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

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

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

kernel/arch/ia32/src/userspace.c

@@ -35 +35 @@
 #include <userspace.h>
 #include <arch/pm.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <arch.h>
 #include <proc/uarg.h>
@@ -70 +70 @@
                 "movl %[uarg], %%eax\n"
                 
-                /* %ebx is defined to hold pcb_ptr - set it to 0 */
-                "xorl %%ebx, %%ebx\n"
+                /* %edi is defined to hold pcb_ptr - set it to 0 */
+                "xorl %%edi, %%edi\n"
                 
                 "iret\n"
                 :
-                : [udata_des] "i" (gdtselector(UDATA_DES) | PL_USER),
+                : [udata_des] "i" (GDT_SELECTOR(UDATA_DES) | PL_USER),
                   [stack_size] "r" ((uint8_t *) kernel_uarg->uspace_stack + THREAD_STACK_SIZE),
                   [ipl] "r" (ipl),
-                  [utext_des] "i" (gdtselector(UTEXT_DES) | PL_USER),
+                  [utext_des] "i" (GDT_SELECTOR(UTEXT_DES) | PL_USER),
                   [entry] "r" (kernel_uarg->uspace_entry),
                   [uarg] "r" (kernel_uarg->uspace_uarg),
-                  [tls_des] "r" (gdtselector(TLS_DES))
+                  [tls_des] "r" (GDT_SELECTOR(TLS_DES))
                 : "eax");