darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

2002-04-07 Elena Zannoni <ezannoni@redhat.com>

Browse source 
* mi-cmd-disas.c: Run through indent.
This commit is contained in:
Elena Zannoni 2002-04-08 00:43:22 +00:00
parent 8f0eea0e54
commit 27cdacdbd0
2 changed files with 32 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gdb/mi/ChangeLog
View file

@ -1,3 +1,7 @@
2002-04-07 Elena Zannoni <ezannoni@redhat.com>
* mi-cmd-disas.c: Run through indent.
2002-04-07 Elena Zannoni <ezannoni@redhat.com> 2002-04-07 Elena Zannoni <ezannoni@redhat.com>
* mi-cmd-disas.c (dump_insns): New function. * mi-cmd-disas.c (dump_insns): New function.

61
gdb/mi/mi-cmd-disas.c
View file

@ -36,11 +36,11 @@
reordering in this function. */ reordering in this function. */
struct dis_line_entry struct dis_line_entry
{ {
int line; int line;
CORE_ADDR start_pc; CORE_ADDR start_pc;
CORE_ADDR end_pc; CORE_ADDR end_pc;
}; };
/* This variable determines where memory used for disassembly is read from. */ /* This variable determines where memory used for disassembly is read from. */
int gdb_disassemble_from_exec = -1; int gdb_disassemble_from_exec = -1;
@ -83,7 +83,7 @@ compare_lines (const PTR mle1p, const PTR mle2p)
} }
static int static int
dump_insns (disassemble_info *di, CORE_ADDR low, CORE_ADDR high, dump_insns (disassemble_info * di, CORE_ADDR low, CORE_ADDR high,
int how_many, struct ui_stream *stb) int how_many, struct ui_stream *stb)
{ {
int num_displayed = 0; int num_displayed = 0;
@ -139,7 +139,7 @@ static void
do_mixed_source_and_assembly (struct disassemble_info *di, int nlines, do_mixed_source_and_assembly (struct disassemble_info *di, int nlines,
struct linetable_entry *le, struct linetable_entry *le,
CORE_ADDR low, CORE_ADDR high, CORE_ADDR low, CORE_ADDR high,
struct symtab *symtab, struct symtab *symtab,
int how_many, struct ui_stream *stb) int how_many, struct ui_stream *stb)
{ {
int newlines = 0; int newlines = 0;
@ -166,8 +166,7 @@ do_mixed_source_and_assembly (struct disassemble_info *di, int nlines,
for (; i < nlines - 1 && le[i].pc < high; i++) for (; i < nlines - 1 && le[i].pc < high; i++)
{ {
if (le[i].line == le[i + 1].line if (le[i].line == le[i + 1].line && le[i].pc == le[i + 1].pc)
&& le[i].pc == le[i + 1].pc)
continue; /* Ignore duplicates */ continue; /* Ignore duplicates */
/* Skip any end-of-function markers. */ /* Skip any end-of-function markers. */
@ -185,8 +184,7 @@ do_mixed_source_and_assembly (struct disassemble_info *di, int nlines,
/* If we're on the last line, and it's part of the function, /* If we're on the last line, and it's part of the function,
then we need to get the end pc in a special way. */ then we need to get the end pc in a special way. */
if (i == nlines - 1 if (i == nlines - 1 && le[i].pc < high)
&& le[i].pc < high)
{ {
mle[newlines].line = le[i].line; mle[newlines].line = le[i].line;
mle[newlines].start_pc = le[i].pc; mle[newlines].start_pc = le[i].pc;
@ -227,7 +225,8 @@ do_mixed_source_and_assembly (struct disassemble_info *di, int nlines,
for (; next_line < mle[i].line; next_line++) for (; next_line < mle[i].line; next_line++)
{ {
ui_out_tuple_begin (uiout, "src_and_asm_line"); ui_out_tuple_begin (uiout, "src_and_asm_line");
print_source_lines (symtab, next_line, next_line + 1, 0); print_source_lines (symtab, next_line, next_line + 1,
0);
ui_out_list_begin (uiout, "line_asm_insn"); ui_out_list_begin (uiout, "line_asm_insn");
ui_out_list_end (uiout); ui_out_list_end (uiout);
ui_out_tuple_end (uiout); ui_out_tuple_end (uiout);
@ -268,7 +267,7 @@ do_mixed_source_and_assembly (struct disassemble_info *di, int nlines,
static void static void
do_assembly_only (disassemble_info *di, CORE_ADDR low, do_assembly_only (disassemble_info * di, CORE_ADDR low,
CORE_ADDR high, int how_many, struct ui_stream *stb) CORE_ADDR high, int how_many, struct ui_stream *stb)
{ {
int num_displayed = 0; int num_displayed = 0;
@ -282,11 +281,9 @@ do_assembly_only (disassemble_info *di, CORE_ADDR low,
enum mi_cmd_result enum mi_cmd_result
do_disassembly (char *file_string, do_disassembly (char *file_string,
int line_num, int line_num,
int mixed_source_and_assembly, int mixed_source_and_assembly,
int how_many, int how_many, CORE_ADDR low, CORE_ADDR high)
CORE_ADDR low,
CORE_ADDR high)
{ {
static disassemble_info di; static disassemble_info di;
static int di_initialized; static int di_initialized;
@ -361,7 +358,7 @@ do_disassembly (char *file_string,
do_assembly_only (&di, low, high, how_many, stb); do_assembly_only (&di, low, high, how_many, stb);
else if (mixed_source_and_assembly) else if (mixed_source_and_assembly)
do_mixed_source_and_assembly (&di, nlines, le, low, do_mixed_source_and_assembly (&di, nlines, le, low,
high, symtab, how_many, stb); high, symtab, how_many, stb);
gdb_flush (gdb_stdout); gdb_flush (gdb_stdout);
@ -416,11 +413,10 @@ mi_cmd_disassemble (char *command, char **argv, int argc)
int optind = 0; int optind = 0;
char *optarg; char *optarg;
enum opt enum opt
{
FILE_OPT, LINE_OPT, NUM_OPT, START_OPT, END_OPT
};
static struct mi_opt opts[] =
{ {
FILE_OPT, LINE_OPT, NUM_OPT, START_OPT, END_OPT
};
static struct mi_opt opts[] = {
{"f", FILE_OPT, 1}, {"f", FILE_OPT, 1},
{"l", LINE_OPT, 1}, {"l", LINE_OPT, 1},
{"n", NUM_OPT, 1}, {"n", NUM_OPT, 1},
@ -469,11 +465,13 @@ mi_cmd_disassemble (char *command, char **argv, int argc)
if (!((line_seen && file_seen && num_seen && !start_seen && !end_seen) 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)
|| (!line_seen && !file_seen && !num_seen && start_seen && end_seen))) || (!line_seen && !file_seen && !num_seen && start_seen && end_seen)))
error ("mi_cmd_disassemble: Usage: ( [-f filename -l linenum [-n howmany]] | [-s startaddr -e endaddr]) [--] mixed_mode."); error
("mi_cmd_disassemble: Usage: ( [-f filename -l linenum [-n howmany]] | [-s startaddr -e endaddr]) [--] mixed_mode.");
if (argc != 1) if (argc != 1)
error ("mi_cmd_disassemble: Usage: [-f filename -l linenum [-n howmany]] [-s startaddr -e endaddr] [--] mixed_mode."); error
("mi_cmd_disassemble: Usage: [-f filename -l linenum [-n howmany]] [-s startaddr -e endaddr] [--] mixed_mode.");
mixed_source_and_assembly = atoi (argv[0]); mixed_source_and_assembly = atoi (argv[0]);
if ((mixed_source_and_assembly != 0) && (mixed_source_and_assembly != 1)) if ((mixed_source_and_assembly != 0) && (mixed_source_and_assembly != 1))
@ -494,11 +492,8 @@ mi_cmd_disassemble (char *command, char **argv, int argc)
error ("mi_cmd_disassemble: No function contains specified address"); error ("mi_cmd_disassemble: No function contains specified address");
} }
retval = do_disassembly (file_string, retval = do_disassembly (file_string,
line_num, line_num,
mixed_source_and_assembly, mixed_source_and_assembly, how_many, low, high);
how_many, return retval;
low,
high);
return retval;
} }