summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorneonloop2021-07-13 18:35:17 +0000
committerneonloop2021-07-13 18:35:17 +0000
commit8c8484e55fffa79c903c95c41a6794fca40a723b (patch)
treed2402c9a4d88a2afb0c89110a2f5f4231ffc3d92
parente774285eb8d6401870df282cb8d4e70612199eb0 (diff)
parent0ca87a4807b4d26baef3b7813e1b948b88dddf79 (diff)
downloadpicogpsp-8c8484e55fffa79c903c95c41a6794fca40a723b.tar.gz
picogpsp-8c8484e55fffa79c903c95c41a6794fca40a723b.tar.bz2
picogpsp-8c8484e55fffa79c903c95c41a6794fca40a723b.zip
Merge remote-tracking branch 'libretro/master' into pico-fe
-rw-r--r--cpu_threaded.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/cpu_threaded.c b/cpu_threaded.c
index ad2c098..148fd78 100644
--- a/cpu_threaded.c
+++ b/cpu_threaded.c
@@ -3154,6 +3154,12 @@ s32 translate_block_arm(u32 pc, translation_region_type
generate_cycle_update();
}
}
+
+ /* This can happen if the last instruction is *not* inconditional */
+ if ((last_condition & 0x0F) != 0x0E) {
+ generate_branch_patch_conditional(backpatch_address, translation_ptr);
+ }
+
for(i = 0; i < translation_gate_targets; i++)
{
if(pc == translation_gate_target_pc[i])