X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fdisasm.h;h=c2f5ec382c8900ade3d25f8f5dba61c9d34dfcd8;hb=d62d0f5fc2156db337ac3cbbc3c05ca76565dbd3;hp=4dae0ba8be089f61719019e09c7b01f5360a5249;hpb=a4642986412fbd22873bf4f64e4d3ee7c5aeabac;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/disasm.h b/gdb/disasm.h
index 4dae0ba8be..c2f5ec382c 100644
--- a/gdb/disasm.h
+++ b/gdb/disasm.h
@@ -1,11 +1,11 @@
 /* Disassemble support for GDB.
-   Copyright (C) 2002, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
 
    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
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -14,28 +14,27 @@
    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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef DISASM_H
 #define DISASM_H
 
+#define DISASSEMBLY_SOURCE	(0x1 << 0)
+#define DISASSEMBLY_RAW_INSN	(0x1 << 1)
+#define DISASSEMBLY_OMIT_FNAME	(0x1 << 2)
+
 struct ui_out;
 struct ui_file;
 
-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 (CORE_ADDR memaddr,
-			   struct ui_file *stream,
-			   int *branch_delay_insns);
+extern int gdb_print_insn (struct gdbarch *gdbarch, CORE_ADDR memaddr,
+			   struct ui_file *stream, int *branch_delay_insns);
 
 #endif