Changeset 26aafe8 in mainline for kernel/arch/ia32

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/ia32

Files:

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

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

@@ -43 +43 @@
 #define USER_ADDRESS_SPACE_END_ARCH      UINT32_C(0x7fffffff)
 
-#define USTACK_ADDRESS_ARCH  (USER_ADDRESS_SPACE_END_ARCH - (PAGE_SIZE - 1))
-
 typedef struct {
 } as_arch_t;

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

@@ -58 +58 @@
 void before_thread_runs_arch(void)
 {
-        uintptr_t kstk = (uintptr_t) &THREAD->kstack[THREAD_STACK_SIZE];
+        uintptr_t kstk = (uintptr_t) &THREAD->kstack[STACK_SIZE];
         
         if (CPU->arch.fi.bits.sep) {

kernel/arch/ia32/src/userspace.c

@@ -76 +76 @@
                 :
                 : [udata_des] "i" (GDT_SELECTOR(UDATA_DES) | PL_USER),
-                  [stack_size] "r" ((uint8_t *) kernel_uarg->uspace_stack + THREAD_STACK_SIZE),
+                  [stack_size] "r" ((uint8_t *) kernel_uarg->uspace_stack + STACK_SIZE),
                   [ipl] "r" (ipl),
                   [utext_des] "i" (GDT_SELECTOR(UTEXT_DES) | PL_USER),