diff options
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/dalvik/Makefile.am | 1 | ||||
| -rw-r--r-- | src/arch/dalvik/dop_const.c | 10 | ||||
| -rw-r--r-- | src/arch/dalvik/dop_ret.c | 81 | ||||
| -rw-r--r-- | src/arch/dalvik/instruction.c | 10 | ||||
| -rw-r--r-- | src/arch/dalvik/translate.h | 6 |
5 files changed, 93 insertions, 15 deletions
diff --git a/src/arch/dalvik/Makefile.am b/src/arch/dalvik/Makefile.am index 8dc93ae..3c58a0e 100644 --- a/src/arch/dalvik/Makefile.am +++ b/src/arch/dalvik/Makefile.am @@ -9,6 +9,7 @@ libarchdalvik_la_SOURCES = \ dop_array.c \ dop_const.c \ dop_invoke.c \ + dop_ret.c \ op_add.c \ op_aget.c \ op_and.c \ diff --git a/src/arch/dalvik/dop_const.c b/src/arch/dalvik/dop_const.c index ea88089..9d42926 100644 --- a/src/arch/dalvik/dop_const.c +++ b/src/arch/dalvik/dop_const.c @@ -45,20 +45,10 @@ GDecInstruction *dalvik_decomp_instr_const(const GArchInstruction *instr, GDecContext *ctx) { GDecInstruction *result; /* Instruction à retourner */ - - GArchOperand *operand; /* Opérande de l'instruction */ GDecInstruction *reg; /* Pseudo-registre redéfini */ GDecInstruction *imm; /* Valeur immédiate décompilée */ - - result = NULL; - - - printf("PAssaage !\n"); - - - operand = g_arch_instruction_get_operand(instr, 0); reg = g_dec_context_convert_register(ctx, operand); diff --git a/src/arch/dalvik/dop_ret.c b/src/arch/dalvik/dop_ret.c new file mode 100644 index 0000000..3d3f29f --- /dev/null +++ b/src/arch/dalvik/dop_ret.c @@ -0,0 +1,81 @@ + +/* OpenIDA - Outil d'analyse de fichiers binaires + * dop_ret.c - décompilation des ordres de retour + * + * 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 "../../decomp/expr/return.h" + + + +/****************************************************************************** +* * +* Paramètres : instr = instruction d'origine à convertir. * +* ctx = contexte de la phase de décompilation. * +* * +* Description : Décompile une instruction de type 'return'. * +* * +* Retour : Instruction mise en place ou NULL. * +* * +* Remarques : - * +* * +******************************************************************************/ + +GDecInstruction *dalvik_decomp_instr_return(const GArchInstruction *instr, GDecContext *ctx) +{ + GDecInstruction *result; /* Instruction à retourner */ + GArchOperand *operand; /* Opérande de l'instruction */ + GDecInstruction *reg; /* Pseudo-registre redéfini */ + + operand = g_arch_instruction_get_operand(instr, 0); + reg = g_dec_context_convert_register(ctx, operand); + + result = g_return_expression_new(G_DEC_EXPRESSION(reg)); + + return result; + +} + + +/****************************************************************************** +* * +* Paramètres : instr = instruction d'origine à convertir. * +* ctx = contexte de la phase de décompilation. * +* * +* Description : Décompile une instruction de type 'return-void'. * +* * +* Retour : Instruction mise en place ou NULL. * +* * +* Remarques : - * +* * +******************************************************************************/ + +GDecInstruction *dalvik_decomp_instr_return_void(const GArchInstruction *instr, GDecContext *ctx) +{ + GDecInstruction *result; /* Instruction à retourner */ + + result = g_return_expression_new(NULL); + + return result; + +} diff --git a/src/arch/dalvik/instruction.c b/src/arch/dalvik/instruction.c index e8059d6..ca48fe2 100644 --- a/src/arch/dalvik/instruction.c +++ b/src/arch/dalvik/instruction.c @@ -80,12 +80,12 @@ static dalvik_instruction _instructions[DOP_COUNT] = { [DOP_MOVE_RESULT_WIDE] = { 0x0b, "move-result-wide" }, [DOP_MOVE_RESULT_OBJECT] = { 0x0c, "move-result-object" }, [DOP_MOVE_EXCEPTION] = { 0x0d, "move-exception" }, - [DOP_RETURN_VOID] = { 0x0e, "return-void" }, - [DOP_RETURN] = { 0x0f, "return" }, - [DOP_RETURN_WIDE] = { 0x10, "return-wide" }, - [DOP_RETURN_OBJECT] = { 0x11, "return-object" }, + [DOP_RETURN_VOID] = { 0x0e, "return-void", dalvik_decomp_instr_return_void }, + [DOP_RETURN] = { 0x0f, "return", dalvik_decomp_instr_return }, + [DOP_RETURN_WIDE] = { 0x10, "return-wide", dalvik_decomp_instr_return }, + [DOP_RETURN_OBJECT] = { 0x11, "return-object", dalvik_decomp_instr_return }, [DOP_CONST_4] = { 0x12, "const/4", dalvik_decomp_instr_const }, - [DOP_CONST_16] = { 0x13, "const/16" }, + [DOP_CONST_16] = { 0x13, "const/16", dalvik_decomp_instr_const }, [DOP_CONST] = { 0x14, "const" }, [DOP_CONST_HIGH16] = { 0x15, "const/high16" }, [DOP_CONST_WIDE_16] = { 0x16, "const-wide/16" }, diff --git a/src/arch/dalvik/translate.h b/src/arch/dalvik/translate.h index 779c133..0f408e6 100644 --- a/src/arch/dalvik/translate.h +++ b/src/arch/dalvik/translate.h @@ -44,6 +44,12 @@ GDecInstruction *dalvik_decomp_instr_const(const GArchInstruction *, GDecContext /* Décompile une instruction de type 'invoke-virtual'. */ GDecInstruction *dalvik_decomp_instr_invoke_virtual(const GArchInstruction *, GDecContext *); +/* Décompile une instruction de type 'return'. */ +GDecInstruction *dalvik_decomp_instr_return(const GArchInstruction *, GDecContext *); + +/* Décompile une instruction de type 'return-void'. */ +GDecInstruction *dalvik_decomp_instr_return_void(const GArchInstruction *, GDecContext *); + /* Décompile une instruction de type 'opérations arithmétiques'. */ GDecInstruction *dalvik_decomp_instr_arithm_2addr(const GArchInstruction *, GDecContext *); |