--- gforth/prim	1999/05/15 20:00:21	1.32
+++ gforth/prim	1999/12/03 18:24:22	1.41
@@ -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.""
+cmove	c_from c_to u --	string	c_move
+""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];
 :
@@ -767,7 +768,7 @@ d = d1-d2;
 :
  dnegate d+ ;
 
-dnegate	d1 -- d2		double
+dnegate	d1 -- d2		double	d_negate
 /* use dminus as alias */
 #ifdef BUGGY_LONG_LONG
 d2 = dnegate(d1);
@@ -806,7 +807,7 @@ w = w1|w2;
 :
  invert swap invert and invert ;
 
-xor	w1 w2 -- w		core
+xor	w1 w2 -- w		core	x_or
 w = w1^w2;
 
 invert	w1 -- w2		core
@@ -814,12 +815,12 @@ w2 = ~w1;
 :
  MAXU xor ;
 
-rshift	u1 n -- u2		core
+rshift	u1 n -- u2		core	r_shift
   u2 = u1>>n;
 :
     0 ?DO 2/ MAXI and LOOP ;
 
-lshift	u1 n -- u2		core
+lshift	u1 n -- u2		core	l_shift
   u2 = u1<<n;
 :
     0 ?DO 2* LOOP ;
@@ -835,7 +836,7 @@ f = FLAG($4==$5);
 	] xor 0= [
     [THEN] ] ;
 
-$1<>	$2 -- f		$7	$3different
+$1<>	$2 -- f		$7	$3not_equals
 f = FLAG($4!=$5);
 :
     [ char $1x char 0 = [IF]
@@ -844,7 +845,7 @@ f = FLAG($4!=$5);
 	] xor 0<> [
     [THEN] ] ;
 
-$1<	$2 -- f		$8	$3less
+$1<	$2 -- f		$8	$3less_than
 f = FLAG($4<$5);
 :
     [ char $1x char 0 = [IF]
@@ -856,7 +857,7 @@ f = FLAG($4<$5);
 	[THEN]
     [THEN] ] ;
 
-$1>	$2 -- f		$9	$3greater
+$1>	$2 -- f		$9	$3greater_than
 f = FLAG($4>$5);
 :
     [ char $1x char 0 = [IF] ] negate [ [ELSE] ] swap [ [THEN] ]
@@ -888,21 +889,21 @@ f = FLAG($4.lo==$5.lo && $4.hi==$5.hi);
 f = FLAG($4==$5);
 #endif
 
-$1<>	$2 -- f		$7	$3different
+$1<>	$2 -- f		$7	$3not_equals
 #ifdef BUGGY_LONG_LONG
 f = FLAG($4.lo!=$5.lo || $4.hi!=$5.hi);
 #else
 f = FLAG($4!=$5);
 #endif
 
-$1<	$2 -- f		$8	$3less
+$1<	$2 -- f		$8	$3less_than
 #ifdef BUGGY_LONG_LONG
 f = FLAG($4.hi==$5.hi ? $4.lo<$5.lo : $4.hi<$5.hi);
 #else
 f = FLAG($4<$5);
 #endif
 
-$1>	$2 -- f		$9	$3greater
+$1>	$2 -- f		$9	$3greater_than
 #ifdef BUGGY_LONG_LONG
 f = FLAG($4.hi==$5.hi ? $4.lo>$5.lo : $4.hi>$5.hi);
 #else
@@ -1025,7 +1026,7 @@ swap	w1 w2 -- w2 w1		core
  >r (swap) ! r> (swap) @ ;
 Variable (swap)
 
-dup	w -- w w		core
+dup	w -- w w		core	dupe
 :
  sp@ @ ;
 
@@ -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
@@ -1790,22 +1795,22 @@ f**		r1 r2 -- r3	float-ext	f_star_star
 ""@i{r3} is @i{r1} raised to the @i{r2}th power.""
 r3 = pow(r1,r2);
 
-fnegate		r1 -- r2	float
+fnegate		r1 -- r2	float	f_negate
 r2 = - r1;
 
-fdrop		r --		float
+fdrop		r --		float	f_drop
 
-fdup		r -- r r	float
+fdup		r -- r r	float	f_dupe
 
-fswap		r1 r2 -- r2 r1	float
+fswap		r1 r2 -- r2 r1	float	f_swap
 
-fover		r1 r2 -- r1 r2 r1	float
+fover		r1 r2 -- r1 r2 r1	float	f_over
 
-frot		r1 r2 r3 -- r2 r3 r1	float
+frot		r1 r2 r3 -- r2 r3 r1	float	f_rote
 
-fnip		r1 r2 -- r2	gforth
+fnip		r1 r2 -- r2	gforth	f_nip
 
-ftuck		r1 r2 -- r2 r1 r2	gforth
+ftuck		r1 r2 -- r2 r1 r2	gforth	f_tuck
 
 float+		f_addr1 -- f_addr2	float	float_plus
 "" Increment @i{f-addr1} by the number of address units corresponding to the size of
@@ -1821,7 +1826,7 @@ floor		r1 -- r2	float
 /* !! unclear wording */
 r2 = floor(r1);
 
-fround		r1 -- r2	float
+fround		r1 -- r2	float	f_round
 ""Round to the nearest integral value.""
 /* !! unclear wording */
 #ifdef HAVE_RINT
