Merged trunk and subtype.

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

diff --git a/src/vm/jit/abi.h b/src/vm/jit/abi.h
index 99ed02b6d1154192e20578e329a606f2c43ff1e2..2bd0e8b8b3af254500c39153d4ed046741be12eb 100644 (file)
--- a/src/vm/jit/abi.h
+++ b/src/vm/jit/abi.h
@@ -1,9 +1,7 @@
 /* src/vm/jit/abi.h - common ABI defines
 
-   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.
 
@@ -31,10 +29,12 @@
 #include "config.h"
 #include "vm/types.h"
 
+#include "arch.h"
+
 #include "vm/jit/abi-asm.h"
-#include "vm/jit/jit.h"
+#include "vm/jit/jit.hpp"
+#include "vm/jit/stack.h"
 
-#include "arch.h"
 
 /* ABI externs ****************************************************************/
 
@@ -64,12 +64,20 @@ extern const s4    abi_registers_float_temporary[];
 
 /* function prototypes ********************************************************/
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* machine dependent descriptor function */
 void md_param_alloc(methoddesc *md);
 void md_param_alloc_native(methoddesc *md);
 
 /* machine dependent return value handling function */
-void md_return_alloc(jitdata *jd, stackptr stackslot);
+void md_return_alloc(jitdata *jd, stackelement_t *stackslot);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif /* _ABI_H */