--- gforth/prim 2005/01/28 20:38:42 1.165 +++ gforth/prim 2005/07/27 19:44:20 1.171 @@ -291,7 +291,6 @@ assert(0); #else a_pfa = PFA(a_cfa); nest = (Cell)IP; -IF_spTOS(spTOS = sp[0]); #ifdef DEBUG { CFA_TO_NAME(a_cfa); @@ -805,20 +804,20 @@ n = n1*n2; / ( n1 n2 -- n ) core slash n = n1/n2; -if(FLOORED_DIV && (n1 < 0) != (n2 < 0) && (n1%n2 != 0)) n--; +if(FLOORED_DIV && ((n1^n2) < 0) && (n1%n2 != 0)) n--; : /mod nip ; mod ( n1 n2 -- n ) core n = n1%n2; -if(FLOORED_DIV && (n1 < 0) != (n2 < 0) && n!=0) n += n2; +if(FLOORED_DIV && ((n1^n2) < 0) && n!=0) n += n2; : /mod drop ; /mod ( n1 n2 -- n3 n4 ) core slash_mod n4 = n1/n2; n3 = n1%n2; /* !! is this correct? look into C standard! */ -if (FLOORED_DIV && (n1<0) != (n2<0) && n3!=0) { +if (FLOORED_DIV && ((n1^n2) < 0) && n3!=0) { n4--; n3+=n2; } @@ -840,7 +839,7 @@ n5=DLO(r); /* assumes that the processor uses either floored or symmetric division */ n5 = d/n3; n4 = d%n3; -if (FLOORED_DIV && (d<0) != (n3<0) && n4!=0) { +if (FLOORED_DIV && ((DHI(d)^n3)<0) && n4!=0) { n5--; n4+=n3; } @@ -857,11 +856,11 @@ DCell d = (DCell)n1 * (DCell)n2; #endif #ifdef BUGGY_LL_DIV DCell r = fmdiv(d,n3); -n4=DHI(r); +n4=DLO(r); #else /* assumes that the processor uses either floored or symmetric division */ n4 = d/n3; -if (FLOORED_DIV && (d<0) != (n3<0) && (d%n3)!=0) n4--; +if (FLOORED_DIV && ((DHI(d)^n3)<0) && (d%n3)!=0) n4--; #endif : */mod nip ; @@ -888,7 +887,7 @@ fm/mod ( d1 n1 -- n2 n3 ) core f_m_sla #ifdef BUGGY_LL_DIV #ifdef ASM_SM_SLASH_REM ASM_SM_SLASH_REM(d1.lo, d1.hi, n1, n2, n3); -if ((d1.hi<0) != (n1<0) && n2!=0) { +if (((DHI(d1)^n1)<0) && n2!=0) { n3--; n2+=n1; } @@ -898,14 +897,22 @@ n2=DHI(r); n3=DLO(r); #endif /* !defined(ASM_SM_SLASH_REM) */ #else +#ifdef ASM_SM_SLASH_REM4 +ASM_SM_SLASH_REM4(d1, n1, n2, n3); +if (((DHI(d1)^n1)<0) && n2!=0) { + n3--; + n2+=n1; +} +#else /* !defined(ASM_SM_SLASH_REM4) */ /* assumes that the processor uses either floored or symmetric division */ n3 = d1/n1; n2 = d1%n1; /* note that this 1%-3>0 is optimized by the compiler */ -if (1%-3>0 && (d1<0) != (n1<0) && n2!=0) { +if (1%-3>0 && ((DHI(d1)^n1)<0) && n2!=0) { n3--; n2+=n1; } +#endif /* !defined(ASM_SM_SLASH_REM4) */ #endif : dup >r dup 0< IF negate >r dnegate r> THEN @@ -924,14 +931,18 @@ n2=DHI(r); n3=DLO(r); #endif /* !defined(ASM_SM_SLASH_REM) */ #else +#ifdef ASM_SM_SLASH_REM4 +ASM_SM_SLASH_REM4(d1, n1, n2, n3); +#else /* !defined(ASM_SM_SLASH_REM4) */ /* assumes that the processor uses either floored or symmetric division */ n3 = d1/n1; n2 = d1%n1; /* note that this 1%-3<0 is optimized by the compiler */ -if (1%-3<0 && (d1<0) != (n1<0) && n2!=0) { +if (1%-3<0 && ((DHI(d1)^n1)<0) && n2!=0) { n3++; n2-=n1; } +#endif /* !defined(ASM_SM_SLASH_REM4) */ #endif : over >r dup >r abs -rot @@ -977,8 +988,12 @@ u2=DHI(r); u3=DLO(r); #endif /* !defined(ASM_UM_SLASH_MOD) */ #else +#ifdef ASM_UM_SLASH_MOD4 +ASM_UM_SLASH_MOD4(ud, u1, u2, u3); +#else /* !defined(ASM_UM_SLASH_MOD4) */ u3 = ud/u1; u2 = ud%u1; +#endif /* !defined(ASM_UM_SLASH_MOD4) */ #endif : 0 swap [ 8 cells 1 + ] literal 0 @@ -2134,6 +2149,9 @@ f2=FLAG(isdigit((unsigned)(sig[0]))!=0); siglen=strlen(sig); if (siglen>u) /* happens in glibc-2.1.3 if 999.. is rounded up */ siglen=u; +if (!f2) /* workaround Cygwin trailing 0s for Inf and Nan */ + for (; sig[siglen-1]=='0'; siglen--); + ; memcpy(c_addr,sig,siglen); memset(c_addr+siglen,f2?'0':' ',u-siglen);