[kaffe] CVS kaffe (stack): Back out part of popargs_noreturn() change for now

Kaffe CVS cvs-commits at kaffe.org
Tue Mar 9 13:38:02 PST 2004


PatchSet 4498 
Date: 2004/03/09 21:00:46
Author: stack
Branch: HEAD
Tag: (none) 
Log:
Back out part of popargs_noreturn() change for now

Members: 
	ChangeLog:1.2078->1.2079 
	kaffe/kaffevm/jit3/icode.c:1.34->1.35 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2078 kaffe/ChangeLog:1.2079
--- kaffe/ChangeLog:1.2078	Tue Mar  9 18:18:20 2004
+++ kaffe/ChangeLog	Tue Mar  9 21:00:46 2004
@@ -1,3 +1,8 @@
+2004-03-09  Timothy S. Stack <stack at cs.utah.edu>
+
+	kaffe/kaffevm/jit3/icode.c:
+	Back out part of popargs_noreturn() change for now.
+	
 2004-03-09  Dalibor Topic <robilad at kaffe.org>
 
 	config/arm/linux/md.h,
Index: kaffe/kaffe/kaffevm/jit3/icode.c
diff -u kaffe/kaffe/kaffevm/jit3/icode.c:1.34 kaffe/kaffe/kaffevm/jit3/icode.c:1.35
--- kaffe/kaffe/kaffevm/jit3/icode.c:1.34	Sat Oct 11 20:45:50 2003
+++ kaffe/kaffe/kaffevm/jit3/icode.c	Tue Mar  9 21:00:48 2004
@@ -3506,12 +3506,17 @@
 popargs_internal(int does_return)
 {
  	if (argcount != 0) {
-		if( does_return )
-		{
 #if defined(HAVE_popargs)
-			slot_slot_const(0, 0, argcount, HAVE_popargs, Tnull);
+		/*
+		 * Must always call popargs so the backend can do cleanup.
+		 *
+		 * Might be able to get away with sending an argcount of zero,
+		 * but, well just send the whole thing for now.  Alternatively,
+		 * it might be better to add a new back end call to
+		 * end_func_sync.
+		 */
+		slot_slot_const(0, 0, argcount, HAVE_popargs, Tnull);
 #endif
-		}
 		if (argcount > maxPush) {
 			maxPush = argcount;
 		}




More information about the kaffe mailing list