12MB stack size only applicable to windows and macos

Author: bilam

jsrc/j.h

@@ -532,7 +532,11 @@ struct jtimespec jmtclk(void); //monotonic clock.  Intended rel->abs conversions
 // NEW WAY
 // The named-call stack is used only when there is a locative, EXCEPT that after a call to 18!:4 it is used until the function calling 18!:4 returns.
 // Since startup calls 18!:4 without a name, we have to allow for the possibility of deep recursion in the name stack.  Normally only a little of the stack is used
+#if defined(__APPLE__) || defined(_WIN32)
 #define CSTACKSIZE      (SY_64?12009472:1015808)  // size we allocate in the calling function, aligned to 16k system page size
+#else
+#define CSTACKSIZE      (SY_64?7946240:1015808)  // OS default stack size 8MB, aligned to 16k system page size
+#endif
 #define CSTACKRESERVE   100000  // amount we allow for slop before we sample the stackpointer, and after the last check
 #else
 // OBSOLETE OLD WAY (with USECSTACK off)
@@ -2147,7 +2151,7 @@ extern JS gjt; // global for JPF (procs without jt)
 /* strchr fails for CE MIPS - neg chars - spellit fails in ws.c for f=.+.  */
 #define strchr(a,b)     (C*)strchr((unsigned char*)(a), (unsigned char)(b))
 #endif
-#if (defined(__arm__)||defined(__aarch64__)||defined(_M_ARM64)) && !defined(__MACH__)
+#if (defined(__arm__)||defined(__aarch64__)||defined(_M_ARM64)) && !defined(__APPLE__)
 // option -fsigned-char in android and raspberry
 #ifdef strchr
 #undef strchr

jsrc/jconsole.c

@@ -17,14 +17,14 @@
 #include <signal.h>
 #include <stdint.h>
 #include <locale.h>
-#ifdef __MACH__
+#ifdef __APPLE__
 #include <xlocale.h>
 #endif
 
 #include "j.h"
 #include "jeload.h"
 
-#define J_STACK  0x1000000uL // 16mb
+#define J_STACK  0xc00000uL // 12mb
 
 static int forceprmpt=0;   /* emit prompt even if isatty is false */
 static int breadline=0;    /* 0: none  1: libedit  2: linenoise */
@@ -68,7 +68,7 @@ char histfile[512];
 static int readlineinit()
 {
  if(hreadline)return 0; // already run
-#ifndef __MACH__
+#ifndef __APPLE__
  if(!(hreadline=dlopen("libedit.so.3",RTLD_LAZY)))
  if(!(hreadline=dlopen("libedit.so.2",RTLD_LAZY)))
   if(!(hreadline=dlopen("libedit.so.1",RTLD_LAZY)))
@@ -243,7 +243,7 @@ int main(int argc, char* argv[])
   free(argvv);
  }
 
-#if !defined(WIN32)
+#if 0
 // set stack size to get limit error instead of crash
  struct rlimit lim;
  if(!getrlimit(RLIMIT_STACK,&lim)){

make2/build_jconsole.sh

@@ -161,33 +161,33 @@ LDFLAGS=" -ldl $LDTHREAD -m32 $macmin "
 #-mmacosx-version-min=10.5
 darwin_j64)
 CFLAGS="$common $macmin"
-LDFLAGS=" -ldl $LDTHREAD $macmin "
+LDFLAGS=" -Wl,-stack_size -Wl,0xc00000 -ldl $LDTHREAD $macmin "
 ;;
 darwin_j64avx)
 CFLAGS="$common $macmin"
-LDFLAGS=" -ldl $LDTHREAD $macmin "
+LDFLAGS=" -Wl,-stack_size -Wl,0xc00000 -ldl $LDTHREAD $macmin "
 ;;
 darwin_j64avx2)
 CFLAGS="$common $macmin"
-LDFLAGS=" -ldl $LDTHREAD $macmin "
+LDFLAGS=" -Wl,-stack_size -Wl,0xc00000 -ldl $LDTHREAD $macmin "
 ;;
 darwin_j64avx512)
 CFLAGS="$common $macmin"
-LDFLAGS=" -ldl $LDTHREAD $macmin "
+LDFLAGS=" -Wl,-stack_size -Wl,0xc00000 -ldl $LDTHREAD $macmin "
 ;;
 darwin_j64arm) # darwin arm
 CFLAGS="$common $macmin -march=armv8-a+crc "
-LDFLAGS=" -ldl $LDTHREAD $macmin "
+LDFLAGS=" -Wl,-stack_size -Wl,0xc00000 -ldl $LDTHREAD $macmin "
 ;;
 windows_j32)
 TARGET=jconsole.exe
 CFLAGS="$common -m32 "
