Changeset 12c7f27 in mainline

Timestamp:

2006-04-22T23:35:20Z (19 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

6ecc8bce

Parents:

cf85e24c

Message:

init tasks must be registered before main_bsp()

Location:

arch

Files:

• mips32/include/arch.h (modified) (1 diff)
• mips32/src/mips32.c (modified) (2 diffs)
• mips32/src/start.S (modified) (2 diffs)
• ppc32/include/arch.h (modified) (1 diff)
• ppc32/src/boot/boot.S (modified) (1 diff)
• ppc32/src/ppc32.c (modified) (2 diffs)

arch/mips32/include/arch.h

@@ -30 +30 @@
 #define __mips32_ARCH_H__
 
+extern void arch_pre_main(void);
+
 #endif

arch/mips32/src/mips32.c

@@ -58 +58 @@
 #define CACHE_EXC ((char *) 0x80000100)
 
+void arch_pre_main(void)
+{
+        /* Setup usermode */
+        init.cnt = 1;
+        init.tasks[0].addr = INIT_ADDRESS;
+        init.tasks[0].size = INIT_SIZE;
+}
+
 void arch_pre_mm_init(void)
 {
@@ -96 +104 @@
         console_init();
         debugger_init();
-        
-        /* Setup usermode */
-        init.cnt = 1;
-        init.tasks[0].addr = INIT_ADDRESS;
-        init.tasks[0].size = INIT_SIZE;
 }
 

arch/mips32/src/start.S

@@ -187 +187 @@
         lui $gp, 0x8000
         
-        jal main_bsp
-        nop
-
+        jal arch_pre_main
+        nop
+        
+        j main_bsp
+        nop
 
         .space TEMP_STACK_SIZE
@@ -322 +324 @@
         add $t9, $a2, 0   # Set up correct entry into PIC code 
         eret
-

arch/ppc32/include/arch.h

@@ -30 +30 @@
 #define __ppc32_ARCH_H__
 
+extern void arch_pre_main(void);
+
 #endif

arch/ppc32/src/boot/boot.S

@@ -68 +68 @@
         bootinfo_end:
         
+        bl arch_pre_main
         b main_bsp
 

arch/ppc32/src/ppc32.c

@@ -38 +38 @@
 bootinfo_t bootinfo;
 
+void arch_pre_main(void)
+{
+        /* Setup usermode */
+        init.cnt = 1;
+        init.tasks[0].addr = PA2KA(bootinfo.init.addr);
+        init.tasks[0].size = bootinfo.init.size;
+}
+
 void arch_pre_mm_init(void)
 {
@@ -48 +56 @@
         ppc32_console_init();
         cuda_init();
-        
-        /* Setup usermode */
-        init.cnt = 1;
-        init.tasks[0].addr = PA2KA(bootinfo.init.addr);
-        init.tasks[0].size = bootinfo.init.size;
 }