summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorCyrille Bagard <nocbos@gmail.com>2020-07-27 22:43:38 (GMT)
committerCyrille Bagard <nocbos@gmail.com>2020-07-27 22:49:24 (GMT)
commitd9c8eaac961b6fa097b362b2202c176a5ef16ec2 (patch)
treeba4572719bd7b2f84d7e06e59fbacfcfddc4ddde /src/arch
parent703e0d10d56bb288b515526f0d0f1994391619bf (diff)
Replaced all BLC_* constants by the new DLC_* values.
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/instruction.c8
-rw-r--r--src/arch/instructions/raw.c22
-rw-r--r--src/arch/instructions/undefined.c4
-rw-r--r--src/arch/operands/target.c2
4 files changed, 18 insertions, 18 deletions
diff --git a/src/arch/instruction.c b/src/arch/instruction.c
index 73b68f2..ea19dab 100644
--- a/src/arch/instruction.c
+++ b/src/arch/instruction.c
@@ -1967,14 +1967,14 @@ static void _g_arch_instruction_print(GArchInstruction *instr, GBufferLine *line
g_buffer_line_fill_virt(line, DLC_VIRTUAL, MDS_32_BITS_UNSIGNED, get_mrange_addr(&instr->range));
- g_buffer_line_fill_content(line, content, &instr->range, VMPA_NO_PHYSICAL);
+ g_buffer_line_fill_content(line, DLC_BINARY, content, &instr->range, VMPA_NO_PHYSICAL);
/* Instruction proprement dite */
key = g_arch_instruction_get_keyword(instr);
klen = strlen(key);
- g_buffer_line_append_text(line, BLC_ASSEMBLY_HEAD, key, klen, RTT_INSTRUCTION, G_OBJECT(instr));
+ g_buffer_line_append_text(line, DLC_ASSEMBLY_HEAD, key, klen, RTT_INSTRUCTION, G_OBJECT(instr));
/* Liste des opérandes */
@@ -1990,8 +1990,8 @@ static void _g_arch_instruction_print(GArchInstruction *instr, GBufferLine *line
for (i = 1; i < count; i++)
{
- g_buffer_line_append_text(line, BLC_ASSEMBLY, ",", 1, RTT_PUNCT, NULL);
- g_buffer_line_append_text(line, BLC_ASSEMBLY, " ", 1, RTT_RAW, NULL);
+ g_buffer_line_append_text(line, DLC_ASSEMBLY, ",", 1, RTT_PUNCT, NULL);
+ g_buffer_line_append_text(line, DLC_ASSEMBLY, " ", 1, RTT_RAW, NULL);
op = _g_arch_instruction_get_operand(instr, i);
diff --git a/src/arch/instructions/raw.c b/src/arch/instructions/raw.c
index 84a79e9..0c27258 100644
--- a/src/arch/instructions/raw.c
+++ b/src/arch/instructions/raw.c
@@ -648,17 +648,17 @@ static void g_raw_instruction_print(GRawInstruction *instr, GBufferLine *line, s
max_displayed_len /= g_arch_instruction_count_operands(base);
}
- g_buffer_line_fill_content(line, content, &base->range, max_displayed_len);
+ g_buffer_line_fill_content(line, DLC_BINARY, content, &base->range, max_displayed_len);
/* Zone du code d'assemblage */
key = g_arch_instruction_get_keyword(base);
klen = strlen(key);
- g_buffer_line_append_text(line, BLC_ASSEMBLY_HEAD, key, klen, RTT_INSTRUCTION, NULL);
+ g_buffer_line_append_text(line, DLC_ASSEMBLY_HEAD, key, klen, RTT_INSTRUCTION, NULL);
if (g_raw_instruction_is_padding(instr))
- g_buffer_line_append_text(line, BLC_ASSEMBLY, "...", 3, RTT_RAW, NULL);
+ g_buffer_line_append_text(line, DLC_ASSEMBLY, "...", 3, RTT_RAW, NULL);
else
{
@@ -723,15 +723,15 @@ static void g_raw_instruction_print(GRawInstruction *instr, GBufferLine *line, s
{
if (!first)
{
- g_buffer_line_append_text(line, BLC_ASSEMBLY, ",", 1, RTT_PUNCT, NULL);
- g_buffer_line_append_text(line, BLC_ASSEMBLY, " ", 1, RTT_RAW, NULL);
+ g_buffer_line_append_text(line, DLC_ASSEMBLY, ",", 1, RTT_PUNCT, NULL);
+ g_buffer_line_append_text(line, DLC_ASSEMBLY, " ", 1, RTT_RAW, NULL);
}
else
first = false;
string[iter++] = '"';
- g_buffer_line_append_text(line, BLC_ASSEMBLY, string, iter, RTT_STRING, NULL);
+ g_buffer_line_append_text(line, DLC_ASSEMBLY, string, iter, RTT_STRING, NULL);
iter = 1;
@@ -741,8 +741,8 @@ static void g_raw_instruction_print(GRawInstruction *instr, GBufferLine *line, s
if (!first)
{
- g_buffer_line_append_text(line, BLC_ASSEMBLY, ",", 1, RTT_PUNCT, NULL);
- g_buffer_line_append_text(line, BLC_ASSEMBLY, " ", 1, RTT_RAW, NULL);
+ g_buffer_line_append_text(line, DLC_ASSEMBLY, ",", 1, RTT_PUNCT, NULL);
+ g_buffer_line_append_text(line, DLC_ASSEMBLY, " ", 1, RTT_RAW, NULL);
}
else
first = false;
@@ -759,13 +759,13 @@ static void g_raw_instruction_print(GRawInstruction *instr, GBufferLine *line, s
{
if (!first)
{
- g_buffer_line_append_text(line, BLC_ASSEMBLY, ",", 1, RTT_PUNCT, NULL);
- g_buffer_line_append_text(line, BLC_ASSEMBLY, " ", 1, RTT_RAW, NULL);
+ g_buffer_line_append_text(line, DLC_ASSEMBLY, ",", 1, RTT_PUNCT, NULL);
+ g_buffer_line_append_text(line, DLC_ASSEMBLY, " ", 1, RTT_RAW, NULL);
}
string[iter++] = '"';
- g_buffer_line_append_text(line, BLC_ASSEMBLY, string, iter, RTT_STRING, NULL);
+ g_buffer_line_append_text(line, DLC_ASSEMBLY, string, iter, RTT_STRING, NULL);
}
diff --git a/src/arch/instructions/undefined.c b/src/arch/instructions/undefined.c
index 1623d7b..dab7864 100644
--- a/src/arch/instructions/undefined.c
+++ b/src/arch/instructions/undefined.c
@@ -390,14 +390,14 @@ static void g_undef_instruction_print(GUndefInstruction *instr, GBufferLine *lin
g_buffer_line_fill_virt(line, DLC_VIRTUAL, MDS_32_BITS_UNSIGNED, get_mrange_addr(&base->range));
- g_buffer_line_fill_content(line, content, &base->range, VMPA_NO_PHYSICAL);
+ g_buffer_line_fill_content(line, DLC_BINARY, content, &base->range, VMPA_NO_PHYSICAL);
/* Instruction proprement dite */
key = g_arch_instruction_get_keyword(base);
klen = strlen(key);
- g_buffer_line_append_text(line, BLC_ASSEMBLY_HEAD, key, klen, RTT_ERROR, NULL);
+ g_buffer_line_append_text(line, DLC_ASSEMBLY_HEAD, key, klen, RTT_ERROR, NULL);
}
diff --git a/src/arch/operands/target.c b/src/arch/operands/target.c
index 9b93548..78a2fc1 100644
--- a/src/arch/operands/target.c
+++ b/src/arch/operands/target.c
@@ -419,7 +419,7 @@ static char *g_target_operand_build_tooltip(const GTargetOperand *operand, const
if (line != NULL)
{
- result = g_buffer_line_get_text(line, BLC_ASSEMBLY, BLC_COUNT, true);
+ result = g_buffer_line_get_text(line, DLC_ASSEMBLY, DLC_COUNT, true);
g_object_unref(G_OBJECT(line));
}