--- gforth/engine/engine.c	2003/11/03 20:13:36	1.72
+++ gforth/engine/engine.c	2005/07/31 20:27:41	1.80
@@ -1,6 +1,6 @@
 /* Gforth virtual machine (aka inner interpreter)
 
-  Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc.
+  Copyright (C) 1995,1996,1997,1998,2000,2003,2004 Free Software Foundation, Inc.
 
   This file is part of Gforth.
 
@@ -151,6 +151,9 @@ extern int gforth_memcmp(const char * s1
 #ifndef LPREG
 #define LPREG
 #endif
+#ifndef CAREG
+#define CAREG
+#endif
 #ifndef CFAREG
 #define CFAREG
 #endif
@@ -160,12 +163,18 @@ extern int gforth_memcmp(const char * s1
 #ifndef TOSREG
 #define TOSREG
 #endif
-#ifndef spaREG
-#define spaREG
-#endif
 #ifndef spbREG
 #define spbREG
 #endif
+#ifndef spcREG
+#define spcREG
+#endif
+#ifndef spdREG
+#define spdREG
+#endif
+#ifndef speREG
+#define speREG
+#endif
 #ifndef FTOSREG
 #define FTOSREG
 #endif
@@ -190,7 +199,7 @@ extern int gforth_memcmp(const char * s1
 
 #ifdef GFORTH_DEBUGGING
 #if DEBUG
-#define NAME(string) { saved_ip=ip; asm(""); fprintf(stderr,"%08lx depth=%3ld: "string"\n",(Cell)ip,sp0+3-sp);}
+#define NAME(string) { saved_ip=ip; asm("# "string); fprintf(stderr,"%08lx depth=%3ld: "string"\n",(Cell)ip,sp0+3-sp);}
 #else /* !DEBUG */
 #define NAME(string) { saved_ip=ip; asm(""); }
 /* the asm here is to avoid reordering of following stuff above the
@@ -202,7 +211,7 @@ extern int gforth_memcmp(const char * s1
 #elif DEBUG
 #       define  NAME(string)    {Cell __depth=sp0+3-sp; int i; fprintf(stderr,"%08lx depth=%3ld: "string,(Cell)ip,sp0+3-sp); for (i=__depth-1; i>0; i--) fprintf(stderr, " $%lx",sp[i]); fprintf(stderr, " $%lx\n",spTOS); }
 #else
-#	define	NAME(string)
+#	define	NAME(string) asm("# "string);
 #endif
 
 #ifdef DEBUG
@@ -220,15 +229,15 @@ extern int gforth_memcmp(const char * s1
 #endif
 
 #ifdef HAS_FFCALL
-#define SAVE_REGS IF_spTOS(sp[0]=spTOS); IF_fpTOS(fp[0]=fpTOS); SP=sp; FP=fp; RP=rp; LP=lp;
-#define REST_REGS sp=SP; fp=FP; rp=RP; lp=LP; IF_spTOS(spTOS=sp[0]); IF_fpTOS(fpTOS=fp[0]);
+#define SAVE_REGS IF_fpTOS(fp[0]=fpTOS); SP=sp; FP=fp; RP=rp; LP=lp;
+#define REST_REGS sp=SP; fp=FP; rp=RP; lp=LP; IF_fpTOS(fpTOS=fp[0]);
 #endif
 
 #if !defined(ENGINE)
 /* normal engine */
 #define VARIANT(v)	(v)
 #define JUMP(target)	goto I_noop
