Added some development assertions and avoided to load code twice.

git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@464 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a

4 files changed, 296 insertions, 0 deletions

diff --git a/src/arch/arm/v7/opdefs/Makefile.am b/src/arch/arm/v7/opdefs/Makefile.am
index 36509b4..45d4932 100644
--- a/src/arch/arm/v7/opdefs/Makefile.am
+++ b/src/arch/arm/v7/opdefs/Makefile.am
@@ -34,6 +34,7 @@ ARMV7_DEFS = 							\
 	adr_A8812.d							\
 	and_A8813.d							\
 	and_A8814.d							\
+	asr_A8816.d							\
 	b_A8818.d							\
 	bic_A8821.d							\
 	bic_A8822.d							\
@@ -79,6 +80,7 @@ ARMV7_DEFS = 							\
 	str_A88203.d						\
 	str_A88204.d						\
 	strb_A88206.d						\
+	sub_A88221.d						\
 	sub_A88222.d						\
 	sub_A88223.d						\
 	sub_A88225.d						\
@@ -89,6 +91,7 @@ ARMV7_DEFS = 							\
 	umaal_A88255.d						\
 	umlal_A88256.d						\
 	umull_A88257.d						\
+	uxtb_A88274.d						\
 	yield_A88426.d						\
 	subs_B9320.d
 
