2002-09-30 17:57:26 +02:00
|
|
|
|
/* Disassemble support for GDB.
|
2003-01-13 Andrew Cagney <ac131313@redhat.com>
* ax-gdb.c, c-valprint.c, charset.c, corefile.c: Update copyright.
* demangle.c, disasm.c, dwarf2cfi.c, dwarfread.c: Update copyright.
* elfread.c, eval.c, expprint.c, expression.h: Update copyright.
* f-typeprint.c, findvar.c, gcore.c, gdb_mbuild.sh: Update copyright.
* gdbtypes.h, gnu-v2-abi.c, inferior.h, inftarg.c: Update copyright.
* language.c, language.h, m32r-tdep.c: Update copyright.
* mn10200-tdep.c, scm-lang.c, scm-lang.h: Update copyright.
* somsolib.c, somsolib.h, symfile.c, symtab.h: Update copyright.
* thread-db.c, typeprint.c, utils.c, valarith.c: Update copyright.
* values.c, win32-nat.c, x86-64-linux-nat.c: Update copyright.
* x86-64-linux-tdep.c, z8k-tdep.c: Update copyright.
* cli/cli-decode.h, config/h8500/tm-h8500.h: Update copyright.
Index: mi/ChangeLog
2003-01-13 Andrew Cagney <ac131313@redhat.com>
* mi-cmd-env.c: Update copyright.
2003-01-14 01:49:06 +01:00
|
|
|
|
|
|
|
|
|
Copyright 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
|
2002-09-30 17:57:26 +02:00
|
|
|
|
|
|
|
|
|
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 2 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, write to the Free Software
|
|
|
|
|
Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
|
|
|
|
|
|
#include "defs.h"
|
|
|
|
|
#include "target.h"
|
|
|
|
|
#include "value.h"
|
|
|
|
|
#include "ui-out.h"
|
|
|
|
|
#include "gdb_string.h"
|
|
|
|
|
#include "disasm.h"
|
2003-04-30 Andrew Cagney <cagney@redhat.com>
* gdbarch.sh (deprecated_tm_print_insn_info): Rename
"tm_print_insn_info".
(TARGET_PRINT_INSN_INFO): Delete macro.
(dis_asm_read_memory): Delete function declaration.
(dis_asm_memory_error, dis_asm_print_address): Ditto.
(tm_print_insn_info): Delete variable definition.
(_initialize_gdbarch): Do not initialize "tm_print_insn_info".
* gdbarch.h, gdbarch.c: Re-generate.
* d10v-tdep.c (display_trace): Replace "tm_print_insn_info" with
"deprecated_tm_print_insn_info".
* mcore-tdep.c (mcore_dump_insn): Ditto.
* mips-tdep.c (mips_gdbarch_init): Ditto.
* sparc-tdep.c (_initialize_sparc_tdep): Ditto.
* v850-tdep.c (v850_scan_prologue, v850_gdbarch_init): Ditto.
* ia64-tdep.c (_initialize_ia64_tdep): Ditto.
* printcmd.c (print_insn): Use "deprecated_tm_print_insn_info"
instead of TARGET_PRINT_INSN_INFO, add comment.
* s390-tdep.c (s390_get_frame_info): Instead of
"dis_asm_read_memory", use "deprecated_tm_print_insn_info".
(s390_check_function_end, s390_is_sigreturn): Ditto.
* corefile.c (dis_asm_read_memory): Move to "disasm.c".
(dis_asm_memory_error, dis_asm_print_address): Ditto.
* disasm.c: Include "gdbcore.h".
(_initialize_disasm): New function, initialize
"deprecated_tm_print_insn_info".
(deprecated_tm_print_insn_info): New variable.
(dis_asm_read_memory): Moved from "corefile.c", made static.
(dis_asm_print_address, dis_asm_memory_error): Ditto.
* Makefile.in (disasm.o): Update dependencies.
2003-04-28 Andrew Cagney <cagney@redhat.com>
* gdbint.texinfo (Target Architecture Definition): Replace
read_fp, TARGET_READ_FP and FP_REGNUM, with deprecated_read_fp,
DEPRECATED_TARGET_READ_FP and DEPRECATED_REGNUM.
2003-05-01 00:01:38 +02:00
|
|
|
|
#include "gdbcore.h"
|
2002-09-30 17:57:26 +02:00
|
|
|
|
|
|
|
|
|
/* Disassemble functions.
|
|
|
|
|
FIXME: We should get rid of all the duplicate code in gdb that does
|
|
|
|
|
the same thing: disassemble_command() and the gdbtk variation. */
|
|
|
|
|
|
|
|
|
|
/* This Structure is used to store line number information.
|
|
|
|
|
We need a different sort of line table from the normal one cuz we can't
|
|
|
|
|
depend upon implicit line-end pc's for lines to do the
|
|
|
|
|
reordering in this function. */
|
|
|
|
|
|
|
|
|
|
struct dis_line_entry
|
|
|
|
|
{
|
|
|
|
|
int line;
|
|
|
|
|
CORE_ADDR start_pc;
|
|
|
|
|
CORE_ADDR end_pc;
|
|
|
|
|
};
|
|
|
|
|
|
2003-04-30 Andrew Cagney <cagney@redhat.com>
* gdbarch.sh (deprecated_tm_print_insn_info): Rename
"tm_print_insn_info".
(TARGET_PRINT_INSN_INFO): Delete macro.
(dis_asm_read_memory): Delete function declaration.
(dis_asm_memory_error, dis_asm_print_address): Ditto.
(tm_print_insn_info): Delete variable definition.
(_initialize_gdbarch): Do not initialize "tm_print_insn_info".
* gdbarch.h, gdbarch.c: Re-generate.
* d10v-tdep.c (display_trace): Replace "tm_print_insn_info" with
"deprecated_tm_print_insn_info".
* mcore-tdep.c (mcore_dump_insn): Ditto.
* mips-tdep.c (mips_gdbarch_init): Ditto.
* sparc-tdep.c (_initialize_sparc_tdep): Ditto.
* v850-tdep.c (v850_scan_prologue, v850_gdbarch_init): Ditto.
* ia64-tdep.c (_initialize_ia64_tdep): Ditto.
* printcmd.c (print_insn): Use "deprecated_tm_print_insn_info"
instead of TARGET_PRINT_INSN_INFO, add comment.
* s390-tdep.c (s390_get_frame_info): Instead of
"dis_asm_read_memory", use "deprecated_tm_print_insn_info".
(s390_check_function_end, s390_is_sigreturn): Ditto.
* corefile.c (dis_asm_read_memory): Move to "disasm.c".
(dis_asm_memory_error, dis_asm_print_address): Ditto.
* disasm.c: Include "gdbcore.h".
(_initialize_disasm): New function, initialize
"deprecated_tm_print_insn_info".
(deprecated_tm_print_insn_info): New variable.
(dis_asm_read_memory): Moved from "corefile.c", made static.
(dis_asm_print_address, dis_asm_memory_error): Ditto.
* Makefile.in (disasm.o): Update dependencies.
2003-04-28 Andrew Cagney <cagney@redhat.com>
* gdbint.texinfo (Target Architecture Definition): Replace
read_fp, TARGET_READ_FP and FP_REGNUM, with deprecated_read_fp,
DEPRECATED_TARGET_READ_FP and DEPRECATED_REGNUM.
2003-05-01 00:01:38 +02:00
|
|
|
|
/* Like target_read_memory, but slightly different parameters. */
|
|
|
|
|
static int
|
|
|
|
|
dis_asm_read_memory (bfd_vma memaddr, bfd_byte *myaddr, unsigned int len,
|
|
|
|
|
disassemble_info *info)
|
|
|
|
|
{
|
|
|
|
|
return target_read_memory (memaddr, (char *) myaddr, len);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Like memory_error with slightly different parameters. */
|
|
|
|
|
static void
|
|
|
|
|
dis_asm_memory_error (int status, bfd_vma memaddr, disassemble_info *info)
|
|
|
|
|
{
|
|
|
|
|
memory_error (status, memaddr);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Like print_address with slightly different parameters. */
|
|
|
|
|
static void
|
|
|
|
|
dis_asm_print_address (bfd_vma addr, struct disassemble_info *info)
|
|
|
|
|
{
|
|
|
|
|
print_address (addr, info->stream);
|
|
|
|
|
}
|
|
|
|
|
|
2002-09-30 17:57:26 +02:00
|
|
|
|
static int
|
2003-01-09 19:30:32 +01:00
|
|
|
|
compare_lines (const void *mle1p, const void *mle2p)
|
2002-09-30 17:57:26 +02:00
|
|
|
|
{
|
|
|
|
|
struct dis_line_entry *mle1, *mle2;
|
|
|
|
|
int val;
|
|
|
|
|
|
|
|
|
|
mle1 = (struct dis_line_entry *) mle1p;
|
|
|
|
|
mle2 = (struct dis_line_entry *) mle2p;
|
|
|
|
|
|
|
|
|
|
val = mle1->line - mle2->line;
|
|
|
|
|
|
|
|
|
|
if (val != 0)
|
|
|
|
|
return val;
|
|
|
|
|
|
|
|
|
|
return mle1->start_pc - mle2->start_pc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
dump_insns (struct ui_out *uiout, disassemble_info * di,
|
|
|
|
|
CORE_ADDR low, CORE_ADDR high,
|
|
|
|
|
int how_many, struct ui_stream *stb)
|
|
|
|
|
{
|
|
|
|
|
int num_displayed = 0;
|
|
|
|
|
CORE_ADDR pc;
|
|
|
|
|
|
|
|
|
|
/* parts of the symbolic representation of the address */
|
|
|
|
|
int unmapped;
|
|
|
|
|
int offset;
|
|
|
|
|
int line;
|
2003-02-02 Elena Zannoni <ezannoni@redhat.com>
Fix PR gdb/742 gdb/743
* disasm.c (dump_insns): Use make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Use
make_cleanup_ui_out_tuple_begin_end and
make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Ditto.
* thread.c (do_captured_list_thread_ids): Ditto.
* ui-out.h (ui_out_table_begin, ui_out_list_begin,
ui_out_tuple_begin, ui_out_table_end, ui_out_list_end,
ui_out_tuple_end): Delete prototypes.
* ui-out.c (ui_out_list_begin, ui_out_tuple_begin,
ui_out_list_end, ui_out_tuple_end): Delete.
From Kevin Buettner <kevinb@redhat.com>:
* ui-out.h (make_cleanup_ui_out_table_begin_end): New function.
* ui-out.c (make_cleanup_ui_out_table_begin_end)
(do_cleanup_table_end): New functions.
* breakpoint.c (print_it_typical, print_one_breakpoint, mention):
Use cleanups to invoke_ui_out_tuple_end().
(breakpoint_1): Use cleanup to invoke ui_out_table_end().
* cli/cli-setshow.c (cmd_show_list): Use
make_cleanup_ui_out_tuple_begin_end.
2003-02-03 02:18:37 +01:00
|
|
|
|
struct cleanup *ui_out_chain;
|
2002-09-30 17:57:26 +02:00
|
|
|
|
|
|
|
|
|
for (pc = low; pc < high;)
|
|
|
|
|
{
|
2003-04-08 03:40:31 +02:00
|
|
|
|
char *filename = NULL;
|
|
|
|
|
char *name = NULL;
|
|
|
|
|
|
2002-09-30 17:57:26 +02:00
|
|
|
|
QUIT;
|
|
|
|
|
if (how_many >= 0)
|
|
|
|
|
{
|
|
|
|
|
if (num_displayed >= how_many)
|
|
|
|
|
break;
|
|
|
|
|
else
|
|
|
|
|
num_displayed++;
|
|
|
|
|
}
|
2003-02-02 Elena Zannoni <ezannoni@redhat.com>
Fix PR gdb/742 gdb/743
* disasm.c (dump_insns): Use make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Use
make_cleanup_ui_out_tuple_begin_end and
make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Ditto.
* thread.c (do_captured_list_thread_ids): Ditto.
* ui-out.h (ui_out_table_begin, ui_out_list_begin,
ui_out_tuple_begin, ui_out_table_end, ui_out_list_end,
ui_out_tuple_end): Delete prototypes.
* ui-out.c (ui_out_list_begin, ui_out_tuple_begin,
ui_out_list_end, ui_out_tuple_end): Delete.
From Kevin Buettner <kevinb@redhat.com>:
* ui-out.h (make_cleanup_ui_out_table_begin_end): New function.
* ui-out.c (make_cleanup_ui_out_table_begin_end)
(do_cleanup_table_end): New functions.
* breakpoint.c (print_it_typical, print_one_breakpoint, mention):
Use cleanups to invoke_ui_out_tuple_end().
(breakpoint_1): Use cleanup to invoke ui_out_table_end().
* cli/cli-setshow.c (cmd_show_list): Use
make_cleanup_ui_out_tuple_begin_end.
2003-02-03 02:18:37 +01:00
|
|
|
|
ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
|
2002-09-30 17:57:26 +02:00
|
|
|
|
ui_out_field_core_addr (uiout, "address", pc);
|
|
|
|
|
|
|
|
|
|
if (!build_address_symbolic (pc, 0, &name, &offset, &filename,
|
|
|
|
|
&line, &unmapped))
|
|
|
|
|
{
|
|
|
|
|
/* We don't care now about line, filename and
|
|
|
|
|
unmapped. But we might in the future. */
|
|
|
|
|
ui_out_text (uiout, " <");
|
|
|
|
|
ui_out_field_string (uiout, "func-name", name);
|
|
|
|
|
ui_out_text (uiout, "+");
|
|
|
|
|
ui_out_field_int (uiout, "offset", offset);
|
|
|
|
|
ui_out_text (uiout, ">:\t");
|
|
|
|
|
}
|
2003-07-07 17:13:17 +02:00
|
|
|
|
else
|
|
|
|
|
ui_out_text (uiout, ":\t");
|
|
|
|
|
|
2002-09-30 17:57:26 +02:00
|
|
|
|
if (filename != NULL)
|
|
|
|
|
xfree (filename);
|
|
|
|
|
if (name != NULL)
|
|
|
|
|
xfree (name);
|
|
|
|
|
|
|
|
|
|
ui_file_rewind (stb->stream);
|
|
|
|
|
pc += TARGET_PRINT_INSN (pc, di);
|
|
|
|
|
ui_out_field_stream (uiout, "inst", stb);
|
|
|
|
|
ui_file_rewind (stb->stream);
|
2003-02-02 Elena Zannoni <ezannoni@redhat.com>
Fix PR gdb/742 gdb/743
* disasm.c (dump_insns): Use make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Use
make_cleanup_ui_out_tuple_begin_end and
make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Ditto.
* thread.c (do_captured_list_thread_ids): Ditto.
* ui-out.h (ui_out_table_begin, ui_out_list_begin,
ui_out_tuple_begin, ui_out_table_end, ui_out_list_end,
ui_out_tuple_end): Delete prototypes.
* ui-out.c (ui_out_list_begin, ui_out_tuple_begin,
ui_out_list_end, ui_out_tuple_end): Delete.
From Kevin Buettner <kevinb@redhat.com>:
* ui-out.h (make_cleanup_ui_out_table_begin_end): New function.
* ui-out.c (make_cleanup_ui_out_table_begin_end)
(do_cleanup_table_end): New functions.
* breakpoint.c (print_it_typical, print_one_breakpoint, mention):
Use cleanups to invoke_ui_out_tuple_end().
(breakpoint_1): Use cleanup to invoke ui_out_table_end().
* cli/cli-setshow.c (cmd_show_list): Use
make_cleanup_ui_out_tuple_begin_end.
2003-02-03 02:18:37 +01:00
|
|
|
|
do_cleanups (ui_out_chain);
|
2002-09-30 17:57:26 +02:00
|
|
|
|
ui_out_text (uiout, "\n");
|
|
|
|
|
}
|
|
|
|
|
return num_displayed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* The idea here is to present a source-O-centric view of a
|
|
|
|
|
function to the user. This means that things are presented
|
|
|
|
|
in source order, with (possibly) out of order assembly
|
|
|
|
|
immediately following. */
|
|
|
|
|
static void
|
|
|
|
|
do_mixed_source_and_assembly (struct ui_out *uiout,
|
|
|
|
|
struct disassemble_info *di, int nlines,
|
|
|
|
|
struct linetable_entry *le,
|
|
|
|
|
CORE_ADDR low, CORE_ADDR high,
|
|
|
|
|
struct symtab *symtab,
|
|
|
|
|
int how_many, struct ui_stream *stb)
|
|
|
|
|
{
|
|
|
|
|
int newlines = 0;
|
|
|
|
|
struct dis_line_entry *mle;
|
|
|
|
|
struct symtab_and_line sal;
|
|
|
|
|
int i;
|
|
|
|
|
int out_of_order = 0;
|
|
|
|
|
int next_line = 0;
|
|
|
|
|
CORE_ADDR pc;
|
|
|
|
|
int num_displayed = 0;
|
2003-02-02 Elena Zannoni <ezannoni@redhat.com>
Fix PR gdb/742 gdb/743
* disasm.c (dump_insns): Use make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Use
make_cleanup_ui_out_tuple_begin_end and
make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Ditto.
* thread.c (do_captured_list_thread_ids): Ditto.
* ui-out.h (ui_out_table_begin, ui_out_list_begin,
ui_out_tuple_begin, ui_out_table_end, ui_out_list_end,
ui_out_tuple_end): Delete prototypes.
* ui-out.c (ui_out_list_begin, ui_out_tuple_begin,
ui_out_list_end, ui_out_tuple_end): Delete.
From Kevin Buettner <kevinb@redhat.com>:
* ui-out.h (make_cleanup_ui_out_table_begin_end): New function.
* ui-out.c (make_cleanup_ui_out_table_begin_end)
(do_cleanup_table_end): New functions.
* breakpoint.c (print_it_typical, print_one_breakpoint, mention):
Use cleanups to invoke_ui_out_tuple_end().
(breakpoint_1): Use cleanup to invoke ui_out_table_end().
* cli/cli-setshow.c (cmd_show_list): Use
make_cleanup_ui_out_tuple_begin_end.
2003-02-03 02:18:37 +01:00
|
|
|
|
struct cleanup *ui_out_chain;
|
2002-09-30 17:57:26 +02:00
|
|
|
|
|
|
|
|
|
mle = (struct dis_line_entry *) alloca (nlines
|
|
|
|
|
* sizeof (struct dis_line_entry));
|
|
|
|
|
|
|
|
|
|
/* Copy linetable entries for this function into our data
|
|
|
|
|
structure, creating end_pc's and setting out_of_order as
|
|
|
|
|
appropriate. */
|
|
|
|
|
|
|
|
|
|
/* First, skip all the preceding functions. */
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < nlines - 1 && le[i].pc < low; i++);
|
|
|
|
|
|
|
|
|
|
/* Now, copy all entries before the end of this function. */
|
|
|
|
|
|
|
|
|
|
for (; i < nlines - 1 && le[i].pc < high; i++)
|
|
|
|
|
{
|
|
|
|
|
if (le[i].line == le[i + 1].line && le[i].pc == le[i + 1].pc)
|
|
|
|
|
continue; /* Ignore duplicates */
|
|
|
|
|
|
|
|
|
|
/* Skip any end-of-function markers. */
|
|
|
|
|
if (le[i].line == 0)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
mle[newlines].line = le[i].line;
|
|
|
|
|
if (le[i].line > le[i + 1].line)
|
|
|
|
|
out_of_order = 1;
|
|
|
|
|
mle[newlines].start_pc = le[i].pc;
|
|
|
|
|
mle[newlines].end_pc = le[i + 1].pc;
|
|
|
|
|
newlines++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* 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. */
|
|
|
|
|
|
|
|
|
|
if (i == nlines - 1 && le[i].pc < high)
|
|
|
|
|
{
|
|
|
|
|
mle[newlines].line = le[i].line;
|
|
|
|
|
mle[newlines].start_pc = le[i].pc;
|
|
|
|
|
sal = find_pc_line (le[i].pc, 0);
|
|
|
|
|
mle[newlines].end_pc = sal.end;
|
|
|
|
|
newlines++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Now, sort mle by line #s (and, then by addresses within
|
|
|
|
|
lines). */
|
|
|
|
|
|
|
|
|
|
if (out_of_order)
|
|
|
|
|
qsort (mle, newlines, sizeof (struct dis_line_entry), compare_lines);
|
|
|
|
|
|
|
|
|
|
/* Now, for each line entry, emit the specified lines (unless
|
|
|
|
|
they have been emitted before), followed by the assembly code
|
|
|
|
|
for that line. */
|
|
|
|
|
|
2003-02-02 Elena Zannoni <ezannoni@redhat.com>
Fix PR gdb/742 gdb/743
* disasm.c (dump_insns): Use make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Use
make_cleanup_ui_out_tuple_begin_end and
make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Ditto.
* thread.c (do_captured_list_thread_ids): Ditto.
* ui-out.h (ui_out_table_begin, ui_out_list_begin,
ui_out_tuple_begin, ui_out_table_end, ui_out_list_end,
ui_out_tuple_end): Delete prototypes.
* ui-out.c (ui_out_list_begin, ui_out_tuple_begin,
ui_out_list_end, ui_out_tuple_end): Delete.
From Kevin Buettner <kevinb@redhat.com>:
* ui-out.h (make_cleanup_ui_out_table_begin_end): New function.
* ui-out.c (make_cleanup_ui_out_table_begin_end)
(do_cleanup_table_end): New functions.
* breakpoint.c (print_it_typical, print_one_breakpoint, mention):
Use cleanups to invoke_ui_out_tuple_end().
(breakpoint_1): Use cleanup to invoke ui_out_table_end().
* cli/cli-setshow.c (cmd_show_list): Use
make_cleanup_ui_out_tuple_begin_end.
2003-02-03 02:18:37 +01:00
|
|
|
|
ui_out_chain = make_cleanup_ui_out_list_begin_end (uiout, "asm_insns");
|
2002-09-30 17:57:26 +02:00
|
|
|
|
|
|
|
|
|
for (i = 0; i < newlines; i++)
|
|
|
|
|
{
|
2003-02-02 Elena Zannoni <ezannoni@redhat.com>
Fix PR gdb/742 gdb/743
* disasm.c (dump_insns): Use make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Use
make_cleanup_ui_out_tuple_begin_end and
make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Ditto.
* thread.c (do_captured_list_thread_ids): Ditto.
* ui-out.h (ui_out_table_begin, ui_out_list_begin,
ui_out_tuple_begin, ui_out_table_end, ui_out_list_end,
ui_out_tuple_end): Delete prototypes.
* ui-out.c (ui_out_list_begin, ui_out_tuple_begin,
ui_out_list_end, ui_out_tuple_end): Delete.
From Kevin Buettner <kevinb@redhat.com>:
* ui-out.h (make_cleanup_ui_out_table_begin_end): New function.
* ui-out.c (make_cleanup_ui_out_table_begin_end)
(do_cleanup_table_end): New functions.
* breakpoint.c (print_it_typical, print_one_breakpoint, mention):
Use cleanups to invoke_ui_out_tuple_end().
(breakpoint_1): Use cleanup to invoke ui_out_table_end().
* cli/cli-setshow.c (cmd_show_list): Use
make_cleanup_ui_out_tuple_begin_end.
2003-02-03 02:18:37 +01:00
|
|
|
|
struct cleanup *ui_out_tuple_chain = NULL;
|
|
|
|
|
struct cleanup *ui_out_list_chain = NULL;
|
2002-09-30 17:57:26 +02:00
|
|
|
|
int close_list = 1;
|
2003-02-02 Elena Zannoni <ezannoni@redhat.com>
Fix PR gdb/742 gdb/743
* disasm.c (dump_insns): Use make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Use
make_cleanup_ui_out_tuple_begin_end and
make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Ditto.
* thread.c (do_captured_list_thread_ids): Ditto.
* ui-out.h (ui_out_table_begin, ui_out_list_begin,
ui_out_tuple_begin, ui_out_table_end, ui_out_list_end,
ui_out_tuple_end): Delete prototypes.
* ui-out.c (ui_out_list_begin, ui_out_tuple_begin,
ui_out_list_end, ui_out_tuple_end): Delete.
From Kevin Buettner <kevinb@redhat.com>:
* ui-out.h (make_cleanup_ui_out_table_begin_end): New function.
* ui-out.c (make_cleanup_ui_out_table_begin_end)
(do_cleanup_table_end): New functions.
* breakpoint.c (print_it_typical, print_one_breakpoint, mention):
Use cleanups to invoke_ui_out_tuple_end().
(breakpoint_1): Use cleanup to invoke ui_out_table_end().
* cli/cli-setshow.c (cmd_show_list): Use
make_cleanup_ui_out_tuple_begin_end.
2003-02-03 02:18:37 +01:00
|
|
|
|
|
2002-09-30 17:57:26 +02:00
|
|
|
|
/* Print out everything from next_line to the current line. */
|
|
|
|
|
if (mle[i].line >= next_line)
|
|
|
|
|
{
|
|
|
|
|
if (next_line != 0)
|
|
|
|
|
{
|
|
|
|
|
/* Just one line to print. */
|
|
|
|
|
if (next_line == mle[i].line)
|
|
|
|
|
{
|
2003-02-02 Elena Zannoni <ezannoni@redhat.com>
Fix PR gdb/742 gdb/743
* disasm.c (dump_insns): Use make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Use
make_cleanup_ui_out_tuple_begin_end and
make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Ditto.
* thread.c (do_captured_list_thread_ids): Ditto.
* ui-out.h (ui_out_table_begin, ui_out_list_begin,
ui_out_tuple_begin, ui_out_table_end, ui_out_list_end,
ui_out_tuple_end): Delete prototypes.
* ui-out.c (ui_out_list_begin, ui_out_tuple_begin,
ui_out_list_end, ui_out_tuple_end): Delete.
From Kevin Buettner <kevinb@redhat.com>:
* ui-out.h (make_cleanup_ui_out_table_begin_end): New function.
* ui-out.c (make_cleanup_ui_out_table_begin_end)
(do_cleanup_table_end): New functions.
* breakpoint.c (print_it_typical, print_one_breakpoint, mention):
Use cleanups to invoke_ui_out_tuple_end().
(breakpoint_1): Use cleanup to invoke ui_out_table_end().
* cli/cli-setshow.c (cmd_show_list): Use
make_cleanup_ui_out_tuple_begin_end.
2003-02-03 02:18:37 +01:00
|
|
|
|
ui_out_tuple_chain
|
|
|
|
|
= make_cleanup_ui_out_tuple_begin_end (uiout,
|
|
|
|
|
"src_and_asm_line");
|
2002-09-30 17:57:26 +02:00
|
|
|
|
print_source_lines (symtab, next_line, mle[i].line + 1, 0);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
/* Several source lines w/o asm instructions associated. */
|
|
|
|
|
for (; next_line < mle[i].line; next_line++)
|
|
|
|
|
{
|
2003-02-02 Elena Zannoni <ezannoni@redhat.com>
Fix PR gdb/742 gdb/743
* disasm.c (dump_insns): Use make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Use
make_cleanup_ui_out_tuple_begin_end and
make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Ditto.
* thread.c (do_captured_list_thread_ids): Ditto.
* ui-out.h (ui_out_table_begin, ui_out_list_begin,
ui_out_tuple_begin, ui_out_table_end, ui_out_list_end,
ui_out_tuple_end): Delete prototypes.
* ui-out.c (ui_out_list_begin, ui_out_tuple_begin,
ui_out_list_end, ui_out_tuple_end): Delete.
From Kevin Buettner <kevinb@redhat.com>:
* ui-out.h (make_cleanup_ui_out_table_begin_end): New function.
* ui-out.c (make_cleanup_ui_out_table_begin_end)
(do_cleanup_table_end): New functions.
* breakpoint.c (print_it_typical, print_one_breakpoint, mention):
Use cleanups to invoke_ui_out_tuple_end().
(breakpoint_1): Use cleanup to invoke ui_out_table_end().
* cli/cli-setshow.c (cmd_show_list): Use
make_cleanup_ui_out_tuple_begin_end.
2003-02-03 02:18:37 +01:00
|
|
|
|
struct cleanup *ui_out_list_chain_line;
|
|
|
|
|
struct cleanup *ui_out_tuple_chain_line;
|
|
|
|
|
|
|
|
|
|
ui_out_tuple_chain_line
|
|
|
|
|
= make_cleanup_ui_out_tuple_begin_end (uiout,
|
|
|
|
|
"src_and_asm_line");
|
2002-09-30 17:57:26 +02:00
|
|
|
|
print_source_lines (symtab, next_line, next_line + 1,
|
|
|
|
|
0);
|
2003-02-02 Elena Zannoni <ezannoni@redhat.com>
Fix PR gdb/742 gdb/743
* disasm.c (dump_insns): Use make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Use
make_cleanup_ui_out_tuple_begin_end and
make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Ditto.
* thread.c (do_captured_list_thread_ids): Ditto.
* ui-out.h (ui_out_table_begin, ui_out_list_begin,
ui_out_tuple_begin, ui_out_table_end, ui_out_list_end,
ui_out_tuple_end): Delete prototypes.
* ui-out.c (ui_out_list_begin, ui_out_tuple_begin,
ui_out_list_end, ui_out_tuple_end): Delete.
From Kevin Buettner <kevinb@redhat.com>:
* ui-out.h (make_cleanup_ui_out_table_begin_end): New function.
* ui-out.c (make_cleanup_ui_out_table_begin_end)
(do_cleanup_table_end): New functions.
* breakpoint.c (print_it_typical, print_one_breakpoint, mention):
Use cleanups to invoke_ui_out_tuple_end().
(breakpoint_1): Use cleanup to invoke ui_out_table_end().
* cli/cli-setshow.c (cmd_show_list): Use
make_cleanup_ui_out_tuple_begin_end.
2003-02-03 02:18:37 +01:00
|
|
|
|
ui_out_list_chain_line
|
|
|
|
|
= make_cleanup_ui_out_list_begin_end (uiout,
|
|
|
|
|
"line_asm_insn");
|
|
|
|
|
do_cleanups (ui_out_list_chain_line);
|
|
|
|
|
do_cleanups (ui_out_tuple_chain_line);
|
2002-09-30 17:57:26 +02:00
|
|
|
|
}
|
|
|
|
|
/* Print the last line and leave list open for
|
|
|
|
|
asm instructions to be added. */
|
2003-02-02 Elena Zannoni <ezannoni@redhat.com>
Fix PR gdb/742 gdb/743
* disasm.c (dump_insns): Use make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Use
make_cleanup_ui_out_tuple_begin_end and
make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Ditto.
* thread.c (do_captured_list_thread_ids): Ditto.
* ui-out.h (ui_out_table_begin, ui_out_list_begin,
ui_out_tuple_begin, ui_out_table_end, ui_out_list_end,
ui_out_tuple_end): Delete prototypes.
* ui-out.c (ui_out_list_begin, ui_out_tuple_begin,
ui_out_list_end, ui_out_tuple_end): Delete.
From Kevin Buettner <kevinb@redhat.com>:
* ui-out.h (make_cleanup_ui_out_table_begin_end): New function.
* ui-out.c (make_cleanup_ui_out_table_begin_end)
(do_cleanup_table_end): New functions.
* breakpoint.c (print_it_typical, print_one_breakpoint, mention):
Use cleanups to invoke_ui_out_tuple_end().
(breakpoint_1): Use cleanup to invoke ui_out_table_end().
* cli/cli-setshow.c (cmd_show_list): Use
make_cleanup_ui_out_tuple_begin_end.
2003-02-03 02:18:37 +01:00
|
|
|
|
ui_out_tuple_chain
|
|
|
|
|
= make_cleanup_ui_out_tuple_begin_end (uiout,
|
|
|
|
|
"src_and_asm_line");
|
2002-09-30 17:57:26 +02:00
|
|
|
|
print_source_lines (symtab, next_line, mle[i].line + 1, 0);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
2003-02-02 Elena Zannoni <ezannoni@redhat.com>
Fix PR gdb/742 gdb/743
* disasm.c (dump_insns): Use make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Use
make_cleanup_ui_out_tuple_begin_end and
make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Ditto.
* thread.c (do_captured_list_thread_ids): Ditto.
* ui-out.h (ui_out_table_begin, ui_out_list_begin,
ui_out_tuple_begin, ui_out_table_end, ui_out_list_end,
ui_out_tuple_end): Delete prototypes.
* ui-out.c (ui_out_list_begin, ui_out_tuple_begin,
ui_out_list_end, ui_out_tuple_end): Delete.
From Kevin Buettner <kevinb@redhat.com>:
* ui-out.h (make_cleanup_ui_out_table_begin_end): New function.
* ui-out.c (make_cleanup_ui_out_table_begin_end)
(do_cleanup_table_end): New functions.
* breakpoint.c (print_it_typical, print_one_breakpoint, mention):
Use cleanups to invoke_ui_out_tuple_end().
(breakpoint_1): Use cleanup to invoke ui_out_table_end().
* cli/cli-setshow.c (cmd_show_list): Use
make_cleanup_ui_out_tuple_begin_end.
2003-02-03 02:18:37 +01:00
|
|
|
|
ui_out_tuple_chain
|
|
|
|
|
= make_cleanup_ui_out_tuple_begin_end (uiout, "src_and_asm_line");
|
2002-09-30 17:57:26 +02:00
|
|
|
|
print_source_lines (symtab, mle[i].line, mle[i].line + 1, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
next_line = mle[i].line + 1;
|
2003-02-02 Elena Zannoni <ezannoni@redhat.com>
Fix PR gdb/742 gdb/743
* disasm.c (dump_insns): Use make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Use
make_cleanup_ui_out_tuple_begin_end and
make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Ditto.
* thread.c (do_captured_list_thread_ids): Ditto.
* ui-out.h (ui_out_table_begin, ui_out_list_begin,
ui_out_tuple_begin, ui_out_table_end, ui_out_list_end,
ui_out_tuple_end): Delete prototypes.
* ui-out.c (ui_out_list_begin, ui_out_tuple_begin,
ui_out_list_end, ui_out_tuple_end): Delete.
From Kevin Buettner <kevinb@redhat.com>:
* ui-out.h (make_cleanup_ui_out_table_begin_end): New function.
* ui-out.c (make_cleanup_ui_out_table_begin_end)
(do_cleanup_table_end): New functions.
* breakpoint.c (print_it_typical, print_one_breakpoint, mention):
Use cleanups to invoke_ui_out_tuple_end().
(breakpoint_1): Use cleanup to invoke ui_out_table_end().
* cli/cli-setshow.c (cmd_show_list): Use
make_cleanup_ui_out_tuple_begin_end.
2003-02-03 02:18:37 +01:00
|
|
|
|
ui_out_list_chain
|
|
|
|
|
= make_cleanup_ui_out_list_begin_end (uiout, "line_asm_insn");
|
2002-09-30 17:57:26 +02:00
|
|
|
|
/* Don't close the list if the lines are not in order. */
|
|
|
|
|
if (i < (newlines - 1) && mle[i + 1].line <= mle[i].line)
|
|
|
|
|
close_list = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
num_displayed += dump_insns (uiout, di, mle[i].start_pc, mle[i].end_pc,
|
|
|
|
|
how_many, stb);
|
|
|
|
|
if (close_list)
|
|
|
|
|
{
|
2003-02-02 Elena Zannoni <ezannoni@redhat.com>
Fix PR gdb/742 gdb/743
* disasm.c (dump_insns): Use make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Use
make_cleanup_ui_out_tuple_begin_end and
make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Ditto.
* thread.c (do_captured_list_thread_ids): Ditto.
* ui-out.h (ui_out_table_begin, ui_out_list_begin,
ui_out_tuple_begin, ui_out_table_end, ui_out_list_end,
ui_out_tuple_end): Delete prototypes.
* ui-out.c (ui_out_list_begin, ui_out_tuple_begin,
ui_out_list_end, ui_out_tuple_end): Delete.
From Kevin Buettner <kevinb@redhat.com>:
* ui-out.h (make_cleanup_ui_out_table_begin_end): New function.
* ui-out.c (make_cleanup_ui_out_table_begin_end)
(do_cleanup_table_end): New functions.
* breakpoint.c (print_it_typical, print_one_breakpoint, mention):
Use cleanups to invoke_ui_out_tuple_end().
(breakpoint_1): Use cleanup to invoke ui_out_table_end().
* cli/cli-setshow.c (cmd_show_list): Use
make_cleanup_ui_out_tuple_begin_end.
2003-02-03 02:18:37 +01:00
|
|
|
|
do_cleanups (ui_out_list_chain);
|
|
|
|
|
do_cleanups (ui_out_tuple_chain);
|
2002-09-30 17:57:26 +02:00
|
|
|
|
ui_out_text (uiout, "\n");
|
|
|
|
|
close_list = 0;
|
|
|
|
|
}
|
|
|
|
|
if (how_many >= 0)
|
|
|
|
|
if (num_displayed >= how_many)
|
|
|
|
|
break;
|
|
|
|
|
}
|
2003-02-02 Elena Zannoni <ezannoni@redhat.com>
Fix PR gdb/742 gdb/743
* disasm.c (dump_insns): Use make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Use
make_cleanup_ui_out_tuple_begin_end and
make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Ditto.
* thread.c (do_captured_list_thread_ids): Ditto.
* ui-out.h (ui_out_table_begin, ui_out_list_begin,
ui_out_tuple_begin, ui_out_table_end, ui_out_list_end,
ui_out_tuple_end): Delete prototypes.
* ui-out.c (ui_out_list_begin, ui_out_tuple_begin,
ui_out_list_end, ui_out_tuple_end): Delete.
From Kevin Buettner <kevinb@redhat.com>:
* ui-out.h (make_cleanup_ui_out_table_begin_end): New function.
* ui-out.c (make_cleanup_ui_out_table_begin_end)
(do_cleanup_table_end): New functions.
* breakpoint.c (print_it_typical, print_one_breakpoint, mention):
Use cleanups to invoke_ui_out_tuple_end().
(breakpoint_1): Use cleanup to invoke ui_out_table_end().
* cli/cli-setshow.c (cmd_show_list): Use
make_cleanup_ui_out_tuple_begin_end.
2003-02-03 02:18:37 +01:00
|
|
|
|
do_cleanups (ui_out_chain);
|
2002-09-30 17:57:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
do_assembly_only (struct ui_out *uiout, disassemble_info * di,
|
|
|
|
|
CORE_ADDR low, CORE_ADDR high,
|
|
|
|
|
int how_many, struct ui_stream *stb)
|
|
|
|
|
{
|
|
|
|
|
int num_displayed = 0;
|
2003-02-02 Elena Zannoni <ezannoni@redhat.com>
Fix PR gdb/742 gdb/743
* disasm.c (dump_insns): Use make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Use
make_cleanup_ui_out_tuple_begin_end and
make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Ditto.
* thread.c (do_captured_list_thread_ids): Ditto.
* ui-out.h (ui_out_table_begin, ui_out_list_begin,
ui_out_tuple_begin, ui_out_table_end, ui_out_list_end,
ui_out_tuple_end): Delete prototypes.
* ui-out.c (ui_out_list_begin, ui_out_tuple_begin,
ui_out_list_end, ui_out_tuple_end): Delete.
From Kevin Buettner <kevinb@redhat.com>:
* ui-out.h (make_cleanup_ui_out_table_begin_end): New function.
* ui-out.c (make_cleanup_ui_out_table_begin_end)
(do_cleanup_table_end): New functions.
* breakpoint.c (print_it_typical, print_one_breakpoint, mention):
Use cleanups to invoke_ui_out_tuple_end().
(breakpoint_1): Use cleanup to invoke ui_out_table_end().
* cli/cli-setshow.c (cmd_show_list): Use
make_cleanup_ui_out_tuple_begin_end.
2003-02-03 02:18:37 +01:00
|
|
|
|
struct cleanup *ui_out_chain;
|
2002-09-30 17:57:26 +02:00
|
|
|
|
|
2003-02-02 Elena Zannoni <ezannoni@redhat.com>
Fix PR gdb/742 gdb/743
* disasm.c (dump_insns): Use make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Use
make_cleanup_ui_out_tuple_begin_end and
make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Ditto.
* thread.c (do_captured_list_thread_ids): Ditto.
* ui-out.h (ui_out_table_begin, ui_out_list_begin,
ui_out_tuple_begin, ui_out_table_end, ui_out_list_end,
ui_out_tuple_end): Delete prototypes.
* ui-out.c (ui_out_list_begin, ui_out_tuple_begin,
ui_out_list_end, ui_out_tuple_end): Delete.
From Kevin Buettner <kevinb@redhat.com>:
* ui-out.h (make_cleanup_ui_out_table_begin_end): New function.
* ui-out.c (make_cleanup_ui_out_table_begin_end)
(do_cleanup_table_end): New functions.
* breakpoint.c (print_it_typical, print_one_breakpoint, mention):
Use cleanups to invoke_ui_out_tuple_end().
(breakpoint_1): Use cleanup to invoke ui_out_table_end().
* cli/cli-setshow.c (cmd_show_list): Use
make_cleanup_ui_out_tuple_begin_end.
2003-02-03 02:18:37 +01:00
|
|
|
|
ui_out_chain = make_cleanup_ui_out_list_begin_end (uiout, "asm_insns");
|
2002-09-30 17:57:26 +02:00
|
|
|
|
|
|
|
|
|
num_displayed = dump_insns (uiout, di, low, high, how_many, stb);
|
|
|
|
|
|
2003-02-02 Elena Zannoni <ezannoni@redhat.com>
Fix PR gdb/742 gdb/743
* disasm.c (dump_insns): Use make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Use
make_cleanup_ui_out_tuple_begin_end and
make_cleanup_ui_out_tuple_begin_end.
(do_mixed_source_and_assembly): Ditto.
* thread.c (do_captured_list_thread_ids): Ditto.
* ui-out.h (ui_out_table_begin, ui_out_list_begin,
ui_out_tuple_begin, ui_out_table_end, ui_out_list_end,
ui_out_tuple_end): Delete prototypes.
* ui-out.c (ui_out_list_begin, ui_out_tuple_begin,
ui_out_list_end, ui_out_tuple_end): Delete.
From Kevin Buettner <kevinb@redhat.com>:
* ui-out.h (make_cleanup_ui_out_table_begin_end): New function.
* ui-out.c (make_cleanup_ui_out_table_begin_end)
(do_cleanup_table_end): New functions.
* breakpoint.c (print_it_typical, print_one_breakpoint, mention):
Use cleanups to invoke_ui_out_tuple_end().
(breakpoint_1): Use cleanup to invoke ui_out_table_end().
* cli/cli-setshow.c (cmd_show_list): Use
make_cleanup_ui_out_tuple_begin_end.
2003-02-03 02:18:37 +01:00
|
|
|
|
do_cleanups (ui_out_chain);
|
2002-09-30 17:57:26 +02:00
|
|
|
|
}
|
|
|
|
|
|
2003-05-03 21:13:04 +02:00
|
|
|
|
/* Initialize the disassemble info struct ready for the specified
|
|
|
|
|
stream. */
|
|
|
|
|
|
|
|
|
|
static disassemble_info
|
|
|
|
|
gdb_disassemble_info (struct gdbarch *gdbarch, struct ui_file *file)
|
2002-09-30 17:57:26 +02:00
|
|
|
|
{
|
2003-05-02 01:21:08 +02:00
|
|
|
|
disassemble_info di;
|
2003-05-03 21:13:04 +02:00
|
|
|
|
INIT_DISASSEMBLE_INFO_NO_ARCH (di, file,
|
2003-05-23 01:00:15 +02:00
|
|
|
|
(fprintf_ftype) fprintf_filtered);
|
2003-05-02 01:21:08 +02:00
|
|
|
|
di.flavour = bfd_target_unknown_flavour;
|
|
|
|
|
di.memory_error_func = dis_asm_memory_error;
|
|
|
|
|
di.print_address_func = dis_asm_print_address;
|
|
|
|
|
/* NOTE: cagney/2003-04-28: The original code, from the old Insight
|
|
|
|
|
disassembler had a local optomization here. By default it would
|
|
|
|
|
access the executable file, instead of the target memory (there
|
|
|
|
|
was a growing list of exceptions though). Unfortunatly, the
|
|
|
|
|
heuristic was flawed. Commands like "disassemble &variable"
|
|
|
|
|
didn't work as they relied on the access going to the target.
|
|
|
|
|
Further, it has been supperseeded by trust-read-only-sections
|
|
|
|
|
(although that should be superseeded by target_trust..._p()). */
|
|
|
|
|
di.read_memory_func = dis_asm_read_memory;
|
2003-07-18 22:16:23 +02:00
|
|
|
|
di.arch = gdbarch_bfd_arch_info (gdbarch)->arch;
|
2003-05-03 21:13:04 +02:00
|
|
|
|
di.mach = gdbarch_bfd_arch_info (gdbarch)->mach;
|
|
|
|
|
di.endian = gdbarch_byte_order (gdbarch);
|
2003-08-14 23:39:05 +02:00
|
|
|
|
di.insn_sets = 0;
|
2003-05-03 21:13:04 +02:00
|
|
|
|
return di;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
gdb_disassembly (struct ui_out *uiout,
|
|
|
|
|
char *file_string,
|
|
|
|
|
int line_num,
|
|
|
|
|
int mixed_source_and_assembly,
|
|
|
|
|
int how_many, CORE_ADDR low, CORE_ADDR high)
|
|
|
|
|
{
|
|
|
|
|
struct ui_stream *stb = ui_out_stream_new (uiout);
|
|
|
|
|
struct cleanup *cleanups = make_cleanup_ui_out_stream_delete (stb);
|
|
|
|
|
disassemble_info di = gdb_disassemble_info (current_gdbarch, stb->stream);
|
|
|
|
|
/* To collect the instruction outputted from opcodes. */
|
|
|
|
|
struct symtab *symtab = NULL;
|
|
|
|
|
struct linetable_entry *le = NULL;
|
|
|
|
|
int nlines = -1;
|
2002-09-30 17:57:26 +02:00
|
|
|
|
|
|
|
|
|
/* Assume symtab is valid for whole PC range */
|
|
|
|
|
symtab = find_pc_symtab (low);
|
|
|
|
|
|
|
|
|
|
if (symtab != NULL && symtab->linetable != NULL)
|
|
|
|
|
{
|
|
|
|
|
/* Convert the linetable to a bunch of my_line_entry's. */
|
|
|
|
|
le = symtab->linetable->item;
|
|
|
|
|
nlines = symtab->linetable->nitems;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!mixed_source_and_assembly || nlines <= 0
|
|
|
|
|
|| symtab == NULL || symtab->linetable == NULL)
|
|
|
|
|
do_assembly_only (uiout, &di, low, high, how_many, stb);
|
|
|
|
|
|
|
|
|
|
else if (mixed_source_and_assembly)
|
|
|
|
|
do_mixed_source_and_assembly (uiout, &di, nlines, le, low,
|
|
|
|
|
high, symtab, how_many, stb);
|
|
|
|
|
|
2003-05-02 01:21:08 +02:00
|
|
|
|
do_cleanups (cleanups);
|
2002-09-30 17:57:26 +02:00
|
|
|
|
gdb_flush (gdb_stdout);
|
|
|
|
|
}
|
2003-04-30 Andrew Cagney <cagney@redhat.com>
* gdbarch.sh (deprecated_tm_print_insn_info): Rename
"tm_print_insn_info".
(TARGET_PRINT_INSN_INFO): Delete macro.
(dis_asm_read_memory): Delete function declaration.
(dis_asm_memory_error, dis_asm_print_address): Ditto.
(tm_print_insn_info): Delete variable definition.
(_initialize_gdbarch): Do not initialize "tm_print_insn_info".
* gdbarch.h, gdbarch.c: Re-generate.
* d10v-tdep.c (display_trace): Replace "tm_print_insn_info" with
"deprecated_tm_print_insn_info".
* mcore-tdep.c (mcore_dump_insn): Ditto.
* mips-tdep.c (mips_gdbarch_init): Ditto.
* sparc-tdep.c (_initialize_sparc_tdep): Ditto.
* v850-tdep.c (v850_scan_prologue, v850_gdbarch_init): Ditto.
* ia64-tdep.c (_initialize_ia64_tdep): Ditto.
* printcmd.c (print_insn): Use "deprecated_tm_print_insn_info"
instead of TARGET_PRINT_INSN_INFO, add comment.
* s390-tdep.c (s390_get_frame_info): Instead of
"dis_asm_read_memory", use "deprecated_tm_print_insn_info".
(s390_check_function_end, s390_is_sigreturn): Ditto.
* corefile.c (dis_asm_read_memory): Move to "disasm.c".
(dis_asm_memory_error, dis_asm_print_address): Ditto.
* disasm.c: Include "gdbcore.h".
(_initialize_disasm): New function, initialize
"deprecated_tm_print_insn_info".
(deprecated_tm_print_insn_info): New variable.
(dis_asm_read_memory): Moved from "corefile.c", made static.
(dis_asm_print_address, dis_asm_memory_error): Ditto.
* Makefile.in (disasm.o): Update dependencies.
2003-04-28 Andrew Cagney <cagney@redhat.com>
* gdbint.texinfo (Target Architecture Definition): Replace
read_fp, TARGET_READ_FP and FP_REGNUM, with deprecated_read_fp,
DEPRECATED_TARGET_READ_FP and DEPRECATED_REGNUM.
2003-05-01 00:01:38 +02:00
|
|
|
|
|
2003-05-03 21:13:04 +02:00
|
|
|
|
/* Print the instruction at address MEMADDR in debugged memory,
|
|
|
|
|
on STREAM. Returns length of the instruction, in bytes. */
|
|
|
|
|
|
|
|
|
|
int
|
|
|
|
|
gdb_print_insn (CORE_ADDR memaddr, struct ui_file *stream)
|
|
|
|
|
{
|
|
|
|
|
disassemble_info di = gdb_disassemble_info (current_gdbarch, stream);
|
|
|
|
|
return TARGET_PRINT_INSN (memaddr, &di);
|
|
|
|
|
}
|
|
|
|
|
|
2003-04-30 Andrew Cagney <cagney@redhat.com>
* gdbarch.sh (deprecated_tm_print_insn_info): Rename
"tm_print_insn_info".
(TARGET_PRINT_INSN_INFO): Delete macro.
(dis_asm_read_memory): Delete function declaration.
(dis_asm_memory_error, dis_asm_print_address): Ditto.
(tm_print_insn_info): Delete variable definition.
(_initialize_gdbarch): Do not initialize "tm_print_insn_info".
* gdbarch.h, gdbarch.c: Re-generate.
* d10v-tdep.c (display_trace): Replace "tm_print_insn_info" with
"deprecated_tm_print_insn_info".
* mcore-tdep.c (mcore_dump_insn): Ditto.
* mips-tdep.c (mips_gdbarch_init): Ditto.
* sparc-tdep.c (_initialize_sparc_tdep): Ditto.
* v850-tdep.c (v850_scan_prologue, v850_gdbarch_init): Ditto.
* ia64-tdep.c (_initialize_ia64_tdep): Ditto.
* printcmd.c (print_insn): Use "deprecated_tm_print_insn_info"
instead of TARGET_PRINT_INSN_INFO, add comment.
* s390-tdep.c (s390_get_frame_info): Instead of
"dis_asm_read_memory", use "deprecated_tm_print_insn_info".
(s390_check_function_end, s390_is_sigreturn): Ditto.
* corefile.c (dis_asm_read_memory): Move to "disasm.c".
(dis_asm_memory_error, dis_asm_print_address): Ditto.
* disasm.c: Include "gdbcore.h".
(_initialize_disasm): New function, initialize
"deprecated_tm_print_insn_info".
(deprecated_tm_print_insn_info): New variable.
(dis_asm_read_memory): Moved from "corefile.c", made static.
(dis_asm_print_address, dis_asm_memory_error): Ditto.
* Makefile.in (disasm.o): Update dependencies.
2003-04-28 Andrew Cagney <cagney@redhat.com>
* gdbint.texinfo (Target Architecture Definition): Replace
read_fp, TARGET_READ_FP and FP_REGNUM, with deprecated_read_fp,
DEPRECATED_TARGET_READ_FP and DEPRECATED_REGNUM.
2003-05-01 00:01:38 +02:00
|
|
|
|
|
|
|
|
|
/* FIXME: cagney/2003-04-28: This global deprecated_tm_print_insn_info
|
|
|
|
|
is going away. */
|
|
|
|
|
disassemble_info deprecated_tm_print_insn_info;
|
|
|
|
|
|
|
|
|
|
extern void _initialize_disasm (void);
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
_initialize_disasm (void)
|
|
|
|
|
{
|
2003-05-03 21:13:04 +02:00
|
|
|
|
|
2003-04-30 Andrew Cagney <cagney@redhat.com>
* gdbarch.sh (deprecated_tm_print_insn_info): Rename
"tm_print_insn_info".
(TARGET_PRINT_INSN_INFO): Delete macro.
(dis_asm_read_memory): Delete function declaration.
(dis_asm_memory_error, dis_asm_print_address): Ditto.
(tm_print_insn_info): Delete variable definition.
(_initialize_gdbarch): Do not initialize "tm_print_insn_info".
* gdbarch.h, gdbarch.c: Re-generate.
* d10v-tdep.c (display_trace): Replace "tm_print_insn_info" with
"deprecated_tm_print_insn_info".
* mcore-tdep.c (mcore_dump_insn): Ditto.
* mips-tdep.c (mips_gdbarch_init): Ditto.
* sparc-tdep.c (_initialize_sparc_tdep): Ditto.
* v850-tdep.c (v850_scan_prologue, v850_gdbarch_init): Ditto.
* ia64-tdep.c (_initialize_ia64_tdep): Ditto.
* printcmd.c (print_insn): Use "deprecated_tm_print_insn_info"
instead of TARGET_PRINT_INSN_INFO, add comment.
* s390-tdep.c (s390_get_frame_info): Instead of
"dis_asm_read_memory", use "deprecated_tm_print_insn_info".
(s390_check_function_end, s390_is_sigreturn): Ditto.
* corefile.c (dis_asm_read_memory): Move to "disasm.c".
(dis_asm_memory_error, dis_asm_print_address): Ditto.
* disasm.c: Include "gdbcore.h".
(_initialize_disasm): New function, initialize
"deprecated_tm_print_insn_info".
(deprecated_tm_print_insn_info): New variable.
(dis_asm_read_memory): Moved from "corefile.c", made static.
(dis_asm_print_address, dis_asm_memory_error): Ditto.
* Makefile.in (disasm.o): Update dependencies.
2003-04-28 Andrew Cagney <cagney@redhat.com>
* gdbint.texinfo (Target Architecture Definition): Replace
read_fp, TARGET_READ_FP and FP_REGNUM, with deprecated_read_fp,
DEPRECATED_TARGET_READ_FP and DEPRECATED_REGNUM.
2003-05-01 00:01:38 +02:00
|
|
|
|
INIT_DISASSEMBLE_INFO_NO_ARCH (deprecated_tm_print_insn_info, gdb_stdout,
|
|
|
|
|
(fprintf_ftype)fprintf_filtered);
|
|
|
|
|
deprecated_tm_print_insn_info.flavour = bfd_target_unknown_flavour;
|
|
|
|
|
deprecated_tm_print_insn_info.read_memory_func = dis_asm_read_memory;
|
|
|
|
|
deprecated_tm_print_insn_info.memory_error_func = dis_asm_memory_error;
|
|
|
|
|
deprecated_tm_print_insn_info.print_address_func = dis_asm_print_address;
|
|
|
|
|
}
|