Changeset 9b0f294 in mainline for kernel/arch

Timestamp:

2006-09-09T10:54:37Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

208fa65

Parents:

27ab6a7

Message:

Even the first kernel register window after the switch from userspace stack needs
proper register window save area [sparc64].

Location:

kernel/arch/sparc64/src

Files:

• proc/scheduler.c (modified) (1 diff)
• sparc64.c (modified) (1 diff)

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

@@ -93 +93 @@
                  */
                 uint64_t sp = (uintptr_t) THREAD->kstack + STACK_SIZE
-                        - (STACK_BIAS + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT));
+                        - (STACK_BIAS + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT) + STACK_WINDOW_SAVE_AREA_SIZE);
                 write_to_ig_g6(sp);
                 write_to_ag_g6(sp);

kernel/arch/sparc64/src/sparc64.c

@@ -99 +99 @@
         switch_to_userspace((uintptr_t) kernel_uarg->uspace_entry,
                 ((uintptr_t) kernel_uarg->uspace_stack) + STACK_SIZE
-                - (ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT) + STACK_BIAS),
+                - (ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT) + STACK_BIAS + STACK_WINDOW_SAVE_AREA_SIZE),
                 (uintptr_t) kernel_uarg->uspace_uarg);