From e19f35e7e441770824f1431f9ccfd8543c1f8f3a Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Fri, 7 Feb 2025 18:02:53 -0800 Subject: [PATCH] ARM Debugger: Fix disassembly of ror r0 barrel shift (fixes #3412) --- CHANGES | 1 + src/arm/decoder-arm.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 1f889b14b..3d48660c3 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,6 @@ 0.10.5: (Future) Other fixes: + - ARM Debugger: Fix disassembly of ror r0 barrel shift (fixes mgba.io/i/3412) - FFmpeg: Fix failing to record videos with CRF video (fixes mgba.io/i/3368) - GB Core: Fix cloning savedata when backing file is outdated (fixes mgba.io/i/3388) - GBA Core: Fix booting into BIOS when skip BIOS is enabled diff --git a/src/arm/decoder-arm.c b/src/arm/decoder-arm.c index 73d1717e9..074c04314 100644 --- a/src/arm/decoder-arm.c +++ b/src/arm/decoder-arm.c @@ -36,7 +36,7 @@ #define ADDR_MODE_1_ASR ADDR_MODE_1_SHIFT(ASR) #define ADDR_MODE_1_ROR \ ADDR_MODE_1_SHIFT(ROR) \ - if (!info->op3.shifterImm) { \ + if ((info->operandFormat & ARM_OPERAND_SHIFT_IMMEDIATE_3) && !info->op3.shifterImm) { \ info->op3.shifterOp = ARM_SHIFT_RRX; \ }