--- gforth/prim 2005/01/26 22:06:03 1.164 +++ gforth/prim 2007/05/09 07:12:59 1.212 @@ -1,6 +1,6 @@ \ Gforth primitives -\ Copyright (C) 1995,1996,1997,1998,2000,2003,2004 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. @@ -100,6 +100,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 @@ -138,7 +140,7 @@ \ Stack caching setup -ifdef(`M4_ENGINE_FAST', `include(cache1.vmg)', `include(cache0.vmg)') +ifdef(`STACK_CACHE_FILE', `include(STACK_CACHE_FILE)', `include(cache0.vmg)') \ these m4 macros would collide with identifiers undefine(`index') @@ -207,10 +209,16 @@ goto *next_code; 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) */ @@ -246,6 +254,9 @@ 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 @@ -291,7 +302,6 @@ assert(0); #else a_pfa = PFA(a_cfa); nest = (Cell)IP; -IF_spTOS(spTOS = sp[0]); #ifdef DEBUG { CFA_TO_NAME(a_cfa); @@ -408,37 +418,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] @@ -724,6 +728,15 @@ c2 = toupper(c1); : dup [char] a - [ char z char a - 1 + ] Literal u< bl and - ; +capscompare ( c_addr1 u1 c_addr2 u2 -- n ) string +""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."" @@ -744,6 +757,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 @@ -805,20 +821,33 @@ n = n1*n2; / ( n1 n2 -- n ) core slash n = n1/n2; -if(FLOORED_DIV && (n1 < 0) != (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(FLOORED_DIV && (n1 < 0) != (n2 < 0) && n!=0) n += 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 (FLOORED_DIV && (n1<0) != (n2<0) && n3!=0) { +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; } @@ -832,18 +861,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 && (d<0) != (n3<0) && n4!=0) { +#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 ; @@ -855,13 +884,17 @@ 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); +#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 -/* assumes that the processor uses either floored or symmetric division */ -n4 = d/n3; -if (FLOORED_DIV && (d<0) != (n3<0) && (d%n3)!=0) n4--; +DCell r = FLOORED_DIV ? fmdiv(d,n3) : smdiv(d,n3); +n4=DLO(r); #endif : */mod nip ; @@ -878,27 +911,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_LL_DIV -DCell r = fmdiv(d1,n1); -n2=DHI(r); -n3=DLO(r); -#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 @@ -907,20 +939,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_LL_DIV +#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=DHI(r); n3=DLO(r); -#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 +#endif /* !defined(ASM_SM_SLASH_REM) */ : over >r dup >r abs -rot dabs rot um/mod @@ -956,14 +981,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(DLO(ud), DHI(ud), u1, u2, u3); +#else /* !defined(ASM_UM_SLASH_MOD) */ UDCell r = umdiv(ud,u1); u2=DHI(r); u3=DLO(r); -#else -u3 = ud/u1; -u2 = ud%u1; -#endif +#endif /* !defined(ASM_UM_SLASH_MOD) */ : 0 swap [ 8 cells 1 + ] literal 0 ?DO /modstep @@ -1016,12 +1040,7 @@ d2 = -d1; d2* ( d1 -- d2 ) double d_two_star ""Shift left by 1; also works on unsigned numbers"" -#ifdef BUGGY_LL_SHIFT -DLO_IS(d2, DLO(d1)<<1); -DHI_IS(d2, (DHI(d1)<<1) | (DLO(d1)>>(CELL_BITS-1))); -#else -d2 = 2*d1; -#endif +d2 = DLSHIFT(d1,1); : 2dup d+ ; @@ -1202,17 +1221,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; @@ -1222,10 +1240,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; \+ @@ -1298,21 +1316,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@ + @ ; @@ -1484,6 +1499,11 @@ for (; f83name1 != NULL; f83name1 = (str 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= @@ -1614,41 +1634,62 @@ 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"" +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 @@ -1675,8 +1716,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? */ @@ -1710,12 +1751,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 @@ -1752,27 +1790,24 @@ 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-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}."" /* 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; ((void (*)())w)(); -sp=SP; -fp=FP; -IF_spTOS(spTOS=sp[0]); -IF_fpTOS(fpTOS=fp[0]); +sp=gforth_SP; +fp=gforth_FP; \+ \+file @@ -1896,7 +1931,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; @@ -1921,9 +1956,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; } @@ -1941,7 +1976,7 @@ char newline[] = { '\r','\n' #endif }; -c_addr=newline; +c_addr=(Char *)newline; u=sizeof(newline); : "newline count ; @@ -1982,6 +2017,9 @@ dsystem = DZERO; 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_LL_D2F extern double ldexp(double x, int exp); @@ -2002,6 +2040,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; @@ -2060,6 +2101,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; @@ -2115,13 +2168,16 @@ 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 */ + 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 @@ -2131,9 +2187,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 @@ -2359,9 +2414,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@ ; @@ -2399,13 +2454,34 @@ u3 = 0; # endif #endif -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]); +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; \+FFCALL @@ -2469,30 +2545,30 @@ av_longlong(alist, d); av-ptr-r ( R:c_addr -- ) gforth av_ptr_r av_ptr(alist, void*, c_addr); -av-call-void ( -- ) gforth av_call_void +av-call-void ( ... -- ... ) gforth av_call_void SAVE_REGS av_call(alist); REST_REGS -av-call-int ( -- w ) gforth av_call_int +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 +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 +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 +av-call-longlong ( ... -- ... d ) gforth av_call_longlong SAVE_REGS av_call(alist); REST_REGS @@ -2503,79 +2579,196 @@ DHI_IS(d, 0); d = llrv; #endif -av-call-ptr ( -- c_addr ) gforth av_call_ptr +av-call-ptr ( ... -- ... c_addr ) gforth av_call_ptr SAVE_REGS av_call(alist); REST_REGS c_addr = prv; alloc-callback ( a_ip -- c_addr ) gforth alloc_callback -c_addr = (char *)alloc_callback(engine_callback, (Xt *)a_ip); +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; + +\+ + +\+LIBFFI + +ffi-type ( n -- a_type ) gforth ffi_type +static void* ffi_types[] = + { &ffi_type_void, + &ffi_type_uint8, &ffi_type_sint8, + &ffi_type_uint16, &ffi_type_sint16, + &ffi_type_uint32, &ffi_type_sint32, + &ffi_type_uint64, &ffi_type_sint64, + &ffi_type_float, &ffi_type_double, &ffi_type_longdouble, + &ffi_type_pointer }; +a_type = ffi_types[n]; + +ffi-size ( n1 -- n2 ) gforth ffi_size +static int ffi_sizes[] = + { sizeof(ffi_cif), sizeof(ffi_closure) }; +n2 = ffi_sizes[n1]; + +ffi-prep-cif ( a_atypes n a_rtype a_cif -- w ) gforth ffi_prep_cif +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((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((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)); +DHI_IS(d, 0); +#else +d = *(DCell*)(a_addr); +#endif + +ffi-2! ( d a_addr -- ) gforth ffi_2store +#ifdef BUGGY_LONG_LONG +*(Cell*)(a_addr) = DLO(d); +#else +*(DCell*)(a_addr) = d; +#endif + +ffi-arg-int ( -- w ) gforth ffi_arg_int +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*)(*gforth_clist++)); +DHI_IS(d, -(*(Cell*)(*gforth_clist++)<0)); +#else +d = *(DCell*)(*gforth_clist++); +#endif + +ffi-arg-dlong ( -- d ) gforth ffi_arg_dlong +#ifdef BUGGY_LONG_LONG +DLO_IS(d, *(Cell*)(*gforth_clist++)); +DHI_IS(d, -(*(Cell*)(*gforth_clist++)<0)); +#else +d = *(Cell*)(*gforth_clist++); +#endif + +ffi-arg-ptr ( -- c_addr ) gforth ffi_arg_ptr +c_addr = *(Char **)(*gforth_clist++); + +ffi-arg-float ( -- r ) gforth ffi_arg_float +r = *(float*)(*gforth_clist++); + +ffi-arg-double ( -- r ) gforth ffi_arg_double +r = *(double*)(*gforth_clist++); + +ffi-ret-void ( -- ) gforth ffi_ret_void +return 0; + +ffi-ret-int ( w -- ) gforth ffi_ret_int +*(int*)(gforth_ritem) = w; +return 0; + +ffi-ret-longlong ( d -- ) gforth ffi_ret_longlong +#ifdef BUGGY_LONG_LONG +*(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 +*(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 **)(gforth_ritem) = c_addr; +return 0; + +ffi-ret-float ( r -- ) gforth ffi_ret_float +*(float*)(gforth_ritem) = r; +return 0; + +ffi-ret-double ( r -- ) gforth ffi_ret_double +*(double*)(gforth_ritem) = r; return 0; \+ @@ -2587,10 +2780,11 @@ define(`uploop', 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)')')') + `uploop(`_i', 1, $1, ``u''`_i ', ``u''`_i')')') \ argdlist(argnum): declare C's arguments define(argdlist, `ifelse($1, 0, `', @@ -2598,15 +2792,15 @@ define(argdlist, \ argclist(argnum): pass C's arguments define(argclist, `ifelse($1, 0, `', - `uploop(`_i', 1, $1, `format(`u%d, ', _i)', `format(`u%d', _i)')')') + `uploop(`_i', 1, $1, ``u''`_i, ', ``u''`_i')')') \ icall(argnum) define(icall, -`icall$1 ( argflist($1)u -- uret ) gforth +`icall$1 ( argflist($1) u -- uret ) gforth uret = (SYSCALL(Cell(*)(argdlist($1)))u)(argclist($1)); ') define(fcall, -`fcall$1 ( argflist($1)u -- rret ) gforth +`fcall$1 ( argflist($1) u -- rret ) gforth rret = (SYSCALL(Float(*)(argdlist($1)))u)(argclist($1)); ') @@ -2629,13 +2823,12 @@ compile-prim1 ( a_prim -- ) gforth compi ""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)."" -IF_spTOS(sp[0]=spTOS); /* workaround for failing to save spTOS - (gcc-2.95.1, gforth-fast --enable-force-reg) */ +/* The ... above are a workaround for a bug in gcc-2.95, which fails + to save spTOS (gforth-fast --enable-force-reg) */ finish_code(); -IF_spTOS(spTOS=sp[0]); forget-dyncode ( c_code -- f ) gforth-internal forget_dyncode f = forget_dyncode(c_code); @@ -2670,7 +2863,7 @@ a_addr = groups; \g static_super -ifdef(`M4_ENGINE_FAST', +ifdef(`STACK_CACHE_FILE', `include(peeprules.vmg)') \g end