Rewritten the whole instruction definition format.

1 files changed, 53 insertions, 18 deletions

diff --git a/plugins/arm/v7/opdefs/mov_A88103.d b/plugins/arm/v7/opdefs/mov_A88103.d
index cd3d75a..8a25367 100644
--- a/plugins/arm/v7/opdefs/mov_A88103.d
+++ b/plugins/arm/v7/opdefs/mov_A88103.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,18 +23,28 @@
 
 @title MOV (register, Thumb)
 
-@desc Move (register) copies a value from a register to the destination register. It can optionally update the condition flags based on the value.
+@id 102
+
+@desc {
+
+	Move (register) copies a value from a register to the destination register. It can optionally update the condition flags based on the value.
+
+}
 
 @encoding (t1) {
 
 	@half 0 1 0 0 0 1 1 0 D(1) Rm(4) Rd(3)
 
-	@syntax <reg_D> <reg_M>
+	@syntax {
+
+		@conv {
 
-	@conv {
+			reg_D = Register(D:Rd)
+			reg_M = Register(Rm)
 
-		reg_D = Register(D:Rd)
-		reg_M = Register(Rm)
+		}
+
+		@asm mov reg_D reg_M
 
 	}
 
@@ -44,12 +54,16 @@
 
 	@half 0 0 0 0 0 0 0 0 0 0 Rm(3) Rd(3)
 
-	@syntax "movs" <reg_D> <reg_M>
+	@syntax {
+
+		@conv {
+
+			reg_D = Register(Rd)
+			reg_M = Register(Rm)
 
-	@conv {
+		}
 
-		reg_D = Register(Rd)
-		reg_M = Register(Rm)
+		@asm movs reg_D reg_M
 
 	}
 
@@ -59,20 +73,41 @@
 
 	@word 1 1 1 0 1 0 1 0 0 1 0 S(1) 1 1 1 1 0 0 0 0 Rd(4) 0 0 0 0 Rm(4)
 
-	@syntax <reg_D> <reg_M>
+	@syntax {
+
+		@assert {
+
+			S == 0
 
-	@conv {
+		}
 
-		reg_D = Register(Rd)
-		reg_M = Register(Rm)
-		setflags = (S == '1')
+		@conv {
+
+			reg_D = Register(Rd)
+			reg_M = Register(Rm)
+
+		}
+
+		@asm mov.w reg_D reg_M
 
 	}
 
-	@rules {
+	@syntax {
+
+		@assert {
+
+			S == 1
+
+		}
+
+		@conv {
+
+			reg_D = Register(Rd)
+			reg_M = Register(Rm)
+
+		}
 
-		if (setflags); chk_call ExtendKeyword("s")
-		chk_call ExtendKeyword(".w")
+		@asm movs.w reg_D reg_M
 
 	}