Changeset 2277e03 in mainline for kernel/arch/sparc64/src

Timestamp:

2013-03-07T22:53:05Z (13 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/sparc64/src/proc

Files:

• sun4u/scheduler.c (modified) (3 diffs)
• sun4v/scheduler.c (modified) (1 diff)

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,