Changeset 8f91729 in mainline for arch/ppc

Timestamp:

2005-08-31T11:43:38Z (20 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

e291e5d

Parents:

b9e97fb

Message:

separated stack mapping

Location:

arch/ppc

Files:

• Makefile.inc (modified) (1 diff)
• include/context.h (modified) (1 diff)
• include/drivers/ofw.h (modified) (1 diff)
• include/ppc.h (deleted)
• src/drivers/ofw.c (modified) (1 diff)
• src/ppc.c (deleted)
• src/start.S (modified) (2 diffs)

arch/ppc/Makefile.inc

@@ -17 +17 @@
 arch_sources= \
         arch/context.S \
-        arch/ppc.c \
         arch/debug/panic.s \
         arch/fpu_context.c \

arch/ppc/include/context.h

@@ -31 +31 @@
 
 #include <arch/types.h>
+#include <arch/drivers/ofw.h>
 
-#define SP_DELTA        4
+#define SP_DELTA        8
+
+#ifdef context_map_stack
+#undef context_map_stack
+#endif
+
+#define context_map_stack(stack, size) \
+        ofw_claim((void *) stack, size, 0);
 
 struct context {

arch/ppc/include/drivers/ofw.h

@@ -58 +58 @@
 extern phandle ofw_find_device(const char *name);
 extern int ofw_get_property(const phandle device, const char *name, void *buf, const int buflen);
+extern void *ofw_claim(const void *addr, const int size, const int align);
 extern void putchar(const char ch);
 

arch/ppc/src/drivers/ofw.c

@@ -93 +93 @@
 }
 
+void *ofw_claim(const void *addr, const int size, const int align)
+{
+        return (void *) ofw_call("claim", 3, 1, addr, size, align);
+}
+
 void putchar(const char ch)
 {

arch/ppc/src/start.S

@@ -34 +34 @@
 
 kernel_image_start:
-        bl early_init
+        lis r4, ofw@ha
+        addi r4, r4, ofw@l
+        stw r5, 0(r4)
         
         lis r3, _hardcoded_ktext_size@ha
@@ -54 +56 @@
         stw r3, 0(r4)
         
+        bl ofw_init
+        
         b main_bsp