[kaffe] CVS kaffe (dalibor): Hello World works on m68k-jit3

[Kaffe CVS]

PatchSet 5028 
Date: 2004/07/30 11:22:32
Author: dalibor
Branch: HEAD
Tag: (none) 
Log:
Hello World works on m68k-jit3

2004-07-30  Kiyo Inaba <inaba at src.ricoh.co.jp>

        * kaffe/kaffevm/jit3/machine.c:
        Remove unneeded (and incorrect) code emitted.
        This mod if suggested by Helmer.

        * config/m68k/jit3-icode.h,
        config/m68k/jit3-m68k.def:
        Comment out cmpr_xRC definition. It emits an unimplemented
        machine code for 68030.

Members: 
	ChangeLog:1.2586->1.2587 
	config/m68k/jit3-icode.h:1.2->1.3 
	config/m68k/jit3-m68k.def:1.8->1.9 
	kaffe/kaffevm/jit3/machine.c:1.54->1.55 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2586 kaffe/ChangeLog:1.2587
--- kaffe/ChangeLog:1.2586	Fri Jul 30 11:05:58 2004
+++ kaffe/ChangeLog	Fri Jul 30 11:22:32 2004
@@ -1,3 +1,14 @@
+2004-07-30  Kiyo Inaba <inaba at src.ricoh.co.jp>
+
+	* kaffe/kaffevm/jit3/machine.c:
+	Remove unneeded (and incorrect) code emitted.
+	This mod if suggested by Helmer.
+
+	* config/m68k/jit3-icode.h,
+	config/m68k/jit3-m68k.def:
+	Comment out cmpr_xRC definition. It emits an unimplemented
+	machine code for 68030.
+
 2004-07-29  Guilhem Lavaux <guilhem at kaffe.org>
 
 	* libraries/javalib/Klasses.jar.bootstrap: Regenerated.
Index: kaffe/config/m68k/jit3-icode.h
diff -u kaffe/config/m68k/jit3-icode.h:1.2 kaffe/config/m68k/jit3-icode.h:1.3
--- kaffe/config/m68k/jit3-icode.h:1.2	Sun Jun 17 16:39:10 2001
+++ kaffe/config/m68k/jit3-icode.h	Fri Jul 30 11:22:44 2004
@@ -137,14 +137,14 @@
 
 #define HAVE_add_ref_const		addr_RRC
 #define HAVE_sub_ref_const		subr_RRC
-#define HAVE_cmp_ref_const		cmpr_xRC
+#undef	HAVE_cmp_ref_const
 #define HAVE_pusharg_ref_const		pushr_xCC
 #define HAVE_load_offset_ref		loadr_RRC
 #define HAVE_store_offset_ref		storer_xRRC
 
 #define HAVE_add_ref_const_rangecheck(v)	(1)
 #define HAVE_sub_ref_const_rangecheck(v)	(1)
-#define HAVE_cmp_ref_const_rangecheck(v)	(1)
+#undef	HAVE_cmp_ref_const_rangecheck(v)
 #define HAVE_pusharg_ref_const_rangecheck(v)	(1)
 #define HAVE_load_offset_ref_rangecheck(v)	m68k_s16_rangecheck(v)
 #define HAVE_store_offset_ref_rangecheck(v)	m68k_s16_rangecheck(v)
Index: kaffe/config/m68k/jit3-m68k.def
diff -u kaffe/config/m68k/jit3-m68k.def:1.8 kaffe/config/m68k/jit3-m68k.def:1.9
--- kaffe/config/m68k/jit3-m68k.def:1.8	Tue Jul 13 14:17:04 2004
+++ kaffe/config/m68k/jit3-m68k.def	Fri Jul 30 11:22:45 2004
@@ -1921,6 +1921,12 @@
 	op_cmpl_dd(r2, r1);
 }
 
+#if 0
+/*
+ * Since this function generates an unimplemented instruction, and
+ * tentatively commented out.
+ */
+
 define_insn(cmp_ref_const, cmpr_xRC)
 {
 	int v = const_int(2);
@@ -1933,6 +1939,7 @@
 		op_tst_a(r);
 	}
 }
+#endif
 
 define_insn(cmp_ref, cmpr_xRR)
 {
Index: kaffe/kaffe/kaffevm/jit3/machine.c
diff -u kaffe/kaffe/kaffevm/jit3/machine.c:1.54 kaffe/kaffe/kaffevm/jit3/machine.c:1.55
--- kaffe/kaffe/kaffevm/jit3/machine.c:1.54	Sat Jul 17 07:57:29 2004
+++ kaffe/kaffe/kaffevm/jit3/machine.c	Fri Jul 30 11:22:46 2004
@@ -832,17 +832,6 @@
 				if ((m & 1) != 0) {
 					assert(!isGlobal(t->u[i].slot));
 					slot_kill_readonce(t->u[i].slot);
-					/*
-					 * If this sequence is in an exception
-					 * handler we need to spill the slot
-					 * in case its used in a subsequent
-					 * basic block.
-					 */
-					if( t->jflags.ANY )
-					{
-						spillAndUpdate(t->u[i].slot,
-							       true);
-					}
 					slot_invalidate(t->u[i].slot);
 				}
 			}