--- gforth/prim	2006/03/11 22:22:40	1.190
+++ gforth/prim	2006/10/30 15:50:52	1.202
@@ -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_SW && n2 == 0)
+  throw(BALL_DIVZERO);
+if (CHECK_DIVISION_SW && n2 == -1 && n1 == CELL_MIN)
+  throw(BALL_RESULTRANGE);
+if (FLOORED_DIV && ((n1^n2) < 0) && (n1%n2 != 0))
+  n--;
 :
  /mod nip ;
 
 mod	( n1 n2 -- n )		core
 n = n1%n2;
+if (CHECK_DIVISION_SW && n2 == 0)
+  throw(BALL_DIVZERO);
+if (CHECK_DIVISION_SW && n2 == -1 && n1 == CELL_MIN)
+  throw(BALL_RESULTRANGE);
 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_SW && n2 == 0)
+  throw(BALL_DIVZERO);
+if (CHECK_DIVISION_SW && n2 == -1 && n1 == CELL_MIN)
+  throw(BALL_RESULTRANGE);
 if (FLOORED_DIV && ((n1^n2) < 0) && n3!=0) {
   n4--;
   n3+=n2;
@@ -836,18 +849,18 @@ DCell d = mmul(n1,n2);
 #else
 DCell d = (DCell)n1 * (DCell)n2;
 #endif
-#ifdef BUGGY_LL_DIV
-DCell r = fmdiv(d,n3);
-n4=DHI(r);
-n5=DLO(r);
-#else
-/* assumes that the processor uses either floored or symmetric division */
-n5 = d/n3;
-n4 = d%n3;
-if (FLOORED_DIV && ((DHI(d)^n3)<0) && n4!=0) {
+#ifdef ASM_SM_SLASH_REM
+ASM_SM_SLASH_REM(DLO(d), DHI(d), n3, n4, n5);
+if (((DHI(d)^n3)<0) && n4!=0) {
+  if (CHECK_DIVISION && n5 == CELL_MIN)
+    throw(BALL_RESULTRANGE);
   n5--;
   n4+=n3;
 }
+#else
+DCell r = fmdiv(d,n3);
+n4=DHI(r);
+n5=DLO(r);
 #endif
 :
  >r m* r> fm/mod ;
@@ -859,13 +872,17 @@ DCell d = mmul(n1,n2);
 #else
 DCell d = (DCell)n1 * (DCell)n2;
 #endif
-#ifdef BUGGY_LL_DIV
+#ifdef ASM_SM_SLASH_REM
+Cell remainder;
+ASM_SM_SLASH_REM(DLO(d), DHI(d), n3, remainder, n4);
+if (((DHI(d)^n3)<0) && remainder!=0) {
+  if (CHECK_DIVISION && n4 == CELL_MIN)
+    throw(BALL_RESULTRANGE);
+  n4--;
+}
+#else
 DCell r = fmdiv(d,n3);
 n4=DLO(r);
-#else
-/* assumes that the processor uses either floored or symmetric division */
-n4 = d/n3;
-if (FLOORED_DIV && ((DHI(d)^n3)<0) && (d%n3)!=0) n4--;
 #endif
 :
  */mod nip ;
@@ -889,36 +906,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 (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 (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 */
-n3 = d1/n1;
-n2 = d1%n1;
-/* note that this 1%-3>0 is optimized by the compiler */
-if (1%-3>0 && ((DHI(d1)^n1)<0) && n2!=0) {
-  n3--;
-  n2+=n1;
-}
-#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
@@ -940,13 +950,18 @@ n3=DLO(r);
 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;
+DCell d3 = d1/n1;
 n2 = d1%n1;
+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) {
-  n3++;
+  d3++;
   n2-=n1;
 }
+n3 = d3;
+if (CHECK_DIVISION && d3 != n3)
+  throw(BALL_RESULTRANGE);
 #endif /* !defined(ASM_SM_SLASH_REM4) */
 #endif
 :
@@ -996,8 +1011,13 @@ u3=DLO(r);
 #ifdef ASM_UM_SLASH_MOD4
 ASM_UM_SLASH_MOD4(ud, u1, u2, u3);
 #else /* !defined(ASM_UM_SLASH_MOD4) */
-u3 = ud/u1;
+UDCell ud3 = ud/u1;
 u2 = ud%u1;
+if (CHECK_DIVISION_SW && u1 == 0)
+  throw(BALL_DIVZERO);
+u3 = ud3;
+if (CHECK_DIVISION && ud3 != u3)
+  throw(BALL_RESULTRANGE);
 #endif /* !defined(ASM_UM_SLASH_MOD4) */
 #endif
 :
@@ -1646,31 +1666,43 @@ n=1;
 
 \g hostos
 
-key-file	( wfileid -- n )		gforth	paren_key_file
+key-file	( wfileid -- c )		gforth	paren_key_file
+""Read one character @i{c} from @i{wfileid}.  This word disables
+buffering for @i{wfileid}.  If you want to read characters from a
+terminal in non-canonical (raw) mode, you have to put the terminal in
+non-canonical mode yourself (using the C interface); the exception is
+@code{stdin}: Gforth automatically puts it into non-canonical mode.""
 #ifdef HAS_FILE
 fflush(stdout);
-n = key((FILE*)wfileid);
+c = key((FILE*)wfileid);
 #else
-n = key(stdin);
+c = key(stdin);
 #endif
 
-key?-file	( wfileid -- n )	        gforth	key_q_file
+key?-file	( wfileid -- f )	        gforth	key_q_file
+""@i{f} is true if at least one character can be read from @i{wfileid}
+without blocking.  If you also want to use @code{read-file} or
+@code{read-line} on the file, you have to call @code{key?-file} or
+@code{key-file} first (these two words disable buffering).""
 #ifdef HAS_FILE
 fflush(stdout);
-n = key_query((FILE*)wfileid);
+f = key_query((FILE*)wfileid);
 #else
-n = key_query(stdin);
+f = key_query(stdin);
 #endif
 
 \+os
 
 stdin	( -- wfileid )	gforth
+""The standard input file of the Gforth process.""
 wfileid = (Cell)stdin;
 
 stdout	( -- wfileid )	gforth
+""The standard output file of the Gforth process.""
 wfileid = (Cell)stdout;
 
 stderr	( -- wfileid )	gforth
+""The standard error output file of the Gforth process.""
 wfileid = (Cell)stderr;
 
 form	( -- urows ucols )	gforth
@@ -2587,69 +2619,69 @@ alloc-callback	( a_ip -- c_addr )	gforth
 c_addr = (char *)alloc_callback(gforth_callback, (Xt *)a_ip);
 
 va-start-void	( -- )	gforth	va_start_void
-va_start_void(clist);
+va_start_void(gforth_clist);
 
 va-start-int	( -- )	gforth	va_start_int
-va_start_int(clist);
+va_start_int(gforth_clist);
 
 va-start-longlong	( -- )	gforth	va_start_longlong
-va_start_longlong(clist);
+va_start_longlong(gforth_clist);
 
 va-start-ptr	( -- )	gforth	va_start_ptr
-va_start_ptr(clist, (char *));
+va_start_ptr(gforth_clist, (char *));
 
 va-start-float	( -- )	gforth	va_start_float
-va_start_float(clist);
+va_start_float(gforth_clist);
 
 va-start-double	( -- )	gforth	va_start_double
-va_start_double(clist);
+va_start_double(gforth_clist);
 
 va-arg-int	( -- w )	gforth	va_arg_int
-w = va_arg_int(clist);
+w = va_arg_int(gforth_clist);
 
 va-arg-longlong	( -- d )	gforth	va_arg_longlong
 #ifdef BUGGY_LONG_LONG
-DLO_IS(d, va_arg_longlong(clist));
+DLO_IS(d, va_arg_longlong(gforth_clist));
 DHI_IS(d, 0);
 #else
-d = va_arg_longlong(clist);
+d = va_arg_longlong(gforth_clist);
 #endif
 
 va-arg-ptr	( -- c_addr )	gforth	va_arg_ptr
-c_addr = (char *)va_arg_ptr(clist,char*);
+c_addr = (char *)va_arg_ptr(gforth_clist,char*);
 
 va-arg-float	( -- r )	gforth	va_arg_float
-r = va_arg_float(clist);
+r = va_arg_float(gforth_clist);
 
 va-arg-double	( -- r )	gforth	va_arg_double
-r = va_arg_double(clist);
+r = va_arg_double(gforth_clist);
 
 va-return-void ( -- )	gforth va_return_void
-va_return_void(clist);
+va_return_void(gforth_clist);
 return 0;
 
 va-return-int ( w -- )	gforth va_return_int
-va_return_int(clist, w);
+va_return_int(gforth_clist, w);
 return 0;
 
 va-return-ptr ( c_addr -- )	gforth va_return_ptr
-va_return_ptr(clist, void *, c_addr);
+va_return_ptr(gforth_clist, void *, c_addr);
 return 0;
 
 va-return-longlong ( d -- )	gforth va_return_longlong
 #ifdef BUGGY_LONG_LONG
-va_return_longlong(clist, d.lo);
+va_return_longlong(gforth_clist, d.lo);
 #else
-va_return_longlong(clist, d);
+va_return_longlong(gforth_clist, d);
 #endif
 return 0;
 
 va-return-float ( r -- )	gforth va_return_float
-va_return_float(clist, r);
+va_return_float(gforth_clist, r);
 return 0;
 
 va-return-double ( r -- )	gforth va_return_double
-va_return_double(clist, r);
+va_return_double(gforth_clist, r);
 return 0;
 
 \+
@@ -2686,7 +2718,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);
@@ -2700,50 +2732,73 @@ ffi-2! ( d a_addr -- )	gforth ffi_2store
 #endif
 
 ffi-arg-int ( -- w )	gforth ffi_arg_int
-w = *(int *)(*clist++);
+w = *(int *)(*gforth_clist++);
+
+ffi-arg-long ( -- w )	gforth ffi_arg_long
+w = *(long *)(*gforth_clist++);
 
 ffi-arg-longlong ( -- d )	gforth ffi_arg_longlong
 #ifdef BUGGY_LONG_LONG
-DLO_IS(d, (Cell*)(*clist++));
-DHI_IS(d, 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));
 #else
-d = *(DCell*)(*clist++);
+d = *(Cell*)(*gforth_clist++);
 #endif
 
 ffi-arg-ptr ( -- c_addr )	gforth ffi_arg_ptr
-c_addr = *(Char **)(*clist++);
+c_addr = *(Char **)(*gforth_clist++);
 
 ffi-arg-float ( -- r )	gforth ffi_arg_float
-r = *(float*)(*clist++);
+r = *(float*)(*gforth_clist++);
 
 ffi-arg-double ( -- r )	gforth ffi_arg_double
-r = *(double*)(*clist++);
+r = *(double*)(*gforth_clist++);
 
 ffi-ret-void ( -- )	gforth ffi_ret_void
 return 0;
 
 ffi-ret-int ( w -- )	gforth ffi_ret_int
-*(int*)(ritem) = w;
+*(int*)(gforth_ritem) = w;
 return 0;
 
 ffi-ret-longlong ( d -- )	gforth ffi_ret_longlong
 #ifdef BUGGY_LONG_LONG
-*(Cell*)(ritem) = DLO(d);
+*(Cell*)(gforth_ritem) = DLO(d);
+#else
+*(DCell*)(gforth_ritem) = d;
+#endif
+return 0;
+
+ffi-ret-dlong ( d -- )	gforth ffi_ret_dlong
+#ifdef BUGGY_LONG_LONG
+*(Cell*)(gforth_ritem) = DLO(d);
 #else
-*(DCell*)(ritem) = d;
+*(Cell*)(gforth_ritem) = d;
 #endif
 return 0;
 
+ffi-ret-long ( n -- )	gforth ffi_ret_long
+*(Cell*)(gforth_ritem) = n;
+return 0;
+
 ffi-ret-ptr ( c_addr -- )	gforth ffi_ret_ptr
-*(Char **)(ritem) = c_addr;
+*(Char **)(gforth_ritem) = c_addr;
 return 0;
 
 ffi-ret-float ( r -- )	gforth ffi_ret_float
-*(float*)(ritem) = r;
+*(float*)(gforth_ritem) = r;
 return 0;
 
 ffi-ret-double ( r -- )	gforth ffi_ret_double
-*(double*)(ritem) = r;
+*(double*)(gforth_ritem) = r;
 return 0;
 
 \+