--- gforth/prim	2003/11/06 09:47:49	1.148
+++ gforth/prim	2005/01/04 22:09:03	1.157
@@ -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.
 
@@ -249,7 +249,7 @@ execute	( xt -- )		core
 #ifndef NO_IP
 ip=IP;
 #endif
-IF_spTOS(spTOS = sp[0]);
+IF_spTOS(spTOS = sp[0]); /* inst_tail would produce a NEXT_P1 */
 SUPER_END;
 EXEC(xt);
 
@@ -259,7 +259,7 @@ perform	( a_addr -- )	gforth
 #ifndef NO_IP
 ip=IP;
 #endif
-IF_spTOS(spTOS = sp[0]);
+IF_spTOS(spTOS = sp[0]); /* inst_tail would produce a NEXT_P1 */
 SUPER_END;
 EXEC(*(Xt *)a_addr);
 :
@@ -324,7 +324,10 @@ 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 ;
 
@@ -433,8 +436,9 @@ condbranch((+loop),n R:nlimit R:n1 -- R:
 /* dependent upon two's complement arithmetic */
 Cell olddiff = n1-nlimit;
 n2=n1+n;	
-,if ((olddiff^(olddiff+n))>=0   /* the limit is not crossed */
-    || (olddiff^n)>=0          /* it is a wrap-around effect */) {
+,if (((olddiff^(olddiff+n))    /* the limit is not crossed */
+     &(olddiff^n))	       /* OR it is a wrap-around effect */
+    >=0) { /* & is used to avoid having two branches for gforth-native */
 ,:
  r> swap
  r> r> 2dup - >r
@@ -463,7 +467,7 @@ if (n<0) {
     newdiff = -newdiff;
 }
 n2=n1+n;
-,if (diff>=0 || newdiff<0) {
+,if (((~diff)|newdiff)<0) { /* use | to avoid two branches for gforth-native */
 ,)
 
 \+
@@ -987,12 +991,20 @@ w2 = ~w1;
 
 rshift	( u1 n -- u2 )		core	r_shift
 ""Logical shift right by @i{n} bits.""
-  u2 = u1>>n;
+#ifdef BROKEN_SHIFT
+  u2 = rshift(u1, n);
+#else
+  u2 = u1 >> n;
+#endif
 :
     0 ?DO 2/ MAXI and LOOP ;
 
 lshift	( u1 n -- u2 )		core	l_shift
-  u2 = u1<<n;
+#ifdef BROKEN_SHIFT
+  u2 = lshift(u1, n);
+#else
+  u2 = u1 << n;
+#endif
 :
     0 ?DO 2* LOOP ;
 
@@ -1589,16 +1601,8 @@ SUPER_END;
 return (Label *)n;
 
 (system)	( c_addr u -- wretval wior )	gforth	paren_system
-#ifndef MSDOS
-int old_tp=terminal_prepped;
-deprep_terminal();
-#endif
-wretval=system(cstr(c_addr,u,1)); /* ~ expansion on first part of string? */
+wretval = gforth_system(c_addr, u);  
 wior = IOR(wretval==-1 || (wretval==127 && errno != 0));
-#ifndef MSDOS
-if (old_tp)
-  prep_terminal();
-#endif
 
 getenv	( c_addr1 u1 -- c_addr2 u2 )	gforth
 ""The string @i{c-addr1 u1} specifies an environment variable. The string @i{c-addr2 u2}
@@ -1844,6 +1848,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
@@ -2353,7 +2372,11 @@ 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);
+#else
 av_longlong(alist, d);
+#endif
 
 av-ptr	( c_addr -- )	gforth  av_ptr
 av_ptr(alist, void*, c_addr);
@@ -2372,7 +2395,11 @@ 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);
+#else
 av_longlong(alist, d);
+#endif
 
 av-ptr-r	( R:c_addr -- )	gforth  av_ptr_r
 av_ptr(alist, void*, c_addr);
@@ -2404,7 +2431,12 @@ av-call-longlong	( -- d )	gforth  av_cal
 SAVE_REGS
 av_call(alist);
 REST_REGS
+#ifdef BUGGY_LONG_LONG
+d.lo = llrv;
+d.hi = 0;
+#else
 d = llrv;
+#endif
 
 av-call-ptr	( -- c_addr )	gforth  av_call_ptr
 SAVE_REGS
@@ -2437,7 +2469,12 @@ va-arg-int	( -- w )	gforth	va_arg_int
 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;
+#else
 d = va_arg_longlong(clist);
+#endif
 
 va-arg-ptr	( -- c_addr )	gforth	va_arg_ptr
 c_addr = (char *)va_arg_ptr(clist,char*);
@@ -2461,7 +2498,11 @@ va_return_ptr(clist, void *, c_addr);
 return 0;
 
 va-return-longlong ( d -- )	gforth va_return_longlong
+#ifdef BUGGY_LONG_LONG
+va_return_longlong(clist, d.lo);
+#else
 va_return_longlong(clist, d);
+#endif
 return 0;
 
 va-return-float ( r -- )	gforth va_return_float
@@ -2526,7 +2567,10 @@ compile_prim1(a_prim);
 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) */
 finish_code();
+IF_spTOS(spTOS=sp[0]);
 
 forget-dyncode ( c_code -- f ) gforth-internal forget_dyncode
 f = forget_dyncode(c_code);