Rewritten the whole instruction definition format.

1 files changed, 29 insertions, 15 deletions

diff --git a/plugins/arm/v7/opdefs/ldr_A8865.d b/plugins/arm/v7/opdefs/ldr_A8865.d
index ebb4e09..e94eccb 100644
--- a/plugins/arm/v7/opdefs/ldr_A8865.d
+++ b/plugins/arm/v7/opdefs/ldr_A8865.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,20 +23,30 @@
 
 @title LDR (register, Thumb)
 
-@desc Load Register (register) calculates an address from a base register value and an offset register value, loads a word from memory, and writes it to a register. The offset register value can optionally be shifted. For information about memory accesses, see Memory accesses on page A8-294. The Thumb form of LDR (register) does not support register writeback.
+@id 64
+
+@desc {
+
+	Load Register (register) calculates an address from a base register value and an offset register value, loads a word from memory, and writes it to a register. The offset register value can optionally be shifted. For information about memory accesses, see Memory accesses on page A8-294. The Thumb form of LDR (register) does not support register writeback.
+
+}
 
 @encoding (t1) {
 
 	@half 0 1 0 1 1 0 0 Rm(3) Rn(3) Rt(3)
 
-	@syntax <reg_T> <mem_access>
+	@syntax {
 
-	@conv {
+		@conv {
 
-		reg_T = Register(Rt)
-		reg_N = Register(Rn)
-		reg_M = Register(Rm)
-		mem_access = MakeMemoryAccess(reg_N, reg_M, NULL, true, false, false)
+			reg_T = Register(Rt)
+			reg_N = Register(Rn)
+			reg_M = Register(Rm)
+			maccess = MemAccessOffset(reg_N, reg_M)
+
+		}
+
+		@asm ldr reg_T maccess
 
 	}
 
@@ -46,15 +56,19 @@
 
 	@word 1 1 1 1 1 0 0 0 0 1 0 1 Rn(4) Rt(4) 0 0 0 0 0 0 imm2(2) Rm(4)
 
-	@syntax ".W" <reg_T> <mem_access>
+	@syntax {
+
+		@conv {
+
+			reg_T = Register(Rt)
+			reg_N = Register(Rn)
+			reg_M = Register(Rm)
+			shift = FixedShift(SRType_LSL, imm2)
+			maccess = MemAccessOffsetExtended(reg_N, reg_M, shift)
 
-	@conv {
+		}
 
-		reg_T = Register(Rt)
-		reg_N = Register(Rn)
-		reg_M = Register(Rm)
-		shift = DecodeImmShift(0, imm2)
-		mem_access = MakeMemoryAccess(reg_N, reg_M, shift, true, false, false)
+		@asm ldr.w reg_T maccess
 
 	}