Changeset 6d123b3 in mainline for kernel/arch/mips64/src/start.S

Timestamp:

2012-03-13T15:23:11Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

145d16f

Parents:

df366b5e

Message:

respect the o32 ABI when calling C functions from assembler and creating contexts
(thx Adam Hraska)

File:

• kernel/arch/mips64/src/start.S (modified) (5 diffs)

kernel/arch/mips64/src/start.S

@@ -241 +241 @@
         /* $a1 contains physical address of bootinfo_t */
         jal arch_pre_main
-        nop
+        addiu $sp, -ABI_STACK_FRAME
         
         j main_bsp
@@ -281 +281 @@
         
         move $a1, $sp
+        move $a0, $k0
         jal exc_dispatch     /* exc_dispatch(excno, register_space) */
-        move $a0, $k0
+        addiu $sp, -ABI_STACK_FRAME
+        addiu $sp, ABI_STACK_FRAME
         
         REGISTERS_LOAD $sp
@@ -323 +325 @@
         sw $t0, ISTATE_OFFSET_T0($sp)  /* save the 5th argument on the stack */
         sw $t1, ISTATE_OFFSET_T1($sp)  /* save the 6th argument on the stack */
+        
         jal syscall_handler
         sw $v0, ISTATE_OFFSET_V0($sp)  /* save the syscall number on the stack */
@@ -357 +360 @@
         move $sp, $k0
         
+        move $a0, $sp
         jal tlb_refill
-        move $a0, $sp 
+        addiu $sp, -ABI_STACK_FRAME
+        addiu $sp, ABI_STACK_FRAME
         
         REGISTERS_LOAD $sp
@@ -366 +371 @@
 cache_error_handler:
         KERNEL_STACK_TO_K0
-        sub $k0, ISTATE_SOFT_SIZE 
+        sub $k0, ISTATE_SOFT_SIZE
         REGISTERS_STORE_AND_EXC_RESET $k0
         sw $sp, ISTATE_OFFSET_SP($k0)
         move $sp, $k0
         
+        move $a0, $sp
         jal cache_error
-        move $a0, $sp
+        addiu $sp, -ABI_STACK_FRAME
+        addiu $sp, ABI_STACK_FRAME
         
         REGISTERS_LOAD $sp