--- gforth/prim	2006/10/21 22:13:48	1.197
+++ gforth/prim	2007/07/06 12:54:56	1.216
@@ -1,6 +1,6 @@
 \ Gforth primitives
 
-\ Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005 Free Software Foundation, Inc.
+\ Copyright (C) 1995,1996,1997,1998,2000,2003,2004,2005,2006 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -209,10 +209,16 @@ goto *next_code;
 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) */
 
@@ -248,6 +254,9 @@ SET_IP((Xt *)a_callee);
 
 execute	( xt -- )		core
 ""Perform the semantics represented by the execution token, @i{xt}.""
+#ifdef DEBUG
+fprintf(stderr, "execute %08x\n", xt);
+#endif
 #ifndef NO_IP
 ip=IP;
 #endif
@@ -329,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
@@ -340,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
@@ -355,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 */')
 
 \+
 )
@@ -626,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 @ ;
@@ -748,6 +724,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
@@ -809,10 +788,10 @@ n = n1*n2;
 
 /	( n1 n2 -- n )		core	slash
 n = n1/n2;
-if (CHECK_DIVISION && (n2 == 0))
-  throw(-10);
-if (CHECK_DIVISION && n2 == -1 && n1 == CELL_MIN)
-  throw(-11);
+if (CHECK_DIVISION_SW && n2 == 0)
+  throw(BALL_DIVZERO);
+if (CHECK_DIVISION_SW && n2 == -1 && n1 == CELL_MIN)
+  throw(BALL_RESULTRANGE);
 if (FLOORED_DIV && ((n1^n2) < 0) && (n1%n2 != 0))
   n--;
 :
