Changeset 2277e03 in mainline

Timestamp:

2013-03-07T22:53:05Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

850235d, e4a1497

Parents:

31399f3

Message:

For all but ia64, make the actual istate_t location match istate_get().

• Drop SP_DELTA from the calculation of the bottom of the kernel stack.
• Make the kernel stack start at its last address (except for ia64).
• Add alignment to istate_t where needed.
• istate_get() on ia64 still returns a wrong address.

Location:

kernel/arch

Files:

• arm32/src/arm32.c (modified) (1 diff)
• ia64/include/istate.h (modified) (1 diff)
• ia64/src/ivt.S (modified) (1 diff)
• ia64/src/proc/scheduler.c (modified) (1 diff)
• mips32/src/mips32.c (modified) (1 diff)
• mips64/src/mips64.c (modified) (1 diff)
• ppc32/src/proc/scheduler.c (modified) (1 diff)
• sparc64/src/proc/sun4u/scheduler.c (modified) (3 diffs)
• sparc64/src/proc/sun4v/scheduler.c (modified) (1 diff)

kernel/arch/arm32/src/arm32.c

@@ -138 +138 @@
         uint8_t *stck;
         
-        stck = &THREAD->kstack[STACK_SIZE - SP_DELTA];
+        stck = &THREAD->kstack[STACK_SIZE];
         supervisor_sp = (uintptr_t) stck;
 }

kernel/arch/ia64/include/istate.h

@@ -106 +106 @@
         uint64_t in5;
         uint64_t in6;
+
+        uint64_t alignment;
 } istate_t;
 

kernel/arch/ia64/src/ivt.S

@@ -35 +35 @@
 #define FRS_TO_SAVE 30
 #define STACK_ITEMS             (21 + FRS_TO_SAVE * 2)
-#define STACK_FRAME_SIZE        ALIGN_UP((STACK_ITEMS*STACK_ITEM_SIZE) + STACK_SCRATCH_AREA_SIZE, STACK_ALIGNMENT)
+#define STACK_FRAME_SIZE        ALIGN_UP((STACK_ITEMS * STACK_ITEM_SIZE) + STACK_SCRATCH_AREA_SIZE, STACK_ALIGNMENT)
 
 #if (STACK_ITEMS % 2 == 0)

kernel/arch/ia64/src/proc/scheduler.c

@@ -90 +90 @@
                 :
                 : "r" (&THREAD->kstack[STACK_SIZE / 2]),
-                  "r" (&THREAD->kstack[STACK_SIZE / 2 - SP_DELTA])
+                  "r" (&THREAD->kstack[STACK_SIZE / 2])
                 );
 }

kernel/arch/mips32/src/mips32.c

@@ -228 +228 @@
 {
         supervisor_sp =
-            (uintptr_t) &THREAD->kstack[STACK_SIZE - SP_DELTA];
+            (uintptr_t) &THREAD->kstack[STACK_SIZE];
 }
 

kernel/arch/mips64/src/mips64.c

@@ -205 +205 @@
 {
         supervisor_sp =
-            (uintptr_t) &THREAD->kstack[STACK_SIZE - SP_DELTA];
+            (uintptr_t) &THREAD->kstack[STACK_SIZE];
 }
 

kernel/arch/ppc32/src/proc/scheduler.c

@@ -55 +55 @@
         asm volatile (
                 "mtsprg0 %[ksp]\n"
-                :: [ksp] "r" (KA2PA(&THREAD->kstack[STACK_SIZE - SP_DELTA]))
+                :: [ksp] "r" (KA2PA(&THREAD->kstack[STACK_SIZE]))
         );
 }

kernel/arch/sparc64/src/proc/sun4u/scheduler.c

@@ -52 +52 @@
 {
         if (THREAD->uspace) {
+                uint64_t sp;
+
                 /*
                  * Write kernel stack address to %g6 of the alternate and
@@ -63 +65 @@
                  *   before it explicitly uses %g7.
                  */
-                uint64_t sp = (uintptr_t) THREAD->kstack + STACK_SIZE -
-                    (STACK_BIAS + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT));
+                sp = (uintptr_t) THREAD->kstack + STACK_SIZE - STACK_BIAS;
                 write_to_ig_g6(sp);
                 write_to_ag_g6(sp);
@@ -76 +77 @@
         if (THREAD->uspace) {
                 /* sample the state of the userspace window buffer */
-                THREAD->arch.uspace_window_buffer = (uint8_t *) read_from_ag_g7();
+                THREAD->arch.uspace_window_buffer =
+                    (uint8_t *) read_from_ag_g7();
         }
 }

kernel/arch/sparc64/src/proc/sun4v/scheduler.c

@@ -55 +55 @@
 {
         if (THREAD->uspace) {
-                uint64_t sp = (uintptr_t) THREAD->kstack + STACK_SIZE -
-                    (STACK_BIAS + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT));
+                uint64_t sp;
+
+                sp = (uintptr_t) THREAD->kstack + STACK_SIZE - STACK_BIAS;
                 asi_u64_write(ASI_SCRATCHPAD, SCRATCHPAD_KSTACK, sp);
                 asi_u64_write(ASI_SCRATCHPAD, SCRATCHPAD_WBUF,