* src/vm/jit/x86_64/asmpart.S (asm_abstractmethoderror): Keep stack aligned.

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

diff --git a/src/vm/jit/disass.h b/src/vm/jit/disass.h
index c9b39a71aa4c9ba37886c0941ba8c27f04a7fbd4..02eae59e06e2207bea4593e53f873186a017633f 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, 2007 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,8 +20,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: disass.h 7436 2007-03-02 20:23:46Z tbfg $
-
 */
 
 
@@ -38,6 +34,8 @@
 
 #include "vm/types.h"
 
+#include "vm/global.h"
+
 #if defined(ENABLE_DISASSEMBLER)
 
 /* some macros ****************************************************************/
@@ -48,9 +46,9 @@
 #define DISASSINSTR(code) \
     do { \
         if (opt_intrp) \
-            (code) = intrp_disassinstr((code)); \
+            (code) = intrp_disassinstr((u1*) (code));  \
         else \
-            (code) = disassinstr((code)); \
+            (code) = disassinstr((u1*) (code));        \
     } while (0)
 
 #define DISASSEMBLE(start,end) \
@@ -64,7 +62,7 @@
 # else /* defined(ENABLE_INTRP) */
 
 #define DISASSINSTR(code) \
-    (code) = disassinstr((code))
+    (code) = disassinstr((u1*) (code))
 
 #define DISASSEMBLE(start,end) \
     disassemble((start), (end))
@@ -73,7 +71,7 @@
 #else /* defined(ENABLE_JIT) */
 
 #define DISASSINSTR(code) \
-    (code) = intrp_disassinstr((code))
+    (code) = intrp_disassinstr((u1*) (code))
 
 #define DISASSEMBLE(start,end) \
     intrp_disassemble((start), (end))
@@ -96,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
@@ -117,9 +119,13 @@ u1 *intrp_disassinstr(u1 *code);
 void intrp_disassemble(u1 *start, u1 *end);
 #endif
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif /* defined(ENABLE_DISASSEMBLER) */
 
-#endif /* _DISASS_H */
+#endif // _DISASS_H
 
 
 /*