Changeset 32e8cd1 in mainline for kernel/arch/sparc32/src/userspace.c

Timestamp:

2013-12-28T17:16:44Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

c1023bcb

Parents:

f6f22cdb

Message:

code revision
coding style fixes
removal of debugging printouts and other temporary stuff

File:

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

kernel/arch/sparc32/src/userspace.c

@@ -27 +27 @@
  */
 
-/** @addtogroup abs32le
+/** @addtogroup sparc32
  * @{
  */
@@ -42 +42 @@
 void userspace(uspace_arg_t *kernel_uarg)
 {
-//      printf("userspace(): entry=%p, stack=%p, stacksize=%d\n", kernel_uarg->uspace_entry, kernel_uarg->uspace_stack, kernel_uarg->uspace_stack_size);
-        /* On real hardware this switches the CPU to user
-           space mode and jumps to kernel_uarg->uspace_entry. */
-
-        uint32_t l0, l1, l2;
         uint32_t psr = psr_read();
-        uint8_t wim;
-
         psr &= ~(1 << 7);
         psr &= ~(1 << 6);
-
+        
         /* Read invalid window variables */
+        uint32_t l0;
+        uint32_t l1;
+        uint32_t l2;
         read_from_invalid(&l0, &l1, &l2);
-
+        
         /* Make current window invalid */
-        wim = (psr & 0x7) + 1;
+        uint8_t wim = (psr & 0x7) + 1;
         wim = (1 << wim) | (1 >> (8 - wim));
-
+        
         asm volatile (
                 "flush\n"
@@ -71 +67 @@
                 "ld %[arg], %%o1\n"
                 "jmp %[entry]\n"
-                "mov %[psr], %%psr\n" :: [entry] "r" (kernel_uarg->uspace_entry),
-                           [arg] "m" (kernel_uarg->uspace_uarg),
-                           [psr] "r" (psr),
-                           [wim] "r" ((uint32_t)wim),   
-                           [v0] "m" (l0),
-                           [v1] "m" (l1),
-                           [v2] "m" (l2),
-                           [stack] "r" (kernel_uarg->uspace_stack + kernel_uarg->uspace_stack_size - 64) : "%g3", "%g4");
-
-        while (true);
+                "mov %[psr], %%psr\n"
+                :: [entry] "r" (kernel_uarg->uspace_entry),
+                   [arg] "m" (kernel_uarg->uspace_uarg),
+                   [psr] "r" (psr),
+                   [wim] "r" ((uint32_t)wim),
+                   [v0] "m" (l0),
+                   [v1] "m" (l1),
+                   [v2] "m" (l2),
+                   [stack] "r" (kernel_uarg->uspace_stack +
+                   kernel_uarg->uspace_stack_size - 64)
+                : "%g3", "%g4"
+        );
+        
+        while (1);
 }