Merged.

[cacao.git] / src / vm / jit / sparc64 / md-abi.c

diff --git a/src/vm/jit/sparc64/md-abi.c b/src/vm/jit/sparc64/md-abi.c
index 0aaf68aa85bf26750d3a4ab2a60c5343cd8342fa..edcf00a18208cd5bc9284aef8dc8eb688af65898 100644 (file)
--- a/src/vm/jit/sparc64/md-abi.c
+++ b/src/vm/jit/sparc64/md-abi.c
@@ -1,9 +1,7 @@
 /* src/vm/jit/sparc64/md-abi.c - functions for Sparc ABI
 
-   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, 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: md-abi.h 4357 2006-01-22 23:33:38Z twisti $
-
 */
 
 
@@ -32,16 +28,17 @@
 
 #include "vm/jit/sparc64/md-abi.h"
 
+#include "vm/descriptor.hpp"
 #include "vm/global.h"
 
 #include "vm/jit/abi.h"
-
-#include "vmcore/descriptor.h"
+#include "vm/jit/stack.h"
 
 /* temp */
 #include "mm/memory.h"
 #include <assert.h>
 
+
 /* helper macros for allocation methods ***************************************/
 #define MIN(a,b) (((a) <= (b)) ? (a) : (b))
 
@@ -295,7 +292,7 @@ void md_param_alloc_native(methoddesc *md)
 
 *******************************************************************************/
 
-void md_return_alloc(jitdata *jd, stackptr stackslot)
+void md_return_alloc(jitdata *jd, stackelement_t* stackslot)
 {
        /* XXX */
 }