aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornotaz2013-04-03 03:12:29 +0300
committernotaz2013-04-03 03:12:29 +0300
commit98175912f3cf2989569feca57f71aa98889f2786 (patch)
treee34a4fc5ddb1bc22a0d091385dfb56c726fafe30
parent1e6bc10a457d20f63a716bc5ae7298f4e12429e7 (diff)
parent10858959854a4e0864cad8629756216c4b2d4310 (diff)
downloadpcsx_rearmed-98175912f3cf2989569feca57f71aa98889f2786.tar.gz
pcsx_rearmed-98175912f3cf2989569feca57f71aa98889f2786.tar.bz2
pcsx_rearmed-98175912f3cf2989569feca57f71aa98889f2786.zip
Merge branch 'master' into libretro
-rw-r--r--libpcsxcore/new_dynarec/linkage_arm.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpcsxcore/new_dynarec/linkage_arm.S b/libpcsxcore/new_dynarec/linkage_arm.S
index d79b09d..942b492 100644
--- a/libpcsxcore/new_dynarec/linkage_arm.S
+++ b/libpcsxcore/new_dynarec/linkage_arm.S
@@ -694,7 +694,7 @@ FUNCTION(jump_handler_read8):
FUNCTION(jump_handler_read16):
add r1, #0x1000/4*4 @ shift to r16 part
- pcsx_read_mem ldrbcc, 1
+ pcsx_read_mem ldrhcc, 1
FUNCTION(jump_handler_read32):
pcsx_read_mem ldrcc, 2