* src/vm/jit/stack.h (REQUIRE_1, REQUIRE_2, REQUIRE_3, REQUIRE_4):

[cacao.git] / src / vm / jit / disass.h

diff --git a/src/vm/jit/disass.h b/src/vm/jit/disass.h
index 77f911613b237fdafc24dadcbd26361ce2796dd7..269e834a5acca27be76920896892bf76ea0c93f6 100644 (file)
--- a/src/vm/jit/disass.h
+++ b/src/vm/jit/disass.h
@@ -1,9 +1,9 @@
 /* src/vm/jit/disass.h - disassembler header
 
-   Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates,
-   R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
-   C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger,
-   Institut f. Computersprachen - TU Wien
+   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
+   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
+   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
+   J. Wenninger, Institut f. Computersprachen - TU Wien
 
    This file is part of CACAO.
 
@@ -19,16 +19,16 @@
 
    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., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+   02110-1301, USA.
 
-   Contact: cacao@complang.tuwien.ac.at
+   Contact: cacao@cacaojvm.org
 
    Authors: Christian Thalinger
 
    Changes:
 
-   $Id: disass.h 4181 2006-01-12 23:08:54Z twisti $
+   $Id: disass.h 4709 2006-03-30 10:14:22Z twisti $
 
 */
 
@@ -44,6 +44,7 @@
 
 #include "vm/types.h"
 
+#if defined(ENABLE_DISASSEMBLER)
 
 /* some macros ****************************************************************/
 
@@ -86,6 +87,13 @@
 #endif /* defined(ENABLE_JIT) */
 
 
+/* export global variables ****************************************************/
+
+#if defined(WITH_BINUTILS_DISASSEMBLER)
+extern disassemble_info info;
+extern bool disass_initialized;
+#endif
+
 extern char *regs[];
 
 #if defined(__I386__) || defined(__X86_64__)
@@ -96,15 +104,20 @@ extern s4   disass_len;
 
 /* function prototypes *******************************************************/
 
+#if defined(ENABLE_JIT)
+void disassemble(u1 *start, u1 *end);
+#endif
+
 #if defined(WITH_BINUTILS_DISASSEMBLER)
 void disass_printf(PTR p, const char *fmt, ...);
+
+int disass_buffer_read_memory(bfd_vma memaddr, bfd_byte *myaddr, unsigned int length, struct disassemble_info *info);
 #endif
 
 /* machine dependent functions */
 
 #if defined(ENABLE_JIT)
 u1 *disassinstr(u1 *code);
-void disassemble(u1 *start, u1 *end);
 #endif
 
 #if defined(ENABLE_INTRP)
@@ -112,6 +125,8 @@ u1 *intrp_disassinstr(u1 *code);
 void intrp_disassemble(u1 *start, u1 *end);
 #endif
 
+#endif /* defined(ENABLE_DISASSEMBLER) */
+
 #endif /* _DISASS_H */