Get sqSetjmpShim.h right on Windows for at least ARMv8 and x86_64.

(I need the CI to test x86). Make sqSetjmpShim.h include <setjmp.h>.
Modify the Alien callback support to include sqSetjmpShim.h, not
<setjmp.h>.

Author: eliotmiranda

platforms/Cross/plugins/IA32ABI/arm32abicc.c

@@ -21,9 +21,10 @@
 #include <sys/mman.h> /* for mprotect */
 
 #include <string.h> /* for memcpy et al */
-#include <setjmp.h>
 #include <stdio.h> /* for fprintf(stderr,...) */
 
+#include "sqSetjmpShim.h"
+
 #include "objAccess.h"
 #include "vmCallback.h"
 #include "sqAssert.h"

platforms/Cross/plugins/IA32ABI/arm64abicc.c

@@ -27,9 +27,10 @@
 
 #include <stdlib.h> // for valloc
 #include <string.h> // for memcpy et al
-#include <setjmp.h>
 #include <stdio.h> // for fprintf(stderr,...)
 
+#include "sqSetjmpShim.h"
+
 #include "objAccess.h"
 #include "vmCallback.h"
 #include "sqAssert.h"

platforms/Cross/plugins/IA32ABI/ia32abi.h

@@ -25,8 +25,6 @@
  * the downward-growing stack.
  */
 
-#include "sqSetjmpShim.h"
-
 // Obsolete Alien call-out API, still used for the exampleCqsort example
 
 #define SIGNATURE	sqInt *argVector/* call args on stack or in array */, \
@@ -39,7 +37,7 @@ extern sqInt callIA32FloatReturn   (SIGNATURE);
 extern sqInt callIA32DoubleReturn  (SIGNATURE);
 
 
-// Not at all obslete callback thunk facilities.
+// Not at all obsolete callback thunk facilities.
 // A callback is a pairing of a Smalltalk block and an Alien pointing to a
 // thunk (a sequence of machine code) at a unique address, each callback
 // having exactly the same thunk but at a different address.  The thunk calls

platforms/Cross/plugins/IA32ABI/ia32abicc.c

@@ -33,9 +33,10 @@ void *getbaz() { return baz; }
 #endif
 
 #include <string.h> /* for memcpy et al */
-#include <setjmp.h>
 #include <stdio.h> /* for fprintf(stderr,...) */
 
+#include "sqSetjmpShim.h"
+
 #include "objAccess.h"
 #include "vmCallback.h"
 #include "sqAssert.h"

platforms/Cross/plugins/IA32ABI/ppc32abicc.c

@@ -60,11 +60,13 @@ void *getbaz() { return baz; }
 #include <string.h>
 #include <unistd.h>
 
+#include "sqSetjmpShim.h"
+
 #include "objAccess.h"
+#include "vmCallback.h"
+#include "sqAssert.h"
 #include "ia32abi.h"
 
-#include <setjmp.h>
-
 #if !defined(min)
 # define min(a,b) ((a) < (b) ? (a) : (b))
 #endif

platforms/Cross/plugins/IA32ABI/riscv64abicc.c

@@ -36,9 +36,10 @@
 #include <stdlib.h> // for valloc
 #include <sys/mman.h> // for mprotect
 #include <string.h> // for memcpy et al
-#include <setjmp.h>
 #include <stdio.h> // for fprintf(stderr,...)
 
+#include "sqSetjmpShim.h"
+
 #include "objAccess.h"
 #include "vmCallback.h"
 #include "sqAssert.h"

platforms/Cross/plugins/IA32ABI/x64sysvabicc.c

@@ -40,9 +40,10 @@ void *getbaz() { return baz; }
 #endif
 
 #include <string.h> /* for memcpy et al */
-#include <setjmp.h>
 #include <stdio.h> /* for fprintf(stderr,...) */
 
+#include "sqSetjmpShim.h"
+
 #include "objAccess.h"
 #include "vmCallback.h"
 #include "sqAssert.h"

