Updated all decompiled instructions using right pseudo registers.

git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@253 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a

1 files changed, 9 insertions, 9 deletions

diff --git a/src/arch/dalvik/decomp/move.c b/src/arch/dalvik/decomp/move.c
index 798b6b0..f700737 100644
--- a/src/arch/dalvik/decomp/move.c
+++ b/src/arch/dalvik/decomp/move.c
@@ -45,14 +45,14 @@ GDecInstruction *dalvik_decomp_instr_move_object(const GArchInstruction *instr,
 {
     GDecInstruction *result;                /* Instruction à retourner     */
     GArchOperand *operand;                  /* Opérande de l'instruction   */
-    GDecInstruction *dest;                  /* Registre de destination     */
     GDecInstruction *src;                   /* Registre de l'object        */
-
-    operand = g_arch_instruction_get_operand(instr, 0);
-    dest = g_dec_context_convert_register(ctx, operand);
+    GDecInstruction *dest;                  /* Registre de destination     */
 
     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, 0);
+    dest = g_dec_context_convert_register(ctx, operand, true);
 
     result = g_assign_expression_new(G_DEC_EXPRESSION(dest), G_DEC_EXPRESSION(src));
 
@@ -79,19 +79,19 @@ GDecInstruction *dalvik_decomp_instr_move_result(const GArchInstruction *instr,
     GDecInstruction *result;                /* Instruction à retourner     */
     GDecInstruction *list;                  /* Instructions décompilées    */
     GArchOperand *operand;                  /* Opérande de l'instruction   */
-    GDecInstruction *dest;                  /* Registre de destination     */
     GDecInstruction *last;                  /* Instruction précédante      */
+    GDecInstruction *dest;                  /* Registre de destination     */
 
     list = g_dec_context_get_decomp_instrs(ctx);
     if (list == NULL) return NULL;
 
-    operand = g_arch_instruction_get_operand(instr, 0);
-    dest = g_dec_context_convert_register(ctx, operand);
-
     last = g_dec_instruction_get_last(list);
     g_dec_instruction_delete(&list, last);
     g_dec_context_set_decomp_instrs(ctx, list);
 
+    operand = g_arch_instruction_get_operand(instr, 0);
+    dest = g_dec_context_convert_register(ctx, operand, true);
+
     result = g_assign_expression_new(G_DEC_EXPRESSION(dest), G_DEC_EXPRESSION(last));
 
     return result;