--- gforth/prim	2007/03/31 21:43:18	1.210
+++ gforth/prim	2008/02/23 13:03:56	1.224
@@ -1,12 +1,12 @@
 \ Gforth primitives
 
-\ Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006,2007 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
@@ -109,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
 
 \ 
 \ 
@@ -203,16 +202,30 @@ 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) */
 
@@ -332,8 +345,6 @@ SET_IP((Xt *)a_target);
 
 \ condbranch(forthname,stackeffect,restline,code1,code2,forthcode)
 \ this is non-syntactical: code must open a brace that is closed by the macro
-\ condbranch(forthname,stackeffect,restline,code1,code2,forthcode)
-\ this is non-syntactical: code must open a brace that is closed by the macro
 define(condbranch,
 $1 ( `#'a_target $2 ) $3
 $4	#ifdef NO_IP
@@ -343,8 +354,10 @@ $5	#ifdef NO_IP
 JUMP(a_target);
 #else
 SET_IP((Xt *)a_target);
+ifelse(condbranch_opt,`1',`INST_TAIL; NEXT_P2;',`/* condbranch_opt=0 */')
 #endif
 }
+ifelse(condbranch_opt,`1',`SUPER_CONTINUE;',`/* condbranch_opt=0 */')
 $6
 
 \+glocals
@@ -358,43 +371,10 @@ $5	lp += nlocals;
 JUMP(a_target);
 #else
 SET_IP((Xt *)a_target);
+ifelse(condbranch_opt,`1',`INST_TAIL; NEXT_P2;',`/* condbranch_opt=0 */')
 #endif
 }
-
-\+
-)
-
-\ version that generates two jumps (not good for PR 15242 workaround)
-define(condbranch_twojump,
-$1 ( `#'a_target $2 ) $3
-$4	#ifdef NO_IP
-INST_TAIL;
-#endif
-$5	#ifdef NO_IP
-JUMP(a_target);
-#else
-SET_IP((Xt *)a_target);
-INST_TAIL; NEXT_P2;
-#endif
-}
-SUPER_CONTINUE;
-$6
-
-\+glocals
-
-$1-lp+!`#' ( `#'a_target `#'nlocals $2 ) $3_lp_plus_store_number
-$4	#ifdef NO_IP
-INST_TAIL;
-#endif
-$5	lp += nlocals;
-#ifdef NO_IP
-JUMP(a_target);
-#else
-SET_IP((Xt *)a_target);
-INST_TAIL; NEXT_P2;
-#endif
-}
-SUPER_CONTINUE;
+ifelse(condbranch_opt,`1',`SUPER_CONTINUE;',`/* condbranch_opt=0 */')
 
 \+
 )
@@ -629,13 +609,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 @ ;
@@ -722,7 +702,7 @@ c2 = toupper(c1);
 :
  dup [char] a - [ char z char a - 1 + ] Literal u<  bl and - ;
 
-capscompare	( c_addr1 u1 c_addr2 u2 -- n )	string
+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
@@ -751,6 +731,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
@@ -1742,12 +1725,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
@@ -1794,7 +1774,7 @@ u = strlen((char *)c_addr);
 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 */
 gforth_FP=fp;
@@ -1810,19 +1790,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);
@@ -2137,7 +2108,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);
 
@@ -2422,7 +2393,9 @@ r = fp[u];
 \g syslib
 
 open-lib	( c_addr1 u1 -- u2 )	gforth	open_lib
-#if defined(HAVE_LIBDL) || defined(HAVE_DLOPEN)
+#if 1
+u2 = (UCell)lt_dlopen(cstr(c_addr1, u1, 1));
+#elif defined(HAVE_LIBDL) || defined(HAVE_DLOPEN)
 #ifndef RTLD_GLOBAL
 #define RTLD_GLOBAL 0
 #endif
@@ -2437,7 +2410,9 @@ u2 = 0;
 #endif
 
 lib-sym	( c_addr1 u1 u2 -- u3 )	gforth	lib_sym
-#if defined(HAVE_LIBDL) || defined(HAVE_DLOPEN)
+#if 1
+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
@@ -2807,8 +2782,12 @@ uploop(i, 0, 7, `fcall(i)')
 fcall(20)
 
 \+
-\+
 
+lib-error ( -- c_addr u )       gforth  lib_error
+c_addr = lt_dlerror();
+u = (c_addr == NULL) ? 0 : strlen(c_addr);
+
+\+
 \g peephole
 
 \+peephole