-extern 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);
+extern void gdb_disassembly (struct gdbarch *gdbarch, struct ui_out *uiout,
+ char *file_string, int flags, int how_many,
+ CORE_ADDR low, CORE_ADDR high);
+
+/* Print the instruction at address MEMADDR in debugged memory,
+ on STREAM. Returns the length of the instruction, in bytes,
+ and, if requested, the number of branch delay slot instructions. */
+
+extern int gdb_print_insn (struct gdbarch *gdbarch, CORE_ADDR memaddr,
+ struct ui_file *stream, int *branch_delay_insns);
+
+/* Return the length in bytes of the instruction at address MEMADDR in
+ debugged memory. */
+
+extern int gdb_insn_length (struct gdbarch *gdbarch, CORE_ADDR memaddr);