Merge branch 'master' of jsoftware.com:jsource

Author: HenryHRich

jsrc/Android.mk

@@ -19,7 +19,7 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
   LOCAL_LDFLAGS += -fopenmp -static-openmp
 endif
 ifeq ($(TARGET_ARCH_ABI),armeabi)
-  LOCAL_CFLAGS := -std=c99 -Wno-unknown-warning-option -fPIC -Os -fvisibility=hidden -fwrapv -Werror -Wno-string-plus-int -Wno-empty-body -Wno-parentheses -Wno-pointer-sign -Wno-pointer-to-int-cast -Wno-logical-op-parentheses -Wno-unused-value -Wno-null-dereference -Wno-type-limits -fno-strict-aliasing -mfloat-abi=softfp -march=armv5te -Wno-sign-compare
+  LOCAL_CFLAGS := -std=c99 -Wno-unknown-warning-option -fPIC -Os -fvisibility=hidden -fwrapv -Werror -Wno-overflow -Wno-string-plus-int -Wno-empty-body -Wno-int-to-pointer-cast -Wno-parentheses -Wno-pointer-sign -Wno-pointer-to-int-cast -Wno-logical-op-parentheses -Wno-unused-value -Wno-null-dereference -Wno-type-limits -fno-strict-aliasing -mfloat-abi=softfp -march=armv5te -Wno-sign-compare
   LOCAL_ARM_MODE := arm
   LOCAL_CFLAGS += -fopenmp
   LOCAL_LDFLAGS += -fopenmp

jsrc/j.h

@@ -442,6 +442,23 @@ extern unsigned int __cdecl _clearfp (void);
 #endif
 #endif
 
+#if !SY_64 && defined(__GNUC__) && !defined(__clang__)
+#if __GNUC__ < 5
+#define __builtin_add_overflow(a,b,c) ({int64_t s=(int64_t)(a)+(int64_t)(b); *(c)=(long)s; (s<INT_MIN||s>INT_MAX);})
+#define __builtin_sub_overflow(a,b,c) ({int64_t s=(int64_t)(a)-(int64_t)(b); *(c)=(long)s; (s<INT_MIN||s>INT_MAX);})
+#define __builtin_mul_overflow(a,b,c) ({int64_t s=(int64_t)(a)*(int64_t)(b); *(c)=(long)s; (s<INT_MIN||s>INT_MAX);})
+#endif
+#endif
+
+#if defined(__clang__) && ( (__clang_major__ > 3) || ((__clang_major__ == 3) && (__clang_minor__ > 5)))
+/* needed by clang newer versions, no matter double_trick is inline asm or not */
+#define NOOPTIMIZE __attribute__((optnone))
+#elif __GNUC__ > 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ > 3))
+#define NOOPTIMIZE __attribute__((optimize("O0")))
+#else
+#define NOOPTIMIZE
+#endif
+
 #define NALP            256             /* size of alphabet                */
 #define NETX            2000            /* size of error display buffer    */
 #define NPP             20              /* max value for quad pp           */
@@ -1091,7 +1108,7 @@ if(likely(!((I)jtinplace&JTWILLBEOPENED)))z=EPILOGNORET(z); RETF(z); \
 // Note: assigns name before assigning the components of the array, so the components had better not depend on name, i. e. no GATV(z,BOX,AN(z),AR(z),AS(z))
 #define GATVS(name,type,atoms,rank,shaape,size,shapecopier,erraction) \
 { I bytes = ALLOBYTES(atoms,rank,size,(type)&LAST0,(type)&NAME); \
- if(SY_64){ASSERT((((I)(atoms)>>(TOOMANYATOMSX-RANKTX))|(I)(rank))<=RMAX,EVLIMIT)} \
+ if(SY_64){ASSERT((((I)(atoms)>>(SY_64?(TOOMANYATOMSX-RANKTX):0))|(I)(rank))<=RMAX,EVLIMIT)} \
  else{ASSERT(((I)bytes>(I)(atoms)&&(I)(atoms)>=(I)0)&&!((rank)&~RMAX),EVLIMIT)} \
  HISTOCALL \
  name = jtgafv(jt, bytes);   \

jsrc/va1.c

@@ -247,4 +247,4 @@ DF2(jtdeadband){A zz;
  )
  RETF(zz);
 }
-#endif
+#endif

jsrc/va1ss.c

@@ -15,7 +15,12 @@
 
 #define SSINGENC(type) ((type)>>INTX)
 #define SSINGCASE(id,subtype) (3*(id)+(subtype))   // encode case/args into one branch value
