Diff for /gforth/float.fs between versions 1.12 and 1.24

version 1.12, 1995/01/24 17:31:20 version 1.24, 1999/02/03 00:10:20
Line 1 Line 1
 \ High level floating point                            14jan94py  \ High level floating point                            14jan94py
   
 1 cells 4 = [IF]  \ Copyright (C) 1995,1997 Free Software Foundation, Inc.
 ' 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! ;  \ This file is part of Gforth.
   
 \ !! have create produce faligned pfas  \ Gforth is free software; you can redistribute it and/or
 : fconstant  ( r -- )  \ modify it under the terms of the GNU General Public License
   falign here f,  Create A,  \ as published by the Free Software Foundation; either version 2
   DOES>  @ f@ ;  \ of the License, or (at your option) any later version.
   
   \ This program is distributed in the hope that it will be useful,
   \ but WITHOUT ANY WARRANTY; without even the implied warranty of
   \ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   \ 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., 675 Mass Ave, Cambridge, MA 02139, USA.
   
   \ 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]
   
   : sfalign ( -- ) \ float-ext s-f-align
       here dup sfaligned swap ?DO  bl c,  LOOP ;
   : dfalign ( -- ) \ float-ext d-f-align
       here dup dfaligned swap ?DO  bl c,  LOOP ;
   
 : fvariable  1 sfloats constant sfloat+ ( sf-addr1 -- sf-addr2 ) \ float-ext s-float-plus
   falign here 0. d>f f, AConstant ;  dofield: lastxt code-address! \ change the constant into a field
   
 : fdepth  ( -- n )  f0 @ fp@ - [ 1 floats ] Literal / ;  1 dfloats constant dfloat+ ( df-addr1 -- df-addr2 ) \ float-ext d-float-plus
   dofield: lastxt code-address! \ change the constant into a field
   
 : FLit ( -- r )  r> faligned dup f@ float+ >r ;  : f, ( f -- )  here 1 floats allot f! ;
 : FLiteral ( r -- )  postpone FLit  falign f, ;  immediate  
   
 &16 Value precision  : fconstant  ( r "name" -- ) \ float
 : set-precision  to precision ;      Create f,
   DOES> ( -- r )
       f@ ;
   
   : fdepth ( -- +n ) \ floating f-depth
       \G +n is the current number of (floating-point) values on the
       \G floating-point stack.
       fp0 @ fp@ - [ 1 floats ] Literal / ;
   
   : FLit ( -- r )  r> dup f@ float+ >r ;
   : FLiteral ( compilation r -- ; run-time -- r ) \ float
       \G Compile appropriate code such that, at run-time, r is placed
       \G on the (floating-point) stack. Interpretation semantics are undefined.
       BEGIN  here cell+ dup faligned <>  WHILE  postpone noop  REPEAT
       postpone FLit  f, ;  immediate
   
   &15 Value precision ( -- u ) \ floating-ext
   \G u is the number of significant digits currently used by
   \G @code{F.} @code{FE.} and @code{FS.} 
   : set-precision ( u -- ) \ floating-ext
       \G Set the number of significant digits currently used by
       \G @code{F.} @code{FE.} and @code{FS.} to u.
       to precision ;
   
 : scratch ( r -- addr len )  : scratch ( r -- addr len )
   pad precision - precision ;    pad precision - precision ;
Line 54 Line 92
   IF  2drop  scratch 3 min type  rdrop  EXIT  THEN    IF  2drop  scratch 3 min type  rdrop  EXIT  THEN
   IF  '- emit  THEN ;    IF  '- emit  THEN ;
   
 : f.  ( r -- )  f$ dup >r 0<  : f.  ( r -- ) \ floating-ext f-dot
   \G Display (the floating-point number) r using fixed-point notation,
   \G followed by a space.
     f$ dup >r 0<
   IF    '0 emit    IF    '0 emit
   ELSE  scratch r@ min type  r@ precision - zeros  THEN    ELSE  scratch r@ min type  r@ precision - zeros  THEN
   '. emit r@ negate zeros    '. emit r@ negate zeros
