Changeset 0c27956 in mainline

Timestamp:

2018-08-02T16:25:48Z (6 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7cd7a8d

Parents:

3b10ae36

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-08-02 16:24:22)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-08-02 16:25:48)

Message:

Fix sparc64: context must save the thread pointer.

Location:

kernel/arch/sparc64

Files:

• include/arch/context_struct.h (modified) (2 diffs)
• src/context.S (modified) (2 diffs)

kernel/arch/sparc64/include/arch/context_struct.h

@@ -48 +48 @@
 #define CONTEXT_OFFSET_L6   0x80
 #define CONTEXT_OFFSET_L7   0x88
-#define CONTEXT_OFFSET_IPL  0x90
-#define CONTEXT_SIZE        0x98
+#define CONTEXT_OFFSET_TP   0x90
+#define CONTEXT_OFFSET_IPL  0x98
+#define CONTEXT_SIZE        0xa0
 
 #ifndef __ASSEMBLER__
@@ -74 +75 @@
         uint64_t l6;
         uint64_t l7;
+        uint64_t tp;  // %g7
         ipl_t ipl;
 } context_t;

kernel/arch/sparc64/src/context.S

@@ -63 +63 @@
         stx %l6, [%o0 + CONTEXT_OFFSET_L6]
         stx %l7, [%o0 + CONTEXT_OFFSET_L7]
+        stx %g7, [%o0 + CONTEXT_OFFSET_TP]
         retl
         mov 1, %o0              ! context_save_arch returns 1
@@ -103 +104 @@
         ldx [%o0 + CONTEXT_OFFSET_L6], %l6
         ldx [%o0 + CONTEXT_OFFSET_L7], %l7
+        ldx [%o0 + CONTEXT_OFFSET_TP], %g7
         retl
         xor %o0, %o0, %o0       ! context_restore_arch returns 0