summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog11
-rw-r--r--src/arch/arm/v7/opcodes/opcodes_tmp_arm.h1
-rw-r--r--src/arch/arm/v7/opdefs/Makefile.am1
-rw-r--r--src/arch/arm/v7/opdefs/pop_A88132.d68
4 files changed, 80 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ca48b3b..11b825a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+14-12-10 Cyrille Bagard <nocbos@gmail.com>
+
+ * src/arch/arm/v7/opcodes/opcodes_tmp_arm.h:
+ Update missing prototypes.
+
+ * src/arch/arm/v7/opdefs/Makefile.am:
+ Add a new definition to ARMV7_DEFS.
+
+ * src/arch/arm/v7/opdefs/pop_A88132.d:
+ New entry: support a new ARMv7 instruction.
+
14-12-09 Cyrille Bagard <nocbos@gmail.com>
* src/arch/arm/v7/helpers.h:
diff --git a/src/arch/arm/v7/opcodes/opcodes_tmp_arm.h b/src/arch/arm/v7/opcodes/opcodes_tmp_arm.h
index 612b45e..666ca71 100644
--- a/src/arch/arm/v7/opcodes/opcodes_tmp_arm.h
+++ b/src/arch/arm/v7/opcodes/opcodes_tmp_arm.h
@@ -10,7 +10,6 @@
#define armv7_read_arm_instr_ldm_user_registers(r) NULL
#define armv7_read_arm_instr_lsr_immediate(r) NULL
#define armv7_read_arm_instr_movt(r) NULL
-#define armv7_read_arm_instr_pop_arm(r) NULL
#define armv7_read_arm_instr_ror_immediate(r) NULL
#define armv7_read_arm_instr_rrx(r) NULL
#define armv7_read_arm_instr_stmda_stmed(r) NULL
diff --git a/src/arch/arm/v7/opdefs/Makefile.am b/src/arch/arm/v7/opdefs/Makefile.am
index a24e706..4330d36 100644
--- a/src/arch/arm/v7/opdefs/Makefile.am
+++ b/src/arch/arm/v7/opdefs/Makefile.am
@@ -58,6 +58,7 @@ ARMV7_DEFS = \
orr_A88122.d \
orr_A88123.d \
pop_A88131.d \
+ pop_A88132.d \
push_A88133.d \
rsb_A88152.d \
rsb_A88153.d \
diff --git a/src/arch/arm/v7/opdefs/pop_A88132.d b/src/arch/arm/v7/opdefs/pop_A88132.d
new file mode 100644
index 0000000..0c6c1b0
--- /dev/null
+++ b/src/arch/arm/v7/opdefs/pop_A88132.d
@@ -0,0 +1,68 @@
+
+/* 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 POP (ARM)
+
+@encoding(A1) {
+
+ @word cond(4) 1 0 0 0 1 0 1 1 1 1 0 1 register_list(16)
+
+ @syntax {c} <registers>
+
+ @conv {
+
+ c = Condition(cond)
+ registers = RegistersList(register_list)
+
+ }
+
+ @rules {
+
+ //if BitCount(register_list) < 2 then SEE LDM / LDMIA / LDMFD;
+ //if registers<13> == '1' && ArchVersion() >= 7 then UNPREDICTABLE;
+
+ }
+
+}
+
+@encoding(A2) {
+
+ @word cond(4) 0 1 0 0 1 0 0 1 1 1 0 1 Rt(4) 0 0 0 0 0 0 0 0 0 1 0 0
+
+ @syntax {c} <registers>
+
+ @conv {
+
+ c = Condition(cond)
+ Rgt = Register(Rt)
+ registers = ListFromRegister(Rgt)
+
+ }
+
+ @rules {
+
+ //if t == 13 then UNPREDICTABLE;
+
+ }
+
+}