[kaffe] CVS kaffe (doogie): Miscellaenous sparse fixes.

[Kaffe CVS]

PatchSet 5681 
Date: 2004/12/20 04:23:33
Author: doogie
Branch: HEAD
Tag: (none) 
Log:
Miscellaenous sparse fixes.

Members: 
	ChangeLog:1.3227->1.3228 
	kaffe/kaffevm/jit/basecode.h:1.4->1.5 
	kaffe/kaffevm/jit/codeproto.h:1.4->1.5 
	kaffe/kaffevm/jit/funcs.c:1.6->1.7 
	kaffe/kaffevm/jit3/funcs.c:1.14->1.15 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3227 kaffe/ChangeLog:1.3228
--- kaffe/ChangeLog:1.3227	Mon Dec 20 04:03:55 2004
+++ kaffe/ChangeLog	Mon Dec 20 04:23:33 2004
@@ -1,5 +1,11 @@
 2004-12-19  Adam Heath  <doogie at brainfood.com>
 
+	* kaffe/kaffevm/jit/basecode.h, kaffe/kaffevm/jit/codeproto.h
+	  kaffe/kaffevm/jit/funcs.c, kaffe/kaffevm/jit3/funcs.c:
+	  Miscellaenous sparse fixes.
+
+2004-12-19  Adam Heath  <doogie at brainfood.com>
+
 	* scripts/SparseWarning.pm:
 	  Add another warning.
 
Index: kaffe/kaffe/kaffevm/jit/basecode.h
diff -u kaffe/kaffe/kaffevm/jit/basecode.h:1.4 kaffe/kaffe/kaffevm/jit/basecode.h:1.5
--- kaffe/kaffe/kaffevm/jit/basecode.h:1.4	Wed Dec 20 02:42:21 2000
+++ kaffe/kaffe/kaffevm/jit/basecode.h	Mon Dec 20 04:23:35 2004
@@ -82,9 +82,9 @@
 /* Conditional monitors */
 
 #define	monitor_enter() \
-	(meth->accflags & ACC_SYNCHRONISED ? mon_enter(meth, local(0)) : 0)
+	(meth->accflags & ACC_SYNCHRONISED ? mon_enter(meth, local(0)) : (void)0)
 #define	monitor_exit()	\
-	(meth->accflags & ACC_SYNCHRONISED ? mon_exit(meth, local(0)) : 0)
+	(meth->accflags & ACC_SYNCHRONISED ? mon_exit(meth, local(0)) : (void)0)
 
 /* -------------------------------------------------------------------- */
 /* Instruction formats */
Index: kaffe/kaffe/kaffevm/jit/codeproto.h
diff -u kaffe/kaffe/kaffevm/jit/codeproto.h:1.4 kaffe/kaffe/kaffevm/jit/codeproto.h:1.5
--- kaffe/kaffe/kaffevm/jit/codeproto.h:1.4	Wed Dec 20 02:42:21 2000
+++ kaffe/kaffe/kaffevm/jit/codeproto.h	Mon Dec 20 04:23:35 2004
@@ -244,5 +244,5 @@
 void softcall_checkarraystore(SlotInfo*, SlotInfo*);
 void softcall_addreference(SlotInfo*, SlotInfo*);
 void softcall_addreference_static(void*, SlotInfo*);
-
+void softcall_abstractmethod(Utf8Const*, Utf8Const*);
 #endif
Index: kaffe/kaffe/kaffevm/jit/funcs.c
diff -u kaffe/kaffe/kaffevm/jit/funcs.c:1.6 kaffe/kaffe/kaffevm/jit/funcs.c:1.7
--- kaffe/kaffe/kaffevm/jit/funcs.c:1.6	Mon Dec 20 00:55:14 2004
+++ kaffe/kaffe/kaffevm/jit/funcs.c	Mon Dec 20 04:23:35 2004
@@ -49,11 +49,11 @@
 	}
 }
 #undef OUT