diff --git a/src/arch/arm/v7/opdefs/asr_A8816.d b/src/arch/arm/v7/opdefs/asr_A8816.d
new file mode 100644
index 0000000..7c1fda6
--- /dev/null
+++ b/src/arch/arm/v7/opdefs/asr_A8816.d
@@ -0,0 +1,93 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * ##FILE## - traduction d'instructions ARMv7
+ *
+ * Copyright (C) 2014 Cyrille Bagard
+ *
+ *  This file is part of Chrysalide.
+ *
+ *  Chrysalide is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Chrysalide is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+@title ASR (immediate)
+
+@encoding(t1) {
+
+    @half 0 0 0 1 0 imm5(5) Rm(3) Rd(3)
+
+    @syntax <Rd> <Rm> <#imm>
+
+    @conv {
+
+        Rd = Register(Rd)
+        Rm = Register(Rm)
+        imm = FixedShift(2, imm5)
+
+    }
+
+    @rules {
+
+        //setflags = !InITBlock();
+
+    }
+
+}
+
+@encoding(T2) {
+
+    @word 1 1 1 0 1 0 1 0 0 1 0 S(1) 1 1 1 1 0 imm3(3) Rd(4) imm2(2) 1 0 Rm(4)
+
+    @syntax {S} ".W" <Rd> <Rm> <#imm>
+
+    @conv {
+
+        S = SetFlags(S)
+        Rd = Register(Rd)
+        Rm = Register(Rm)
+        imm = FixedShift(2, imm3:imm2)
+
+    }
+
+    @rules {
+
+        //if d IN {13,15} || m IN {13,15} then UNPREDICTABLE;
+
+    }
+
+}
+
+@encoding(A1) {
+
+    @word cond(4) 0 0 0 1 1 0 1 S(1) 0 0 0 0 Rd(4) imm5(5) 1 0 0 Rm(4)
+
+    @syntax {S} {c} <Rd> <Rm> <#imm>
+
+    @conv {
+
+        S = SetFlags(S)
+        c = Condition(cond)
+        Rd = Register(Rd)
+        Rm = Register(Rm)
+        imm = FixedShift(2, imm5)
+
+    }
+
+    @rules {
+
+        //if Rd == '1111' && S == '1' then SEE SUBS PC, LR and related instructions;
+
+    }
+
+}
diff --git a/src/arch/arm/v7/opdefs/sub_A88221.d b/src/arch/arm/v7/opdefs/sub_A88221.d
new file mode 100644
index 0000000..0ef0e11
--- /dev/null
+++ b/src/arch/arm/v7/opdefs/sub_A88221.d
@@ -0,0 +1,116 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * ##FILE## - traduction d'instructions ARMv7
+ *
+ * Copyright (C) 2014 Cyrille Bagard
+ *
+ *  This file is part of Chrysalide.
+ *
+ *  Chrysalide is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Chrysalide is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+@title SUB (immediate, Thumb)
+
+@encoding(t1) {
+
+    @half 0 0 0 1 1 1 1 imm3(3) Rn(3) Rd(3)
+
+    @syntax <Rd> <Rn> <const>
+
+    @conv {
+
+        Rd = Register(Rd)
+        Rn = Register(Rn)
+        const = ZeroExtend(imm3, 3, 32);
+
+    }
+
+    @rules {
+
+        //setflags = !InITBlock();
+
+    }
+
+}
+
+@encoding(t2) {
+
+    @half 0 0 1 1 1 Rdn(3) imm8(8)
+
+    @syntax <Rdn> <const>
+
+    @conv {
+
+        Rdn = Register(Rdn)
+        const = ZeroExtend(imm8, 8, 32);
+
+    }
+
+    @rules {
+
+        //setflags = !InITBlock();
+
+    }
+
+}
+
+@encoding(T3) {
+
+    @word 1 1 1 1 0 i(1) 0 1 1 0 1 S(1) Rn(4) 0 imm3(3) Rd(4) imm8(8)
+
+    @syntax {S} ".W" <Rd> <Rn> <const>
+
+    @conv {
+
+        S = SetFlags(S)
+        Rd = Register(Rd)
+        Rn = Register(Rn)
+        const = ThumbExpandImm_C(i:imm3:imm8, i)
+
+    }
+
+    @rules {
+
+        //if Rd == '1111' && S == '1' then SEE CMP (immediate);
+        //if Rn == '1101' then SEE SUB (SP minus immediate);
+        //if d == 13 || (d == 15 && S == '0') || n == 15 then UNPREDICTABLE;
+
+    }
+
+}
+
+@encoding(T4) {
+
+    @word 1 1 1 1 0 i(1) 1 0 1 0 1 0 Rn(4) 0 imm3(3) Rd(4) imm8(8)
+
+    @syntax "subw" <Rd> <Rn> <const>
+
+    @conv {
+
+        Rd = Register(Rd)
+        Rn = Register(Rn)
+        const = ZeroExtend((i:imm3:imm8, 12, 32)
+
+    }
+
+    @rules {
+
+        //if Rn == '1111' then SEE ADR;
+        //if Rn == '1101' then SEE SUB (SP minus immediate);
+        //if d IN {13,15} then UNPREDICTABLE;
+
+    }
+
+}
diff --git a/src/arch/arm/v7/opdefs/uxtb_A88274.d b/src/arch/arm/v7/opdefs/uxtb_A88274.d
new file mode 100644
index 0000000..97b17de
--- /dev/null
+++ b/src/arch/arm/v7/opdefs/uxtb_A88274.d
@@ -0,0 +1,84 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * ##FILE## - traduction d'instructions ARMv7
+ *
+ * Copyright (C) 2014 Cyrille Bagard
+ *
+ *  This file is part of Chrysalide.
+ *
+ *  Chrysalide is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  Chrysalide is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+@title UXTB
+
+@encoding(t1) {
+
+    @half 1 0 1 1 0 0 1 0 1 1 Rm(3) Rd(3)
+
+    @syntax <Rd> <Rm>
+
+    @conv {
+
+        Rd = Register(Rd)
+        Rm = Register(Rm)
+
+    }
+
+}
+
+@encoding(T2) {
+
+    @word 1 1 1 1 1 0 1 0 0 1 0 1 1 1 1 1 1 1 1 1 Rd(4) 1 0 rotate(2) Rm(4)
+
+    @syntax <Rd> <Rm> <?rotation>
+
+    @conv {
+
+        Rd = Register(Rd)
+        Rm = Register(Rm)
+        rotation = BuildRotation(rotate:'000')
+
+    }
+
+    @rules {
+
+        //if d IN {13,15} || m IN {13,15} then UNPREDICTABLE;
+
+    }
+
+}
+
+@encoding(A1) {
+
+    @word cond(4) 0 1 1 0 1 1 1 0 1 1 1 1 Rd(4) rotate(2) 0 0 0 1 1 1 Rm(4)
+
+    @syntax {c} <Rd> <Rm> <?rotation>
+
+    @conv {
+
+        c = Condition(cond)
+        Rd = Register(Rd)
+        Rm = Register(Rm)
+        rotation = BuildRotation(rotate:'000')
+
+    }
+
+    @rules {
+
+        //if d == 15 || m == 15 then UNPREDICTABLE;
+
+    }
+
+}