--- gforth/prim	2008/10/09 16:30:56	1.237
+++ gforth/prim	2010/05/17 09:01:11	1.250
@@ -1,6 +1,6 @@
 \ Gforth primitives
 
-\ Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007,2008,2009 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -229,9 +229,28 @@ fprintf(stderr, "dodoes to %x, push %x\n
 SET_IP(DOES_CODE1(CFA));
 #endif /* !defined(NO_IP) */
 
-(does-handler) ( -- )	gforth-internal	paren_does_handler
-""just a slot to have an encoding for the DOESJUMP, 
-which is no longer used anyway (!! eliminate this)""
+(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]
 
@@ -1662,7 +1681,11 @@ 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
@@ -1694,6 +1717,7 @@ c_addr2 = (Char *)getenv(cstr(c_addr1,u1
 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 */
 
@@ -1831,13 +1855,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(u2<u1 && ferror((FILE *)wfileid));
 /* !! is the value of ferror errno-compatible? */
 if (wior)
   clearerr((FILE *)wfileid);
 
 (read-line)	( c_addr u1 wfileid -- u2 flag u3 wior ) file	paren_read_line
-struct Cellquad r = read_line(c_addr, u1, wfileid);
+struct Cellquad r = read_line(c_addr, u1, (FILE *)wfileid);
 u2   = r.n1;
 flag = r.n2;
 u3   = r.n3;
@@ -2145,6 +2171,7 @@ 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((char *)sig);
@@ -2457,11 +2484,62 @@ lib-error ( -- c_addr u )       gforth
 #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
 
+w!be ( w c_addr -- )	gforth w_store_be
+""Store the bottom 16 bits of @i{w} at @i{c_addr} in big endian format.""
+*(Wyde*)(c_addr) = htobe16(w);
+
+l!be ( w c_addr -- )	gforth l_store_be
+""Store the bottom 32 bits of @i{w} at @i{c_addr} in big endian format.""
+*(Tetrabyte*)(c_addr) = htobe32(w);
+
+x!be ( w c_addr -- )	gforth x_store_be
+""Store the bottom 64 bits of @i{w} at @i{c_addr} in big endian format.""
+*(Octabyte*)(c_addr) = htobe64(w);
+
+w!le ( w c_addr -- )	gforth w_store_le
+""Store the bottom 16 bits of @i{w} at @i{c_addr} in big endian format.""
+*(Wyde*)(c_addr) = htole16(w);
+
+l!le ( w c_addr -- )	gforth l_store_le
+""Store the bottom 32 bits of @i{w} at @i{c_addr} in big endian format.""
+*(Tetrabyte*)(c_addr) = htole32(w);
+
+x!le ( w c_addr -- )	gforth x_store_le
+""Store the bottom 64 bits of @i{w} at @i{c_addr} in big endian format.""
+*(Octabyte*)(c_addr) = htole64(w);
+
+w@be ( c_addr -- u )	gforth w_fetch_be
+""@i{u} is the zero-extended 16-bit big endian value stored at @i{c_addr}.""
+u = be16toh(*(UWyde*)(c_addr));
+
+l@be ( c_addr -- u )	gforth l_fetch_be
+""@i{u} is the zero-extended 32-bit big endian value stored at @i{c_addr}.""
+u = be32toh(*(UTetrabyte*)(c_addr));
+
+x@be ( c_addr -- u )	gforth x_fetch_be
+""@i{u} is the zero-extended 64-bit big endian value stored at @i{c_addr}.""
+u = be64toh(*(UOctabyte*)(c_addr));
+
+w@le ( c_addr -- u )	gforth w_fetch_le
+""@i{u} is the zero-extended 16-bit little endian value stored at @i{c_addr}.""
+u = le16toh(*(UWyde*)(c_addr));
+
+l@le ( c_addr -- u )	gforth l_fetch_le
+""@i{u} is the zero-extended 32-bit little endian value stored at @i{c_addr}.""
+u = le32toh(*(UTetrabyte*)(c_addr));
+
+x@le ( c_addr -- u )	gforth x_fetch_le
+""@i{u} is the zero-extended 64-bit little endian value stored at @i{c_addr}.""
+u = le64toh(*(UOctabyte*)(c_addr));
+
 \+
 \g peephole
 
@@ -2509,6 +2587,36 @@ a_addr = groups;
 
 \+
 
+\g primitive_centric
+
+\ primitives for primitive-centric code
+\ another one is does-exec
+
+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
 
 ifdef(`STACK_CACHE_FILE',