Changeset bbb94545 in mainline for kernel/arch/sparc32/src/proc/scheduler.c

Timestamp:

2013-11-01T20:28:13Z (11 years ago)

Author:

Jakub Klama <jakub.klama@…>

Branches:

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

Children:

3f596c9

Parents:

e6a3bfee

Message:

Fixed moving from/to invalid window and register window corruption in
preemptible_trap.

File:

• kernel/arch/sparc32/src/proc/scheduler.c (modified) (1 diff)

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

@@ -44 +44 @@
 void before_thread_runs_arch(void)
 {
-        uint32_t kernel_sp = (uint32_t) THREAD->kstack + STACK_SIZE;
-        uint32_t uspace_wbuf = (uint32_t) THREAD->arch.uspace_window_buffer;
-        write_to_invalid(kernel_sp, uspace_wbuf, 0xdeadbeef);
+        printf("before_thread_runs_arch(uspace=%d, kernel_sp=0x%08x\n", THREAD->uspace, (uintptr_t)THREAD->kstack + STACK_SIZE);
+        if (THREAD->uspace) {
+                uint32_t kernel_sp = (uint32_t) THREAD->kstack + STACK_SIZE - 8;
+                uint32_t uspace_wbuf = (uint32_t) THREAD->arch.uspace_window_buffer;
+                write_to_invalid(kernel_sp, uspace_wbuf, 0);
+        }
 }