[kaffe] CVS kaffe (dalibor): Fix for compiler warnings on alpha-linux

Kaffe CVS Kaffe Mailing List <kaffe@kaffe.org>
Fri Oct 10 13:08:03 2003


PatchSet 4107 
Date: 2003/10/10 20:05:54
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Fix for compiler warnings on alpha-linux

Members: 
	ChangeLog:1.1701->1.1702 
	config/alpha/alpha.c:1.4->1.5 
	kaffe/kaffevm/mem/gc-incremental.c:1.68->1.69 
	kaffe/kaffevm/mem/gc-mem.c:1.49->1.50 
	kaffe/kaffevm/systems/unix-jthreads/jthread.c:1.101->1.102 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.1701 kaffe/ChangeLog:1.1702
--- kaffe/ChangeLog:1.1701	Fri Oct 10 19:01:21 2003
+++ kaffe/ChangeLog	Fri Oct 10 20:05:54 2003
@@ -1,3 +1,19 @@
+2003-10-10  Alexander Kotelnikov <sacha@myxomop.com>
+
+	* config/alpha/alpha.c:
+	(__alpha_nextFrame) Cast sc to void *.
+
+	* kaffe/kaffevm/mem/gc-incremental.c:
+	(gcMalloc) Cast size to unsigned int.
+
+	* kaffe/kaffevm/mem/gc-mem.c:
+	(gc_primitive_alloc, gc_primitive_free) Added casts to unsigned
+	int.
+
+	* kaffe/kaffevm/systems/unix-jthreads/jthread.c:
+	(interrupt, suspendOnQThread) Added casts to fix compiler
+	warnings.
+	
 2003-10-10  Laurent Martelli <laurent@aopsys.com>
 
 	* libraries/javalib/java/lang/reflect/Field.java:
Index: kaffe/config/alpha/alpha.c
diff -u kaffe/config/alpha/alpha.c:1.4 kaffe/config/alpha/alpha.c:1.5
--- kaffe/config/alpha/alpha.c:1.4	Fri Aug  1 17:21:22 2003
+++ kaffe/config/alpha/alpha.c	Fri Oct 10 20:05:55 2003
@@ -84,7 +84,7 @@
 	    dprintf ("nextFrame  pc %p sp %p fp %p\n", pc, (int *) sp, (int *) fp); );
     }
 
-    if (!jthread_on_current_stack(sp)) {
+    if (!jthread_on_current_stack((void*)sp)) {
 	return NULL;
     }
 
Index: kaffe/kaffe/kaffevm/mem/gc-incremental.c
diff -u kaffe/kaffe/kaffevm/mem/gc-incremental.c:1.68 kaffe/kaffe/kaffevm/mem/gc-incremental.c:1.69
--- kaffe/kaffe/kaffevm/mem/gc-incremental.c:1.68	Sun Sep 28 19:47:41 2003
+++ kaffe/kaffe/kaffevm/mem/gc-incremental.c	Fri Oct 10 20:05:56 2003
@@ -1042,7 +1042,7 @@
 			case 2:
 				/* Grow the heap */
 				DBG (GCSYSALLOC, dprintf ("growing heap by %u bytes of type %s (%2.1f%% free)\n", 
-							  size, gcFunctions[fidx].description,
+							  (unsigned int)size, gcFunctions[fidx].description,
 							  (1.0 - (gcStats.totalmem / (double)gc_heap_total)) * 100.0); )
 				
 				gc_heap_grow(size);
Index: kaffe/kaffe/kaffevm/mem/gc-mem.c
diff -u kaffe/kaffe/kaffevm/mem/gc-mem.c:1.49 kaffe/kaffe/kaffevm/mem/gc-mem.c:1.50
--- kaffe/kaffe/kaffevm/mem/gc-mem.c:1.49	Sat Oct  4 18:52:55 2003
+++ kaffe/kaffe/kaffevm/mem/gc-mem.c	Fri Oct 10 20:05:56 2003
@@ -661,7 +661,7 @@
 
 	assert(sz % gc_pgsize == 0);
 
-	DBG(GCPRIM, dprintf("\ngc_primitive_alloc: got to allocate 0x%x bytes\n", sz); )
+	DBG(GCPRIM, dprintf("\ngc_primitive_alloc: got to allocate 0x%x bytes\n", (unsigned int)sz); )
 
 	/* try freelists for small primitive blocks first */
 	if (i <= GC_PRIM_LIST_COUNT) {
@@ -700,7 +700,7 @@
 		gc_remove_from_prim_freelist (best_fit);
 
 		DBG(GCPRIM, dprintf ("gc_primitive_alloc: found best_fit %p diff 0x%x (0x%x - 0x%x)\n",
-				     best_fit, diff, best_fit->size, sz); )
+				     best_fit, (unsigned int)diff, best_fit->size, (unsigned int)sz); )
 		assert ( diff % gc_pgsize == 0 );
 
 		if (diff > 0) {
@@ -712,7 +712,7 @@
 			nptr->size = diff;
 			gc_block_rm (nptr);
 
-			DBG(GCPRIM, dprintf ("gc_primitive_alloc: splitted remaining 0x%x bytes @ %p\n", diff, nptr); )
+			DBG(GCPRIM, dprintf ("gc_primitive_alloc: splitted remaining 0x%x bytes @ %p\n", (unsigned int)diff, nptr); )
 
 			DBG(GCDIAG, nptr->magic = GC_MAGIC);
 
@@ -813,7 +813,7 @@
 	gc_add_to_prim_freelist (mem);
 
 	DBG(GCPRIM, dprintf ("gc_primitive_free: added 0x%x bytes @ %p to freelist %u @ %p\n", mem->size, mem,
-			     gc_get_prim_freelist(mem)-&gc_prim_freelist[0], gc_get_prim_freelist(mem)); )
+			     (unsigned int)(gc_get_prim_freelist(mem)-&gc_prim_freelist[0]), gc_get_prim_freelist(mem)); )
 }
 
 /*
Index: kaffe/kaffe/kaffevm/systems/unix-jthreads/jthread.c
diff -u kaffe/kaffe/kaffevm/systems/unix-jthreads/jthread.c:1.101 kaffe/kaffe/kaffevm/systems/unix-jthreads/jthread.c:1.102
--- kaffe/kaffe/kaffevm/systems/unix-jthreads/jthread.c:1.101	Sat Oct  4 18:52:56 2003
+++ kaffe/kaffe/kaffevm/systems/unix-jthreads/jthread.c	Fri Oct 10 20:05:56 2003
@@ -518,7 +518,7 @@
 	/*
 	 * Handle the signal.
 	 */
-	handleInterrupt(sig, GET_SIGNAL_CONTEXT_POINTER(sc));
+	handleInterrupt(sig, (void*)GET_SIGNAL_CONTEXT_POINTER(sc));
 
 	/*
 	 * Leave the critical section.  This may or may not cause a
@@ -862,8 +862,8 @@
 	KaffeNodeQueue** ntid;
 	KaffeNodeQueue* last;
 
-DBG(JTHREAD,	dprintf("suspendOnQThread %p %p (%qd) bI %d\n", 
-	jtid, queue, timeout, blockInts); )
+DBG(JTHREAD,	dprintf("suspendOnQThread %p %p (%ld) bI %d\n",
+	jtid, queue, (long) timeout, blockInts); )
 
 	assert(timeout >= 0 || timeout == NOTIMEOUT);
 	assert(intsDisabled());