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

7 files changed, 45 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index bf7c4f8..a3949f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+15-01-04  Cyrille Bagard <nocbos@gmail.com>
+
+	* src/analysis/disass/area.c:
+	Disable lots of debug messages.
+
+	* src/analysis/disass/disassembler.c:
+	Disable an old function using removed symbols.
+
+	* src/arch/arm/v7/link.c:
+	Disable lots of debug messages.
+
+	* src/arch/instruction.h:
+	Declare GBinFormat without including the right header (circular reference).
+
+	* src/format/symbol.h:
+	Ensure all symbols are declared ; this fix some sign extension bugs.
+
+	* src/gui/panels/bookmarks.c:
+	Disable an temporary function using removed symbols.
+
 14-12-31  Cyrille Bagard <nocbos@gmail.com>
 
 	* src/analysis/disass/area.c:
diff --git a/src/analysis/disass/area.c b/src/analysis/disass/area.c
index 0ec4ad4..8c46eb0 100644
--- a/src/analysis/disass/area.c
+++ b/src/analysis/disass/area.c
@@ -379,7 +379,7 @@ void load_code_from_mem_area(mem_area *area, mem_area *list, size_t count, const
     copy_vmpa(&pos, get_mrange_addr(&area->range));
     advance_vmpa(&pos, diff);
 
-    printf(" [%p] CODE start @ %u (len=%u)\n", area, (unsigned int)diff, (unsigned int)alen);
+    //printf(" [%p] CODE start @ %u (len=%u)\n", area, (unsigned int)diff, (unsigned int)alen);
 
     for (i = diff; i < alen; i += diff)
     {
@@ -484,8 +484,10 @@ static void load_data_from_mem_area(mem_area *area, mem_area *list, size_t count
     copy_vmpa(&pos, get_mrange_addr(&area->range));
     advance_vmpa(&pos, diff);
 
+    /*
     printf(" [%p] DATA start @ 0x%08x -> %u (len=%u)\n",
            area, (unsigned int)get_phy_addr(&pos), (unsigned int)diff, (unsigned int)alen);
+    */
 
     for (i = diff; i < alen; i += diff)
     {
@@ -577,11 +579,11 @@ static void fill_mem_area(mem_area *area, mem_area *list, size_t count, const GL
     phys_t i;                               /* Boucle de parcours          */
     vmpa2t start;                           /* Adresse de départ de combles*/
 
-
+    /*
     printf(" === FILLING | 0x%08x (%u)...\n",
            (unsigned int)get_phy_addr(get_mrange_addr(&area->range)),
            (unsigned int)get_phy_addr(get_mrange_addr(&area->range)));
-
+    */
 
     /* Les symboles se doivent d'être indépendants ! */
     if (area->has_sym) return;
diff --git a/src/analysis/disass/disassembler.c b/src/analysis/disass/disassembler.c
index 77e64d7..9907a52 100644
--- a/src/analysis/disass/disassembler.c
+++ b/src/analysis/disass/disassembler.c
@@ -336,7 +336,7 @@ static void g_delayed_disassembly_process(GDelayedDisassembly *disass, GtkExtSta
 
 }
 
-
+#if 0
 /******************************************************************************
 *                                                                             *
 *  Paramètres  : disass    = analyse à mener.                                 *
@@ -462,7 +462,7 @@ static void g_delayed_disassembly_process_old(GDelayedDisassembly *disass, GtkEx
     run_plugins_on_binary(disass->binary, PGA_BINARY_PRINTED, true);
 
 }
-
+#endif
 
 
 /* ---------------------------------------------------------------------------------- */
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
 {
diff --git a/src/format/symbol.h b/src/format/symbol.h
index 76bf46b..ac1ff0d 100644
--- a/src/format/symbol.h
+++ b/src/format/symbol.h
@@ -30,6 +30,7 @@
 
 #include "../analysis/routine.h"
 #include "../analysis/db/items/comment.h"
+#include "../arch/instruction.h"
 
 
 
diff --git a/src/gui/panels/bookmarks.c b/src/gui/panels/bookmarks.c
index 5d2be18..4b4777e 100644
--- a/src/gui/panels/bookmarks.c
+++ b/src/gui/panels/bookmarks.c
@@ -924,7 +924,7 @@ static void on_param_search_changed(GtkSearchEntry *entry, GBookmarksPanel *pane
 
     gtk_widget_override_color(GTK_WIDGET(entry), GTK_STATE_NORMAL, NULL);
 
-    reload_config_into_treeview(panel, get_main_configuration());
+    //reload_config_into_treeview(panel, get_main_configuration());
 
 }