Changeset 7248e31 in mainline

Timestamp:

2005-09-07T07:42:36Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

24bd23a

Parents:

0b512a8

Message:

Make IA-32 userspace stack be aligned on doubleword boundary.
In userspace(), mark "eax" as clobbered register.

Location:

arch/ia32

Files:

• include/mm/vm.h (modified) (1 diff)
• src/userspace.c (modified) (2 diffs)

arch/ia32/include/mm/vm.h

@@ -32 +32 @@
 #include <arch/types.h>
 
-#define KERNEL_ADDRESS_SPACE_START_ARCH         (__address) 0x80000000
-#define KERNEL_ADDRESS_SPACE_END_ARCH           (__address) 0xffffffff  
-#define USER_ADDRESS_SPACE_START_ARCH           (__address) 0x00000000
-#define USER_ADDRESS_SPACE_END_ARCH             (__address) 0x7fffffff
+#define KERNEL_ADDRESS_SPACE_START_ARCH         ((__address) 0x80000000)
+#define KERNEL_ADDRESS_SPACE_END_ARCH           ((__address) 0xffffffff)
+#define USER_ADDRESS_SPACE_START_ARCH           ((__address) 0x00000000)
+#define USER_ADDRESS_SPACE_END_ARCH             ((__address) 0x7fffffff)
 
 #define UTEXT_ADDRESS_ARCH      0x00001000
-#define USTACK_ADDRESS_ARCH     (0x7fffffff-(PAGE_SIZE-1))
+#define USTACK_ADDRESS_ARCH     (USER_ADDRESS_SPACE_END_ARCH-(PAGE_SIZE-1))
 #define UDATA_ADDRESS_ARCH      0x21000000
 

arch/ia32/src/userspace.c

@@ -46 +46 @@
         pri = cpu_priority_high();
 
-        __asm__ volatile (""
-    /* CLNT */
+        __asm__ volatile (
+                /* CLNT */
                 "pushfl;"
                 "pop %%eax;"
@@ -60 +60 @@
                 "pushl %4\n"
                 "iret"
-                : : "i" (selector(UDATA_DES) | PL_USER), "i" (USTACK_ADDRESS+(THREAD_STACK_SIZE-1)), "r" (pri), "i" (selector(UTEXT_DES) | PL_USER), "i" (UTEXT_ADDRESS));
+                : 
+                : "i" (selector(UDATA_DES) | PL_USER), "r" (USTACK_ADDRESS+(THREAD_STACK_SIZE)), "r" (pri), "i" (selector(UTEXT_DES) | PL_USER), "i" (UTEXT_ADDRESS)
+                : "eax");
         
         /* Unreachable */