platforms/Cross/plugins/IA32ABI/x64win64abicc.c

@@ -18,9 +18,10 @@
 
 #include <stdlib.h> /* for valloc */
 #include <string.h> /* for memcpy et al */
-#include <setjmp.h>
 #include <stdio.h> /* for fprintf(stderr,...) */
 
+#include "sqSetjmpShim.h"
+
 #include "objAccess.h"
 #include "vmCallback.h"
 #include "sqAssert.h"

platforms/Cross/plugins/JPEGReadWriter2Plugin/sqJPEGReadWriter2Plugin.c

@@ -29,6 +29,7 @@
  */
 #include <stdio.h> /* abs */
 #include <stdlib.h> /* abs */
+#include "sqSetjmpShim.h"
 #include "JPEGReadWriter2Plugin.h"
 
 /*
@@ -322,5 +323,5 @@ void
 error_exit (j_common_ptr cinfo)
 {
   /* cinfo->err really points to a error_mgr2 struct, so coerce the pointer */
-  longjmp(*((error_ptr2)(cinfo->err))->setjmp_buffer, 1);
+  _longjmp(*((error_ptr2)(cinfo->err))->setjmp_buffer, 1);
 }

platforms/Cross/vm/sqSetjmpShim.h

@@ -1,6 +1,6 @@
 /* sqSetjmpShim.h
  *
- *	Defines to ensure we use the most minimal version of setjmp/longjmp
+ *	Defines to ensure the VM uses the most minimal version of setjmp/longjmp
  *	available on the platform to avoid issues with stack unwinding.
  *
  *	Author: Eliot Miranda
@@ -27,22 +27,32 @@
  *   DEALINGS IN THE SOFTWARE.
  */
 
-/* Use the most minimal setjmp/longjmp pair available; no signal handling
- * wanted or necessary. On win64 to avoid crashes when unwinding the stack in
- * Kernel32's longjmp we use the pair in platforms/win32/misc/_setjmp-x64.asm.
+#if !defined(__SETJMP_SHIM)
+#define __SETJMP_SHIM
+
+#include <setjmp.h>
+
+/* Use the most minimal setjmp/longjmp pair available; unix signal(3) handling
+ * intentionally avoided. On win64 to avoid crashes when unwinding the stack in
+ * Kernel32's longjmp use the pairs in platforms/win32/misc/_setjmp-???.asm.
  */
-#if !defined(_WIN32)
-# undef setjmp
-# undef longjmp
-# define setjmp _setjmp
-# define longjmp _longjmp
-#endif
-/* clang on mingw redeclares _setjmp so we have to provide an alternative */
-#if __MINGW32__ || __MINGW64__ /* clang on cygwin/mingw */
-int __attribute__((__nothrow__,__returns_twice__)) _setjmp0(jmp_buf);
-# undef _setjmp
+#undef setjmp
+#undef _setjmp
+#undef longjmp
+#undef _longjmp
+#define setjmp(b) _setjmp(b)
+#define longjmp(b,v) _longjmp(b,v)
+
+#if defined(_WIN32) || defined(_WIN64)
+// Windows clang redeclares _setjmp so provide an alternative
 # define _setjmp(b) _setjmp0(b)
-# undef longjmp
-# define longjmp _longjmp
-void _longjmp(_JBTYPE *, int); /* setjmp.h only declares __mingw_longjmp via longjmp */
-#endif
+# if defined(__GNUC__) || defined(__clang__)
+int __attribute__((__nothrow__,__returns_twice__)) __cdecl _setjmp0(jmp_buf jb);
+void __attribute__((_Noreturn)) __cdecl _longjmp(jmp_buf jb,int v);
+# else
+int  __cdecl _setjmp0(jmp_buf jb);
+void __declspec(noreturn) __cdecl _longjmp(jmp_buf jb,int v);
+# endif
+#endif // _WIN32 || _WIN64
+
+#endif // __SETJMP_SHIM