diff options
author | Cyrille Bagard <nocbos@gmail.com> | 2015-10-14 00:10:11 (GMT) |
---|---|---|
committer | Cyrille Bagard <nocbos@gmail.com> | 2015-10-14 00:10:11 (GMT) |
commit | 48726043e2f07874e7a09a866c4cc537a65a683c (patch) | |
tree | 557e4f6cd700d131e8964d02890a6381f87e52cd /src/arch/arm/v7/post.c | |
parent | 18beadb4192144b00c06769645befb17ae1ce98e (diff) |
Forced the full definition of locations to fix the search of symbols.
git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@594 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a
Diffstat (limited to 'src/arch/arm/v7/post.c')
-rw-r--r-- | src/arch/arm/v7/post.c | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/src/arch/arm/v7/post.c b/src/arch/arm/v7/post.c index e95bd66..e066bb0 100644 --- a/src/arch/arm/v7/post.c +++ b/src/arch/arm/v7/post.c @@ -24,9 +24,6 @@ #include "post.h" -#include <assert.h> - - #include "../../target.h" @@ -60,13 +57,13 @@ void post_process_branch_instructions(GArchInstruction *instr, GArchProcessor *p op = g_arch_instruction_get_operand(instr, 0); - if (g_imm_operand_get_value(G_IMM_OPERAND(op), MDS_32_BITS_UNSIGNED, &addr)) + if (g_imm_operand_get_value(G_IMM_OPERAND(op), MDS_32_BITS_UNSIGNED, &addr) + && g_exe_format_translate_address_into_vmpa(G_EXE_FORMAT(format), addr, &target)) { 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_UNDEFINED, loc, NULL); @@ -124,13 +121,23 @@ void post_process_branch_and_link_instructions(GArchInstruction *instr, GArchPro op = g_arch_instruction_get_operand(instr, 0); - if (g_imm_operand_get_value(G_IMM_OPERAND(op), MDS_32_BITS_UNSIGNED, &addr)) + if (g_imm_operand_get_value(G_IMM_OPERAND(op), MDS_32_BITS_UNSIGNED, &addr) + && g_exe_format_translate_address_into_vmpa(G_EXE_FORMAT(format), addr, &target)) { + + + /// FIXME (DUR) ?! + if (addr < 0x8000) return; + + if (addr > 0x6966c) return; + + + + 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_UNDEFINED, loc, NULL); @@ -188,13 +195,13 @@ void post_process_comp_and_branch_instructions(GArchInstruction *instr, GArchPro op = g_arch_instruction_get_operand(instr, 1); - if (g_imm_operand_get_value(G_IMM_OPERAND(op), MDS_32_BITS_UNSIGNED, &addr)) + if (g_imm_operand_get_value(G_IMM_OPERAND(op), MDS_32_BITS_UNSIGNED, &addr) + && g_exe_format_translate_address_into_vmpa(G_EXE_FORMAT(format), addr, &target)) { 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_UNDEFINED, loc, NULL); @@ -256,7 +263,8 @@ void post_process_ldr_instructions(GArchInstruction *instr, GArchProcessor *proc if (!G_IS_IMM_OPERAND(op)) return; - if (g_imm_operand_get_value(G_IMM_OPERAND(op), MDS_32_BITS_UNSIGNED, &addr)) + if (g_imm_operand_get_value(G_IMM_OPERAND(op), MDS_32_BITS_UNSIGNED, &addr) + && g_exe_format_translate_address_into_vmpa(G_EXE_FORMAT(format), addr, &target)) { new = g_target_operand_new(MDS_32_BITS_UNSIGNED, addr); @@ -277,7 +285,6 @@ void post_process_ldr_instructions(GArchInstruction *instr, GArchProcessor *proc } while (0); - init_vmpa(&target, VMPA_NO_PHYSICAL, addr); init_mrange(&trange, &target, 0); vmpa2_virt_to_string(&target, MDS_UNDEFINED, loc, NULL); @@ -317,6 +324,5 @@ void post_process_ldr_instructions(GArchInstruction *instr, GArchProcessor *proc g_arch_instruction_replace_operand(instr, new, op); } - else assert(0); } |