[kaffe] CVS kaffe (robilad): Small build fix for jit3 on darwin

[Kaffe CVS]

PatchSet 5823 
Date: 2005/01/09 01:36:37
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Small build fix for jit3 on darwin

2005-01-09  Dalibor Topic  <robilad at kaffe.org>

* kaffe/kaffevm/jit3/constpool.h:
(KaffeJIT3_getCurrConst, KaffeJIT3_getFirstConst):
Added prototypes.

* kaffe/kaffevm/jit3/constpool.c (KaffeJIT3_getFirstConst)
(KaffeJIT3_getCurrConst): New functions.

* config/powerpc/jit-labels.h
(FILL_LABEL_Lreg_s, FILL_LABEL_Lsavedregs, FILL_LABEL_Lframe),
config/powerpc/jit3-powerpc.def (define_insn, define_insn):
Replaced findConst and currConst by KaffeJIT3_getFirstConst and
KaffeJIT3_getCurrConst.

Reported by:  Michael Franz <mvfranz at gmail.com>

Members: 
	ChangeLog:1.3367->1.3368 
	config/powerpc/jit-labels.h:1.1->1.2 
	config/powerpc/jit3-powerpc.def:1.3->1.4 
	kaffe/kaffevm/jit3/constpool.c:1.13->1.14 
	kaffe/kaffevm/jit3/constpool.h:1.6->1.7 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3367 kaffe/ChangeLog:1.3368
--- kaffe/ChangeLog:1.3367	Sat Jan  8 22:02:35 2005
+++ kaffe/ChangeLog	Sun Jan  9 01:36:37 2005
@@ -1,3 +1,20 @@
+2005-01-09  Dalibor Topic  <robilad at kaffe.org>
+
+	* kaffe/kaffevm/jit3/constpool.h: 
+	(KaffeJIT3_getCurrConst, KaffeJIT3_getFirstConst): 
+	Added prototypes.
+
+	* kaffe/kaffevm/jit3/constpool.c (KaffeJIT3_getFirstConst) 
+	(KaffeJIT3_getCurrConst): New functions.
+
+	* config/powerpc/jit-labels.h 
+	(FILL_LABEL_Lreg_s, FILL_LABEL_Lsavedregs, FILL_LABEL_Lframe),
+	config/powerpc/jit3-powerpc.def (define_insn, define_insn):
+	Replaced findConst and currConst by KaffeJIT3_getFirstConst and
+	KaffeJIT3_getCurrConst.
+
+	Reported by:  Michael Franz <mvfranz at gmail.com>
+	
 2005-01-08  Dalibor Topic  <robilad at kaffe.org>
 
 	Resynced with GNU Classpath.
Index: kaffe/config/powerpc/jit-labels.h
diff -u kaffe/config/powerpc/jit-labels.h:1.1 kaffe/config/powerpc/jit-labels.h:1.2
--- kaffe/config/powerpc/jit-labels.h:1.1	Tue Dec 21 00:15:28 2004
+++ kaffe/config/powerpc/jit-labels.h	Sun Jan  9 01:36:39 2005
@@ -83,7 +83,7 @@
 	if( saved_registers < 0 ) \
 		saved_registers = 0; \
 	saved_registers = maxStack + maxTemp + 18; \
-	if( (firstConst != currConst) || maxLocal || maxTemp ) \
+	if( (KaffeJIT3_getFirstConst() != KaffeJIT3_getCurrConst()) || maxLocal || maxTemp ) \
 	{ \
 		saved_registers += 1; /* r31 */ \
 	} \
@@ -103,7 +103,7 @@
 	if( saved_registers < 0 ) \
 		saved_registers = 0; \
 	saved_registers += maxStack + maxTemp; \
-	if( (firstConst != currConst) || maxLocal || maxTemp ) \
+	if( (KaffeJIT3_getFirstConst() != KaffeJIT3_getCurrConst()) || maxLocal || maxTemp ) \
 	{ \
 		saved_registers += 1; /* r31 */ \
 	} \
@@ -127,7 +127,7 @@
 	if( saved_registers < 0 ) \
 		saved_registers = 0; \
 	saved_registers = maxStack + maxTemp; \
-	if( (firstConst != currConst) || maxLocal || maxTemp ) \
+	if( (KaffeJIT3_getFirstConst() != KaffeJIT3_getCurrConst()) || maxLocal || maxTemp ) \
 	{ \
 		saved_registers += 1; /* r31 */ \
 	} \
Index: kaffe/config/powerpc/jit3-powerpc.def
diff -u kaffe/config/powerpc/jit3-powerpc.def:1.3 kaffe/config/powerpc/jit3-powerpc.def:1.4
--- kaffe/config/powerpc/jit3-powerpc.def:1.3	Mon Dec 27 16:09:45 2004
+++ kaffe/config/powerpc/jit3-powerpc.def	Sun Jan  9 01:36:39 2005
@@ -82,7 +82,7 @@
 	 * Either, this method is not a leaf or we have a constpool and need
 	 * to overwrite LR to get at it.
 	 */
-	if( (firstConst != currConst) ||
+	if( (KaffeJIT3_getFirstConst() != KaffeJIT3_getCurrConst()) ||
 	    maxLocal ||
 	    maxTemp )
 	{
@@ -314,7 +314,7 @@
 	}
 	setEpilogueLabel(CODEPC);
 	
-	if( (firstConst != currConst) ||
+	if( (KaffeJIT3_getFirstConst() != KaffeJIT3_getCurrConst()) ||
 	    maxLocal ||
 	    maxTemp )
 	{
Index: kaffe/kaffe/kaffevm/jit3/constpool.c
diff -u kaffe/kaffe/kaffevm/jit3/constpool.c:1.13 kaffe/kaffe/kaffevm/jit3/constpool.c:1.14
--- kaffe/kaffe/kaffevm/jit3/constpool.c:1.13	Mon Dec 27 16:09:48 2004
+++ kaffe/kaffe/kaffevm/jit3/constpool.c	Sun Jan  9 01:36:39 2005
@@ -206,3 +206,16 @@
 {
 	return nConst;
 }
+
+constpool* 
+KaffeJIT3_getFirstConst(void)
+{
+        return firstConst;
+}
+
+constpool* 
+KaffeJIT3_getCurrConst(void)
+{
+        return currConst;
+}
+
Index: kaffe/kaffe/kaffevm/jit3/constpool.h
diff -u kaffe/kaffe/kaffevm/jit3/constpool.h:1.6 kaffe/kaffe/kaffevm/jit3/constpool.h:1.7
--- kaffe/kaffe/kaffevm/jit3/constpool.h:1.6	Mon Dec 27 16:09:48 2004
+++ kaffe/kaffe/kaffevm/jit3/constpool.h	Sun Jan  9 01:36:39 2005
@@ -112,4 +112,14 @@
  */
 uint32 KaffeJIT3_getNumberOfConstants(void);
 
+/**
+ * Return the first constpool object.
+ */
+constpool* KaffeJIT3_getFirstConst(void);
+
+/**
+ * Return the current constpool object.
+ */
+constpool* KaffeJIT3_getCurrConst(void);
+
 #endif