diff options
Diffstat (limited to 'src/analysis/disass/disassembler.c')
| -rw-r--r-- | src/analysis/disass/disassembler.c | 127 |
1 files changed, 38 insertions, 89 deletions
diff --git a/src/analysis/disass/disassembler.c b/src/analysis/disass/disassembler.c index 5326c36..246a5b2 100644 --- a/src/analysis/disass/disassembler.c +++ b/src/analysis/disass/disassembler.c @@ -39,11 +39,16 @@ #include "routines.h" #include "../../format/format.h" #include "../../glibext/delayed-int.h" +#include "../../glibext/generators/prologue.h" #include "../../gui/panels/log.h" #include "../../plugins/pglist.h" +#include "../human/asm/lang.h" // TODO : REMME -> format ! + + + /* ------------------------ DESASSEMBLAGE DE BINAIRE DIFFERE ------------------------ */ @@ -54,8 +59,9 @@ struct _GDelayedDisassembly GLoadedBinary *binary; /* Destinataire final */ GExeFormat *format; /* Format du binaire représenté*/ + GCodingLanguage *lang; /* Traduction en ASM préférée */ - GCodeBuffer *buffer; /* Tampon pour le rendu */ + GBufferCache *cache; /* Tampon pour le rendu */ }; @@ -80,7 +86,7 @@ static void g_delayed_disassembly_dispose(GDelayedDisassembly *); static void g_delayed_disassembly_finalize(GDelayedDisassembly *); /* Crée une tâche de désassemblage différé. */ -static GDelayedDisassembly *g_delayed_disassembly_new(GLoadedBinary *, GCodeBuffer *); +static GDelayedDisassembly *g_delayed_disassembly_new(GLoadedBinary *, GBufferCache *); /* Opère sur toutes les instructions. */ static void process_all_instructions(wgroup_id_t, GtkStatusStack *, const char *, ins_fallback_cb, GArchProcessor *, GProcContext *, GExeFormat *); @@ -97,7 +103,7 @@ static void g_delayed_disassembly_process(GDelayedDisassembly *, GtkStatusStack /* Construit la description d'introduction du désassemblage. */ -static void build_disass_prologue(GCodeBuffer *, const char *, const char *); +static void build_disass_prologue(GBufferCache *, const GCodingLanguage *, const char *, const char *); @@ -172,6 +178,7 @@ static void g_delayed_disassembly_init(GDelayedDisassembly *disass) static void g_delayed_disassembly_dispose(GDelayedDisassembly *disass) { g_object_unref(G_OBJECT(disass->format)); + g_object_unref(G_OBJECT(disass->lang)); G_OBJECT_CLASS(g_delayed_disassembly_parent_class)->dispose(G_OBJECT(disass)); @@ -211,7 +218,7 @@ static void g_delayed_disassembly_finalize(GDelayedDisassembly *disass) * * ******************************************************************************/ -static GDelayedDisassembly *g_delayed_disassembly_new(GLoadedBinary *binary, GCodeBuffer *buffer) +static GDelayedDisassembly *g_delayed_disassembly_new(GLoadedBinary *binary, GBufferCache *cache) { GDelayedDisassembly *result; /* Tâche à retourner */ @@ -219,8 +226,9 @@ static GDelayedDisassembly *g_delayed_disassembly_new(GLoadedBinary *binary, GCo result->binary = binary; result->format = g_loaded_binary_get_format(binary); + result->lang = g_asm_language_new(); - result->buffer = buffer; + result->cache = cache; return result; @@ -568,7 +576,7 @@ static void g_delayed_disassembly_process(GDelayedDisassembly *disass, GtkStatus - print_disassembled_instructions(disass->buffer, disass->format, proc, status); + print_disassembled_instructions(disass->cache, disass->lang, disass->binary, status); @@ -612,10 +620,10 @@ static void g_delayed_disassembly_process(GDelayedDisassembly *disass, GtkStatus /****************************************************************************** * * -* Paramètres : buffer = tampon de destination pour le texte. * +* Paramètres : cache = tampon de destination pour le texte. * +* lang = trauducteur pour l'impression finale. * * filename = nom du fichier ciblé à décompiler. * -* data = données en mémoire pour l'empreinte. * -* length = quantité de données à prendre en compte. * +* checksum = empreinte identifiant le binaire chargé. * * * * Description : Construit la description d'introduction du désassemblage. * * * @@ -625,96 +633,32 @@ static void g_delayed_disassembly_process(GDelayedDisassembly *disass, GtkStatus * * ******************************************************************************/ -static void build_disass_prologue(GCodeBuffer *buffer, const char *filename, const char *checksum) +static void build_disass_prologue(GBufferCache *cache, const GCodingLanguage *lang, const char *filename, const char *checksum) { -#if 0 - GLangOutput *output; /* Modèle de sortie adéquat */ - GBufferLine *line; /* Ligne de destination */ - bool managed; /* Groupe déjà défini ? */ - size_t len; /* Taille du texte */ - char *content; /* Contenu textuel d'une ligne */ - - output = g_asm_output_new(); + char **text; /* Contenu brute à imprimer */ + GIntroGenerator *generator; /* Générateur constitué */ - line = g_lang_output_start_comments(output, buffer); - if (line != NULL) - { - g_buffer_line_start_merge_at(line, BLC_PHYSICAL); - g_buffer_line_add_flag(line, BLF_WIDTH_MANAGER); - - g_code_buffer_append_new_line(buffer, line); - - } - - managed = (line != NULL); + text = calloc(4, sizeof(char *)); /* Introduction */ - line = g_lang_output_continue_comments(output, buffer, - SL(_("Disassembly generated by Chrysalide"))); - g_buffer_line_start_merge_at(line, BLC_PHYSICAL); - - if (!managed) - g_buffer_line_add_flag(line, BLF_WIDTH_MANAGER); - - g_code_buffer_append_new_line(buffer, line); - - line = g_lang_output_continue_comments(output, buffer, - SL(_("Chrysalide is free software - © 2008-2015 Cyrille Bagard"))); - g_buffer_line_start_merge_at(line, BLC_PHYSICAL); - - g_code_buffer_append_new_line(buffer, line); - - line = g_lang_output_continue_comments(output, buffer, NULL, 0); - g_buffer_line_start_merge_at(line, BLC_PHYSICAL); - - g_code_buffer_append_new_line(buffer, line); + text[0] = strdup(_("Disassembly generated by Chrysalide")); + text[1] = strdup(_("Chrysalide is free software - © 2008-2016 Cyrille Bagard")); /* Fichier */ - len = strlen(_("File: ")) + strlen(filename) + 1; - content = (char *)calloc(len, sizeof(char)); - - snprintf(content, len, "%s%s", _("File: "), filename); - - line = g_lang_output_continue_comments(output, buffer, content, len - 1); - g_buffer_line_start_merge_at(line, BLC_PHYSICAL); - - g_code_buffer_append_new_line(buffer, line); - - free(content); + asprintf(&text[2], "%s%s", _("File: "), filename); /* Checksum SHA256 */ - len = strlen(_("Sha256: ")) + strlen(checksum); - content = (char *)calloc(len + 1, sizeof(char)); - - snprintf(content, len + 1, "%s%s", _("Sha256: "), checksum); - - line = g_lang_output_continue_comments(output, buffer, content, len - 1); - g_buffer_line_start_merge_at(line, BLC_PHYSICAL); - - g_code_buffer_append_new_line(buffer, line); + asprintf(&text[3], "%s%s", _("Sha256: "), checksum); - free(content); + /* Intégration finale */ - /* Ligne de séparation */ + generator = g_intro_generator_new(lang, text, 4); - line = g_lang_output_continue_comments(output, buffer, NULL, 0); - g_buffer_line_start_merge_at(line, BLC_PHYSICAL); - g_code_buffer_append_new_line(buffer, line); + g_buffer_cache_append(cache, G_LINE_GENERATOR(generator), BLF_NONE); - /* Conclusion */ - - line = g_lang_output_end_comments(output, buffer); - if (line != NULL) - { - g_buffer_line_start_merge_at(line, BLC_PHYSICAL); - g_code_buffer_append_new_line(buffer, line); - } - - g_object_unref(G_OBJECT(output)); -#endif } @@ -724,7 +668,7 @@ static void build_disass_prologue(GCodeBuffer *buffer, const char *filename, con * parts = parties binaires à désassembler. * * count = nombre de parties à traiter. * * instrs = liste des instructions chargées. [OUT] * -* buffer = tampon de code mis en place. [OUT] * +* cache = tampon de code mis en place. [OUT] * * ack = fonction à appeler une fois l'opération terminée. * * * * Description : Procède au désassemblage d'un contenu binaire donné. * @@ -735,30 +679,35 @@ static void build_disass_prologue(GCodeBuffer *buffer, const char *filename, con * * ******************************************************************************/ -void disassemble_binary(GLoadedBinary *binary, GCodeBuffer **buffer, disassembly_ack_fc ack) +void disassemble_binary(GLoadedBinary *binary, GBufferCache **cache, disassembly_ack_fc ack) { GBinFormat *format; /* Format associé au binaire */ + GCodingLanguage *lang; /* Langage de sortie préféré */ GBinContent *content; /* Contenu bianire manipulé */ const gchar *checksum; /* Identifiant de binaire */ GDelayedDisassembly *disass; /* Désassemblage à mener */ GWorkQueue *queue; /* Gestionnaire de différés */ - *buffer = g_code_buffer_new(BLC_ASSEMBLY); + *cache = g_buffer_cache_new(); format = G_BIN_FORMAT(g_loaded_binary_get_format(binary)); + lang = g_asm_language_new(); + content = g_binary_format_get_content(format); checksum = g_binary_content_get_checksum(content); g_object_unref(G_OBJECT(content)); g_object_unref(G_OBJECT(format)); - build_disass_prologue(*buffer, g_binary_content_describe(content, true), checksum); + build_disass_prologue(*cache, lang, g_binary_content_describe(content, true), checksum); - disass = g_delayed_disassembly_new(binary, *buffer); + disass = g_delayed_disassembly_new(binary, *cache); g_signal_connect(disass, "work-completed", G_CALLBACK(ack), binary); queue = get_work_queue(); g_work_queue_schedule_work(queue, G_DELAYED_WORK(disass), DEFAULT_WORK_GROUP); + g_object_unref(G_OBJECT(lang)); + } |