--- gforth/prim 2006/05/25 22:10:16 1.194 +++ gforth/prim 2006/10/21 22:13:48 1.197 @@ -809,12 +809,21 @@ n = n1*n2; / ( n1 n2 -- n ) core slash n = n1/n2; -if(FLOORED_DIV && ((n1^n2) < 0) && (n1%n2 != 0)) n--; +if (CHECK_DIVISION && (n2 == 0)) + throw(-10); +if (CHECK_DIVISION && n2 == -1 && n1 == CELL_MIN) + throw(-11); +if (FLOORED_DIV && ((n1^n2) < 0) && (n1%n2 != 0)) + n--; : /mod nip ; mod ( n1 n2 -- n ) core n = n1%n2; +if (CHECK_DIVISION && (n2 == 0)) + throw(-10); +if (CHECK_DIVISION && n2 == -1 && n1 == CELL_MIN) + throw(-11); if(FLOORED_DIV && ((n1^n2) < 0) && n!=0) n += n2; : /mod drop ; @@ -822,6 +831,10 @@ 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)) + throw(-10); +if (CHECK_DIVISION && n2 == -1 && n1 == CELL_MIN) + throw(-11); if (FLOORED_DIV && ((n1^n2) < 0) && n3!=0) { n4--; n3+=n2; @@ -2698,7 +2711,7 @@ w = ffi_prep_closure((ffi_closure *)a_cl ffi-2@ ( a_addr -- d ) gforth ffi_2fetch #ifdef BUGGY_LONG_LONG -DLO_IS(d, (Cell*)(*a_addr)); +DLO_IS(d, *(Cell*)(*a_addr)); DHI_IS(d, 0); #else d = *(DCell*)(a_addr); @@ -2719,16 +2732,16 @@ w = *(long *)(*gforth_clist++); ffi-arg-longlong ( -- d ) gforth ffi_arg_longlong #ifdef BUGGY_LONG_LONG -DLO_IS(d, (Cell*)(*gforth_clist++)); -DHI_IS(d, -((Cell*)(*gforth_clist++)<0)); +DLO_IS(d, *(Cell*)(*gforth_clist++)); +DHI_IS(d, -(*(Cell*)(*gforth_clist++)<0)); #else d = *(DCell*)(*gforth_clist++); #endif ffi-arg-dlong ( -- d ) gforth ffi_arg_dlong #ifdef BUGGY_LONG_LONG -DLO_IS(d, (Cell*)(*gforth_clist++)); -DHI_IS(d, -((Cell*)(*gforth_clist++)<0)); +DLO_IS(d, *(Cell*)(*gforth_clist++)); +DHI_IS(d, -(*(Cell*)(*gforth_clist++)<0)); #else d = *(Cell*)(*gforth_clist++); #endif @@ -2766,11 +2779,7 @@ ffi-ret-dlong ( d -- ) gforth ffi_ret_dl return 0; ffi-ret-long ( n -- ) gforth ffi_ret_long -#ifdef BUGGY_LONG_LONG -*(Cell*)(gforth_ritem) = DLO(n); -#else *(Cell*)(gforth_ritem) = n; -#endif return 0; ffi-ret-ptr ( c_addr -- ) gforth ffi_ret_ptr