Changeset 3e828ea in mainline for kernel/arch/mips32/src/mips32.c

Timestamp:

2019-09-23T12:49:29Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

File:

• kernel/arch/mips32/src/mips32.c (modified) (3 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;
@@ -107 +103 @@
 #endif
 
+        str_cpy(bargs, CONFIG_BOOT_ARGUMENTS_BUFLEN, bootinfo->bootargs);
+
         /* Initialize machine_ops pointer. */
         machine_ops_init();
@@ -169 +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)