From 2a1dd967d3b4e06f504431f9d3d613992095b2c3 Mon Sep 17 00:00:00 2001 From: Cyrille Bagard Date: Sat, 25 Apr 2015 20:44:37 +0000 Subject: Removed some debug messages. git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@518 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a --- ChangeLog | 11 +++++++++++ src/analysis/disass/area.c | 26 -------------------------- src/analysis/disass/output.c | 11 ----------- src/arch/arm/v7/context.c | 28 +++------------------------- src/arch/arm/v7/context.h | 15 +-------------- src/gtkext/graph/ranks.c | 1 - src/gtkext/gtkgraphview.c | 2 -- src/gtkext/gtkviewpanel.c | 5 ----- 8 files changed, 15 insertions(+), 84 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1e95e36..83d8022 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ 15-04-25 Cyrille Bagard + * src/analysis/disass/area.c: + * src/analysis/disass/output.c: + * src/arch/arm/v7/context.c: + * src/arch/arm/v7/context.h: + * src/gtkext/graph/ranks.c: + * src/gtkext/gtkgraphview.c: + * src/gtkext/gtkviewpanel.c: + Remove some debug messages. + +15-04-25 Cyrille Bagard + * configure.ac: Add the new Makefile from the 'plugins/libcsem directory. diff --git a/src/analysis/disass/area.c b/src/analysis/disass/area.c index 3a23993..bc19224 100644 --- a/src/analysis/disass/area.c +++ b/src/analysis/disass/area.c @@ -818,39 +818,13 @@ static void load_data_from_mem_area(mem_area *area, mem_area *list, size_t count void fill_mem_area(mem_area **list, size_t *count, size_t *index, const GLoadedBinary *binary, GProcContext *ctx, status_blob_info *info) { mem_area *area; /* Zone de désassemblage */ - - phys_t len; /* Taille de la zone à remplir */ phys_t i; /* Boucle de parcours */ vmpa2t start; /* Adresse de départ de combles*/ - bool refresh; /* Besoin de rafraîchissement */ - - size_t k; - - - for (k = 0; k < *count; k++) - { - printf(" (filled) AREA %zu :: 0x%08x + %u\n", - k, - (unsigned int)get_phy_addr(get_mrange_addr(&(*list)[k].range)), - (unsigned int)get_mrange_length(&(*list)[k].range)); - - } - - area = (*list) + *index; - - - printf(" === FILLING (%zu) | 0x%08x // 0x%08x <-> 0x%08x...\n", *index, - (unsigned int)get_phy_addr(get_mrange_addr(&area->range)), - (unsigned int)get_virt_addr(get_mrange_addr(&area->range)), - (unsigned int)(get_virt_addr(get_mrange_addr(&area->range)) + get_mrange_length(&area->range))); - - - /* Les symboles se doivent d'être indépendants ! */ if (area->has_sym) return; diff --git a/src/analysis/disass/output.c b/src/analysis/disass/output.c index edd6843..f2c49bb 100644 --- a/src/analysis/disass/output.c +++ b/src/analysis/disass/output.c @@ -183,17 +183,6 @@ void print_disassembled_instructions(GCodeBuffer *buffer, const GExeFormat *form iaddr = get_mrange_addr(g_arch_instruction_get_range(iter)); saddr = get_mrange_addr(g_binary_symbol_get_range(symbols[sym_index])); - - printf("OUTPUT [%zu] :: (instr) 0x%08x - 0x%08x :: (sym) 0x%08x - 0x%08x '%s' (cmp=%d)\n", - sym_index, - (unsigned int)get_phy_addr(iaddr), - (unsigned int)get_virt_addr(iaddr), - (unsigned int)get_phy_addr(saddr), - (unsigned int)get_virt_addr(saddr), - g_binary_symbol_to_string(symbols[sym_index]), - cmp_vmpa(iaddr, saddr)); - - /* On écarte les symboles qu'on ne sait pas réintroduire */ for (compared = cmp_vmpa(iaddr, saddr); compared > 0; diff --git a/src/arch/arm/v7/context.c b/src/arch/arm/v7/context.c index c29794d..885ce70 100644 --- a/src/arch/arm/v7/context.c +++ b/src/arch/arm/v7/context.c @@ -209,12 +209,6 @@ GArmV7Context *g_armv7_context_new(void) static void g_armv7_context_push_drop_point(GArmV7Context *ctx, virt_t addr) { - - - printf("PUSH v7 !! 0x%08x\n", addr); - - - if (addr & 0x1) { addr -= 0x1; @@ -229,8 +223,9 @@ static void g_armv7_context_push_drop_point(GArmV7Context *ctx, virt_t addr) /****************************************************************************** * * -* Paramètres : ctx = contexte de désassemblage à compléter. * -* addr = adresse d'un nouveau point de départ à traiter. * +* Paramètres : ctx = contexte de désassemblage à compléter. * +* addr = adresse d'un nouveau point de départ à traiter. * +* marker = forme générique d'un encodage à mémoriser. * * * * Description : Ajoute une adresse virtuelle comme point de départ de code. * * * @@ -242,19 +237,12 @@ static void g_armv7_context_push_drop_point(GArmV7Context *ctx, virt_t addr) void g_armv7_context_push_drop_point_ext(GArmV7Context *ctx, virt_t addr, ArmV7InstrSet marker) { - - - printf("PUSH v7 !! 0x%08x\n", (unsigned int)addr); - - - if (addr & 0x1) { addr -= 0x1; assert(marker == AV7IS_THUMB); } - g_armv7_context_define_encoding(ctx, addr, marker); G_PROC_CONTEXT_CLASS(g_armv7_context_parent_class)->push_point(G_PROC_CONTEXT(ctx), addr); @@ -262,14 +250,6 @@ void g_armv7_context_push_drop_point_ext(GArmV7Context *ctx, virt_t addr, ArmV7I } - - - - - - - - /****************************************************************************** * * * Paramètres : ctx = contexte de désassemblage à compléter. * @@ -286,8 +266,6 @@ void g_armv7_context_push_drop_point_ext(GArmV7Context *ctx, virt_t addr, ArmV7I void g_armv7_context_define_encoding(GArmV7Context *ctx, virt_t addr, ArmV7InstrSet marker) { - printf(" --encoding-- @ 0x%08llx -> %d\n", (unsigned long long)addr, (int)marker); - _g_arm_context_define_encoding(G_ARM_CONTEXT(ctx), addr, marker); } diff --git a/src/arch/arm/v7/context.h b/src/arch/arm/v7/context.h index a4d99d6..48cafce 100644 --- a/src/arch/arm/v7/context.h +++ b/src/arch/arm/v7/context.h @@ -57,7 +57,6 @@ GType g_armv7_context_get_type(void); GArmV7Context *g_armv7_context_new(void); - /* Jeux d'instructions possibles avec ARM v7 */ typedef enum _ArmV7InstrSet { @@ -77,21 +76,9 @@ void g_armv7_context_define_encoding(GArmV7Context *, virt_t, ArmV7InstrSet); /* Indique l'encodage (générique) utilisé à une adresse donnée. */ ArmV7InstrSet g_armv7_context_find_encoding(GArmV7Context *, virt_t); - - - - - - - - - - +/* Ajoute une adresse virtuelle comme point de départ de code. */ void g_armv7_context_push_drop_point_ext(GArmV7Context *ctx, virt_t addr, ArmV7InstrSet marker); - - - #endif /* _ARCH_ARM_V7_CONTEXT_H */ diff --git a/src/gtkext/graph/ranks.c b/src/gtkext/graph/ranks.c index a10d5a1..e1f6688 100644 --- a/src/gtkext/graph/ranks.c +++ b/src/gtkext/graph/ranks.c @@ -641,7 +641,6 @@ void g_graph_ranks_compute_y_line(GGraphRanks *ranks) last_bottom = GRAPH_VERTICAL_MARGIN; y = 0; - for (i = 0; i < ranks->count; i++) last_bottom = compute_rank_props_y_pos(&ranks->props[i], &y, last_bottom); diff --git a/src/gtkext/gtkgraphview.c b/src/gtkext/gtkgraphview.c index e0eb870..46a82eb 100644 --- a/src/gtkext/gtkgraphview.c +++ b/src/gtkext/gtkgraphview.c @@ -242,8 +242,6 @@ static void gtk_graph_view_adjust_scroll_value(GtkGraphView *view, GtkAdjustment fake_y = 0; gtk_buffer_view_compute_fake_coord(view, &fake_x, &fake_y); - printf("fake :: (%d ; %d)\n", fake_x, fake_y); - gtk_fixed_move(GTK_FIXED(view), GTK_WIDGET(view->support), fake_x, -fake_y); } diff --git a/src/gtkext/gtkviewpanel.c b/src/gtkext/gtkviewpanel.c index e36da71..574bf22 100644 --- a/src/gtkext/gtkviewpanel.c +++ b/src/gtkext/gtkviewpanel.c @@ -331,11 +331,6 @@ static void gtk_view_panel_size_allocate(GtkWidget *widget, GtkAllocation *alloc GTK_WIDGET_CLASS(gtk_view_panel_parent_class)->size_allocate(widget, allocation); - - printf("[%s / %p] __SIZE :: (%d ; %d)\n", G_OBJECT_TYPE_NAME(widget), widget, - allocation->width, allocation->height); - - panel = GTK_VIEW_PANEL(widget); gtk_view_panel_update_adjustment(panel, GTK_ORIENTATION_HORIZONTAL); -- cgit v0.11.2-87-g4458