Changeset 26aafe8 in mainline for kernel/arch/amd64

Timestamp:

2011-05-19T16:47:49Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

a6d8726

Parents:

bcaca55

Message:

cleanup the huge mess related to stacks, their sizes and locations
use two frames for kernel stacks by default on all platforms (to play it safe)

Location:

kernel/arch/amd64

Files:

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

kernel/arch/amd64/include/mm/as.h

@@ -43 +43 @@
 #define KERNEL_ADDRESS_SPACE_START_ARCH  UINT64_C(0xffff800000000000)
 #define KERNEL_ADDRESS_SPACE_END_ARCH    UINT64_C(0xffffffffffffffff)
-
-#define USER_ADDRESS_SPACE_START_ARCH  UINT64_C(0x0000000000000000)
-#define USER_ADDRESS_SPACE_END_ARCH    UINT64_C(0x00007fffffffffff)
-
-#define USTACK_ADDRESS_ARCH  (USER_ADDRESS_SPACE_END_ARCH - (PAGE_SIZE - 1))
+#define USER_ADDRESS_SPACE_START_ARCH    UINT64_C(0x0000000000000000)
+#define USER_ADDRESS_SPACE_END_ARCH      UINT64_C(0x00007fffffffffff)
 
 #define as_constructor_arch(as, flags)  (as != as)

kernel/arch/amd64/src/proc/scheduler.c

@@ -56 +56 @@
 {
         CPU->arch.tss->rsp0 =
-            (uintptr_t) &THREAD->kstack[THREAD_STACK_SIZE];
+            (uintptr_t) &THREAD->kstack[STACK_SIZE];
         
         /*

kernel/arch/amd64/src/userspace.c

@@ -66 +66 @@
                 "iretq\n"
                 :: [udata_des] "i" (GDT_SELECTOR(UDATA_DES) | PL_USER),
-                   [stack_size] "r" (kernel_uarg->uspace_stack + THREAD_STACK_SIZE),
+                   [stack_size] "r" (kernel_uarg->uspace_stack + STACK_SIZE),
                    [ipl] "r" (ipl),
                    [utext_des] "i" (GDT_SELECTOR(UTEXT_DES) | PL_USER),