Merge branch 'Cog' of github.com:OpenSmalltalk/opensmalltalk-vm into …

…merge-with-pharo-win32

.appveyor.yml

@@ -1,17 +1,48 @@
 environment:
-  CYG_ROOT: C:\cygwin
   CYG_MIRROR: http://cygwin.mirror.constant.com
-  CYG_CACHE: C:\cygwin\var\cache\setup
-  CYG_BASH: C:\cygwin\bin\bash
   BINTRAYAPIKEY:
     secure: uknPzww818XWJiLecwur9p1MfrkACOyx9d3iNrw/TuD89EoPSc8zLqKdPZjWdcQd
   matrix:
+    - FLAVOR: squeak.sista.spur
+      ARCH: win32x86
+      CYG_ROOT: C:\cygwin
+      CYG_SETUP: setup-x86.exe
+      MINGW_ARCH: i686
     - FLAVOR: squeak.cog.spur
+      ARCH: win32x86
+      CYG_ROOT: C:\cygwin
+      CYG_SETUP: setup-x86.exe
+      MINGW_ARCH: i686
     - FLAVOR: squeak.cog.v3
+      ARCH: win32x86
+      CYG_ROOT: C:\cygwin
+      CYG_SETUP: setup-x86.exe
+      MINGW_ARCH: i686
     - FLAVOR: squeak.stack.spur
+      ARCH: win32x86
+      CYG_ROOT: C:\cygwin
+      CYG_SETUP: setup-x86.exe
+      MINGW_ARCH: i686
     - FLAVOR: squeak.stack.v3
+      ARCH: win32x86
+      CYG_ROOT: C:\cygwin
+      CYG_SETUP: setup-x86.exe
+      MINGW_ARCH: i686
     - FLAVOR: newspeak.cog.spur
+      ARCH: win32x86
+      CYG_ROOT: C:\cygwin
+      CYG_SETUP: setup-x86.exe
+      MINGW_ARCH: i686
     - FLAVOR: newspeak.stack.spur
+      ARCH: win32x86
+      CYG_ROOT: C:\cygwin
+      CYG_SETUP: setup-x86.exe
+      MINGW_ARCH: i686
+    - FLAVOR: squeak.stack.spur
+      ARCH: win64x64
+      CYG_ROOT: C:\cygwin64
+      CYG_SETUP: setup-x86_64.exe
+      MINGW_ARCH: x86_64
 
 matrix:
   fast_finish: false
@@ -23,7 +54,8 @@ clone_depth: 5
 
 install:
   - ps: 'Start-FileDownload "http://cygwin.com/setup-x86.exe" -FileName "setup-x86.exe"'
-  - 'setup-x86.exe -qnNdO -R "%CYG_ROOT%" -s "%CYG_MIRROR%" -l "%CYG_CACHE%" -P mingw64-i686-gcc-core,mingw64-i686-gcc-g++,mingw64-i686-headers,mingw64-i686-runtime,zip'
+  - ps: 'Start-FileDownload "http://cygwin.com/setup-x86_64.exe" -FileName "setup-x86_64.exe"'
+  - '%CYG_SETUP% -qnNdO -R "%CYG_ROOT%" -s "%CYG_MIRROR%" -l "%CYG_ROOT%\var\cache\setup" -P mingw64-%MINGW_ARCH%-gcc-core,mingw64-%MINGW_ARCH%-gcc-g++,mingw64-%MINGW_ARCH%-headers,mingw64-%MINGW_ARCH%-runtime,zip'
 
 build: false
 
@@ -35,6 +67,6 @@ build: false
 # build which causes failures as certain functions attempt to redirect
 # default file handles. Ensure a dummy file descriptor is opened with 'exec'.
 test_script:
-  - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; exec ./.travis_build.sh"'
+  - '%CYG_ROOT%\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; exec ./.travis_build.sh"'
 on_success:
-  - '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; exec ./.travis_deploy.sh"'
+  - '%CYG_ROOT%\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; exec ./.travis_deploy.sh"'

.travis_build.sh

@@ -4,7 +4,6 @@ set -e
 source ./.travis_helpers.sh
 
 if [[ "${APPVEYOR}" ]]; then
-    ARCH="win32x86"
     TRAVIS_BUILD_DIR="$(pwd)"
     TRAVIS_TAG="${APPVEYOR_REPO_TAG}"
     PLATFORM="Windows"
@@ -14,6 +13,7 @@ if [[ "${APPVEYOR}" ]]; then
 
     echo
     echo "Using gcc $(i686-w64-mingw32-gcc --version)"
+    echo "Using 64-bit gcc $(x86_64-w64-mingw32-gcc --version)"
     echo
     test -d /usr/i686-w64-mingw32/sys-root/mingw/lib || echo "No lib dir"
     test -d /usr/i686-w64-mingw32/sys-root/mingw/include || echo "No inc dir"

build.win32x86/squeak.sista.spur/Croquet.def.in

@@ -0,0 +1,3 @@
+; Set the total stack size to 4 megabytes (0x400000), reserving 4Mb and
+; committing 64k (0x10000)
+STACKSIZE 0x400000,0x10000

build.win32x86/squeak.sista.spur/Croquet.exe.manifest

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly
+	xmlns="urn:schemas-microsoft-com:asm.v1"
+	manifestVersion="1.0"
+	xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+<assemblyIdentity
+	version="1.0.0.0"
+	processorArchitecture="*"
+	name="www.mirandabanda.org.Cog.Croquet"
+	type="win32"
+/>
+<description>Croquet Smalltalk Virtual Machine</description>
+<asmv3:application>
+	<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+		<dpiAware>false</dpiAware>
+	</asmv3:windowsSettings>
+</asmv3:application>
+<dependency>
+	<dependentAssembly>
+		<assemblyIdentity
+			type="win32"
+			name="Microsoft.Windows.Common-Controls"
+			version="6.0.0.0"
+			processorArchitecture="*"
+			publicKeyToken="6595b64144ccf1df"
+			language="*"
+		/>
+	</dependentAssembly>
+</dependency>
+</assembly>

build.win32x86/squeak.sista.spur/Croquet.rc

@@ -0,0 +1,32 @@
+#ifdef _WIN32
+1                       ICON    DISCARDABLE     "Croquet.ico"
+2                       ICON    DISCARDABLE     "Croquet.ico"
+3                       ICON    DISCARDABLE     "Croquet.ico"
+
+1 VERSIONINFO
+ FILEVERSION FILEVERSIONVALUES
+ PRODUCTVERSION 5,0,0,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"    // Lang=US English, CharSet=Windows Multilin
+        BEGIN
+            VALUE "CompanyName", "Squeak.org\0"
+            VALUE "FileDescription", "Croquet Cog Spur Virtual Machine\0"
+            VALUE "FileVersion", FILEVERSIONSTRING
+            VALUE "LegalCopyright", "Copyright \251 Squeak.org 1996-2014\0"
+            VALUE "ProductName", "Croquet Cog Spur\0"
+            VALUE "ProductVersion", "5.0\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1252
+    END
+END
+#endif

build.win32x86/squeak.sista.spur/Makefile

@@ -0,0 +1,9 @@
+#############################################################################
+# Makefile for Win32 Cog Spur Squeak VM using gcc-3.4.x and cygwin
+# Do make init to allow make -n to function.
+#############################################################################
+
+VM:=Squeak
+VMSRCDIR:=../../spursistasrc/vm
+
+include ../common/Makefile

build.win32x86/squeak.sista.spur/Squeak.def.in

@@ -0,0 +1,3 @@
+; Set the total stack size to 4 megabytes (0x400000), reserving 4Mb and
+; committing 64k (0x10000)
+STACKSIZE 0x400000,0x10000

build.win32x86/squeak.sista.spur/Squeak.exe.manifest

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly
+	xmlns="urn:schemas-microsoft-com:asm.v1"
+	manifestVersion="1.0"
+	xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+<assemblyIdentity
+	version="1.0.0.0"
+	processorArchitecture="*"
+	name="www.mirandabanda.org.Cog.Squeak"
+	type="win32"
+/>
+<description>Squeak Smalltalk Virtual Machine</description>
+<asmv3:application>
+	<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
+		<dpiAware>false</dpiAware>
+	</asmv3:windowsSettings>
+</asmv3:application>
+<dependency>
+	<dependentAssembly>
+		<assemblyIdentity
+			type="win32"
+			name="Microsoft.Windows.Common-Controls"
+			version="6.0.0.0"
+			processorArchitecture="*"
+			publicKeyToken="6595b64144ccf1df"
+			language="*"
+		/>
+	</dependentAssembly>
+</dependency>
+</assembly>

build.win32x86/squeak.sista.spur/Squeak.rc

@@ -0,0 +1,32 @@
+#ifdef _WIN32
+1                       ICON    DISCARDABLE     "GreenCogSqueak.ico"
+2                       ICON    DISCARDABLE     "squeak2.ico"
+3                       ICON    DISCARDABLE     "squeak3.ico"
+
+1 VERSIONINFO
+ FILEVERSION FILEVERSIONVALUES
+ PRODUCTVERSION 5,0,0,0
+ FILEFLAGSMASK 0x3fL
+ FILEFLAGS 0xaL
+ FILEOS 0x10001L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904E4"    // Lang=US English, CharSet=Windows Multilin
+        BEGIN
+            VALUE "CompanyName", "Squeak.org\0"
+            VALUE "FileDescription", "Squeak Cog Spur Virtual Machine\0"
+            VALUE "FileVersion", FILEVERSIONSTRING
+            VALUE "LegalCopyright", "Copyright \251 Squeak.org 1996-2014\0"
+            VALUE "ProductName", "Squeak Cog Spur\0"
+            VALUE "ProductVersion", "5.0\0"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1252
+    END
+END
+#endif

build.win32x86/squeak.sista.spur/mvm

