diff options
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/dalvik/Makefile.am | 1 | ||||
| -rw-r--r-- | src/arch/dalvik/dop_array.c | 2 | ||||
| -rw-r--r-- | src/arch/dalvik/dop_if.c | 95 | ||||
| -rw-r--r-- | src/arch/dalvik/instruction.c | 12 | ||||
| -rw-r--r-- | src/arch/dalvik/translate.h | 3 |
5 files changed, 106 insertions, 7 deletions
diff --git a/src/arch/dalvik/Makefile.am b/src/arch/dalvik/Makefile.am index 3c58a0e..fbd041d 100644 --- a/src/arch/dalvik/Makefile.am +++ b/src/arch/dalvik/Makefile.am @@ -8,6 +8,7 @@ libarchdalvik_la_SOURCES = \ dop_arithm.c \ dop_array.c \ dop_const.c \ + dop_if.c \ dop_invoke.c \ dop_ret.c \ op_add.c \ diff --git a/src/arch/dalvik/dop_array.c b/src/arch/dalvik/dop_array.c index fa9f94f..94ca09a 100644 --- a/src/arch/dalvik/dop_array.c +++ b/src/arch/dalvik/dop_array.c @@ -34,7 +34,7 @@ * Paramètres : instr = instruction d'origine à convertir. * * ctx = contexte de la phase de décompilation. * * * -* Description : Décompile une instruction de type 'array-length'. * +* Description : Décompile une instruction de type 'array-length'. * * * * Retour : Instruction mise en place ou NULL. * * * diff --git a/src/arch/dalvik/dop_if.c b/src/arch/dalvik/dop_if.c new file mode 100644 index 0000000..3a9d8dd --- /dev/null +++ b/src/arch/dalvik/dop_if.c @@ -0,0 +1,95 @@ + +/* OpenIDA - Outil d'analyse de fichiers binaires + * dop_array.c - décompilation des branchements conditionnels + * + * Copyright (C) 2010 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 "translate.h" + + +#include "instruction.h" +#include "../../decomp/expr/cond.h" +#include "../../decomp/instr/ite.h" + + + +/****************************************************************************** +* * +* Paramètres : instr = instruction d'origine à convertir. * +* ctx = contexte de la phase de décompilation. * +* * +* Description : Décompile une instruction de comparaison d'opérandes. * +* * +* Retour : Instruction mise en place ou NULL. * +* * +* Remarques : - * +* * +******************************************************************************/ + +GDecInstruction *dalvik_decomp_instr_if(const GArchInstruction *instr, GDecContext *ctx) +{ + GDecInstruction *result; /* Instruction à retourner */ + CompSignType sign; /* Type d'opération menée */ + GArchOperand *operand; /* Opérande de l'instruction */ + GDecInstruction *op1; /* Premier opérande utilisé */ + GDecInstruction *op2; /* Second opérande utilisé */ + vmpa_t jmp; /* Adresse de saut */ + GDecInstruction *cond; /* Comparaison à restituer */ + + switch (g_dalvik_instruction_get_opcode(G_DALVIK_INSTRUCTION(instr))) + { + case DOP_IF_EQ: + sign = CST_EQ; + break; + case DOP_IF_NE: + sign = CST_NE; + break; + case DOP_IF_LT: + sign = CST_LT; + break; + case DOP_IF_GE: + sign = CST_GE; + break; + case DOP_IF_GT: + sign = CST_GT; + break; + case DOP_IF_LE: + sign = CST_LE; + break; + default: + sign = CST_COUNT; + break; + } + + operand = g_arch_instruction_get_operand(instr, 0); + op1 = g_dec_context_convert_register(ctx, operand); + + operand = g_arch_instruction_get_operand(instr, 1); + op2 = g_dec_context_convert_register(ctx, operand); + + operand = g_arch_instruction_get_operand(instr, 2); + jmp = 0x1234ull;/*g_dec_context_convert_register(ctx, operand);*/ + + cond = g_cond_expression_new(G_DEC_EXPRESSION(op1), sign, G_DEC_EXPRESSION(op2)); + result = g_ite_instruction_new(G_DEC_EXPRESSION(cond), jmp, jmp); + + return result; + +} diff --git a/src/arch/dalvik/instruction.c b/src/arch/dalvik/instruction.c index d23bbe5..051bbe2 100644 --- a/src/arch/dalvik/instruction.c +++ b/src/arch/dalvik/instruction.c @@ -110,12 +110,12 @@ static dalvik_instruction _instructions[DOP_COUNT] = { [DOP_CMPL_DOUBLE] = { 0x2f, "cmpl-double" }, [DOP_CMPG_DOUBLE] = { 0x30, "cmpg-double" }, [DOP_CMP_LONG] = { 0x31, "cmp-long" }, - [DOP_IF_EQ] = { 0x32, "if-eq" }, - [DOP_IF_NE] = { 0x33, "if-ne" }, - [DOP_IF_LT] = { 0x34, "if-lt" }, - [DOP_IF_GE] = { 0x35, "if-ge" }, - [DOP_IF_GT] = { 0x36, "if-gt" }, - [DOP_IF_LE] = { 0x37, "if-le" }, + [DOP_IF_EQ] = { 0x32, "if-eq", dalvik_decomp_instr_if }, + [DOP_IF_NE] = { 0x33, "if-ne", dalvik_decomp_instr_if }, + [DOP_IF_LT] = { 0x34, "if-lt", dalvik_decomp_instr_if }, + [DOP_IF_GE] = { 0x35, "if-ge", dalvik_decomp_instr_if }, + [DOP_IF_GT] = { 0x36, "if-gt", dalvik_decomp_instr_if }, + [DOP_IF_LE] = { 0x37, "if-le", dalvik_decomp_instr_if }, [DOP_IF_EQZ] = { 0x38, "if-eqz" }, [DOP_IF_NEZ] = { 0x39, "if-nez" }, [DOP_IF_LTZ] = { 0x3a, "if-ltz" }, diff --git a/src/arch/dalvik/translate.h b/src/arch/dalvik/translate.h index 350dff8..c708aaf 100644 --- a/src/arch/dalvik/translate.h +++ b/src/arch/dalvik/translate.h @@ -60,6 +60,9 @@ GDecInstruction *dalvik_decomp_instr_arithm_2addr(const GArchInstruction *, GDec /* Décompile une instruction de type 'opérations arithmétiques'. */ GDecInstruction *dalvik_decomp_instr_arithm_lit(const GArchInstruction *, GDecContext *); +/* Décompile une instruction de comparaison d'opérandes. */ +GDecInstruction *dalvik_decomp_instr_if(const GArchInstruction *, GDecContext *); + #endif /* _ANALYSIS_DECOMP_RTL_DALVIK_TRANSLATE_H */ |