diff options
author | Cyrille Bagard <nocbos@gmail.com> | 2014-12-25 16:31:33 (GMT) |
---|---|---|
committer | Cyrille Bagard <nocbos@gmail.com> | 2014-12-25 16:31:33 (GMT) |
commit | 19e1a97fafb1b73d0efcd995b31951daf1a5c661 (patch) | |
tree | 9cbc897ddb1d3005fb8dadfa3ad830c607acdddd /src/arch/arm | |
parent | 9cab778bfaaca2589a383445e8569d99d73374d5 (diff) |
Cleaned all the code for immediate operands.
git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@444 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a
Diffstat (limited to 'src/arch/arm')
-rw-r--r-- | src/arch/arm/v7/Makefile.am | 1 | ||||
-rw-r--r-- | src/arch/arm/v7/link.c | 113 | ||||
-rw-r--r-- | src/arch/arm/v7/link.h | 41 | ||||
-rw-r--r-- | src/arch/arm/v7/post.c | 175 | ||||
-rw-r--r-- | src/arch/arm/v7/post.h | 5 | ||||
-rw-r--r-- | src/arch/arm/v7/processor.c | 7 |
6 files changed, 186 insertions, 156 deletions
diff --git a/src/arch/arm/v7/Makefile.am b/src/arch/arm/v7/Makefile.am index 704b3a6..28a899e 100644 --- a/src/arch/arm/v7/Makefile.am +++ b/src/arch/arm/v7/Makefile.am @@ -5,6 +5,7 @@ libarcharmv7_la_SOURCES = \ arm.h arm.c \ helpers.h helpers.c \ instruction.h instruction.c \ + link.h link.c \ post.h post.c \ processor.h processor.c \ pseudo.h pseudo.c \ diff --git a/src/arch/arm/v7/link.c b/src/arch/arm/v7/link.c new file mode 100644 index 0000000..278b8d0 --- /dev/null +++ b/src/arch/arm/v7/link.c @@ -0,0 +1,113 @@ + +/* Chrysalide - Outil d'analyse de fichiers binaires + * post.c - traitements complémentaires à la phase de désassemblage + * + * Copyright (C) 2014 Cyrille Bagard + * + * This file is part of Chrysalide. + * + * OpenIDA is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * OpenIDA is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Foobar. If not, see <http://www.gnu.org/licenses/>. + */ + + +#include "link.h" + + +#include <assert.h> + + + +/****************************************************************************** +* * +* Paramètres : instr = instruction ARMv7 à traiter. * +* context = contexte associé à la phase de désassemblage. * +* format = acès aux données du binaire d'origine. * +* * +* Description : Complète un désassemblage accompli pour une instruction. * +* * +* Retour : - * +* * +* Remarques : - * +* * +******************************************************************************/ + +void handle_links_with_thumb_instruction_bl(GArchInstruction *instr, GProcContext *context, GBinFormat *format) +{ + const mrange_t *range; /* Emplacementt d'instruction */ + virt_t pc; /* Position dans l'exécution */ + GArchOperand *op; /* Opérande numérique en place */ + int32_t offset; /* Décallage encodé en dur */ + + range = g_arch_instruction_get_range(instr); + + pc = get_virt_addr(get_mrange_addr(range)); + + /** + * Qu'on se trouve en mode Thumb ou ARM, l'instruction + * ne peut qu'être encodée sur 4 octets. + */ + + assert(get_mrange_length(range) == 4); + + pc += 4; + + op = g_arch_instruction_get_operand(instr, 0); + + if (g_imm_operand_get_value(G_IMM_OPERAND(op), MDS_32_BITS_SIGNED, &offset)) + g_imm_operand_set_value(G_IMM_OPERAND(op), MDS_32_BITS_UNSIGNED, pc + offset); + +} + + +/****************************************************************************** +* * +* Paramètres : instr = instruction ARMv7 à traiter. * +* context = contexte associé à la phase de désassemblage. * +* format = acès aux données du binaire d'origine. * +* * +* Description : Complète un désassemblage accompli pour une instruction. * +* * +* Retour : - * +* * +* Remarques : - * +* * +******************************************************************************/ + +void handle_links_with_thumb_instruction_blx(GArchInstruction *instr, GProcContext *context, GBinFormat *format) +{ + const mrange_t *range; /* Emplacementt d'instruction */ + virt_t pc; /* Position dans l'exécution */ + GArchOperand *op; /* Opérande numérique en place */ + int32_t offset; /* Décallage encodé en dur */ + + range = g_arch_instruction_get_range(instr); + + pc = get_virt_addr(get_mrange_addr(range)); + + /** + * Qu'on se trouve en mode Thumb ou ARM, l'instruction + * ne peut qu'être encodée sur 4 octets. + */ + + assert(get_mrange_length(range) == 4); + + pc += 4; + pc -= pc % 4; + + op = g_arch_instruction_get_operand(instr, 0); + + if (g_imm_operand_get_value(G_IMM_OPERAND(op), MDS_32_BITS_SIGNED, &offset)) + g_imm_operand_set_value(G_IMM_OPERAND(op), MDS_32_BITS_UNSIGNED, pc + offset); + +} diff --git a/src/arch/arm/v7/link.h b/src/arch/arm/v7/link.h new file mode 100644 index 0000000..79da9f3 --- /dev/null +++ b/src/arch/arm/v7/link.h @@ -0,0 +1,41 @@ + +/* Chrysalide - Outil d'analyse de fichiers binaires + * link.h - prototypes pour l'édition des liens durant la phase de désassemblage + * + * Copyright (C) 2014 Cyrille Bagard + * + * This file is part of Chrysalide. + * + * OpenIDA is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * OpenIDA is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Foobar. If not, see <http://www.gnu.org/licenses/>. + */ + + +#ifndef _ARCH_ARM_V7_LINK_H +#define _ARCH_ARM_V7_LINK_H + + +#include "../../instruction.h" +#include "../../../format/format.h" + + + +/* Complète un désassemblage accompli pour une instruction. */ +void handle_links_with_thumb_instruction_bl(GArchInstruction *, GProcContext *, GBinFormat *); + +/* Complète un désassemblage accompli pour une instruction. */ +void handle_links_with_thumb_instruction_blx(GArchInstruction *, GProcContext *, GBinFormat *); + + + +#endif /* _ARCH_ARM_V7_LINK_H */ 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); - - - - } - diff --git a/src/arch/arm/v7/post.h b/src/arch/arm/v7/post.h index d9ad99e..dec51b2 100644 --- a/src/arch/arm/v7/post.h +++ b/src/arch/arm/v7/post.h @@ -31,10 +31,7 @@ /* Complète un désassemblage accompli pour une instruction. */ -void post_process_thumb_instruction_bl(GArchInstruction *, GBinFormat *); - -/* Complète un désassemblage accompli pour une instruction. */ -void post_process_thumb_instruction_blx(GArchInstruction *, GBinFormat *); +void post_process_branch_instructions(GArchInstruction *, GProcContext *, GBinFormat *); diff --git a/src/arch/arm/v7/processor.c b/src/arch/arm/v7/processor.c index 2b8617b..4ae933b 100644 --- a/src/arch/arm/v7/processor.c +++ b/src/arch/arm/v7/processor.c @@ -200,6 +200,7 @@ GArmV7Processor *g_armv7_processor_new(void) * Remarques : - * * * ******************************************************************************/ +#include "link.h" #include "post.h" static GArchInstruction *g_armv7_processor_disassemble(const GArmV7Processor *proc, GArmContext *ctx, const bin_t *data, vmpa2t *pos, phys_t end) { @@ -269,7 +270,8 @@ static GArchInstruction *g_armv7_processor_disassemble(const GArmV7Processor *pr { - g_arch_instruction_set_post_prod_function(result, post_process_thumb_instruction_bl); + g_arch_instruction_set_hook(result, IPH_LINK, handle_links_with_thumb_instruction_bl); + g_arch_instruction_set_hook(result, IPH_POST, post_process_branch_instructions); @@ -278,7 +280,8 @@ static GArchInstruction *g_armv7_processor_disassemble(const GArmV7Processor *pr if (strcmp(g_arch_instruction_get_keyword(result, 0), "blx") == 0/* && pc == 0x000085b2*/) { - g_arch_instruction_set_post_prod_function(result, post_process_thumb_instruction_blx); + g_arch_instruction_set_hook(result, IPH_LINK, handle_links_with_thumb_instruction_blx); + g_arch_instruction_set_hook(result, IPH_POST, post_process_branch_instructions); } |