--- gforth/float.fs	1994/06/01 10:02:22	1.4
+++ gforth/float.fs	1995/01/18 18:41:35	1.10
@@ -1,11 +1,28 @@
 \ High level floating point                            14jan94py
 
-: faligned ( addr -- f-addr )
-  [ 1 floats 1- ] Literal + [ -1 floats ] Literal and ;
-
-: falign ( -- )
-  here dup faligned swap
-  ?DO  bl c,  LOOP ;
+1 cells 4 = [IF]
+' cells   Alias sfloats
+' cell+   Alias sfloat+
+' align   Alias sfalign
+' aligned Alias sfaligned
+[ELSE]
+: sfloats  2* 2* ;
+: sfloat+  4 + ;
+: sfaligned ( addr -- addr' )  3 + -4 and ;
+: sfalign ( -- )  here dup sfaligned swap ?DO  bl c,  LOOP ;
+[THEN]
+
+1 floats 8 = [IF]
+' floats   Alias dfloats
+' float+   Alias dfloat+
+' falign   Alias dfalign
+' faligned Alias dfaligned
+[ELSE]
+: dfloats  2* 2* 2* ;
+: dfloat+  8 + ;
+: dfaligned ( addr -- addr' )  7 + -8 and ;
+: dfalign ( -- )  here dup dfaligned swap ?DO  bl c,  LOOP ;
+[THEN]
 
 : f, ( f -- )  here 1 floats allot f! ;
 
@@ -53,12 +70,38 @@
   scratch over c@ emit '. emit 1 /string type
   'E emit . ;
 
-: fnumber ( string -- r / )
-  ?dup IF  dup count >float 0=
-           IF    defers notfound
-	   ELSE  drop state @
-	         IF  postpone FLiteral  THEN  THEN  THEN ;
+: sfnumber ( c-addr u -- r / )
+    2dup >float
+    IF
+	2drop state @
+	IF
+	    postpone FLiteral
+	THEN
+    ELSE
+	defers notfound
+    THEN ;
 
-' fnumber IS notfound
+' sfnumber IS notfound
 
 1e0 fasin 2e0 f* fconstant pi
+
+: f2*  2e0 f* ;
+: f2/  2e0 f/ ;
+: 1/f  1e0 fswap f/ ;
+
+
+\ We now have primitives for these, so we need not define them
+
+\ : falog ( f -- 10^f )  [ 10e0 fln ] FLiteral f* fexp ;
+
+\ : fsinh    fexpm1 fdup fdup 1e0 f+ f/ f+ f2/ ;
+\ : fcosh    fexp fdup 1/f f+ f2/ ;
+\ : ftanh    f2* fexpm1 fdup 2e0 f+ f/ ;
+
+\ : fatanh   fdup f0< >r fabs 1e0 fover f- f/  f2* flnp1 f2/
+\            r> IF  fnegate  THEN ;
+\ : facosh   fdup fdup f* 1e0 f- fsqrt f+ fln ;
+\ : fasinh   fdup fdup f* 1e0 f+ fsqrt f/ fatanh ;
+
+: f.s  ." <" fdepth 0 .r ." > " fdepth 0 max maxdepth-.s @ min dup 0 
+  ?DO  dup i - 1- floats fp@ + f@ f.  LOOP  drop ;