diff options
Diffstat (limited to 'src/analysis/disass/output.c')
-rw-r--r-- | src/analysis/disass/output.c | 183 |
1 files changed, 54 insertions, 129 deletions
diff --git a/src/analysis/disass/output.c b/src/analysis/disass/output.c index fe4d705..6c044be 100644 --- a/src/analysis/disass/output.c +++ b/src/analysis/disass/output.c @@ -27,27 +27,18 @@ #include <i18n.h> -#include "../../arch/processor.h" -#include "../../common/extstr.h" #include "../../format/format.h" +#include "../../glibext/generators/rborder.h" #include "../../gui/panels/log.h" -#define ROUTINE_INTRO_MSG "; --------------- BEGIN OF PROCEDURE ---------------" - -#define ROUTINE_OUTRO_MSG "; ---------------- END OF PROCEDURE ----------------" - - - /****************************************************************************** * * -* Paramètres : buffer = tampon de récueil des résultats d'impression. * -* format = format du binaire traité. * -* instrs = ensemble d'instructions à traiter. * -* routines = liste de routines intervenant dans le flot. * -* count = quantité de ces routines. * -* status = barre de statut avec progression à mettre à jour. * +* Paramètres : cache = tampon de récueil des résultats d'impression. * +* lang = langage de haut niveau préféré pour l'impression. * +* binary = tampon de récueil des résultats d'impression. * +* status = barre de statut avec progression à mettre à jour. * * * * Description : Transcrit du code désassemblé en texte humainement lisible. * * * @@ -57,8 +48,10 @@ * * ******************************************************************************/ -void print_disassembled_instructions(GCodeBuffer *buffer, GExeFormat *format, GArchProcessor *proc, GtkStatusStack *status) +void print_disassembled_instructions(GBufferCache *cache, GCodingLanguage *lang, GLoadedBinary *binary, GtkStatusStack *status) { + GExeFormat *format; /* Format associé au binaire */ + GArchProcessor *proc; /* Processeur de l'architecture*/ GBinPortion *root; /* Couche première de portions */ GBinPortion **portions; /* Morceaux d'encadrement */ size_t portions_count; /* Taille de cette liste */ @@ -74,22 +67,21 @@ void print_disassembled_instructions(GCodeBuffer *buffer, GExeFormat *format, GA size_t i; /* Boucle de parcours */ GArchInstruction *instr; /* Instruction à traiter */ const vmpa2t *iaddr; /* Adresse d'instruction */ - vmpa2t outro_addr; /* Adresse de fin de code */ - GBufferLine *line; + GBorderGenerator *border; /* Délimitation de routine */ const vmpa2t *paddr; /* Adresse de portion */ + GLineGenerator *generator; /* Générateur de contenu ajouté*/ const vmpa2t *saddr; /* Adresse de symbole */ int compared; /* Bilan d'une comparaison */ SymbolType stype; /* Type de symbole trouvé */ - const char *label; /* Etiquette ciblant un symbole*/ - mrange_t range; /* Couverture sans surface */ + vmpa2t intro_addr; /* Adresse de début de code */ + vmpa2t outro_addr; /* Adresse de fin de code */ + BufferLineFlags flags; /* Propriétés pour la ligne */ + //mrange_t range; /* Couverture sans surface */ GDbComment *comment; /* Commentaire à ajouter */ - const char *text; - - char *prefixed; @@ -98,6 +90,8 @@ void print_disassembled_instructions(GCodeBuffer *buffer, GExeFormat *format, GA + format = g_loaded_binary_get_format(binary); + proc = g_loaded_binary_get_processor(binary); bool collect_all_portions(GBinPortion *portion, GBinPortion *parent, BinaryPortionVisit visit, void *unused) { @@ -149,29 +143,8 @@ void print_disassembled_instructions(GCodeBuffer *buffer, GExeFormat *format, GA { expect_outro = false; - init_mrange(&range, &outro_addr, 0); - - line = g_code_buffer_prepare_new_line(buffer, &range); - g_buffer_line_add_flag(line, BLF_IS_LABEL); - g_buffer_line_fill_mrange(line, msize, msize); - - g_code_buffer_append_new_line(buffer, line); - - line = g_code_buffer_prepare_new_line(buffer, &range); - g_buffer_line_add_flag(line, BLF_IS_LABEL); - g_buffer_line_fill_mrange(line, msize, msize); - - g_buffer_line_start_merge_at(line, BLC_ASSEMBLY_HEAD); - g_buffer_line_append_text(line, BLC_ASSEMBLY_HEAD, - ROUTINE_OUTRO_MSG, strlen(ROUTINE_OUTRO_MSG), RTT_COMMENT, NULL); - - g_code_buffer_append_new_line(buffer, line); - - line = g_code_buffer_prepare_new_line(buffer, &range); - g_buffer_line_add_flag(line, BLF_IS_LABEL); - g_buffer_line_fill_mrange(line, msize, msize); - - g_code_buffer_append_new_line(buffer, line); + border = g_border_generator_new(lang, &outro_addr, false, msize); + g_buffer_cache_append(cache, G_LINE_GENERATOR(border), BLF_NONE); } @@ -184,7 +157,11 @@ void print_disassembled_instructions(GCodeBuffer *buffer, GExeFormat *format, GA if (cmp_vmpa_by_phy(iaddr, paddr) != 0) break; - g_binary_portion_print(portions[portion_index], buffer, msize); + generator = G_LINE_GENERATOR(portions[portion_index]); + + /* Si elle comporte une description ! */ + if (g_line_generator_count_lines(generator) > 0) + g_buffer_cache_append(cache, generator, BLF_NONE); portion_index++; @@ -192,7 +169,10 @@ void print_disassembled_instructions(GCodeBuffer *buffer, GExeFormat *format, GA /* Début d'un nouveau symbole ? */ - if (sym_index < sym_count) + if (sym_index == sym_count) + compared = -1; + + else { iaddr = get_mrange_addr(g_arch_instruction_get_range(instr)); saddr = get_mrange_addr(g_binary_symbol_get_range(symbols[sym_index])); @@ -225,29 +205,10 @@ void print_disassembled_instructions(GCodeBuffer *buffer, GExeFormat *format, GA { /* Impression de la marque de début */ - init_mrange(&range, get_mrange_addr(g_binary_symbol_get_range(symbols[sym_index])), 0); - - line = g_code_buffer_prepare_new_line(buffer, &range); - g_buffer_line_add_flag(line, BLF_IS_LABEL); - g_buffer_line_fill_mrange(line, msize, msize); - - g_code_buffer_append_new_line(buffer, line); - - line = g_code_buffer_prepare_new_line(buffer, &range); - g_buffer_line_add_flag(line, BLF_IS_LABEL); - g_buffer_line_fill_mrange(line, msize, msize); - - g_buffer_line_start_merge_at(line, BLC_ASSEMBLY_HEAD); - g_buffer_line_append_text(line, BLC_ASSEMBLY_HEAD, - ROUTINE_INTRO_MSG, strlen(ROUTINE_INTRO_MSG), RTT_COMMENT, NULL); - - g_code_buffer_append_new_line(buffer, line); + copy_vmpa(&intro_addr, get_mrange_addr(g_binary_symbol_get_range(symbols[sym_index]))); - line = g_code_buffer_prepare_new_line(buffer, &range); - g_buffer_line_add_flag(line, BLF_IS_LABEL); - g_buffer_line_fill_mrange(line, msize, msize); - - g_code_buffer_append_new_line(buffer, line); + border = g_border_generator_new(lang, &intro_addr, true, msize); + g_buffer_cache_append(cache, G_LINE_GENERATOR(border), BLF_NONE); /* Mémorisation de la fin */ @@ -259,23 +220,10 @@ void print_disassembled_instructions(GCodeBuffer *buffer, GExeFormat *format, GA /* Etiquette ? */ - label = g_binary_symbol_get_label(symbols[sym_index]); - - if (label != NULL) - { - init_mrange(&range, get_mrange_addr(g_binary_symbol_get_range(symbols[sym_index])), 0); - - line = g_code_buffer_prepare_new_line(buffer, &range); - g_buffer_line_add_flag(line, BLF_IS_LABEL); - g_buffer_line_fill_mrange(line, msize, msize); - - g_buffer_line_start_merge_at(line, BLC_ASSEMBLY_HEAD); - g_buffer_line_append_text(line, BLC_ASSEMBLY_HEAD, label, strlen(label), RTT_LABEL, NULL); - g_buffer_line_append_text(line, BLC_ASSEMBLY_HEAD, ":", 1, RTT_PUNCT, NULL); - - g_code_buffer_append_new_line(buffer, line); + generator = g_binary_symbol_produce_label(symbols[sym_index]); - } + if (generator != NULL) + g_buffer_cache_append(cache, generator, BLF_NONE); } @@ -283,64 +231,37 @@ void print_disassembled_instructions(GCodeBuffer *buffer, GExeFormat *format, GA no_more_symbol_finally: + flags = BLF_NONE; - - line = g_arch_instruction_print(instr, buffer, msize, content, ASX_INTEL); - - - if (g_arch_instruction_get_flags(instr) & AIF_RETURN_POINT) - g_buffer_line_add_flag(line, BLF_BOOKMARK); - - - if (sym_index < sym_count) + if (compared == 0) { - iaddr = get_mrange_addr(g_arch_instruction_get_range(instr)); - saddr = get_mrange_addr(g_binary_symbol_get_range(symbols[sym_index])); - - if (cmp_vmpa(iaddr, saddr) == 0) - { - /* Point d'entrée ? */ - - if (g_binary_symbol_get_target_type(symbols[sym_index]) == STP_ENTRY_POINT) - g_buffer_line_add_flag(line, BLF_ENTRYPOINT); + /* Point d'entrée ? */ - /* Début d'un groupe bien cohérent avec les alignements ? */ + if (g_binary_symbol_get_target_type(symbols[sym_index]) == STP_ENTRY_POINT) + flags |= BLF_ENTRYPOINT; - if (g_binary_symbol_is_block_start(symbols[sym_index])) - g_buffer_line_add_flag(line, BLF_WIDTH_MANAGER); + /* Début d'un groupe bien cohérent avec les alignements ? */ - /* Commentaire ? */ - - comment = g_binary_symbol_get_comment(symbols[sym_index]); - - if (comment != NULL) - { + if (g_binary_symbol_is_block_start(symbols[sym_index])) + flags |= BLF_WIDTH_MANAGER; - /* FIXME : appliquer ! */ - - text = g_db_comment_get_text(comment); - - - prefixed = strdup("; "); - prefixed = stradd(prefixed, text); - - - - g_buffer_line_append_text(line, BLC_COMMENTS, prefixed, strlen(prefixed), RTT_COMMENT, NULL); + } + g_buffer_cache_append(cache, G_LINE_GENERATOR(instr), flags); - free(prefixed); + if (compared == 0) + { + /* Commentaire ? */ - } + comment = g_binary_symbol_get_comment(symbols[sym_index]); - sym_index++; + if (comment != NULL) + g_db_item_apply(G_DB_ITEM(comment), binary); - } + sym_index++; } - g_code_buffer_append_new_line(buffer, line); - g_object_unref(G_OBJECT(instr)); gtk_status_stack_update_activity_value(status, id, 1); @@ -356,6 +277,10 @@ void print_disassembled_instructions(GCodeBuffer *buffer, GExeFormat *format, GA if (portions != NULL) free(portions); + g_object_unref(G_OBJECT(proc)); + g_object_unref(G_OBJECT(format)); + + fprintf(stderr, "MISSING :: %u symbols\n", _missing); |