X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fjit%2Farm%2Fmd-abi.c;h=c0f00f81a395d33a453e14195e0c2eb20ab3b053;hb=449e2443bf21e8dd7f3b7e877c558840cf6bd338;hp=edf480ec83931636062ad2e7ef86a48ff5fa4e2a;hpb=d145561207bc54005eed962d5a316143e20b1ef2;p=cacao.git

diff --git a/src/vm/jit/arm/md-abi.c b/src/vm/jit/arm/md-abi.c
index edf480ec8..c0f00f81a 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 8115 2007-06-20 19:14:05Z michi $
-
 */
 
 
@@ -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 **************************************************/
 
@@ -150,12 +145,14 @@ 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 * 4;
+				pd->index    = stacksize;
+				pd->regoff   = stacksize * 8;
 				stacksize++;
 			}
 			break;
@@ -169,10 +166,12 @@ void md_param_alloc(methoddesc *md)
 			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]);
@@ -181,11 +180,13 @@ void md_param_alloc(methoddesc *md)
 			}
 			else {
 
-				ALIGN_2(stacksize);
+				/*ALIGN_2(stacksize);*/
 
 				pd->inmemory  = true;
-				pd->regoff    = stacksize * 4;
-				stacksize    += 2;
+				pd->index     = stacksize;
+				pd->regoff    = stacksize * 8;
+				/*stacksize    += 2;*/
+				stacksize++;
 			}
 			break;
 		}
@@ -242,11 +243,13 @@ 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->index    = -1;
 				pd->regoff   = stacksize * 4;
 				stacksize++;
 			}
@@ -260,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]);
@@ -274,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]);
@@ -291,6 +298,7 @@ void md_param_alloc_native(methoddesc *md)
 				ALIGN_2(stacksize);
 #endif
 				pd->inmemory  = true;
+				pd->index     = -1;
 				pd->regoff    = stacksize * 4;
 				reguse        = INT_ARG_CNT;
 				stacksize    += 2;
@@ -339,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;
 
@@ -356,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. */