diff options
Diffstat (limited to 'src/graph/layout.c')
-rw-r--r-- | src/graph/layout.c | 78 |
1 files changed, 44 insertions, 34 deletions
diff --git a/src/graph/layout.c b/src/graph/layout.c index 667074b..21f7454 100644 --- a/src/graph/layout.c +++ b/src/graph/layout.c @@ -2,7 +2,7 @@ /* OpenIDA - Outil d'analyse de fichiers binaires * layout.c - mise en place de graphique * - * Copyright (C) 2009 Cyrille Bagard + * Copyright (C) 2009-2012 Cyrille Bagard * * This file is part of OpenIDA. * @@ -31,7 +31,9 @@ #include "dot.h" #include "node.h" +#include "../analysis/binary.h" #include "../common/extstr.h" +#include "../gtkext/gtkbufferview.h" @@ -40,7 +42,7 @@ /* Etablit tous les liens entre les différents morceaux de code. */ -static char *complete_graph_links(const GtkGraphView *, GtkBinView **, size_t, char *); +static char *complete_graph_links(const GtkGraphView *, GtkViewPanel **, size_t, char *); @@ -58,7 +60,7 @@ static char *complete_graph_links(const GtkGraphView *, GtkBinView **, size_t, c * * ******************************************************************************/ -bool build_graph_view(GtkGraphView *view, GtkBinView **views, size_t count) +bool build_graph_view(GtkGraphView *view, GtkViewPanel **views, size_t count) { GGraphNode **nodes; /* Intermédiaires en place */ size_t i; /* Boucle de parcours */ @@ -72,12 +74,11 @@ bool build_graph_view(GtkGraphView *view, GtkBinView **views, size_t count) nodes = (GGraphNode **)calloc(count, sizeof(GGraphNode *)); for (i = 0; i < count; i++) - nodes[i] = g_graph_node_new(views[i]); + nodes[i] = g_graph_node_new(GTK_WIDGET(views[i])); /* Définition du graphique */ cmds = strdup("digraph G {\noverlap=false;\n splines=true;\n"); - //cmds = strdup("digraph G {\n"); for (i = 0; i < count; i++) cmds = g_graph_node_register_for_dot(nodes[i], cmds); @@ -86,8 +87,6 @@ bool build_graph_view(GtkGraphView *view, GtkBinView **views, size_t count) cmds = stradd(cmds, "}"); - printf("first step :: '%s'\n", cmds); - layout = create_graph_layout(cmds); /* Affichage du graphique */ @@ -113,7 +112,7 @@ bool build_graph_view(GtkGraphView *view, GtkBinView **views, size_t count) * Paramètres : view = support contenant les différentes lignes. * * views = morceaux de code à afficher de façon organisée. * * count = quantité de ces morceaux de code. * -* desc = description du graphique à compléter. * +* desc = description du graphique à compléter. [OUT] * * * * Description : Etablit tous les liens entre les différents morceaux de code.* * * @@ -123,51 +122,65 @@ bool build_graph_view(GtkGraphView *view, GtkBinView **views, size_t count) * * ******************************************************************************/ -static char *complete_graph_links(const GtkGraphView *view, GtkBinView **views, size_t count, char *desc) +static char *complete_graph_links(const GtkGraphView *view, GtkViewPanel **views, size_t count, char *desc) { + GOpenidaBinary *binary; /* Binaire rattaché aux vues */ + GArchInstruction *instrs; /* Instructions pour assembleur*/ + GBufferView *buffer; /* Tampon d'une partie de code */ + vmpa_t end; /* Adresse finale du tampon */ size_t i; /* Boucle de parcours #1 */ - GRenderingLine *last; /* Dernière ligne d'un bloc */ - GRenderingLine **dests; /* Ligne visée par une autre */ + GArchInstruction *last; /* Dernière instruc. d'un bloc */ + vmpa_t addr; /* Addresse d'instruction */ + GArchInstruction **dests; /* Instr. visée par une autre */ InstructionLinkType *types; /* Type de lien entre lignes */ size_t dcount; /* Nombre de liens de dest. */ size_t j; /* Boucle de parcours #2 */ - vmpa_t addr; /* Addresse de destination */ size_t k; /* Boucle de parcours #3 */ - char buffer[LINKS_DESC_LEN]; /* Tampon pour l'ajout de liens*/ - GRenderingLine *next; /* Ligne suivante dans le flux */ + char cmd[LINKS_DESC_LEN]; /* Tampon pour l'ajout de liens*/ + GArchInstruction *next; /* Instruction suivante */ + + if (count == 0) + return desc; + + binary = gtk_view_panel_get_binary(views[0]); + instrs = g_openida_binary_get_instructions(binary); for (i = 0; i < count; i++) { - last = gtk_bin_view_get_last_line(views[i]); + buffer = gtk_buffer_view_get_buffer(GTK_BUFFER_VIEW(views[i])); + g_buffer_view_get_restrictions(buffer, NULL, &end); - if (g_rendering_line_has_destinations(last)) + last = g_arch_instruction_find_by_address(instrs, end, true); + g_arch_instruction_get_location(last, NULL, NULL, &addr); + + if (g_arch_instruction_has_destinations(last)) { - dcount = g_rendering_line_get_destinations(last, &dests, &types); + dcount = g_arch_instruction_get_destinations(last, &dests, &types); for (j = 0; j < dcount; j++) { - addr = get_rendering_line_address(dests[j]); + g_arch_instruction_get_location(dests[j], NULL, NULL, &addr); for (k = 0; k < count; k++) - if (gtk_bin_view_contain_address(views[k], addr)) + if (gtk_view_panel_contain_address(views[k], addr)) break; if (k < count) switch (types[j]) { case ILT_JUMP: - snprintf(buffer, LINKS_DESC_LEN, "_%p -> _%p;\n", views[i], views[k]); - desc = stradd(desc, buffer); + snprintf(cmd, LINKS_DESC_LEN, "_%p -> _%p;\n", views[i], views[k]); + desc = stradd(desc, cmd); break; case ILT_JUMP_IF_TRUE: - snprintf(buffer, LINKS_DESC_LEN, "_%p -> _%p;\n", views[i], views[k]); - desc = stradd(desc, buffer); + snprintf(cmd, LINKS_DESC_LEN, "_%p -> _%p;\n", views[i], views[k]); + desc = stradd(desc, cmd); break; case ILT_JUMP_IF_FALSE: - snprintf(buffer, LINKS_DESC_LEN, "_%p -> _%p;\n", views[i], views[k]); - desc = stradd(desc, buffer); + snprintf(cmd, LINKS_DESC_LEN, "_%p -> _%p;\n", views[i], views[k]); + desc = stradd(desc, cmd); break; default: @@ -180,24 +193,21 @@ static char *complete_graph_links(const GtkGraphView *view, GtkBinView **views, } /* Si la ligne n'est pas la dernière, on suit le flux normal */ - else if (last != gtk_bin_view_get_last_line(view)) + else if (addr != end) { - next = g_rendering_line_get_next_iter(gtk_bin_view_get_lines(GTK_BIN_VIEW(view)), - last, - gtk_bin_view_get_last_line(GTK_BIN_VIEW(view))); - + next = g_arch_instruction_get_next_iter(instrs, last, end); if (next == NULL) continue; - addr = get_rendering_line_address(next); + g_arch_instruction_get_location(next, NULL, NULL, &addr); for (k = 0; k < count; k++) - if (gtk_bin_view_contain_address(views[k], addr)) + if (gtk_view_panel_contain_address(views[k], addr)) break; if (k < count) { - snprintf(buffer, LINKS_DESC_LEN, "_%p -> _%p;\n", views[i], views[k]); - desc = stradd(desc, buffer); + snprintf(cmd, LINKS_DESC_LEN, "_%p -> _%p;\n", views[i], views[k]); + desc = stradd(desc, cmd); } } |