aboutsummaryrefslogtreecommitdiff
path: root/src/ARMInterpreter_LoadStore.cpp
diff options
context:
space:
mode:
authorStapleButter <thetotalworm@gmail.com>2017-06-13 17:44:35 +0200
committerStapleButter <thetotalworm@gmail.com>2017-06-13 17:44:35 +0200
commit49f8aec656d9570ab21bfab00a81bb3bb83ca4d6 (patch)
tree391fd764f3f4ec95b15e2b793be57ceda3810f58 /src/ARMInterpreter_LoadStore.cpp
parent3499949129f50042190e38687a7faec773acbab8 (diff)
fix some shit
Diffstat (limited to 'src/ARMInterpreter_LoadStore.cpp')
-rw-r--r--src/ARMInterpreter_LoadStore.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ARMInterpreter_LoadStore.cpp b/src/ARMInterpreter_LoadStore.cpp
index 23e6b62..7edf88c 100644
--- a/src/ARMInterpreter_LoadStore.cpp
+++ b/src/ARMInterpreter_LoadStore.cpp
@@ -220,7 +220,7 @@ A_IMPLEMENT_WB_LDRSTR(LDRB)
// TODO: CHECK LDRD/STRD TIMINGS!!
#define A_LDRD \
- if (cpu->Num != 0) return A_UNK(cpu); \
+ if (cpu->Num != 0) return; \
offset += cpu->R[(cpu->CurInstr>>16) & 0xF]; \
if (cpu->CurInstr & (1<<21)) cpu->R[(cpu->CurInstr>>16) & 0xF] = offset; \
cpu->Cycles += 1; \
@@ -229,7 +229,7 @@ A_IMPLEMENT_WB_LDRSTR(LDRB)
cpu->R[r+1] = cpu->DataRead32(offset+4); \
#define A_LDRD_POST \
- if (cpu->Num != 0) return A_UNK(cpu); \
+ if (cpu->Num != 0) return; \
u32 addr = cpu->R[(cpu->CurInstr>>16) & 0xF]; \
cpu->R[(cpu->CurInstr>>16) & 0xF] += offset; \
cpu->Cycles += 1; \
@@ -238,7 +238,7 @@ A_IMPLEMENT_WB_LDRSTR(LDRB)
cpu->R[r+1] = cpu->DataRead32(addr+4); \
#define A_STRD \
- if (cpu->Num != 0) return A_UNK(cpu); \
+ if (cpu->Num != 0) return; \
offset += cpu->R[(cpu->CurInstr>>16) & 0xF]; \
if (cpu->CurInstr & (1<<21)) cpu->R[(cpu->CurInstr>>16) & 0xF] = offset; \
u32 r = (cpu->CurInstr>>12) & 0xF; \
@@ -246,7 +246,7 @@ A_IMPLEMENT_WB_LDRSTR(LDRB)
cpu->DataWrite32(offset+4, cpu->R[r+1]); \
#define A_STRD_POST \
- if (cpu->Num != 0) return A_UNK(cpu); \
+ if (cpu->Num != 0) return; \
cpu->R[(cpu->CurInstr>>16) & 0xF] += offset; \
u32 r = (cpu->CurInstr>>12) & 0xF; \
cpu->DataWrite32(offset , cpu->R[r ]); \