diff options
| author | David Guillen Fandos | 2021-06-22 00:09:44 +0200 |
|---|---|---|
| committer | David Guillen Fandos | 2021-06-22 00:09:44 +0200 |
| commit | dbf72e95efd507d5a6255c25aee055a0a3c1350e (patch) | |
| tree | 1a748f7dd10683aa78920f5e539ba85aaf5117b8 /psp | |
| parent | f8d4276e12165a2610c87e998a343c02c2904855 (diff) | |
| download | picogpsp-dbf72e95efd507d5a6255c25aee055a0a3c1350e.tar.gz picogpsp-dbf72e95efd507d5a6255c25aee055a0a3c1350e.tar.bz2 picogpsp-dbf72e95efd507d5a6255c25aee055a0a3c1350e.zip | |
Fix the no-caller-saves bug for MIPS
Seems that ABI mandates that we allocate space for arg0..4 even if we do
pass them as registers. For some reason write_io_register<> functions
write in that stack area (1 word) corrupting the s0 saved register.
This seems to be a new gcc behaviour?
Diffstat (limited to 'psp')
| -rw-r--r-- | psp/mips_stub.S | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/psp/mips_stub.S b/psp/mips_stub.S index 59cf2a0..7b9bcb0 100644 --- a/psp/mips_stub.S +++ b/psp/mips_stub.S @@ -293,18 +293,18 @@ mips_cheat_hook: # ARM regs must be saved before branching here return_to_main: REG_L $28, GP_SAVE($16) # Restore previous state - REG_L $s0, 0*SZREG($sp) - REG_L $s1, 1*SZREG($sp) - REG_L $s2, 2*SZREG($sp) - REG_L $s3, 3*SZREG($sp) - REG_L $s4, 4*SZREG($sp) - REG_L $s5, 5*SZREG($sp) - REG_L $s6, 6*SZREG($sp) - REG_L $s7, 7*SZREG($sp) - REG_L $fp, 8*SZREG($sp) - REG_L $ra, 9*SZREG($sp) + REG_L $s0, 4*SZREG($sp) + REG_L $s1, 5*SZREG($sp) + REG_L $s2, 6*SZREG($sp) + REG_L $s3, 7*SZREG($sp) + REG_L $s4, 8*SZREG($sp) + REG_L $s5, 9*SZREG($sp) + REG_L $s6, 10*SZREG($sp) + REG_L $s7, 11*SZREG($sp) + REG_L $fp, 12*SZREG($sp) + REG_L $ra, 13*SZREG($sp) jr $ra # Return to main - addiu $sp, $sp, 80 # Restore stack pointer (delay slot) + addiu $sp, $sp, 112 # Restore stack pointer (delay slot) # Perform an indirect branch. @@ -590,17 +590,17 @@ asr_shift_high: execute_arm_translate_internal: - addiu $sp, $sp, -80 # Store the main thread context - REG_S $s0, 0*SZREG($sp) - REG_S $s1, 1*SZREG($sp) - REG_S $s2, 2*SZREG($sp) - REG_S $s3, 3*SZREG($sp) - REG_S $s4, 4*SZREG($sp) - REG_S $s5, 5*SZREG($sp) - REG_S $s6, 6*SZREG($sp) - REG_S $s7, 7*SZREG($sp) - REG_S $fp, 8*SZREG($sp) - REG_S $ra, 9*SZREG($sp) + addiu $sp, $sp, -112 # Store the main thread context + REG_S $s0, 4*SZREG($sp) + REG_S $s1, 5*SZREG($sp) + REG_S $s2, 6*SZREG($sp) + REG_S $s3, 7*SZREG($sp) + REG_S $s4, 8*SZREG($sp) + REG_S $s5, 9*SZREG($sp) + REG_S $s6, 10*SZREG($sp) + REG_S $s7, 11*SZREG($sp) + REG_S $fp, 12*SZREG($sp) + REG_S $ra, 13*SZREG($sp) move $16, $5 REG_S $28, GP_SAVE($16) |