=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/math.c,v retrieving revision 1.2 retrieving revision 1.7 diff -u -p -r1.2 -r1.7 --- OpenXM_contrib2/asir2000/builtin/math.c 2000/08/21 08:31:20 1.2 +++ OpenXM_contrib2/asir2000/builtin/math.c 2003/12/24 08:00:38 1.7 @@ -23,7 +23,7 @@ * shall be made on your publication or presentation in any form of the * results obtained by use of the SOFTWARE. * (4) In the event that you modify the SOFTWARE, you shall notify FLL by - * e-mail at risa-admin@flab.fujitsu.co.jp of the detailed specification + * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification * for such modification or the source code of the modified part of the * SOFTWARE. * @@ -45,7 +45,7 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/builtin/math.c,v 1.1.1.1 1999/12/03 07:39:07 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/math.c,v 1.6 2003/12/11 00:19:24 noro Exp $ */ #include "ca.h" #include @@ -65,8 +65,11 @@ struct ftab math_tab[] = { {"dasin",Pdasin,1}, {"dacos",Pdacos,1}, {"datan",Pdatan,1}, + {"floor",Pdfloor,1}, {"dfloor",Pdfloor,1}, + {"ceil",Pdceil,1}, {"dceil",Pdceil,1}, + {"rint",Pdrint,1}, {"drint",Pdrint,1}, {0,0,0}, }; @@ -188,13 +191,17 @@ Q *rp; d = floor(ToReal(ARG0(arg))); if ( d < -9.223372036854775808e18 || d >= 9.223372036854775808e18 ) error("dfloor : OverFlow"); + if ( !d ) { + *rp = 0; + return; + } a = (L)d; if ( a < 0 ) { sgn = -1; a = -a; } else sgn = 1; -#if defined(i386) || defined(__alpha) || defined(VISUAL) +#if defined(i386) || defined(__alpha) || defined(VISUAL) || defined(__x86_64) au = ((unsigned int *)&a)[1]; al = ((unsigned int *)&a)[0]; #else @@ -227,13 +234,17 @@ Q *rp; d = ceil(ToReal(ARG0(arg))); if ( d < -9.223372036854775808e18 || d >= 9.223372036854775808e18 ) error("dceil : OverFlow"); + if ( !d ) { + *rp = 0; + return; + } a = (L)d; if ( a < 0 ) { sgn = -1; a = -a; } else sgn = 1; -#if defined(i386) || defined(__alpha) || defined(VISUAL) +#if defined(i386) || defined(__alpha) || defined(VISUAL) || defined(__x86_64) au = ((unsigned int *)&a)[1]; al = ((unsigned int *)&a)[0]; #else @@ -280,7 +291,7 @@ Q *rp; a = -a; } else sgn = 1; -#if defined(i386) || defined(__alpha) || defined(VISUAL) +#if defined(i386) || defined(__alpha) || defined(VISUAL) || defined(__x86_64) au = ((unsigned int *)&a)[1]; al = ((unsigned int *)&a)[0]; #else @@ -290,8 +301,9 @@ Q *rp; if ( au ) { NEWQ(q); SGN(q) = sgn; NM(q)=NALLOC(2); DN(q)=0; PL(NM(q))=2; BD(NM(q))[0]=al; BD(NM(q))[1] = au; - } else { + } else if ( al ) { UTOQ(al,q); SGN(q) = sgn; - } + } else + q = 0; *rp = q; }