Changeset 40ca402 in mainline

Timestamp:

2006-02-06T22:29:52Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

dd4d6b0

Parents:

8a1da55

Message:

Userspace now starts executing correctly.

Location:

arch/amd64

Files:

• include/mm/as.h (modified) (1 diff)
• src/userspace.c (modified) (1 diff)

arch/amd64/include/mm/as.h

@@ -35 +35 @@
 #define KERNEL_ADDRESS_SPACE_END_ARCH           (__address) 0xffffffffffffffff
 #define USER_ADDRESS_SPACE_START_ARCH           (__address) 0x0000000000000000
-#define USER_ADDRESS_SPACE_END_ARCH             (__address) 0x00008fffffffffff
+#define USER_ADDRESS_SPACE_END_ARCH             (__address) 0x00007fffffffffff
 
 #define UTEXT_ADDRESS_ARCH      0x00001000

arch/amd64/src/userspace.c

@@ -58 +58 @@
                           "pushq %%rsi;"
                           "iretq;"
-                          : : "i" (gdtselector(UDATA_DES) | PL_USER), "i" (USTACK_ADDRESS+THREAD_STACK_SIZE), "r" (ipl), "i" (gdtselector(UTEXT_DES) | PL_USER), "i" (UTEXT_ADDRESS));
+                          : : "i" (gdtselector(UDATA_DES) | PL_USER), 
+                          "i" (USTACK_ADDRESS+THREAD_STACK_SIZE), 
+                          "r" (ipl), 
+                          "i" (gdtselector(UTEXT_DES) | PL_USER), 
+                          "i" (UTEXT_ADDRESS));
         
         /* Unreachable */