Added some missing vim modelines.

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

diff --git a/src/vm/jit/x86_64/md-abi.c b/src/vm/jit/x86_64/md-abi.c
index 720971fcb91a70229dfeedbf99f1b11a426923f2..c250388c777afa2eebdcb49910bd9c3a65576630 100644 (file)
--- a/src/vm/jit/x86_64/md-abi.c
+++ b/src/vm/jit/x86_64/md-abi.c
@@ -1,9 +1,7 @@
 /* src/vm/jit/x86_64/md-abi.c - functions for x86_64 Linux ABI
 
-   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: md-abi.c 8115 2007-06-20 19:14:05Z michi $
-
 */
 
 
@@ -32,12 +28,12 @@
 
 #include "vm/jit/x86_64/md-abi.h"
 
+#include "vm/descriptor.hpp"
 #include "vm/global.h"
 
 #include "vm/jit/abi.h"
-#include "vm/jit/jit.h" /* for REG_* (maybe can be removed) */
-
-#include "vmcore/descriptor.h"
+#include "vm/jit/jit.hpp" /* for REG_* (maybe can be removed) */
+#include "vm/jit/stack.h"
 
 
 /* register descripton array **************************************************/
@@ -63,7 +59,7 @@ const s4 abi_registers_integer_argument[] = {
 };
 
 const s4 abi_registers_integer_saved[] = {
-       7,  /* s0 */
+       5,  /* s0 */
        12, /* s1 */
        13, /* s2 */
        14, /* s3 */
@@ -228,16 +224,18 @@ void md_param_alloc_native(methoddesc *md)
 
 *******************************************************************************/
 
-void md_return_alloc(jitdata *jd, stackptr stackslot)
+void md_return_alloc(jitdata *jd, stackelement_t *stackslot)
 {
        methodinfo   *m;
+       codeinfo     *code;
        registerdata *rd;
        methoddesc   *md;
 
        /* get required compiler data */
 
-       m  = jd->m;
-       rd = jd->rd;
+       m    = jd->m;
+       code = jd->code;
+       rd   = jd->rd;
 
        md = m->parseddesc;
 
@@ -251,7 +249,7 @@ void md_return_alloc(jitdata *jd, stackptr stackslot)
                   to their argument register -> so leafmethods with
                   paramcount > 0 could already use a00! */
 
-               if (!jd->isleafmethod || (md->paramcount == 0)) {
+               if (!code_is_leafmethod(code) || (md->paramcount == 0)) {
                        /* Only precolor the stackslot, if it is not a SAVEDVAR
                           <-> has not to survive method invokations */
 
@@ -281,4 +279,5 @@ void md_return_alloc(jitdata *jd, stackptr stackslot)
  * c-basic-offset: 4
  * tab-width: 4
  * End:
+ * vim:noexpandtab:sw=4:ts=4:
  */