--- gforth/prim	2004/08/27 15:53:50	1.155
+++ gforth/prim	2005/01/24 22:18:34	1.161
@@ -1,6 +1,6 @@
 \ Gforth primitives
 
-\ Copyright (C) 1995,1996,1997,1998,2000,2003 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003,2004 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -191,7 +191,7 @@ goto *next_code;
 ip=IP; /* undo any ip updating that may have been performed by NEXT_P0 */
 #endif /* !defined(NO_IP) */
 SUPER_END; /* !! probably unnecessary and may lead to measurement errors */
-EXEC(*(Xt *)PFA(CFA));
+VM_JUMP(EXEC1(*(Xt *)PFA(CFA)));
 
 (dofield) ( n1 -- n2 )	gforth-internal	paren_field
 ""run-time routine for fields""
@@ -251,7 +251,7 @@ ip=IP;
 #endif
 IF_spTOS(spTOS = sp[0]); /* inst_tail would produce a NEXT_P1 */
 SUPER_END;
-EXEC(xt);
+VM_JUMP(EXEC1(xt));
 
 perform	( a_addr -- )	gforth
 ""@code{@@ execute}.""
@@ -261,7 +261,7 @@ ip=IP;
 #endif
 IF_spTOS(spTOS = sp[0]); /* inst_tail would produce a NEXT_P1 */
 SUPER_END;
-EXEC(*(Xt *)a_addr);
+VM_JUMP(EXEC1(*(Xt *)a_addr));
 :
  @ execute ;
 
@@ -284,7 +284,7 @@ lit-perform	( #a_addr -- )	new	lit_perfo
 ip=IP;
 #endif
 SUPER_END;
-EXEC(*(Xt *)a_addr);
+VM_JUMP(EXEC1(*(Xt *)a_addr));
 
 does-exec ( #a_cfa -- R:nest a_pfa )	new	does_exec
 #ifdef NO_IP
@@ -324,15 +324,14 @@ INST_TAIL;
 JUMP(a_target);
 #else
 SET_IP((Xt *)a_target);
-INST_TAIL;
-NEXT_P2;
 #endif
-SUPER_CONTINUE;  /* we do our own control flow, so don't append NEXT etc. */
 :
  r> @ >r ;
 
 \ 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
@@ -342,6 +341,37 @@ $5	#ifdef NO_IP
 JUMP(a_target);
 #else
 SET_IP((Xt *)a_target);
+#endif
+}
+$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);
+#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
 }
@@ -820,7 +850,7 @@ n2 = n1>>1;
 
 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_LONG_LONG
+#ifdef BUGGY_LL_DIV
 DCell r = fmdiv(d1,n1);
 n2=r.hi;
 n3=r.lo;
@@ -842,7 +872,7 @@ 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_LONG_LONG
+#ifdef BUGGY_LL_DIV
 DCell r = smdiv(d1,n1);
 n2=r.hi;
 n3=r.lo;
@@ -863,7 +893,7 @@ if (1%-3<0 && (d1<0) != (n1<0) && n2!=0)
  r>        0< IF  swap negate swap  THEN ;
 
 m*	( n1 n2 -- d )		core	m_star
-#ifdef BUGGY_LONG_LONG
+#ifdef BUGGY_LL_MUL
 d = mmul(n1,n2);
 #else
 d = (DCell)n1 * (DCell)n2;
@@ -875,7 +905,7 @@ d = (DCell)n1 * (DCell)n2;
 
 um*	( u1 u2 -- ud )		core	u_m_star
 /* use u* as alias */
-#ifdef BUGGY_LONG_LONG
+#ifdef BUGGY_LL_MUL
 ud = ummul(u1,u2);
 #else
 ud = (UDCell)u1 * (UDCell)u2;
@@ -891,7 +921,7 @@ 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_LONG_LONG
+#ifdef BUGGY_LL_DIV
 UDCell r = umdiv(ud,u1);
 u2=r.hi;
 u3=r.lo;
@@ -910,9 +940,9 @@ u2 = ud%u1;
    and >r >r 2dup d+ swap r> + swap r> ;
 
 m+	( d1 n -- d2 )		double		m_plus
