Cleaned all the code for immediate operands.

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

1 files changed, 25 insertions, 150 deletions

diff --git a/src/arch/arm/v7/post.c b/src/arch/arm/v7/post.c
index 8ba12d8..f85fc91 100644
--- a/src/arch/arm/v7/post.c
+++ b/src/arch/arm/v7/post.c
@@ -24,19 +24,15 @@
 #include "post.h"
 
 
-
-
-
 #include "../../target.h"
 
 
 
-
-
 /******************************************************************************
 *                                                                             *
-*  Paramètres  : instr  = instruction ARMv7 à traiter.                        *
-*                format = acès aux données du binaire d'origine.              *
+*  Paramètres  : instr   = instruction ARMv7 à traiter.                       *
+*                context = contexte associé à la phase de désassemblage.      *
+*                format  = accès aux données du binaire d'origine.            *
 *                                                                             *
 *  Description : Complète un désassemblage accompli pour une instruction.     *
 *                                                                             *
@@ -46,22 +42,11 @@
 *                                                                             *
 ******************************************************************************/
 
-void post_process_thumb_instruction_bl(GArchInstruction *instr, GBinFormat *format)
+void post_process_branch_instructions(GArchInstruction *instr, GProcContext *context, GBinFormat *format)
 {
-
-
-    const mrange_t *range;
-
-    virt_t pc;
-
-
-
-
-
-    GArchOperand *op;
-    vmpa_t val;
-    GArchOperand *new;
-
+    GArchOperand *op;                       /* Opérande numérique en place */
+    uint32_t addr;                          /* Adresse visée par le saut   */
+    GArchOperand *new;                      /* Instruction de ciblage      */
     vmpa2t target;
     mrange_t trange;
     VMPA_BUFFER(loc);
@@ -69,148 +54,38 @@ void post_process_thumb_instruction_bl(GArchInstruction *instr, GBinFormat *form
     GBinRoutine *routine;                   /* Nouvelle routine trouvée    */
     GBinSymbol *symbol;                     /* Nouveau symbole construit   */
 
-
-
-
-    range = g_arch_instruction_get_range(instr);
-
-    pc = get_virt_addr(get_mrange_addr(range)) + 4 /* PC++ */;
-    printf("  -- PC = 0x%x\n", (unsigned int)pc);
-
-
     op = g_arch_instruction_get_operand(instr, 0);
 
-    g_imm_operand_to_vmpa_t(G_IMM_OPERAND(op), &val);
-
-    printf("  -> %llx = %lld  ==>> 0x%x\n", val, val, (unsigned int)(pc + val));
-
-
-
-    new = g_target_operand_new(MDS_32_BITS, pc + val);
-
-    if (!g_target_operand_resolve(G_TARGET_OPERAND(new), format))
+    if (g_imm_operand_get_value(G_IMM_OPERAND(op), MDS_32_BITS_UNSIGNED, &addr))
     {
-        init_vmpa(&target, VMPA_NO_PHYSICAL, pc + val);
-        init_mrange(&trange, &target, 0);
-
-        vmpa2_virt_to_string(&target, MDS_32_BITS, loc, NULL);
-        snprintf(name, sizeof(name), "loc_%s", loc + 2);
-
-        routine = g_binary_routine_new();
-        g_binary_routine_set_name(routine, strdup(name));
-        //routine = try_to_demangle_routine(name);
-
-        g_binary_routine_set_range(routine, &trange);
-
-        symbol = g_binary_symbol_new(STP_ROUTINE, NULL, ~0);
-        g_binary_symbol_attach_routine(symbol, routine);
-        g_binary_format_add_symbol(G_BIN_FORMAT(format), symbol);
+        new = g_target_operand_new(MDS_32_BITS_UNSIGNED, addr);
 
+        if (!g_target_operand_resolve(G_TARGET_OPERAND(new), format))
+        {
+            init_vmpa(&target, VMPA_NO_PHYSICAL, addr);
+            init_mrange(&trange, &target, 0);
 
+            vmpa2_virt_to_string(&target, MDS_32_BITS, loc, NULL);
+            snprintf(name, sizeof(name), "loc_%s", loc + 2);
 
-        g_target_operand_resolve(G_TARGET_OPERAND(new), format);
+            routine = g_binary_routine_new();
+            g_binary_routine_set_name(routine, strdup(name));
+            //routine = try_to_demangle_routine(name);
 
+            g_binary_routine_set_range(routine, &trange);
 
-    }
-
-
-    g_arch_instruction_replace_operand(instr, new, op);
-    //g_arch_instruction_attach_extra_operand(result, new);
+            symbol = g_binary_symbol_new(STP_ROUTINE, NULL, ~0);
+            g_binary_symbol_attach_routine(symbol, routine);
+            g_binary_format_add_symbol(G_BIN_FORMAT(format), symbol);
 
 
 
-}
-
-
+            g_target_operand_resolve(G_TARGET_OPERAND(new), format);
 
+        }
 
-
-/******************************************************************************
-*                                                                             *
-*  Paramètres  : instr  = instruction ARMv7 à traiter.                        *
-*                format = acès aux données du binaire d'origine.              *
-*                                                                             *
-*  Description : Complète un désassemblage accompli pour une instruction.     *
-*                                                                             *
-*  Retour      : -                                                            *
-*                                                                             *
-*  Remarques   : -                                                            *
-*                                                                             *
-******************************************************************************/
-
-void post_process_thumb_instruction_blx(GArchInstruction *instr, GBinFormat *format)
-{
-
-
-
-
-
-    const mrange_t *range;
-
-    virt_t pc;
-
-
-
-    GArchOperand *op;
-    vmpa_t val;
-    GArchOperand *new;
-
-    vmpa2t target;
-    mrange_t trange;
-    VMPA_BUFFER(loc);
-    char name[5 + VMPA_MAX_LEN];
-    GBinRoutine *routine;                   /* Nouvelle routine trouvée    */
-    GBinSymbol *symbol;                     /* Nouveau symbole construit   */
-
-
-
-    range = g_arch_instruction_get_range(instr);
-
-    pc = get_virt_addr(get_mrange_addr(range)) + 4 /* PC++ */;
-
-    printf("  -- PC = 0x%x -> 0x%x\n", (unsigned int)pc, (unsigned int)pc - pc % 4);
-    pc = pc - pc % 4;
-
-    op = g_arch_instruction_get_operand(instr, 0);
-
-    g_imm_operand_to_vmpa_t(G_IMM_OPERAND(op), &val);
-
-    printf("  -> %llx = %lld  ==>> 0x%x\n", val, val, (unsigned int)(pc + val));
-
-
-
-    new = g_target_operand_new(MDS_32_BITS, pc + val);
-
-    if (!g_target_operand_resolve(G_TARGET_OPERAND(new), format))
-    {
-        init_vmpa(&target, VMPA_NO_PHYSICAL, pc + val);
-        init_mrange(&trange, &target, 0);
-
-        vmpa2_virt_to_string(&target, MDS_32_BITS, loc, NULL);
-        snprintf(name, sizeof(name), "loc_%s", loc + 2);
-
-        routine = g_binary_routine_new();
-        g_binary_routine_set_name(routine, strdup(name));
-        //routine = try_to_demangle_routine(name);
-
-        g_binary_routine_set_range(routine, &trange);
-
-        symbol = g_binary_symbol_new(STP_ROUTINE, NULL, ~0);
-        g_binary_symbol_attach_routine(symbol, routine);
-        g_binary_format_add_symbol(G_BIN_FORMAT(format), symbol);
-
-
-
-        g_target_operand_resolve(G_TARGET_OPERAND(new), format);
-
+        g_arch_instruction_replace_operand(instr, new, op);
 
     }
 
-    g_arch_instruction_replace_operand(instr, new, op);
-    //g_arch_instruction_attach_extra_operand(result, new);
-
-
-
-
 }
-