--- gforth/float.fs 2007/12/31 17:34:58 1.52 +++ gforth/float.fs 2011/10/06 20:04:35 1.59 @@ -1,12 +1,12 @@ \ High level floating point 14jan94py -\ Copyright (C) 1995,1997,2003,2004,2005,2006,2007 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., 59 Temple Place, Suite 330, Boston, MA 02111, USA. +\ along with this program. If not, see http://www.gnu.org/licenses/. \ 1 cells 4 = [IF] \ ' cells Alias sfloats @@ -142,6 +141,22 @@ DOES> ( -- r ) 2drop false THEN ; +[ifdef] recognizer: + ' noop + :noname postpone Fliteral ; + dup + recognizer: r:fnumber + + :noname ( addr u -- nt int-table true | addr u false ) + 2dup sfnumber dup + IF + drop 2drop r:fnumber true + THEN ; Constant fnum-recognizer + +fnum-recognizer +forth-recognizer get-recognizers +1+ forth-recognizer set-recognizers +[else] [ifundef] compiler-notfound1 defer compiler-notfound1 ' no.extensions IS compiler-notfound1 @@ -171,6 +186,7 @@ IS compiler-notfound1 defers interpreter-notfound1 ENDIF ; IS interpreter-notfound1 +[then] : fvariable ( "name" -- ) \ float f-variable Create 0.0E0 f, ; @@ -234,14 +250,23 @@ set-current fnegate f~rel THEN ; +-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 ) +: ftrunc ( r1 -- r2 ) \ X:ftrunc \ round towards 0 - \ !! should be implemented properly - F>D D>F ; + fdup fabs floor fswap fcopysign ; : FMOD ( r1 r2 -- r ) \ remainder of r1/r2 FOVER FOVER F/ ftrunc F* F- ; +