@@ -820,10 +799,10 @@ if (FLOORED_DIV && ((n1^n2) < 0) && (n1%
 
 mod	( n1 n2 -- n )		core
 n = n1%n2;
-if (CHECK_DIVISION && (n2 == 0))
-  throw(-10);
-if (CHECK_DIVISION && n2 == -1 && n1 == CELL_MIN)
-  throw(-11);
+if (CHECK_DIVISION_SW && n2 == 0)
+  throw(BALL_DIVZERO);
+if (CHECK_DIVISION_SW && n2 == -1 && n1 == CELL_MIN)
+  throw(BALL_RESULTRANGE);
 if(FLOORED_DIV && ((n1^n2) < 0) && n!=0) n += n2;
 :
  /mod drop ;
@@ -831,10 +810,10 @@ if(FLOORED_DIV && ((n1^n2) < 0) && n!=0)
 /mod	( n1 n2 -- n3 n4 )		core		slash_mod
 n4 = n1/n2;
 n3 = n1%n2; /* !! is this correct? look into C standard! */
-if (CHECK_DIVISION && (n2 == 0))
-  throw(-10);
-if (CHECK_DIVISION && n2 == -1 && n1 == CELL_MIN)
-  throw(-11);
+if (CHECK_DIVISION_SW && n2 == 0)
+  throw(BALL_DIVZERO);
+if (CHECK_DIVISION_SW && n2 == -1 && n1 == CELL_MIN)
+  throw(BALL_RESULTRANGE);
 if (FLOORED_DIV && ((n1^n2) < 0) && n3!=0) {
   n4--;
   n3+=n2;
@@ -849,18 +828,18 @@ DCell d = mmul(n1,n2);
 #else
 DCell d = (DCell)n1 * (DCell)n2;
 #endif
-#ifdef BUGGY_LL_DIV
-DCell r = fmdiv(d,n3);
-n4=DHI(r);
-n5=DLO(r);
-#else
-/* assumes that the processor uses either floored or symmetric division */
-n5 = d/n3;
-n4 = d%n3;
+#ifdef ASM_SM_SLASH_REM
+ASM_SM_SLASH_REM(DLO(d), DHI(d), n3, n4, n5);
 if (FLOORED_DIV && ((DHI(d)^n3)<0) && n4!=0) {
+  if (CHECK_DIVISION && n5 == CELL_MIN)
+    throw(BALL_RESULTRANGE);
   n5--;
   n4+=n3;
 }
+#else
+DCell r = FLOORED_DIV ? fmdiv(d,n3) : smdiv(d,n3);
+n4=DHI(r);
+n5=DLO(r);
 #endif
 :
  >r m* r> fm/mod ;
@@ -872,13 +851,17 @@ DCell d = mmul(n1,n2);
 #else
 DCell d = (DCell)n1 * (DCell)n2;
 #endif
-#ifdef BUGGY_LL_DIV
-DCell r = fmdiv(d,n3);
-n4=DLO(r);
+#ifdef ASM_SM_SLASH_REM
+Cell remainder;
+ASM_SM_SLASH_REM(DLO(d), DHI(d), n3, remainder, n4);
+if (FLOORED_DIV && ((DHI(d)^n3)<0) && remainder!=0) {
+  if (CHECK_DIVISION && n4 == CELL_MIN)
+    throw(BALL_RESULTRANGE);
+  n4--;
+}
 #else
-/* assumes that the processor uses either floored or symmetric division */
-n4 = d/n3;
-if (FLOORED_DIV && ((DHI(d)^n3)<0) && (d%n3)!=0) n4--;
+DCell r = FLOORED_DIV ? fmdiv(d,n3) : smdiv(d,n3);
+n4=DLO(r);
 #endif
 :
  */mod nip ;
@@ -902,10 +885,11 @@ 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_LL_DIV
 #ifdef ASM_SM_SLASH_REM
-ASM_SM_SLASH_REM(d1.lo, d1.hi, n1, n2, n3);
+ASM_SM_SLASH_REM(DLO(d1), DHI(d1), n1, n2, n3);
 if (((DHI(d1)^n1)<0) && n2!=0) {
+  if (CHECK_DIVISION && n3 == CELL_MIN)
+    throw(BALL_RESULTRANGE);
   n3--;
   n2+=n1;
 }
@@ -914,24 +898,6 @@ DCell r = fmdiv(d1,n1);
 n2=DHI(r);
 n3=DLO(r);
 #endif /* !defined(ASM_SM_SLASH_REM) */
-#else
-#ifdef ASM_SM_SLASH_REM4
-ASM_SM_SLASH_REM4(d1, n1, n2, n3);
-if (((DHI(d1)^n1)<0) && n2!=0) {
-  n3--;
-  n2+=n1;
-}
-#else /* !defined(ASM_SM_SLASH_REM4) */
-/* assumes that the processor uses either floored or symmetric division */
-n3 = d1/n1;
-n2 = d1%n1;
-/* note that this 1%-3>0 is optimized by the compiler */
-if (1%-3>0 && ((DHI(d1)^n1)<0) && n2!=0) {
-  n3--;
-  n2+=n1;
-}
-#endif /* !defined(ASM_SM_SLASH_REM4) */
-#endif
 :
  dup >r dup 0< IF  negate >r dnegate r>  THEN
  over       0< IF  tuck + swap  THEN
@@ -940,28 +906,13 @@ if (1%-3>0 && ((DHI(d1)^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_LL_DIV
 #ifdef ASM_SM_SLASH_REM
-ASM_SM_SLASH_REM(d1.lo, d1.hi, n1, n2, n3);
+ASM_SM_SLASH_REM(DLO(d1), DHI(d1), n1, n2, n3);
 #else /* !defined(ASM_SM_SLASH_REM) */
 DCell r = smdiv(d1,n1);
 n2=DHI(r);
 n3=DLO(r);
 #endif /* !defined(ASM_SM_SLASH_REM) */
-#else
-#ifdef ASM_SM_SLASH_REM4
-ASM_SM_SLASH_REM4(d1, n1, n2, n3);
-#else /* !defined(ASM_SM_SLASH_REM4) */
-/* assumes that the processor uses either floored or symmetric division */
-n3 = d1/n1;
-n2 = d1%n1;
-/* note that this 1%-3<0 is optimized by the compiler */
-if (1%-3<0 && ((DHI(d1)^n1)<0) && n2!=0) {
-  n3++;
-  n2-=n1;
-}
-#endif /* !defined(ASM_SM_SLASH_REM4) */
-#endif
 :
  over >r dup >r abs -rot
  dabs rot um/mod
@@ -997,22 +948,13 @@ 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_LL_DIV
 #ifdef ASM_UM_SLASH_MOD
-ASM_UM_SLASH_MOD(ud.lo, ud.hi, u1, u2, u3);
+ASM_UM_SLASH_MOD(DLO(ud), DHI(ud), u1, u2, u3);
 #else /* !defined(ASM_UM_SLASH_MOD) */
 UDCell r = umdiv(ud,u1);
 u2=DHI(r);
 u3=DLO(r);
 #endif /* !defined(ASM_UM_SLASH_MOD) */
-#else
-#ifdef ASM_UM_SLASH_MOD4
-ASM_UM_SLASH_MOD4(ud, u1, u2, u3);
-#else /* !defined(ASM_UM_SLASH_MOD4) */
-u3 = ud/u1;
-u2 = ud%u1;
-#endif /* !defined(ASM_UM_SLASH_MOD4) */
-#endif
 :
    0 swap [ 8 cells 1 + ] literal 0
    ?DO /modstep
@@ -1065,12 +1007,7 @@ d2 = -d1;
 
 d2*	( d1 -- d2 )		double		d_two_star
 ""Shift left by 1; also works on unsigned numbers""
-#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
+d2 = DLSHIFT(d1,1);
 :
  2dup d+ ;
 
@@ -1529,6 +1466,11 @@ for (; f83name1 != NULL; f83name1 = (str
       memcasecmp(c_addr, f83name1->name, u)== 0 /* or inline? */)
     break;
 f83name2=f83name1;
+#ifdef DEBUG
+fprintf(stderr, "F83find ");
+fwrite(c_addr, u, 1, stderr);
+fprintf(stderr, " found %08x\n", f83name2); 
+#endif
 :
     BEGIN  dup WHILE  (find-samelen)  dup  WHILE
 	>r 2dup r@ cell+ char+ capscomp  0=
@@ -1684,8 +1626,6 @@ f = key_query((FILE*)wfileid);
 f = key_query(stdin);
 #endif
 
-\+os
-
 stdin	( -- wfileid )	gforth
 ""The standard input file of the Gforth process.""
 wfileid = (Cell)stdin;
@@ -1698,9 +1638,16 @@ stderr	( -- wfileid )	gforth
 ""The standard error output file of the Gforth process.""
 wfileid = (Cell)stderr;
 
+\+os
+
 form	( -- urows ucols )	gforth
-""The number of lines and columns in the terminal. These numbers may change
-with the window size.""
+""The number of lines and columns in the terminal. These numbers may
+change with the window size.  Note that it depends on the OS whether
+this reflects the actual size and changes with the window size
+(currently only on Unix-like OSs).  On other OSs you just get a
+default, and can tell Gforth the terminal size by setting the
+environment variables @code{COLUMNS} and @code{LINES} before starting
+Gforth.""
 /* we could block SIGWINCH here to get a consistent size, but I don't
  think this is necessary or always beneficial */
 urows=rows;
@@ -1771,12 +1718,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
@@ -1823,7 +1767,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;
@@ -2166,7 +2110,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);
 
@@ -2803,10 +2747,11 @@ define(`uploop',
 define(`_uploop',
        `ifelse($1, `$3', `$5',
 	       `$4`'define(`$1', incr($1))_uploop(`$1', `$2', `$3', `$4', `$5')')')
+
 \ argflist(argnum): Forth argument list
 define(argflist,
        `ifelse($1, 0, `',
-               `uploop(`_i', 1, $1, `format(`u%d ', _i)', `format(`u%d ', _i)')')')
+               `uploop(`_i', 1, $1, ``u''`_i ', ``u''`_i')')')
 \ argdlist(argnum): declare C's arguments
 define(argdlist,
        `ifelse($1, 0, `',
@@ -2814,15 +2759,15 @@ define(argdlist,
 \ argclist(argnum): pass C's arguments
 define(argclist,
        `ifelse($1, 0, `',
-               `uploop(`_i', 1, $1, `format(`u%d, ', _i)', `format(`u%d', _i)')')')
+               `uploop(`_i', 1, $1, ``u''`_i, ', ``u''`_i')')')
 \ icall(argnum)
 define(icall,
-`icall$1	( argflist($1)u -- uret )	gforth
+`icall$1	( argflist($1) u -- uret )	gforth
 uret = (SYSCALL(Cell(*)(argdlist($1)))u)(argclist($1));
 
 ')
 define(fcall,
-`fcall$1	( argflist($1)u -- rret )	gforth
+`fcall$1	( argflist($1) u -- rret )	gforth
 rret = (SYSCALL(Float(*)(argdlist($1)))u)(argclist($1));
 
 ')