--- gforth/prim 2006/10/22 16:54:00 1.198 +++ gforth/prim 2006/10/30 15:29:48 1.201 @@ -809,9 +809,9 @@ n = n1*n2; / ( n1 n2 -- n ) core slash n = n1/n2; -if (CHECK_DIVISION && n2 == 0) +if (CHECK_DIVISION_SW && n2 == 0) throw(BALL_DIVZERO); -if (CHECK_DIVISION && n2 == -1 && n1 == CELL_MIN) +if (CHECK_DIVISION_SW && n2 == -1 && n1 == CELL_MIN) throw(BALL_RESULTRANGE); if (FLOORED_DIV && ((n1^n2) < 0) && (n1%n2 != 0)) n--; @@ -820,9 +820,9 @@ if (FLOORED_DIV && ((n1^n2) < 0) && (n1% mod ( n1 n2 -- n ) core n = n1%n2; -if (CHECK_DIVISION && n2 == 0) +if (CHECK_DIVISION_SW && n2 == 0) throw(BALL_DIVZERO); -if (CHECK_DIVISION && n2 == -1 && n1 == CELL_MIN) +if (CHECK_DIVISION_SW && n2 == -1 && n1 == CELL_MIN) throw(BALL_RESULTRANGE); if(FLOORED_DIV && ((n1^n2) < 0) && n!=0) n += n2; : @@ -831,9 +831,9 @@ if(FLOORED_DIV && ((n1^n2) < 0) && n!=0) /mod ( n1 n2 -- n3 n4 ) core slash_mod n4 = n1/n2; n3 = n1%n2; /* !! is this correct? look into C standard! */ -if (CHECK_DIVISION && n2 == 0) +if (CHECK_DIVISION_SW && n2 == 0) throw(BALL_DIVZERO); -if (CHECK_DIVISION && n2 == -1 && n1 == CELL_MIN) +if (CHECK_DIVISION_SW && n2 == -1 && n1 == CELL_MIN) throw(BALL_RESULTRANGE); if (FLOORED_DIV && ((n1^n2) < 0) && n3!=0) { n4--; @@ -844,7 +844,6 @@ if (FLOORED_DIV && ((n1^n2) < 0) && n3!= */mod ( n1 n2 n3 -- n4 n5 ) core star_slash_mod ""n1*n2=n3*n5+n4, with the intermediate result (n1*n2) being double."" -DCell d5; #ifdef BUGGY_LL_MUL DCell d = mmul(n1,n2); #else @@ -856,16 +855,16 @@ n4=DHI(r); n5=DLO(r); #else /* assumes that the processor uses either floored or symmetric division */ -d5 = d/n3; +DCell d5 = d/n3; n4 = d%n3; -if (CHECK_DIVISION && n3 == 0) +if (CHECK_DIVISION_SW && n3 == 0) throw(BALL_DIVZERO); if (FLOORED_DIV && ((DHI(d)^n3)<0) && n4!=0) { d5--; n4+=n3; } n5 = d5; -if (d5 != n5) +if (CHECK_DIVISION && d5 != n5) throw(BALL_RESULTRANGE); #endif : @@ -873,7 +872,6 @@ if (d5 != n5) */ ( n1 n2 n3 -- n4 ) core star_slash ""n4=(n1*n2)/n3, with the intermediate result being double."" -DCell d4; #ifdef BUGGY_LL_MUL DCell d = mmul(n1,n2); #else @@ -884,13 +882,13 @@ DCell r = fmdiv(d,n3); n4=DLO(r); #else /* assumes that the processor uses either floored or symmetric division */ -d4 = d/n3; -if (CHECK_DIVISION && n3 == 0) +DCell d4 = d/n3; +if (CHECK_DIVISION_SW && n3 == 0) throw(BALL_DIVZERO); if (FLOORED_DIV && ((DHI(d)^n3)<0) && (d%n3)!=0) d4--; n4 = d4; -if (d4 != n4) +if (CHECK_DIVISION && d4 != n4) throw(BALL_RESULTRANGE); #endif : @@ -915,45 +913,29 @@ n2 = n1>>1; fm/mod ( d1 n1 -- n2 n3 ) core f_m_slash_mod ""Floored division: @i{d1} = @i{n3}*@i{n1}+@i{n2}, @i{n1}>@i{n2}>=0 or 0>=@i{n2}>@i{n1}."" -#ifdef BUGGY_LL_DIV #ifdef ASM_SM_SLASH_REM +#ifdef BUGGY_LL_DIV ASM_SM_SLASH_REM(d1.lo, d1.hi, n1, n2, n3); if (((DHI(d1)^n1)<0) && n2!=0) { - if (n3 == CELL_MIN) + if (CHECK_DIVISION && n3 == CELL_MIN) throw(BALL_RESULTRANGE); n3--; n2+=n1; } -#else /* !defined(ASM_SM_SLASH_REM) */ -DCell r = fmdiv(d1,n1); -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) { - if (n3 == CELL_MIN) + if (CHECK_DIVISION && n3 == CELL_MIN) throw(BALL_RESULTRANGE); n3--; n2+=n1; } -#else /* !defined(ASM_SM_SLASH_REM4) */ -/* assumes that the processor uses either floored or symmetric division */ -DCell d3 = d1/n1; -n2 = d1%n1; -if (CHECK_DIVISION && n1 == 0) - throw(BALL_DIVZERO); -/* note that this 1%-3>0 is optimized by the compiler */ -if (1%-3>0 && ((DHI(d1)^n1)<0) && n2!=0) { - d3--; - n2+=n1; -} -n3 = d3; -if (d3 != n3) - throw(BALL_RESULTRANGE); -#endif /* !defined(ASM_SM_SLASH_REM4) */ #endif +#else /* !defined(ASM_SM_SLASH_REM) */ +DCell r = fmdiv(d1,n1); +n2=DHI(r); +n3=DLO(r); +#endif /* !defined(ADM_SM_SLASH_REM) */ : dup >r dup 0< IF negate >r dnegate r> THEN over 0< IF tuck + swap THEN @@ -977,7 +959,7 @@ ASM_SM_SLASH_REM4(d1, n1, n2, n3); /* assumes that the processor uses either floored or symmetric division */ DCell d3 = d1/n1; n2 = d1%n1; -if (CHECK_DIVISION && n1 == 0) +if (CHECK_DIVISION_SW && n1 == 0) throw(BALL_DIVZERO); /* note that this 1%-3<0 is optimized by the compiler */ if (1%-3<0 && ((DHI(d1)^n1)<0) && n2!=0) { @@ -985,7 +967,7 @@ if (1%-3<0 && ((DHI(d1)^n1)<0) && n2!=0) n2-=n1; } n3 = d3; -if (d3 != n3) +if (CHECK_DIVISION && d3 != n3) throw(BALL_RESULTRANGE); #endif /* !defined(ASM_SM_SLASH_REM4) */ #endif @@ -1038,10 +1020,10 @@ ASM_UM_SLASH_MOD4(ud, u1, u2, u3); #else /* !defined(ASM_UM_SLASH_MOD4) */ UDCell ud3 = ud/u1; u2 = ud%u1; -if (CHECK_DIVISION && u1 == 0) +if (CHECK_DIVISION_SW && u1 == 0) throw(BALL_DIVZERO); u3 = ud3; -if (ud3 != u3) +if (CHECK_DIVISION && ud3 != u3) throw(BALL_RESULTRANGE); #endif /* !defined(ASM_UM_SLASH_MOD4) */ #endif