--- gforth/engine/engine.c	2005/08/21 22:09:14	1.84
+++ gforth/engine/engine.c	2006/01/05 01:37:32	1.88
@@ -1,6 +1,6 @@
 /* Gforth virtual machine (aka inner interpreter)
 
-  Copyright (C) 1995,1996,1997,1998,2000,2003,2004 Free Software Foundation, Inc.
+  Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005 Free Software Foundation, Inc.
 
   This file is part of Gforth.
 
@@ -241,9 +241,9 @@ extern int gforth_memcmp(const char * s1
       }
 #endif
 
-#ifdef HAS_FFCALL
-#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]);
+#if defined(HAS_FFCALL) || defined(HAS_LIBFFI)
+#define SAVE_REGS IF_fpTOS(fp[0]=fpTOS); gforth_SP=sp; gforth_FP=fp; gforth_RP=rp; gforth_LP=lp;
+#define REST_REGS sp=gforth_SP; fp=gforth_FP; rp=gforth_RP; lp=gforth_LP; IF_fpTOS(fpTOS=fp[0]);
 #endif
 
 #if !defined(ENGINE)
@@ -259,7 +259,6 @@ extern int gforth_memcmp(const char * s1
 #define VARIANT(v)	(v)
 #define JUMP(target)	goto I_noop
 #define LABEL(name) H_##name: SKIP16; I_##name:
-#define IN_ENGINE2
 
 #elif ENGINE==3
 /* variant with different immediate arguments for finding out
@@ -309,7 +308,7 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
   extern void ** clist;
   extern void ffi_callback(ffi_cif * cif, void * resp, void ** args, Xt * ip);
 #endif
-  register Address up UPREG = UP;
+  register Address up UPREG = gforth_UP;
   register Cell MAYBE_UNUSED spTOS TOSREG;
   register Cell MAYBE_UNUSED spb spbREG;
   register Cell MAYBE_UNUSED spc spcREG;