lifning
/
gpsp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a bug with BLH (half BL) on ARM 

This fixes issues on games from Camelot (GS2 and Mario Golf)
This commit is contained in:
David Guillen Fandos 2021-08-15 22:19:40 +02:00
parent 1b37289890
commit 057b80f8cc
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arm/arm_emit.h
View File

@ -1866,9 +1866,8 @@ u32 execute_store_cpsr_body(u32 _cpsr, u32 store_mask, u32 address)
generate_update_pc(((pc + 2) | 0x01)); \ generate_update_pc(((pc + 2) | 0x01)); \
thumb_generate_load_reg(reg_a1, REG_LR); \ thumb_generate_load_reg(reg_a1, REG_LR); \
thumb_generate_store_reg(reg_a0, REG_LR); \ thumb_generate_store_reg(reg_a0, REG_LR); \
generate_mov(reg_a0, reg_a1); \ generate_add_reg_reg_imm(reg_a0, reg_a1, (offset * 2), 0); \
generate_add_imm(reg_a0, (offset * 2), 0); \ generate_indirect_branch_cycle_update(dual_thumb); \
generate_indirect_branch_cycle_update(thumb); \
} \ } \
#define thumb_bx() \ #define thumb_bx() \

2
arm/arm_stub.S
View File

@ -269,6 +269,7 @@ defsymbl(arm_indirect_branch_dual_arm)
save_flags() save_flags()
tst r0, #0x01 @ check lower bit tst r0, #0x01 @ check lower bit
bne 1f @ if set going to Thumb mode bne 1f @ if set going to Thumb mode
add r0, #2 @ two LSB are cleared after
call_c_function(block_lookup_address_arm) call_c_function(block_lookup_address_arm)
restore_flags() restore_flags()
bx r0 @ keep executing arm code bx r0 @ keep executing arm code
@ -296,6 +297,7 @@ defsymbl(arm_indirect_branch_dual_thumb)
load_registers_arm() @ load in ARM registers load_registers_arm() @ load in ARM registers
bic r1, r1, #0x20 @ clear Thumb mode bic r1, r1, #0x20 @ clear Thumb mode
str r1, [reg_base, #REG_CPSR] @ store flags str r1, [reg_base, #REG_CPSR] @ store flags
add r0, #2 @ two LSB are cleared after
call_c_function(block_lookup_address_arm) call_c_function(block_lookup_address_arm)
restore_flags() restore_flags()
bx r0 bx r0