version 1.156, 2004/12/31 13:23:57
|
version 1.160, 2005/01/23 23:16:21
|
Line 324 INST_TAIL;
|
Line 324 INST_TAIL;
|
JUMP(a_target); |
JUMP(a_target); |
#else |
#else |
SET_IP((Xt *)a_target); |
SET_IP((Xt *)a_target); |
INST_TAIL; |
|
NEXT_P2; |
|
#endif |
#endif |
SUPER_CONTINUE; /* we do our own control flow, so don't append NEXT etc. */ |
|
: |
: |
r> @ >r ; |
r> @ >r ; |
|
|
\ condbranch(forthname,stackeffect,restline,code1,code2,forthcode) |
\ condbranch(forthname,stackeffect,restline,code1,code2,forthcode) |
\ this is non-syntactical: code must open a brace that is closed by the macro |
\ this is non-syntactical: code must open a brace that is closed by the macro |
|
\ condbranch(forthname,stackeffect,restline,code1,code2,forthcode) |
|
\ this is non-syntactical: code must open a brace that is closed by the macro |
define(condbranch, |
define(condbranch, |
$1 ( `#'a_target $2 ) $3 |
$1 ( `#'a_target $2 ) $3 |
$4 #ifdef NO_IP |
$4 #ifdef NO_IP |
Line 342 $5 #ifdef NO_IP
|
Line 341 $5 #ifdef NO_IP
|
JUMP(a_target); |
JUMP(a_target); |
#else |
#else |
SET_IP((Xt *)a_target); |
SET_IP((Xt *)a_target); |
|
#endif |
|
} |
|
$6 |
|
|
|
\+glocals |
|
|
|
$1-lp+!`#' ( `#'a_target `#'nlocals $2 ) $3_lp_plus_store_number |
|
$4 #ifdef NO_IP |
|
INST_TAIL; |
|
#endif |
|
$5 lp += nlocals; |
|
#ifdef NO_IP |
|
JUMP(a_target); |
|
#else |
|
SET_IP((Xt *)a_target); |
|
#endif |
|
} |
|
|
|
\+ |
|
) |
|
|
|
\ version that generates two jumps (not good for PR 15242 workaround) |
|
define(condbranch_twojump, |
|
$1 ( `#'a_target $2 ) $3 |
|
$4 #ifdef NO_IP |
|
INST_TAIL; |
|
#endif |
|
$5 #ifdef NO_IP |
|
JUMP(a_target); |
|
#else |
|
SET_IP((Xt *)a_target); |
INST_TAIL; NEXT_P2; |
INST_TAIL; NEXT_P2; |
#endif |
#endif |
} |
} |
Line 820 n2 = n1>>1;
|
Line 850 n2 = n1>>1;
|
|
|
fm/mod ( d1 n1 -- n2 n3 ) core f_m_slash_mod |
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}."" |
""Floored division: @i{d1} = @i{n3}*@i{n1}+@i{n2}, @i{n1}>@i{n2}>=0 or 0>=@i{n2}>@i{n1}."" |
#ifdef BUGGY_LONG_LONG |
#ifdef BUGGY_LL_DIV |
DCell r = fmdiv(d1,n1); |
DCell r = fmdiv(d1,n1); |
n2=r.hi; |
n2=r.hi; |
n3=r.lo; |
n3=r.lo; |
Line 842 if (1%-3>0 && (d1<0) != (n1<0) && n2!=0)
|
Line 872 if (1%-3>0 && (d1<0) != (n1<0) && n2!=0)
|
|
|
sm/rem ( d1 n1 -- n2 n3 ) core s_m_slash_rem |
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."" |
""Symmetric division: @i{d1} = @i{n3}*@i{n1}+@i{n2}, sign(@i{n2})=sign(@i{d1}) or 0."" |
#ifdef BUGGY_LONG_LONG |
#ifdef BUGGY_LL_DIV |
DCell r = smdiv(d1,n1); |
DCell r = smdiv(d1,n1); |
n2=r.hi; |
n2=r.hi; |
n3=r.lo; |
n3=r.lo; |
Line 863 if (1%-3<0 && (d1<0) != (n1<0) && n2!=0)
|
Line 893 if (1%-3<0 && (d1<0) != (n1<0) && n2!=0)
|
r> 0< IF swap negate swap THEN ; |
r> 0< IF swap negate swap THEN ; |
|
|
m* ( n1 n2 -- d ) core m_star |
m* ( n1 n2 -- d ) core m_star |
#ifdef BUGGY_LONG_LONG |
#ifdef BUGGY_LL_MUL |
d = mmul(n1,n2); |
d = mmul(n1,n2); |
#else |
#else |
d = (DCell)n1 * (DCell)n2; |
d = (DCell)n1 * (DCell)n2; |
Line 875 d = (DCell)n1 * (DCell)n2;
|
Line 905 d = (DCell)n1 * (DCell)n2;
|
|
|
um* ( u1 u2 -- ud ) core u_m_star |
um* ( u1 u2 -- ud ) core u_m_star |
/* use u* as alias */ |
/* use u* as alias */ |
#ifdef BUGGY_LONG_LONG |
#ifdef BUGGY_LL_MUL |
ud = ummul(u1,u2); |
ud = ummul(u1,u2); |
#else |
#else |
ud = (UDCell)u1 * (UDCell)u2; |
ud = (UDCell)u1 * (UDCell)u2; |
Line 891 ud = (UDCell)u1 * (UDCell)u2;
|
Line 921 ud = (UDCell)u1 * (UDCell)u2;
|
|
|
um/mod ( ud u1 -- u2 u3 ) core u_m_slash_mod |
um/mod ( ud u1 -- u2 u3 ) core u_m_slash_mod |
""ud=u3*u1+u2, u1>u2>=0"" |
""ud=u3*u1+u2, u1>u2>=0"" |
#ifdef BUGGY_LONG_LONG |
#ifdef BUGGY_LL_DIV |
UDCell r = umdiv(ud,u1); |
UDCell r = umdiv(ud,u1); |
u2=r.hi; |
u2=r.hi; |
u3=r.lo; |
u3=r.lo; |
Line 910 u2 = ud%u1;
|
Line 940 u2 = ud%u1;
|
and >r >r 2dup d+ swap r> + swap r> ; |
and >r >r 2dup d+ swap r> + swap r> ; |
|
|
m+ ( d1 n -- d2 ) double m_plus |
m+ ( d1 n -- d2 ) double m_plus |
#ifdef BUGGY_LONG_LONG |
#ifdef BUGGY_LL_ADD |
d2.lo = d1.lo+n; |
DLO_IS(d2, DLO(d1)+n); |
d2.hi = d1.hi - (n<0) + (d2.lo<d1.lo); |
DHI_IS(d2, DHI(d1) - (n<0) + (DLO(d2)<DLO(d1))); |
#else |
#else |
d2 = d1+n; |
d2 = d1+n; |
#endif |
#endif |
Line 920 d2 = d1+n;
|
Line 950 d2 = d1+n;
|
s>d d+ ; |
s>d d+ ; |
|
|
d+ ( d1 d2 -- d ) double d_plus |
d+ ( d1 d2 -- d ) double d_plus |
#ifdef BUGGY_LONG_LONG |
#ifdef BUGGY_LL_ADD |
d.lo = d1.lo+d2.lo; |
DLO_IS(d, DLO(d1) + DLO(d2)); |
d.hi = d1.hi + d2.hi + (d.lo<d1.lo); |
DHI_IS(d, DHI(d1) + DHI(d2) + (d.lo<DLO(d1))); |
#else |
#else |
d = d1+d2; |
d = d1+d2; |
#endif |
#endif |
Line 930 d = d1+d2;
|
Line 960 d = d1+d2;
|
rot + >r tuck + swap over u> r> swap - ; |
rot + >r tuck + swap over u> r> swap - ; |
|
|
d- ( d1 d2 -- d ) double d_minus |
d- ( d1 d2 -- d ) double d_minus |
#ifdef BUGGY_LONG_LONG |
#ifdef BUGGY_LL_ADD |
d.lo = d1.lo - d2.lo; |
DLO_IS(d, DLO(d1) - DLO(d2)); |
d.hi = d1.hi-d2.hi-(d1.lo<d2.lo); |
DHI_IS(d, DHI(d1)-DHI(d2)-(DLO(d1)<DLO(d2))); |
#else |
#else |
d = d1-d2; |
d = d1-d2; |
#endif |
#endif |
Line 941 d = d1-d2;
|
Line 971 d = d1-d2;
|
|
|
dnegate ( d1 -- d2 ) double d_negate |
dnegate ( d1 -- d2 ) double d_negate |
/* use dminus as alias */ |
/* use dminus as alias */ |
#ifdef BUGGY_LONG_LONG |
#ifdef BUGGY_LL_ADD |
d2 = dnegate(d1); |
d2 = dnegate(d1); |
#else |
#else |
d2 = -d1; |
d2 = -d1; |
Line 951 d2 = -d1;
|
Line 981 d2 = -d1;
|
|
|
d2* ( d1 -- d2 ) double d_two_star |
d2* ( d1 -- d2 ) double d_two_star |
""Shift left by 1; also works on unsigned numbers"" |
""Shift left by 1; also works on unsigned numbers"" |
#ifdef BUGGY_LONG_LONG |
#ifdef BUGGY_LL_SHIFT |
d2.lo = d1.lo<<1; |
DLO_IS(d2, DLO(d1)<<1); |
d2.hi = (d1.hi<<1) | (d1.lo>>(CELL_BITS-1)); |
DHI_IS(d2, (DHI(d1)<<1) | (DLO(d1)>>(CELL_BITS-1))); |
#else |
#else |
d2 = 2*d1; |
d2 = 2*d1; |
#endif |
#endif |
Line 963 d2 = 2*d1;
|
Line 993 d2 = 2*d1;
|
d2/ ( d1 -- d2 ) double d_two_slash |
d2/ ( d1 -- d2 ) double d_two_slash |
""Arithmetic shift right by 1. For signed numbers this is a floored |
""Arithmetic shift right by 1. For signed numbers this is a floored |
division by 2."" |
division by 2."" |
#ifdef BUGGY_LONG_LONG |
#ifdef BUGGY_LL_SHIFT |
d2.hi = d1.hi>>1; |
DHI_IS(d2, DHI(d1)>>1); |
d2.lo= (d1.lo>>1) | (d1.hi<<(CELL_BITS-1)); |
DLO_IS(d2, (DLO(d1)>>1) | (DHI(d1)<<(CELL_BITS-1))); |
#else |
#else |
d2 = d1>>1; |
d2 = d1>>1; |
#endif |
#endif |
Line 1068 comparisons(u, u1 u2, u_, u1, u2, gforth
|
Line 1098 comparisons(u, u1 u2, u_, u1, u2, gforth
|
\ dcomparisons(prefix, args, prefix, arg1, arg2, wordsets...) |
\ dcomparisons(prefix, args, prefix, arg1, arg2, wordsets...) |
define(dcomparisons, |
define(dcomparisons, |
$1= ( $2 -- f ) $6 $3equals |
$1= ( $2 -- f ) $6 $3equals |
#ifdef BUGGY_LONG_LONG |
#ifdef BUGGY_LL_CMP |
f = FLAG($4.lo==$5.lo && $4.hi==$5.hi); |
f = FLAG($4.lo==$5.lo && $4.hi==$5.hi); |
#else |
#else |
f = FLAG($4==$5); |
f = FLAG($4==$5); |
#endif |
#endif |
|
|
$1<> ( $2 -- f ) $7 $3not_equals |
$1<> ( $2 -- f ) $7 $3not_equals |
#ifdef BUGGY_LONG_LONG |
#ifdef BUGGY_LL_CMP |
f = FLAG($4.lo!=$5.lo || $4.hi!=$5.hi); |
f = FLAG($4.lo!=$5.lo || $4.hi!=$5.hi); |
#else |
#else |
f = FLAG($4!=$5); |
f = FLAG($4!=$5); |
#endif |
#endif |
|
|
$1< ( $2 -- f ) $8 $3less_than |
$1< ( $2 -- f ) $8 $3less_than |
#ifdef BUGGY_LONG_LONG |
#ifdef BUGGY_LL_CMP |
f = FLAG($4.hi==$5.hi ? $4.lo<$5.lo : $4.hi<$5.hi); |
f = FLAG($4.hi==$5.hi ? $4.lo<$5.lo : $4.hi<$5.hi); |
#else |
#else |
f = FLAG($4<$5); |
f = FLAG($4<$5); |
#endif |
#endif |
|
|
$1> ( $2 -- f ) $9 $3greater_than |
$1> ( $2 -- f ) $9 $3greater_than |
#ifdef BUGGY_LONG_LONG |
#ifdef BUGGY_LL_CMP |
f = FLAG($4.hi==$5.hi ? $4.lo>$5.lo : $4.hi>$5.hi); |
f = FLAG($4.hi==$5.hi ? $4.lo>$5.lo : $4.hi>$5.hi); |
#else |
#else |
f = FLAG($4>$5); |
f = FLAG($4>$5); |
#endif |
#endif |
|
|
$1<= ( $2 -- f ) gforth $3less_or_equal |
$1<= ( $2 -- f ) gforth $3less_or_equal |
#ifdef BUGGY_LONG_LONG |
#ifdef BUGGY_LL_CMP |
f = FLAG($4.hi==$5.hi ? $4.lo<=$5.lo : $4.hi<=$5.hi); |
f = FLAG($4.hi==$5.hi ? $4.lo<=$5.lo : $4.hi<=$5.hi); |
#else |
#else |
f = FLAG($4<=$5); |
f = FLAG($4<=$5); |
#endif |
#endif |
|
|
$1>= ( $2 -- f ) gforth $3greater_or_equal |
$1>= ( $2 -- f ) gforth $3greater_or_equal |
#ifdef BUGGY_LONG_LONG |
#ifdef BUGGY_LL_CMP |
f = FLAG($4.hi==$5.hi ? $4.lo>=$5.lo : $4.hi>=$5.hi); |
f = FLAG($4.hi==$5.hi ? $4.lo>=$5.lo : $4.hi>=$5.hi); |
#else |
#else |
f = FLAG($4>=$5); |
f = FLAG($4>=$5); |
Line 1848 char * string = cstr(c_addr1, u1, 1);
|
Line 1878 char * string = cstr(c_addr1, u1, 1);
|
char * pattern = cstr(c_addr2, u2, 0); |
char * pattern = cstr(c_addr2, u2, 0); |
flag = FLAG(!fnmatch(pattern, string, 0)); |
flag = FLAG(!fnmatch(pattern, string, 0)); |
|
|
|
set-dir ( c_addr u -- wior ) gforth set_dir |
|
""Change the current directory to @i{c-addr, u}. |
|
Return an error if this is not possible"" |
|
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); |
|
if(c_addr2 != NULL) { |
|
u2 = strlen(c_addr2); |
|
} else { |
|
u2 = 0; |
|
} |
|
|
\+ |
\+ |
|
|
newline ( -- c_addr u ) gforth |
newline ( -- c_addr u ) gforth |
Line 1890 dsystem = timeval2us(&usage.ru_stime);
|
Line 1935 dsystem = timeval2us(&usage.ru_stime);
|
struct timeval time1; |
struct timeval time1; |
gettimeofday(&time1,NULL); |
gettimeofday(&time1,NULL); |
duser = timeval2us(&time1); |
duser = timeval2us(&time1); |
#ifndef BUGGY_LONG_LONG |
dsystem = DZERO; |
dsystem = (DCell)0; |
|
#else |
|
dsystem=(DCell){0,0}; |
|
#endif |
|
#endif |
#endif |
|
|
\+ |
\+ |
Line 1907 comparisons(f, r1 r2, f_, r1, r2, gforth
|
Line 1948 comparisons(f, r1 r2, f_, r1, r2, gforth
|
comparisons(f0, r, f_zero_, r, 0., float, gforth, float, gforth) |
comparisons(f0, r, f_zero_, r, 0., float, gforth, float, gforth) |
|
|
d>f ( d -- r ) float d_to_f |
d>f ( d -- r ) float d_to_f |
#ifdef BUGGY_LONG_LONG |
#ifdef BUGGY_LL_D2F |
extern double ldexp(double x, int exp); |
extern double ldexp(double x, int exp); |
if (d.hi<0) { |
if (DHI(d)<0) { |
|
#ifdef BUGGY_LL_ADD |
DCell d2=dnegate(d); |
DCell d2=dnegate(d); |
r = -(ldexp((Float)d2.hi,CELL_BITS) + (Float)d2.lo); |
#else |
|
DCell d2=-d; |
|
#endif |
|
r = -(ldexp((Float)DHI(d2),CELL_BITS) + (Float)DLO(d2)); |
} else |
} else |
r = ldexp((Float)d.hi,CELL_BITS) + (Float)d.lo; |
r = ldexp((Float)DHI(d),CELL_BITS) + (Float)DLO(d); |
#else |
#else |
r = d; |
r = d; |
#endif |
#endif |
Line 2357 av-double ( r -- ) gforth av_double
|
Line 2402 av-double ( r -- ) gforth av_double
|
av_double(alist, r); |
av_double(alist, r); |
|
|
av-longlong ( d -- ) gforth av_longlong |
av-longlong ( d -- ) gforth av_longlong |
#ifdef BUGGY_LONG_LONG |
#ifdef BUGGY_LL_SIZE |
av_longlong(alist, d.lo); |
av_longlong(alist, DLO(d)); |
#else |
#else |
av_longlong(alist, d); |
av_longlong(alist, d); |
#endif |
#endif |
Line 2380 lp += sizeof(Float);
|
Line 2425 lp += sizeof(Float);
|
av_double(alist, r); |
av_double(alist, r); |
|
|
av-longlong-r ( R:d -- ) gforth av_longlong_r |
av-longlong-r ( R:d -- ) gforth av_longlong_r |
#ifdef BUGGY_LONG_LONG |
#ifdef BUGGY_LL_SIZE |
av_longlong(alist, d.lo); |
av_longlong(alist, DLO(d)); |
#else |
#else |
av_longlong(alist, d); |
av_longlong(alist, d); |
#endif |
#endif |
Line 2417 SAVE_REGS
|
Line 2462 SAVE_REGS
|
av_call(alist); |
av_call(alist); |
REST_REGS |
REST_REGS |
#ifdef BUGGY_LONG_LONG |
#ifdef BUGGY_LONG_LONG |
d.lo = llrv; |
DLO_IS(d, llrv); |
d.hi = 0; |
DHI_IS(d, 0); |
#else |
#else |
d = llrv; |
d = llrv; |
#endif |
#endif |
Line 2455 w = va_arg_int(clist);
|
Line 2500 w = va_arg_int(clist);
|
|
|
va-arg-longlong ( -- d ) gforth va_arg_longlong |
va-arg-longlong ( -- d ) gforth va_arg_longlong |
#ifdef BUGGY_LONG_LONG |
#ifdef BUGGY_LONG_LONG |
d.lo = va_arg_longlong(clist); |
DLO_IS(d, va_arg_longlong(clist)); |
d.hi = 0; |
DHI_IS(d, 0); |
#else |
#else |
d = va_arg_longlong(clist); |
d = va_arg_longlong(clist); |
#endif |
#endif |