aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog17
-rw-r--r--gdb/disasm.c54
-rw-r--r--gdb/disasm.h11
-rw-r--r--gdb/record-btrace.c8
4 files changed, 47 insertions, 43 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 72d33e3..723f06b 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,20 @@
+2017-02-02 Pedro Alves <palves@redhat.com>
+
+ * disasm.c (gdb_disassembler::pretty_print_insn): Rename to...
+ (gdb_pretty_print_insn): ... this. Now a free function. Add back
+ a 'gdbarch' parameter. Allocate a mem_fileopen stream here.
+ Adjust to call gdb_print_insn instead of
+ gdb_disassembler::print_insn.
+ (dump_insns, do_mixed_source_and_assembly_deprecated)
+ (do_mixed_source_and_assembly, do_assembly_only): Add back a
+ 'gdbarch' parameter. Remove gdb_disassembler parameter.
+ (gdb_disassembly): Don't allocate a gdb_disassembler here.
+ * disasm.h (gdb_disassembler::pretty_print_insn): Delete
+ declaration.
+ (gdb_pretty_print_insn): Re-add declaration.
+ * record-btrace.c (btrace_insn_history): Don't allocate a
+ gdb_disassembler here. Adjust to call gdb_pretty_print_insn.
+
2017-02-01 Simon Marchi <simon.marchi@polymtl.ca>
* disasm.h (gdb_disassembly): Remove file_string parameter.
diff --git a/gdb/disasm.c b/gdb/disasm.c
index 9d36f15..03ff8d3 100644
--- a/gdb/disasm.c
+++ b/gdb/disasm.c
@@ -182,9 +182,9 @@ compare_lines (const void *mle1p, const void *mle2p)
/* See disasm.h. */
int
-gdb_disassembler::pretty_print_insn (struct ui_out *uiout,
- const struct disasm_insn *insn,
- int flags)
+gdb_pretty_print_insn (struct gdbarch *gdbarch, struct ui_out *uiout,
+ const struct disasm_insn *insn,
+ int flags)
{
/* parts of the symbolic representation of the address */
int unmapped;
@@ -195,8 +195,6 @@ gdb_disassembler::pretty_print_insn (struct ui_out *uiout,
char *filename = NULL;
char *name = NULL;
CORE_ADDR pc;
- struct ui_file *stb = stream ();
- struct gdbarch *gdbarch = arch ();
ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, NULL);
pc = insn->addr;
@@ -250,7 +248,9 @@ gdb_disassembler::pretty_print_insn (struct ui_out *uiout,
if (name != NULL)
xfree (name);
- ui_file_rewind (stb);
+ struct ui_file *stb = mem_fileopen ();
+ make_cleanup_ui_file_delete (stb);
+
if (flags & DISASSEMBLY_RAW_INSN)
{
CORE_ADDR end_pc;
@@ -264,14 +264,12 @@ gdb_disassembler::pretty_print_insn (struct ui_out *uiout,
struct cleanup *cleanups =
make_cleanup_ui_file_delete (opcode_stream);
- size = print_insn (pc);
+ size = gdb_print_insn (gdbarch, pc, stb, NULL);
end_pc = pc + size;
for (;pc < end_pc; ++pc)
{
- err = m_di.read_memory_func (pc, &data, 1, &m_di);
- if (err != 0)
- m_di.memory_error_func (err, pc, &m_di);
+ read_code (pc, &data, 1);
fprintf_filtered (opcode_stream, "%s%02x",
spacer, (unsigned) data);
spacer = " ";
@@ -283,10 +281,9 @@ gdb_disassembler::pretty_print_insn (struct ui_out *uiout,
do_cleanups (cleanups);
}
else
- size = print_insn (pc);
+ size = gdb_print_insn (gdbarch, pc, stb, NULL);
uiout->field_stream ("inst", stb);
- ui_file_rewind (stb);
do_cleanups (ui_out_chain);
uiout->text ("\n");
@@ -294,10 +291,9 @@ gdb_disassembler::pretty_print_insn (struct ui_out *uiout,
}
static int
-dump_insns (struct ui_out *uiout, gdb_disassembler *di,
- CORE_ADDR low, CORE_ADDR high,
- int how_many, int flags,
- CORE_ADDR *end_pc)
+dump_insns (struct gdbarch *gdbarch,
+ struct ui_out *uiout, CORE_ADDR low, CORE_ADDR high,
+ int how_many, int flags, CORE_ADDR *end_pc)
{
struct disasm_insn insn;
int num_displayed = 0;
@@ -309,7 +305,7 @@ dump_insns (struct ui_out *uiout, gdb_disassembler *di,
{
int size;
- size = di->pretty_print_insn (uiout, &insn, flags);
+ size = gdb_pretty_print_insn (gdbarch, uiout, &insn, flags);
if (size <= 0)
break;
@@ -335,8 +331,8 @@ dump_insns (struct ui_out *uiout, gdb_disassembler *di,
static void
do_mixed_source_and_assembly_deprecated
- (struct ui_out *uiout,
- gdb_disassembler *di, struct symtab *symtab,
+ (struct gdbarch *gdbarch, struct ui_out *uiout,
+ struct symtab *symtab,
CORE_ADDR low, CORE_ADDR high,
int how_many, int flags)
{
@@ -471,7 +467,7 @@ do_mixed_source_and_assembly_deprecated
= make_cleanup_ui_out_list_begin_end (uiout, "line_asm_insn");
}
- num_displayed += dump_insns (uiout, di,
+ num_displayed += dump_insns (gdbarch, uiout,
mle[i].start_pc, mle[i].end_pc,
how_many, flags, NULL);
@@ -499,7 +495,6 @@ do_mixed_source_and_assembly_deprecated
static void
do_mixed_source_and_assembly (struct gdbarch *gdbarch,
struct ui_out *uiout,
- gdb_disassembler *di,
struct symtab *main_symtab,
CORE_ADDR low, CORE_ADDR high,
int how_many, int flags)
@@ -721,7 +716,7 @@ do_mixed_source_and_assembly (struct gdbarch *gdbarch,
end_pc = std::min (sal.end, high);
else
end_pc = pc + 1;
- num_displayed += dump_insns (uiout, di, pc, end_pc,
+ num_displayed += dump_insns (gdbarch, uiout, pc, end_pc,
how_many, flags, &end_pc);
pc = end_pc;
@@ -736,8 +731,7 @@ do_mixed_source_and_assembly (struct gdbarch *gdbarch,
}
static void
-do_assembly_only (struct ui_out *uiout,
- gdb_disassembler *di,
+do_assembly_only (struct gdbarch *gdbarch, struct ui_out *uiout,
CORE_ADDR low, CORE_ADDR high,
int how_many, int flags)
{
@@ -745,7 +739,7 @@ do_assembly_only (struct ui_out *uiout,
ui_out_chain = make_cleanup_ui_out_list_begin_end (uiout, "asm_insns");
- dump_insns (uiout, di, low, high, how_many, flags, NULL);
+ dump_insns (gdbarch, uiout, low, high, how_many, flags, NULL);
do_cleanups (ui_out_chain);
}
@@ -818,9 +812,6 @@ gdb_disassembly (struct gdbarch *gdbarch, struct ui_out *uiout,
int flags, int how_many,
CORE_ADDR low, CORE_ADDR high)
{
- struct ui_file *stb = mem_fileopen ();
- struct cleanup *cleanups = make_cleanup_ui_file_delete (stb);
- gdb_disassembler di (gdbarch, stb);
struct symtab *symtab;
int nlines = -1;
@@ -832,17 +823,16 @@ gdb_disassembly (struct gdbarch *gdbarch, struct ui_out *uiout,
if (!(flags & (DISASSEMBLY_SOURCE_DEPRECATED | DISASSEMBLY_SOURCE))
|| nlines <= 0)
- do_assembly_only (uiout, &di, low, high, how_many, flags);
+ do_assembly_only (gdbarch, uiout, low, high, how_many, flags);
else if (flags & DISASSEMBLY_SOURCE)
- do_mixed_source_and_assembly (gdbarch, uiout, &di, symtab, low, high,
+ do_mixed_source_and_assembly (gdbarch, uiout, symtab, low, high,
how_many, flags);
else if (flags & DISASSEMBLY_SOURCE_DEPRECATED)
- do_mixed_source_and_assembly_deprecated (uiout, &di, symtab,
+ do_mixed_source_and_assembly_deprecated (gdbarch, uiout, symtab,
low, high, how_many, flags);
- do_cleanups (cleanups);
gdb_flush (gdb_stdout);
}
diff --git a/gdb/disasm.h b/gdb/disasm.h
index 7374dbf..dcc01e1 100644
--- a/gdb/disasm.h
+++ b/gdb/disasm.h
@@ -44,11 +44,6 @@ public:
int print_insn (CORE_ADDR memaddr, int *branch_delay_insns = NULL);
- /* Prints the instruction INSN into UIOUT and returns the length of
- the printed instruction in bytes. */
- int pretty_print_insn (struct ui_out *uiout,
- const struct disasm_insn *insn, int flags);
-
/* Return the gdbarch of gdb_disassembler. */
struct gdbarch *arch ()
{ return m_gdbarch; }
@@ -102,6 +97,12 @@ extern void gdb_disassembly (struct gdbarch *gdbarch, struct ui_out *uiout,
extern int gdb_print_insn (struct gdbarch *gdbarch, CORE_ADDR memaddr,
struct ui_file *stream, int *branch_delay_insns);
+/* Prints the instruction INSN into UIOUT and returns the length of
+ the printed instruction in bytes. */
+
+extern int gdb_pretty_print_insn (struct gdbarch *gdbarch, struct ui_out *uiout,
+ const struct disasm_insn *insn, int flags);
+
/* Return the length in bytes of the instruction at address MEMADDR in
debugged memory. */
diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c
index ee0d22c..35e96ad 100644
--- a/gdb/record-btrace.c
+++ b/gdb/record-btrace.c
@@ -700,7 +700,6 @@ btrace_insn_history (struct ui_out *uiout,
const struct btrace_insn_iterator *begin,
const struct btrace_insn_iterator *end, int flags)
{
- struct ui_file *stb;
struct cleanup *cleanups, *ui_item_chain;
struct gdbarch *gdbarch;
struct btrace_insn_iterator it;
@@ -712,12 +711,9 @@ btrace_insn_history (struct ui_out *uiout,
flags |= DISASSEMBLY_SPECULATIVE;
gdbarch = target_gdbarch ();
- stb = mem_fileopen ();
- cleanups = make_cleanup_ui_file_delete (stb);
- gdb_disassembler di (gdbarch, stb);
last_lines = btrace_mk_line_range (NULL, 0, 0);
- make_cleanup_ui_out_list_begin_end (uiout, "asm_insns");
+ cleanups = make_cleanup_ui_out_list_begin_end (uiout, "asm_insns");
/* UI_ITEM_CHAIN is a cleanup chain for the last source line and the
instructions corresponding to that line. */
@@ -776,7 +772,7 @@ btrace_insn_history (struct ui_out *uiout,
if ((insn->flags & BTRACE_INSN_FLAG_SPECULATIVE) != 0)
dinsn.is_speculative = 1;
- di.pretty_print_insn (uiout, &dinsn, flags);
+ gdb_pretty_print_insn (gdbarch, uiout, &dinsn, flags);
}
}
generated by cgit v1.1 at 2024-11-16 05:23:26 +0000