summaryrefslogtreecommitdiff
path: root/src/analysis
diff options
context:
space:
mode:
authorCyrille Bagard <nocbos@gmail.com>2013-02-24 11:09:36 (GMT)
committerCyrille Bagard <nocbos@gmail.com>2013-02-24 11:09:36 (GMT)
commit02c2cf555953f335a825e34c869c9999668fd42c (patch)
tree59395c04d509f9fae8314d311f6ab90e163df45d /src/analysis
parent34e1a14aced520ba06ee1b81cfd7710e97c1643f (diff)
Refined comparisons decompilation and fixed some bugs.
git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@340 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a
Diffstat (limited to 'src/analysis')
-rwxr-xr-xsrc/analysis/decomp/Makefile.am1
-rw-r--r--src/analysis/decomp/cmerge.c135
-rw-r--r--src/analysis/decomp/cmerge.h37
-rw-r--r--src/analysis/decomp/decompiler.c7
4 files changed, 178 insertions, 2 deletions
diff --git a/src/analysis/decomp/Makefile.am b/src/analysis/decomp/Makefile.am
index 27388d6..0e3ffb4 100755
--- a/src/analysis/decomp/Makefile.am
+++ b/src/analysis/decomp/Makefile.am
@@ -2,6 +2,7 @@
noinst_LTLIBRARIES = libanalysisdecomp.la
libanalysisdecomp_la_SOURCES = \
+ cmerge.h cmerge.c \
decompiler.h decompiler.c \
il.h il.c \
reduce.h reduce.c
diff --git a/src/analysis/decomp/cmerge.c b/src/analysis/decomp/cmerge.c
new file mode 100644
index 0000000..9838531
--- /dev/null
+++ b/src/analysis/decomp/cmerge.c
@@ -0,0 +1,135 @@
+
+/* OpenIDA - Outil d'analyse de fichiers binaires
+ * cmerge.c - fusion des conditions successives
+ *
+ * Copyright (C) 2013 Cyrille Bagard
+ *
+ * This file is part of OpenIDA.
+ *
+ * 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 "cmerge.h"
+
+
+#include "../../decomp/expr/block.h"
+#include "../../decomp/expr/comp.h"
+#include "../../decomp/expr/cond.h"
+#include "../../decomp/instr/ite.h"
+
+
+
+/* Recherche des conditions successives pouvant être fusionnées. */
+static bool track_branch_conditions(GDecInstruction *, GDecInstruction *, DecInstrVisitFlags, void *);
+
+
+
+/******************************************************************************
+* *
+* Paramètres : instr = instruction visitée. *
+* parent = instruction parente. *
+* flags = moments des appels réalisés en retour. *
+* data = adresse non utilisée ici. *
+* *
+* Description : Recherche des conditions successives pouvant être fusionnées.*
+* *
+* Retour : true afin d'aller jusqu'au terme du parcours. *
+* *
+* Remarques : - *
+* *
+******************************************************************************/
+
+static bool track_branch_conditions(GDecInstruction *instr, GDecInstruction *parent, DecInstrVisitFlags flags, void *data)
+{
+ GDecInstruction *true_branch; /* Branche 'vrai' */
+ GDecInstruction *false_branch; /* Branche 'faux' */
+ GDecInstruction *first; /* Première sous-instruction */
+ GCondExpression *sub_cond; /* Expression conditionnelle */
+ GCondExpression *top_cond; /* Expression conditionnelle */
+
+ if (!G_IS_ITE_INSTRUCTION(instr))
+ goto tbc_done;
+
+ g_ite_instruction_get_branches(G_ITE_INSTRUCTION(instr), &true_branch, &false_branch);
+ if (false_branch != NULL) goto tbc_done;
+
+ /* count(block) == 1 */
+
+ first = g_expr_block_get_item(G_EXPR_BLOCK(true_branch), 0);
+ if (!G_IS_ITE_INSTRUCTION(first)) goto tbc_done;
+
+ printf("got one!\n");
+
+ /* Récupération des informations inférieures */
+
+ sub_cond = g_ite_instruction_get_condition(G_ITE_INSTRUCTION(first));
+ g_object_ref(G_OBJECT(sub_cond));
+
+ g_ite_instruction_get_branches(G_ITE_INSTRUCTION(first), &true_branch, &false_branch);
+ if (true_branch != NULL) g_object_ref(G_OBJECT(true_branch));
+ if (false_branch != NULL) g_object_ref(G_OBJECT(false_branch));
+
+ /* Reconstitution d'une nouvelle instruction */
+
+ top_cond = g_ite_instruction_get_condition(G_ITE_INSTRUCTION(instr));
+
+ //g_cond_expression_add_condition(top_cond, sub_cond, COT_AND);
+
+ //g_ite_instruction_set_branches(G_ITE_INSTRUCTION(instr), true_branch, false_branch);
+
+
+
+
+ printf("got one!\n");
+
+ /*
+GDecExpression *g_ite_instruction_get_condition(const GITEInstruction *instr)
+
+
+
+GDecExpression *g_cond_expression_get_expression(const GCondExpression *cond)
+
+
+void g_cond_expression_set_expression(GCondExpression *cond, GDecExpression *exp)
+ */
+
+
+ tbc_done:
+
+ return true;
+
+}
+
+
+/******************************************************************************
+* *
+* Paramètres : instr = instructions à traiter. *
+* *
+* Description : Fusionne les conditions qui s'enchaînent. *
+* *
+* Retour : - *
+* *
+* Remarques : - *
+* *
+******************************************************************************/
+
+void merge_lonely_conditions(GDecInstruction *instr)
+{
+ return;
+
+ g_dec_instruction_visit(instr, (dec_instr_visitor_cb)track_branch_conditions,
+ DVF_EXIT, NULL);
+
+}
diff --git a/src/analysis/decomp/cmerge.h b/src/analysis/decomp/cmerge.h
new file mode 100644
index 0000000..0b556c6
--- /dev/null
+++ b/src/analysis/decomp/cmerge.h
@@ -0,0 +1,37 @@
+
+/* OpenIDA - Outil d'analyse de fichiers binaires
+ * cmerge.h - prototypes pour la fusion des conditions successives
+ *
+ * Copyright (C) 2013 Cyrille Bagard
+ *
+ * This file is part of OpenIDA.
+ *
+ * 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 _ANALYSIS_DECOMP_CMERGE_H
+#define _ANALYSIS_DECOMP_CMERGE_H
+
+
+#include "../../decomp/instruction.h"
+
+
+
+/* Fusionne les conditions qui s'enchaînent. */
+void merge_lonely_conditions(GDecInstruction *);
+
+
+
+#endif /* _ANALYSIS_DECOMP_CMERGE_H */
diff --git a/src/analysis/decomp/decompiler.c b/src/analysis/decomp/decompiler.c
index c36811d..89f9d49 100644
--- a/src/analysis/decomp/decompiler.c
+++ b/src/analysis/decomp/decompiler.c
@@ -32,6 +32,7 @@
#include <i18n.h>
+#include "cmerge.h"
#include "il.h"
#include "reduce.h"
#include "../../decomp/output.h"
@@ -184,7 +185,9 @@ static void prepare_all_routines_for_decomp(const GLoadedBinary *binary, const c
//instr = g_binary_format_decompile_routine(G_BIN_FORMAT(format), routines[i], context);
- reduce_used_variables(dinstrs);
+ //merge_lonely_conditions(dinstrs);
+
+ /////reduce_used_variables(dinstrs);
g_expr_block_set_border_behavior(G_EXPR_BLOCK(dinstrs), BBB_FORCE_ON);
@@ -228,7 +231,7 @@ GCodeBuffer *decompile_all_from_file(const GLoadedBinary *binary, const char *fi
build_decomp_prologue(result, filename);
- prepare_all_routines_for_decomp(binary, filename);
+ //prepare_all_routines_for_decomp(binary, filename);