Changeset 26aafe8 in mainline for kernel/arch/mips32

Timestamp:

2011-05-19T16:47:49Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

a6d8726

Parents:

bcaca55

Message:

cleanup the huge mess related to stacks, their sizes and locations
use two frames for kernel stacks by default on all platforms (to play it safe)

Location:

kernel/arch/mips32

Files:

• include/mm/as.h (modified) (1 diff)
• src/mips32.c (modified) (2 diffs)

kernel/arch/mips32/include/mm/as.h

@@ -38 +38 @@
 #define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH  0
 
-#define KERNEL_ADDRESS_SPACE_START_ARCH         (unsigned long) 0x80000000
-#define KERNEL_ADDRESS_SPACE_END_ARCH           (unsigned long) 0x9fffffff
-#define USER_ADDRESS_SPACE_START_ARCH           (unsigned long) 0x00000000
-#define USER_ADDRESS_SPACE_END_ARCH             (unsigned long) 0x7fffffff
-
-#define USTACK_ADDRESS_ARCH     (0x80000000 - PAGE_SIZE)
+#define KERNEL_ADDRESS_SPACE_START_ARCH  UINT32_C(0x80000000)
+#define KERNEL_ADDRESS_SPACE_END_ARCH    UINT32_C(0x9fffffff)
+#define USER_ADDRESS_SPACE_START_ARCH    UINT32_C(0x00000000)
+#define USER_ADDRESS_SPACE_END_ARCH      UINT32_C(0x7fffffff)
 
 typedef struct {

kernel/arch/mips32/src/mips32.c

@@ -220 +220 @@
             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 + PAGE_SIZE), 
+        userspace_asm(((uintptr_t) kernel_uarg->uspace_stack + STACK_SIZE),
             (uintptr_t) kernel_uarg->uspace_uarg,
             (uintptr_t) kernel_uarg->uspace_entry);
@@ -235 +235 @@
 void before_thread_runs_arch(void)
 {
-        supervisor_sp = (uintptr_t) &THREAD->kstack[THREAD_STACK_SIZE -
-            SP_DELTA];
+        supervisor_sp =
+            (uintptr_t) &THREAD->kstack[STACK_SIZE - SP_DELTA];
 }