--- gforth/float.fs 2000/09/23 12:27:46 1.33 +++ gforth/float.fs 2011/10/06 21:08:45 1.60 @@ -1,12 +1,12 @@ \ High level floating point 14jan94py -\ Copyright (C) 1995,1997 Free Software Foundation, Inc. +\ Copyright (C) 1995,1997,2003,2004,2005,2006,2007,2009,2010 Free Software Foundation, Inc. \ This file is part of Gforth. \ Gforth is free software; you can redistribute it and/or \ 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. \ This program is distributed in the hope that it will be useful, @@ -15,8 +15,7 @@ \ 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. +\ along with this program. If not, see http://www.gnu.org/licenses/. \ 1 cells 4 = [IF] \ ' cells Alias sfloats @@ -51,12 +50,14 @@ \G enough space to align it. 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 +}. + 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 +}. - + 1 dfloats , + : f, ( f -- ) \ gforth \G Reserve data space for one floating-point number and store \G @i{f} in the space. @@ -72,12 +73,12 @@ DOES> ( -- r ) \G floating-point stack. fp0 @ fp@ - [ 1 floats ] Literal / ; -: FLit ( -- r ) r> dup f@ float+ >r ; : FLiteral ( compilation r -- ; run-time -- r ) \ float f-literal \G Compile appropriate code such that, at run-time, @i{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 + BEGIN here cell+ cell+ dup faligned <> WHILE postpone noop REPEAT + postpone ahead here >r f, postpone then + r> postpone literal postpone f@ ; immediate &15 Value precision ( -- u ) \ float-ext \G @i{u} is the number of significant digits currently used by @@ -102,7 +103,7 @@ DOES> ( -- r ) : f. ( r -- ) \ float-ext f-dot \G Display (the floating-point number) @i{r} without exponent, \G followed by a space. - f$ dup >r 0< + f$ dup >r 0<= IF '0 emit ELSE scratch r@ min type r@ precision - zeros THEN '. emit r@ negate zeros @@ -127,8 +128,6 @@ DOES> ( -- r ) scratch over c@ emit '. emit 1 /string type 'E emit . ; -require debugs.fs - : sfnumber ( c-addr u -- r true | false ) 2dup [CHAR] e scan ( c-addr u c-addr2 u2 ) dup 0= @@ -142,23 +141,52 @@ require debugs.fs 2drop false THEN ; -:noname ( c-addr u -- ) +[ifdef] recognizer: + ' noop + :noname postpone Fliteral ; + dup + recognizer: r:fnumber + + : fnum-recognizer ( addr u -- nt int-table true | addr u false ) + 2dup sfnumber dup + IF + drop 2drop r:fnumber true + THEN ; + +' 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 interpreter-notfound1 execute ; is interpreter-notfound +[then] + +:noname ( c-addr u -- ... xt ) 2dup sfnumber IF - 2drop POSTPONE FLiteral + 2drop [comp'] FLiteral ELSE - defers compiler-notfound + defers compiler-notfound1 ENDIF ; -IS compiler-notfound +IS compiler-notfound1 -:noname ( c-addr u -- r ) +:noname ( c-addr u -- ... xt ) 2dup sfnumber IF - 2drop + 2drop ['] noop ELSE - defers interpreter-notfound + defers interpreter-notfound1 ENDIF ; -IS interpreter-notfound +IS interpreter-notfound1 +[then] : fvariable ( "name" -- ) \ float f-variable Create 0.0E0 f, ; @@ -180,6 +208,9 @@ IS interpreter-notfound \G Divide 1.0e0 by @i{r1}. 1.0e0 fswap f/ ; +get-current environment-wordlist set-current +1.7976931348623157e308 FConstant max-float +set-current \ We now have primitives for these, so we need not define them @@ -208,7 +239,7 @@ IS interpreter-notfound \G @code{f~abs}; r3=0: bitwise comparison; r3<0: @code{fnegate f~rel}. fdup f0= IF \ bitwise comparison - fp@ float+ 1 floats over float+ -text 0= + fp@ float+ 1 floats over float+ over str= fdrop fdrop fdrop EXIT THEN @@ -219,8 +250,23 @@ IS interpreter-notfound fnegate f~rel THEN ; -: 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 ; +-0e 8 0 [do] fp@ [i] + c@ $80 = [if] [i] constant fsign-offset [then] [loop] + +: fcopysign ( r1 r2 -- r3 ) \ gforth +\G r3 takes its absolute value from r1 and its sign from r2 + \ !! 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 +\ 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- ; +