--- gforth/engine/engine.c	2010/12/31 18:09:02	1.113
+++ gforth/engine/engine.c	2012/03/23 20:49:44	1.118
@@ -1,6 +1,6 @@
 /* Gforth virtual machine (aka inner interpreter)
 
-  Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008,2010 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.
 
@@ -89,7 +89,13 @@
 
 #ifdef MEMCMP_AS_SUBROUTINE
 extern int gforth_memcmp(const char * s1, const char * s2, size_t n);
+extern Char *gforth_memmove(Char * dest, const Char* src, Cell n);
+extern Char *gforth_memset(Char * s, Cell c, UCell n);
+extern Char *gforth_memcpy(Char * dest, const Char* src, Cell n);
 #define memcmp(s1,s2,n) gforth_memcmp(s1,s2,n)
+#define memmove(a,b,c) gforth_memmove(a,b,c)
+#define memset(a,b,c) gforth_memset(a,b,c)
+#define memcpy(a,b,c) gforth_memcpy(a,b,c)
 #endif
 
 #define NEWLINE	'\n'
@@ -230,9 +236,10 @@ extern int gforth_memcmp(const char * s1
 #define asmcomment(string) asm("")
 #endif
 
+#define DEPTHOFF 4
 #ifdef GFORTH_DEBUGGING
 #if DEBUG
-#define NAME(string) { saved_ip=ip; asmcomment(string); fprintf(stderr,"%08lx depth=%3ld tos=%016lx: "string"\n",(Cell)ip,sp0+3-sp,sp[0]);}
+#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
@@ -242,7 +249,7 @@ 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) asmcomment(string);
 #endif
@@ -262,11 +269,11 @@ extern int gforth_memcmp(const char * s1
 #endif
 
 #ifdef STANDALONE
-jmp_buf throw_jmp_buf;
+jmp_buf * throw_jmp_handler;
 
 void throw(int code)
 {
-  longjmp(throw_jmp_buf,code); /* !! or use siglongjmp ? */
+  longjmp(*throw_jmp_handler,code); /* !! or use siglongjmp ? */
 }
 #endif
 
@@ -423,7 +430,7 @@ Label *gforth_engine(Xt *ip0, Cell *sp0,
 #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];