Changeset 1fbbcd6 in mainline for arch

Timestamp:

2005-08-29T20:31:23Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

81887b7

Parents:

4dd0704

Message:

Globalize 'size' and 'delta' and rename them to 'kernel_size' and 'heap_delta'.

Fix heap initialization to take 'heap_delta' into account.

Implement IA-64 get_stack_base().

Adjust SP_DELTA's to consider one extra word on stack.
(So that the stack pointer is within appropriate limits even on IA-64).

More #include cleanup.

Location:

arch

Files:

• ia32/include/asm.h (modified) (1 diff)
• ia32/include/context.h (modified) (1 diff)
• ia32/include/cpu.h (modified) (1 diff)
• ia64/include/asm.h (modified) (1 diff)
• ia64/include/context.h (modified) (1 diff)
• mips/include/asm.h (modified) (1 diff)
• mips/include/context.h (modified) (1 diff)

arch/ia32/include/asm.h

@@ -162 +162 @@
  * Return the base address of the current stack.
  * The stack is assumed to be STACK_SIZE bytes long.
+ * The stack must start on page boundary.
  */
 static inline __address get_stack_base(void)

arch/ia32/include/context.h

@@ -32 +32 @@
 #include <arch/types.h>
 
+#define STACK_ITEM_SIZE 4
+
 /*
  * Both context_save() and context_restore() eat two doublewords from the stack.
  * First for pop of the saved register, second during ret instruction.
+ *
+ * One item is put onto stack to support get_stack_base().
  */
-#define SP_DELTA        8
+#define SP_DELTA        (8+STACK_ITEM_SIZE)
 
 struct context {

arch/ia32/include/cpu.h

@@ -30 +30 @@
 #define __ia32_CPU_H__
 
-#include <config.h>
-#include <proc/thread.h>
 #include <typedefs.h>
 #include <arch/pm.h>

arch/ia64/include/asm.h

@@ -33 +33 @@
 #include <config.h>
 
-/* TODO: implement the real stuff */
+/** Return base address of current stack
+ *
+ * Return the base address of the current stack.
+ * The stack is assumed to be STACK_SIZE long.
+ * The stack must start on page boundary.
+ */
 static inline __address get_stack_base(void)
 {
-        return NULL;
+        __u64 v;
+
+        __asm__ volatile ("and %0 = %1, r12" : "=r" (v) : "r" (~(STACK_SIZE-1)));
+        
+        return v;
 }
 

arch/ia64/include/context.h

@@ -32 +32 @@
 #include <arch/types.h>
 
+#define STACK_ITEM_SIZE 16
+
 /*
  * context_save() and context_restore() are both leaf procedures.
  * No need to allocate scratch area.
+ *
+ * One item is put onto the stack to support get_stack_base().
  */
-#define SP_DELTA        0
+#define SP_DELTA        (0+STACK_ITEM_SIZE)
 
 #ifdef context_set

arch/mips/include/asm.h

@@ -39 +39 @@
  * Return the base address of the current stack.
  * The stack is assumed to be STACK_SIZE bytes long.
+ * The stack must start on page boundary.
  */
 static inline __address get_stack_base(void)

arch/mips/include/context.h

@@ -32 +32 @@
 #include <arch/types.h>
 
-#define SP_DELTA        0
+#define STACK_ITEM_SIZE 4
+
+/*
+ * Put one item onto the stack to support get_stack_base().
+ */
+#define SP_DELTA        (0+STACK_ITEM_SIZE)