--- gforth/engine/engine.c	2003/03/09 15:17:03	1.61
+++ gforth/engine/engine.c	2003/08/15 14:07:04	1.64
@@ -59,6 +59,11 @@
 #include <dl.h>
 #endif
 
+#ifdef HAS_FFCALL
+#include <avcall.h>
+#include <callback.h>
+#endif
+
 #ifndef SEEK_SET
 /* should be defined in stdio.h, but some systems don't have it */
 #define SEEK_SET 0
@@ -156,7 +161,7 @@ extern int gforth_memcmp(const char * s1
 # define CPU_DEP1 0
 #endif
 
-/* instructions containing these must be the last instruction of a
+/* instructions containing SUPER_END must be the last instruction of a
    super-instruction (e.g., branches, EXECUTE, and other instructions
    ending the basic block). Instructions containing SET_IP get this
    automatically, so you usually don't have to write it.  If you have
@@ -184,6 +189,11 @@ 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]);
+#endif
+
 #if !defined(ENGINE)
 /* normal engine */
 #define VARIANT(v)	(v)
@@ -212,7 +222,6 @@ extern int gforth_memcmp(const char * s1
 
 #define LABEL2(name) K_##name:
 
-
 Label *engine(Xt *ip0, Cell *sp0, Cell *rp0, Float *fp0, Address lp0)
 /* executes code at ip, if ip!=NULL
    returns array of machine code labels (for use in a loader), if ip==NULL
@@ -231,6 +240,15 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
 #ifdef MORE_VARS
   MORE_VARS
 #endif
+#ifdef HAS_FFCALL
+  av_alist alist;
+  extern va_alist clist;
+  float frv;
+  int irv;
+  double drv;
+  long long llrv;
+  void * prv;
+#endif
   register Address up UPREG = UP;
   IF_spTOS(register Cell spTOS TOSREG;)
   IF_fpTOS(register Float fpTOS FTOSREG;)
@@ -263,6 +281,7 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
 #define INST_ADDR(name) ((Label)&&J_##name)
 #include "prim_lab.i"
 #undef INST_ADDR
+    (Label)&&after_last
   };
 #ifdef CPU_DEP2
   CPU_DEP2