Changeset e28175d in mainline for kernel/arch/mips32/src/mips32.c

Timestamp:

2020-03-15T10:44:02Z (6 years ago)

Author:

GitHub <noreply@…>

Parents:

b401b33 (diff), 44dde42 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

heiducteam <tristanided@…> (2020-03-15 10:44:02)

git-committer:

GitHub <noreply@…> (2020-03-15 10:44:02)

Message:

Merge pull request #1 from HelenOS/master

sync

File:

• kernel/arch/mips32/src/mips32.c (modified) (2 diffs)

kernel/arch/mips32/src/mips32.c

@@ -71 +71 @@
 arch_ops_t *arch_ops = &mips32_ops;
 
-/*
- * Why the linker moves the variable 64K away in assembler
- * when not in .text section?
- */
-
 /* Stack pointer saved when entering user mode */
-uintptr_t supervisor_sp __attribute__((section(".text")));
+// FIXME: This won't work with SMP unless thread creation is globally serialized.
+uintptr_t supervisor_sp;
 
 size_t cpu_count = 0;
@@ -171 +167 @@
         cp0_status_write(cp0_status_read() | (cp0_status_exl_exception_bit |
             cp0_status_um_bit | cp0_status_ie_enabled_bit));
-        cp0_epc_write((uintptr_t) kernel_uarg->uspace_entry);
-        userspace_asm(((uintptr_t) kernel_uarg->uspace_stack +
-            kernel_uarg->uspace_stack_size),
-            (uintptr_t) kernel_uarg->uspace_uarg,
-            (uintptr_t) kernel_uarg->uspace_entry);
+        cp0_epc_write(kernel_uarg->uspace_entry);
+        userspace_asm(kernel_uarg->uspace_stack +
+            kernel_uarg->uspace_stack_size,
+            kernel_uarg->uspace_uarg,
+            kernel_uarg->uspace_entry);
 
         while (true)