summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorCyrille Bagard <nocbos@gmail.com>2015-01-04 18:33:12 (GMT)
committerCyrille Bagard <nocbos@gmail.com>2015-01-04 18:33:12 (GMT)
commit639a993fd7400f95eb09ec69d89f227ef41b2865 (patch)
treeeafdac2dce4c63e95a6d82542968736e9e1231c6 /src/arch
parent0f571c20444dbb5d8d8d0fa46a69b31cb89f9583 (diff)
Disabled lots of debug messages and fixed some symbols related bugs.
git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@447 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/arm/v7/link.c4
-rw-r--r--src/arch/instruction.h15
2 files changed, 16 insertions, 3 deletions
diff --git a/src/arch/arm/v7/link.c b/src/arch/arm/v7/link.c
index e7a1b40..65ae09e 100644
--- a/src/arch/arm/v7/link.c
+++ b/src/arch/arm/v7/link.c
@@ -68,7 +68,7 @@ void handle_links_with_thumb_instruction_bl(GArchInstruction *instr, GProcContex
g_imm_operand_set_value(G_IMM_OPERAND(op), MDS_32_BITS_UNSIGNED, pc + offset);
- printf("[@ 0x%08x] Add 0x%08x to %p\n", (uint32_t)get_virt_addr(get_mrange_addr(range)), (uint32_t)(pc + offset), context);
+ //printf("[@ 0x%08x] Add 0x%08x to %p\n", (uint32_t)get_virt_addr(get_mrange_addr(range)), (uint32_t)(pc + offset), context);
}
@@ -114,7 +114,7 @@ void handle_links_with_thumb_instruction_blx(GArchInstruction *instr, GProcConte
g_imm_operand_set_value(G_IMM_OPERAND(op), MDS_32_BITS_UNSIGNED, pc + offset);
- printf("[@ 0x%08x] Add 0x%08x to %p\n", (uint32_t)get_virt_addr(get_mrange_addr(range)), (uint32_t)(pc + offset), context);
+ //printf("[@ 0x%08x] Add 0x%08x to %p\n", (uint32_t)get_virt_addr(get_mrange_addr(range)), (uint32_t)(pc + offset), context);
}
diff --git a/src/arch/instruction.h b/src/arch/instruction.h
index 5657f73..eb31865 100644
--- a/src/arch/instruction.h
+++ b/src/arch/instruction.h
@@ -36,7 +36,7 @@
#include "../decomp/context.h"
#include "../decomp/instruction.h"
//#include "../format/executable.h"
-#include "../format/format.h"
+//#include "../format/format.h"
@@ -61,6 +61,19 @@ GType g_arch_instruction_get_type(void);
/* Etend la désignation d'un nom d'instruction. */
void g_arch_instruction_append_suffix(GArchInstruction *, const char *);
+/**
+ * La définition de "GBinFormat", utile aux traitements complémentaires, ne peut
+ * se faire en incluant le fichier d'en-tête "../format/format.h", pour cause
+ * de références circulaires.
+ *
+ * On procède donc à une seconde déclaration, en attendant éventuellement mieux.
+ */
+
+
+/* Format binaire générique (instance) */
+typedef struct _GBinFormat GBinFormat;
+
+
/* Types de crochet de traitement */
typedef enum _InstrProcessHook
{