Merge pull request #31 from codereport/remove-32

Removing 32-bit Support

Author: codereport

base64/lib/arch/generic/32/dec_loop.c

@@ -7,32 +7,17 @@
 #include "../../codecs.h"
 #include "../../env.h"
 
-#if BASE64_WORDSIZE == 32
-#  include "32/enc_loop.c"
-#elif BASE64_WORDSIZE == 64
-#  include "64/enc_loop.c"
-#endif
-
-#if BASE64_WORDSIZE >= 32
-#  include "32/dec_loop.c"
-#endif
+#include "64/enc_loop.c"
 
 BASE64_ENC_FUNCTION(plain)
 {
 	#include "enc_head.c"
-#if BASE64_WORDSIZE == 32
-	enc_loop_generic_32(&s, &slen, &o, &olen);
-#elif BASE64_WORDSIZE == 64
 	enc_loop_generic_64(&s, &slen, &o, &olen);
-#endif
 	#include "enc_tail.c"
 }
 
 BASE64_DEC_FUNCTION(plain)
 {
 	#include "dec_head.c"
-#if BASE64_WORDSIZE >= 32
-	dec_loop_generic_32(&s, &slen, &o, &olen);
-#endif
 	#include "dec_tail.c"
 }

base64/lib/arch/generic/32/enc_loop.c