@@ -0,0 +1,33 @@
+#!/bin/bash -e
+A=;D=;F=
+if [ $# = 0 ]; then
+	A=1;D=1;F=1
+else
+	while getopts 'Aadf?' opt "$@"; do
+		case $opt in
+		A)	A=1;D=1;F=1;;
+		a)	A=1;;
+		d)	D=1;;
+		f)	F=1;;
+		*)	echo usage $0 [-A] [-a\ [-d] [-f]; exit 0;;
+		esac
+	done
+	if [ "$1" = -- ]; then
+		if [ "$A$D$F" = "" ]; then
+			A=1;D=1;F=1
+		fi
+	fi
+	shift `expr $OPTIND - 1`
+fi
+if [ -n "$D" ]; then
+	rm -rf builddbg/vm/*.exe
+	make $@ debug 2>&1 | tee LOGD
+fi
+if [ -n "$A" ]; then
+	rm -rf buildast/vm/*.exe
+	make $@ assert 2>&1 | tee LOGA
+fi
+if [ -n "$F" ]; then
+	rm -rf build/vm/*.exe
+	make $@ 2>&1 | tee LOGF
+fi

build.win32x86/squeak.sista.spur/plugins.ext

@@ -0,0 +1,9 @@
+# Copied, perhaps edited, from ../../src/examplePlugins.ext
+# N.B. SqueakSSL is not ready for prime time.  Compiles but does not link fully.
+# See platforms/win32/plugins/SqueakSSL/Makefile
+EXTERNAL_PLUGINS = \
+BochsIA32Plugin \
+BochsX64Plugin \
+SqueakFFIPrims \
+UUIDPlugin \
+Win32OSProcessPlugin

build.win32x86/squeak.sista.spur/plugins.int

@@ -0,0 +1,37 @@
+# Copied, perhaps edited, from ../../src/examplePlugins.int
+INTERNAL_PLUGINS = \
+ADPCMCodecPlugin \
+AsynchFilePlugin \
+B3DAcceleratorPlugin \
+B2DPlugin \
+BitBltPlugin \
+BMPReadWriterPlugin \
+CroquetPlugin \
+ZipPlugin \
+DropPlugin \
+DSAPrims \
+FFTPlugin \
+FilePlugin \
+FloatArrayPlugin \
+FloatMathPlugin \
+HostWindowPlugin \
+IA32ABI \
+JoystickTabletPlugin \
+JPEGReaderPlugin \
+JPEGReadWriter2Plugin \
+Klatt \
+LargeIntegers \
+LocalePlugin \
+Matrix2x3Plugin \
+MIDIPlugin \
+MiscPrimitivePlugin \
+Mpeg3Plugin \
+RePlugin \
+SecurityPlugin \
+SerialPlugin \
+SocketPlugin \
+SoundCodecPrims \
+SoundGenerationPlugin \
+SoundPlugin \
+StarSqueakPlugin \
+SurfacePlugin

build.win64x64/squeak.stack.spur/plugins.ext

@@ -2,7 +2,7 @@
 # N.B. SqueakSSL is not ready for prime time.  Compiles but does not link fully.
 # See platforms/win32/plugins/SqueakSSL/Makefile
 EXTERNAL_PLUGINS = \
+SqueakFFIPrims \
 UUIDPlugin \
 Win32OSProcessPlugin
-#SqueakFFIPrims \
 

nsspur64src/vm/cogit.h

@@ -1,5 +1,5 @@
 /* Automatically generated by
-	CCodeGenerator VMMaker.oscog-eem.1976 uuid: 21cb3e48-ac24-420a-9d0d-75f4b84ce1c9
+	CCodeGenerator VMMaker.oscog-nice.1982 uuid: ed988fdd-7019-41f8-9051-e08afa837953
  */
 
 
@@ -117,15 +117,15 @@ VM_EXPORT sqInt ceCannotResumeTrampoline;
 VM_EXPORT void (*ceCaptureCStackPointers)(void);
 VM_EXPORT sqInt ceCheckForInterruptTrampoline;
 VM_EXPORT void (*ceEnterCogCodePopReceiverReg)(void);
-VM_EXPORT unsigned long (*ceGetFP)(void);
-VM_EXPORT unsigned long (*ceGetSP)(void);
+VM_EXPORT usqIntptr_t (*ceGetFP)(void);
+VM_EXPORT usqIntptr_t (*ceGetSP)(void);
 VM_EXPORT sqInt ceReturnToInterpreterTrampoline;
-VM_EXPORT unsigned long (*ceTryLockVMOwner)(void);
+VM_EXPORT usqIntptr_t (*ceTryLockVMOwner)(void);
 VM_EXPORT void (*ceUnlockVMOwner)(void);
 VM_EXPORT sqInt cFramePointerInUse;
 VM_EXPORT sqInt cmEntryOffset;
 VM_EXPORT sqInt cmNoCheckEntryOffset;
-VM_EXPORT unsigned long debugPrimCallStackOffset;
+VM_EXPORT usqIntptr_t debugPrimCallStackOffset;
 VM_EXPORT sqInt missOffset;
 VM_EXPORT void (*realCECallCogCodePopReceiverAndClassRegs)(void);
 VM_EXPORT void (*realCECallCogCodePopReceiverArg0Regs)(void);