-#define	OUT(v)	do { DBGEXPR(JIT,(void)printCodeLabels(),0),codeblock[CODEPC] = v; CODEPC++; } while (0)
-#define	BOUT(v)	do { DBGEXPR(JIT,(void)printCodeLabels(),0),*(uint8*)&codeblock[CODEPC] = v; CODEPC++; } while (0)
-#define	WOUT(v)	do { DBGEXPR(JIT,(void)printCodeLabels(),0),*(uint16*)&codeblock[CODEPC] = v; CODEPC += 2; } while (0)
-#define	LOUT(v)	do { DBGEXPR(JIT,(void)printCodeLabels(),0),*(uint32*)&codeblock[CODEPC] = v; CODEPC += 4; } while (0)
-#define	QOUT(v)	do { DBGEXPR(JIT,(void)printCodeLabels(),0),*(uint64*)&codeblock[CODEPC] = v; CODEPC += 8; } while (0)
+#define	OUT(v)	do { DBGEXPR(JIT,(void)printCodeLabels(),(void)0),codeblock[CODEPC] = v; CODEPC++; } while (0)
+#define	BOUT(v)	do { DBGEXPR(JIT,(void)printCodeLabels(),(void)0),*(uint8*)&codeblock[CODEPC] = v; CODEPC++; } while (0)
+#define	WOUT(v)	do { DBGEXPR(JIT,(void)printCodeLabels(),(void)0),*(uint16*)&codeblock[CODEPC] = v; CODEPC += 2; } while (0)
+#define	LOUT(v)	do { DBGEXPR(JIT,(void)printCodeLabels(),(void)0),*(uint32*)&codeblock[CODEPC] = v; CODEPC += 4; } while (0)
+#define	QOUT(v)	do { DBGEXPR(JIT,(void)printCodeLabels(),(void)0),*(uint64*)&codeblock[CODEPC] = v; CODEPC += 8; } while (0)
 #else
 #undef OUT
 #define	OUT(v)	do { codeblock[CODEPC] = v; CODEPC++; } while (0)
Index: kaffe/kaffe/kaffevm/jit3/funcs.c
diff -u kaffe/kaffe/kaffevm/jit3/funcs.c:1.14 kaffe/kaffe/kaffevm/jit3/funcs.c:1.15
--- kaffe/kaffe/kaffevm/jit3/funcs.c:1.14	Sun Dec 19 22:13:08 2004
+++ kaffe/kaffe/kaffevm/jit3/funcs.c	Mon Dec 20 04:23:36 2004
@@ -50,11 +50,11 @@
 	}
 }
 #undef OUT
-#define	OUT(v)	do { DBGEXPR(JIT,(void)printCodeLabels(),0),codeblock[CODEPC] = v; CODEPC++; } while (0)
-#define	BOUT(v)	do { DBGEXPR(JIT,(void)printCodeLabels(),0),*(uint8*)&codeblock[CODEPC] = v; CODEPC++; } while (0)
-#define	WOUT(v)	do { DBGEXPR(JIT,(void)printCodeLabels(),0),*(uint16*)&codeblock[CODEPC] = v; CODEPC += 2; } while (0)
-#define	LOUT(v)	do { DBGEXPR(JIT,(void)printCodeLabels(),0),*(uint32*)&codeblock[CODEPC] = v; CODEPC += 4; } while (0)
-#define	QOUT(v)	do { DBGEXPR(JIT,(void)printCodeLabels(),0),*(uint64*)&codeblock[CODEPC] = v; CODEPC += 8; } while (0)
+#define	OUT(v)	do { DBGEXPR(JIT,(void)printCodeLabels(),(void)0),codeblock[CODEPC] = v; CODEPC++; } while (0)
+#define	BOUT(v)	do { DBGEXPR(JIT,(void)printCodeLabels(),(void)0),*(uint8*)&codeblock[CODEPC] = v; CODEPC++; } while (0)
+#define	WOUT(v)	do { DBGEXPR(JIT,(void)printCodeLabels(),(void)0),*(uint16*)&codeblock[CODEPC] = v; CODEPC += 2; } while (0)
+#define	LOUT(v)	do { DBGEXPR(JIT,(void)printCodeLabels(),(void)0),*(uint32*)&codeblock[CODEPC] = v; CODEPC += 4; } while (0)
+#define	QOUT(v)	do { DBGEXPR(JIT,(void)printCodeLabels(),(void)0),*(uint64*)&codeblock[CODEPC] = v; CODEPC += 8; } while (0)
 #else /* !  defined(KAFFE_VMDEBUG) */
 #undef OUT
 #define	OUT(v)	do { codeblock[CODEPC] = v; CODEPC++; } while (0)