all repos — mgba @ 47eabe1bc78729082e2b65235e99940a51b7ccc7

mGBA Game Boy Advance Emulator

ARM7: Fix instruction decoding of Thumb shifts
Jeffrey Pfau jeffrey@endrift.com
Thu, 08 Oct 2015 19:52:38 -0700
commit

47eabe1bc78729082e2b65235e99940a51b7ccc7

parent

3f36f3d88eff2f62c1e571943f6cb698207788c4

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

jump to
M CHANGESCHANGES

@@ -18,6 +18,7 @@ - GBA Video: Fix OBJ semitransparency improperly interacting with other blending ops

- GBA: Fix autodetect problems with some bad dumps of Super Mario Advance 2 - GBA Memory: Fix bad BIOS Load16 on big endian - GBA Memory: Fix bad Load8 on big endian + - ARM7: Fix instruction decoding of Thumb shifts Misc: - Qt: Window size command line options are now supported - Qt: Increase usability of key mapper
M src/arm/decoder-thumb.csrc/arm/decoder-thumb.c

@@ -18,7 +18,7 @@ }

#define DEFINE_IMMEDIATE_5_DECODER_DATA_THUMB(NAME, MNEMONIC) \ DEFINE_THUMB_DECODER(NAME, MNEMONIC, \ - info->op3.immediate = (opcode >> 6) & 0x0007; \ + info->op3.immediate = (opcode >> 6) & 0x001F; \ info->op1.reg = opcode & 0x0007; \ info->op2.reg = (opcode >> 3) & 0x0007; \ info->affectsCPSR = 1; \