--- gforth/prim 2000/08/09 20:04:06 1.52 +++ gforth/prim 2001/03/18 12:39:33 1.79 @@ -1,6 +1,6 @@ \ Gforth primitives -\ Copyright (C) 1995,1996,1997,1998 Free Software Foundation, Inc. +\ Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc. \ This file is part of Gforth. @@ -16,7 +16,7 @@ \ 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., 675 Mass Ave, Cambridge, MA 02139, USA. +\ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA. \ WARNING: This file is processed by m4. Make sure your identifiers @@ -72,8 +72,36 @@ \ df_.* DFloat * \ sf_.* SFloat * \ xt.* XT -\ wid.* WID \ f83name.* F83Name * + +\E stack data-stack sp Cell +\E stack fp-stack fp Float +\E stack return-stack rp Cell +\E +\E get-current prefixes set-current +\E +\E s" Bool" single data-stack type-prefix f +\E s" Char" single data-stack type-prefix c +\E s" Cell" single data-stack type-prefix n +\E s" Cell" single data-stack type-prefix w +\E s" UCell" single data-stack type-prefix u +\E s" DCell" double data-stack type-prefix d +\E s" UDCell" double data-stack type-prefix ud +\E s" Float" single fp-stack type-prefix r +\E s" Cell *" single data-stack type-prefix a_ +\E s" Char *" single data-stack type-prefix c_ +\E s" Float *" single data-stack type-prefix f_ +\E s" DFloat *" single data-stack type-prefix df_ +\E s" SFloat *" single data-stack type-prefix sf_ +\E s" Xt" single data-stack type-prefix xt +\E s" struct F83Name *" single data-stack type-prefix f83name +\E s" struct Longname *" single data-stack type-prefix longname +\E +\E return-stack stack-prefix R: +\E inst-stream stack-prefix # +\E +\E set-current + \ \ \ @@ -102,29 +130,29 @@ \ these m4 macros would collide with identifiers undefine(`index') undefine(`shift') +undefine(`symbols') noop ( -- ) gforth -; : ; -lit ( -- w ) gforth -w = (Cell)NEXT_INST; -INC_IP(1); +lit ( #w -- w ) gforth : r> dup @ swap cell+ >r ; execute ( xt -- ) core ""Perform the semantics represented by the execution token, @i{xt}."" ip=IP; -IF_TOS(TOS = sp[0]); +IF_spTOS(spTOS = sp[0]); +SUPER_END; EXEC(xt); perform ( a_addr -- ) gforth -""Equivalent to @code{@ execute}."" +""@code{@@ execute}."" /* and pfe */ ip=IP; -IF_TOS(TOS = sp[0]); +IF_spTOS(spTOS = sp[0]); +SUPER_END; EXEC(*(Xt *)a_addr); : @ execute ; @@ -132,45 +160,40 @@ EXEC(*(Xt *)a_addr); \fhas? skipbranchprims 0= [IF] \+glocals -branch-lp+!# ( -- ) gforth branch_lp_plus_store_number +branch-lp+!# ( #ndisp #nlocals -- ) gforth branch_lp_plus_store_number /* this will probably not be used */ -branch_adjust_lp: -lp += (Cell)(IP[1]); -goto branch; +lp += nlocals; +SET_IP((Xt *)(((Cell)(IP-2))+ndisp)); \+ -branch ( -- ) gforth -branch: -SET_IP((Xt *)(((Cell)IP)+(Cell)NEXT_INST)); +branch ( #ndisp -- ) gforth +SET_IP((Xt *)(((Cell)(IP-1))+ndisp)); : r> dup @ + >r ; -\ condbranch(forthname,restline,code,forthcode) +\ condbranch(forthname,stackeffect,restline,code,forthcode) \ this is non-syntactical: code must open a brace that is closed by the macro define(condbranch, -$1 $2 -$3 SET_IP((Xt *)(((Cell)IP)+(Cell)NEXT_INST)); - NEXT; +$1 ( `#'ndisp $2 ) $3 +$4 SET_IP((Xt *)(((Cell)(IP-1))+ndisp)); +TAIL; } -else - INC_IP(1); -$4 +$5 \+glocals -$1-lp+!# $2_lp_plus_store_number -$3 goto branch_adjust_lp; +$1-lp+!`#' ( `#'ndisp `#'nlocals $2 ) $3_lp_plus_store_number +$4 lp += nlocals; +SET_IP((Xt *)(((Cell)(IP-2))+ndisp)); +TAIL; } -else - INC_IP(2); \+ ) -condbranch(?branch,( f -- ) f83 question_branch, +condbranch(?branch,f --,f83 question_branch, if (f==0) { - IF_TOS(TOS = sp[0]); ,: 0= dup \ !f !f r> dup @ \ !f !f IP branchoffset @@ -183,18 +206,16 @@ if (f==0) { \+xconds -?dup-?branch ( f -- f ) new question_dupe_question_branch +?dup-?branch ( #ndisp f -- f ) new question_dupe_question_branch ""The run-time procedure compiled by @code{?DUP-IF}."" if (f==0) { sp++; - IF_TOS(TOS = sp[0]); - SET_IP((Xt *)(((Cell)IP)+(Cell)NEXT_INST)); - NEXT; + IF_spTOS(spTOS = sp[0]); + SET_IP((Xt *)(((Cell)(IP-1))+ndisp)); + TAIL; } -else - INC_IP(1); -?dup-0=-?branch ( f -- ) new question_dupe_zero_equals_question_branch +?dup-0=-?branch ( #ndisp f -- ) 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 @@ -202,46 +223,37 @@ few cycles in that case, but is easy to invocation */ if (f!=0) { sp--; - SET_IP((Xt *)(((Cell)IP)+(Cell)NEXT_INST)); + SET_IP((Xt *)(((Cell)(IP-1))+ndisp)); NEXT; } -else - INC_IP(1); \+ \f[THEN] \fhas? skiploopprims 0= [IF] -condbranch((next),( -- ) cmFORTH paren_next, -if ((*rp)--) { +condbranch((next),R:n1 -- R:n2,cmFORTH paren_next, +n2=n1-1; +if (n1) { ,: r> r> dup 1- >r IF dup @ + >r ELSE cell+ >r THEN ;) -condbranch((loop),( -- ) gforth paren_loop, -Cell index = *rp+1; -Cell limit = rp[1]; -if (index != limit) { - *rp = index; +condbranch((loop),R:nlimit R:n1 -- R:nlimit R:n2,gforth paren_loop, +n2=n1+1; +if (n2 != nlimit) { ,: r> r> 1+ r> 2dup = IF >r 1- >r cell+ >r ELSE >r >r dup @ + >r THEN ;) -condbranch((+loop),( n -- ) gforth paren_plus_loop, +condbranch((+loop),n R:nlimit R:n1 -- R:nlimit R:n2,gforth paren_plus_loop, /* !! check this thoroughly */ -Cell index = *rp; /* sign bit manipulation and test: (x^y)<0 is equivalent to (x<0) != (y<0) */ /* dependent upon two's complement arithmetic */ -Cell olddiff = index-rp[1]; +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 */) { -#ifdef i386 - *rp += n; -#else - *rp = index + n; -#endif - IF_TOS(TOS = sp[0]); ,: r> swap r> r> 2dup - >r @@ -252,70 +264,48 @@ if ((olddiff^(olddiff+n))>=0 /* the li \+xconds -condbranch((-loop),( u -- ) gforth paren_minus_loop, -/* !! check this thoroughly */ -Cell index = *rp; -UCell olddiff = index-rp[1]; +condbranch((-loop),u R:nlimit R:n1 -- R:nlimit R:n2,gforth paren_minus_loop, +UCell olddiff = n1-nlimit; +n2=n1-u; if (olddiff>u) { -#ifdef i386 - *rp -= u; -#else - *rp = index - u; -#endif - IF_TOS(TOS = sp[0]); ,) -condbranch((s+loop),( n -- ) gforth paren_symmetric_plus_loop, +condbranch((s+loop),n R:nlimit R:n1 -- R:nlimit R:n2,gforth paren_symmetric_plus_loop, ""The run-time procedure compiled by S+LOOP. It loops until the index crosses the boundary between limit and limit-sign(n). I.e. a symmetric version of (+LOOP)."" /* !! check this thoroughly */ -Cell index = *rp; -Cell diff = index-rp[1]; +Cell diff = n1-nlimit; Cell newdiff = diff+n; if (n<0) { diff = -diff; newdiff = -newdiff; } +n2=n1+n; if (diff>=0 || newdiff<0) { -#ifdef i386 - *rp += n; -#else - *rp = index + n; -#endif - IF_TOS(TOS = sp[0]); ,) \+ -unloop ( -- ) core -rp += 2; +unloop ( R:w1 R:w2 -- ) core +/* !! alias for 2rdrop */ : r> rdrop rdrop >r ; -(for) ( ncount -- ) cmFORTH paren_for +(for) ( ncount -- R:nlimit R:ncount ) cmFORTH paren_for /* or (for) = >r -- collides with unloop! */ -*--rp = 0; -*--rp = ncount; +nlimit=0; : r> swap 0 >r >r >r ; -(do) ( nlimit nstart -- ) gforth paren_do -/* or do it in high-level? 0.09/0.23% */ -*--rp = nlimit; -*--rp = nstart; +(do) ( nlimit nstart -- R:nlimit R:nstart ) gforth paren_do : r> swap rot >r >r >r ; -(?do) ( nlimit nstart -- ) gforth paren_question_do -*--rp = nlimit; -*--rp = nstart; +(?do) ( #ndisp nlimit nstart -- R:nlimit R:nstart ) gforth paren_question_do if (nstart == nlimit) { - IF_TOS(TOS = sp[0]); - goto branch; - } -else { - INC_IP(1); + SET_IP((Xt *)(((Cell)(IP-1))+ndisp)); + TAIL; } : 2dup = @@ -327,15 +317,10 @@ else { \+xconds -(+do) ( nlimit nstart -- ) gforth paren_plus_do -*--rp = nlimit; -*--rp = nstart; +(+do) ( #ndisp nlimit nstart -- R:nlimit R:nstart ) gforth paren_plus_do if (nstart >= nlimit) { - IF_TOS(TOS = sp[0]); - goto branch; - } -else { - INC_IP(1); + SET_IP((Xt *)(((Cell)(IP-1))+ndisp)); + TAIL; } : swap 2dup @@ -347,15 +332,10 @@ else { cell+ THEN >r ; -(u+do) ( ulimit ustart -- ) gforth paren_u_plus_do -*--rp = ulimit; -*--rp = ustart; +(u+do) ( #ndisp ulimit ustart -- R:ulimit R:ustart ) gforth paren_u_plus_do if (ustart >= ulimit) { - IF_TOS(TOS = sp[0]); - goto branch; - } -else { - INC_IP(1); + SET_IP((Xt *)(((Cell)(IP-1))+ndisp)); + TAIL; } : swap 2dup @@ -367,15 +347,10 @@ else { cell+ THEN >r ; -(-do) ( nlimit nstart -- ) gforth paren_minus_do -*--rp = nlimit; -*--rp = nstart; +(-do) ( #ndisp nlimit nstart -- R:nlimit R:nstart ) gforth paren_minus_do if (nstart <= nlimit) { - IF_TOS(TOS = sp[0]); - goto branch; - } -else { - INC_IP(1); + SET_IP((Xt *)(((Cell)(IP-1))+ndisp)); + TAIL; } : swap 2dup @@ -387,15 +362,10 @@ else { cell+ THEN >r ; -(u-do) ( ulimit ustart -- ) gforth paren_u_minus_do -*--rp = ulimit; -*--rp = ustart; +(u-do) ( #ndisp ulimit ustart -- R:ulimit R:ustart ) gforth paren_u_minus_do if (ustart <= ulimit) { - IF_TOS(TOS = sp[0]); - goto branch; - } -else { - INC_IP(1); + SET_IP((Xt *)(((Cell)(IP-1))+ndisp)); + TAIL; } : swap 2dup @@ -412,29 +382,24 @@ else { \ don't make any assumptions where the return stack is!! \ implement this in machine code if it should run quickly! -i ( -- n ) core -n = *rp; +i ( R:n -- R:n n ) core : \ rp@ cell+ @ ; r> r> tuck >r >r ; -i' ( -- w ) gforth i_tick -""loop end value"" -w = rp[1]; +i' ( R:w R:w2 -- R:w R:w2 w ) gforth i_tick : \ rp@ cell+ cell+ @ ; r> r> r> dup itmp ! >r >r >r itmp @ ; variable itmp -j ( -- n ) core -n = rp[2]; +j ( R:n R:d1 -- n R:n R:d1 ) core : \ rp@ cell+ cell+ cell+ @ ; r> r> r> r> dup itmp ! >r >r >r >r itmp @ ; [IFUNDEF] itmp variable itmp [THEN] -k ( -- n ) gforth -n = rp[4]; +k ( R:n R:d1 R:d2 -- n R:n R:d1 R:d2 ) gforth : \ rp@ [ 5 cells ] Literal + @ ; r> r> r> r> r> r> dup itmp ! >r >r >r >r >r >r itmp @ ; @@ -819,6 +784,7 @@ w2 = ~w1; MAXU xor ; rshift ( u1 n -- u2 ) core r_shift +""Logical shift right by @i{n} bits."" u2 = u1>>n; : 0 ?DO 2/ MAXI and LOOP ; @@ -954,7 +920,7 @@ a_addr = sp+1; sp! ( a_addr -- ) gforth sp_store sp = a_addr; -/* works with and without TOS caching */ +/* works with and without spTOS caching */ rp@ ( -- a_addr ) gforth rp_fetch a_addr = rp; @@ -972,54 +938,37 @@ fp = f_addr; \+ -;s ( -- ) gforth semis +;s ( R:w -- ) gforth semis ""The primitive compiled by @code{EXIT}."" -SET_IP((Xt *)(*rp++)); +SET_IP((Xt *)w); ->r ( w -- ) core to_r -""@code{( R: -- w )}"" -*--rp = w; +>r ( w -- R:w ) core to_r : (>r) ; : (>r) rp@ cell+ @ rp@ ! rp@ cell+ ! ; -r> ( -- w ) core r_from -""@code{( R: w -- )}"" -w = *rp++; +r> ( R:w -- w ) core r_from : rp@ cell+ @ rp@ @ rp@ cell+ ! (rdrop) rp@ ! ; Create (rdrop) ' ;s A, -rdrop ( -- ) gforth -""@code{( R: w -- )}"" -rp++; +rdrop ( R:w -- ) gforth : r> r> drop >r ; -2>r ( w1 w2 -- ) core-ext two_to_r -""@code{( R: -- w1 w2 )}"" -*--rp = w1; -*--rp = w2; +2>r ( w1 w2 -- R:w1 R:w2 ) core-ext two_to_r : swap r> swap >r swap >r >r ; -2r> ( -- w1 w2 ) core-ext two_r_from -""@code{( R: w1 w2 -- )}"" -w2 = *rp++; -w1 = *rp++; +2r> ( R:w1 R:w2 -- w1 w2 ) core-ext two_r_from : r> r> swap r> swap >r swap ; -2r@ ( -- w1 w2 ) core-ext two_r_fetch -""@code{( R: w1 w2 -- w1 w2 )}"" -w2 = rp[0]; -w1 = rp[1]; +2r@ ( R:w1 R:w2 -- R:w1 R:w2 w1 w2 ) core-ext two_r_fetch : i' j ; -2rdrop ( -- ) gforth two_r_drop -""@code{( R: w1 w2 -- )}"" -rp+=2; +2rdrop ( R:w1 R:w2 -- ) gforth two_r_drop : r> r> drop r> drop >r ; @@ -1065,7 +1014,7 @@ tuck ( w1 w2 -- w2 w1 w2 ) core-ext ""Actually the stack effect is: @code{( w -- 0 | w w )}. It performs a @code{dup} if w is nonzero."" if (w!=0) { - IF_TOS(*sp-- = w;) + IF_spTOS(*sp-- = w;) #ifndef USE_TOS *--sp = w; #endif @@ -1223,8 +1172,8 @@ n2 = n1 * sizeof(Char); ; count ( c_addr1 -- c_addr2 u ) core -"" If @i{c-add1} is the address of a counted string return the length of -the string, @i{u}, and the address of its first character, @i{c-addr2}."" +""@i{c-addr2} is the first character and @i{u} the length of the +counted string at @i{c-addr1}."" u = *c_addr1; c_addr2 = c_addr1+1; : @@ -1243,7 +1192,7 @@ f83name2=f83name1; r> @ REPEAT THEN nip nip ; : (find-samelen) ( u f83name1 -- u f83name2/0 ) - BEGIN 2dup cell+ c@ $1F and <> WHILE @ dup 0= UNTIL THEN ; + BEGIN 2dup cell+ c@ $1F and <> WHILE @ dup 0= UNTIL THEN ; \+hash @@ -1378,7 +1327,7 @@ c_addr = (Address)CODE_ADDRESS(xt); @ ; >does-code ( xt -- a_addr ) gforth to_does_code -""If @i{xt} is the execution token of a defining-word-defined word, +""If @i{xt} is the execution token of a child of a @code{DOES>} word, @i{a-addr} is the start of the Forth code after the @code{DOES>}; Otherwise @i{a-addr} is 0."" a_addr = (Cell *)DOES_CODE(xt); @@ -1393,16 +1342,16 @@ CACHE_FLUSH(xt,(size_t)PFA(0)); ! ; does-code! ( a_addr xt -- ) gforth does_code_store -""Create a code field at @i{xt} for a defining-word-defined word; @i{a-addr} -is the start of the Forth code after @code{DOES>}."" +""Create a code field at @i{xt} for a child of a @code{DOES>}-word; +@i{a-addr} is the start of the Forth code after @code{DOES>}."" MAKE_DOES_CF(xt, a_addr); CACHE_FLUSH(xt,(size_t)PFA(0)); : dodoes: over ! cell+ ! ; does-handler! ( a_addr -- ) gforth does_handler_store -""Create a @code{DOES>}-handler at address @i{a-addr}. Usually, @i{a-addr} points -just behind a @code{DOES>}."" +""Create a @code{DOES>}-handler at address @i{a-addr}. Normally, +@i{a-addr} points just behind a @code{DOES>}."" MAKE_DOES_HANDLER(a_addr); CACHE_FLUSH((caddr_t)a_addr,DOES_HANDLER_SIZE); : @@ -1480,6 +1429,7 @@ cache."" FLUSH_ICACHE(c_addr,u); (bye) ( n -- ) gforth paren_bye +SUPER_END; return (Label *)n; (system) ( c_addr u -- wretval wior ) gforth peren_system @@ -1503,8 +1453,8 @@ in length."" c_addr2 = getenv(cstr(c_addr1,u1,1)); u2 = (c_addr2 == NULL ? 0 : strlen(c_addr2)); -open-pipe ( c_addr u ntype -- wfileid wior ) gforth open_pipe -wfileid=(Cell)popen(cstr(c_addr,u,1),fileattr[ntype]); /* ~ expansion of 1st arg? */ +open-pipe ( c_addr u wfam -- wfileid wior ) gforth open_pipe +wfileid=(Cell)popen(cstr(c_addr,u,1),fileattr[wfam]); /* ~ expansion of 1st arg? */ wior = IOR(wfileid==0); /* !! the man page says that errno is not set reliably */ close-pipe ( wfileid -- wretval wior ) gforth close_pipe @@ -1583,14 +1533,14 @@ access the stack itself. The stack point variables @code{SP} and @code{FP}."" /* This is a first attempt at support for calls to C. This may change in the future */ -IF_FTOS(fp[0]=FTOS); +IF_fpTOS(fp[0]=fpTOS); FP=fp; SP=sp; ((void (*)())w)(); sp=SP; fp=FP; -IF_TOS(TOS=sp[0]); -IF_FTOS(FTOS=fp[0]); +IF_spTOS(spTOS=sp[0]); +IF_fpTOS(fpTOS=fp[0]); \+ \+file @@ -1598,15 +1548,15 @@ IF_FTOS(FTOS=fp[0]); close-file ( wfileid -- wior ) file close_file wior = IOR(fclose((FILE *)wfileid)==EOF); -open-file ( c_addr u ntype -- wfileid wior ) file open_file -wfileid = (Cell)fopen(tilde_cstr(c_addr, u, 1), fileattr[ntype]); +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); -create-file ( c_addr u ntype -- wfileid wior ) file create_file +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[ntype], 0666); +fd = open(tilde_cstr(c_addr, u, 1), O_CREAT|O_TRUNC|ufileattr[wfam], 0666); if (fd != -1) { - wfileid = (Cell)fdopen(fd, fileattr[ntype]); + wfileid = (Cell)fdopen(fd, fileattr[wfam]); wior = IOR(wfileid == 0); } else { wfileid = 0; @@ -1646,7 +1596,7 @@ if (wior) clearerr((FILE *)wfileid); read-line ( c_addr u1 wfileid -- u2 flag wior ) file read_line -#if 1 +""this is only for backward compatibility"" Cell c; flag=-1; for(u2=0; u20) && (c_addr[u2-1]==NEWLINE)); -} -else { - wior=0; - u2=0; -} -#endif \+ @@ -1709,26 +1645,26 @@ PUTC(c); flush-file ( wfileid -- wior ) file-ext flush_file wior = IOR(fflush((FILE *) wfileid)==EOF); -file-status ( c_addr u -- ntype wior ) file-ext file_status +file-status ( c_addr u -- wfam wior ) file-ext file_status char *filename=tilde_cstr(c_addr, u, 1); if (access (filename, F_OK) != 0) { - ntype=0; + wfam=0; wior=IOR(1); } else if (access (filename, R_OK | W_OK) == 0) { - ntype=2; /* r/w */ + wfam=2; /* r/w */ wior=0; } else if (access (filename, R_OK) == 0) { - ntype=0; /* r/o */ + wfam=0; /* r/o */ wior=0; } else if (access (filename, W_OK) == 0) { - ntype=4; /* w/o */ + wfam=4; /* w/o */ wior=0; } else { - ntype=1; /* well, we cannot access the file, but better deliver a legal + wfam=1; /* well, we cannot access the file, but better deliver a legal access mode (r/o bin), so we get a decent error later upon open. */ wior=0; } @@ -1876,12 +1812,12 @@ f2=FLAG(isdigit((unsigned)(sig[0]))!=0); memmove(c_addr,sig,u); >float ( c_addr u -- flag ) float to_float -""Attempt to convert the character string @i{c-addr u} to -internal floating-point representation. If the string -represents a valid floating-point number @i{r} is placed -on the floating-point stack and @i{flag} is true. Otherwise, -@i{flag} is false. A string of blanks is a special case -and represents the floating-point number 0."" +""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 +@i{r} is placed on the floating-point stack and @i{flag} is +true. Otherwise, @i{flag} is false. A string of blanks is a special +case and represents the floating-point number 0."" /* real signature: c_addr u -- r t / f */ Float r; char *number=cstr(c_addr, u, 1); @@ -1905,9 +1841,9 @@ number[u]='\0'; r=strtod(number,&endconv); if((flag=FLAG(!(Cell)*endconv))) { - IF_FTOS(fp[0] = FTOS); + IF_fpTOS(fp[0] = fpTOS); fp += -1; - FTOS = sign ? -r : r; + fpTOS = sign ? -r : r; } else if(*endconv=='d' || *endconv=='D') { @@ -1915,9 +1851,9 @@ else if(*endconv=='d' || *endconv=='D') r=strtod(number,&endconv); if((flag=FLAG(!(Cell)*endconv))) { - IF_FTOS(fp[0] = FTOS); + IF_fpTOS(fp[0] = fpTOS); fp += -1; - FTOS = sign ? -r : r; + fpTOS = sign ? -r : r; } } @@ -2062,9 +1998,8 @@ df_addr = (DFloat *)((((Cell)c_addr)+(si \+ \+glocals -@local# ( -- w ) gforth fetch_local_number -w = *(Cell *)(lp+(Cell)NEXT_INST); -INC_IP(1); +@local# ( #noffset -- w ) gforth fetch_local_number +w = *(Cell *)(lp+noffset); @local0 ( -- w ) new fetch_local_zero w = *(Cell *)(lp+0*sizeof(Cell)); @@ -2080,9 +2015,8 @@ w = *(Cell *)(lp+3*sizeof(Cell)); \+floating -f@local# ( -- r ) gforth f_fetch_local_number -r = *(Float *)(lp+(Cell)NEXT_INST); -INC_IP(1); +f@local# ( #noffset -- r ) gforth f_fetch_local_number +r = *(Float *)(lp+noffset); f@local0 ( -- r ) new f_fetch_local_zero r = *(Float *)(lp+0*sizeof(Float)); @@ -2092,17 +2026,15 @@ r = *(Float *)(lp+1*sizeof(Float)); \+ -laddr# ( -- c_addr ) gforth laddr_number +laddr# ( #noffset -- c_addr ) gforth laddr_number /* this can also be used to implement lp@ */ -c_addr = (Char *)(lp+(Cell)NEXT_INST); -INC_IP(1); +c_addr = (Char *)(lp+noffset); -lp+!# ( -- ) gforth lp_plus_store_number +lp+!# ( #noffset -- ) gforth lp_plus_store_number ""used with negative immediate values it allocates memory on the local stack, a positive immediate argument drops memory from the local stack"" -lp += (Cell)NEXT_INST; -INC_IP(1); +lp += noffset; lp- ( -- ) new minus_four_lp_plus_store lp += -sizeof(Cell); @@ -2209,12 +2141,12 @@ UP=up=(char *)a_addr; Variable UP wcall ( u -- ) gforth -IF_FTOS(fp[0]=FTOS); +IF_fpTOS(fp[0]=fpTOS); FP=fp; sp=(SYSCALL(Cell(*)(Cell *, void *))u)(sp, &FP); fp=FP; -IF_TOS(TOS=sp[0];) -IF_FTOS(FTOS=fp[0]); +IF_spTOS(spTOS=sp[0];) +IF_fpTOS(fpTOS=fp[0]); \+file @@ -2232,8 +2164,10 @@ if(dent == NULL) { flag = 0; } else { u2 = strlen(dent->d_name); - if(u2 > u1) + if(u2 > u1) { u2 = u1; + wior = -512-ENAMETOOLONG; + } memmove(c_addr, dent->d_name, u2); } @@ -2250,7 +2184,8 @@ flag = FLAG(!fnmatch(pattern, string, 0) newline ( -- c_addr u ) gforth ""String containing the newline sequence of the host OS"" char newline[] = { -#ifdef unix +#if defined(unix) || defined(__MACH__) +/* Darwin/MacOS X sets __MACH__, but not unix. */ '\n' #else '\r','\n' @@ -2260,7 +2195,9 @@ c_addr=newline; u=sizeof(newline); : "newline count ; -Create "newline 1 c, $0A c, +Create "newline e? crlf [IF] 2 c, $0D c, [ELSE] 1 c, [THEN] $0A c, + +\+os utime ( -- dtime ) gforth ""Report the current time in microseconds since some epoch."" @@ -2283,8 +2220,16 @@ 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}; #endif +#endif + +\+ + +\+floating v* ( f_addr1 nstride1 f_addr2 nstride2 ucount -- r ) gforth v_star ""dot-product: r=v1*v2. The first element of v1 is at f_addr1, the @@ -2295,6 +2240,10 @@ for (r=0.; ucount>0; ucount--) { f_addr1 = (Float *)(((Address)f_addr1)+nstride1); f_addr2 = (Float *)(((Address)f_addr2)+nstride2); } +: + >r swap 2swap swap 0e r> 0 ?DO + dup f@ over + 2swap dup f@ f* f+ over + 2swap + LOOP 2drop 2drop ; faxpy ( ra f_x nstridex f_y nstridey ucount -- ) gforth ""vy=ra*vx+vy"" @@ -2303,3 +2252,130 @@ for (; ucount>0; ucount--) { f_x = (Float *)(((Address)f_x)+nstridex); f_y = (Float *)(((Address)f_y)+nstridey); } +: + >r swap 2swap swap r> 0 ?DO + fdup dup f@ f* over + 2swap dup f@ f+ dup f! over + 2swap + LOOP 2drop 2drop fdrop ; + +\+ + +\+file + +(read-line) ( c_addr u1 wfileid -- u2 flag u3 wior ) file paren_read_line +Cell c; +flag=-1; +u3=0; +for(u2=0; u2next)) + if ((UCell)LONGNAME_COUNT(longname1)==u && + memcasecmp(c_addr, longname1->name, u)== 0 /* or inline? */) + break; +longname2=longname1; +: + BEGIN dup WHILE (findl-samelen) dup WHILE + >r 2dup r@ cell+ cell+ capscomp 0= + IF 2drop r> EXIT THEN + r> @ + REPEAT THEN nip nip ; +: (findl-samelen) ( u longname1 -- u longname2/0 ) + BEGIN 2dup cell+ @ lcount-mask and <> WHILE @ dup 0= UNTIL THEN ; + +\+hash + +(hashlfind) ( c_addr u a_addr -- longname2 ) new paren_hashlfind +struct Longname *longname1; +longname2=NULL; +while(a_addr != NULL) +{ + longname1=(struct Longname *)(a_addr[1]); + a_addr=(Cell *)(a_addr[0]); + if ((UCell)LONGNAME_COUNT(longname1)==u && + memcasecmp(c_addr, longname1->name, u)== 0 /* or inline? */) + { + longname2=longname1; + break; + } +} +: + BEGIN dup WHILE + 2@ >r >r dup r@ cell+ @ lcount-mask and = + IF 2dup r@ cell+ cell+ capscomp 0= + IF 2drop r> rdrop EXIT THEN THEN + rdrop r> + REPEAT nip nip ; + +(tablelfind) ( c_addr u a_addr -- longname2 ) new paren_tablelfind +""A case-sensitive variant of @code{(hashfind)}"" +struct Longname *longname1; +longname2=NULL; +while(a_addr != NULL) +{ + longname1=(struct Longname *)(a_addr[1]); + a_addr=(Cell *)(a_addr[0]); + if ((UCell)LONGNAME_COUNT(longname1)==u && + memcmp(c_addr, longname1->name, u)== 0 /* or inline? */) + { + longname2=longname1; + break; + } +} +: + BEGIN dup WHILE + 2@ >r >r dup r@ cell+ @ lcount-mask and = + IF 2dup r@ cell+ cell+ -text 0= + IF 2drop r> rdrop EXIT THEN THEN + rdrop r> + REPEAT nip nip ; + +\+ + +primtable ( -- wprimtable ) new +""wprimtable is a table containing the xts of the primitives indexed +by sequence-number in prim (for use in prepare-peephole-table)."" +wprimtable = (Cell)primtable(symbols+DOESJUMP+1,MAX_SYMBOLS-DOESJUMP-1); + +prepare-peephole-table ( wprimtable -- wpeeptable ) new prepare_peephole_opt +""wpeeptable is a data structure used by @code{peephole-opt}; it is +constructed by combining a primitives table with a simple peephole +optimization table."" +wpeeptable = prepare_peephole_table((Xt *)wprimtable); + +peephole-opt ( xt1 xt2 wpeeptable -- xt ) new peephole_opt +""xt is the combination of xt1 and xt2 (according to wpeeptable); if +they cannot be combined, xt is 0."" +xt = peephole_opt(xt1, xt2, wpeeptable); + +lit_plus = lit + + +call ( #a_callee -- R:a_retaddr ) +""Call callee (a variant of docol with inline argument)."" +a_retaddr = (Cell *)IP; +SET_IP((Xt *)a_callee); + +useraddr ( #u -- a_addr ) +a_addr = (Cell *)(up+u); + + +