This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH] Fix alignment of disassemble /r
- From: Daniel Gutson <daniel dot gutson at tallertechnologies dot com>
- To: gdb-patches <gdb-patches at sourceware dot org>
- Date: Fri, 11 Apr 2014 19:24:50 -0300
- Subject: [PATCH] Fix alignment of disassemble /r
- Authentication-results: sourceware.org; auth=none
Hi,
when disassembling in raw mode (/r) in a variable-length insn
architecture (i.e. x86),
the output can be completely messed since no alignment takes place.
I am aware of the uiout->table stuff, but it seems an overkill since I
should change
the current_uiout when disassembling in this mode (and I didn't find
any actual use of this
machinery at least for x86).
Therefore, I added a hack in the dump_insns when the /r flag is specified.
This clearly isn't the cutiest thing in the world, and I specified a
hardcoded maximum number
of opcode bytes to align (currently 8) though it is easily changeable.
Please let me know if this approach is OK or I should do something
else. Maybe consider whether
current arch is insn-len variable?
If this happens to be OK, please commit it for me since I don't have
write access.
Thanks,
Daniel.
2014-04-11 Daniel Gutson <daniel.gutson@tallertechnologies.com>
* disasm.c (dump_insns): Added right alignment when showing opcodes.
diff --git a/gdb/disasm.c b/gdb/disasm.c
index d94225b..0fd5aa1 100644
--- a/gdb/disasm.c
+++ b/gdb/disasm.c
@@ -107,6 +107,13 @@ dump_insns (struct gdbarch *gdbarch, struct ui_out *uiout,
int offset;
int line;
struct cleanup *ui_out_chain;
+ /* This array holds enough space for 8 bytes of opcodes;
+ since the format is 02x plus the space, the length
+ the array is (2chars + 1space) * 8 bytes + 1zero = 25 chars. */
+ char right_align[8 * 3 + 1];
+
+ memset(right_align, ' ', sizeof(right_align) - 2);
+ right_align[sizeof(right_align) - 1] = 0;
for (pc = low; pc < high;)
{
@@ -154,6 +161,7 @@ dump_insns (struct gdbarch *gdbarch, struct ui_out *uiout,
bfd_byte data;
int status;
const char *spacer = "";
+ unsigned int alignment_pos = 0;
/* Build the opcodes using a temporary stream so we can
write them out in a single go for the MI. */
@@ -170,8 +178,11 @@ dump_insns (struct gdbarch *gdbarch, struct ui_out *uiout,
fprintf_filtered (opcode_stream, "%s%02x",
spacer, (unsigned) data);
spacer = " ";
+ alignment_pos += 3;
}
ui_out_field_stream (uiout, "opcodes", opcode_stream);
+ if (alignment_pos < sizeof(right_align))
+ ui_out_text (uiout, &right_align[alignment_pos]);
ui_out_text (uiout, "\t");
do_cleanups (cleanups);