-#define LABEL(name) J_##name: asm(""); I_##name:
+#define LABEL(name) H_##name: I_##name:
 
 #elif ENGINE==2
 /* variant with padding between VM instructions for finding out
@@ -236,7 +245,7 @@ extern int gforth_memcmp(const char * s1
 #define engine engine2
 #define VARIANT(v)	(v)
 #define JUMP(target)	goto I_noop
-#define LABEL(name) J_##name: SKIP16; I_##name:
+#define LABEL(name) H_##name: SKIP16; I_##name:
 #define IN_ENGINE2
 
 #elif ENGINE==3
@@ -245,13 +254,14 @@ extern int gforth_memcmp(const char * s1
 #define engine engine3
 #define VARIANT(v)	((v)^0xffffffff)
 #define JUMP(target)	goto K_lit
-#define LABEL(name) J_##name: asm(""); I_##name:
+#define LABEL(name) H_##name: I_##name:
 #else
 #error illegal ENGINE value
 #endif /* ENGINE */
 
 /* the asm(""); is there to get a stop compiled on Itanium */
 #define LABEL2(name) K_##name: asm("");
+#define LABEL3(name) J_##name: asm("");
 
 Label *engine(Xt *ip0, Cell *sp0, Cell *rp0, Float *fp0, Address lp0)
 /* executes code at ip, if ip!=NULL
@@ -268,6 +278,7 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
   register Float *fp FPREG = fp0;
   register Address lp LPREG = lp0;
   register Xt cfa CFAREG;
+  register Label real_ca CAREG;
 #ifdef MORE_VARS
   MORE_VARS
 #endif
@@ -281,9 +292,11 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
   void * prv;
 #endif
   register Address up UPREG = UP;
-  IF_spTOS(register Cell MAYBE_UNUSED spTOS TOSREG;)
-  register Cell MAYBE_UNUSED spb spaREG;
-  register Cell MAYBE_UNUSED spc spbREG;
+  register Cell MAYBE_UNUSED spTOS TOSREG;
+  register Cell MAYBE_UNUSED spb spbREG;
+  register Cell MAYBE_UNUSED spc spcREG;
+  register Cell MAYBE_UNUSED spd spdREG;
+  register Cell MAYBE_UNUSED spe speREG;
   IF_fpTOS(register Float fpTOS FTOSREG;)
 #if defined(DOUBLY_INDIRECT)
   static Label *symbols;
@@ -303,7 +316,13 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
 #define INST_ADDR(name) ((Label)&&J_##name)
 #include PRIM_LAB_I
 #undef INST_ADDR
-    (Label)&&after_last
+    (Label)&&after_last,
+    (Label)&&before_goto,
+    (Label)&&after_goto,
+/* just mention the H_ labels, so the SKIP16s are not optimized away */
+#define INST_ADDR(name) ((Label)&&H_##name)
+#include PRIM_LAB_I
+#undef INST_ADDR
   };
 #ifdef CPU_DEP2
   CPU_DEP2
@@ -339,15 +358,37 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
     return symbols;
   }
 
-  IF_spTOS(spTOS = sp[0]);
+#if STACK_CACHE_DEFAULT>0
+  sp += STACK_CACHE_DEFAULT-1;
+#endif
+
+#if STACK_CACHE_DEFAULT>0
+  spTOS = sp[0];
+#endif
+#if STACK_CACHE_DEFAULT>1
+  spb = sp[-1];
+#endif
+#if STACK_CACHE_DEFAULT>2
+  spc = sp[-2];
+#endif
+#if STACK_CACHE_DEFAULT>3
+  spd = sp[-3];
+#endif
+#if STACK_CACHE_DEFAULT>4
+  spe = sp[-4];
+#endif
+
   IF_fpTOS(fpTOS = fp[0]);
 /*  prep_terminal(); */
 #ifdef NO_IP
   goto *(*(Label *)ip0);
+  before_goto:
+  goto *real_ca;
+  after_goto:;
 #else
   SET_IP(ip);
   SUPER_END; /* count the first block, too */
-  NEXT;
+  FIRST_NEXT;
 #endif
 
 #ifdef CPU_DEP3
@@ -357,4 +398,6 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
 #include PRIM_I
   after_last: return (Label *)0;
   /*needed only to get the length of the last primitive */
+
+  return (Label *)0;
 }