--- gforth/prim	2003/11/08 20:29:03	1.149
+++ gforth/prim	2004/06/19 18:47:26	1.154
@@ -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 ;
 
@@ -988,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 ;
 
@@ -2354,7 +2365,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);
@@ -2373,7 +2388,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);
@@ -2405,7 +2424,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
@@ -2438,7 +2462,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*);
@@ -2462,7 +2491,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