1 files changed, 22 insertions, 34 deletions
diff --git a/src/arch/arm/v7/opdefs/ldr_A8865.d b/src/arch/arm/v7/opdefs/ldr_A8865.d
index b6a0126..ebb4e09 100644
--- a/src/arch/arm/v7/opdefs/ldr_A8865.d
+++ b/src/arch/arm/v7/opdefs/ldr_A8865.d
@@ -2,7 +2,7 @@
 /* Chrysalide - Outil d'analyse de fichiers binaires
  * ##FILE## - traduction d'instructions ARMv7
  *
- * Copyright (C) 2014 Cyrille Bagard
+ * Copyright (C) 2015 Cyrille Bagard
  *
  *  This file is part of Chrysalide.
  *
@@ -23,52 +23,40 @@
 
 @title LDR (register, Thumb)
 
-@encoding(t1) {
+@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.
 
-    @half 0 1 0 1 1 0 0 Rm(3) Rn(3) Rt(3)
+@encoding (t1) {
 
-    @syntax <Rgt> <access>
+	@half 0 1 0 1 1 0 0 Rm(3) Rn(3) Rt(3)
 
-    @conv {
+	@syntax <reg_T> <mem_access>
 
-        Rgt = Register(Rt)
-        Rgn = Register(Rn)
-        Rgm = Register(Rm)
-        access = _MakeMemoryAccess(Rgn, Rgm, 0)
+	@conv {
 
-    }
+		reg_T = Register(Rt)
+		reg_N = Register(Rn)
+		reg_M = Register(Rm)
+		mem_access = MakeMemoryAccess(reg_N, reg_M, NULL, true, false, false)
 
-    @rules {
-
-        //if CurrentInstrSet() == InstrSet_ThumbEE then SEE "Modified operation in ThumbEE";
-
-    }
+	}
 
 }
 
-@encoding(T2) {
-
-    @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)
+@encoding (T2) {
 
-    @syntax "ldr.W" <Rgt>, <access>
+	@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)
 
-    @conv {
+	@syntax ".W" <reg_T> <mem_access>
 
-        Rgt = Register(Rt)
-        Rgn = Register(Rn)
-        Rgm = Register(Rm)
-        shift = DecodeImmShift(0, imm2)
-        access = MakeShiftedMemoryAccess(Rgn, Rgm, shift, 0)
+	@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)
 
-    @rules {
-
-        //if Rn == '1111' then SEE LDR (literal);
-        //if m IN {13,15} then UNPREDICTABLE;
-        //if t == 15 && InITBlock() && !LastInITBlock() then UNPREDICTABLE;
-        if (Rt == '1111'); chk_call SetInsFlag(AIF_RETURN_POINT)
-
-    }
+	}
 
 }
+