--- gforth/prim 2003/08/15 16:47:43 1.134 +++ gforth/prim 2011/12/02 21:59:09 1.261 @@ -1,12 +1,12 @@ \ Gforth primitives -\ Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc. +\ Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008,2009,2010 Free Software Foundation, Inc. \ This file is part of Gforth. \ Gforth is free software; you can redistribute it and/or \ modify it under the terms of the GNU General Public License -\ as published by the Free Software Foundation; either version 2 +\ as published by the Free Software Foundation, either version 3 \ of the License, or (at your option) any later version. \ This program is distributed in the hope that it will be useful, @@ -15,8 +15,7 @@ \ GNU General Public License for more details. \ You should have received a copy of the GNU General Public License -\ along with this program; if not, write to the Free Software -\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. +\ along with this program. If not, see http://www.gnu.org/licenses/. \ WARNING: This file is processed by m4. Make sure your identifiers @@ -100,6 +99,8 @@ \E s" struct F83Name *" single data-stack type-prefix f83name \E s" struct Longname *" single data-stack type-prefix longname \E +\E data-stack stack-prefix S: +\E fp-stack stack-prefix F: \E return-stack stack-prefix R: \E inst-stream stack-prefix # \E @@ -107,9 +108,9 @@ \E store-optimization on \E ' noop tail-nextp2 ! \ now INST_TAIL just stores, but does not jump \E -\E include-skipped-insts on \ static superinsts include cells for components -\E \ useful for dynamic programming and -\E \ superinsts across entry points +\E `include-skipped-insts' on \ static superinsts include cells for components +\E \ useful for dynamic programming and +\E \ superinsts across entry points \ \ @@ -136,11 +137,123 @@ \ throw execute, cfa and NEXT1 out? \ macroize *ip, ip++, *ip++ (pipelining)? +\ Stack caching setup + +ifdef(`STACK_CACHE_FILE', `include(STACK_CACHE_FILE)', `include(cache0.vmg)') + \ these m4 macros would collide with identifiers undefine(`index') undefine(`shift') undefine(`symbols') +\F 0 [if] + +\ run-time routines for non-primitives. They are defined as +\ primitives, because that simplifies things. + +(docol) ( -- R:a_retaddr ) gforth-internal paren_docol +""run-time routine for colon definitions"" +#ifdef NO_IP +a_retaddr = next_code; +INST_TAIL; +goto **(Label *)PFA(CFA); +#else /* !defined(NO_IP) */ +a_retaddr = (Cell *)IP; +SET_IP((Xt *)PFA(CFA)); +#endif /* !defined(NO_IP) */ + +(docon) ( -- w ) gforth-internal paren_docon +""run-time routine for constants"" +w = *(Cell *)PFA(CFA); +#ifdef NO_IP +INST_TAIL; +goto *next_code; +#endif /* defined(NO_IP) */ + +(dovar) ( -- a_body ) gforth-internal paren_dovar +""run-time routine for variables and CREATEd words"" +a_body = PFA(CFA); +#ifdef NO_IP +INST_TAIL; +goto *next_code; +#endif /* defined(NO_IP) */ + +(douser) ( -- a_user ) gforth-internal paren_douser +""run-time routine for constants"" +a_user = (Cell *)(up+*(Cell *)PFA(CFA)); +#ifdef NO_IP +INST_TAIL; +goto *next_code; +#endif /* defined(NO_IP) */ + +(dodefer) ( -- ) gforth-internal paren_dodefer +""run-time routine for deferred words"" +#ifndef NO_IP +ip=IP; /* undo any ip updating that may have been performed by NEXT_P0 */ +#endif /* !defined(NO_IP) */ +SUPER_END; /* !! probably unnecessary and may lead to measurement errors */ +VM_JUMP(EXEC1(*(Xt *)PFA(CFA))); + +(dofield) ( n1 -- n2 ) gforth-internal paren_field +""run-time routine for fields"" +n2 = n1 + *(Cell *)PFA(CFA); +#ifdef NO_IP +INST_TAIL; +goto *next_code; +#endif /* defined(NO_IP) */ + +(dovalue) ( -- w ) gforth-internal paren_doval +""run-time routine for constants"" +w = *(Cell *)PFA(CFA); +#ifdef NO_IP +INST_TAIL; +goto *next_code; +#endif /* defined(NO_IP) */ + +(dodoes) ( -- a_body R:a_retaddr ) gforth-internal paren_dodoes +""run-time routine for @code{does>}-defined words"" +#ifdef NO_IP +a_retaddr = next_code; +a_body = PFA(CFA); +INST_TAIL; +#ifdef DEBUG +fprintf(stderr, "dodoes to %x, push %x\n", a_retaddr, a_body); +#endif +goto **(Label *)DOES_CODE1(CFA); +#else /* !defined(NO_IP) */ +a_retaddr = (Cell *)IP; +a_body = PFA(CFA); +#ifdef DEBUG +fprintf(stderr, "dodoes to %x, push %x\n", a_retaddr, a_body); +#endif +SET_IP(DOES_CODE1(CFA)); +#endif /* !defined(NO_IP) */ + +(doabicode) ( ... -- ...) gforth-internal paren_doabicode +""run-time routine for @code{ABI-code} definitions"" +abifunc *f = (abifunc *)PFA(CFA); +Float *fp_mem = fp; +sp = (*f)(sp, &fp_mem); +fp = fp_mem; +#ifdef NO_IP +INST_TAIL; +goto *next_code; +#endif /* defined(NO_IP) */ + +(do;abicode) ( ... -- ... ) gforth-internal paren_do_semicolon_abi_code +""run-time routine for @code{;abi-code}-defined words"" +Float *fp_mem = fp; +Address body = (Address)PFA(CFA); +semiabifunc *f = (semiabifunc *)DOES_CODE1(CFA); +sp = (*f)(sp, &fp_mem, body); +fp = fp_mem; +#ifdef NO_IP +INST_TAIL; +goto *next_code; +#endif /* defined(NO_IP) */ + +\F [endif] + \g control noop ( -- ) gforth @@ -150,6 +263,7 @@ noop ( -- ) gforth call ( #a_callee -- R:a_retaddr ) new ""Call callee (a variant of docol with inline argument)."" #ifdef NO_IP +assert(0); INST_TAIL; JUMP(a_callee); #else @@ -166,12 +280,14 @@ SET_IP((Xt *)a_callee); execute ( xt -- ) core ""Perform the semantics represented by the execution token, @i{xt}."" +#ifdef DEBUG +fprintf(stderr, "execute %08x\n", xt); +#endif #ifndef NO_IP ip=IP; #endif -IF_spTOS(spTOS = sp[0]); SUPER_END; -EXEC(xt); +VM_JUMP(EXEC1(xt)); perform ( a_addr -- ) gforth ""@code{@@ execute}."" @@ -179,9 +295,8 @@ perform ( a_addr -- ) gforth #ifndef NO_IP ip=IP; #endif -IF_spTOS(spTOS = sp[0]); SUPER_END; -EXEC(*(Xt *)a_addr); +VM_JUMP(EXEC1(*(Xt *)a_addr)); : @ execute ; @@ -204,7 +319,7 @@ lit-perform ( #a_addr -- ) new lit_perfo ip=IP; #endif SUPER_END; -EXEC(*(Xt *)a_addr); +VM_JUMP(EXEC1(*(Xt *)a_addr)); does-exec ( #a_cfa -- R:nest a_pfa ) new does_exec #ifdef NO_IP @@ -213,7 +328,6 @@ assert(0); #else a_pfa = PFA(a_cfa); nest = (Cell)IP; -IF_spTOS(spTOS = sp[0]); #ifdef DEBUG { CFA_TO_NAME(a_cfa); @@ -259,10 +373,10 @@ $5 #ifdef NO_IP JUMP(a_target); #else SET_IP((Xt *)a_target); -INST_TAIL; NEXT_P2; +ifelse(condbranch_opt,`1',`INST_TAIL; NEXT_P2;',`/* condbranch_opt=0 */') #endif } -SUPER_CONTINUE; +ifelse(condbranch_opt,`1',`SUPER_CONTINUE;',`/* condbranch_opt=0 */') $6 \+glocals @@ -276,10 +390,10 @@ $5 lp += nlocals; JUMP(a_target); #else SET_IP((Xt *)a_target); -INST_TAIL; NEXT_P2; +ifelse(condbranch_opt,`1',`INST_TAIL; NEXT_P2;',`/* condbranch_opt=0 */') #endif } -SUPER_CONTINUE; +ifelse(condbranch_opt,`1',`SUPER_CONTINUE;',`/* condbranch_opt=0 */') \+ ) @@ -297,37 +411,31 @@ condbranch(?branch,f --,f83 question_bra \+xconds -?dup-?branch ( #a_target f -- f ) new question_dupe_question_branch +?dup-?branch ( #a_target f -- S:... ) new question_dupe_question_branch ""The run-time procedure compiled by @code{?DUP-IF}."" if (f==0) { - sp++; - IF_spTOS(spTOS = sp[0]); #ifdef NO_IP INST_TAIL; JUMP(a_target); #else SET_IP((Xt *)a_target); - INST_TAIL; NEXT_P2; #endif +} else { +sp--; +sp[0]=f; } -SUPER_CONTINUE; -?dup-0=-?branch ( #a_target f -- ) new question_dupe_zero_equals_question_branch +?dup-0=-?branch ( #a_target f -- S:... ) new question_dupe_zero_equals_question_branch ""The run-time procedure compiled by @code{?DUP-0=-IF}."" -/* the approach taken here of declaring the word as having the stack -effect ( f -- ) and correcting for it in the branch-taken case costs a -few cycles in that case, but is easy to convert to a CONDBRANCH -invocation */ if (f!=0) { sp--; + sp[0]=f; #ifdef NO_IP JUMP(a_target); #else SET_IP((Xt *)a_target); - NEXT; #endif } -SUPER_CONTINUE; \+ \fhas? skiploopprims 0= [IF] @@ -353,8 +461,9 @@ condbranch((+loop),n R:nlimit R:n1 -- R: /* dependent upon two's complement arithmetic */ Cell olddiff = n1-nlimit; n2=n1+n; -,if ((olddiff^(olddiff+n))>=0 /* the limit is not crossed */ - || (olddiff^n)>=0 /* it is a wrap-around effect */) { +,if (((olddiff^(olddiff+n)) /* the limit is not crossed */ + &(olddiff^n)) /* OR it is a wrap-around effect */ + >=0) { /* & is used to avoid having two branches for gforth-native */ ,: r> swap r> r> 2dup - >r @@ -383,7 +492,7 @@ if (n<0) { newdiff = -newdiff; } n2=n1+n; -,if (diff>=0 || newdiff<0) { +,if (((~diff)|newdiff)<0) { /* use | to avoid two branches for gforth-native */ ,) \+ @@ -407,10 +516,8 @@ if (nstart == nlimit) { JUMP(a_target); #else SET_IP((Xt *)a_target); - INST_TAIL; NEXT_P2; #endif } -SUPER_CONTINUE; : 2dup = IF r> swap rot >r >r @@ -430,10 +537,8 @@ if (nstart >= nlimit) { JUMP(a_target); #else SET_IP((Xt *)a_target); - INST_TAIL; NEXT_P2; #endif } -SUPER_CONTINUE; : swap 2dup r> swap >r swap >r @@ -453,10 +558,8 @@ if (ustart >= ulimit) { JUMP(a_target); #else SET_IP((Xt *)a_target); -INST_TAIL; NEXT_P2; #endif } -SUPER_CONTINUE; : swap 2dup r> swap >r swap >r @@ -476,10 +579,8 @@ if (nstart <= nlimit) { JUMP(a_target); #else SET_IP((Xt *)a_target); -INST_TAIL; NEXT_P2; #endif } -SUPER_CONTINUE; : swap 2dup r> swap >r swap >r @@ -499,10 +600,8 @@ if (ustart <= ulimit) { JUMP(a_target); #else SET_IP((Xt *)a_target); -INST_TAIL; NEXT_P2; #endif } -SUPER_CONTINUE; : swap 2dup r> swap >r swap >r @@ -513,6 +612,24 @@ SUPER_CONTINUE; cell+ THEN >r ; +(try1) ( ... a_oldhandler a_recovery -- R:a_recovery R:a_sp R:f_fp R:c_lp R:a_oldhandler a_newhandler ) gforth paren_try1 +a_sp = sp-1; +f_fp = fp; +c_lp = lp; +a_newhandler = rp-5; + +(throw1) ( ... wball a_handler -- ... wball ) gforth paren_throw1 +rp = a_handler; +lp = (Address)rp[1]; +fp = (Float *)rp[2]; +sp = (Cell *)rp[3]; +#ifndef NO_IP +ip=IP; +#endif +SUPER_END; +VM_JUMP(EXEC1(*(Xt *)rp[4])); + + \+ \ don't make any assumptions where the return stack is!! @@ -529,13 +646,13 @@ i' ( R:w R:w2 -- R:w R:w2 w ) gforth i r> r> r> dup itmp ! >r >r >r itmp @ ; variable itmp -j ( R:n R:d1 -- n R:n R:d1 ) core +j ( R:w R:w1 R:w2 -- w R:w R:w1 R:w2 ) core : \ rp@ cell+ cell+ cell+ @ ; r> r> r> r> dup itmp ! >r >r >r >r itmp @ ; [IFUNDEF] itmp variable itmp [THEN] -k ( R:n R:d1 R:d2 -- n R:n R:d1 R:d2 ) gforth +k ( R:w R:w1 R:w2 R:w3 R:w4 -- w R:w R:w1 R:w2 R:w3 R:w4 ) gforth : \ rp@ [ 5 cells ] Literal + @ ; r> r> r> r> r> r> dup itmp ! >r >r >r >r >r >r itmp @ ; @@ -594,6 +711,10 @@ n = compare(c_addr1, u1, c_addr2, u2); : rot 2dup swap - >r min swap -text dup IF rdrop ELSE drop r> sgn THEN ; +: -text ( c_addr1 u c_addr2 -- n ) + swap bounds + ?DO dup c@ I c@ = WHILE 1+ LOOP drop 0 + ELSE c@ I c@ - unloop THEN sgn ; : sgn ( n -- -1/0/1 ) dup 0= IF EXIT THEN 0< 2* 1+ ; @@ -618,6 +739,15 @@ c2 = toupper(c1); : dup [char] a - [ char z char a - 1 + ] Literal u< bl and - ; +capscompare ( c_addr1 u1 c_addr2 u2 -- n ) gforth +""Compare two strings lexicographically. If they are equal, @i{n} is 0; if +the first string is smaller, @i{n} is -1; if the first string is larger, @i{n} +is 1. Currently this is based on the machine's character +comparison. In the future, this may change to consider the current +locale and its collation order."" +/* close ' to keep fontify happy */ +n = capscompare(c_addr1, u1, c_addr2, u2); + /string ( c_addr1 u1 n -- c_addr2 u2 ) string slash_string ""Adjust the string specified by @i{c-addr1, u1} to remove @i{n} characters from the start of the string."" @@ -638,6 +768,9 @@ n = n1+n2; \ lit+ / lit_plus = lit + lit+ ( n1 #n2 -- n ) new lit_plus +#ifdef DEBUG +fprintf(stderr, "lit+ %08x\n", n2); +#endif n=n1+n2; \ PFE-0.9.14 has it differently, but the next release will have it as follows @@ -699,20 +832,84 @@ n = n1*n2; / ( n1 n2 -- n ) core slash 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) && (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 ; /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; +} : >r s>d r> fm/mod ; +*/mod ( n1 n2 n3 -- n4 n5 ) core star_slash_mod +""n1*n2=n3*n5+n4, with the intermediate result (n1*n2) being double."" +#ifdef BUGGY_LL_MUL +DCell d = mmul(n1,n2); +#else +DCell d = (DCell)n1 * (DCell)n2; +#endif +#ifdef ASM_SM_SLASH_REM +ASM_SM_SLASH_REM(DLO(d), DHI(d), n3, n4, n5); +if (FLOORED_DIV && ((DHI(d)^n3)<0) && n4!=0) { + if (CHECK_DIVISION && n5 == CELL_MIN) + throw(BALL_RESULTRANGE); + n5--; + n4+=n3; +} +#else +DCell r = FLOORED_DIV ? fmdiv(d,n3) : smdiv(d,n3); +n4=DHI(r); +n5=DLO(r); +#endif +: + >r m* r> fm/mod ; + +*/ ( n1 n2 n3 -- n4 ) core star_slash +""n4=(n1*n2)/n3, with the intermediate result being double."" +#ifdef BUGGY_LL_MUL +DCell d = mmul(n1,n2); +#else +DCell d = (DCell)n1 * (DCell)n2; +#endif +#ifdef ASM_SM_SLASH_REM +Cell remainder; +ASM_SM_SLASH_REM(DLO(d), DHI(d), n3, remainder, n4); +if (FLOORED_DIV && ((DHI(d)^n3)<0) && remainder!=0) { + if (CHECK_DIVISION && n4 == CELL_MIN) + throw(BALL_RESULTRANGE); + n4--; +} +#else +DCell r = FLOORED_DIV ? fmdiv(d,n3) : smdiv(d,n3); +n4=DLO(r); +#endif +: + */mod nip ; + 2* ( n1 -- n2 ) core two_star ""Shift left by 1; also works on unsigned numbers"" n2 = 2*n1; @@ -725,27 +922,26 @@ division by 2 (note that @code{/} not ne n2 = n1>>1; : dup MINI and IF 1 ELSE 0 THEN - [ bits/byte cell * 1- ] literal + [ bits/char cell * 1- ] literal 0 DO 2* swap dup 2* >r MINI and IF 1 ELSE 0 THEN or r> swap LOOP nip ; 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_LONG_LONG -DCell r = fmdiv(d1,n1); -n2=r.hi; -n3=r.lo; -#else -/* 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 && (d1<0) != (n1<0) && n2!=0) { +#ifdef ASM_SM_SLASH_REM +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; } -#endif +#else /* !defined(ASM_SM_SLASH_REM) */ +DCell r = fmdiv(d1,n1); +n2=DHI(r); +n3=DLO(r); +#endif /* !defined(ASM_SM_SLASH_REM) */ : dup >r dup 0< IF negate >r dnegate r> THEN over 0< IF tuck + swap THEN @@ -754,20 +950,13 @@ if (1%-3>0 && (d1<0) != (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_LONG_LONG +#ifdef ASM_SM_SLASH_REM +ASM_SM_SLASH_REM(DLO(d1), DHI(d1), n1, n2, n3); +#else /* !defined(ASM_SM_SLASH_REM) */ DCell r = smdiv(d1,n1); -n2=r.hi; -n3=r.lo; -#else -/* 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 && (d1<0) != (n1<0) && n2!=0) { - n3++; - n2-=n1; -} -#endif +n2=DHI(r); +n3=DLO(r); +#endif /* !defined(ASM_SM_SLASH_REM) */ : over >r dup >r abs -rot dabs rot um/mod @@ -775,7 +964,7 @@ if (1%-3<0 && (d1<0) != (n1<0) && n2!=0) r> 0< IF swap negate swap THEN ; m* ( n1 n2 -- d ) core m_star -#ifdef BUGGY_LONG_LONG +#ifdef BUGGY_LL_MUL d = mmul(n1,n2); #else d = (DCell)n1 * (DCell)n2; @@ -787,31 +976,29 @@ d = (DCell)n1 * (DCell)n2; um* ( u1 u2 -- ud ) core u_m_star /* use u* as alias */ -#ifdef BUGGY_LONG_LONG +#ifdef BUGGY_LL_MUL ud = ummul(u1,u2); #else ud = (UDCell)u1 * (UDCell)u2; #endif : - >r >r 0 0 r> r> [ 8 cells ] literal 0 + 0 -rot dup [ 8 cells ] literal - DO - over >r dup >r 0< and d2*+ drop - r> 2* r> swap - LOOP 2drop ; + dup 0< I' and d2*+ drop + LOOP ; : d2*+ ( ud n -- ud+n c ) over MINI and >r >r 2dup d+ swap r> + swap r> ; um/mod ( ud u1 -- u2 u3 ) core u_m_slash_mod ""ud=u3*u1+u2, u1>u2>=0"" -#ifdef BUGGY_LONG_LONG +#ifdef ASM_UM_SLASH_MOD +ASM_UM_SLASH_MOD(DLO(ud), DHI(ud), u1, u2, u3); +#else /* !defined(ASM_UM_SLASH_MOD) */ UDCell r = umdiv(ud,u1); -u2=r.hi; -u3=r.lo; -#else -u3 = ud/u1; -u2 = ud%u1; -#endif +u2=DHI(r); +u3=DLO(r); +#endif /* !defined(ASM_UM_SLASH_MOD) */ : 0 swap [ 8 cells 1 + ] literal 0 ?DO /modstep @@ -823,9 +1010,9 @@ u2 = ud%u1; and >r >r 2dup d+ swap r> + swap r> ; m+ ( d1 n -- d2 ) double m_plus -#ifdef BUGGY_LONG_LONG -d2.lo = d1.lo+n; -d2.hi = d1.hi - (n<0) + (d2.lod d+ ; d+ ( d1 d2 -- d ) double d_plus -#ifdef BUGGY_LONG_LONG -d.lo = d1.lo+d2.lo; -d.hi = d1.hi + d2.hi + (d.lor tuck + swap over u> r> swap - ; d- ( d1 d2 -- d ) double d_minus -#ifdef BUGGY_LONG_LONG -d.lo = d1.lo - d2.lo; -d.hi = d1.hi-d2.hi-(d1.lo>(CELL_BITS-1)); -#else -d2 = 2*d1; -#endif +d2 = DLSHIFT(d1,1); : 2dup d+ ; d2/ ( d1 -- d2 ) double d_two_slash ""Arithmetic shift right by 1. For signed numbers this is a floored division by 2."" -#ifdef BUGGY_LONG_LONG -d2.hi = d1.hi>>1; -d2.lo= (d1.lo>>1) | (d1.hi<<(CELL_BITS-1)); +#ifdef BUGGY_LL_SHIFT +DHI_IS(d2, DHI(d1)>>1); +DLO_IS(d2, (DLO(d1)>>1) | (DHI(d1)<<(CELL_BITS-1))); #else d2 = d1>>1; #endif @@ -904,12 +1086,20 @@ w2 = ~w1; rshift ( u1 n -- u2 ) core r_shift ""Logical shift right by @i{n} bits."" - u2 = u1>>n; +#ifdef BROKEN_SHIFT + u2 = rshift(u1, n); +#else + u2 = u1 >> n; +#endif : 0 ?DO 2/ MAXI and LOOP ; lshift ( u1 n -- u2 ) core l_shift - u2 = u1< ( $2 -- f ) $7 $3not_equals -#ifdef BUGGY_LONG_LONG +#ifdef BUGGY_LL_CMP f = FLAG($4.lo!=$5.lo || $4.hi!=$5.hi); #else f = FLAG($4!=$5); #endif $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); #else f = FLAG($4<$5); #endif $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); #else f = FLAG($4>$5); #endif $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); #else f = FLAG($4<=$5); #endif $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); #else f = FLAG($4>=$5); @@ -1042,17 +1232,16 @@ useraddr ( #u -- a_addr ) new a_addr = (Cell *)(up+u); up! ( a_addr -- ) gforth up_store -UP=up=(char *)a_addr; +gforth_UP=up=(Address)a_addr; : up ! ; Variable UP -sp@ ( -- a_addr ) gforth sp_fetch -a_addr = sp+1; +sp@ ( S:... -- a_addr ) gforth sp_fetch +a_addr = sp; -sp! ( a_addr -- ) gforth sp_store +sp! ( a_addr -- S:... ) gforth sp_store sp = a_addr; -/* works with and without spTOS caching */ rp@ ( -- a_addr ) gforth rp_fetch a_addr = rp; @@ -1062,10 +1251,10 @@ rp = a_addr; \+floating -fp@ ( -- f_addr ) gforth fp_fetch +fp@ ( f:... -- f_addr ) gforth fp_fetch f_addr = fp; -fp! ( f_addr -- ) gforth fp_store +fp! ( f_addr -- f:... ) gforth fp_store fp = f_addr; \+ @@ -1084,19 +1273,19 @@ rdrop ( R:w -- ) gforth : r> r> drop >r ; -2>r ( w1 w2 -- R:w1 R:w2 ) core-ext two_to_r +2>r ( d -- R:d ) core-ext two_to_r : swap r> swap >r swap >r >r ; -2r> ( R:w1 R:w2 -- w1 w2 ) core-ext two_r_from +2r> ( R:d -- d ) core-ext two_r_from : r> r> swap r> swap >r swap ; -2r@ ( R:w1 R:w2 -- R:w1 R:w2 w1 w2 ) core-ext two_r_fetch +2r@ ( R:d -- R:d d ) core-ext two_r_fetch : i' j ; -2rdrop ( R:w1 R:w2 -- ) gforth two_r_drop +2rdrop ( R:d -- ) gforth two_r_drop : r> r> drop r> drop >r ; @@ -1138,21 +1327,18 @@ tuck ( w1 w2 -- w2 w1 w2 ) core-ext : swap over ; -?dup ( w -- w ) core question_dupe +?dup ( w -- S:... w ) core question_dupe ""Actually the stack effect is: @code{( w -- 0 | w w )}. It performs a @code{dup} if w is nonzero."" if (w!=0) { - IF_spTOS(*sp-- = w;) -#ifndef USE_TOS *--sp = w; -#endif } : dup IF dup THEN ; -pick ( u -- w ) core-ext +pick ( S:... u -- S:... w ) core-ext ""Actually the stack effect is @code{ x0 ... xu u -- x0 ... xu x0 }."" -w = sp[u+1]; +w = sp[u]; : 1+ cells sp@ + @ ; @@ -1316,6 +1502,38 @@ c_addr2 = c_addr1+1; \g compiler +\+f83headerstring + +(f83find) ( c_addr u f83name1 -- f83name2 ) new paren_f83find +for (; f83name1 != NULL; f83name1 = (struct F83Name *)(f83name1->next)) + if ((UCell)F83NAME_COUNT(f83name1)==u && + memcasecmp(c_addr, f83name1->name, u)== 0 /* or inline? */) + break; +f83name2=f83name1; +#ifdef DEBUG +fprintf(stderr, "F83find "); +fwrite(c_addr, u, 1, stderr); +fprintf(stderr, " found %08x\n", f83name2); +#endif +: + BEGIN dup WHILE (find-samelen) dup WHILE + >r 2dup r@ cell+ char+ capscomp 0= + IF 2drop r> EXIT THEN + r> @ + REPEAT THEN nip nip ; +: (find-samelen) ( u f83name1 -- u f83name2/0 ) + BEGIN 2dup cell+ c@ $1F and <> WHILE @ dup 0= UNTIL THEN ; +: capscomp ( c_addr1 u c_addr2 -- n ) + swap bounds + ?DO dup c@ I c@ <> + IF dup c@ toupper I c@ toupper = + ELSE true THEN WHILE 1+ LOOP drop 0 + ELSE c@ toupper I c@ toupper - unloop THEN sgn ; +: sgn ( n -- -1/0/1 ) + dup 0= IF EXIT THEN 0< 2* 1+ ; + +\- + (listlfind) ( c_addr u longname1 -- longname2 ) new paren_listlfind longname2=listlfind(c_addr, u, longname1); : @@ -1326,6 +1544,14 @@ longname2=listlfind(c_addr, u, longname1 REPEAT THEN nip nip ; : (findl-samelen) ( u longname1 -- u longname2/0 ) BEGIN 2dup cell+ @ lcount-mask and <> WHILE @ dup 0= UNTIL THEN ; +: capscomp ( c_addr1 u c_addr2 -- n ) + swap bounds + ?DO dup c@ I c@ <> + IF dup c@ toupper I c@ toupper = + ELSE true THEN WHILE 1+ LOOP drop 0 + ELSE c@ toupper I c@ toupper - unloop THEN sgn ; +: sgn ( n -- -1/0/1 ) + dup 0= IF EXIT THEN 0< 2* 1+ ; \+hash @@ -1349,6 +1575,12 @@ longname2 = tablelfind(c_addr, u, a_addr IF 2drop r> rdrop EXIT THEN THEN rdrop r> REPEAT nip nip ; +: -text ( c_addr1 u c_addr2 -- n ) + swap bounds + ?DO dup c@ I c@ = WHILE 1+ LOOP drop 0 + ELSE c@ I c@ - unloop THEN sgn ; +: sgn ( n -- -1/0/1 ) + dup 0= IF EXIT THEN 0< 2* 1+ ; (hashkey1) ( c_addr u ubits -- ukey ) gforth paren_hashkey1 ""ukey is the hash key for the string c_addr u fitting in ubits bits"" @@ -1368,6 +1600,8 @@ Create rot-values \+ +\+ + (parse-white) ( c_addr1 u1 -- c_addr2 u2 ) gforth paren_parse_white struct Cellpair r=parse_white(c_addr1, u1); c_addr2 = (Char *)(r.n1); @@ -1411,41 +1645,66 @@ 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 ) facility 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; +\+os + form ( -- urows ucols ) gforth -""The number of lines and columns in the terminal. These numbers may change -with the window size."" +""The number of lines and columns in the terminal. These numbers may +change with the window size. Note that it depends on the OS whether +this reflects the actual size and changes with the window size +(currently only on Unix-like OSs). On other OSs you just get a +default, and can tell Gforth the terminal size by setting the +environment variables @code{COLUMNS} and @code{LINES} before starting +Gforth."" /* we could block SIGWINCH here to get a consistent size, but I don't think this is necessary or always beneficial */ urows=rows; ucols=cols; +wcwidth ( u -- n ) gforth +""The number of fixed-width characters per unicode character u"" +#ifdef HAVE_WCWIDTH +n = wcwidth(u); +#else +n = 1; +#endif + 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 @@ -1456,23 +1715,15 @@ supported on your machine (take a look a your machine has a separate instruction cache. In such cases, @code{flush-icache} does nothing instead of flushing the instruction cache."" -FLUSH_ICACHE(c_addr,u); +FLUSH_ICACHE((caddr_t)c_addr,u); (bye) ( n -- ) gforth paren_bye SUPER_END; return (Label *)n; (system) ( c_addr u -- wretval wior ) gforth paren_system -#ifndef MSDOS -int old_tp=terminal_prepped; -deprep_terminal(); -#endif -wretval=system(cstr(c_addr,u,1)); /* ~ expansion on first part of string? */ +wretval = gforth_system(c_addr, u); wior = IOR(wretval==-1 || (wretval==127 && errno != 0)); -#ifndef MSDOS -if (old_tp) - prep_terminal(); -#endif getenv ( c_addr1 u1 -- c_addr2 u2 ) gforth ""The string @i{c-addr1 u1} specifies an environment variable. The string @i{c-addr2 u2} @@ -1480,10 +1731,11 @@ 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 +fflush(stdout); wfileid=(Cell)popen(cstr(c_addr,u,1),pfileattr[wfam]); /* ~ expansion of 1st arg? */ wior = IOR(wfileid==0); /* !! the man page says that errno is not set reliably */ @@ -1515,12 +1767,9 @@ nhour =ltime->tm_hour; nmin =ltime->tm_min; nsec =ltime->tm_sec; -ms ( n -- ) facility-ext +ms ( u -- ) facility-ext ""Wait at least @i{n} milli-second."" -struct timeval timeout; -timeout.tv_sec=n/1000; -timeout.tv_usec=1000*(n%1000); -(void)select(0,0,0,0,&timeout); +gforth_ms(u); allocate ( u -- a_addr wior ) memory ""Allocate @i{u} address units of contiguous data space. The initial @@ -1555,28 +1804,37 @@ if (a_addr1==NULL) else a_addr2 = (Cell *)realloc(a_addr1, u); wior = IOR(a_addr2==NULL); /* !! Define a return code */ +if (a_addr2==NULL) + a_addr2 = a_addr1; 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-c ( ... w -- ... ) gforth call_c ""Call the C function pointed to by @i{w}. The C function has to access the stack itself. The stack pointers are exported in the global -variables @code{SP} and @code{FP}."" +variables @code{gforth_SP} and @code{gforth_FP}."" /* This is a first attempt at support for calls to C. This may change in the future */ IF_fpTOS(fp[0]=fpTOS); -FP=fp; -SP=sp; +gforth_FP=fp; +gforth_SP=sp; +gforth_RP=rp; +gforth_LP=lp; +#ifdef HAS_LINKBACK ((void (*)())w)(); -sp=SP; -fp=FP; -IF_spTOS(spTOS=sp[0]); +#else +((void (*)(void *))w)(gforth_pointers); +#endif +sp=gforth_SP; +fp=gforth_FP; +rp=gforth_RP; +lp=gforth_LP; IF_fpTOS(fpTOS=fp[0]); \+ @@ -1586,19 +1844,10 @@ close-file ( wfileid -- wior ) file clo wior = IOR(fclose((FILE *)wfileid)==EOF); open-file ( c_addr u wfam -- wfileid wior ) file open_file -wfileid = (Cell)fopen(tilde_cstr(c_addr, u, 1), fileattr[wfam]); -wior = IOR(wfileid == 0); +wfileid = opencreate_file(tilde_cstr(c_addr,u,1), wfam, 0, &wior); create-file ( c_addr u wfam -- wfileid wior ) file create_file -Cell fd; -fd = open(tilde_cstr(c_addr, u, 1), O_CREAT|O_TRUNC|ufileattr[wfam], 0666); -if (fd != -1) { - wfileid = (Cell)fdopen(fd, fileattr[wfam]); - wior = IOR(wfileid == 0); -} else { - wfileid = 0; - wior = IOR(1); -} +wfileid = opencreate_file(tilde_cstr(c_addr,u,1), wfam, O_CREAT|O_TRUNC, &wior); delete-file ( c_addr u -- wior ) file delete_file wior = IOR(unlink(tilde_cstr(c_addr, u, 1))==-1); @@ -1626,13 +1875,15 @@ wior = IOR(ftruncate(fileno((FILE *)wfil read-file ( c_addr u1 wfileid -- u2 wior ) file read_file /* !! fread does not guarantee enough */ u2 = fread(c_addr, sizeof(Char), u1, (FILE *)wfileid); +if (u2>0) + gf_regetc((FILE *)wfileid); wior = FILEIO(u2d_name); + u2 = strlen((char *)dent->d_name); if(u2 > u1) { u2 = u1; wior = -512-ENAMETOOLONG; @@ -1718,6 +1969,25 @@ char * string = cstr(c_addr1, u1, 1); char * pattern = cstr(c_addr2, u2, 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 @i{c-addr1, u1}. +If the buffer size is not sufficient, return 0 0"" +c_addr2 = (Char *)getcwd((char *)c_addr1, u1); +if(c_addr2 != NULL) { + u2 = strlen((char *)c_addr2); +} else { + u2 = 0; +} + +=mkdir ( c_addr u wmode -- wior ) gforth equals_mkdir +""Create directory @i{c-addr u} with mode @i{wmode}."" +wior = IOR(mkdir(tilde_cstr(c_addr,u,1),wmode)); + \+ newline ( -- c_addr u ) gforth @@ -1731,7 +2001,7 @@ char newline[] = { '\r','\n' #endif }; -c_addr=newline; +c_addr=(Char *)newline; u=sizeof(newline); : "newline count ; @@ -1760,11 +2030,19 @@ dsystem = timeval2us(&usage.ru_stime); struct timeval time1; gettimeofday(&time1,NULL); duser = timeval2us(&time1); -#ifndef BUGGY_LONG_LONG -dsystem = (DCell)0; -#else -dsystem=(DCell){0,0}; +dsystem = DZERO; #endif + +ntime ( -- dtime ) gforth +""Report the current time in nanoseconds since some epoch."" +#ifdef HAVE_CLOCK_GETTIME +struct timespec time1; +clock_gettime(CLOCK_REALTIME,&time1); +dtime = timespec2ns(&time1); +#else +struct timeval time1; +gettimeofday(&time1,NULL); +dtime = timeval2us(&time1) * 1000LL; #endif \+ @@ -1776,14 +2054,21 @@ dsystem=(DCell){0,0}; comparisons(f, r1 r2, f_, r1, r2, gforth, gforth, float, gforth) comparisons(f0, r, f_zero_, r, 0., float, gforth, float, gforth) +s>f ( n -- r ) float s_to_f +r = n; + d>f ( d -- r ) float d_to_f -#ifdef BUGGY_LONG_LONG +#ifdef BUGGY_LL_D2F extern double ldexp(double x, int exp); -if (d.hi<0) { +if (DHI(d)<0) { +#ifdef BUGGY_LL_ADD 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 - r = ldexp((Float)d.hi,CELL_BITS) + (Float)d.lo; + r = ldexp((Float)DHI(d),CELL_BITS) + (Float)DLO(d); #else r = d; #endif @@ -1792,6 +2077,9 @@ f>d ( r -- d ) float f_to_d extern DCell double2ll(Float r); d = double2ll(r); +f>s ( r -- n ) float f_to_s +n = (Cell)r; + f! ( r f_addr -- ) float f_store ""Store @i{r} into the float at address @i{f-addr}."" *f_addr = r; @@ -1850,6 +2138,18 @@ f** ( r1 r2 -- r3 ) float-ext f_star_sta ""@i{r3} is @i{r1} raised to the @i{r2}th power."" r3 = pow(r1,r2); +fm* ( r1 n -- r2 ) gforth fm_star +r2 = r1*n; + +fm/ ( r1 n -- r2 ) gforth fm_slash +r2 = r1/n; + +fm*/ ( r1 n1 n2 -- r2 ) gforth fm_star_slash +r2 = (r1*n1)/n2; + +f**2 ( r1 -- r2 ) gforth fm_square +r2 = r1*r1; + fnegate ( r1 -- r2 ) float f_negate r2 = - r1; @@ -1880,7 +2180,7 @@ floor ( r1 -- r2 ) float /* !! unclear wording */ r2 = floor(r1); -fround ( r1 -- r2 ) gforth f_round +fround ( r1 -- r2 ) float f_round ""Round to the nearest integral value."" r2 = rint(r1); @@ -1903,15 +2203,19 @@ int flag; int decpt; sig=ecvt(r, u, &decpt, &flag); n=(r==0. ? 1 : decpt); +flag=signbit(r); /* not all ecvt()s do this as desired */ 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 */ + for (; sig[siglen-1]=='0'; siglen--); + ; memcpy(c_addr,sig,siglen); memset(c_addr+siglen,f2?'0':' ',u-siglen); ->float ( c_addr u -- flag ) float to_float +>float ( c_addr u -- f:... flag ) float to_float ""Actual stack effect: ( c_addr u -- r t | f ). Attempt to convert the character string @i{c-addr u} to internal floating-point representation. If the string represents a valid floating-point number @@ -1921,9 +2225,8 @@ case and represents the floating-point n Float r; flag = to_float(c_addr, u, &r); if (flag) { - IF_fpTOS(fp[0] = fpTOS); - fp += -1; - fpTOS = r; + fp--; + fp[0]=r; } fabs ( r1 -- r2 ) float-ext f_abs @@ -2149,9 +2452,9 @@ f>l ( r -- ) gforth f_to_l lp -= sizeof(Float); *(Float *)lp = r; -fpick ( u -- r ) gforth +fpick ( f:... u -- f:... r ) gforth ""Actually the stack effect is @code{ r0 ... ru u -- r0 ... ru r0 }."" -r = fp[u+1]; /* +1, because update of fp happens before this fragment */ +r = fp[u]; : floats fp@ + f@ ; @@ -2163,22 +2466,12 @@ r = fp[u+1]; /* +1, because update of fp \g syslib open-lib ( c_addr1 u1 -- u2 ) gforth open_lib -#if defined(HAVE_LIBDL) || defined(HAVE_DLOPEN) -#ifndef RTLD_GLOBAL -#define RTLD_GLOBAL 0 -#endif -u2=(UCell) dlopen(cstr(c_addr1, u1, 1), RTLD_GLOBAL | RTLD_LAZY); -#else -# ifdef _WIN32 -u2 = (Cell) GetModuleHandle(cstr(c_addr1, u1, 1)); -# else -#warning Define open-lib! -u2 = 0; -# endif -#endif +u2 = gforth_dlopen(c_addr1, u1); lib-sym ( c_addr1 u1 u2 -- u3 ) gforth lib_sym -#if defined(HAVE_LIBDL) || defined(HAVE_DLOPEN) +#ifdef HAVE_LIBLTDL +u3 = (UCell) lt_dlsym((lt_dlhandle)u2, cstr(c_addr1, u1, 1)); +#elif defined(HAVE_LIBDL) || defined(HAVE_DLOPEN) u3 = (UCell) dlsym((void*)u2,cstr(c_addr1, u1, 1)); #else # ifdef _WIN32 @@ -2189,178 +2482,161 @@ u3 = 0; # endif #endif -\+FFCALL - -av-start-void ( c_addr -- ) gforth av_start_void -av_start_void(alist, c_addr); - -av-start-int ( c_addr -- ) gforth av_start_int -av_start_int(alist, c_addr, &irv); - -av-start-float ( c_addr -- ) gforth av_start_float -av_start_float(alist, c_addr, &frv); - -av-start-double ( c_addr -- ) gforth av_start_double -av_start_double(alist, c_addr, &drv); - -av-start-longlong ( c_addr -- ) gforth av_start_longlong -av_start_longlong(alist, c_addr, &llrv); - -av-start-ptr ( c_addr -- ) gforth av_start_ptr -av_start_ptr(alist, c_addr, void*, &prv); - -av-int ( w -- ) gforth av_int -av_int(alist, w); - -av-float ( r -- ) gforth av_float -av_float(alist, r); - -av-double ( r -- ) gforth av_double -av_double(alist, r); - -av-longlong ( d -- ) gforth av_longlong -av_longlong(alist, d); - -av-ptr ( c_addr -- ) gforth av_ptr -av_ptr(alist, void*, c_addr); - -av-call-void ( -- ) gforth av_call_void -SAVE_REGS -av_call(alist); -REST_REGS - -av-call-int ( -- w ) gforth av_call_int -SAVE_REGS -av_call(alist); -REST_REGS -w = irv; - -av-call-float ( -- r ) gforth av_call_float -SAVE_REGS -av_call(alist); -REST_REGS -r = frv; - -av-call-double ( -- r ) gforth av_call_double -SAVE_REGS -av_call(alist); -REST_REGS -r = drv; - -av-call-longlong ( -- d ) gforth av_call_longlong -SAVE_REGS -av_call(alist); -REST_REGS -d = llrv; - -av-call-ptr ( -- c_addr ) gforth av_call_ptr -SAVE_REGS -av_call(alist); -REST_REGS -c_addr = prv; - -alloc-callback ( xt -- c_addr ) gforth alloc_callback -c_addr = (char *)alloc_callback(engine_callback, ((Xt *)xt)+2); - -va-start-int ( -- w ) gforth va_start_int -w = va_start_int(clist); - -va-start-longlong ( -- d ) gforth va_start_longlong -d = va_start_longlong(clist); - -va-start-ptr ( -- c_addr ) gforth va_start_ptr -c_addr = (char *)va_start_ptr(clist, (char *)); - -va-start-float ( -- r ) gforth va_start_float -r = va_start_float(clist); - -va-start-double ( -- r ) gforth va_start_double -r = va_start_double(clist); - -va-return-void ( -- ) gforth va_return_void -va_return_void(clist); -return 0; - -va-return-int ( w -- ) gforth va_return_int -va_return_int(clist, w); -return 0; - -va-return-ptr ( c_addr -- ) gforth va_return_ptr -va_return_ptr(clist, void *, c_addr); -return 0; - -va-return-longlong ( d -- ) gforth va_return_longlong -va_return_longlong(clist, d); -return 0; - -va-return-float ( r -- ) gforth va_return_float -va_return_float(clist, r); -return 0; - -va-return-double ( r -- ) gforth va_return_double -va_return_double(clist, r); -return 0; - -\- +wcall ( ... u -- ... ) gforth +gforth_FP=fp; +sp=(Cell*)(SYSCALL(Cell*(*)(Cell *, void *))u)(sp, &gforth_FP); +fp=gforth_FP; + +uw@ ( c_addr -- u ) gforth u_w_fetch +""@i{u} is the zero-extended 16-bit value stored at @i{c_addr}."" +u = *(UWyde*)(c_addr); + +sw@ ( c_addr -- n ) gforth s_w_fetch +""@i{n} is the sign-extended 16-bit value stored at @i{c_addr}."" +n = *(Wyde*)(c_addr); + +w! ( w c_addr -- ) gforth w_store +""Store the bottom 16 bits of @i{w} at @i{c_addr}."" +*(Wyde*)(c_addr) = w; + +ul@ ( c_addr -- u ) gforth u_l_fetch +""@i{u} is the zero-extended 32-bit value stored at @i{c_addr}."" +u = *(UTetrabyte*)(c_addr); + +sl@ ( c_addr -- n ) gforth s_l_fetch +""@i{n} is the sign-extended 32-bit value stored at @i{c_addr}."" +n = *(Tetrabyte*)(c_addr); + +l! ( w c_addr -- ) gforth l_store +""Store the bottom 32 bits of @i{w} at @i{c_addr}."" +*(Tetrabyte*)(c_addr) = w; + +lib-error ( -- c_addr u ) gforth lib_error +""Error message for last failed @code{open-lib} or @code{lib-sym}."" +#ifdef HAVE_LIBLTDL +c_addr = (Char *)lt_dlerror(); +u = (c_addr == NULL) ? 0 : strlen((char *)c_addr); +#elif defined(HAVE_LIBDL) || defined(HAVE_DLOPEN) +c_addr = dlerror(); +u = strlen(c_addr); +#else +c_addr = "libltdl is not configured"; +u = strlen(c_addr); +#endif -define(`uploop', - `pushdef(`$1', `$2')_uploop(`$1', `$2', `$3', `$4', `$5')`'popdef(`$1')') -define(`_uploop', - `ifelse($1, `$3', `$5', - `$4`'define(`$1', incr($1))_uploop(`$1', `$2', `$3', `$4', `$5')')') -\ argflist(argnum): Forth argument list -define(argflist, - `ifelse($1, 0, `', - `uploop(`_i', 1, $1, `format(`u%d ', _i)', `format(`u%d ', _i)')')') -\ argdlist(argnum): declare C's arguments -define(argdlist, - `ifelse($1, 0, `', - `uploop(`_i', 1, $1, `Cell, ', `Cell')')') -\ argclist(argnum): pass C's arguments -define(argclist, - `ifelse($1, 0, `', - `uploop(`_i', 1, $1, `format(`u%d, ', _i)', `format(`u%d', _i)')')') -\ icall(argnum) -define(icall, -`icall$1 ( argflist($1)u -- uret ) gforth -uret = (SYSCALL(Cell(*)(argdlist($1)))u)(argclist($1)); - -') -define(fcall, -`fcall$1 ( argflist($1)u -- rret ) gforth -rret = (SYSCALL(Float(*)(argdlist($1)))u)(argclist($1)); - -') - -\ close ' to keep fontify happy - -uploop(i, 0, 7, `icall(i)') -icall(20) -uploop(i, 0, 7, `fcall(i)') -fcall(20) +be-w! ( w c_addr -- ) gforth w_store_be +""Store the bottom 16 bits of @i{w} at @i{c_addr} in big endian format."" +c_addr[0] = w >> 8; +c_addr[1] = w; + +be-l! ( w c_addr -- ) gforth l_store_be +""Store the bottom 32 bits of @i{w} at @i{c_addr} in big endian format."" +c_addr[0] = w >> 24; +c_addr[1] = w >> 16; +c_addr[2] = w >> 8; +c_addr[3] = w; + +le-w! ( w c_addr -- ) gforth w_store_le +""Store the bottom 16 bits of @i{w} at @i{c_addr} in big endian format."" +c_addr[1] = w >> 8; +c_addr[0] = w; + +le-l! ( w c_addr -- ) gforth l_store_le +""Store the bottom 32 bits of @i{w} at @i{c_addr} in big endian format."" +c_addr[3] = w >> 24; +c_addr[2] = w >> 16; +c_addr[1] = w >> 8; +c_addr[0] = w; + +be-uw@ ( c_addr -- u ) gforth w_fetch_be +""@i{u} is the zero-extended 16-bit big endian value stored at @i{c_addr}."" +u = (c_addr[0] << 8) | (c_addr[1]); + +be-ul@ ( c_addr -- u ) gforth l_fetch_be +""@i{u} is the zero-extended 32-bit big endian value stored at @i{c_addr}."" +u = (c_addr[0] << 24) | (c_addr[1] << 16) | (c_addr[2] << 8) | (c_addr[3]); + +le-uw@ ( c_addr -- u ) gforth w_fetch_le +""@i{u} is the zero-extended 16-bit little endian value stored at @i{c_addr}."" +u = (c_addr[1] << 8) | (c_addr[0]); + +le-ul@ ( c_addr -- u ) gforth l_fetch_le +""@i{u} is the zero-extended 32-bit little endian value stored at @i{c_addr}."" +u = (c_addr[3] << 24) | (c_addr[2] << 16) | (c_addr[1] << 8) | (c_addr[0]); + +\+64bit + +x! ( w c_addr -- ) gforth x_store +""Store the bottom 64 bits of @i{w} at 64-bit-aligned @i{c_addr}."" +*(UOctabyte *)c_addr = w; + +ux@ ( c_addr -- u ) gforth u_x_fetch +""@i{u} is the zero-extended 64-bit value stored at 64-bit-aligned @i{c_addr}."" +u = *(UOctabyte *)c_addr; + +sx@ ( c_addr -- n ) gforth s_x_fetch +""@i{u} is the sign-extended 64-bit value stored at 64-bit-aligned @i{c_addr}."" +n = *(Octabyte *)c_addr; + +be-x! ( w c_addr -- ) gforth b_e_x_store +""Store the bottom 64 bits of @i{w} at @i{c_addr} in big endian format."" +c_addr[0] = w >> 56; +c_addr[1] = w >> 48; +c_addr[2] = w >> 40; +c_addr[3] = w >> 32; +c_addr[4] = w >> 24; +c_addr[5] = w >> 16; +c_addr[6] = w >> 8; +c_addr[7] = w; + +le-x! ( w c_addr -- ) gforth l_e_x_store +""Store the bottom 64 bits of @i{w} at @i{c_addr} in big endian format."" +c_addr[7] = w >> 56; +c_addr[6] = w >> 48; +c_addr[5] = w >> 40; +c_addr[4] = w >> 32; +c_addr[3] = w >> 24; +c_addr[2] = w >> 16; +c_addr[1] = w >> 8; +c_addr[0] = w; + +be-ux@ ( c_addr -- u ) gforth b_e_u_x_fetch +""@i{u} is the zero-extended 64-bit big endian value stored at @i{c_addr}."" +u = (((Cell)(c_addr[0]) << 56) | + ((Cell)(c_addr[1]) << 48) | + ((Cell)(c_addr[2]) << 40) | + ((Cell)(c_addr[3]) << 32) | + ((Cell)(c_addr[4]) << 24) | + ((Cell)(c_addr[5]) << 16) | + ((Cell)(c_addr[6]) << 8) | + ((Cell)(c_addr[7]))); + +le-ux@ ( c_addr -- u ) gforth l_e_u_x_fetch +""@i{u} is the zero-extended 64-bit little endian value stored at @i{c_addr}."" +u = (((Cell)(c_addr[7]) << 56) | + ((Cell)(c_addr[6]) << 48) | + ((Cell)(c_addr[5]) << 40) | + ((Cell)(c_addr[4]) << 32) | + ((Cell)(c_addr[3]) << 24) | + ((Cell)(c_addr[2]) << 16) | + ((Cell)(c_addr[1]) << 8) | + ((Cell)(c_addr[0]))); \+ \+ - -wcall ( u -- ) gforth -IF_fpTOS(fp[0]=fpTOS); -FP=fp; -sp=(Cell*)(SYSCALL(Cell*(*)(Cell *, void *))u)(sp, &FP); -fp=FP; -IF_spTOS(spTOS=sp[0];) -IF_fpTOS(fpTOS=fp[0]); +\g peephole \+peephole -\g peephole - compile-prim1 ( a_prim -- ) gforth compile_prim1 ""compile prim (incl. immargs) at @var{a_prim}"" compile_prim1(a_prim); -finish-code ( -- ) gforth finish_code +finish-code ( ... -- ... ) gforth finish_code ""Perform delayed steps in code generation (branch resolution, I-cache flushing)."" +/* The ... above are a workaround for a bug in gcc-2.95, which fails + to save spTOS (gforth-fast --enable-force-reg) */ finish_code(); forget-dyncode ( c_code -- f ) gforth-internal forget_dyncode @@ -2394,12 +2670,39 @@ a_addr = groups; \+ -\g static_super +\g primitive_centric -\C #if !defined(GFORTH_DEBUGGING) && !defined(INDIRECT_THREADED) && !defined(DOUBLY_INDIRECT) && !defined(VM_PROFILING) +\ primitives for primitive-centric code +\ another one is does-exec -include(peeprules.vmg) +abi-call ( #a_callee ... -- ... ) gforth-internal abi_call +/* primitive for compiled ABI-CODE words */ +abifunc *f = (abifunc *)a_callee; +Float *fp_mem = fp; +sp = (*f)(sp, &fp_mem); +fp = fp_mem; + +;abi-code-exec ( #a_cfa ... -- ... ) gforth-internal semi_abi_code_exec +/* primitive for performing ;ABI-CODE words */ +Float *fp_mem = fp; +semiabifunc *f = (semiabifunc *)DOES_CODE1(a_cfa); +Address body = (Address)PFA(a_cfa); +sp = (*f)(sp, &fp_mem, body); +fp = fp_mem; + +lit-execute ( #a_addr -- ) new lit_execute +/* for ;code and code words; a static superinstruction would be more general, + but VM_JUMP is currently not supported there */ +#ifndef NO_IP +ip=IP; +#endif +SUPER_END; +VM_JUMP(EXEC1((Xt)a_addr)); + + +\g static_super -\C #endif +ifdef(`STACK_CACHE_FILE', +`include(peeprules.vmg)') \g end