--- gforth/prim	1999/05/15 20:00:21	1.32
+++ gforth/prim	1999/11/08 22:01:09	1.40
@@ -445,27 +445,28 @@ n = rp[4];
 \ digit is high-level: 0/0%
 
 move	c_from c_to ucount --		core
-"" If @i{ucount}>0, copy the contents of @i{ucount} address units
-at @i{c-from} to @i{c-to}. @code{move} chooses its copy direction
-to avoid problems when @i{c-from}, @i{c-to} overlap.""
+""Copy the contents of @i{ucount} address units at @i{c-from} to
+@i{c-to}. @code{move} works correctly even if the two areas overlap.""
 memmove(c_to,c_from,ucount);
 /* make an Ifdef for bsd and others? */
 :
  >r 2dup u< IF r> cmove> ELSE r> cmove THEN ;
 
 cmove	c_from c_to u --	string
-"" If @i{u}>0, copy the contents of @i{ucount} characters from
-data space at @i{c-from} to @i{c-to}. The copy proceeds @code{char}-by-@code{char}
-from low address to high address.""
+""Copy the contents of @i{ucount} characters from data space at
+@i{c-from} to @i{c-to}. The copy proceeds @code{char}-by-@code{char}
+from low address to high address; i.e., for overlapping areas it is
+safe if @i{c-to}=<@i{c-from}.""
 while (u-- > 0)
   *c_to++ = *c_from++;
 :
  bounds ?DO  dup c@ I c! 1+  LOOP  drop ;
 
 cmove>	c_from c_to u --	string	c_move_up
-"" If @i{u}>0, copy the contents of @i{ucount} characters from
-data space at @i{c-from} to @i{c-to}. The copy proceeds @code{char}-by-@code{char}
-from high address to low address.""
+""Copy the contents of @i{ucount} characters from data space at
+@i{c-from} to @i{c-to}. The copy proceeds @code{char}-by-@code{char}
+from high address to low address; i.e., for overlapping areas it is
+safe if @i{c-to}>=@i{c-from}.""
 while (u-- > 0)
   c_to[u] = c_from[u];
 :
@@ -1348,11 +1349,14 @@ f_addr = (Float *)((((Cell)c_addr)+(size
  [ 1 floats 1- ] Literal + [ -1 floats ] Literal and ;
 
 >body		xt -- a_addr	core	to_body
+"" Get the address of the body of the word represented by @i{xt} (the address
+of the word's data field).""
 a_addr = PFA(xt);
 :
     2 cells + ;
 
-\+standardthreading
+\ threading stuff is currently only interesting if we have a compiler
+\fhas? standardthreading has? compiler and [IF]
 
 >code-address		xt -- c_addr		gforth	to_code_address
 ""@i{c-addr} is the code address of the word @i{xt}.""
@@ -1414,7 +1418,7 @@ n=1;
 :
  1 ;
 
-\+
+\f[THEN]
 
 key-file	wfileid -- n		gforth	paren_key_file
 #ifdef HAS_FILE
@@ -1661,18 +1665,19 @@ else {
 }
 
 \+
-\+file
 
 write-file	c_addr u1 wfileid -- wior	file	write_file
 /* !! fwrite does not guarantee enough */
+#ifdef HAS_FILE
 {
   UCell u2 = fwrite(c_addr, sizeof(Char), u1, (FILE *)wfileid);
   wior = FILEIO(u2<u1 && ferror((FILE *)wfileid));
   if (wior)
     clearerr((FILE *)wfileid);
 }
-
-\+
+#else
+TYPE(c_addr, u1);
+#endif
 
 emit-file	c wfileid -- wior	gforth	emit_file
 #ifdef HAS_FILE
@@ -1680,7 +1685,7 @@ wior = FILEIO(putc(c, (FILE *)wfileid)==
 if (wior)
   clearerr((FILE *)wfileid);
 #else
-putc(c, stdout);
+PUTC(c);
 #endif
 
 \+file
@@ -1859,7 +1864,7 @@ internal floating-point representation.
 represents a valid floating-point number @i{r} is placed
 on the floating-point stack and @i{flag} is true. Otherwise,
 @i{flag} is false. A string of blanks is a special case
-and represents the flotaing-point number 0.""
+and represents the floating-point number 0.""
 /* real signature: c_addr u -- r t / f */
 Float r;
 char *number=cstr(c_addr, u, 1);
@@ -2177,3 +2182,12 @@ UP=up=(char *)a_addr;
 :
  up ! ;
 Variable UP
+
+wcall	u --	gforth
+IF_FTOS(fp[0]=FTOS);
+FP=fp;
+sp=(SYSCALL(Cell(*)(Cell *, void *))u)(sp, &FP);
+fp=FP;
+IF_TOS(TOS=sp[0];)
+IF_FTOS(FTOS=fp[0]);
+