diff options
author | Cyrille Bagard <nocbos@gmail.com> | 2010-04-11 16:39:38 (GMT) |
---|---|---|
committer | Cyrille Bagard <nocbos@gmail.com> | 2010-04-11 16:39:38 (GMT) |
commit | 30258fa96ad48eed68924f259ec5464fc4fd8094 (patch) | |
tree | 6187f2ddbee31de8bcd1b4b6e930a38f858f922c /src/arch/immediate.c | |
parent | 929150f18d23d82e8390bd98e31b1edb34bc09f1 (diff) |
Provided a faster than GTK display buffer.
git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@150 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a
Diffstat (limited to 'src/arch/immediate.c')
-rw-r--r-- | src/arch/immediate.c | 91 |
1 files changed, 63 insertions, 28 deletions
diff --git a/src/arch/immediate.c b/src/arch/immediate.c index b9b8a6e..61dc5f5 100644 --- a/src/arch/immediate.c +++ b/src/arch/immediate.c @@ -85,11 +85,14 @@ static void g_imm_operand_class_init(GImmOperandClass *); static void g_imm_operand_init(GImmOperand *); /* Construit la chaîne de caractères correspondant à l'opérande. */ -static void g_imm_operand_to_string(const GImmOperand *, AsmSyntax, char [VMPA_MAX_SIZE]); +static size_t g_imm_operand_to_string(const GImmOperand *, AsmSyntax, char [VMPA_MAX_SIZE]); /* Ajoute du texte simple à un fichier ouvert en écriture. */ static void g_imm_operand_add_text(const GImmOperand *, GRenderingOptions *, MainRendering, FILE *); +/* 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 *); @@ -136,6 +139,7 @@ static void g_imm_operand_init(GImmOperand *operand) parent = G_CONTENT_EXPORTER(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; } @@ -352,57 +356,59 @@ bool g_imm_operand_is_negative(const GImmOperand *operand) * * * Description : Construit la chaîne de caractères correspondant à l'opérande.* * * -* Retour : - * +* Retour : Nombre de caractères utilisés. * * * * Remarques : - * * * ******************************************************************************/ -static void g_imm_operand_to_string(const GImmOperand *operand, AsmSyntax syntax, char value[VMPA_MAX_SIZE]) +static size_t g_imm_operand_to_string(const GImmOperand *operand, AsmSyntax syntax, char value[VMPA_MAX_SIZE]) { + size_t result; /* Longueur à retourner */ + switch (syntax) { case ASX_INTEL: switch (operand->size) { case MDS_UNDEFINED: - snprintf(value, VMPA_MAX_SIZE, "0x???"); + result = snprintf(value, VMPA_MAX_SIZE, "0x???"); break; case AOS_8_BITS_UNSIGNED: - snprintf(value, VMPA_MAX_SIZE, "0x%hhx", operand->unsigned_imm.val8); + result = 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); + result = 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); + result = 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); + result = 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); + result = snprintf(value, VMPA_MAX_SIZE, "0x%hhx", ~operand->signed_imm.val8 + 1); else - snprintf(value, VMPA_MAX_SIZE, "0x%hhx", operand->signed_imm.val8); + result = 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); + result = snprintf(value, VMPA_MAX_SIZE, "0x%hx", ~operand->signed_imm.val16 + 1); else - snprintf(value, VMPA_MAX_SIZE, "0x%hx", operand->signed_imm.val16); + result = 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); + result = snprintf(value, VMPA_MAX_SIZE, "0x%x", ~operand->signed_imm.val32 + 1); else - snprintf(value, VMPA_MAX_SIZE, "0x%x", operand->signed_imm.val32); + result = 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); + result = snprintf(value, VMPA_MAX_SIZE, "0x%llx", ~operand->signed_imm.val64 + 1); else - snprintf(value, VMPA_MAX_SIZE, "0x%llx", operand->signed_imm.val64); + result = snprintf(value, VMPA_MAX_SIZE, "0x%llx", operand->signed_imm.val64); break; } break; @@ -411,31 +417,31 @@ static void g_imm_operand_to_string(const GImmOperand *operand, AsmSyntax syntax switch (operand->size) { case MDS_UNDEFINED: - snprintf(value, VMPA_MAX_SIZE, "$0x???"); + result = snprintf(value, VMPA_MAX_SIZE, "$0x???"); break; case AOS_8_BITS_UNSIGNED: - snprintf(value, VMPA_MAX_SIZE, "$0x%hhx", operand->unsigned_imm.val8); + result = 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); + result = 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); + result = 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); + result = 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); + result = 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); + result = 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); + result = 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); + result = snprintf(value, VMPA_MAX_SIZE, "$0x%llx", ~operand->signed_imm.val64 + 1); break; } break; @@ -445,6 +451,8 @@ static void g_imm_operand_to_string(const GImmOperand *operand, AsmSyntax syntax } + return result; + } @@ -466,11 +474,38 @@ static void g_imm_operand_to_string(const GImmOperand *operand, AsmSyntax syntax static void g_imm_operand_add_text(const GImmOperand *operand, GRenderingOptions *options, MainRendering rendering, FILE *stream) { char value[VMPA_MAX_SIZE]; /* Chaîne à imprimer */ + size_t len; /* Taille de l'élément inséré */ + + len = g_imm_operand_to_string(operand, g_rendering_options_get_syntax(options), value); + + g_content_exporter_insert_text(G_CONTENT_EXPORTER(operand), stream, value, len, RTT_IMMEDIATE); + +} + + +/****************************************************************************** +* * +* Paramètres : operand = opérande à transcrire. * +* buffer = espace où placer ledit contenu. * +* options = options de rendu. * +* * +* Description : Ajoute à un tampon GLib le contenu de l'instance spécifiée. * +* * +* Retour : - * +* * +* Remarques : - * +* * +******************************************************************************/ + +static void g_imm_operand_to_buffer(const GImmOperand *operand, GBufferLine *buffer, GRenderingOptions *options) +{ + char value[VMPA_MAX_SIZE]; /* Chaîne à imprimer */ + size_t len; /* Taille de l'élément inséré */ - g_imm_operand_to_string(operand, g_rendering_options_get_syntax(options), value); + len = g_imm_operand_to_string(operand, g_rendering_options_get_syntax(options), value); - g_content_exporter_insert_text(G_CONTENT_EXPORTER(operand), stream, - value, strlen(value), RTT_IMMEDIATE); + g_content_exporter_insert_into_buffer(G_CONTENT_EXPORTER(operand), buffer, BLC_ASSEMBLY, + value, len, RTT_IMMEDIATE); } |