Avoided fixed columns when filling lines with locations.

3 files changed, 13 insertions, 4 deletions

diff --git a/src/arch/instruction.c b/src/arch/instruction.c
index 6bc158f..73b68f2 100644
--- a/src/arch/instruction.c
+++ b/src/arch/instruction.c
@@ -34,6 +34,7 @@
 #include "storage.h"
 #include "../glibext/gbinarycursor.h"
 #include "../glibext/linegen-int.h"
+#include "../gtkext/gtkblockdisplay.h"
 
 
 
@@ -1962,7 +1963,9 @@ static void _g_arch_instruction_print(GArchInstruction *instr, GBufferLine *line
     size_t i;                               /* Boucle de parcours          */
     GArchOperand *op;                       /* Opérande à manipuler        */
 
-    g_buffer_line_fill_vmpa(line, get_mrange_addr(&instr->range), MDS_32_BITS_UNSIGNED, MDS_32_BITS_UNSIGNED);
+    g_buffer_line_fill_phys(line, DLC_PHYSICAL, MDS_32_BITS_UNSIGNED, get_mrange_addr(&instr->range));
+
+    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);
 
diff --git a/src/arch/instructions/raw.c b/src/arch/instructions/raw.c
index 05eb886..84a79e9 100644
--- a/src/arch/instructions/raw.c
+++ b/src/arch/instructions/raw.c
@@ -1,6 +1,6 @@
 
 /* Chrysalide - Outil d'analyse de fichiers binaires
- * artificial.c - instructions pures vues de l'esprit
+ * raw.c - instructions pures vues de l'esprit
  *
  * Copyright (C) 2014-2020 Cyrille Bagard
  *
@@ -35,6 +35,7 @@
 #include "../instruction-int.h"
 #include "../operands/immediate.h"
 #include "../operands/target.h"
+#include "../../gtkext/gtkblockdisplay.h"
 
 
 
@@ -629,7 +630,9 @@ static void g_raw_instruction_print(GRawInstruction *instr, GBufferLine *line, s
 
     /* Localisation */
 
-    g_buffer_line_fill_vmpa(line, get_mrange_addr(&base->range), MDS_32_BITS_UNSIGNED, MDS_32_BITS_UNSIGNED);
+    g_buffer_line_fill_phys(line, DLC_PHYSICAL, MDS_32_BITS_UNSIGNED, get_mrange_addr(&base->range));
+
+    g_buffer_line_fill_virt(line, DLC_VIRTUAL, MDS_32_BITS_UNSIGNED, get_mrange_addr(&base->range));
 
     /* Contenu */
 
diff --git a/src/arch/instructions/undefined.c b/src/arch/instructions/undefined.c
index 6d90a1c..1623d7b 100644
--- a/src/arch/instructions/undefined.c
+++ b/src/arch/instructions/undefined.c
@@ -31,6 +31,7 @@
 
 
 #include "undefined-int.h"
+#include "../../gtkext/gtkblockdisplay.h"
 
 
 
@@ -385,7 +386,9 @@ static void g_undef_instruction_print(GUndefInstruction *instr, GBufferLine *lin
 
     base = G_ARCH_INSTRUCTION(instr);
 
-    g_buffer_line_fill_vmpa(line, get_mrange_addr(&base->range), MDS_32_BITS_UNSIGNED, MDS_32_BITS_UNSIGNED);
+    g_buffer_line_fill_phys(line, DLC_PHYSICAL, MDS_32_BITS_UNSIGNED, get_mrange_addr(&base->range));
+
+    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);