From 5477c891c5e235601b00601425df1fa8673a7929 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Wed, 23 Jul 2014 23:12:28 -0700
Subject: [PATCH] Fix cmp and related opcodes in disassembler

---
 src/arm/decoder-arm.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/arm/decoder-arm.c b/src/arm/decoder-arm.c
index 163f35378..ee299369a 100644
--- a/src/arm/decoder-arm.c
+++ b/src/arm/decoder-arm.c
@@ -103,7 +103,9 @@
 		info->affectsCPSR = S; \
 		SHIFTER; \
 		if (SKIPPED == 1) { \
-			info->operandFormat &= ~ARM_OPERAND_1; \
+			info->operandFormat >>= 8; \
+			info->op1 = info->op2; \
+			info->op2 = info->op3; \
 		} else if (SKIPPED == 2) { \
 			info->operandFormat &= ~ARM_OPERAND_2; \
 		} \