diff options
Diffstat (limited to 'gdb/disasm.c')
| -rw-r--r-- | gdb/disasm.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/gdb/disasm.c b/gdb/disasm.c index e465388..6983903 100644 --- a/gdb/disasm.c +++ b/gdb/disasm.c @@ -30,6 +30,7 @@ #include "safe-ctype.h" #include <algorithm> #include "common/gdb_optional.h" +#include "valprint.h" /* Disassemble functions. FIXME: We should get rid of all the duplicate code in gdb that does @@ -199,8 +200,6 @@ gdb_pretty_print_disassembler::pretty_print_insn (struct ui_out *uiout, int offset; int line; int size; - char *filename = NULL; - char *name = NULL; CORE_ADDR pc; struct gdbarch *gdbarch = arch (); @@ -237,6 +236,7 @@ gdb_pretty_print_disassembler::pretty_print_insn (struct ui_out *uiout, uiout->text (pc_prefix (pc)); uiout->field_core_addr ("address", gdbarch, pc); + std::string name, filename; if (!build_address_symbolic (gdbarch, pc, 0, &name, &offset, &filename, &line, &unmapped)) { @@ -244,7 +244,7 @@ gdb_pretty_print_disassembler::pretty_print_insn (struct ui_out *uiout, the future. */ uiout->text (" <"); if ((flags & DISASSEMBLY_OMIT_FNAME) == 0) - uiout->field_string ("func-name", name); + uiout->field_string ("func-name", name.c_str ()); uiout->text ("+"); uiout->field_int ("offset", offset); uiout->text (">:\t"); @@ -252,11 +252,6 @@ gdb_pretty_print_disassembler::pretty_print_insn (struct ui_out *uiout, else uiout->text (":\t"); - if (filename != NULL) - xfree (filename); - if (name != NULL) - xfree (name); - m_insn_stb.clear (); if (flags & DISASSEMBLY_RAW_INSN) |