Merge branch 'master' of jsoftware.com:jsource

Author: HenryHRich

.gitignore

@@ -13,6 +13,7 @@ jsrc/jversion.h
 foo.ijs
 jj.ijs
 test*.txt
+*.tmp
 
 # windows - most output files go to %userprofile%\jbld\jout
 # some end up in the project folder and are marked here

jsrc/Jnative.mk

@@ -9,7 +9,7 @@ LOCAL_MODULE_FILENAME    := libjnative
 LOCAL_LDLIBS := 
 
 ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
-  LOCAL_CFLAGS := -fPIC -Os -fvisibility=hidden -fwrapv -Werror -fno-strict-aliasing -march=armv8-a
+  LOCAL_CFLAGS := -fPIC -Os -fvisibility=hidden -fwrapv -Werror -fno-strict-aliasing -DC_CRC32C=1 -DEMU_AVX=1 -DPYXES=1 -march=armv8-a
   LOCAL_ARM_NEON := true
 endif
 ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
@@ -21,7 +21,7 @@ ifeq ($(TARGET_ARCH_ABI),armeabi)
   LOCAL_ARM_MODE := thumb
 endif
 ifeq ($(TARGET_ARCH),x86_64)
-  LOCAL_CFLAGS := -fPIC -Os -fvisibility=hidden -fwrapv -Werror -fno-strict-aliasing -march=x86-64 -msse4.2 -mpopcnt -fno-stack-protector
+  LOCAL_CFLAGS := -fPIC -Os -fvisibility=hidden -fwrapv -Werror -fno-strict-aliasing -DC_CRC32C=1 -DEMU_AVX=1 -DPYXES=1 -march=x86-64 -msse4.2 -mpopcnt -fno-stack-protector
 endif
 ifeq ($(TARGET_ARCH),x86)
   LOCAL_CFLAGS := -fPIC -Os -fvisibility=hidden -fwrapv -Werror -fno-strict-aliasing -march=i686 -mssse3 -mfpmath=sse -fno-stack-protector

jsrc/jt.h

@@ -366,7 +366,5 @@ typedef JST* JS;  // shared part of struct
 #define THREADID(jt) ((((I)(jt)&(JTALIGNBDY-1))>>LGTHREADBLKSIZE)-(offsetof(struct JSTstruct, threaddata[0])>>LGTHREADBLKSIZE))  // thread number from jt.  Thread 0 is the master
 #define JTTHREAD0(jt) (JJTOJ(jt)->threaddata)   // the array of JTT structs
 #define JTFORTHREAD(jt,n) (&(JTTHREAD0(jt)[n]))   // JTT struct for thread n
-#if !(defined(ANDROID) && defined(__x86_64__) && MAXTASKS<2)
 enum {xxxx = 1/(offsetof(struct JSTstruct, threaddata[MAXTASKS])<=JTALIGNBDY) };  // assert not too many threads
 enum {xxxxx = 1/(offsetof(struct JSTstruct, threaddata[1])-offsetof(struct JSTstruct, threaddata[0])==((I)1<<LGTHREADBLKSIZE)) };  // assert size of threaddata what we expected
-#endif

jsrc/vi.c

@@ -905,7 +905,7 @@ static IOFSMALLRANGE(jtio42,I,US)  static IOFSMALLRANGE(jtio44,I,UI4)  // 4-byte
    case IEPS:  {T*av=(T*)u+m; DQ(ac, DQ(c, x=(xe); j=-m;   while(j<0 &&(exp))++j; *zb++=j<0;     wv+=q;); av+=p; if(1==wc)wv=v0;);} break;  \
  }}
 
-static void jtiosc(J jt,I mode,I m,I c,I ac,I wc,A a,A w,A z){B*zb;I j,p,q,*u,*v,zn,*zv;
+static A jtiosc(J jt,I mode,I m,I c,I ac,I wc,A a,A w,A z){B*zb;I j,p,q,*u,*v,zn,*zv;
  p=1<ac?m:0; q=1<wc||1<c;
  zn=AN(z); 
  zv=AV(z); zb=(B*)zv; u=AV(a); v=AV(w); 
@@ -922,6 +922,7 @@ static void jtiosc(J jt,I mode,I m,I c,I ac,I wc,A a,A w,A z){B*zb;I j,p,q,*u,*v
   case FLX:   if(1.0==jt->cct)SCDO(D, *wv,x!=av[j]) 
              else{D cct=jt->cct;    SCDO(D, *wv,!TCMPEQ(cct,x,av[j]));} break; 
  }
+ RETF(z);
 }    /* right argument cell is scalar; only for modes IIDOT IICO IEPS */
 
 

make2/build_jnative.sh

@@ -110,6 +110,23 @@ common="$OPENMP -fPIC -O2 -fvisibility=hidden -fno-strict-aliasing \
 
 fi
 
+USE_PYXES="${USE_PYXES:=1}"
+if [ $USE_PYXES -eq 1 ] ; then
+common="$common -DPYXES=1"
+LDTHREAD=" -pthread "
+else
+common="$common -DPYXES=0"
+fi
+
+if [ -z "${j64x##*32*}" ]; then
+USE_EMU_AVX=0
+else
+USE_EMU_AVX="${USE_EMU_AVX:=1}"
+fi
+if [ $USE_EMU_AVX -eq 1 ] ; then
+common="$common -DEMU_AVX=1"
+fi
+
 case $jplatform\_$j64x in
 
 linux_j32)

make2/clean.sh

@@ -21,3 +21,9 @@ find ../dllsrc -name "*.o" -type f -delete
 find ../sleef/src -name "*.o" -type f -delete
 find ../base64 -name "*.o" -type f -delete
 find obj -name "*.o" -type f -delete || true
+
+find ../jsrc -name "*.tmp" -type f -delete
+find ../dllsrc -name "*.tmp" -type f -delete
+find ../sleef/src -name "*.tmp" -type f -delete
+find ../base64 -name "*.tmp" -type f -delete
+find obj -name "*.tmp" -type f -delete || true

makemsvc/jconsole/makefile

@@ -31,7 +31,7 @@ endif
 RCS= ../../makevs/jconsole/jconsole.rc
 
 ifndef LD
-LD=link
+LD=lld-link
 endif
 
 %.o: %.c

makemsvc/jconsole/makefile.win

@@ -31,7 +31,7 @@ CFLAGSLN= -DREADLINE -DUSE_LINENOISE
 RCS= ../../makevs/jconsole/jconsole.rc
 
 !ifndef LD
-LD=link
+LD=lld-link
 !endif
 
 .c.o:

makemsvc/jdll/makefile

@@ -252,7 +252,7 @@ DEF= ../../dllsrc/jdll.def
 RCS= ../../dllsrc/jdll.rc
 
 ifndef LD
-LD=link
+LD=lld-link
 endif
 
 %.o: %.c

makemsvc/jdll/makefile.win

@@ -252,7 +252,7 @@ DEF= ../../dllsrc/jdll.def
 RCS= ../../dllsrc/jdll.rc
 
 !ifndef LD
-LD=link
+LD=lld-link
 !endif
 
 .c.o: