X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fdisasm.c;h=164939b58826ded1b08455b22b2e558188676275;hb=cb7364414157c42de5ea618d98e2be9eff1894ba;hp=734db2b1c8296b284b56c7f9a46a92c3ea10bf05;hpb=f995bbe8e62fdb5607acb1ee127240cfe50d2b8f;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/disasm.c b/gdb/disasm.c index 734db2b1c8..164939b588 100644 --- a/gdb/disasm.c +++ b/gdb/disasm.c @@ -1,6 +1,6 @@ /* Disassemble support for GDB. - Copyright (C) 2000-2017 Free Software Foundation, Inc. + Copyright (C) 2000-2019 Free Software Foundation, Inc. This file is part of GDB. @@ -29,6 +29,9 @@ #include "source.h" #include "safe-ctype.h" #include +#include "gdbsupport/gdb_optional.h" +#include "valprint.h" +#include "cli/cli-style.h" /* Disassemble functions. FIXME: We should get rid of all the duplicate code in gdb that does @@ -160,28 +163,27 @@ gdb_disassembler::dis_asm_print_address (bfd_vma addr, print_address (self->arch (), addr, self->stream ()); } -static int -compare_lines (const void *mle1p, const void *mle2p) +static bool +line_is_less_than (const deprecated_dis_line_entry &mle1, + const deprecated_dis_line_entry &mle2) { - struct deprecated_dis_line_entry *mle1, *mle2; - int val; - - mle1 = (struct deprecated_dis_line_entry *) mle1p; - mle2 = (struct deprecated_dis_line_entry *) mle2p; + bool val; /* End of sequence markers have a line number of 0 but don't want to be sorted to the head of the list, instead sort by PC. */ - if (mle1->line == 0 || mle2->line == 0) + if (mle1.line == 0 || mle2.line == 0) { - val = mle1->start_pc - mle2->start_pc; - if (val == 0) - val = mle1->line - mle2->line; + if (mle1.start_pc != mle2.start_pc) + val = mle1.start_pc < mle2.start_pc; + else + val = mle1.line < mle2.line; } else { - val = mle1->line - mle2->line; - if (val == 0) - val = mle1->start_pc - mle2->start_pc; + if (mle1.line != mle2.line) + val = mle1.line < mle2.line; + else + val = mle1.start_pc < mle2.start_pc; } return val; } @@ -189,105 +191,102 @@ compare_lines (const void *mle1p, const void *mle2p) /* See disasm.h. */ int -gdb_pretty_print_disassembler::pretty_print_insn (struct ui_out *uiout, - const struct disasm_insn *insn, - int flags) +gdb_pretty_print_disassembler::pretty_print_insn (const struct disasm_insn *insn, + gdb_disassembly_flags flags) { /* parts of the symbolic representation of the address */ int unmapped; int offset; int line; int size; - struct cleanup *ui_out_chain; - char *filename = NULL; - char *name = NULL; CORE_ADDR pc; struct gdbarch *gdbarch = arch (); - ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, NULL); - pc = insn->addr; - - if (insn->number != 0) - { - uiout->field_fmt ("insn-number", "%u", insn->number); - uiout->text ("\t"); - } - - if ((flags & DISASSEMBLY_SPECULATIVE) != 0) - { - if (insn->is_speculative) - { - uiout->field_string ("is-speculative", "?"); - - /* The speculative execution indication overwrites the first - character of the PC prefix. - We assume a PC prefix length of 3 characters. */ - if ((flags & DISASSEMBLY_OMIT_PC) == 0) - uiout->text (pc_prefix (pc) + 1); - else - uiout->text (" "); - } - else if ((flags & DISASSEMBLY_OMIT_PC) == 0) - uiout->text (pc_prefix (pc)); - else - uiout->text (" "); - } - else if ((flags & DISASSEMBLY_OMIT_PC) == 0) - uiout->text (pc_prefix (pc)); - uiout->field_core_addr ("address", gdbarch, pc); - - if (!build_address_symbolic (gdbarch, pc, 0, &name, &offset, &filename, - &line, &unmapped)) - { - /* We don't care now about line, filename and unmapped. But we might in - the future. */ - uiout->text (" <"); - if ((flags & DISASSEMBLY_OMIT_FNAME) == 0) - uiout->field_string ("func-name", name); - uiout->text ("+"); - uiout->field_int ("offset", offset); - uiout->text (">:\t"); - } - else - uiout->text (":\t"); - - if (filename != NULL) - xfree (filename); - if (name != NULL) - xfree (name); - - m_insn_stb.clear (); - - if (flags & DISASSEMBLY_RAW_INSN) - { - CORE_ADDR end_pc; - bfd_byte data; - int err; - const char *spacer = ""; - - /* Build the opcodes using a temporary stream so we can - write them out in a single go for the MI. */ - m_opcode_stb.clear (); - + { + ui_out_emit_tuple tuple_emitter (m_uiout, NULL); + pc = insn->addr; + + if (insn->number != 0) + { + m_uiout->field_unsigned ("insn-number", insn->number); + m_uiout->text ("\t"); + } + + if ((flags & DISASSEMBLY_SPECULATIVE) != 0) + { + if (insn->is_speculative) + { + m_uiout->field_string ("is-speculative", "?"); + + /* The speculative execution indication overwrites the first + character of the PC prefix. + We assume a PC prefix length of 3 characters. */ + if ((flags & DISASSEMBLY_OMIT_PC) == 0) + m_uiout->text (pc_prefix (pc) + 1); + else + m_uiout->text (" "); + } + else if ((flags & DISASSEMBLY_OMIT_PC) == 0) + m_uiout->text (pc_prefix (pc)); + else + m_uiout->text (" "); + } + else if ((flags & DISASSEMBLY_OMIT_PC) == 0) + m_uiout->text (pc_prefix (pc)); + m_uiout->field_core_addr ("address", gdbarch, pc); + + std::string name, filename; + bool omit_fname = ((flags & DISASSEMBLY_OMIT_FNAME) != 0); + if (!build_address_symbolic (gdbarch, pc, false, omit_fname, &name, + &offset, &filename, &line, &unmapped)) + { + /* We don't care now about line, filename and unmapped. But we might in + the future. */ + m_uiout->text (" <"); + if (!omit_fname) + m_uiout->field_string ("func-name", name.c_str (), + function_name_style.style ()); + /* For negative offsets, avoid displaying them as +-N; the sign of + the offset takes the place of the "+" here. */ + if (offset >= 0) + m_uiout->text ("+"); + m_uiout->field_signed ("offset", offset); + m_uiout->text (">:\t"); + } + else + m_uiout->text (":\t"); + + m_insn_stb.clear (); + + if (flags & DISASSEMBLY_RAW_INSN) + { + CORE_ADDR end_pc; + bfd_byte data; + const char *spacer = ""; + + /* Build the opcodes using a temporary stream so we can + write them out in a single go for the MI. */ + m_opcode_stb.clear (); + + size = m_di.print_insn (pc); + end_pc = pc + size; + + for (;pc < end_pc; ++pc) + { + read_code (pc, &data, 1); + m_opcode_stb.printf ("%s%02x", spacer, (unsigned) data); + spacer = " "; + } + + m_uiout->field_stream ("opcodes", m_opcode_stb); + m_uiout->text ("\t"); + } + else size = m_di.print_insn (pc); - end_pc = pc + size; - for (;pc < end_pc; ++pc) - { - read_code (pc, &data, 1); - m_opcode_stb.printf ("%s%02x", spacer, (unsigned) data); - spacer = " "; - } - - uiout->field_stream ("opcodes", m_opcode_stb); - uiout->text ("\t"); - } - else - size = m_di.print_insn (pc); - - uiout->field_stream ("inst", m_insn_stb); - do_cleanups (ui_out_chain); - uiout->text ("\n"); + m_uiout->field_stream ("inst", m_insn_stb); + } + m_uiout->text ("\n"); return size; } @@ -295,7 +294,7 @@ gdb_pretty_print_disassembler::pretty_print_insn (struct ui_out *uiout, static int dump_insns (struct gdbarch *gdbarch, struct ui_out *uiout, CORE_ADDR low, CORE_ADDR high, - int how_many, int flags, CORE_ADDR *end_pc) + int how_many, gdb_disassembly_flags flags, CORE_ADDR *end_pc) { struct disasm_insn insn; int num_displayed = 0; @@ -303,13 +302,13 @@ dump_insns (struct gdbarch *gdbarch, memset (&insn, 0, sizeof (insn)); insn.addr = low; - gdb_pretty_print_disassembler disasm (gdbarch); + gdb_pretty_print_disassembler disasm (gdbarch, uiout); while (insn.addr < high && (how_many < 0 || num_displayed < how_many)) { int size; - size = disasm.pretty_print_insn (uiout, &insn, flags); + size = disasm.pretty_print_insn (&insn, flags); if (size <= 0) break; @@ -338,7 +337,7 @@ do_mixed_source_and_assembly_deprecated (struct gdbarch *gdbarch, struct ui_out *uiout, struct symtab *symtab, CORE_ADDR low, CORE_ADDR high, - int how_many, int flags) + int how_many, gdb_disassembly_flags flags) { int newlines = 0; int nlines; @@ -350,9 +349,6 @@ do_mixed_source_and_assembly_deprecated int next_line = 0; int num_displayed = 0; print_source_lines_flags psl_flags = 0; - struct cleanup *ui_out_chain; - struct cleanup *ui_out_tuple_chain = make_cleanup (null_cleanup, 0); - struct cleanup *ui_out_list_chain = make_cleanup (null_cleanup, 0); gdb_assert (symtab != NULL && SYMTAB_LINETABLE (symtab) != NULL); @@ -407,14 +403,16 @@ do_mixed_source_and_assembly_deprecated /* Now, sort mle by line #s (and, then by addresses within lines). */ if (out_of_order) - qsort (mle, newlines, sizeof (struct deprecated_dis_line_entry), - compare_lines); + std::sort (mle, mle + newlines, line_is_less_than); /* Now, for each line entry, emit the specified lines (unless they have been emitted before), followed by the assembly code for that line. */ - ui_out_chain = make_cleanup_ui_out_list_begin_end (uiout, "asm_insns"); + ui_out_emit_list asm_insns_list (uiout, "asm_insns"); + + gdb::optional outer_tuple_emitter; + gdb::optional inner_list_emitter; for (i = 0; i < newlines; i++) { @@ -426,9 +424,7 @@ do_mixed_source_and_assembly_deprecated /* Just one line to print. */ if (next_line == mle[i].line) { - ui_out_tuple_chain - = make_cleanup_ui_out_tuple_begin_end (uiout, - "src_and_asm_line"); + outer_tuple_emitter.emplace (uiout, "src_and_asm_line"); print_source_lines (symtab, next_line, mle[i].line + 1, psl_flags); } else @@ -436,39 +432,27 @@ do_mixed_source_and_assembly_deprecated /* Several source lines w/o asm instructions associated. */ for (; next_line < mle[i].line; next_line++) { - 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"); + ui_out_emit_tuple tuple_emitter (uiout, + "src_and_asm_line"); print_source_lines (symtab, next_line, next_line + 1, psl_flags); - 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); + ui_out_emit_list temp_list_emitter (uiout, + "line_asm_insn"); } /* Print the last line and leave list open for asm instructions to be added. */ - ui_out_tuple_chain - = make_cleanup_ui_out_tuple_begin_end (uiout, - "src_and_asm_line"); + outer_tuple_emitter.emplace (uiout, "src_and_asm_line"); print_source_lines (symtab, next_line, mle[i].line + 1, psl_flags); } } else { - ui_out_tuple_chain - = make_cleanup_ui_out_tuple_begin_end (uiout, - "src_and_asm_line"); + outer_tuple_emitter.emplace (uiout, "src_and_asm_line"); print_source_lines (symtab, mle[i].line, mle[i].line + 1, psl_flags); } next_line = mle[i].line + 1; - ui_out_list_chain - = make_cleanup_ui_out_list_begin_end (uiout, "line_asm_insn"); + inner_list_emitter.emplace (uiout, "line_asm_insn"); } num_displayed += dump_insns (gdbarch, uiout, @@ -479,16 +463,13 @@ do_mixed_source_and_assembly_deprecated assembly range for this source line, close out the list/tuple. */ if (i == (newlines - 1) || mle[i + 1].line > mle[i].line) { - do_cleanups (ui_out_list_chain); - do_cleanups (ui_out_tuple_chain); - ui_out_tuple_chain = make_cleanup (null_cleanup, 0); - ui_out_list_chain = make_cleanup (null_cleanup, 0); + inner_list_emitter.reset (); + outer_tuple_emitter.reset (); uiout->text ("\n"); } if (how_many >= 0 && num_displayed >= how_many) break; } - do_cleanups (ui_out_chain); } /* The idea here is to present a source-O-centric view of a @@ -501,15 +482,12 @@ do_mixed_source_and_assembly (struct gdbarch *gdbarch, struct ui_out *uiout, struct symtab *main_symtab, CORE_ADDR low, CORE_ADDR high, - int how_many, int flags) + int how_many, gdb_disassembly_flags flags) { const struct linetable_entry *le, *first_le; int i, nlines; int num_displayed = 0; print_source_lines_flags psl_flags = 0; - struct cleanup *ui_out_chain; - struct cleanup *ui_out_tuple_chain; - struct cleanup *ui_out_list_chain; CORE_ADDR pc; struct symtab *last_symtab; int last_line; @@ -570,21 +548,21 @@ do_mixed_source_and_assembly (struct gdbarch *gdbarch, CLI output works on top of this because MI ignores ui_out_text output, which is where we put file name and source line contents output. - Cleanup usage: - ui_out_chain + Emitter usage: + asm_insns_emitter Handles the outer "asm_insns" list. - ui_out_tuple_chain + tuple_emitter The tuples for each group of consecutive disassemblies. - ui_out_list_chain + list_emitter List of consecutive source lines or disassembled insns. */ if (flags & DISASSEMBLY_FILENAME) psl_flags |= PRINT_SOURCE_LINES_FILENAME; - ui_out_chain = make_cleanup_ui_out_list_begin_end (uiout, "asm_insns"); + ui_out_emit_list asm_insns_emitter (uiout, "asm_insns"); - ui_out_tuple_chain = NULL; - ui_out_list_chain = NULL; + gdb::optional tuple_emitter; + gdb::optional list_emitter; last_symtab = NULL; last_line = 0; @@ -653,11 +631,11 @@ do_mixed_source_and_assembly (struct gdbarch *gdbarch, /* Skip the newline if this is the first instruction. */ if (pc > low) uiout->text ("\n"); - if (ui_out_tuple_chain != NULL) + if (tuple_emitter.has_value ()) { - gdb_assert (ui_out_list_chain != NULL); - do_cleanups (ui_out_list_chain); - do_cleanups (ui_out_tuple_chain); + gdb_assert (list_emitter.has_value ()); + list_emitter.reset (); + tuple_emitter.reset (); } if (sal.symtab != last_symtab && !(flags & DISASSEMBLY_FILENAME)) @@ -679,41 +657,32 @@ do_mixed_source_and_assembly (struct gdbarch *gdbarch, We need to preserve the structure of the output, so output a bunch of line tuples with no asm entries. */ int l; - struct cleanup *ui_out_list_chain_line; - struct cleanup *ui_out_tuple_chain_line; gdb_assert (sal.symtab != NULL); for (l = start_preceding_line_to_display; l < end_preceding_line_to_display; ++l) { - ui_out_tuple_chain_line - = make_cleanup_ui_out_tuple_begin_end (uiout, - "src_and_asm_line"); + ui_out_emit_tuple line_tuple_emitter (uiout, + "src_and_asm_line"); print_source_lines (sal.symtab, l, l + 1, psl_flags); - 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); + ui_out_emit_list chain_line_emitter (uiout, "line_asm_insn"); } } - ui_out_tuple_chain - = make_cleanup_ui_out_tuple_begin_end (uiout, "src_and_asm_line"); + tuple_emitter.emplace (uiout, "src_and_asm_line"); if (sal.symtab != NULL) print_source_lines (sal.symtab, sal.line, sal.line + 1, psl_flags); else uiout->text (_("--- no source info for this pc ---\n")); - ui_out_list_chain - = make_cleanup_ui_out_list_begin_end (uiout, "line_asm_insn"); + list_emitter.emplace (uiout, "line_asm_insn"); } else { /* Here we're appending instructions to an existing line. By construction the very first insn will have a symtab and follow the new_source_line path above. */ - gdb_assert (ui_out_tuple_chain != NULL); - gdb_assert (ui_out_list_chain != NULL); + gdb_assert (tuple_emitter.has_value ()); + gdb_assert (list_emitter.has_value ()); } if (sal.end != 0) @@ -730,22 +699,16 @@ do_mixed_source_and_assembly (struct gdbarch *gdbarch, last_symtab = sal.symtab; last_line = sal.line; } - - do_cleanups (ui_out_chain); } static void do_assembly_only (struct gdbarch *gdbarch, struct ui_out *uiout, CORE_ADDR low, CORE_ADDR high, - int how_many, int flags) + int how_many, gdb_disassembly_flags flags) { - struct cleanup *ui_out_chain; - - ui_out_chain = make_cleanup_ui_out_list_begin_end (uiout, "asm_insns"); + ui_out_emit_list list_emitter (uiout, "asm_insns"); dump_insns (gdbarch, uiout, low, high, how_many, flags, NULL); - - do_cleanups (ui_out_chain); } /* Initialize the disassemble info struct ready for the specified @@ -763,6 +726,31 @@ fprintf_disasm (void *stream, const char *format, ...) return 0; } +/* Combine implicit and user disassembler options and return them + in a newly-created string. */ + +static std::string +get_all_disassembler_options (struct gdbarch *gdbarch) +{ + const char *implicit = gdbarch_disassembler_options_implicit (gdbarch); + const char *options = get_disassembler_options (gdbarch); + const char *comma = ","; + + if (implicit == nullptr) + { + implicit = ""; + comma = ""; + } + + if (options == nullptr) + { + options = ""; + comma = ""; + } + + return string_printf ("%s%s%s", implicit, comma, options); +} + gdb_disassembler::gdb_disassembler (struct gdbarch *gdbarch, struct ui_file *file, di_read_memory_ftype read_memory_func) @@ -774,12 +762,12 @@ gdb_disassembler::gdb_disassembler (struct gdbarch *gdbarch, m_di.memory_error_func = dis_asm_memory_error; m_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 + disassembler had a local optimization here. By default it would access the executable file, instead of the target memory (there was a growing list of exceptions though). Unfortunately, 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 + Further, it has been superseeded by trust-read-only-sections (although that should be superseeded by target_trust..._p()). */ m_di.read_memory_func = read_memory_func; m_di.arch = gdbarch_bfd_arch_info (gdbarch)->arch; @@ -787,7 +775,9 @@ gdb_disassembler::gdb_disassembler (struct gdbarch *gdbarch, m_di.endian = gdbarch_byte_order (gdbarch); m_di.endian_code = gdbarch_byte_order_for_code (gdbarch); m_di.application_data = this; - m_di.disassembler_options = get_disassembler_options (gdbarch); + m_disassembler_options_holder = get_all_disassembler_options (gdbarch); + if (!m_disassembler_options_holder.empty ()) + m_di.disassembler_options = m_disassembler_options_holder.c_str (); disassemble_init_for_target (&m_di); } @@ -814,7 +804,7 @@ gdb_disassembler::print_insn (CORE_ADDR memaddr, void gdb_disassembly (struct gdbarch *gdbarch, struct ui_out *uiout, - int flags, int how_many, + gdb_disassembly_flags flags, int how_many, CORE_ADDR low, CORE_ADDR high) { struct symtab *symtab; @@ -874,13 +864,16 @@ gdb_buffered_insn_length_fprintf (void *stream, const char *format, ...) return 0; } -/* Initialize a struct disassemble_info for gdb_buffered_insn_length. */ +/* Initialize a struct disassemble_info for gdb_buffered_insn_length. + Upon return, *DISASSEMBLER_OPTIONS_HOLDER owns the string pointed + to by DI.DISASSEMBLER_OPTIONS. */ static void gdb_buffered_insn_length_init_dis (struct gdbarch *gdbarch, struct disassemble_info *di, const gdb_byte *insn, int max_len, - CORE_ADDR addr) + CORE_ADDR addr, + std::string *disassembler_options_holder) { init_disassemble_info (di, NULL, gdb_buffered_insn_length_fprintf); @@ -896,7 +889,9 @@ gdb_buffered_insn_length_init_dis (struct gdbarch *gdbarch, di->endian = gdbarch_byte_order (gdbarch); di->endian_code = gdbarch_byte_order_for_code (gdbarch); - di->disassembler_options = get_disassembler_options (gdbarch); + *disassembler_options_holder = get_all_disassembler_options (gdbarch); + if (!disassembler_options_holder->empty ()) + di->disassembler_options = disassembler_options_holder->c_str (); disassemble_init_for_target (di); } @@ -908,8 +903,10 @@ gdb_buffered_insn_length (struct gdbarch *gdbarch, const gdb_byte *insn, int max_len, CORE_ADDR addr) { struct disassemble_info di; + std::string disassembler_options_holder; - gdb_buffered_insn_length_init_dis (gdbarch, &di, insn, max_len, addr); + gdb_buffered_insn_length_init_dis (gdbarch, &di, insn, max_len, addr, + &disassembler_options_holder); return gdbarch_print_insn (gdbarch, addr, &di); } @@ -928,6 +925,7 @@ set_disassembler_options (char *prospective_options) { struct gdbarch *gdbarch = get_current_arch (); char **disassembler_options = gdbarch_disassembler_options (gdbarch); + const disasm_options_and_args_t *valid_options_and_args; const disasm_options_t *valid_options; char *options = remove_whitespace_and_extra_commas (prospective_options); const char *opt; @@ -944,24 +942,46 @@ set_disassembler_options (char *prospective_options) return; } - valid_options = gdbarch_valid_disassembler_options (gdbarch); - if (valid_options == NULL) + valid_options_and_args = gdbarch_valid_disassembler_options (gdbarch); + if (valid_options_and_args == NULL) { - fprintf_filtered (gdb_stdlog, _("\ + fprintf_filtered (gdb_stderr, _("\ 'set disassembler-options ...' is not supported on this architecture.\n")); return; } + valid_options = &valid_options_and_args->options; + /* Verify we have valid disassembler options. */ FOR_EACH_DISASSEMBLER_OPTION (opt, options) { size_t i; for (i = 0; valid_options->name[i] != NULL; i++) - if (disassembler_options_cmp (opt, valid_options->name[i]) == 0) + if (valid_options->arg != NULL && valid_options->arg[i] != NULL) + { + size_t len = strlen (valid_options->name[i]); + bool found = false; + const char *arg; + size_t j; + + if (memcmp (opt, valid_options->name[i], len) != 0) + continue; + arg = opt + len; + for (j = 0; valid_options->arg[i]->values[j] != NULL; j++) + if (disassembler_options_cmp + (arg, valid_options->arg[i]->values[j]) == 0) + { + found = true; + break; + } + if (found) + break; + } + else if (disassembler_options_cmp (opt, valid_options->name[i]) == 0) break; if (valid_options->name[i] == NULL) { - fprintf_filtered (gdb_stdlog, + fprintf_filtered (gdb_stderr, _("Invalid disassembler option value: '%s'.\n"), opt); return; @@ -973,7 +993,7 @@ set_disassembler_options (char *prospective_options) } static void -set_disassembler_options_sfunc (char *args, int from_tty, +set_disassembler_options_sfunc (const char *args, int from_tty, struct cmd_list_element *c) { set_disassembler_options (prospective_options); @@ -984,32 +1004,46 @@ show_disassembler_options_sfunc (struct ui_file *file, int from_tty, struct cmd_list_element *c, const char *value) { struct gdbarch *gdbarch = get_current_arch (); + const disasm_options_and_args_t *valid_options_and_args; + const disasm_option_arg_t *valid_args; const disasm_options_t *valid_options; const char *options = get_disassembler_options (gdbarch); if (options == NULL) options = ""; - fprintf_filtered (file, _("The current disassembler options are '%s'\n"), + fprintf_filtered (file, _("The current disassembler options are '%s'\n\n"), options); - valid_options = gdbarch_valid_disassembler_options (gdbarch); + valid_options_and_args = gdbarch_valid_disassembler_options (gdbarch); + + if (valid_options_and_args == NULL) + { + fputs_filtered (_("There are no disassembler options available " + "for this architecture.\n"), + file); + return; + } - if (valid_options == NULL) - return; + valid_options = &valid_options_and_args->options; - fprintf_filtered (file, _("\n\ + fprintf_filtered (file, _("\ The following disassembler options are supported for use with the\n\ -'set disassembler-options