[gforth] / gforth / prim  

gforth: gforth/prim

Diff for /gforth/prim between version 1.197 and 1.198

version 1.197, Sat Oct 21 22:13:48 2006 UTC version 1.198, Sun Oct 22 16:54:00 2006 UTC
Line 809 
Line 809 
   
 /       ( n1 n2 -- n )          core    slash  /       ( n1 n2 -- n )          core    slash
 n = n1/n2;  n = n1/n2;
 if (CHECK_DIVISION && (n2 == 0))  if (CHECK_DIVISION && n2 == 0)
   throw(-10);    throw(BALL_DIVZERO);
 if (CHECK_DIVISION && n2 == -1 && n1 == CELL_MIN)  if (CHECK_DIVISION && n2 == -1 && n1 == CELL_MIN)
   throw(-11);    throw(BALL_RESULTRANGE);
 if (FLOORED_DIV && ((n1^n2) < 0) && (n1%n2 != 0))  if (FLOORED_DIV && ((n1^n2) < 0) && (n1%n2 != 0))
   n--;    n--;
 :  :
Line 820 
Line 820 
   
 mod     ( n1 n2 -- n )          core  mod     ( n1 n2 -- n )          core
 n = n1%n2;  n = n1%n2;
 if (CHECK_DIVISION && (n2 == 0))  if (CHECK_DIVISION && n2 == 0)
   throw(-10);    throw(BALL_DIVZERO);
 if (CHECK_DIVISION && n2 == -1 && n1 == CELL_MIN)  if (CHECK_DIVISION && n2 == -1 && n1 == CELL_MIN)
   throw(-11);    throw(BALL_RESULTRANGE);
 if(FLOORED_DIV && ((n1^n2) < 0) && n!=0) n += n2;  if(FLOORED_DIV && ((n1^n2) < 0) && n!=0) n += n2;
 :  :
  /mod drop ;   /mod drop ;
