all repos — mgba @ 293831e3bf85da749dea26ab0382cd8c866d5a41

mGBA Game Boy Advance Emulator

ARM: Fix some decoder errors
Jeffrey Pfau jeffrey@endrift.com
Sat, 10 Jan 2015 14:19:05 -0800
commit

293831e3bf85da749dea26ab0382cd8c866d5a41

parent

7a3db31eb2c58563184fe4e4a0806dd565d98b8c

1 files changed, 4 insertions(+), 4 deletions(-)

jump to
M src/arm/decoder-arm.c → src/arm/decoder-arm.c 
@@ -213,7 +213,6 @@ ARM_MEMORY_POST_INCREMENT | \
 		ARM_MEMORY_WRITEBACK, \
 		ADDRESSING_MODE, CYCLES, TYPE) \
 	DEFINE_LOAD_STORE_DECODER_EX_ARM(NAME ## P, MNEMONIC, \
-		ARM_MEMORY_PRE_INCREMENT | \
 		ARM_MEMORY_OFFSET_SUBTRACT, \
 		ADDRESSING_MODE, CYCLES, TYPE) \
 	DEFINE_LOAD_STORE_DECODER_EX_ARM(NAME ## PW, MNEMONIC, \

@@ -222,10 +221,9 @@ ARM_MEMORY_WRITEBACK | \
 		ARM_MEMORY_OFFSET_SUBTRACT, \
 		ADDRESSING_MODE, CYCLES, TYPE) \
 	DEFINE_LOAD_STORE_DECODER_EX_ARM(NAME ## PU, MNEMONIC, \
-		ARM_MEMORY_PRE_INCREMENT, \
+		0, \
 		ADDRESSING_MODE, CYCLES, TYPE) \
 	DEFINE_LOAD_STORE_DECODER_EX_ARM(NAME ## PUW, MNEMONIC, \
-		ARM_MEMORY_PRE_INCREMENT | \
 		ARM_MEMORY_WRITEBACK, \
 		ADDRESSING_MODE, CYCLES, TYPE)
 

@@ -243,10 +241,12 @@
 #define DEFINE_LOAD_STORE_T_DECODER_SET_ARM(NAME, MNEMONIC, ADDRESSING_MODE, CYCLES, TYPE) \
 	DEFINE_LOAD_STORE_DECODER_EX_ARM(NAME, MNEMONIC, \
 		ARM_MEMORY_POST_INCREMENT | \
+		ARM_MEMORY_WRITEBACK | \
 		ARM_MEMORY_OFFSET_SUBTRACT, \
 		ADDRESSING_MODE, CYCLES, TYPE) \
 	DEFINE_LOAD_STORE_DECODER_EX_ARM(NAME ## U, MNEMONIC, \
-		ARM_MEMORY_POST_INCREMENT, \
+		ARM_MEMORY_POST_INCREMENT | \
+		ARM_MEMORY_WRITEBACK, \
 		ADDRESSING_MODE, CYCLES, TYPE)
 
 #define DEFINE_LOAD_STORE_T_DECODER_ARM(NAME, MNEMONIC, CYCLES, TYPE) \