X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fjit%2Fpowerpc64%2Flinux%2Fmd-abi.c;h=d5459bb13bcc766271e5325de491344954ca8237;hb=fa3fb41985bc911b5300f144b740159ac0c1eea0;hp=14765c6e71366a376067f84a9d03fddae317d9df;hpb=a9f63894d00738f365f587cc2a29e7644750a33c;p=cacao.git

diff --git a/src/vm/jit/powerpc64/linux/md-abi.c b/src/vm/jit/powerpc64/linux/md-abi.c
index 14765c6e7..d5459bb13 100644
--- a/src/vm/jit/powerpc64/linux/md-abi.c
+++ b/src/vm/jit/powerpc64/linux/md-abi.c
@@ -1,9 +1,7 @@
 /* src/vm/jit/powerpc64/linux/md-abi.c - functions for PowerPC64 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 7724 2007-04-16 21:07:10Z twisti $
-
 */
 
 
@@ -35,14 +31,11 @@
 
 #include "vm/jit/powerpc64/linux/md-abi.h"
 
+#include "vm/descriptor.hpp"
 #include "vm/global.h"
 
 #include "vm/jit/abi.h"
-
-#include "vmcore/descriptor.h"
-
-
-#define CACAO_ALIGN(a)    do { if ((a) & 1) (a)++; } while (0)
+#include "vm/jit/stack.h"
 
 
 /* register descripton array **************************************************/
@@ -206,18 +199,21 @@ void md_param_alloc(methoddesc *md)
 		case TYPE_ADR:
 			if (iarg < INT_ARG_CNT) {
 				pd->inmemory = false;
+				pd->index = iarg;
 				pd->regoff   = abi_registers_integer_argument[iarg];
 				iarg++;
 			}
 			else {
 				pd->inmemory = true;
-				pd->regoff   = stacksize + stackcount;
+				pd->index = stacksize + stackcount;
+				pd->regoff   = (stacksize + stackcount) * 8;
 			}
 			break;
 		case TYPE_FLT:
 		case TYPE_DBL:
 			if (farg < FLT_ARG_CNT) {
 				pd->inmemory = false;
+				pd->index = farg;
 				pd->regoff   = abi_registers_float_argument[farg];
 				farg++;
 				if (arg < INT_ARG_CNT) {
@@ -226,7 +222,8 @@ void md_param_alloc(methoddesc *md)
 			}
 			else {
 				pd->inmemory = true;
-				pd->regoff   = stacksize + stackcount ;
+				pd->index = stacksize + stackcount;
+				pd->regoff   = (stacksize + stackcount) * 8;
 			}
 			break;
 		default:
@@ -288,18 +285,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;
+	methodinfo   *m;
+	codeinfo     *code;
 	registerdata *rd;
-	methoddesc *md;
+	methoddesc   *md;
 
 	/* get required compiler data */
 
-	m = jd->m;
+	m    = jd->m;
 	code = jd->code;
-	rd = jd->rd;
+	rd   = jd->rd;
 
 	md = m->parseddesc;
 	
@@ -307,7 +304,7 @@ void md_return_alloc(jitdata *jd, stackptr stackslot)
 	   their argument register -> so leafmethods with paramcount > 0
 	   could already use R3 == 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. */
 
@@ -342,4 +339,5 @@ void md_return_alloc(jitdata *jd, stackptr stackslot)
  * c-basic-offset: 4
  * tab-width: 4
  * End:
+ * vim:noexpandtab:sw=4:ts=4:
  */