Line 831 
Line 831 
 /mod    ( n1 n2 -- n3 n4 )              core            slash_mod  /mod    ( n1 n2 -- n3 n4 )              core            slash_mod
 n4 = n1/n2;  n4 = n1/n2;
 n3 = n1%n2; /* !! is this correct? look into C standard! */  n3 = n1%n2; /* !! is this correct? look into C standard! */
 if (CHECK_DIVISION && (n2 == 0))  if (CHECK_DIVISION && n2 == 0)
   throw(-10);    throw(BALL_DIVZERO);
 if (CHECK_DIVISION && n2 == -1 && n1 == CELL_MIN)  if (CHECK_DIVISION && n2 == -1 && n1 == CELL_MIN)
   throw(-11);    throw(BALL_RESULTRANGE);
 if (FLOORED_DIV && ((n1^n2) < 0) && n3!=0) {  if (FLOORED_DIV && ((n1^n2) < 0) && n3!=0) {
   n4--;    n4--;
   n3+=n2;    n3+=n2;
Line 844 
Line 844 
   
 */mod   ( n1 n2 n3 -- n4 n5 )   core    star_slash_mod  */mod   ( n1 n2 n3 -- n4 n5 )   core    star_slash_mod
 ""n1*n2=n3*n5+n4, with the intermediate result (n1*n2) being double.""  ""n1*n2=n3*n5+n4, with the intermediate result (n1*n2) being double.""
   DCell d5;
 #ifdef BUGGY_LL_MUL  #ifdef BUGGY_LL_MUL
 DCell d = mmul(n1,n2);  DCell d = mmul(n1,n2);
 #else  #else
Line 855 
Line 856 
 n5=DLO(r);  n5=DLO(r);
 #else  #else
 /* assumes that the processor uses either floored or symmetric division */  /* assumes that the processor uses either floored or symmetric division */
 n5 = d/n3;  d5 = d/n3;
 n4 = d%n3;  n4 = d%n3;
   if (CHECK_DIVISION && n3 == 0)
     throw(BALL_DIVZERO);
 if (FLOORED_DIV && ((DHI(d)^n3)<0) && n4!=0) {  if (FLOORED_DIV && ((DHI(d)^n3)<0) && n4!=0) {
   n5--;    d5--;
   n4+=n3;    n4+=n3;
 }  }
   n5 = d5;
   if (d5 != n5)
     throw(BALL_RESULTRANGE);
 #endif  #endif
 :  :
  >r m* r> fm/mod ;   >r m* r> fm/mod ;
   
 */      ( n1 n2 n3 -- n4 )      core    star_slash  */      ( n1 n2 n3 -- n4 )      core    star_slash
 ""n4=(n1*n2)/n3, with the intermediate result being double.""  ""n4=(n1*n2)/n3, with the intermediate result being double.""
   DCell d4;
 #ifdef BUGGY_LL_MUL  #ifdef BUGGY_LL_MUL
 DCell d = mmul(n1,n2);  DCell d = mmul(n1,n2);
 #else  #else
Line 877 
Line 884 
 n4=DLO(r);  n4=DLO(r);
 #else  #else
 /* assumes that the processor uses either floored or symmetric division */  /* assumes that the processor uses either floored or symmetric division */
 n4 = d/n3;  d4 = d/n3;
 if (FLOORED_DIV && ((DHI(d)^n3)<0) && (d%n3)!=0) n4--;  if (CHECK_DIVISION && n3 == 0)
     throw(BALL_DIVZERO);
   if (FLOORED_DIV && ((DHI(d)^n3)<0) && (d%n3)!=0)
     d4--;
   n4 = d4;
   if (d4 != n4)
     throw(BALL_RESULTRANGE);
 #endif  #endif
 :  :
  */mod nip ;   */mod nip ;
Line 906 
Line 919 
 #ifdef ASM_SM_SLASH_REM  #ifdef ASM_SM_SLASH_REM
 ASM_SM_SLASH_REM(d1.lo, d1.hi, n1, n2, n3);  ASM_SM_SLASH_REM(d1.lo, d1.hi, n1, n2, n3);
 if (((DHI(d1)^n1)<0) && n2!=0) {  if (((DHI(d1)^n1)<0) && n2!=0) {
     if (n3 == CELL_MIN)
       throw(BALL_RESULTRANGE);
   n3--;    n3--;
   n2+=n1;    n2+=n1;
 }  }
Line 918 
Line 933 
 #ifdef ASM_SM_SLASH_REM4  #ifdef ASM_SM_SLASH_REM4
 ASM_SM_SLASH_REM4(d1, n1, n2, n3);  ASM_SM_SLASH_REM4(d1, n1, n2, n3);
 if (((DHI(d1)^n1)<0) && n2!=0) {  if (((DHI(d1)^n1)<0) && n2!=0) {
     if (n3 == CELL_MIN)
       throw(BALL_RESULTRANGE);
   n3--;    n3--;
   n2+=n1;    n2+=n1;
 }  }
 #else /* !defined(ASM_SM_SLASH_REM4) */  #else /* !defined(ASM_SM_SLASH_REM4) */
 /* assumes that the processor uses either floored or symmetric division */  /* assumes that the processor uses either floored or symmetric division */
 n3 = d1/n1;  DCell d3 = d1/n1;
 n2 = d1%n1;  n2 = d1%n1;
   if (CHECK_DIVISION && n1 == 0)
     throw(BALL_DIVZERO);
 /* note that this 1%-3>0 is optimized by the compiler */  /* note that this 1%-3>0 is optimized by the compiler */
 if (1%-3>0 && ((DHI(d1)^n1)<0) && n2!=0) {  if (1%-3>0 && ((DHI(d1)^n1)<0) && n2!=0) {
   n3--;    d3--;
   n2+=n1;    n2+=n1;
 }  }
   n3 = d3;
   if (d3 != n3)
     throw(BALL_RESULTRANGE);
 #endif /* !defined(ASM_SM_SLASH_REM4) */  #endif /* !defined(ASM_SM_SLASH_REM4) */
 #endif  #endif
 :  :
Line 953 
Line 975 
 ASM_SM_SLASH_REM4(d1, n1, n2, n3);  ASM_SM_SLASH_REM4(d1, n1, n2, n3);
 #else /* !defined(ASM_SM_SLASH_REM4) */  #else /* !defined(ASM_SM_SLASH_REM4) */
 /* assumes that the processor uses either floored or symmetric division */  /* assumes that the processor uses either floored or symmetric division */
 n3 = d1/n1;  DCell d3 = d1/n1;
 n2 = d1%n1;  n2 = d1%n1;
   if (CHECK_DIVISION && n1 == 0)
     throw(BALL_DIVZERO);
 /* note that this 1%-3<0 is optimized by the compiler */  /* note that this 1%-3<0 is optimized by the compiler */
 if (1%-3<0 && ((DHI(d1)^n1)<0) && n2!=0) {  if (1%-3<0 && ((DHI(d1)^n1)<0) && n2!=0) {
   n3++;    d3++;
   n2-=n1;    n2-=n1;
 }  }
   n3 = d3;
   if (d3 != n3)
     throw(BALL_RESULTRANGE);
 #endif /* !defined(ASM_SM_SLASH_REM4) */  #endif /* !defined(ASM_SM_SLASH_REM4) */
 #endif  #endif
 :  :
Line 1009 
Line 1036 
 #ifdef ASM_UM_SLASH_MOD4  #ifdef ASM_UM_SLASH_MOD4
 ASM_UM_SLASH_MOD4(ud, u1, u2, u3);  ASM_UM_SLASH_MOD4(ud, u1, u2, u3);
 #else /* !defined(ASM_UM_SLASH_MOD4) */  #else /* !defined(ASM_UM_SLASH_MOD4) */
 u3 = ud/u1;  UDCell ud3 = ud/u1;
 u2 = ud%u1;  u2 = ud%u1;
   if (CHECK_DIVISION && u1 == 0)
     throw(BALL_DIVZERO);
   u3 = ud3;
   if (ud3 != u3)
     throw(BALL_RESULTRANGE);
 #endif /* !defined(ASM_UM_SLASH_MOD4) */  #endif /* !defined(ASM_UM_SLASH_MOD4) */
 #endif  #endif
 :  :

Generate output suitable for use with a patch program
Legend:
Removed from v.1.197  
changed lines
  Added in v.1.198
CVS Admin

Powered by ViewCVS 1.0-dev 		(Powered by ViewCVS)

ViewCVS and CVS Help