Changeset 26aafe8 in mainline for kernel/generic/include

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/generic/include

Files:

• config.h (modified) (2 diffs)
• cpu.h (modified) (1 diff)
• mm/as.h (modified) (1 diff)
• mm/frame.h (modified) (1 diff)
• proc/task.h (modified) (1 diff)
• proc/thread.h (modified) (1 diff)
• proc/uarg.h (modified) (1 diff)
• typedefs.h (modified) (1 diff)

kernel/generic/include/config.h

@@ -36 +36 @@
 #define KERN_CONFIG_H_
 
-#include <typedefs.h>
 #include <arch/mm/page.h>
 
-#define STACK_SIZE  PAGE_SIZE
+#define ONE_FRAME    0
+#define TWO_FRAMES   1
+#define FOUR_FRAMES  2
+
+#define STACK_FRAMES  TWO_FRAMES
+#define STACK_SIZE    ((1 << STACK_FRAMES) << PAGE_WIDTH)
 
 #define CONFIG_INIT_TASKS        32
 #define CONFIG_TASK_NAME_BUFLEN  32
+
+#ifndef __ASM__
+
+#include <typedefs.h>
 
 typedef struct {
@@ -80 +88 @@
 extern ballocs_t ballocs;
 
+#endif /* __ASM__ */
+
 #endif
 

kernel/generic/include/cpu.h

@@ -41 +41 @@
 #include <arch/cpu.h>
 #include <arch/context.h>
-
-#define CPU_STACK_SIZE  STACK_SIZE
 
 /** CPU structure.

kernel/generic/include/mm/as.h

@@ -84 +84 @@
 #define USER_ADDRESS_SPACE_END      USER_ADDRESS_SPACE_END_ARCH
 
-#define USTACK_ADDRESS  USTACK_ADDRESS_ARCH
+#ifdef USTACK_ADDRESS_ARCH
+        #define USTACK_ADDRESS  USTACK_ADDRESS_ARCH
+#else
+        #define USTACK_ADDRESS  (USER_ADDRESS_SPACE_END - (STACK_SIZE - 1))
+#endif
 
 /** Kernel address space. */

kernel/generic/include/mm/frame.h

@@ -44 +44 @@
 #include <arch/mm/page.h>
 #include <arch/mm/frame.h>
-
-#define ONE_FRAME    0
-#define TWO_FRAMES   1
-#define FOUR_FRAMES  2
-
-
-#ifdef ARCH_STACK_FRAMES
-        #define STACK_FRAMES  ARCH_STACK_FRAMES
-#else
-        #define STACK_FRAMES  ONE_FRAME
-#endif
 
 /** Maximum number of zones in the system. */

kernel/generic/include/proc/task.h

@@ -78 +78 @@
         /** Unique identity of task. */
         task_id_t taskid;
-        /** Task security context. */
-        context_id_t context;
+        /** Task security container. */
+        container_id_t container;
         
         /** Number of references (i.e. threads). */

kernel/generic/include/proc/thread.h

@@ -49 +49 @@
 #include <sysinfo/abi.h>
 
-#define THREAD_STACK_SIZE   STACK_SIZE
 #define THREAD_NAME_BUFLEN  20
 

kernel/generic/include/proc/uarg.h

@@ -40 +40 @@
         void *uspace_entry;
         void *uspace_stack;
-
+        
         void (* uspace_thread_function)();
         void *uspace_thread_arg;

kernel/generic/include/typedefs.h

@@ -64 +64 @@
 typedef uint64_t thread_id_t;
 typedef uint64_t task_id_t;
-typedef uint32_t context_id_t;
+typedef uint32_t container_id_t;
 
 typedef int32_t inr_t;