-#ifdef BUGGY_LONG_LONG
-d2.lo = d1.lo+n;
-d2.hi = d1.hi - (n<0) + (d2.lo<d1.lo);
+#ifdef BUGGY_LL_ADD
+DLO_IS(d2, DLO(d1)+n);
+DHI_IS(d2, DHI(d1) - (n<0) + (DLO(d2)<DLO(d1)));
 #else
 d2 = d1+n;
 #endif
@@ -920,9 +950,9 @@ d2 = d1+n;
  s>d d+ ;
 
 d+	( d1 d2 -- d )		double	d_plus
-#ifdef BUGGY_LONG_LONG
-d.lo = d1.lo+d2.lo;
-d.hi = d1.hi + d2.hi + (d.lo<d1.lo);
+#ifdef BUGGY_LL_ADD
+DLO_IS(d, DLO(d1) + DLO(d2));
+DHI_IS(d, DHI(d1) + DHI(d2) + (d.lo<DLO(d1)));
 #else
 d = d1+d2;
 #endif
@@ -930,9 +960,9 @@ d = d1+d2;
  rot + >r tuck + swap over u> r> swap - ;
 
 d-	( d1 d2 -- d )		double		d_minus
-#ifdef BUGGY_LONG_LONG
-d.lo = d1.lo - d2.lo;
-d.hi = d1.hi-d2.hi-(d1.lo<d2.lo);
+#ifdef BUGGY_LL_ADD
+DLO_IS(d, DLO(d1) - DLO(d2));
+DHI_IS(d, DHI(d1)-DHI(d2)-(DLO(d1)<DLO(d2)));
 #else
 d = d1-d2;
 #endif
@@ -941,7 +971,7 @@ d = d1-d2;
 
 dnegate	( d1 -- d2 )		double	d_negate
 /* use dminus as alias */
-#ifdef BUGGY_LONG_LONG
+#ifdef BUGGY_LL_ADD
 d2 = dnegate(d1);
 #else
 d2 = -d1;
@@ -951,9 +981,9 @@ d2 = -d1;
 
 d2*	( d1 -- d2 )		double		d_two_star
 ""Shift left by 1; also works on unsigned numbers""
-#ifdef BUGGY_LONG_LONG
-d2.lo = d1.lo<<1;
-d2.hi = (d1.hi<<1) | (d1.lo>>(CELL_BITS-1));
+#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
@@ -963,9 +993,9 @@ d2 = 2*d1;
 d2/	( d1 -- d2 )		double		d_two_slash
 ""Arithmetic shift right by 1.  For signed numbers this is a floored
 division by 2.""
-#ifdef BUGGY_LONG_LONG
-d2.hi = d1.hi>>1;
-d2.lo= (d1.lo>>1) | (d1.hi<<(CELL_BITS-1));
+#ifdef BUGGY_LL_SHIFT
+DHI_IS(d2, DHI(d1)>>1);
+DLO_IS(d2, (DLO(d1)>>1) | (DHI(d1)<<(CELL_BITS-1)));
 #else
 d2 = d1>>1;
 #endif