@@ -89,11 +89,7 @@ F1(jtbdot){A b,h=0;I j=0,n,*v;
 /* 2 - box list of results corresp. to arguments    */
 /*     unused entries are set to 0                  */
 
-#if SY_64
 #define HIC(x,y)  ((UI)x+10495464745870458733U*(UI)y)
-#else
-#define HIC(x,y)  ((UI)x+2838338383U*(UI)y)
-#endif
 
 static A jtmemoget(J jt,I x,I y,A self){A h,*hv,q;I*jv,k,m,*v;
  h=FAV(self)->fgh[2]; hv=AAV(h); 

base64/lib/arch/generic/codec-generic.c

@@ -39,14 +39,8 @@ static A jtmerge1(J jt,A w,A ind){A z;B*b;C*wc,*zc;D*wd,*zd;I c,it,j,k,m,r,*s,t,
  switch(MCASE(CTTZ(it),k)){
   case MCASE(B01X,sizeof(C)): DO(c,         *zc++=wc[i+c*(I)*b++];); break;
   case MCASE(B01X,sizeof(I)): DO(c,         *zi++=wi[i+c*(I)*b++];); break;
-#if !SY_64
-  case MCASE(B01X,sizeof(D)): DO(c,         *zd++=wd[i+c*(I)*b++];); break;
-#endif
   case MCASE(INTX,sizeof(C)): DO(c, MINDEX; *zc++=wc[i+c*j];); break;
   case MCASE(INTX,sizeof(I)): DO(c, MINDEX; *zi++=wi[i+c*j];); break;
-#if !SY_64
-  case MCASE(INTX,sizeof(D)): DO(c, MINDEX; *zd++=wd[i+c*j];); break;
-#endif  
   default: if(it&B01)DO(c,         MC(zc,wc+k*(i+c*(I)*b++),k); zc+=k;)
            else      DO(c, MINDEX; MC(zc,wc+k*(i+c*j     ),k); zc+=k;); break;
  }

jsrc/a.c

@@ -151,13 +151,9 @@ static int javaWd(JNIEnv *env, jclass jcls, int type, A w, A *pz, const char*loc
         pinta[3*i+2] = -1;
       }
       jintArray intb= (*env)->NewIntArray(env, AN(*w1));
-#if SY_64
       jint *pintb = (*env)->GetIntArrayElements(env, intb, 0);
       for (j=0; j<AN(*w1); j++) pintb[j]=(jint)*(AV(*w1)+j);
       (*env)->ReleaseIntArrayElements(env, intb, pintb, 0);
-#else
-      (*env)->SetIntArrayRegion(env, intb, 0, AN(*w1), (jint*)AV(*w1));
-#endif
       (*env)->SetObjectArrayElement(env, inarr, i, intb);
       (*env)->DeleteLocalRef(env,intb);
     }
@@ -202,13 +198,9 @@ static int javaWd(JNIEnv *env, jclass jcls, int type, A w, A *pz, const char*loc
         } else {
           *pz=jega(INT,len,2,ishape);
         }
-#if SY_64
         jint *parray = (*env)->GetIntArrayElements(env, array, 0);
         for (j=0; j<len; j++) *(AV(*pz)+j)=parray[j];
         (*env)->ReleaseIntArrayElements(env, array, parray, 0);
-#else
-        (*env)->GetIntArrayRegion(env, array, 0, len, (jint*)AV(*pz));
-#endif
       } else {
         LOGD("result not string or integers");
         rc=3;

jsrc/am.c

@@ -87,11 +87,7 @@ static DF1(jtobqfslash){A y,z;B b=0,p;C er,id,*wv;I c,d,k,m,m1,mn,n,n1,r,*s,wt;
 }    /* f//.y for atomic f */
 
 
-#if SY_64
 #define TYMESF(x)       {LD t=*u--*(LD)*v++; x=(I)t; BOV(t<IMIN||IMAX<t);}
-#else
-#define TYMESF(x)       {D  t=*u--*( D)*v++; x=(I)t; BOV(t<IMIN||IMAX<t);}
-#endif
 #define ACCUMF          {B p;I y; TYMESF(y); p=0>x; x+=y; BOV(p==0>y&&p!=0>x);}
 
 #define PMCASE(t,c,d)   (65536*(c)+256*(d)+(t))

jsrc/andjnative.c

@@ -15,12 +15,7 @@ static DF1(jtreduce);
 #define PARITY2         u=(B*)&s; b=0; b^=*u++; b^=*u++;
 #define PARITY4         u=(B*)&s; b=0; b^=*u++; b^=*u++; b^=*u++; b^=*u++; 
 #define PARITY8         u=(B*)&s; b=0; b^=*u++; b^=*u++; b^=*u++; b^=*u++; b^=*u++; b^=*u++; b^=*u++; b^=*u++;
-
-#if SY_64
 #define PARITYW         PARITY8
-#else
-#define PARITYW         PARITY4
-#endif  
 
 #if SY_ALIGN
 #define VDONE(T,PAR)  \

jsrc/ao.c

@@ -36,13 +36,8 @@ static X jtxmodpow(J jt,A a,A w,A h){A ox,z;
 }
 
 #define DMOD 46340         /* <. %: _1+2^31 */
-
-#if SY_64
 #define XMOD 3037000499    /* <. %: _1+2^63 */
-#else
-#define XMOD 94906265      /* <. %: _1+2^53 */
 static I dmodpow(D x,I n,D m){D z=1; while(n){if(1&n)z=fmod(z*x,m); x=fmod(x*x,m); n>>=1;} R(I)z;}
-#endif
 
 static I imodpow(I x,I n,I m){I z=1; while(n){if(1&n)z=(z*x)%m;     x=(x*x)%m;     n>>=1;} R   z;}
 
@@ -62,11 +57,7 @@ static DF2(jtmodpow2){A h;B b,c;I at,m,n,wt,x,z;
  if(XMOD<m||XMOD<-m||m==IMIN||x==IMIN)R cvt(INT,xmodpow(a,w,h));
  if(b=0>m)m=-m;
  if(c=0>x)x=-x; x=x%m; if(c)x=m-x;
-#if SY_64
  z=imodpow(x,n,m);
-#else
- z=m>DMOD?dmodpow((D)x,n,(D)m):imodpow(x,n,m);
-#endif
  R sc(b?z-m:z);
 }    /* a m&|@^ w ; m guaranteed to be INT or XNUM */
 

jsrc/ar.c

@@ -543,11 +543,7 @@ static A jtgetnewpd(J jt, UC* pd, A pd0){A new;
 }
 
 // copy n atoms of type wt to type zt
-#if SY_64
 void copyTT(void *zv, void *wv, I n, I zt, I wt){
-#else
-void jtcopyTT(J jt, void *zv, void *wv, I n, I zt, I wt){
-#endif
   if(TYPESEQ(zt,wt))MC(zv,wv,n<<bplg(zt));
   else if(zt&INT){I *targ=zv; B *src=wv; DQ(n, *targ++ = *src++;)}  // B01-> int promotion
   else {D *targ=zv; I *src=wv; DQ(n, *targ++ = (D)*src++;)}
@@ -759,13 +755,7 @@ DF2(jtcut2){F2PREFIP;PROLOG(0025);A fs,z,zz;I neg,pfx;C id,*v1,*wv,*zc;I cger[12
   VARPS adocv; varps(adocv,fs,wt,0);  // qualify the operation, returning action routine and conversion info
   if(adocv.f){C*z0=0,*zc;I t,zk,zt;  // if the operation is a primitive that we can  apply / to...  z0 will hold a neutral if we have to calculate one
    zt=rtype(adocv.cv);
-#if SY_64
    GA(zz,zt,m*wcn,r,AS(w)); AS(zz)[0]=m; 
-#else
-   // plusinsI writes past the end of its result area if d==1 and there is overflow (normally that would be OK and would be converted to D inplace).  Here it overruns the buffer,
-   // so we allocate one extra word just in case
-   GA(zz,zt,m*wcn+1,r,AS(w)); AS(zz)[0]=m; AN(zz)=m*wcn;
-#endif
    if(!AN(zz))R zz;  // don't run function on empty arg
    I atomsize=bpnoun(zt);
    zc=CAV(zz); zk=wcn*atomsize;