Merge branch 'master' of jsoftware.com:jsource

Try to sidestep integer overflow

Author: HenryHRich

jsrc/io.c

@@ -924,6 +924,8 @@ JS _Initializer(void* hDLL){
 #else
  getsopath(sopath);
 #endif
+// extern int getsize_xdic_DIC(void);
+// fprintf(stderr,"sizeof(DIC) "FMTI" \n",(I)getsize_xdic_DIC());
  JS jt=jvmreservea(sizeof(JST),__builtin_ctz(JTALIGNBDY));
  if(!jt)R 0;
  I sz=offsetof(JST,threaddata[1]); // #relevant bytes: just JS and the first JT.  This makes MDTHREAD() valid

jsrc/j.c

@@ -173,8 +173,10 @@ I4 charfill=0x20;  // SP, used for filling LIT/C2T/C4T
 #define hw "avx512"
 #elif C_AVX2
 #define hw "avx2"
-#elif __arm64__ || __aarch64__
+#elif __arm64__ || __aarch64__ || __arm__
 #define hw "arm"
+#elif defined(__wasm__)
+#define hw "wasm"
 #else
 #define hw ""
 #endif

jsrc/xdic.c

@@ -149,8 +149,14 @@ typedef struct ADic {
 #if 7==NORMAH
 _Static_assert(sizeof(DIC)==32*SZI,"DIC not 32 Is");
 #else
+#if SY_64
 _Static_assert(sizeof(DIC)==33*SZI,"DIC not 33 Is");
+#else
+_Static_assert(sizeof(DIC)==34*SZI,"DIC not 34 Is");
+#endif
 #endif
+int getsize_xdic_DIC(void){return (int)sizeof(DIC);} // temp for debugging
+
 #define ST UI4   // type of hash slot
 #define STX UI8   // type of index to hash slot, which is + for found, 1s-comp for not found
 #define STN 4  // width of hash slot

make2/build_jamalgam.sh

@@ -4,7 +4,9 @@ set -e
 cd "$(dirname "$0")"
 echo "entering $(pwd)"
 
-jplatform64=$(./jplatform64.sh)
+unameop=$(uname -o || uname -s)
+eval "$(./jplatform64.sh)"
+jplatform64="$jplatform"/"$j64x"
 
 if [ "" = "$CFLAGS" ]; then
  # OPTLEVEL will be merged back into CFLAGS, further down
@@ -88,16 +90,22 @@ case "$jplatform64" in
    macmin="-arch x86_64 -mmacosx-version-min=10.6"
   fi
   ;;
- openbsd/*) make=gmake ;;
+ openbsd/*)
+  NO_SHA_ASM=1
+  make=gmake
+  ;;
  freebsd/*) make=gmake ;;
  wasm*)
   USE_OPENMP=0
   LDTHREAD=" -pthread "
   NO_SHA_ASM=1
-  USE_OPENMP=0
   USE_PYXES=0
   ;;
 esac
+case "$j64x" in
+ j32*) USE_PYXES="${USE_PYXES:=0}" ;;
+ *) USE_PYXES="${USE_PYXES:=1}" ;;
+esac
 make="${make:=make}"
 
 CC=${CC-"$(which cc clang gcc 2> /dev/null | head -n1 | xargs basename)"}
@@ -243,31 +251,34 @@ if [ $USE_BOXEDSPARSE -eq 1 ]; then
  common="$common -DBOXEDSPARSE"
 fi
 
-USE_PYXES="${USE_PYXES:=1}"
 if [ $USE_PYXES -eq 1 ]; then
-case "$jplatform64" in
- windows/j32*)
-  common="$common -DPYXES=1 -I../../../../pthreads4w/include"
-  LDTHREAD=" ../../../../pthreads4w/lib/pthreadVC3-w32.lib "
-  ;;
- windows/j64arm)
-  common="$common -DPYXES=1 -I../../../../pthreads4w/include"
-  LDTHREAD=" ../../../../pthreads4w/lib/pthreadVC3-arm64.lib "
-  ;;
- windows/*)
-  common="$common -DPYXES=1 -I../../../../pthreads4w/include"
-  LDTHREAD=" ../../../../pthreads4w/lib/pthreadVC3.lib "
-  ;;
- *)
-  common="$common -DPYXES=1"
-  LDTHREAD=" -pthread "
-  ;;
+ case "$jplatform64" in
+  windows/j32*)
+   common="$common -DPYXES=1 -I../../../../pthreads4w/include"
+   LDTHREAD=" ../../../../pthreads4w/lib/pthreadVC3-w32.lib "
+   ;;
+  windows/j64arm)
+   common="$common -DPYXES=1 -I../../../../pthreads4w/include"
+   LDTHREAD=" ../../../../pthreads4w/lib/pthreadVC3-arm64.lib "
+   ;;
+  windows/*)
+   common="$common -DPYXES=1 -I../../../../pthreads4w/include"
+   LDTHREAD=" ../../../../pthreads4w/lib/pthreadVC3.lib "
+   ;;
+  *)
+   common="$common -DPYXES=1"
+   LDTHREAD=" -pthread "
+   ;;
+ esac
+ case "$j64x" in
+  j32*) USE_NORMAH8=1 ;;
+  *) USE_NORMAH8="${USE_NORMAH8:=0}" ;;
  esac
 else
  common="$common -DPYXES=0"
+ USE_NORMAH8="${USE_NORMAH8:=0}"
 fi
 
-USE_NORMAH8="${USE_NORMAH8:=0}"
 if [ $USE_NORMAH8 -eq 1 ]; then
  common="$common -DNORMAH8=1"
 else
@@ -759,7 +770,7 @@ case $jplatform64 in
   TARGET=jamalgam
   # faster, but sse2 not available for 32-bit amd cpu
   # sse does not support mfpmath=sse in 32-bit gcc
-  CFLAGS="$common -Wno-psabi -Wno-incompatible-pointer-types $DOLECOM -m32 -msse2 -mfpmath=sse -D_FILE_OFFSET_BITS=64 -D_WIN32 "
+  CFLAGS="$common -Wno-psabi -Wno-incompatible-pointer-types -m32 -msse2 -mfpmath=sse -fno-finite-math-only $DOLECOM -D_FILE_OFFSET_BITS=64 -D_WIN32 "
   # slower, use 387 fpu and truncate extra precision
   # CFLAGS="$common -m32 -ffloat-store "
   CPPFLAGS="-fPIC $OPTLEVEL -falign-functions=4 -fvisibility=hidden -Wno-psabi $DOLECOM -m32 -msse2 -mfpmath=sse -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 "
@@ -786,7 +797,7 @@ case $jplatform64 in
   fi
   WINDRES="${WINDRES:=windres}"
   TARGET=j.dll
-  CFLAGS="$common -march=armv8-a+crc -Wno-incompatible-pointer-types -DNO_SHA_ASM $DOLECOM -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 -D_WIN64 "
+  CFLAGS="$common -march=armv8-a+crc -Wno-incompatible-pointer-types -fno-finite-math-only -DNO_SHA_ASM $DOLECOM -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 -D_WIN64 "
   CPPFLAGS="-fPIC $OPTLEVEL -falign-functions=4 -fvisibility=hidden $DOLECOM -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 -D_WIN64 "
   LDFLAGS=" -shared -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -lole32 -ladvapi32 -loleaut32 -lsynchronization -luuid $LDTHREAD $LDOPENMP "
   if [ $jolecom -eq 1 ]; then
@@ -811,7 +822,7 @@ case $jplatform64 in
   fi
   WINDRES="${WINDRES:=windres}"
   TARGET=jamalgam
-  CFLAGS="$common -Wno-incompatible-pointer-types $DOLECOM -DC_AVX2=1 -DC_AVX512=1 -D_FILE_OFFSET_BITS=64 -D_WIN32 -D_WIN64 "
+  CFLAGS="$common -Wno-incompatible-pointer-types -fno-finite-math-only $DOLECOM -DC_AVX2=1 -DC_AVX512=1 -D_FILE_OFFSET_BITS=64 -D_WIN32 -D_WIN64 "
   CPPFLAGS="-fPIC $OPTLEVEL -falign-functions=4 -fvisibility=hidden $DOLECOM -DC_AVX2=1 -DC_AVX512=1 -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 -D_WIN64 "
   LDFLAGS=" -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -lole32 -ladvapi32 -loleaut32 -lsynchronization -luuid $LDTHREAD $LDOPENMP "
   CFLAGS_SIMD=" -march=skylake-avx512 -mtune=skylake-avx512 -msse4.1 -msse4.2 -mavx2 -mfma -mbmi -mbmi2 -mlzcnt -mmovbe -mpopcnt -mno-vzeroupper "
@@ -838,7 +849,7 @@ case $jplatform64 in
   fi
   WINDRES="${WINDRES:=windres}"
   TARGET=jamalgam
-  CFLAGS="$common -Wno-incompatible-pointer-types $DOLECOM -DC_AVX2=1 -D_FILE_OFFSET_BITS=64 -D_WIN32 -D_WIN64 "
+  CFLAGS="$common -Wno-incompatible-pointer-types -fno-finite-math-only $DOLECOM -DC_AVX2=1 -D_FILE_OFFSET_BITS=64 -D_WIN32 -D_WIN64 "
   CPPFLAGS="-fPIC $OPTLEVEL -falign-functions=4 -fvisibility=hidden $DOLECOM -DC_AVX2=1 -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 -D_WIN64 "
   LDFLAGS=" -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -lole32 -ladvapi32 -loleaut32 -lsynchronization -luuid $LDTHREAD $LDOPENMP "
   CFLAGS_SIMD=" -march=skylake -mtune=skylake -msse4.1 -msse4.2 -mavx2 -mfma -mbmi -mbmi2 -mlzcnt -mmovbe -mpopcnt -mno-vzeroupper "
@@ -865,7 +876,7 @@ case $jplatform64 in
   fi
   WINDRES="${WINDRES:=windres}"
   TARGET=jamalgam
-  CFLAGS="$common -Wno-incompatible-pointer-types -msse3 $DOLECOM -D_FILE_OFFSET_BITS=64 -D_WIN32 -D_WIN64 "
+  CFLAGS="$common -Wno-incompatible-pointer-types -msse3 -fno-finite-math-only $DOLECOM -D_FILE_OFFSET_BITS=64 -D_WIN32 -D_WIN64 "
   CPPFLAGS="-fPIC $OPTLEVEL -falign-functions=4 -fvisibility=hidden $DOLECOM -D_FILE_OFFSET_BITS=64 -D_JDLL -D_WIN32 -D_WIN64 "
   LDFLAGS=" -Wl,--enable-stdcall-fixup -lm -static-libgcc -static-libstdc++ -lole32 -ladvapi32 -loleaut32 -lsynchronization -luuid $LDTHREAD $LDOPENMP "
   if [ $jolecom -eq 1 ]; then
@@ -918,14 +929,20 @@ fi
 mkdir -p ../bin/$jplatform64
 mkdir -p obj/$jplatform64/
 cp makefile-jamalgam obj/$jplatform64/.
-export BACKTRACE_OBJS CFLAGS CPPFLAGS LDFLAGS TARGET CFLAGS_SIMD GASM_FLAGS NASM_FLAGS FLAGS_BASE64 DLLOBJS LIBJDEF LIBJRES OBJS_BASE64 OBJS_FMA OBJS_AESNI OBJS_AESARM OBJS_ASM SRC_ASM OBJSLN jplatform64 WINDRES
+export BACKTRACE_OBJS CFLAGS CPPFLAGS LDFLAGS TARGET CFLAGS_SIMD GASM_FLAGS NASM_FLAGS FLAGS_BASE64 DLLOBJS LIBJDEF LIBJRES OBJS_BASE64 OBJS_FMA OBJS_AESNI OBJS_AESARM OBJS_ASM SRC_ASM OBJSLN jplatform j64x jplatform64 WINDRES
 cd obj/$jplatform64/
 if [ "x$MAKEFLAGS" = x'' ]; then
- if [ $(uname) = Linux ]; then par=$(nproc); else par=$(sysctl -n hw.ncpu); fi
- $make -j$par -f makefile-jamalgam
-else
- $make -f makefile-jamalgam
+ if ([ "$unameop" = "Linux" ] || [ "$unameop" = "GNU/Linux" ]); then
+  par=$(nproc)
+ elif [ "$unameop" = "Darwin" ] || [ "$unameop" = "OpenBSD" ] || [ "$unameop" = "FreeBSD" ]; then
+  par=$(sysctl -n hw.ncpu)
+ else
+  par=2
+ fi
+ export MAKEFLAGS=-j$par
 fi
+echo "MAKEFLAGS=$MAKEFLAGS"
+$make -f makefile-jamalgam
 retval=$?
 cd -
 exit $retval

make2/build_jconsole.sh

@@ -4,7 +4,9 @@ set -e
 cd "$(dirname "$0")"
 echo "entering $(pwd)"
 
-jplatform64=$(./jplatform64.sh)
+unameop=$(uname -o || uname -s)
+eval "$(./jplatform64.sh)"
+jplatform64="$jplatform"/"$j64x"
 
 if [ "" = "$CFLAGS" ]; then
  # OPTLEVEL will be merged back into CFLAGS, further down
@@ -90,6 +92,11 @@ case "$jplatform64" in
   ;;
  openbsd/*) make=gmake ;;
  freebsd/*) make=gmake ;;
+ wasm*) USE_PYXES=0 ;;
+esac
+case "$j64x" in
+ j32*) USE_PYXES="${USE_PYXES:=0}" ;;
+ *) USE_PYXES="${USE_PYXES:=1}" ;;
 esac
 make="${make:=make}"
 
@@ -167,11 +174,22 @@ else
  common="$common -DEMU_AVX2=0"
 fi
 
-USE_PYXES="${USE_PYXES:=1}"
 if [ $USE_PYXES -eq 1 ]; then
  common="$common -DPYXES=1"
+ case "$j64x" in
+  j32*) USE_NORMAH8=1 ;;
+  *) USE_NORMAH8="${USE_NORMAH8:=0}" ;;
+ esac
 else
  common="$common -DPYXES=0"
+ USE_NORMAH8="${USE_NORMAH8:=0}"
+fi
+
+USE_NORMAH8="${USE_NORMAH8:=0}"
+if [ $USE_NORMAH8 -eq 1 ]; then
+ common="$common -DNORMAH8=1"
+else
+ common="$common -DNORMAH8=0"
 fi
 
 if [ "${USE_GMP_H:=1}" -eq 1 ]; then
@@ -322,14 +340,20 @@ fi
 mkdir -p ../bin/$jplatform64
 mkdir -p obj/$jplatform64
 cp makefile-jconsole obj/$jplatform64/.
-export AR BACKTRACE_OBJS CC CFLAGS LDFLAGS TARGET OBJSLN jplatform64
+export AR BACKTRACE_OBJS CC CFLAGS LDFLAGS TARGET OBJSLN jplatform j64x jplatform64
 cd obj/$jplatform64/
 if [ "x$MAKEFLAGS" = x'' ]; then
- if [ $(uname) = Linux ]; then par=$(nproc); else par=$(sysctl -n hw.ncpu); fi
- $make -j$par -f makefile-jconsole all
-else
- $make -f makefile-jconsole all
+ if ([ "$unameop" = "Linux" ] || [ "$unameop" = "GNU/Linux" ]); then
+  par=$(nproc)
+ elif [ "$unameop" = "Darwin" ] || [ "$unameop" = "OpenBSD" ] || [ "$unameop" = "FreeBSD" ]; then
+  par=$(sysctl -n hw.ncpu)
+ else
+  par=2
+ fi
+ export MAKEFLAGS=-j$par
 fi
+echo "MAKEFLAGS=$MAKEFLAGS"
+$make -f makefile-jconsole all
 retval=$?
 cd -
 exit $retval

make2/build_jnative.sh

@@ -4,7 +4,9 @@ set -e
 cd "$(dirname "$0")"
 echo "entering $(pwd)"
 
-jplatform64=$(./jplatform64.sh)
+unameop=$(uname -o || uname -s)
+eval "$(./jplatform64.sh)"
+jplatform64="$jplatform"/"$j64x"
 
 if [ "" = "$CFLAGS" ]; then
  # OPTLEVEL will be merged back into CFLAGS, further down
@@ -260,14 +262,20 @@ echo "CFLAGS=$CFLAGS"
 mkdir -p ../bin/$jplatform64
 mkdir -p obj/$jplatform64/
 cp makefile-jnative obj/$jplatform64/.
-export CC AR CFLAGS LDFLAGS LDFLAGS_a LDFLAGS_b TARGET TARGET_a jplatform64
+export CC AR CFLAGS LDFLAGS LDFLAGS_a LDFLAGS_b TARGET TARGET_a jplatform j64x jplatform64
 cd obj/$jplatform64/
 if [ "x$MAKEFLAGS" = x'' ]; then
- if [ $(uname) = Linux ]; then par=$(nproc); else par=$(sysctl -n hw.ncpu); fi
- $make -j$par -f makefile-jnative all
-else
- $make -f makefile-jnative
+ if ([ "$unameop" = "Linux" ] || [ "$unameop" = "GNU/Linux" ]); then
+  par=$(nproc)
+ elif [ "$unameop" = "Darwin" ] || [ "$unameop" = "OpenBSD" ] || [ "$unameop" = "FreeBSD" ]; then
+  par=$(sysctl -n hw.ncpu)
+ else
+  par=2
+ fi
+ export MAKEFLAGS=-j$par
 fi
+echo "MAKEFLAGS=$MAKEFLAGS"
+$make -f makefile-jnative
 retval=$?
 cd -
 exit $retval