Removed some extra special column indexes.

2 files changed, 10 insertions, 8 deletions

diff --git a/src/arch/operands/immediate.c b/src/arch/operands/immediate.c
index 769826b..746bcae 100644
--- a/src/arch/operands/immediate.c
+++ b/src/arch/operands/immediate.c
@@ -45,6 +45,7 @@
 #include "../../core/logs.h"
 #include "../../format/format.h"
 #include "../../glibext/objhole.h"
+#include "../../gtkext/gtkblockdisplay.h"
 
 
 
@@ -1351,7 +1352,7 @@ static void g_imm_operand_print(const GImmOperand *operand, GBufferLine *line)
 
     len = g_imm_operand_to_string(operand, value);
 
-    g_buffer_line_append_text(line, BLC_MAIN, value, len, RTT_IMMEDIATE, G_OBJECT(operand));
+    g_buffer_line_append_text(line, DLC_ASSEMBLY, value, len, RTT_IMMEDIATE, G_OBJECT(operand));
 
 }
 
@@ -1940,7 +1941,7 @@ static void g_known_imm_operand_print(const GKnownImmOperand *operand, GBufferLi
 
     len = strlen(operand->alt_text);
 
-    g_buffer_line_append_text(line, BLC_MAIN, operand->alt_text, len, RTT_IMMEDIATE, G_OBJECT(operand));
+    g_buffer_line_append_text(line, DLC_ASSEMBLY, operand->alt_text, len, RTT_IMMEDIATE, G_OBJECT(operand));
 
 }
 
diff --git a/src/arch/operands/target.c b/src/arch/operands/target.c
index d921200..9b93548 100644
--- a/src/arch/operands/target.c
+++ b/src/arch/operands/target.c
@@ -40,6 +40,7 @@
 #include "../../format/format.h"
 #include "../../format/strsym.h"
 #include "../../glibext/gbinarycursor.h"
+#include "../../gtkext/gtkblockdisplay.h"
 
 
 
@@ -301,20 +302,20 @@ static void g_target_operand_print(const GTargetOperand *operand, GBufferLine *l
     if (operand->symbol != NULL && label != NULL)
     {
         if (operand->diff > 0)
-            g_buffer_line_append_text(line, BLC_MAIN, "<", 1, RTT_LTGT, NULL);
+            g_buffer_line_append_text(line, DLC_ASSEMBLY, "<", 1, RTT_LTGT, NULL);
 
-        g_buffer_line_append_text(line, BLC_MAIN, label, strlen(label), RTT_LABEL, G_OBJECT(operand));
+        g_buffer_line_append_text(line, DLC_ASSEMBLY, label, strlen(label), RTT_LABEL, G_OBJECT(operand));
 
         if (operand->diff > 0)
         {
-            g_buffer_line_append_text(line, BLC_MAIN, "+", 1, RTT_SIGNS, G_OBJECT(operand));
+            g_buffer_line_append_text(line, DLC_ASSEMBLY, "+", 1, RTT_SIGNS, G_OBJECT(operand));
 
             init_vmpa(&tmp, operand->diff, VMPA_NO_VIRTUAL);
             vmpa2_phys_to_string(&tmp, MDS_4_BITS, value, &len);
 
-            g_buffer_line_append_text(line, BLC_MAIN, value, len, RTT_LABEL, G_OBJECT(operand));
+            g_buffer_line_append_text(line, DLC_ASSEMBLY, value, len, RTT_LABEL, G_OBJECT(operand));
 
-            g_buffer_line_append_text(line, BLC_MAIN, ">", 1, RTT_LTGT, NULL);
+            g_buffer_line_append_text(line, DLC_ASSEMBLY, ">", 1, RTT_LTGT, NULL);
 
         }
 
@@ -323,7 +324,7 @@ static void g_target_operand_print(const GTargetOperand *operand, GBufferLine *l
     {
         vmpa2_to_string(&operand->addr, operand->size, value, &len);
 
-        g_buffer_line_append_text(line, BLC_MAIN, value, len, RTT_LABEL, G_OBJECT(operand));
+        g_buffer_line_append_text(line, DLC_ASSEMBLY, value, len, RTT_LABEL, G_OBJECT(operand));
 
     }