1 files changed, 51 insertions, 11 deletions
diff --git a/plugins/arm/v7/opdefs/rsc_A88155.d b/plugins/arm/v7/opdefs/rsc_A88155.d
index fc5f8b6..dd8954c 100644
--- a/plugins/arm/v7/opdefs/rsc_A88155.d
+++ b/plugins/arm/v7/opdefs/rsc_A88155.d
@@ -2,7 +2,7 @@
 /* Chrysalide - Outil d'analyse de fichiers binaires
  * ##FILE## - traduction d'instructions ARMv7
  *
- * Copyright (C) 2015 Cyrille Bagard
+ * Copyright (C) 2017 Cyrille Bagard
  *
  *  This file is part of Chrysalide.
  *
@@ -23,27 +23,67 @@
 
 @title RSC (immediate)
 
-@desc Reverse Subtract with Carry (immediate) subtracts a register value and the value of NOT (Carry flag) from an immediate value, and writes the result to the destination register. It can optionally update the condition flags based on the result.
+@id 154
+
+@desc {
+
+	Reverse Subtract with Carry (immediate) subtracts a register value and the value of NOT (Carry flag) from an immediate value, and writes the result to the destination register. It can optionally update the condition flags based on the result.
+
+}
 
 @encoding (A1) {
 
 	@word cond(4) 0 0 1 0 1 1 1 S(1) Rn(4) Rd(4) imm12(12)
 
-	@syntax <reg_D> <reg_N> <imm32>
+	@syntax {
+
+		@assert {
+
+			S == 0
+
+		}
+
+		@conv {
+
+			reg_D = Register(Rd)
+			reg_N = Register(Rn)
+			imm32 = ARMExpandImm(imm12)
+
+		}
+
+		@asm rsc ?reg_D reg_N imm32
 
-	@conv {
+		@rules {
 
-		reg_D = Register(Rd)
-		reg_N = Register(Rn)
-		setflags = (S == '1')
-		imm32 = ARMExpandImm(imm12)
+			check g_arm_instruction_set_cond(cond)
+
+		}
 
 	}
 
-	@rules {
+	@syntax {
+
+		@assert {
+
+			S == 1
+
+		}
+
+		@conv {
+
+			reg_D = Register(Rd)
+			reg_N = Register(Rn)
+			imm32 = ARMExpandImm(imm12)
+
+		}
+
+		@asm rscs ?reg_D reg_N imm32
+
+		@rules {
+
+			check g_arm_instruction_set_cond(cond)
 
-		if (setflags); chk_call ExtendKeyword("s")
-		chk_call StoreCondition(cond)
+		}
 
 	}