tui-disasm: Fix line buffer size calculation
The code that fills the TUI disassembly window content first calculates the maximum full length of a displayed disassembly line. This calculation typically yields the wrong result. The result is too large, so the bug does not cause any run-time failures, but unnecessary confusion for the reader. This patch fixes the calculation. gdb/ChangeLog: * tui/tui-disasm.c (tui_set_disassem_content): Fix calculation of the longest disassembly line's length.
This commit is contained in:
parent
0bb65f1e7c
commit
f5396833d3
|
@ -1,3 +1,8 @@
|
||||||
|
2016-11-09 Andreas Arnez <arnez@linux.vnet.ibm.com>
|
||||||
|
|
||||||
|
* tui/tui-disasm.c (tui_set_disassem_content): Fix calculation of
|
||||||
|
the longest disassembly line's length.
|
||||||
|
|
||||||
2016-11-09 Andreas Arnez <arnez@linux.vnet.ibm.com>
|
2016-11-09 Andreas Arnez <arnez@linux.vnet.ibm.com>
|
||||||
|
|
||||||
* tui/tui-disasm.c (tui_set_disassem_content): Fix line buffer
|
* tui/tui-disasm.c (tui_set_disassem_content): Fix line buffer
|
||||||
|
|
|
@ -178,7 +178,7 @@ tui_set_disassem_content (struct gdbarch *gdbarch, CORE_ADDR pc)
|
||||||
int tab_len = tui_default_tab_len ();
|
int tab_len = tui_default_tab_len ();
|
||||||
struct tui_asm_line *asm_lines;
|
struct tui_asm_line *asm_lines;
|
||||||
int insn_pos;
|
int insn_pos;
|
||||||
int addr_size, max_size;
|
int addr_size, insn_size;
|
||||||
char *line;
|
char *line;
|
||||||
|
|
||||||
if (pc == 0)
|
if (pc == 0)
|
||||||
|
@ -203,9 +203,9 @@ tui_set_disassem_content (struct gdbarch *gdbarch, CORE_ADDR pc)
|
||||||
|
|
||||||
tui_disassemble (gdbarch, asm_lines, pc, max_lines);
|
tui_disassemble (gdbarch, asm_lines, pc, max_lines);
|
||||||
|
|
||||||
/* See what is the maximum length of an address and of a line. */
|
/* Determine maximum address- and instruction lengths. */
|
||||||
addr_size = 0;
|
addr_size = 0;
|
||||||
max_size = 0;
|
insn_size = 0;
|
||||||
for (i = 0; i < max_lines; i++)
|
for (i = 0; i < max_lines; i++)
|
||||||
{
|
{
|
||||||
size_t len = strlen (asm_lines[i].addr_string);
|
size_t len = strlen (asm_lines[i].addr_string);
|
||||||
|
@ -213,15 +213,16 @@ tui_set_disassem_content (struct gdbarch *gdbarch, CORE_ADDR pc)
|
||||||
if (len > addr_size)
|
if (len > addr_size)
|
||||||
addr_size = len;
|
addr_size = len;
|
||||||
|
|
||||||
len = strlen (asm_lines[i].insn) + tab_len;
|
len = strlen (asm_lines[i].insn);
|
||||||
if (len > max_size)
|
if (len > insn_size)
|
||||||
max_size = len;
|
insn_size = len;
|
||||||
}
|
}
|
||||||
max_size += addr_size + tab_len;
|
|
||||||
|
/* Align instructions to the same column. */
|
||||||
|
insn_pos = (1 + (addr_size / tab_len)) * tab_len;
|
||||||
|
|
||||||
/* Allocate memory to create each line. */
|
/* Allocate memory to create each line. */
|
||||||
line = (char*) alloca (max_size);
|
line = (char*) alloca (insn_pos + insn_size + 1);
|
||||||
insn_pos = (1 + (addr_size / tab_len)) * tab_len;
|
|
||||||
|
|
||||||
/* Now construct each line. */
|
/* Now construct each line. */
|
||||||
for (i = 0; i < max_lines; i++)
|
for (i = 0; i < max_lines; i++)
|
||||||
|
|
Loading…
Reference in New Issue