--- gforth/engine/engine.c	2005/12/31 15:46:13	1.87
+++ gforth/engine/engine.c	2011/12/31 15:29:26	1.116
@@ -1,12 +1,12 @@
 /* Gforth virtual machine (aka inner interpreter)
 
-  Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005 Free Software Foundation, Inc.
+  Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008,2010,2011 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,6 +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>
@@ -53,7 +54,7 @@
 #include "fnmatch.h"
 #endif
 #else
-#include "systypes.h"
+/* #include <systypes.h> */
 #endif
 
 #if defined(HAVE_LIBDL) || defined(HAVE_DLOPEN) /* what else? */
@@ -71,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
@@ -97,6 +94,20 @@ extern int gforth_memcmp(const char * s1
 
 #define NEWLINE	'\n'
 
+/* These two flags control whether divisions are checked by software.
+   The CHECK_DIVISION_SW is for those cases where the event is a
+   division by zero or overflow on the C level, and might be reported
+   by hardware; we might check forr that in autoconf and set the
+   switch appropriately, but currently don't.  The CHECK_DIVISION flag
+   is for the other cases. */
+#ifdef GFORTH_DEBUGGING
+#define CHECK_DIVISION_SW 1
+#define CHECK_DIVISION 1
+#else
+#define CHECK_DIVISION_SW 0
+#define CHECK_DIVISION 0
+#endif
+
 /* conversion on fetch */
 
 #define vm_Cell2f(_cell,_x)		((_x)=(Bool)(_cell))
@@ -210,9 +221,19 @@ extern int gforth_memcmp(const char * s1
 #endif
 #define SUPER_CONTINUE
 
+#ifdef ASMCOMMENT
+/* an individualized asm statement so that (hopefully) gcc's optimizer
+   does not do cross-jumping */
+#define asmcomment(string) asm(ASMCOMMENT string)
+#else
+/* we don't know how to do an asm comment, so we just do an empty asm */
+#define asmcomment(string) asm("")
+#endif
+
+#define DEPTHOFF 4
 #ifdef GFORTH_DEBUGGING
 #if DEBUG
-#define NAME(string) { saved_ip=ip; asm("# "string); fprintf(stderr,"%08lx depth=%3ld: "string"\n",(Cell)ip,sp0+3-sp);}
+#define NAME(string) { saved_ip=ip; asmcomment(string); fprintf(stderr,"%08lx depth=%3ld tos=%016lx: "string"\n",(Cell)ip,sp0+DEPTHOFF-sp,sp[0]);}
 #else /* !DEBUG */
 #define NAME(string) { saved_ip=ip; asm(""); }
 /* the asm here is to avoid reordering of following stuff above the
@@ -222,9 +243,9 @@ extern int gforth_memcmp(const char * s1
    because the stack loads may already cause a stack underflow. */
 #endif /* !DEBUG */
 #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); }
+#       define  NAME(string)    {Cell __depth=sp0+DEPTHOFF-sp; int i; fprintf(stderr,"%08lx depth=%3ld: "string,(Cell)ip,sp0+DEPTHOFF-sp); for (i=__depth-1; i>0; i--) fprintf(stderr, " $%lx",sp[i]); fprintf(stderr, " $%lx\n",spTOS); }
 #else
-#	define	NAME(string) asm("# "string);
+#	define	NAME(string) asmcomment(string);
 #endif
 
 #ifdef DEBUG
@@ -241,9 +262,18 @@ extern int gforth_memcmp(const char * s1
       }
 #endif
 
+#ifdef STANDALONE
+jmp_buf throw_jmp_buf;
+
+void throw(int code)
+{
+  longjmp(throw_jmp_buf,code); /* !! or use siglongjmp ? */
+}
+#endif
+
 #if defined(HAS_FFCALL) || defined(HAS_LIBFFI)
-#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]);
+#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)
@@ -251,38 +281,48 @@ extern int gforth_memcmp(const char * s1
 #define VARIANT(v)	(v)
 #define JUMP(target)	goto I_noop
 #define LABEL(name) H_##name: asm(""); I_##name:
+#define LABEL3(name) J_##name: asm("");
 
 #elif ENGINE==2
 /* variant with padding between VM instructions for finding out
    cross-inst jumps (for dynamic code) */
-#define engine engine2
+#define gforth_engine gforth_engine2
 #define VARIANT(v)	(v)
 #define JUMP(target)	goto I_noop
 #define LABEL(name) H_##name: SKIP16; I_##name:
+/* the SKIP16 after LABEL3 is there, because the ARM gcc may place
+   some constants after the final branch, and may refer to them from
+   the code before label3.  Since we don't copy the constants, we have
+   to make sure that such code is recognized as non-relocatable. */
+#define LABEL3(name) J_##name: SKIP16;
 
 #elif ENGINE==3
 /* variant with different immediate arguments for finding out
    immediate arguments (for native code) */
-#define engine engine3
+#define gforth_engine gforth_engine3
 #define VARIANT(v)	((v)^0xffffffff)
 #define JUMP(target)	goto K_lit
 #define LABEL(name) H_##name: asm(""); I_##name:
+#define LABEL3(name) J_##name: asm("");
 #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)
+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
@@ -296,28 +336,25 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
 #endif
 #ifdef HAS_FFCALL
   av_alist alist;
-  extern va_alist clist;
+  extern va_alist gforth_clist;
   float frv;
   int irv;
   double drv;
   long long llrv;
   void * prv;
 #endif
-#ifdef HAS_LIBFFI
-  extern void * ritem;
-  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;
+#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[]= {
@@ -344,6 +381,11 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
 #include PRIM_LAB_I
 #undef INST_ADDR
   };
+#ifdef STANDALONE
+#define INST_ADDR(name) ((Label)&&I_##name)
+#include "image.i"
+#undef INST_ADDR
+#endif
 #ifdef CPU_DEP2
   CPU_DEP2
 #endif
@@ -365,7 +407,7 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
 
     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) {
@@ -375,10 +417,14 @@ Label *engine(Xt *ip0, Cell *sp0, Cell *
       xts[i] = symbols[i] = &routines[i];
     }
 #endif /* defined(DOUBLY_INDIRECT) */
+#ifdef STANDALONE
+    return image;
+#else
     return symbols;
+#endif
   }
 
-#if !(defined(GFORTH_DEBUGGING) || defined(INDIRECT_THREADED) || defined(DOUBLY_INDIRECT) || defined(VM_PROFILING))
+#ifdef USE_TOS
   sp += STACK_CACHE_DEFAULT-1;
   /* some of those registers are dead, but its simpler to initialize them all */  spTOS = sp[0];
   spb = sp[-1];