--- gforth/engine/engine.c	2002/12/19 23:12:07	1.50
+++ gforth/engine/engine.c	2003/08/04 20:32:36	1.63
@@ -1,6 +1,6 @@
 /* Gforth virtual machine (aka inner interpreter)
 
-  Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc.
+  Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc.
 
   This file is part of Gforth.
 
@@ -59,28 +59,23 @@
 #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
 #endif
 
-#define IOR(flag)	((flag)? -512-errno : 0)
-
-struct F83Name {
-  struct F83Name *next;  /* the link field for old hands */
-  char		countetc;
-  char		name[0];
-};
-
-#define F83NAME_COUNT(np)	((np)->countetc & 0x1f)
-
-struct Longname {
-  struct Longname *next;  /* the link field for old hands */
-  Cell		countetc;
-  char		name[0];
-};
+#ifndef HAVE_FSEEKO
+#define fseeko fseek
+#endif
 
-#define LONGNAME_COUNT(np)	((np)->countetc & (((~((UCell)0))<<3)>>3))
+#ifndef HAVE_FTELLO
+#define ftello ftell
+#endif
 
 #define NULLC '\0'
 
@@ -166,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
@@ -194,11 +189,16 @@ 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)
 #define JUMP(target)	goto I_noop
-#define LABEL(name) I_##name:
+#define LABEL(name) J_##name: asm(""); I_##name:
 
 #elif ENGINE==2
 /* variant with padding between VM instructions for finding out
@@ -206,7 +206,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: asm(".skip 16"); I_##name:
+#define LABEL(name) J_##name: SKIP16; I_##name:
 #define IN_ENGINE2
 
 #elif ENGINE==3
@@ -215,14 +215,13 @@ extern int gforth_memcmp(const char * s1
 #define engine engine3
 #define VARIANT(v)	((v)^0xffffffff)
 #define JUMP(target)	goto K_lit
-#define LABEL(name) I_##name:
+#define LABEL(name) J_##name: asm(""); I_##name:
 #else
 #error illegal ENGINE value
 #endif /* ENGINE */
 
 #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
@@ -241,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;)
@@ -262,19 +270,17 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
     /* the following entry is normally unused;
        it is there because its index indicates a does-handler */
     CPU_DEP1,
-#define INST_ADDR(name) (Label)&&I_##name
+#define INST_ADDR(name) ((Label)&&I_##name)
 #include "prim_lab.i"
 #undef INST_ADDR
     (Label)&&after_last,
     (Label)0,
-#define INST_ADDR(name) (Label)&&K_##name
+#define INST_ADDR(name) ((Label)&&K_##name)
 #include "prim_lab.i"
 #undef INST_ADDR
-#ifdef IN_ENGINE2
-#define INST_ADDR(name) (Label)&&J_##name
+#define INST_ADDR(name) ((Label)&&J_##name)
 #include "prim_lab.i"
 #undef INST_ADDR
-#endif
   };
 #ifdef CPU_DEP2
   CPU_DEP2
@@ -301,7 +307,7 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
       xts[i] = symbols[i] = (Label)routines[i];
     for (; routines[i]!=0; i++) {
       if (i>=MAX_SYMBOLS) {
-	fprintf(stderr,"gforth-ditc: more than %d primitives\n",MAX_SYMBOLS);
+	fprintf(stderr,"gforth-ditc: more than %ld primitives\n",(long)MAX_SYMBOLS);
 	exit(1);
       }
       xts[i] = symbols[i] = &routines[i];