#define DISASM_H
#include "dis-asm.h"
-
-#define DISASSEMBLY_SOURCE_DEPRECATED (0x1 << 0)
-#define DISASSEMBLY_RAW_INSN (0x1 << 1)
-#define DISASSEMBLY_OMIT_FNAME (0x1 << 2)
-#define DISASSEMBLY_FILENAME (0x1 << 3)
-#define DISASSEMBLY_OMIT_PC (0x1 << 4)
-#define DISASSEMBLY_SOURCE (0x1 << 5)
-#define DISASSEMBLY_SPECULATIVE (0x1 << 6)
+#include "common/enum-flags.h"
+
+enum gdb_disassembly_flag
+ {
+ DISASSEMBLY_SOURCE_DEPRECATED = (0x1 << 0),
+ DISASSEMBLY_RAW_INSN = (0x1 << 1),
+ DISASSEMBLY_OMIT_FNAME = (0x1 << 2),
+ DISASSEMBLY_FILENAME = (0x1 << 3),
+ DISASSEMBLY_OMIT_PC = (0x1 << 4),
+ DISASSEMBLY_SOURCE = (0x1 << 5),
+ DISASSEMBLY_SPECULATIVE = (0x1 << 6),
+ };
+DEF_ENUM_FLAGS_TYPE (enum gdb_disassembly_flag, gdb_disassembly_flags);
struct gdbarch;
struct ui_out;
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; }
};
extern void gdb_disassembly (struct gdbarch *gdbarch, struct ui_out *uiout,
- char *file_string, int flags, int how_many,
+ gdb_disassembly_flags flags, int how_many,
CORE_ADDR low, CORE_ADDR high);
/* Print the instruction at address MEMADDR in debugged memory,
extern int gdb_print_insn (struct gdbarch *gdbarch, CORE_ADDR memaddr,
struct ui_file *stream, int *branch_delay_insns);
+/* Class used to pretty-print instructions. */
+
+class gdb_pretty_print_disassembler
+{
+public:
+ explicit gdb_pretty_print_disassembler (struct gdbarch *gdbarch)
+ : m_di (gdbarch, &m_insn_stb)
+ {}
+
+ /* 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,
+ gdb_disassembly_flags flags);
+
+private:
+ /* Returns the architecture used for disassembling. */
+ struct gdbarch *arch () { return m_di.arch (); }
+
+ /* The disassembler used for instruction printing. */
+ gdb_disassembler m_di;
+
+ /* The buffer used to build the instruction string. The
+ disassembler is initialized with this stream. */
+ string_file m_insn_stb;
+
+ /* The buffer used to build the raw opcodes string. */
+ string_file m_opcode_stb;
+};
+
/* Return the length in bytes of the instruction at address MEMADDR in
debugged memory. */
const gdb_byte *insn, int max_len,
CORE_ADDR memaddr);
+/* Returns GDBARCH's disassembler options. */
+
+extern char *get_disassembler_options (struct gdbarch *gdbarch);
+
+/* Sets the active gdbarch's disassembler options to OPTIONS. */
+
+extern void set_disassembler_options (char *options);
+
#endif