Diff for /gforth/float.fs between versions 1.42 and 1.68

version 1.42, 2003/03/09 15:16:49 version 1.68, 2012/12/31 15:25:18
Line 1 Line 1
 \ High level floating point                            14jan94py  \ High level floating point                            14jan94py
   
 \ Copyright (C) 1995,1997,2003 Free Software Foundation, Inc.  \ Copyright (C) 1995,1997,2003,2004,2005,2006,2007,2009,2010,2011,2012 Free Software Foundation, Inc.
   
 \ This file is part of Gforth.  \ This file is part of Gforth.
   
 \ Gforth is free software; you can redistribute it and/or  \ Gforth is free software; you can redistribute it and/or
 \ modify it under the terms of the GNU General Public License  \ modify it under the terms of the GNU General Public License
 \ as published by the Free Software Foundation; either version 2  \ as published by the Free Software Foundation, either version 3
 \ of the License, or (at your option) any later version.  \ of the License, or (at your option) any later version.
   
 \ This program is distributed in the hope that it will be useful,  \ This program is distributed in the hope that it will be useful,
Line 15 Line 15
 \ GNU General Public License for more details.  \ GNU General Public License for more details.
   
 \ You should have received a copy of the GNU General Public License  \ You should have received a copy of the GNU General Public License
 \ along with this program; if not, write to the Free Software  \ along with this program. If not, see http://www.gnu.org/licenses/.
 \ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.  
   
 \ 1 cells 4 = [IF]  \ 1 cells 4 = [IF]
 \ ' cells   Alias sfloats  \ ' cells   Alias sfloats
Line 51 Line 50
     \G enough space to align it.      \G enough space to align it.
     here dup dfaligned swap ?DO  bl c,  LOOP ;      here dup dfaligned swap ?DO  bl c,  LOOP ;
   
 1 sfloats (Field) sfloat+ , ( sf-addr1 -- sf-addr2 ) \ float-ext s-float-plus  (Field) sfloat+ ( sf-addr1 -- sf-addr2 ) \ float-ext s-float-plus
 \G @code{1 sfloats +}.  \G @code{1 sfloats +}.
       1 sfloats ,
   
 1 dfloats (Field) dfloat+ , ( df-addr1 -- df-addr2 ) \ float-ext d-float-plus  (Field) dfloat+ ( df-addr1 -- df-addr2 ) \ float-ext d-float-plus
 \G @code{1 dfloats +}.  \G @code{1 dfloats +}.
       1 dfloats ,
       
 : f, ( f -- ) \ gforth  : f, ( f -- ) \ gforth
     \G Reserve data space for one floating-point number and store      \G Reserve data space for one floating-point number and store
     \G @i{f} in the space.      \G @i{f} in the space.
Line 87  DOES> ( -- r ) Line 88  DOES> ( -- r )
     \G @code{F.} @code{FE.} and @code{FS.} to @i{u}.      \G @code{F.} @code{FE.} and @code{FS.} to @i{u}.
     to precision ;      to precision ;
   
 : scratch ( r -- addr len )  : scratch ( -- addr len )
   pad precision - precision ;    pad precision - precision ;
   
 : zeros ( n -- )   0 max 0 ?DO  '0 emit  LOOP ;  : zeros ( n -- )   0 max 0 ?DO  '0 emit  LOOP ;
