Merged trunk and subtype.

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

diff --git a/src/vm/jit/disass.h b/src/vm/jit/disass.h
index f5192658a7fd726c0c54bcdef9e04c79a3504b12..39bb0d23cfb5b0279e4535c84c15782bc768ebd1 100644 (file)
--- a/src/vm/jit/disass.h
+++ b/src/vm/jit/disass.h
@@ -1,9 +1,7 @@
 /* src/vm/jit/disass.h - disassembler header
 
-   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
+   Copyright (C) 1996-2005, 2006, 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -22,14 +20,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Christian Thalinger
-
-   Changes:
-
-   $Id: disass.h 7219 2007-01-16 22:18:57Z pm $
-
 */
 
 
@@ -44,6 +34,8 @@
 
 #include "vm/types.h"
 
+#include "vm/global.h"
+
 #if defined(ENABLE_DISASSEMBLER)
 
 /* some macros ****************************************************************/
@@ -94,9 +86,7 @@ extern disassemble_info info;
 extern bool disass_initialized;
 #endif
 
-extern char *regs[];
-
-#if defined(__I386__) || defined(__X86_64__) || defined(__S390__)
+#if defined(__I386__) || defined(__X86_64__) || defined(__S390__) || defined(__M68K__)
 extern char disass_buf[512];
 extern s4   disass_len;
 #endif
@@ -104,6 +94,10 @@ extern s4   disass_len;
 
 /* function prototypes *******************************************************/
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #if defined(ENABLE_JIT)
 void disassemble(u1 *start, u1 *end);
 #endif
@@ -127,7 +121,11 @@ void intrp_disassemble(u1 *start, u1 *end);
 
 #endif /* defined(ENABLE_DISASSEMBLER) */
 
-#endif /* _DISASS_H */
+#ifdef __cplusplus
+}
+#endif
+
+#endif // _DISASS_H
 
 
 /*