--- gforth/prim 2006/02/04 22:09:11 1.188 +++ gforth/prim 2006/12/31 13:39:13 1.204 @@ -1,6 +1,6 @@ \ Gforth primitives -\ Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005 Free Software Foundation, Inc. +\ Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006 Free Software Foundation, Inc. \ This file is part of Gforth. @@ -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,10 +906,11 @@ 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 -ASM_SM_SLASH_REM(d1.lo, d1.hi, n1, n2, n3); +ASM_SM_SLASH_REM(DLO(d1), DHI(d1), n1, n2, n3); if (((DHI(d1)^n1)<0) && n2!=0) { + if (CHECK_DIVISION && n3 == CELL_MIN) + throw(BALL_RESULTRANGE); n3--; n2+=n1; } @@ -901,24 +919,6 @@ 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) { - 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 : dup >r dup 0< IF negate >r dnegate r> THEN over 0< IF tuck + swap THEN @@ -927,28 +927,13 @@ if (1%-3>0 && ((DHI(d1)^n1)<0) && n2!=0) sm/rem ( d1 n1 -- n2 n3 ) core s_m_slash_rem ""Symmetric division: @i{d1} = @i{n3}*@i{n1}+@i{n2}, sign(@i{n2})=sign(@i{d1}) or 0."" -#ifdef BUGGY_LL_DIV #ifdef ASM_SM_SLASH_REM -ASM_SM_SLASH_REM(d1.lo, d1.hi, n1, n2, n3); +ASM_SM_SLASH_REM(DLO(d1), DHI(d1), n1, n2, n3); #else /* !defined(ASM_SM_SLASH_REM) */ DCell r = smdiv(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); -#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 : over >r dup >r abs -rot dabs rot um/mod @@ -984,22 +969,13 @@ ud = (UDCell)u1 * (UDCell)u2; um/mod ( ud u1 -- u2 u3 ) core u_m_slash_mod ""ud=u3*u1+u2, u1>u2>=0"" -#ifdef BUGGY_LL_DIV #ifdef ASM_UM_SLASH_MOD -ASM_UM_SLASH_MOD(ud.lo, ud.hi, u1, u2, u3); +ASM_UM_SLASH_MOD(DLO(ud), DHI(ud), u1, u2, u3); #else /* !defined(ASM_UM_SLASH_MOD) */ UDCell r = umdiv(ud,u1); 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 ?DO /modstep @@ -1238,7 +1214,7 @@ useraddr ( #u -- a_addr ) new a_addr = (Cell *)(up+u); up! ( a_addr -- ) gforth up_store -gforth_UP=up=(char *)a_addr; +gforth_UP=up=(Address)a_addr; : up ! ; Variable UP @@ -1646,31 +1622,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 @@ -1681,6 +1669,10 @@ with the window size."" urows=rows; ucols=cols; +wcwidth ( u -- n ) gforth +""The number of fixed-width characters per unicode character u"" +n = wcwidth(u); + flush-icache ( c_addr u -- ) gforth flush_icache ""Make sure that the instruction cache of the processor (if there is one) does not contain stale data at @i{c-addr} and @i{u} bytes @@ -1707,8 +1699,8 @@ is the host operating system's expansion environment variable does not exist, @i{c-addr2 u2} specifies a string 0 characters in length."" /* close ' to keep fontify happy */ -c_addr2 = getenv(cstr(c_addr1,u1,1)); -u2 = (c_addr2 == NULL ? 0 : strlen(c_addr2)); +c_addr2 = (Char *)getenv(cstr(c_addr1,u1,1)); +u2 = (c_addr2 == NULL ? 0 : strlen((char *)c_addr2)); open-pipe ( c_addr u wfam -- wfileid wior ) gforth open_pipe wfileid=(Cell)popen(cstr(c_addr,u,1),pfileattr[wfam]); /* ~ expansion of 1st arg? */ @@ -1784,12 +1776,12 @@ else wior = IOR(a_addr2==NULL); /* !! Define a return code */ strerror ( n -- c_addr u ) gforth -c_addr = strerror(n); -u = strlen(c_addr); +c_addr = (Char *)strerror(n); +u = strlen((char *)c_addr); strsignal ( n -- c_addr u ) gforth -c_addr = (Address)strsignal(n); -u = strlen(c_addr); +c_addr = (Char *)strsignal(n); +u = strlen((char *)c_addr); call-c ( ... w -- ... ) gforth call_c ""Call the C function pointed to by @i{w}. The C function has to @@ -1925,7 +1917,7 @@ if(dent == NULL) { u2 = 0; flag = 0; } else { - u2 = strlen(dent->d_name); + u2 = strlen((char *)dent->d_name); if(u2 > u1) { u2 = u1; wior = -512-ENAMETOOLONG; @@ -1950,9 +1942,9 @@ wior = IOR(chdir(tilde_cstr(c_addr, u, 1 get-dir ( c_addr1 u1 -- c_addr2 u2 ) gforth get_dir ""Store the current directory in the buffer specified by @{c-addr1, u1}. If the buffer size is not sufficient, return 0 0"" -c_addr2 = getcwd(c_addr1, u1); +c_addr2 = (Char *)getcwd((char *)c_addr1, u1); if(c_addr2 != NULL) { - u2 = strlen(c_addr2); + u2 = strlen((char *)c_addr2); } else { u2 = 0; } @@ -1970,7 +1962,7 @@ char newline[] = { '\r','\n' #endif }; -c_addr=newline; +c_addr=(Char *)newline; u=sizeof(newline); : "newline count ; @@ -2162,7 +2154,7 @@ sig=ecvt(r, u, &decpt, &flag); n=(r==0. ? 1 : decpt); f1=FLAG(flag!=0); f2=FLAG(isdigit((unsigned)(sig[0]))!=0); -siglen=strlen(sig); +siglen=strlen((char *)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 */ @@ -2583,69 +2575,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; \+ @@ -2669,19 +2661,20 @@ static int ffi_sizes[] = n2 = ffi_sizes[n1]; ffi-prep-cif ( a_atypes n a_rtype a_cif -- w ) gforth ffi_prep_cif -w = ffi_prep_cif(a_cif, FFI_DEFAULT_ABI, n, a_rtype, a_atypes); +w = ffi_prep_cif((ffi_cif *)a_cif, FFI_DEFAULT_ABI, n, + (ffi_type *)a_rtype, (ffi_type **)a_atypes); ffi-call ( a_avalues a_rvalue a_ip a_cif -- ) gforth ffi_call SAVE_REGS -ffi_call(a_cif, a_ip, a_rvalue, a_avalues); +ffi_call((ffi_cif *)a_cif, (void(*)())a_ip, (void *)a_rvalue, (void **)a_avalues); REST_REGS ffi-prep-closure ( a_ip a_cif a_closure -- w ) gforth ffi_prep_closure -w = ffi_prep_closure(a_closure, a_cif, gforth_callback, a_ip); +w = ffi_prep_closure((ffi_closure *)a_closure, (ffi_cif *)a_cif, gforth_callback, (void *)a_ip); 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); @@ -2695,50 +2688,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*)(*clist++); +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 = *(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; \+