From 7a8eb317c5bce0f1ff290a9343777db74adec663 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Wed, 1 Feb 2017 22:54:35 -0500 Subject: [PATCH] Remove unused file_string parameter in gdb_disassembly The file_string parameter was added in 8f0eea0 (sorry, no title back then) and has never actually been used. gdb/ChangeLog: * disasm.h (gdb_disassembly): Remove file_string parameter. * disasm.c (gdb_disassembly): Likewise. * cli/cli-cmds.c (print_disassembly): Adapt. * mi/mi-cmd-disas.c (mi_cmd_disassemble): Likewise. * stack.c (do_gdb_disassembly): Likewise. --- gdb/ChangeLog | 8 ++++++++ gdb/cli/cli-cmds.c | 2 +- gdb/disasm.c | 2 +- gdb/disasm.h | 2 +- gdb/mi/mi-cmd-disas.c | 1 - gdb/stack.c | 2 +- 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8638ebabc3..72d33e34f4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2017-02-01 Simon Marchi + + * disasm.h (gdb_disassembly): Remove file_string parameter. + * disasm.c (gdb_disassembly): Likewise. + * cli/cli-cmds.c (print_disassembly): Adapt. + * mi/mi-cmd-disas.c (mi_cmd_disassemble): Likewise. + * stack.c (do_gdb_disassembly): Likewise. + 2017-02-01 Andreas Arnez * dwarf2loc.c (dwarf2_evaluate_loc_desc_full): For diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c index 119f2202ce..b5c9d0ba78 100644 --- a/gdb/cli/cli-cmds.c +++ b/gdb/cli/cli-cmds.c @@ -1148,7 +1148,7 @@ print_disassembly (struct gdbarch *gdbarch, const char *name, paddress (gdbarch, low), paddress (gdbarch, high)); /* Dump the specified range. */ - gdb_disassembly (gdbarch, current_uiout, 0, flags, -1, low, high); + gdb_disassembly (gdbarch, current_uiout, flags, -1, low, high); printf_filtered ("End of assembler dump.\n"); gdb_flush (gdb_stdout); diff --git a/gdb/disasm.c b/gdb/disasm.c index 897f2f1412..9d36f151f3 100644 --- a/gdb/disasm.c +++ b/gdb/disasm.c @@ -815,7 +815,7 @@ gdb_disassembler::print_insn (CORE_ADDR memaddr, void gdb_disassembly (struct gdbarch *gdbarch, struct ui_out *uiout, - char *file_string, int flags, int how_many, + int flags, int how_many, CORE_ADDR low, CORE_ADDR high) { struct ui_file *stb = mem_fileopen (); diff --git a/gdb/disasm.h b/gdb/disasm.h index 7bbfa31da4..7374dbfe2d 100644 --- a/gdb/disasm.h +++ b/gdb/disasm.h @@ -92,7 +92,7 @@ struct disasm_insn }; extern void gdb_disassembly (struct gdbarch *gdbarch, struct ui_out *uiout, - char *file_string, int flags, int how_many, + int flags, int how_many, CORE_ADDR low, CORE_ADDR high); /* Print the instruction at address MEMADDR in debugged memory, diff --git a/gdb/mi/mi-cmd-disas.c b/gdb/mi/mi-cmd-disas.c index 2247d2c3e0..9338f7bdec 100644 --- a/gdb/mi/mi-cmd-disas.c +++ b/gdb/mi/mi-cmd-disas.c @@ -187,7 +187,6 @@ mi_cmd_disassemble (char *command, char **argv, int argc) } gdb_disassembly (gdbarch, uiout, - file_string, disasm_flags, how_many, low, high); diff --git a/gdb/stack.c b/gdb/stack.c index 4c9e14e48e..f48433109a 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -770,7 +770,7 @@ do_gdb_disassembly (struct gdbarch *gdbarch, TRY { - gdb_disassembly (gdbarch, current_uiout, 0, + gdb_disassembly (gdbarch, current_uiout, DISASSEMBLY_RAW_INSN, how_many, low, high); } -- 2.34.1