X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fjit%2Farm%2Fmd-abi.c;h=56062a1894887d3f86e84163aa2cc829730ed304;hb=fa3fb41985bc911b5300f144b740159ac0c1eea0;hp=8d19890e12fc94b0888b9bd1315cc01eb53848f7;hpb=20382f5ef7c49204c3192d99972f274e8cf167fc;p=cacao.git

diff --git a/src/vm/jit/arm/md-abi.c b/src/vm/jit/arm/md-abi.c
index 8d19890e1..56062a189 100644
--- a/src/vm/jit/arm/md-abi.c
+++ b/src/vm/jit/arm/md-abi.c
@@ -1,9 +1,7 @@
 /* src/vm/jit/arm/md-abi.c - functions for arm 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 7713 2007-04-15 21:49:48Z twisti $
-
 */
 
 
@@ -32,12 +28,11 @@
 
 #include "vm/jit/arm/md-abi.h"
 
+#include "vm/descriptor.hpp"
 #include "vm/global.h"
 
 #include "vm/jit/abi.h"
 
-#include "vmcore/descriptor.h"
-
 
 /* register descripton array **************************************************/
 
@@ -135,10 +130,12 @@ void md_param_alloc(methoddesc *md)
 	s4         stacksize;
 
 	/* set default values */
-	reguse = 0;
+
+	reguse    = 0;
 	stacksize = 0;
 
 	/* get params field of methoddesc */
+
 	pd = md->params;
 
 	for (i = 0; i < md->paramcount; i++, pd++) {
@@ -148,49 +145,48 @@ void md_param_alloc(methoddesc *md)
 		case TYPE_FLT:
 			if (reguse < INT_ARG_CNT) {
 				pd->inmemory = false;
+				pd->index    = reguse;
 				pd->regoff   = abi_registers_integer_argument[reguse];
 				reguse++;
 			}
 			else {
 				pd->inmemory = true;
-				pd->regoff   = stacksize;
+				pd->index    = stacksize;
+				pd->regoff   = stacksize * 8;
 				stacksize++;
 			}
 			break;
 
 		case TYPE_LNG:
 		case TYPE_DBL:
-			if (reguse+1 < INT_ARG_CNT) {
+			/* interally we use the EABI */
+
+			ALIGN_2(reguse);
+
+			if (reguse < INT_ARG_CNT) {
 				pd->inmemory = false;
 #if defined(__ARMEL__)
+				pd->index    = PACK_REGS(reguse, reguse + 1);
 				pd->regoff   =
 					PACK_REGS(abi_registers_integer_argument[reguse],
 							  abi_registers_integer_argument[reguse + 1]);
 #else
+				pd->index    = PACK_REGS(reguse + 1, reguse);
 				pd->regoff   =
 					PACK_REGS(abi_registers_integer_argument[reguse + 1],
 							  abi_registers_integer_argument[reguse]);
 #endif
 				reguse += 2;
 			}
-			else if (reguse < INT_ARG_CNT) {
-				pd->inmemory = false;
-#if defined(__ARMEL__)
-				pd->regoff   =
-					PACK_REGS(abi_registers_integer_argument[reguse],
-							  abi_registers_integer_argument[INT_ARG_CNT]);
-#else
-				pd->regoff   =
-					PACK_REGS(abi_registers_integer_argument[INT_ARG_CNT],
-							  abi_registers_integer_argument[reguse]);
-#endif
-				reguse++;
-				stacksize++;
-			}
 			else {
-				pd->inmemory = true;
-				pd->regoff   = stacksize;
-				stacksize += 2;
+
+				/*ALIGN_2(stacksize);*/
+
+				pd->inmemory  = true;
+				pd->index     = stacksize;
+				pd->regoff    = stacksize * 8;
+				/*stacksize    += 2;*/
+				stacksize++;
 			}
 			break;
 		}
@@ -224,8 +220,6 @@ void md_param_alloc(methoddesc *md)
 
 *******************************************************************************/
 
-#define ALIGN_2(a)    do { if ((a) & 0x1) (a)++; } while (0)
-
 void md_param_alloc_native(methoddesc *md)
 {
 	paramdesc *pd;
@@ -249,12 +243,14 @@ void md_param_alloc_native(methoddesc *md)
 		case TYPE_FLT:
 			if (reguse < INT_ARG_CNT) {
 				pd->inmemory = false;
+				pd->index    = -1;
 				pd->regoff   = abi_registers_integer_argument[reguse];
 				reguse++;
 			}
 			else {
 				pd->inmemory = true;
-				pd->regoff   = stacksize;
+				pd->index    = -1;
+				pd->regoff   = stacksize * 4;
 				stacksize++;
 			}
 			break;
@@ -267,10 +263,12 @@ void md_param_alloc_native(methoddesc *md)
 #endif
 				pd->inmemory = false;
 #if defined(__ARMEL__)
+				pd->index    = -1;
 				pd->regoff   =
 					PACK_REGS(abi_registers_integer_argument[reguse],
 							  abi_registers_integer_argument[reguse + 1]);
 #else
+				pd->index    = -1;
 				pd->regoff   =
 					PACK_REGS(abi_registers_integer_argument[reguse + 1],
 							  abi_registers_integer_argument[reguse]);
@@ -281,10 +279,12 @@ void md_param_alloc_native(methoddesc *md)
 			else if (reguse < INT_ARG_CNT) {
 				pd->inmemory = false;
 # if defined(__ARMEL__)
+				pd->index    = -1;
 				pd->regoff   =
 					PACK_REGS(abi_registers_integer_argument[reguse],
 							  abi_registers_integer_argument[INT_ARG_CNT]);
 # else
+				pd->index    = -1;
 				pd->regoff   =
 					PACK_REGS(abi_registers_integer_argument[INT_ARG_CNT],
 							  abi_registers_integer_argument[reguse]);
@@ -298,7 +298,8 @@ void md_param_alloc_native(methoddesc *md)
 				ALIGN_2(stacksize);
 #endif
 				pd->inmemory  = true;
-				pd->regoff    = stacksize;
+				pd->index     = -1;
+				pd->regoff    = stacksize * 4;
 				reguse        = INT_ARG_CNT;
 				stacksize    += 2;
 			}
@@ -346,16 +347,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;
 
@@ -363,7 +366,7 @@ void md_return_alloc(jitdata *jd, stackptr stackslot)
 	   their argument register -> so leafmethods with paramcount > 0
 	   could already use R0 == 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. */
 
@@ -411,4 +414,5 @@ void md_return_alloc(jitdata *jd, stackptr stackslot)
  * c-basic-offset: 4
  * tab-width: 4
  * End:
+ * vim:noexpandtab:sw=4:ts=4:
  */