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=ca70e80ba4b23aa01a0a50f5c02c6ab48a5954e9;hpb=b3c49af8c2fd74264afa095e0df282c6e25c6a70;p=cacao.git

diff --git a/src/vm/jit/powerpc64/linux/md-abi.c b/src/vm/jit/powerpc64/linux/md-abi.c
index ca70e80ba..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 7601 2007-03-28 23:02:50Z michi $
-
 */
 
 
@@ -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 **************************************************/
@@ -70,6 +63,39 @@ const char *abi_registers_integer_name[] = {
 	"r24", "r25", "r26", "r27", "r28", "r29", "r30", "r31",
 };
 
+const s4 abi_registers_integer_argument[] = {
+	3,  /* a0 */
+	4,  /* a1 */
+	5,  /* a2 */
+	6,  /* a3 */
+	7,  /* a4 */
+	8,  /* a5 */
+	9,  /* a6 */
+	10, /* a7 */
+};
+
+const s4 abi_registers_integer_saved[] = {
+	15, /* s0 */
+	24, /* s1 */
+	25, /* s2 */
+	26, /* s3 */
+	27, /* s4 */
+	28, /* s5 */
+	29, /* s6 */
+	30, /* s7 */
+	31, /* s8 */
+};
+
+const s4 abi_registers_integer_temporary[] = {
+	17, /* t0 */
+	18, /* t1 */
+	19, /* t2 */
+	20, /* t3 */
+	21, /* t4 */
+	22, /* t5 */
+	23, /* t6 */
+};
+
 
 s4 nregdescfloat[] = {
 	/*ftmp3,  fa0/v0,     fa1,     fa2,     fa3,     fa4,     fa5,     fa6,   */
@@ -87,6 +113,45 @@ s4 nregdescfloat[] = {
 	REG_END
 };
 
+const s4 abi_registers_float_argument[] = {
+	1,  /* fa0  */
+	2,  /* fa1  */
+	3,  /* fa2  */
+	4,  /* fa3  */
+	5,  /* fa4  */
+	6,  /* fa5  */
+	7,  /* fa6  */
+	8,  /* fa7  */
+	9,  /* fa8  */
+	10, /* fa9  */
+	11, /* fa10 */
+	12, /* fa11 */
+	13, /* fa12 */
+};
+
+const s4 abi_registers_float_saved[] = {
+	16, /* fs0  */
+	17, /* fs1  */
+	18, /* fs2  */
+	19, /* fs3  */
+	20, /* fs4  */
+	21, /* fs5  */
+	22, /* fs6  */
+	23, /* fs7  */
+	24, /* fs8  */
+	25, /* fs9  */
+	26, /* fs10 */
+	27, /* fs11 */
+	28, /* fs12 */
+	29, /* fs13 */
+	30, /* fs14 */
+	31, /* fs15 */
+};
+
+const s4 abi_registers_float_temporary[] = {
+	-1,
+};
+
 
 /* md_param_alloc **************************************************************
 
@@ -117,10 +182,10 @@ void md_param_alloc(methoddesc *md)
 
 	/* set default values */
 
-	iarg = 0;
-	farg = 0;
-	arg = 0;
-	stacksize = LA_SIZE_IN_POINTERS;
+	iarg       = 0;
+	farg       = 0;
+	arg        = 0;
+	stacksize  = LA_SIZE_IN_POINTERS;
 	stackcount = 0;
 
 	/* get params field of methoddesc */
@@ -134,25 +199,31 @@ void md_param_alloc(methoddesc *md)
 		case TYPE_ADR:
 			if (iarg < INT_ARG_CNT) {
 				pd->inmemory = false;
-				pd->regoff = iarg;
+				pd->index = iarg;
+				pd->regoff   = abi_registers_integer_argument[iarg];
 				iarg++;
-			} else {
+			}
+			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->regoff = farg;
+				pd->index = farg;
+				pd->regoff   = abi_registers_float_argument[farg];
 				farg++;
 				if (arg < INT_ARG_CNT) {
 					iarg++;		/* yes, that is true, floating arguments take int register slots away */
 				}
-			} else {
+			}
+			else {
 				pd->inmemory = true;
-				pd->regoff = stacksize + stackcount ;
+				pd->index = stacksize + stackcount;
+				pd->regoff   = (stacksize + stackcount) * 8;
 			}
 			break;
 		default:
@@ -167,7 +238,8 @@ void md_param_alloc(methoddesc *md)
 	if (IS_INT_LNG_TYPE(md->returntype.type)) {
 		if (iarg < 1)
 			iarg = 1;
-	} else if (IS_FLT_DBL_TYPE(md->returntype.type)) {
+	}
+	else if (IS_FLT_DBL_TYPE(md->returntype.type)) {
 		if (farg < 1)
 			farg = 1;
 	}
@@ -213,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;
 	
@@ -232,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. */
 
@@ -267,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:
  */