mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-09 04:21:49 +08:00
6ff0ba5f7b
The "source centric" /m option to the disassemble command is often unhelpful, e.g., in the presence of optimized code. This patch adds a /s modifier that is better. For one, /m only prints instructions from the originating source file, leaving out instructions from e.g., inlined functions from other files. gdb/ChangeLog: PR gdb/11833 * NEWS: Document new /s modifier for the disassemble command. * cli/cli-cmds.c (disassemble_command): Add support for /s. (_initialize_cli_cmds): Update online docs of disassemble command. * disasm.c: #include "source.h". (struct deprecated_dis_line_entry): Renamed from dis_line_entry. All uses updated. (dis_line_entry): New struct. (hash_dis_line_entry, eq_dis_line_entry): New functions. (allocate_dis_line_table): New functions. (maybe_add_dis_line_entry, line_has_code_p): New functions. (dump_insns): New arg end_pc. All callers updated. (do_mixed_source_and_assembly_deprecated): Renamed from do_mixed_source_and_assembly. All callers updated. (do_mixed_source_and_assembly): New function. (gdb_disassembly): Handle /s (DISASSEMBLY_SOURCE). * disasm.h (DISASSEMBLY_SOURCE_DEPRECATED): Renamed from DISASSEMBLY_SOURCE. All uses updated. (DISASSEMBLY_SOURCE): New macro. * mi/mi-cmd-disas.c (mi_cmd_disassemble): New modes 4,5. gdb/doc/ChangeLog: * gdb.texinfo (Machine Code): Update docs for mixed source/assembly disassembly. (GDB/MI Data Manipulation): Update docs for new disassembly modes. gdb/testsuite/ChangeLog: * gdb.mi/mi-disassemble.exp: Update. * gdb.base/disasm-optim.S: New file. * gdb.base/disasm-optim.c: New file. * gdb.base/disasm-optim.h: New file. * gdb.base/disasm-optim.exp: New file.
196 lines
5.4 KiB
C
196 lines
5.4 KiB
C
/* MI Command Set - disassemble commands.
|
|
Copyright (C) 2000-2015 Free Software Foundation, Inc.
|
|
Contributed by Cygnus Solutions (a Red Hat company).
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "defs.h"
|
|
#include "arch-utils.h"
|
|
#include "target.h"
|
|
#include "value.h"
|
|
#include "mi-cmds.h"
|
|
#include "mi-getopt.h"
|
|
#include "ui-out.h"
|
|
#include "disasm.h"
|
|
|
|
/* The arguments to be passed on the command line and parsed here are
|
|
either:
|
|
|
|
START-ADDRESS: address to start the disassembly at.
|
|
END-ADDRESS: address to end the disassembly at.
|
|
|
|
or:
|
|
|
|
FILENAME: The name of the file where we want disassemble from.
|
|
LINE: The line around which we want to disassemble. It will
|
|
disassemble the function that contins that line.
|
|
HOW_MANY: Number of disassembly lines to display. With source, it
|
|
is the number of disassembly lines only, not counting the source
|
|
lines.
|
|
|
|
always required:
|
|
|
|
MODE: 0 -- disassembly.
|
|
1 -- disassembly and source (with deprecated source-centric view).
|
|
2 -- disassembly and opcodes.
|
|
3 -- disassembly, source-centric and opcodes.
|
|
4 -- disassembly, and source (with pc-centric view).
|
|
5 -- disassembly, source (pc-centric) and opcodes. */
|
|
|
|
void
|
|
mi_cmd_disassemble (char *command, char **argv, int argc)
|
|
{
|
|
struct gdbarch *gdbarch = get_current_arch ();
|
|
struct ui_out *uiout = current_uiout;
|
|
CORE_ADDR start;
|
|
|
|
int mode, disasm_flags;
|
|
struct symtab *s;
|
|
|
|
/* Which options have we processed ... */
|
|
int file_seen = 0;
|
|
int line_seen = 0;
|
|
int num_seen = 0;
|
|
int start_seen = 0;
|
|
int end_seen = 0;
|
|
|
|
/* ... and their corresponding value. */
|
|
char *file_string = NULL;
|
|
int line_num = -1;
|
|
int how_many = -1;
|
|
CORE_ADDR low = 0;
|
|
CORE_ADDR high = 0;
|
|
struct cleanup *cleanups = make_cleanup (null_cleanup, NULL);
|
|
|
|
/* Options processing stuff. */
|
|
int oind = 0;
|
|
char *oarg;
|
|
enum opt
|
|
{
|
|
FILE_OPT, LINE_OPT, NUM_OPT, START_OPT, END_OPT
|
|
};
|
|
static const struct mi_opt opts[] =
|
|
{
|
|
{"f", FILE_OPT, 1},
|
|
{"l", LINE_OPT, 1},
|
|
{"n", NUM_OPT, 1},
|
|
{"s", START_OPT, 1},
|
|
{"e", END_OPT, 1},
|
|
{ 0, 0, 0 }
|
|
};
|
|
|
|
/* Get the options with their arguments. Keep track of what we
|
|
encountered. */
|
|
while (1)
|
|
{
|
|
int opt = mi_getopt ("-data-disassemble", argc, argv, opts,
|
|
&oind, &oarg);
|
|
if (opt < 0)
|
|
break;
|
|
switch ((enum opt) opt)
|
|
{
|
|
case FILE_OPT:
|
|
file_string = xstrdup (oarg);
|
|
file_seen = 1;
|
|
make_cleanup (xfree, file_string);
|
|
break;
|
|
case LINE_OPT:
|
|
line_num = atoi (oarg);
|
|
line_seen = 1;
|
|
break;
|
|
case NUM_OPT:
|
|
how_many = atoi (oarg);
|
|
num_seen = 1;
|
|
break;
|
|
case START_OPT:
|
|
low = parse_and_eval_address (oarg);
|
|
start_seen = 1;
|
|
break;
|
|
case END_OPT:
|
|
high = parse_and_eval_address (oarg);
|
|
end_seen = 1;
|
|
break;
|
|
}
|
|
}
|
|
argv += oind;
|
|
argc -= oind;
|
|
|
|
/* Allow only filename + linenum (with how_many which is not
|
|
required) OR start_addr + end_addr. */
|
|
|
|
if (!((line_seen && file_seen && num_seen && !start_seen && !end_seen)
|
|
|| (line_seen && file_seen && !num_seen && !start_seen && !end_seen)
|
|
|| (!line_seen && !file_seen && !num_seen && start_seen && end_seen)))
|
|
error (_("-data-disassemble: Usage: ( [-f filename -l linenum [-n "
|
|
"howmany]] | [-s startaddr -e endaddr]) [--] mode."));
|
|
|
|
if (argc != 1)
|
|
error (_("-data-disassemble: Usage: [-f filename -l linenum "
|
|
"[-n howmany]] [-s startaddr -e endaddr] [--] mode."));
|
|
|
|
mode = atoi (argv[0]);
|
|
if (mode < 0 || mode > 5)
|
|
error (_("-data-disassemble: Mode argument must be in the range 0-5."));
|
|
|
|
/* Convert the mode into a set of disassembly flags. */
|
|
|
|
disasm_flags = 0; /* Initialize here for -Wall. */
|
|
switch (mode)
|
|
{
|
|
case 0:
|
|
break;
|
|
case 1:
|
|
disasm_flags |= DISASSEMBLY_SOURCE_DEPRECATED;
|
|
break;
|
|
case 2:
|
|
disasm_flags |= DISASSEMBLY_RAW_INSN;
|
|
break;
|
|
case 3:
|
|
disasm_flags |= DISASSEMBLY_SOURCE_DEPRECATED | DISASSEMBLY_RAW_INSN;
|
|
break;
|
|
case 4:
|
|
disasm_flags |= DISASSEMBLY_SOURCE;
|
|
break;
|
|
case 5:
|
|
disasm_flags |= DISASSEMBLY_SOURCE | DISASSEMBLY_RAW_INSN;
|
|
break;
|
|
default:
|
|
gdb_assert_not_reached ("bad disassembly mode");
|
|
}
|
|
|
|
/* We must get the function beginning and end where line_num is
|
|
contained. */
|
|
|
|
if (line_seen && file_seen)
|
|
{
|
|
s = lookup_symtab (file_string);
|
|
if (s == NULL)
|
|
error (_("-data-disassemble: Invalid filename."));
|
|
if (!find_line_pc (s, line_num, &start))
|
|
error (_("-data-disassemble: Invalid line number"));
|
|
if (find_pc_partial_function (start, NULL, &low, &high) == 0)
|
|
error (_("-data-disassemble: "
|
|
"No function contains specified address"));
|
|
}
|
|
|
|
gdb_disassembly (gdbarch, uiout,
|
|
file_string,
|
|
disasm_flags,
|
|
how_many, low, high);
|
|
|
|
do_cleanups (cleanups);
|
|
}
|