diff options
author | Cyrille Bagard <nocbos@gmail.com> | 2012-07-29 21:41:52 (GMT) |
---|---|---|
committer | Cyrille Bagard <nocbos@gmail.com> | 2012-07-29 21:41:52 (GMT) |
commit | 8e1f2335773a9025cd46d45a33261725707af3ba (patch) | |
tree | 6001a1095985514bbde3c8ec49b4dd5d32182fc8 /src/arch/dalvik/decomp/iget.c | |
parent | 8b35a66464636d0c46237af7490a6ca6866ecc4d (diff) |
Updated all decompiled instructions using right pseudo registers.
git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@253 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a
Diffstat (limited to 'src/arch/dalvik/decomp/iget.c')
-rw-r--r-- | src/arch/dalvik/decomp/iget.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/arch/dalvik/decomp/iget.c b/src/arch/dalvik/decomp/iget.c index 8b8f9f0..931438c 100644 --- a/src/arch/dalvik/decomp/iget.c +++ b/src/arch/dalvik/decomp/iget.c @@ -48,19 +48,16 @@ GDecInstruction *dalvik_decomp_instr_iget(const GArchInstruction *instr, GDecCon { GDecInstruction *result; /* Instruction à retourner */ GArchOperand *operand; /* Opérande de l'instruction */ - GDecInstruction *dest; /* Registre de destination */ GDecInstruction *src; /* Registre de l'object */ uint32_t index; /* Indice dans la table */ GDexFormat *format; /* Accès aux constantes */ GDecInstruction *field; /* Champ concerné par l'opérat°*/ GBinVariable *var; /* Variable / champ accédé */ + GDecInstruction *dest; /* Registre de destination */ GDecInstruction *access; /* Représentation de l'accès */ - operand = g_arch_instruction_get_operand(instr, 0); - dest = g_dec_context_convert_register(ctx, operand); - operand = g_arch_instruction_get_operand(instr, 1); - src = g_dec_context_convert_register(ctx, operand); + src = g_dec_context_convert_register(ctx, operand, false); operand = g_arch_instruction_get_operand(instr, 2); index = g_dalvik_pool_operand_get_index(G_DALVIK_POOL_OPERAND(operand)); @@ -70,6 +67,9 @@ GDecInstruction *dalvik_decomp_instr_iget(const GArchInstruction *instr, GDecCon field = g_pseudo_register_new(); g_pseudo_register_set_variable(G_PSEUDO_REGISTER(field), var); + operand = g_arch_instruction_get_operand(instr, 0); + dest = g_dec_context_convert_register(ctx, operand, true); + access = g_access_expression_new(G_DEC_EXPRESSION(src), G_DEC_EXPRESSION(field)); result = g_assign_expression_new(G_DEC_EXPRESSION(dest), G_DEC_EXPRESSION(access)); |