diff options
| author | Cyrille Bagard <nocbos@gmail.com> | 2013-01-20 13:10:06 (GMT) |
|---|---|---|
| committer | Cyrille Bagard <nocbos@gmail.com> | 2013-01-20 13:10:06 (GMT) |
| commit | 37fd2f1329c56078bc8a8b2fc955aa001c109c01 (patch) | |
| tree | 71bcce9a3eaf6b7569d1f1d3e057752ae517ebde /src/arch/dalvik/decomp/aget.c | |
| parent | a9bbd894bd25f7c2bb72fb7d4064b19377d90c6d (diff) | |
Took care of shared allocations between blocks when converting registers.
git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@326 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a
Diffstat (limited to 'src/arch/dalvik/decomp/aget.c')
| -rw-r--r-- | src/arch/dalvik/decomp/aget.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/arch/dalvik/decomp/aget.c b/src/arch/dalvik/decomp/aget.c index 0fa66eb..4ca012b 100644 --- a/src/arch/dalvik/decomp/aget.c +++ b/src/arch/dalvik/decomp/aget.c @@ -45,20 +45,23 @@ GDecInstruction *dalvik_decomp_instr_aget(const GArchInstruction *instr, GDecContext *ctx) { GDecInstruction *result; /* Instruction à retourner */ + vmpa_t addr; /* Adresse de l'instruction */ GArchOperand *operand; /* Opérande de l'instruction */ GDecInstruction *array; /* Tableau accédé */ GDecInstruction *index; /* Indice de cellule considérée*/ GDecInstruction *content; /* Contenu de cellule visé */ GDecInstruction *access; /* Représentation de l'accès */ + g_arch_instruction_get_location(instr, NULL, NULL, &addr); + operand = g_arch_instruction_get_operand(instr, 1); - array = g_dec_context_convert_register(ctx, operand, false); + array = g_dec_context_convert_register(ctx, operand, false, addr); operand = g_arch_instruction_get_operand(instr, 2); - index = g_dec_context_convert_register(ctx, operand, false); + index = g_dec_context_convert_register(ctx, operand, false, addr); operand = g_arch_instruction_get_operand(instr, 0); - content = g_dec_context_convert_register(ctx, operand, true); + content = g_dec_context_convert_register(ctx, operand, true, addr); access = g_array_access_new(G_DEC_EXPRESSION(array), G_DEC_EXPRESSION(index)); result = g_assign_expression_new(G_DEC_EXPRESSION(content), G_DEC_EXPRESSION(access)); |