summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/arm/Makefile.am1
-rw-r--r--src/arch/arm/instruction.c1
-rw-r--r--src/arch/arm/link.c65
-rw-r--r--src/arch/arm/link.h39
-rw-r--r--src/arch/arm/v7/opdefs/Makefile.am2
-rw-r--r--src/arch/arm/v7/opdefs/b_A8818.d10
6 files changed, 112 insertions, 6 deletions
diff --git a/src/arch/arm/Makefile.am b/src/arch/arm/Makefile.am
index 0fde813..c0bbdf7 100644
--- a/src/arch/arm/Makefile.am
+++ b/src/arch/arm/Makefile.am
@@ -7,6 +7,7 @@ libarcharm_la_SOURCES = \
context.h context.c \
instruction-int.h \
instruction.h instruction.c \
+ link.h link.c \
processor.h processor.c \
register-int.h \
register.h register.c
diff --git a/src/arch/arm/instruction.c b/src/arch/arm/instruction.c
index 6ce115c..47c9b4b 100644
--- a/src/arch/arm/instruction.c
+++ b/src/arch/arm/instruction.c
@@ -95,6 +95,7 @@ static void g_arm_instruction_class_init(GArmInstructionClass *klass)
static void g_arm_instruction_init(GArmInstruction *instr)
{
+ instr->cond = ACC_AL;
}
diff --git a/src/arch/arm/link.c b/src/arch/arm/link.c
new file mode 100644
index 0000000..c0f1f54
--- /dev/null
+++ b/src/arch/arm/link.c
@@ -0,0 +1,65 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * link.c - édition des liens après la phase de désassemblage ARM
+ *
+ * Copyright (C) 2015 Cyrille Bagard
+ *
+ * This file is part of Chrysalide.
+ *
+ * OpenIDA 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.
+ *
+ * OpenIDA 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/>.
+ */
+
+
+#include "link.h"
+
+
+#include "cond.h"
+#include "instruction.h"
+#include "../link.h"
+
+
+
+/******************************************************************************
+* *
+* Paramètres : instr = instruction ARM à traiter. *
+* proc = représentation de l'architecture utilisée. *
+* context = contexte associé à la phase de désassemblage. *
+* format = acès aux données du binaire d'origine. *
+* *
+* Description : Etablit un lien conditionnel selon une instruction donnée. *
+* *
+* Retour : - *
+* *
+* Remarques : - *
+* *
+******************************************************************************/
+
+void handle_arm_conditional_branch_as_link(GArchInstruction *instr, GArchProcessor *proc, GProcContext *context, GBinFormat *format)
+{
+ switch (g_arm_instruction_get_cond(G_ARM_INSTRUCTION(instr)))
+ {
+ case ACC_AL:
+ handle_jump_as_link(instr, proc, context, format);
+ break;
+
+ case ACC_NV:
+ break;
+
+ default:
+ handle_branch_if_true_as_link(instr, proc, context, format);
+ break;
+
+ }
+
+}
diff --git a/src/arch/arm/link.h b/src/arch/arm/link.h
new file mode 100644
index 0000000..7529dc4
--- /dev/null
+++ b/src/arch/arm/link.h
@@ -0,0 +1,39 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * link.h - prototypes pour l'édition des liens après la phase de désassemblage ARM
+ *
+ * Copyright (C) 2015 Cyrille Bagard
+ *
+ * This file is part of Chrysalide.
+ *
+ * OpenIDA 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.
+ *
+ * OpenIDA 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/>.
+ */
+
+
+#ifndef _ARCH_ARM_LINK_H
+#define _ARCH_ARM_LINK_H
+
+
+#include "../instruction.h"
+#include "../processor.h"
+#include "../../format/format.h"
+
+
+
+/* Etablit un lien conditionnel selon une instruction donnée. */
+void handle_arm_conditional_branch_as_link(GArchInstruction *, GArchProcessor *, GProcContext *, GBinFormat *);
+
+
+
+#endif /* _ARCH_ARM_LINK_H */
diff --git a/src/arch/arm/v7/opdefs/Makefile.am b/src/arch/arm/v7/opdefs/Makefile.am
index b95b588..b897f1d 100644
--- a/src/arch/arm/v7/opdefs/Makefile.am
+++ b/src/arch/arm/v7/opdefs/Makefile.am
@@ -106,7 +106,7 @@ fmk.done: $(ARMV7_DEFS)
fix_includes_in_c_templates:
@for f in `find .gen/ -name '*tmpl.c'`; do \
if grep -q '##INCLUDES##' $$f; then \
- $(fix_verbose)sed -i 's/##INCLUDES##/\n#include "..\/helpers.h"\n#include "..\/instruction.h"\n#include "..\/fetch.h"\n#include "..\/post.h"\n#include "..\/..\/instruction.h"\n#include "..\/..\/..\/link.h"\n#include "..\/..\/..\/..\/common\/bconst.h"\n\n/' $$f; \
+ $(fix_verbose)sed -i 's/##INCLUDES##/\n#include "..\/helpers.h"\n#include "..\/instruction.h"\n#include "..\/fetch.h"\n#include "..\/post.h"\n#include "..\/..\/instruction.h"\n#include "..\/..\/link.h"\n#include "..\/..\/..\/link.h"\n#include "..\/..\/..\/..\/common\/bconst.h"\n\n/' $$f; \
fi; \
done
diff --git a/src/arch/arm/v7/opdefs/b_A8818.d b/src/arch/arm/v7/opdefs/b_A8818.d
index a275177..f06367b 100644
--- a/src/arch/arm/v7/opdefs/b_A8818.d
+++ b/src/arch/arm/v7/opdefs/b_A8818.d
@@ -39,7 +39,7 @@
@hooks {
fetch = help_fetching_with_instruction_b_from_thumb
- link = handle_branch_if_true_as_link
+ link = handle_arm_conditional_branch_as_link
post = post_process_branch_instructions
}
@@ -69,7 +69,7 @@
@hooks {
fetch = help_fetching_with_instruction_b_from_thumb
- link = handle_branch_if_true_as_link
+ link = handle_arm_conditional_branch_as_link
post = post_process_branch_instructions
}
@@ -99,7 +99,7 @@
@hooks {
fetch = help_fetching_with_instruction_b_from_thumb
- link = handle_branch_if_true_as_link
+ link = handle_arm_conditional_branch_as_link
post = post_process_branch_instructions
}
@@ -131,7 +131,7 @@
@hooks {
fetch = help_fetching_with_instruction_b_from_thumb
- link = handle_branch_if_true_as_link
+ link = handle_arm_conditional_branch_as_link
post = post_process_branch_instructions
}
@@ -161,7 +161,7 @@
@hooks {
fetch = help_fetching_with_instruction_b_from_arm
- link = handle_branch_if_true_as_link
+ link = handle_arm_conditional_branch_as_link
post = post_process_branch_instructions
}
generated by cgit v0.11.2-87-g4458 at 2024-11-04 22:00:37 (GMT)