Changeset add04f7 in mainline for kernel/arch/ia32/src/userspace.c

Timestamp:

2009-03-03T15:20:49Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

f24d300

Parents:

deca67b

Message:

better inline assembler readability using the new symbolic syntax

File:

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

kernel/arch/ia32/src/userspace.c

@@ -27 +27 @@
  */
 
-/** @addtogroup ia32    
+/** @addtogroup ia32
  * @{
  */
@@ -48 +48 @@
 void userspace(uspace_arg_t *kernel_uarg)
 {
-        ipl_t ipl;
-
-        ipl = interrupts_disable();
-
+        ipl_t ipl = interrupts_disable();
+        
         asm volatile (
                 /*
@@ -61 +59 @@
                 "push %%eax\n"
                 "popfl\n"
-
+                
                 /* Set up GS register (TLS) */
-                "movl %6, %%gs\n"
-
-                "pushl %0\n"
-                "pushl %1\n"
-                "pushl %2\n"
-                "pushl %3\n"
-                "pushl %4\n"
-                "movl %5, %%eax\n"
-
+                "movl %[tls_des], %%gs\n"
+                
+                "pushl %[udata_des]\n"
+                "pushl %[stack_size]\n"
+                "pushl %[ipl]\n"
+                "pushl %[utext_des]\n"
+                "pushl %[entry]\n"
+                "movl %[uarg], %%eax\n"
+                
                 /* %ebx is defined to hold pcb_ptr - set it to 0 */
-                "xorl %%ebx, %%ebx\n"   
-
+                "xorl %%ebx, %%ebx\n"
+                
                 "iret\n"
-                : 
-                : "i" (selector(UDATA_DES) | PL_USER),
-                  "r" ((uint8_t *) kernel_uarg->uspace_stack +
-                      THREAD_STACK_SIZE),
-                  "r" (ipl),
-                  "i" (selector(UTEXT_DES) | PL_USER),
-                  "r" (kernel_uarg->uspace_entry),
-                  "r" (kernel_uarg->uspace_uarg),
-                  "r" (selector(TLS_DES))
+                :
+                : [udata_des] "i" (selector(UDATA_DES) | PL_USER),
+                  [stack_size] "r" ((uint8_t *) kernel_uarg->uspace_stack + THREAD_STACK_SIZE),
+                  [ipl] "r" (ipl),
+                  [utext_des] "i" (selector(UTEXT_DES) | PL_USER),
+                  [entry] "r" (kernel_uarg->uspace_entry),
+                  [uarg] "r" (kernel_uarg->uspace_uarg),
+                  [tls_des] "r" (selector(TLS_DES))
                 : "eax");
         
         /* Unreachable */
-        for(;;)
-                ;
+        while (1);
 }