[kaffe] CVS kaffe (robilad): Cross-compilation fix for jit

[Kaffe CVS]

PatchSet 5557 
Date: 2005/03/13 22:08:48
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Cross-compilation fix for jit

2005-03-13  Dalibor Topic  <robilad at kaffe.org>

* config/arm/jit-arm.def:
Replace use of idealReg by KaffeVM_jitSetIdealReg.

* kaffe/kaffevm/jit/registers.c:
(idealReg) Made static.
(KaffeVM_jitSetIdealReg) New function.

* kaffe/kaffevm/jit/registers.h:
(idealReg) Removed prototype.
(KaffeVM_jitSetIdealReg) New prototype.

Members: 
	ChangeLog:1.3731->1.3732 
	config/arm/jit-arm.def:1.7->1.8 
	kaffe/kaffevm/jit/registers.c:1.8->1.9 
	kaffe/kaffevm/jit/registers.h:1.7->1.8 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3731 kaffe/ChangeLog:1.3732
--- kaffe/ChangeLog:1.3731	Sun Mar 13 21:50:33 2005
+++ kaffe/ChangeLog	Sun Mar 13 22:08:48 2005
@@ -1,5 +1,18 @@
 2005-03-13  Dalibor Topic  <robilad at kaffe.org>
 	
+	* config/arm/jit-arm.def:
+	Replace use of idealReg by KaffeVM_jitSetIdealReg.
+	
+	* kaffe/kaffevm/jit/registers.c:
+	(idealReg) Made static.
+	(KaffeVM_jitSetIdealReg) New function.
+	
+	* kaffe/kaffevm/jit/registers.h:
+	(idealReg) Removed prototype.
+	(KaffeVM_jitSetIdealReg) New prototype.
+	
+2005-03-13  Dalibor Topic  <robilad at kaffe.org>
+	
 	* kaffe/kaffevm/jit/machine.c:
 	Replace use of enable_readonce by 
 	KaffeVM_jitSetEnableReadonce and KaffeVM_jitGetEnableReadonce.
Index: kaffe/config/arm/jit-arm.def
diff -u kaffe/config/arm/jit-arm.def:1.7 kaffe/config/arm/jit-arm.def:1.8
--- kaffe/config/arm/jit-arm.def:1.7	Thu Jan 20 22:54:26 2005
+++ kaffe/config/arm/jit-arm.def	Sun Mar 13 22:08:51 2005
@@ -1523,10 +1523,10 @@
 	 * XXX: This should go in a macro `rreg_int_pref(1, R0+a)'
 	 */
 	if (a < 4) {
-	 	idealReg = R0 + a;
+	 	KaffeVM_jitSetIdealReg(R0 + a);
 	}
 	r = rreg_int(1);
-	idealReg = NOREG;	/* reset idealReg */
+	KaffeVM_jitSetIdealReg(NOREG);	/* reset idealReg */
 
 	if (a < 4) {
 		int w = R0 + a;
Index: kaffe/kaffe/kaffevm/jit/registers.c
diff -u kaffe/kaffe/kaffevm/jit/registers.c:1.8 kaffe/kaffe/kaffevm/jit/registers.c:1.9
--- kaffe/kaffe/kaffevm/jit/registers.c:1.8	Sun Mar 13 21:50:38 2005
+++ kaffe/kaffe/kaffevm/jit/registers.c	Sun Mar 13 22:08:53 2005
@@ -74,7 +74,18 @@
 /*
  * Set this if you prefer a given register for a slot.
  */
-int idealReg = NOREG;
+static int idealReg = NOREG;
+
+/**
+ * Set preferred register for a slot
+ *
+ * @param reg the preferred register
+ */
+void 
+KaffeVM_jitSetIdealReg(int reg)
+{
+  idealReg = reg;
+}
 
 /*
  * Initiate registers.
Index: kaffe/kaffe/kaffevm/jit/registers.h
diff -u kaffe/kaffe/kaffevm/jit/registers.h:1.7 kaffe/kaffe/kaffevm/jit/registers.h:1.8
--- kaffe/kaffe/kaffevm/jit/registers.h:1.7	Sun Mar 13 21:50:38 2005
+++ kaffe/kaffe/kaffevm/jit/registers.h	Sun Mar 13 22:08:53 2005
@@ -72,7 +72,7 @@
 void	forceRegister(SlotInfo*, int, int);
 int	slowSlotOffset(SlotInfo*, int, int);
 
-extern int idealReg;
+extern void KaffeVM_jitSetIdealReg(int reg);
 extern int KaffeVM_jitGetEnableReadonce(void);
 extern void KaffeVM_jitSetEnableReadonce(int enable);