Line 62 Line 103
 \ I'm afraid this does not really implement ansi semantics wrt precision.  \ I'm afraid this does not really implement ansi semantics wrt precision.
 \ Shouldn't precision indicate the number of places shown after the point?  \ Shouldn't precision indicate the number of places shown after the point?
   
 : fe. ( r -- )  f$ 1- s>d 3 fm/mod 3 * >r 1+ >r  : fe. ( r -- ) \ floating-ext f-e-dot
   \G Display r using engineering notation, followed by a space.
     f$ 1- s>d 3 fm/mod 3 * >r 1+ >r
   scratch r@ min type '. emit  scratch r> /string type    scratch r@ min type '. emit  scratch r> /string type
   'E emit r> . ;    'E emit r> . ;
   
 : fs. ( r -- )  f$ 1-  : fs. ( r -- ) \ floating-ext f-s-dot
   \G Display r using scientific notation, followed by a space.
     f$ 1-
   scratch over c@ emit '. emit 1 /string type    scratch over c@ emit '. emit 1 /string type
   'E emit . ;    'E emit . ;
   
 : sfnumber ( c-addr u -- r / )  require debugs.fs
     2dup >float  
   : sfnumber ( c-addr u -- r true | false )
       2dup [CHAR] e scan ( c-addr u c-addr2 u2 )
       dup 0=
       IF
           2drop 2dup [CHAR] E scan ( c-addr u c-addr3 u3 )
       THEN
       nip
     IF      IF
         2drop state @          >float
         IF  
             postpone FLiteral  
         THEN  
     ELSE      ELSE
         defers notfound          2drop false
     THEN ;      THEN ;
   
 ' sfnumber IS notfound  :noname ( c-addr u -- )
       2dup sfnumber
 1e0 fasin 2e0 f* fconstant pi      IF
           2drop POSTPONE FLiteral
       ELSE
           defers compiler-notfound
       ENDIF ;
   IS compiler-notfound
   
 : f2*  2e0 f* ;  :noname ( c-addr u -- r )
 : f2/  .5e0 f* ;      2dup sfnumber
 : 1/f  1e0 fswap f/ ;      IF
           2drop
       ELSE
           defers interpreter-notfound
       ENDIF ;
   IS interpreter-notfound
   
   : fvariable ( "name" -- ) \ float
       Create 0.0E0 f, ;
       \ does> ( -- f-addr )
   
   1.0e0 fasin 2.0e0 f* fconstant pi ( -- r ) \ gforth
   \G FCONSTANT: r is the value pi; the ratio of a circle's area
   \G to its diameter.
   
   : f2* ( r1 -- r2 ) \ gforth
       \G Multiply r1 by 2.0e0
       2.0e0 f* ;
   
   : f2/ ( r1 -- r2 ) \ gforth
       \G Multiply r1 by 0.5e0
       0.5e0 f* ;
   
   : 1/f ( r1 -- r2 ) \ gforth
       \G Divide 1.0e0 by r1
       1.0e0 fswap f/ ;
   
   
 \ We now have primitives for these, so we need not define them  \ We now have primitives for these, so we need not define them
   
 \ : falog ( f -- 10^f )  [ 10e0 fln ] FLiteral f* fexp ;  \ : falog ( f -- 10^f )  [ 10.0e0 fln ] FLiteral f* fexp ;
   
 \ : fsinh    fexpm1 fdup fdup 1e0 f+ f/ f+ f2/ ;  \ : fsinh    fexpm1 fdup fdup 1.0e0 f+ f/ f+ f2/ ;
 \ : fcosh    fexp fdup 1/f f+ f2/ ;  \ : fcosh    fexp fdup 1/f f+ f2/ ;
 \ : ftanh    f2* fexpm1 fdup 2e0 f+ f/ ;  \ : ftanh    f2* fexpm1 fdup 2.0e0 f+ f/ ;
   
 \ : fatanh   fdup f0< >r fabs 1e0 fover f- f/  f2* flnp1 f2/  \ : fatanh   fdup f0< >r fabs 1.0e0 fover f- f/  f2* flnp1 f2/
 \            r> IF  fnegate  THEN ;  \            r> IF  fnegate  THEN ;
 \ : facosh   fdup fdup f* 1e0 f- fsqrt f+ fln ;  \ : facosh   fdup fdup f* 1.0e0 f- fsqrt f+ fln ;
 \ : fasinh   fdup fdup f* 1e0 f+ fsqrt f/ fatanh ;  \ : fasinh   fdup fdup f* 1.0e0 f+ fsqrt f/ fatanh ;
   
 : f~ ( f1 f2 f3 -- flag )  fdup f0= IF  fdrop f= EXIT  THEN  
   fdup f0>   IF  frot frot f- fabs fswap  
            ELSE  fnegate frot frot fover fabs fover fabs f+ frot frot  
                  f- fabs frot frot f*  THEN  f< ;  
   
 : f.s  ." <" fdepth 0 .r ." > " fdepth 0 max maxdepth-.s @ min dup 0   \ !! factor out parts
   ?DO  dup i - 1- floats fp@ + f@ f.  LOOP  drop ;   : f~ ( f1 f2 f3 -- flag ) \ float-ext
       fdup f0=
       IF
           fdrop f= EXIT
       THEN
       fdup f0>
       IF
           frot frot f- fabs fswap
       ELSE
           fnegate frot frot fover fabs fover fabs f+ frot frot
           f- fabs frot frot f*
       THEN
       f< ;
   
   : f.s ( -- ) \ gforth f-dot-s
       \G Display the number of items on the floating-point stack,
       \G followed by a list of the items; TOS is the right-most item.
       ." <" fdepth 0 .r ." > " fdepth 0 max maxdepth-.s @ min dup 0 
       ?DO  dup i - 1- floats fp@ + f@ f.  LOOP  drop ; 

Removed from v.1.12  
changed lines
  Added in v.1.24


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>