Problems with kaffe-0.8.2 on NextStep 3.3

[Tim Wilkinson]

Mircea,

On Sun, 9 Mar 1997, Mircea Oancea wrote:

> It runs the HelloWorldApp but when compiling it brakes with:
> 
> $ javac HelloWorldApp.java
> ./intrp/machine.c:186: failed assertion `npc < meth->codelen'
> /usr/local/bin/javac: 3776 abort

Yeah, broke the interpreter in this release (du) but you all be please to
know that I've now improved my testing procedure ... hopefully ...

Anyway, below is a fix for this problem:

--- versions/kaffe-0.8.2/kaffe/kaffevm/kaffe.def	Mon Mar  3 14:04:53 1997
+++ kaffe-0.8.3/kaffe/kaffevm/kaffe.def	Sat Mar  8 18:16:43 1997
@@ -2297,7 +2297,9 @@
 	move_label_const(wstack(0), reference_code_label(npc));
 	end_basic_block();
 	branch_a(reference_code_label(pc+idx));
+#if defined(TRANSLATOR)
 	pop(1);
+#endif
 }
 
 define_insn(RET)
@@ -3212,7 +3214,9 @@
 	move_label_const(wstack(0), reference_code_label(npc));
 	end_basic_block();
 	branch_a(reference_code_label(pc+idx));
+#if defined(TRANSLATOR)
 	pop(1);
+#endif
 }
 
 define_insn(BREAKPOINT)

--
  Tim Wilkinson                         Tel/Fax: +44 181 440 0658
  T. J. Wilkinson & Associates,         Mobile:  +44 370 621006
  London, UK.                           Email:   tim at tjwassoc.demon.co.uk