Changeset 1affcdf3 in mainline for kernel/arch/arm32/src/userspace.c

Timestamp:

2011-06-10T19:33:41Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1878386

Parents:

13ecdac9 (diff), 79a141a (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.

Message:

Merge mainline changes

File:

• kernel/arch/arm32/src/userspace.c (modified) (3 diffs)

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 */