Changeset 0f250f9 in mainline for arch/amd64/src/userspace.c

Timestamp:

2006-03-17T18:07:56Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

69f293e

Parents:

6c6a19e6

Message:

Improved uspace threads.
ia64 needs fixing.

File:

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

arch/amd64/src/userspace.c

@@ -31 +31 @@
 #include <arch/types.h>
 #include <arch.h>
-#include <proc/thread.h>
+#include <proc/uarg.h>
 #include <mm/as.h>
 
@@ -40 +40 @@
  *
  */
-void userspace(uspace_arg_t *uarg)
+void userspace(uspace_arg_t *kernel_uarg)
 {
         ipl_t ipl;
@@ -52 +52 @@
                           "pushq %3\n"
                           "pushq %4\n"
+                          "movq %5, %%rax\n"
                           "iretq\n"
                           : : 
                           "i" (gdtselector(UDATA_DES) | PL_USER), 
-                          "r" (uarg->uspace_stack+THREAD_STACK_SIZE), 
+                          "r" (kernel_uarg->uspace_stack+THREAD_STACK_SIZE), 
                           "r" (ipl), 
                           "i" (gdtselector(UTEXT_DES) | PL_USER), 
-                          "r" (uarg->uspace_entry));
+                          "r" (kernel_uarg->uspace_entry),
+                          "r" (kernel_uarg->uspace_uarg)
+                          : "rax"
+                          );
         
         /* Unreachable */
-        for(;;);
+        for(;;)
+                ;
 }