--- gforth/float.fs 2004/05/08 17:14:30 1.43 +++ gforth/float.fs 2009/09/25 18:52:29 1.55 @@ -1,12 +1,12 @@ \ High level floating point 14jan94py -\ Copyright (C) 1995,1997,2003 Free Software Foundation, Inc. +\ Copyright (C) 1995,1997,2003,2004,2005,2006,2007 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 @@ -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. @@ -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,35 @@ require debugs.fs 2drop false THEN ; -:noname ( c-addr u -- ) +[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 : fvariable ( "name" -- ) \ float f-variable Create 0.0E0 f, ; @@ -221,3 +232,24 @@ set-current ELSE fnegate f~rel THEN ; + +-0e fp@ c@ $80 = [if] 0 [else] 7 [endif] constant fsign-offset + +: 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- ; +