--- gforth/prim	2007/06/01 18:40:20	1.213
+++ gforth/prim	2007/09/16 16:26:11	1.218
@@ -109,9 +109,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
 
 \ 
 \ 
@@ -338,8 +338,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
@@ -349,8 +347,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
@@ -364,43 +364,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 */')
 
 \+
 )
@@ -635,13 +602,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 @ ;
@@ -1816,19 +1783,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);
@@ -2143,7 +2101,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);