Changeset 26aafe8 in mainline for kernel/arch/arm32

Timestamp:

2011-05-19T16:47:49Z (15 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/arm32

Files:

• include/mm/as.h (modified) (1 diff)
• src/arm32.c (modified) (1 diff)
• src/userspace.c (modified) (3 diffs)

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

@@ -37 +37 @@
 #define KERN_arm32_AS_H_
 
-#define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH      0
+#define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH  0
 
-#define KERNEL_ADDRESS_SPACE_START_ARCH     (unsigned long) 0x80000000
-#define KERNEL_ADDRESS_SPACE_END_ARCH       (unsigned long) 0xffffffff
-#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(0xffffffff)
+#define USER_ADDRESS_SPACE_START_ARCH    UINT32_C(0x00000000)
+#define USER_ADDRESS_SPACE_END_ARCH      UINT32_C(0x7fffffff)
 
 typedef struct {

kernel/arch/arm32/src/arm32.c

@@ -134 +134 @@
         uint8_t *stck;
         
-        stck = &THREAD->kstack[THREAD_STACK_SIZE - SP_DELTA];
+        stck = &THREAD->kstack[STACK_SIZE - SP_DELTA];
         supervisor_sp = (uintptr_t) stck;
 }

kernel/arch/arm32/src/userspace.c

@@ -38 +38 @@
 
 /** Struct for holding all general purpose registers.
- *  
+ *
  *  Used to set registers when going to userspace.
  */
@@ -60 +60 @@
 } ustate_t;
 
-/** Changes processor mode and jumps to the address specified in the first
- * parameter.
+/** Change processor mode
  *
- *  @param kernel_uarg   Userspace settings (entry point, stack, ...).
+ * @param kernel_uarg Userspace settings (entry point, stack, ...).
+ *
  */
 void userspace(uspace_arg_t *kernel_uarg)
@@ -79 +79 @@
 
         /* clear other registers */
-        ustate.r3  = ustate.r4  = ustate.r5 = ustate.r6 = ustate.r7 =
-            ustate.r8 = ustate.r9 = ustate.r10 = ustate.r11 = ustate.r12 =
-            ustate.lr = 0;
+        ustate.r3 = 0;
+        ustate.r4 = 0;
+        ustate.r5 = 0;
+        ustate.r6 = 0;
+        ustate.r7 = 0;
+        ustate.r8 = 0;
+        ustate.r9 = 0;
+        ustate.r10 = 0;
+        ustate.r11 = 0;
+        ustate.r12 = 0;
+        ustate.lr = 0;
 
         /* set user stack */
-        ustate.sp = ((uint32_t)kernel_uarg->uspace_stack) + PAGE_SIZE;
+        ustate.sp = ((uint32_t)kernel_uarg->uspace_stack) + STACK_SIZE;
 
         /* set where uspace execution starts */