diff options
author | Cyrille Bagard <nocbos@gmail.com> | 2010-04-11 16:55:16 (GMT) |
---|---|---|
committer | Cyrille Bagard <nocbos@gmail.com> | 2010-04-11 16:55:16 (GMT) |
commit | 49468379e912806400c5874f8e359cb934516228 (patch) | |
tree | bf0c8d3b83410e687a3aaebfd622c4e2e29d682a /src/arch/immediate.c | |
parent | 30258fa96ad48eed68924f259ec5464fc4fd8094 (diff) |
Cleaned the code by removing all references to the old GtkTextBuffer usage.
git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@151 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a
Diffstat (limited to 'src/arch/immediate.c')
-rw-r--r-- | src/arch/immediate.c | 184 |
1 files changed, 0 insertions, 184 deletions
diff --git a/src/arch/immediate.c b/src/arch/immediate.c index 61dc5f5..07f848f 100644 --- a/src/arch/immediate.c +++ b/src/arch/immediate.c @@ -93,8 +93,6 @@ static void g_imm_operand_add_text(const GImmOperand *, GRenderingOptions *, Mai /* Ajoute à un tampon GLib le contenu de l'instance spécifiée. */ static void g_imm_operand_to_buffer(const GImmOperand *, GBufferLine *, GRenderingOptions *); -/* Ajoute à un texte GTK le contenu d'un opérande. */ -static void g_imm_operand_add_to_gtk_buffer(const GImmOperand *, const GExeFormat *, AsmSyntax, GtkTextBuffer *, GtkTextIter *); /* Indique le type défini pour un opérande de valeur numérique. */ @@ -140,7 +138,6 @@ static void g_imm_operand_init(GImmOperand *operand) parent->add_text = (add_text_fc)g_imm_operand_add_text; parent->export_buffer = (export_buffer_fc)g_imm_operand_to_buffer; - parent->add_arch_to_gtk_buffer = (add_arch_to_gtk_buffer_fc)g_imm_operand_add_to_gtk_buffer; } @@ -512,187 +509,6 @@ static void g_imm_operand_to_buffer(const GImmOperand *operand, GBufferLine *buf /****************************************************************************** * * -* Paramètres : operand = opérande à transcrire. * -* format = format du binaire manipulé. * -* syntax = type de représentation demandée. * -* buffer = zone de texte à venir compléter. * -* iter = point d'insertion du nouveau texte. * -* * -* Description : Ajoute à un texte GTK le contenu d'un opérande. * -* * -* Retour : - * -* * -* Remarques : - * -* * -******************************************************************************/ - -static void g_imm_operand_add_to_gtk_buffer(const GImmOperand *operand, const GExeFormat *format, AsmSyntax syntax, GtkTextBuffer *buffer, GtkTextIter *iter) -{ - char value[VMPA_MAX_SIZE]; /* Chaîne à imprimer */ - vmpa_t address; /* Décallage final constaté */ - const char *label; /* Etiquette de symbole */ - SymbolType symtype; /* Type de symbole */ - char *printable; /* Version texte présentable */ - - /* Valeur brute */ - - switch (syntax) - { - case ASX_INTEL: - switch (operand->size) - { - case MDS_UNDEFINED: - snprintf(value, VMPA_MAX_SIZE, "0x???"); - break; - case AOS_8_BITS_UNSIGNED: - snprintf(value, VMPA_MAX_SIZE, "0x%hhx", operand->unsigned_imm.val8); - break; - case AOS_16_BITS_UNSIGNED: - snprintf(value, VMPA_MAX_SIZE, "0x%hx", operand->unsigned_imm.val16); - break; - case AOS_32_BITS_UNSIGNED: - snprintf(value, VMPA_MAX_SIZE, "0x%x", operand->unsigned_imm.val32); - break; - case AOS_64_BITS_UNSIGNED: - snprintf(value, VMPA_MAX_SIZE, "0x%llx", operand->unsigned_imm.val64); - break; - case AOS_8_BITS_SIGNED: - if (g_imm_operand_is_negative(operand)) - snprintf(value, VMPA_MAX_SIZE, "0x%hhx", ~operand->signed_imm.val8 + 1); - else - snprintf(value, VMPA_MAX_SIZE, "0x%hhx", operand->signed_imm.val8); - break; - case AOS_16_BITS_SIGNED: - if (g_imm_operand_is_negative(operand)) - snprintf(value, VMPA_MAX_SIZE, "0x%hx", ~operand->signed_imm.val16 + 1); - else - snprintf(value, VMPA_MAX_SIZE, "0x%hx", operand->signed_imm.val16); - break; - case AOS_32_BITS_SIGNED: - if (g_imm_operand_is_negative(operand)) - snprintf(value, VMPA_MAX_SIZE, "0x%x", ~operand->signed_imm.val32 + 1); - else - snprintf(value, VMPA_MAX_SIZE, "0x%x", operand->signed_imm.val32); - break; - case AOS_64_BITS_SIGNED: - if (g_imm_operand_is_negative(operand)) - snprintf(value, VMPA_MAX_SIZE, "0x%llx", ~operand->signed_imm.val64 + 1); - else - snprintf(value, VMPA_MAX_SIZE, "0x%llx", operand->signed_imm.val64); - break; - } - break; - - case ASX_ATT: - switch (operand->size) - { - case MDS_UNDEFINED: - snprintf(value, VMPA_MAX_SIZE, "$0x???"); - break; - case AOS_8_BITS_UNSIGNED: - snprintf(value, VMPA_MAX_SIZE, "$0x%hhx", operand->unsigned_imm.val8); - break; - case AOS_16_BITS_UNSIGNED: - snprintf(value, VMPA_MAX_SIZE, "$0x%hx", operand->unsigned_imm.val16); - break; - case AOS_32_BITS_UNSIGNED: - snprintf(value, VMPA_MAX_SIZE, "$0x%x", operand->unsigned_imm.val32); - break; - case AOS_64_BITS_UNSIGNED: - snprintf(value, VMPA_MAX_SIZE, "$0x%llx", operand->unsigned_imm.val64); - break; - case AOS_8_BITS_SIGNED: - snprintf(value, VMPA_MAX_SIZE, "$0x%hhx", ~operand->signed_imm.val8 + 1); - break; - case AOS_16_BITS_SIGNED: - snprintf(value, VMPA_MAX_SIZE, "$0x%hx", ~operand->signed_imm.val16 + 1); - break; - case AOS_32_BITS_SIGNED: - snprintf(value, VMPA_MAX_SIZE, "$0x%x", ~operand->signed_imm.val32 + 1); - break; - case AOS_64_BITS_SIGNED: - snprintf(value, VMPA_MAX_SIZE, "$0x%llx", ~operand->signed_imm.val64 + 1); - break; - } - break; - - default: - break; - - } - - g_content_exporter_insert_with_gtk_tag(G_CONTENT_EXPORTER(operand), buffer, iter, - value, strlen(value), RTT_IMMEDIATE); - - /* Complément d'information */ - - if (operand->size == g_arch_processor_get_memory_size(get_arch_processor_from_format(format))) - { - if (g_imm_operand_to_vmpa_t(operand, &address)) - { - if (g_binary_format_resolve_symbol(G_BIN_FORMAT(format), &label, &symtype, &address)) - { - switch (symtype) - { - case STP_OBJECT: - case STP_FUNCTION: - g_content_exporter_insert_with_gtk_tag(G_CONTENT_EXPORTER(operand), buffer, iter, - " ", 1, RTT_NONE); - g_content_exporter_insert_with_gtk_tag(G_CONTENT_EXPORTER(operand), buffer, iter, - "<", 1, RTT_LTGT); - - g_content_exporter_insert_with_gtk_tag(G_CONTENT_EXPORTER(operand), buffer, iter, - label, strlen(label), RTT_LTGT); - - if (address > 0) - { - g_content_exporter_insert_with_gtk_tag(G_CONTENT_EXPORTER(operand), buffer, iter, - "+", 1, RTT_LTGT); - - snprintf(value, VMPA_MAX_SIZE, "0x%llx", address); - - g_content_exporter_insert_with_gtk_tag(G_CONTENT_EXPORTER(operand), buffer, iter, - value, strlen(value), RTT_LTGT); - - } - - g_content_exporter_insert_with_gtk_tag(G_CONTENT_EXPORTER(operand), buffer, iter, - ">", 1, RTT_LTGT); - - break; - - case STP_STRING: - printable = strdup(label); - printable = escape_crlf(printable); - /*printable = strrpl(printable, "<", "<"); - printable = strrpl(printable, ">", ">");*/ - - g_content_exporter_insert_with_gtk_tag(G_CONTENT_EXPORTER(operand), buffer, iter, - " ", 1, RTT_NONE); - g_content_exporter_insert_with_gtk_tag(G_CONTENT_EXPORTER(operand), buffer, iter, - "\"", 1, RTT_STRING); - g_content_exporter_insert_with_gtk_tag(G_CONTENT_EXPORTER(operand), buffer, iter, - printable, strlen(printable), RTT_STRING); - g_content_exporter_insert_with_gtk_tag(G_CONTENT_EXPORTER(operand), buffer, iter, - "\"", 1, RTT_STRING); - - free(printable); - - break; - - } - - } - - } - - } - -} - - -/****************************************************************************** -* * * Paramètres : operand = opérande à traiter. * * addr = valeur résultante. [OUT] * * * |