--- gforth/prim 2006/10/22 20:45:34 1.199 +++ gforth/prim 2006/10/27 21:47:01 1.200 @@ -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--; @@ -857,14 +857,14 @@ n5=DLO(r); /* assumes that the processor uses either floored or symmetric division */ 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 : @@ -883,12 +883,12 @@ n4=DLO(r); #else /* assumes that the processor uses either floored or symmetric division */ DCell d4 = d/n3; -if (CHECK_DIVISION && n3 == 0) +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 : @@ -917,7 +917,7 @@ fm/mod ( d1 n1 -- n2 n3 ) core f_m_sla #ifdef ASM_SM_SLASH_REM 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; @@ -931,7 +931,7 @@ n3=DLO(r); #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; @@ -940,7 +940,7 @@ if (((DHI(d1)^n1)<0) && n2!=0) { /* 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) { @@ -948,7 +948,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 @@ -975,7 +975,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) { @@ -983,7 +983,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 @@ -1036,10 +1036,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