-A jtssingleton1(J jt, A w,I caseno){A z;void *zv;
+
+#if !(defined(__aarch32__)||defined(__arm__)||defined(_M_ARM))
+#undef NOOPTIMIZE
+#define NOOPTIMIZE
+#endif
+A NOOPTIMIZE jtssingleton1(J jt, A w,I caseno){A z;void *zv;
  F2PREFIP;
  I ar=AR(w);
  // Calculate inplaceability

jsrc/va2.c

@@ -1198,7 +1198,7 @@ DF2(jtatomic2){A z;
   // singleton.  we need the rank of the result
   ar-=af; wr-=wf; ar=ar>wr?ar:wr; af=af>wf?af:wf; af+=ar;   // set af to max len of frame, ar to max cell rank; then af=max framelen + max rank = resultrank
 forcess:;  // branch point for rank-0 singletons from above, always with atomic result
-  z=jtssingleton(jt,a,w,af+((I)FAV(self)->lc<<RANKTX)+(((I)jtinplace&3)<<24)+((3*(at>>INTX)+(wt>>INTX))<<26));  // create portmanteau parm reg
+  z=jtssingleton(jt,a,w,af|((I)FAV(self)->lc<<RANKTX)|(((I)jtinplace&3)<<24)|((3*(at>>INTX)+(wt>>INTX))<<26));  // create portmanteau parm reg
   if(likely(z!=0)){RETF(z);}  // normal case is good return; the rest is retry for singletons
   if(unlikely(jt->jerr<=NEVM)){RETF(z);}   // if error is unrecoverable, don't retry
   // if retryable error, fall through.  The retry will not be through the singleton code

jsrc/va2ss.c

@@ -36,8 +36,13 @@ static NOINLINE I intforD(J jt, D d){D q;I z;  // noinline because it uses so ma
 }
 
 #define SSINGCASE(id,subtype) (9*(id)+(subtype))   // encode case/args into one branch value
+
+#if !(defined(__aarch32__)||defined(__arm__)||defined(_M_ARM))
+#undef NOOPTIMIZE
+#define NOOPTIMIZE
+#endif
 // do singleton operation. ipcaserank bits 0-15=rank of result, 16-23=self->lc code for the operation (with comparisons flagged), 24-25=inplace bits, 26-29 types code
-A jtssingleton(J jt, A a,A w,I ipcaserank){A z;I aiv;void *zv;
+A NOOPTIMIZE jtssingleton(J jt, A a,A w,I ipcaserank){A z;I aiv;void *zv;
  z=0; I ac=AC(a); I wc=AC(w);
  // see if we can inplace an assignment.  That is always a good idea, though rare
  if(unlikely(((B)(a==jt->asginfo.zombieval)&((B)(ipcaserank>>(24+JTINPLACEAX)))&(B)1)+((B)(w==jt->asginfo.zombieval)&((B)(ipcaserank>>(24+JTINPLACEWX)))&(B)1))){

jsrc/x15.c

@@ -584,15 +584,6 @@ static void double_trick(double*v, I n){I i=0;
                   d[56],d[57],d[58],d[59],d[60],d[61],d[62],d[63]);break;  \
 }
 
-#if defined(__clang__) && ( (__clang_major__ > 3) || ((__clang_major__ == 3) && (__clang_minor__ > 5)))
-/* needed by clang newer versions, no matter double_trick is inline asm or not */
-#define NOOPTIMIZE __attribute__((optnone))
-#elif __GNUC__ > 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ > 3))
-#define NOOPTIMIZE __attribute__((optimize("O0")))
-#else
-#define NOOPTIMIZE
-#endif
-
 static I     NOOPTIMIZE stdcalli(STDCALLI fp,I*d,I cnt,DoF*dd,I dcnt){I r;
  SWITCHCALL;
  R r;

make2/build_libj.sh

@@ -106,9 +106,11 @@ common="$OPENMP -fPIC -O2 -fvisibility=hidden -fno-strict-aliasing -fno-stack-pr
  -Wno-parentheses \
  -Wno-pointer-sign \
  -Wno-pointer-to-int-cast \
+ -Wno-return-local-addr \
  -Wno-shift-count-overflow \
  -Wno-shift-negative-value \
  -Wno-sign-compare \
+ -Wno-string-plus-int \
  -Wno-type-limits \
  -Wno-uninitialized \
  -Wno-unused-parameter \

makemsvc/jconsole/makefile

@@ -1,4 +1,4 @@
-READLINE=1
+# READLINE=1
 ifeq (1,${DEBUG})
 FDEBUG = /FS /Zi /DDEBUG=1
 LDEBUG = /DEBUG

makemsvc/jconsole/makefile.win

@@ -1,4 +1,4 @@
-READLINE=1
+# READLINE=1
 !if "1"=="$(DEBUG)"
 FDEBUG = /FS /Zi /DDEBUG=1
 LDEBUG = /DEBUG