Line 127  DOES> ( -- r ) Line 128  DOES> ( -- r )
   scratch over c@ emit '. emit 1 /string type    scratch over c@ emit '. emit 1 /string type
   'E emit . ;    'E emit . ;
   
 require debugs.fs  [IFDEF] fp-char
   : sfnumber ( c-addr u -- r true | false )
       fp-char @ >float1 ;
   
   Create si-prefixes ," PTGMk munpf"
   si-prefixes count bl scan drop Constant zero-exp
   
   : prefix-number ( c-addr u -- r true | false )
       si-prefixes count bounds DO
           2dup I c@ scan nip dup 0<> IF
               1 = IF  1- fp-char @  ELSE  I c@  THEN
               >float1
               dup IF  1000 s>f zero-exp I - s>f f** f*  THEN
               UNLOOP  EXIT  THEN  drop
       LOOP
       sfnumber ;
   [ELSE]
 : sfnumber ( c-addr u -- r true | false )  : sfnumber ( c-addr u -- r true | false )
     2dup [CHAR] e scan ( c-addr u c-addr2 u2 )      >float ;
     dup 0=  : prefix-number  sfnumber ;
     IF  [THEN]
         2drop 2dup [CHAR] E scan ( c-addr u c-addr3 u3 )  
     THEN  [ifdef] recognizer:
     nip      [IFDEF] 2lit,
     IF          : flit, postpone Fliteral ;
         >float          :noname ['] noop ;
     ELSE          :noname ['] flit, ;
         2drop false      [ELSE]
     THEN ;          ' noop
           :noname postpone Fliteral ;
       [THEN]
       dup
       recognizer: r:fnumber
   
       : fnum-recognizer ( addr u -- float int-table | addr u r:fail )
           2dup prefix-number
           IF
               2drop r:fnumber  EXIT
           THEN
           r:fail ;
   
   ' fnum-recognizer
   forth-recognizer get-recognizers
   1+ forth-recognizer set-recognizers
   [else]
   [ifundef] compiler-notfound1
   defer compiler-notfound1
   ' no.extensions IS compiler-notfound1
   
   :noname compiler-notfound1 execute ; is compiler-notfound
   
   defer interpreter-notfound1
   ' no.extensions IS interpreter-notfound1
   
 :noname ( c-addr u -- )  :noname interpreter-notfound1 execute ; is interpreter-notfound
   [then]
   
   :noname ( c-addr u -- ... xt )
     2dup sfnumber      2dup sfnumber
     IF      IF
         2drop POSTPONE FLiteral          2drop [comp'] FLiteral
     ELSE      ELSE
         defers compiler-notfound          defers compiler-notfound1
     ENDIF ;      ENDIF ;
 IS compiler-notfound  IS compiler-notfound1
   
 :noname ( c-addr u -- r )  :noname ( c-addr u -- ... xt )
     2dup sfnumber      2dup sfnumber
     IF      IF
         2drop          2drop ['] noop
     ELSE      ELSE
         defers interpreter-notfound          defers interpreter-notfound1
     ENDIF ;      ENDIF ;
 IS interpreter-notfound  IS interpreter-notfound1
   [then]
   
 : fvariable ( "name" -- ) \ float f-variable  : fvariable ( "name" -- ) \ float f-variable
     Create 0.0E0 f, ;      Create 0.0E0 f, ;
Line 222  set-current Line 266  set-current
         fnegate f~rel          fnegate f~rel
     THEN ;      THEN ;
   
 : f.s ( -- ) \ gforth f-dot-s  -0e 8 0 [do] fp@ [i] + c@ $80 = [if] [i] constant fsign-offset [then] [loop]
     \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.  : fcopysign ( r1 r2 -- r3 ) \ gforth
     ." <" fdepth 0 .r ." > " fdepth 0 max maxdepth-.s @ min dup 0   \G r3 takes its absolute value from r1 and its sign from r2
     ?DO  dup i - 1- floats fp@ + f@ f.  LOOP  drop ;       \ !! implementation relies on IEEE DP format
       fp@ fsign-offset + dup c@ $80 and >r ( r1 r2 addr-r1sign )
       float+ dup c@ $7f and r> or swap c!
       fdrop ;
   
   \ proposals from Krishna Myeni in <cjsp2d$47l$1@ngspool-d02.news.aol.com>
   \ not sure if they are a good idea
   
   : ftrunc ( r1 -- r2 ) \ X:ftrunc
       \ round towards 0
       fdup fabs floor fswap fcopysign ;
   
   : FMOD ( r1 r2 -- r )
       \ remainder of r1/r2
       FOVER FOVER F/ ftrunc F* F- ;
   

Removed from v.1.42  
changed lines
  Added in v.1.68


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