@@ -1831,13 +1836,13 @@ r2 = floor(r1+0.5);
 /* !! This is not quite true to the rounding rules given in the standard */
 #endif
 
-fmax		r1 r2 -- r3	float
+fmax		r1 r2 -- r3	float	f_max
 if (r1<r2)
   r3 = r2;
 else
   r3 = r1;
 
-fmin		r1 r2 -- r3	float
+fmin		r1 r2 -- r3	float	f_min
 if (r1<r2)
   r3 = r1;
 else
@@ -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);
@@ -1893,30 +1898,30 @@ else if(*endconv=='d' || *endconv=='D')
      }
 }
 
-fabs		r1 -- r2	float-ext
+fabs		r1 -- r2	float-ext	f_abs
 r2 = fabs(r1);
 
-facos		r1 -- r2	float-ext
+facos		r1 -- r2	float-ext	f_a_cos
 r2 = acos(r1);
 
-fasin		r1 -- r2	float-ext
+fasin		r1 -- r2	float-ext	f_a_sine
 r2 = asin(r1);
 
-fatan		r1 -- r2	float-ext
+fatan		r1 -- r2	float-ext	f_a_tan
 r2 = atan(r1);
 
-fatan2		r1 r2 -- r3	float-ext
+fatan2		r1 r2 -- r3	float-ext	f_a_tan_two
 ""@i{r1/r2}=tan(@i{r3}). ANS Forth does not require, but probably
 intends this to be the inverse of @code{fsincos}. In gforth it is.""
 r3 = atan2(r1,r2);
 
-fcos		r1 -- r2	float-ext
+fcos		r1 -- r2	float-ext	f_cos
 r2 = cos(r1);
 
-fexp		r1 -- r2	float-ext
+fexp		r1 -- r2	float-ext	f_e_x_p
 r2 = exp(r1);
 
-fexpm1		r1 -- r2	float-ext
+fexpm1		r1 -- r2	float-ext	f_e_x_p_m_one
 ""@i{r2}=@i{e}**@i{r1}@minus{}1""
 #ifdef HAVE_EXPM1
 extern double
@@ -1929,10 +1934,10 @@ r2 = expm1(r1);
 r2 = exp(r1)-1.;
 #endif
 
-fln		r1 -- r2	float-ext
+fln		r1 -- r2	float-ext	f_l_n
 r2 = log(r1);
 
-flnp1		r1 -- r2	float-ext
+flnp1		r1 -- r2	float-ext	f_l_n_p_one
 ""@i{r2}=ln(@i{r1}+1)""
 #ifdef HAVE_LOG1P
 extern double
@@ -1945,57 +1950,57 @@ r2 = log1p(r1);
 r2 = log(r1+1.);
 #endif
 
-flog		r1 -- r2	float-ext
+flog		r1 -- r2	float-ext	f_log
 ""The decimal logarithm.""
 r2 = log10(r1);
 
-falog		r1 -- r2	float-ext
+falog		r1 -- r2	float-ext	f_a_log
 ""@i{r2}=10**@i{r1}""
 extern double pow10(double);
 r2 = pow10(r1);
 
-fsin		r1 -- r2	float-ext
+fsin		r1 -- r2	float-ext	f_sine
 r2 = sin(r1);
 
-fsincos		r1 -- r2 r3	float-ext
+fsincos		r1 -- r2 r3	float-ext	f_sine_cos
 ""@i{r2}=sin(@i{r1}), @i{r3}=cos(@i{r1})""
 r2 = sin(r1);
 r3 = cos(r1);
 
-fsqrt		r1 -- r2	float-ext
+fsqrt		r1 -- r2	float-ext	f_square_root
 r2 = sqrt(r1);
 
-ftan		r1 -- r2	float-ext
+ftan		r1 -- r2	float-ext	f_tan
 r2 = tan(r1);
 :
  fsincos f/ ;
 
-fsinh		r1 -- r2	float-ext
+fsinh		r1 -- r2	float-ext	f_cinch
 r2 = sinh(r1);
 :
  fexpm1 fdup fdup 1. d>f f+ f/ f+ f2/ ;
 
-fcosh		r1 -- r2	float-ext
+fcosh		r1 -- r2	float-ext	f_cosh
 r2 = cosh(r1);
 :
  fexp fdup 1/f f+ f2/ ;
 
-ftanh		r1 -- r2	float-ext
+ftanh		r1 -- r2	float-ext	f_tan_h
 r2 = tanh(r1);
 :
  f2* fexpm1 fdup 2. d>f f+ f/ ;
 
-fasinh		r1 -- r2	float-ext
+fasinh		r1 -- r2	float-ext	f_a_cinch
 r2 = asinh(r1);
 :
  fdup fdup f* 1. d>f f+ fsqrt f/ fatanh ;
 
-facosh		r1 -- r2	float-ext
+facosh		r1 -- r2	float-ext	f_a_cosh
 r2 = acosh(r1);
 :
  fdup fdup f* 1. d>f f- fsqrt f+ fln ;
 
-fatanh		r1 -- r2	float-ext
+fatanh		r1 -- r2	float-ext	f_a_tan_h
 r2 = atanh(r1);
 :
  fdup f0< >r fabs 1. d>f fover f- f/  f2* flnp1 f2/
@@ -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]);
+