@@ -1068,42 +1098,42 @@ comparisons(u, u1 u2, u_, u1, u2, gforth
 \ dcomparisons(prefix, args, prefix, arg1, arg2, wordsets...)
 define(dcomparisons,
 $1=	( $2 -- f )		$6	$3equals
-#ifdef BUGGY_LONG_LONG
+#ifdef BUGGY_LL_CMP
 f = FLAG($4.lo==$5.lo && $4.hi==$5.hi);
 #else
 f = FLAG($4==$5);
 #endif
 
 $1<>	( $2 -- f )		$7	$3not_equals
-#ifdef BUGGY_LONG_LONG
+#ifdef BUGGY_LL_CMP
 f = FLAG($4.lo!=$5.lo || $4.hi!=$5.hi);
 #else
 f = FLAG($4!=$5);
 #endif
 
 $1<	( $2 -- f )		$8	$3less_than
-#ifdef BUGGY_LONG_LONG
+#ifdef BUGGY_LL_CMP
 f = FLAG($4.hi==$5.hi ? $4.lo<$5.lo : $4.hi<$5.hi);
 #else
 f = FLAG($4<$5);
 #endif
 
 $1>	( $2 -- f )		$9	$3greater_than
-#ifdef BUGGY_LONG_LONG
+#ifdef BUGGY_LL_CMP
 f = FLAG($4.hi==$5.hi ? $4.lo>$5.lo : $4.hi>$5.hi);
 #else
 f = FLAG($4>$5);
 #endif
 
 $1<=	( $2 -- f )		gforth	$3less_or_equal
-#ifdef BUGGY_LONG_LONG
+#ifdef BUGGY_LL_CMP
 f = FLAG($4.hi==$5.hi ? $4.lo<=$5.lo : $4.hi<=$5.hi);
 #else
 f = FLAG($4<=$5);
 #endif
 
 $1>=	( $2 -- f )		gforth	$3greater_or_equal
-#ifdef BUGGY_LONG_LONG
+#ifdef BUGGY_LL_CMP
 f = FLAG($4.hi==$5.hi ? $4.lo>=$5.lo : $4.hi>=$5.hi);
 #else
 f = FLAG($4>=$5);
@@ -1848,6 +1878,21 @@ char * string = cstr(c_addr1, u1, 1);
 char * pattern = cstr(c_addr2, u2, 0);
 flag = FLAG(!fnmatch(pattern, string, 0));
 
+set-dir	( c_addr u -- wior )	gforth set_dir
+""Change the current directory to @i{c-addr, u}.
+Return an error if this is not possible""
+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);
+if(c_addr2 != NULL) {
+  u2 = strlen(c_addr2);
+} else {
+  u2 = 0;
+}
+
 \+
 
 newline	( -- c_addr u )	gforth
@@ -1890,11 +1935,7 @@ 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
+dsystem = DZERO;
 #endif
 
 \+
@@ -1907,13 +1948,17 @@ comparisons(f, r1 r2, f_, r1, r2, gforth
 comparisons(f0, r, f_zero_, r, 0., float, gforth, float, gforth)
 
 d>f	( d -- r )		float	d_to_f
-#ifdef BUGGY_LONG_LONG
+#ifdef BUGGY_LL_D2F
 extern double ldexp(double x, int exp);
-if (d.hi<0) {
+if (DHI(d)<0) {
+#ifdef BUGGY_LL_ADD
   DCell d2=dnegate(d);
-  r = -(ldexp((Float)d2.hi,CELL_BITS) + (Float)d2.lo);
+#else
+  DCell d2=-d;
+#endif
+  r = -(ldexp((Float)DHI(d2),CELL_BITS) + (Float)DLO(d2));
 } else
-  r = ldexp((Float)d.hi,CELL_BITS) + (Float)d.lo;
+  r = ldexp((Float)DHI(d),CELL_BITS) + (Float)DLO(d);
 #else
 r = d;
 #endif
@@ -2357,8 +2402,8 @@ av-double	( r -- )	gforth  av_double
 av_double(alist, r);
 
 av-longlong	( d -- )	gforth  av_longlong
-#ifdef BUGGY_LONG_LONG
-av_longlong(alist, d.lo);
+#ifdef BUGGY_LL_SIZE
+av_longlong(alist, DLO(d));
 #else
 av_longlong(alist, d);
 #endif
@@ -2380,8 +2425,8 @@ lp += sizeof(Float);
 av_double(alist, r);
 
 av-longlong-r	( R:d -- )	gforth  av_longlong_r
-#ifdef BUGGY_LONG_LONG
-av_longlong(alist, d.lo);
+#ifdef BUGGY_LL_SIZE
+av_longlong(alist, DLO(d));
 #else
 av_longlong(alist, d);
 #endif
@@ -2417,8 +2462,8 @@ SAVE_REGS
 av_call(alist);
 REST_REGS
 #ifdef BUGGY_LONG_LONG
-d.lo = llrv;
-d.hi = 0;
+DLO_IS(d, llrv);
+DHI_IS(d, 0);
 #else
 d = llrv;
 #endif
@@ -2455,8 +2500,8 @@ w = va_arg_int(clist);
 
 va-arg-longlong	( -- d )	gforth	va_arg_longlong
 #ifdef BUGGY_LONG_LONG
-d.lo = va_arg_longlong(clist);
-d.hi = 0;
+DLO_IS(d, va_arg_longlong(clist));
+DHI_IS(d, 0);
 #else
 d = va_arg_longlong(clist);
 #endif