-LDFLAGS=" -m32 -Wl,--stack=0x1000000,--subsystem,console -static-libgcc $LDTHREAD"
+LDFLAGS=" -m32 -Wl,--stack=0xc00000,--subsystem,console -static-libgcc $LDTHREAD"
 ;;
 windows_j6*)
 TARGET=jconsole.exe
 CFLAGS="$common"
-LDFLAGS=" -Wl,--stack=0x1000000,--subsystem,console -static-libgcc $LDTHREAD"
+LDFLAGS=" -Wl,--stack=0xc00000,--subsystem,console -static-libgcc $LDTHREAD"
 ;;
 *)
 echo no case for those parameters

makemsvc/jconsole/makefile

@@ -10,11 +10,11 @@ endif
 ifeq (1,${x64})
 CF1= -maes -msse3 -fno-strict-aliasing -Wno-parentheses -Wno-unused-variable -Wno-pointer-sign -Wno-missing-braces -Wno-char-subscripts -Wno-unused-value -Wno-unused-function -Wno-empty-body -Wno-sometimes-uninitialized -Wno-string-plus-int -Wno-unknown-pragmas -Wno-delete-non-abstract-non-virtual-dtor
 CFLAGS= ${PTHREADINC} ${FDEBUG} /DEMU_AVX=1 /WX /W3 /O2 /GS /D_USING_V110_SDK71_ /D_CRT_SECURE_NO_WARNINGS /MT ${CF1}
-FLAGS= ${LDEBUG} /STACK:0x10000000 /MACHINE:X64 /SUBSYSTEM:CONSOLE,5.02
+FLAGS= ${LDEBUG} /STACK:0xc00000 /MACHINE:X64 /SUBSYSTEM:CONSOLE,5.02
 else
 CF1= -m32 -msse2 -fno-strict-aliasing -Wno-parentheses -Wno-unused-variable -Wno-pointer-sign -Wno-missing-braces -Wno-char-subscripts -Wno-unused-value -Wno-unused-function -Wno-empty-body -Wno-sometimes-uninitialized -Wno-string-plus-int -Wno-unknown-pragmas -Wno-delete-non-abstract-non-virtual-dtor
 CFLAGS= ${PTHREADINC} ${FDEBUG} /WX /W3 /O2 /GS /D_USING_V110_SDK71_ /D_CRT_SECURE_NO_WARNINGS /MT ${CF1}
-FLAGS= ${LDEBUG} /STACK:0x10000000 /MACHINE:X86 /SUBSYSTEM:CONSOLE,5.01
+FLAGS= ${LDEBUG} /STACK:0xc00000 /MACHINE:X86 /SUBSYSTEM:CONSOLE,5.01
 endif
 
 .SUFFIXES: .o

makemsvc/jconsole/makefile.win

@@ -10,11 +10,11 @@ LDEBUG = /DEBUG
 !if "1"=="$(x64)"
 CF1= -maes -msse3 -fno-strict-aliasing -Wno-parentheses -Wno-unused-variable -Wno-pointer-sign -Wno-missing-braces -Wno-char-subscripts -Wno-unused-value -Wno-unused-function -Wno-empty-body -Wno-sometimes-uninitialized -Wno-string-plus-int -Wno-unknown-pragmas -Wno-delete-non-abstract-non-virtual-dtor
 CFLAGS= $(PTHREADINC) $(FDEBUG) /DEMU_AVX=1 /WX /W3 /O2 /GS /D_USING_V110_SDK71_ /D_CRT_SECURE_NO_WARNINGS /MT $(CF1)
-FLAGS= $(LDEBUG) /STACK:0x10000000 /MACHINE:X64 /SUBSYSTEM:CONSOLE,5.02
+FLAGS= $(LDEBUG) /STACK:0xc00000 /MACHINE:X64 /SUBSYSTEM:CONSOLE,5.02
 !else
 CF1= -m32 -msse2 -fno-strict-aliasing -Wno-parentheses -Wno-unused-variable -Wno-pointer-sign -Wno-missing-braces -Wno-char-subscripts -Wno-unused-value -Wno-unused-function -Wno-empty-body -Wno-sometimes-uninitialized -Wno-string-plus-int -Wno-unknown-pragmas -Wno-delete-non-abstract-non-virtual-dtor
 CFLAGS= $(PTHREADINC) $(FDEBUG) /WX /W3 /O2 /GS /D_USING_V110_SDK71_ /D_CRT_SECURE_NO_WARNINGS /MT $(CF1)
-FLAGS= $(LDEBUG) /STACK:0x10000000 /MACHINE:X86 /SUBSYSTEM:CONSOLE,5.01
+FLAGS= $(LDEBUG) /STACK:0xc00000 /MACHINE:X86 /SUBSYSTEM:CONSOLE,5.01
 !endif
 
 .SUFFIXES: .o