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

Kaffe CVS cvs-commits at kaffe.org
Sun Mar 13 13:56:20 PST 2005


PatchSet 5556 
Date: 2005/03/13 21:50:33
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Cross-compilation fix for jit engine

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.

* kaffe/kaffevm/jit/registers.c:
(enable_readonce) Made static.
(KaffeVM_jitGetEnableReadonce,
KaffeVM_jitSetEnableReadonce) New functions.

* kaffe/kaffevm/jit/registers.h:
(enable_readonce) Removed prototype.
(KaffeVM_jitGetEnableReadonce,
KaffeVM_jitSetEnableReadonce) New prototypes.

Members: 
	ChangeLog:1.3730->1.3731 
	kaffe/kaffevm/jit/machine.c:1.78->1.79 
	kaffe/kaffevm/jit/registers.c:1.7->1.8 
	kaffe/kaffevm/jit/registers.h:1.6->1.7 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3730 kaffe/ChangeLog:1.3731
--- kaffe/ChangeLog:1.3730	Sun Mar 13 21:17:18 2005
+++ kaffe/ChangeLog	Sun Mar 13 21:50:33 2005
@@ -1,5 +1,21 @@
 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.
+	
+	* kaffe/kaffevm/jit/registers.c:
+	(enable_readonce) Made static.
+	(KaffeVM_jitGetEnableReadonce,
+	KaffeVM_jitSetEnableReadonce) New functions.
+	
+	* kaffe/kaffevm/jit/registers.h:
+	(enable_readonce) Removed prototype.
+	(KaffeVM_jitGetEnableReadonce,
+	KaffeVM_jitSetEnableReadonce) New prototypes.
+	
+2005-03-13  Dalibor Topic  <robilad at kaffe.org>
+	
 	* config/i386/jit-i386.def,
 	kaffe/kaffevm/jit/machine.c:
 	Replace use of reginfo by KaffeVM_jitGetRegInfo.
Index: kaffe/kaffe/kaffevm/jit/machine.c
diff -u kaffe/kaffe/kaffevm/jit/machine.c:1.78 kaffe/kaffe/kaffevm/jit/machine.c:1.79
--- kaffe/kaffe/kaffevm/jit/machine.c:1.78	Sun Mar 13 21:17:21 2005
+++ kaffe/kaffe/kaffevm/jit/machine.c	Sun Mar 13 21:50:38 2005
@@ -833,8 +833,8 @@
 	int i;
 	int old_ro;
 
-	old_ro = enable_readonce;
-	enable_readonce = 0;
+	old_ro = KaffeVM_jitGetEnableReadonce();
+	KaffeVM_jitSetEnableReadonce(0);
 
 	/* Spill locals */
 	for (i = 0; i < maxLocal; i++) {
@@ -859,7 +859,7 @@
 		}
 	}
 
-	enable_readonce = old_ro;
+	KaffeVM_jitSetEnableReadonce(old_ro);
 }
 
 /*
Index: kaffe/kaffe/kaffevm/jit/registers.c
diff -u kaffe/kaffe/kaffevm/jit/registers.c:1.7 kaffe/kaffe/kaffevm/jit/registers.c:1.8
--- kaffe/kaffe/kaffevm/jit/registers.c:1.7	Sun Mar 13 21:17:21 2005
+++ kaffe/kaffe/kaffevm/jit/registers.c	Sun Mar 13 21:50:38 2005
@@ -44,7 +44,27 @@
  * a short while.  This can have a bad effect on read-once register so
  * we disable them termporaily.
  */
-int enable_readonce = Rreadonce;
+static int enable_readonce = Rreadonce;
+
+/**
+ * Get the value of enable_readonce.
+ */
+int
+KaffeVM_jitGetEnableReadonce(void)
+{
+  return enable_readonce;
+}
+
+/**
+ * Set the value of enable_readonce.
+ *
+ * @param enable new value
+ */
+void
+KaffeVM_jitSetEnableReadonce(int enable)
+{
+  enable_readonce = enable;
+}
 
 /* Count for each register use - gives an idea of which register is
  * to be reused.
Index: kaffe/kaffe/kaffevm/jit/registers.h
diff -u kaffe/kaffe/kaffevm/jit/registers.h:1.6 kaffe/kaffe/kaffevm/jit/registers.h:1.7
--- kaffe/kaffe/kaffevm/jit/registers.h:1.6	Sun Mar 13 21:17:21 2005
+++ kaffe/kaffe/kaffevm/jit/registers.h	Sun Mar 13 21:50:38 2005
@@ -73,7 +73,8 @@
 int	slowSlotOffset(SlotInfo*, int, int);
 
 extern int idealReg;
-extern int enable_readonce;
+extern int KaffeVM_jitGetEnableReadonce(void);
+extern void KaffeVM_jitSetEnableReadonce(int enable);
 
 #define	rread			1
 #define	rwrite			2




More information about the kaffe mailing list