diff options
Diffstat (limited to 'src/analysis')
| -rw-r--r-- | src/analysis/disass/area.c | 6 | ||||
| -rw-r--r-- | src/analysis/disass/links.c | 19 |
2 files changed, 17 insertions, 8 deletions
diff --git a/src/analysis/disass/area.c b/src/analysis/disass/area.c index 7eacc29..389dd75 100644 --- a/src/analysis/disass/area.c +++ b/src/analysis/disass/area.c @@ -484,6 +484,9 @@ static void update_address_as_routine(GBinFormat *format, const vmpa2t *addr) } + if (found) + g_object_unref(G_OBJECT(symbol)); + } @@ -632,7 +635,10 @@ void load_code_from_mem_area(mem_area *area, mem_area *list, size_t count, GProc has_new_sym = g_binary_format_find_symbol_at(format, &sym_addr, &symbol); if (has_new_sym) + { insert_extra_symbol_into_mem_areas(list, count, symbol); + g_object_unref(G_OBJECT(symbol)); + } } diff --git a/src/analysis/disass/links.c b/src/analysis/disass/links.c index 77ec2af..d3434cb 100644 --- a/src/analysis/disass/links.c +++ b/src/analysis/disass/links.c @@ -139,6 +139,7 @@ static void convert_immediate_into_target(GArchInstruction *instr, size_t index, GImmOperand *imm; /* Version native de l'opérande*/ virt_t addr; /* Adresse visée par le saut */ MemoryDataSize msize; /* Taille de l'opérande */ + vmpa2t target; /* Défination finale précise */ GArchOperand *new; /* Instruction de ciblage */ op = g_arch_instruction_get_operand(instr, index); @@ -152,12 +153,16 @@ static void convert_immediate_into_target(GArchInstruction *instr, size_t index, { msize = g_imm_operand_get_size(imm); - new = g_target_operand_new(msize, addr); + if (g_exe_format_translate_address_into_vmpa(G_EXE_FORMAT(format), addr, &target)) + { + new = g_target_operand_new(msize, &target); + + if (!g_target_operand_resolve(G_TARGET_OPERAND(new), format, false)) + g_object_unref(G_OBJECT(new)); + else + g_arch_instruction_replace_operand(instr, new, op); - if (!g_target_operand_resolve(G_TARGET_OPERAND(new), format, false)) - g_object_unref(G_OBJECT(new)); - else - g_arch_instruction_replace_operand(instr, new, op); + } } @@ -184,7 +189,6 @@ void establish_links_for_instruction(GArchInstruction *instr, GBinFormat *format size_t count; /* Nombre d'opérandes présents */ size_t i; /* Boucle de parcours */ GArchOperand *op; /* Opérande numérique en place */ - virt_t virt; /* Adresse liée à une cible */ vmpa2t addr; /* Localisation plus complète */ GArchInstruction *target; /* Instruction visée au final */ @@ -203,8 +207,7 @@ void establish_links_for_instruction(GArchInstruction *instr, GBinFormat *format op = g_arch_instruction_get_operand(instr, i); if (!G_IS_TARGET_OPERAND(op)) continue; - virt = g_target_operand_get_addr(G_TARGET_OPERAND(op)); - init_vmpa(&addr, VMPA_NO_PHYSICAL, virt); + g_target_operand_get_addr(G_TARGET_OPERAND(op), &addr); target = g_arch_processor_find_instr_by_address(proc, &addr); |