--- gforth/engine/engine.c	2007/04/01 21:30:26	1.102
+++ gforth/engine/engine.c	2010/12/31 18:09:02	1.113
@@ -1,12 +1,12 @@
 /* Gforth virtual machine (aka inner interpreter)
 
-  Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006 Free Software Foundation, Inc.
+  Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008,2010 Free Software Foundation, Inc.
 
   This file is part of Gforth.
 
   Gforth is free software; you can redistribute it and/or
   modify it under the terms of the GNU General Public License
-  as published by the Free Software Foundation; either version 2
+  as published by the Free Software Foundation, either version 3
   of the License, or (at your option) any later version.
 
   This program is distributed in the hope that it will be useful,
@@ -15,8 +15,7 @@
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+  along with this program; if not, see http://www.gnu.org/licenses/.
 */
 
 #if defined(GFORTH_DEBUGGING) || defined(INDIRECT_THREADED) || defined(DOUBLY_INDIRECT) || defined(VM_PROFILING)
@@ -24,7 +23,6 @@
 #else
 #define USE_TOS
 #endif
-#define USE_NO_FTOS
 
 #include "config.h"
 #include "forth.h"
@@ -46,7 +44,9 @@
 #include <unistd.h>
 #include <pwd.h>
 #include <dirent.h>
+#ifdef HAVE_WCHAR_H
 #include <wchar.h>
+#endif
 #include <sys/resource.h>
 #ifdef HAVE_FNMATCH_H
 #include <fnmatch.h>
@@ -72,10 +72,6 @@
 #include <callback.h>
 #endif
 
-#ifdef HAS_LIBFFI
-#include <ffi.h>
-#endif
-
 #ifndef SEEK_SET
 /* should be defined in stdio.h, but some systems don't have it */
 #define SEEK_SET 0
@@ -314,14 +310,18 @@ void throw(int code)
 /* the asm(""); is there to get a stop compiled on Itanium */
 #define LABEL2(name) K_##name: asm("");
 
-Label *gforth_engine(Xt *ip0, Cell *sp0, Cell *rp0, Float *fp0, Address lp0)
+Label *gforth_engine(Xt *ip0, Cell *sp0, Cell *rp0, Float *fp0, Address lp0 sr_proto)
 /* executes code at ip, if ip!=NULL
    returns array of machine code labels (for use in a loader), if ip==NULL
 */
 {
-#ifndef GFORTH_DEBUGGING
+#if defined(GFORTH_DEBUGGING)
+#if defined(GLOBALS_NONRELOC)
+  register saved_regs *saved_regs_p TOSREG = saved_regs_p0;
+#endif /* defined(GLOBALS_NONRELOC) */
+#else /* !defined(GFORTH_DEBUGGING) */
   register Cell *rp RPREG;
-#endif
+#endif /* !defined(GFORTH_DEBUGGING) */
 #ifndef NO_IP
   register Xt *ip IPREG = ip0;
 #endif
@@ -342,21 +342,18 @@ Label *gforth_engine(Xt *ip0, Cell *sp0,
   long long llrv;
   void * prv;
 #endif
-#ifdef HAS_LIBFFI
-  extern void * gforth_ritem;
-  extern void ** gforth_clist;
-  extern void ffi_callback(ffi_cif * cif, void * resp, void ** args, Xt * ip);
-#endif
   register Address up UPREG = gforth_UP;
+#if !defined(GFORTH_DEBUGGING)
   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;
-  register Cell MAYBE_UNUSED spf speREG;
-  register Cell MAYBE_UNUSED spg speREG;
-  register Cell MAYBE_UNUSED sph speREG;
+  register Cell MAYBE_UNUSED spf spfREG;
+  register Cell MAYBE_UNUSED spg spgREG;
+  register Cell MAYBE_UNUSED sph sphREG;
   IF_fpTOS(register Float fpTOS FTOSREG;)
+#endif /* !defined(GFORTH_DEBUGGING) */
 #if defined(DOUBLY_INDIRECT)
   static Label *symbols;
   static void *routines[]= {
@@ -409,7 +406,7 @@ Label *gforth_engine(Xt *ip0, Cell *sp0,
 
     symbols = (Label *)(malloc(MAX_SYMBOLS*sizeof(Cell)+CODE_OFFSET)+code_offset);
     xts = (Label *)(malloc(MAX_SYMBOLS*sizeof(Cell)+XT_OFFSET)+xt_offset);
-    for (i=0; i<DOESJUMP+1; i++)
+    for (i=0; i<DOER_MAX+1; i++)
       xts[i] = symbols[i] = (Label)routines[i];
     for (; routines[i]!=0; i++) {
       if (i>=MAX_SYMBOLS) {