Vm-dev September 2012

vm-dev@lists.squeakfoundation.org

26 participants
73 discussions

VM Maker: CMakeVMMaker-IgorStasenko.174.mcz
by commits＠source.squeak.org 18 Sep '12

18 Sep '12

Igor Stasenko uploaded a new version of CMakeVMMaker to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMaker-IgorStasenko.174.mcz ==================== Summary ==================== Name: CMakeVMMaker-IgorStasenko.174 Author: IgorStasenko Time: 18 September 2012, 2:21:25.63 pm UUID: 2d9e02ce-bdbc-46a9-afde-c2538649fc95 Ancestors: CMakeVMMaker-IgorStasenko.173 updated the libpng library version to 1.5.12 =============== Diff against CMakeVMMaker-IgorStasenko.173 =============== Item was changed: ----- Method: CMLibPng>>archiveMD5Sum (in category 'package properties') ----- archiveMD5Sum + ^ '8ea7f60347a306c5faf70b977fa80e28'! - ^ '39a35257cd888d29f1d000c2ffcc79eb'! Item was changed: ----- Method: CMLibPng>>downloadURL (in category 'package properties') ----- downloadURL + ^ 'ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.5.12.tar.xz'! - ^ 'ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.2.49.tar.gz'!

1 0

[commit] r2615 - include default float.h when not compiling with mingw
by commits＠squeakvm.org 18 Sep '12

18 Sep '12

Author: piumarta Date: 2012-09-17 16:50:54 -0700 (Mon, 17 Sep 2012) New Revision: 2615 Modified: trunk/platforms/win32/vm/sqWin32Intel.c Log: include default float.h when not compiling with mingw Modified: trunk/platforms/win32/vm/sqWin32Intel.c =================================================================== --- trunk/platforms/win32/vm/sqWin32Intel.c 2012-09-17 00:58:51 UTC (rev 2614) +++ trunk/platforms/win32/vm/sqWin32Intel.c 2012-09-17 23:50:54 UTC (rev 2615) @@ -24,7 +24,11 @@ #include <stdio.h> #include <string.h> #include <fcntl.h> /* _O_BINARY */ -#include <mingw-include/float.h> /* prevent the one in lib/gcc/XYZ/include from interfering */ +#if defined(__MINGW32__) || defined(__MINGW64__) +# include <mingw-include/float.h> /* prevent the one in lib/gcc/XYZ/include from interfering */ +#else +# include <float.h> +#endif #include <ole2.h> #include "sq.h" #include "sqWin32Args.h"

1 0

[commit] r2614 - support building a VM that runs 64-bit images
by commits＠squeakvm.org 17 Sep '12

17 Sep '12

Author: piumarta Date: 2012-09-16 17:58:51 -0700 (Sun, 16 Sep 2012) New Revision: 2614 Modified: trunk/platforms/unix/CMakeLists.txt trunk/platforms/unix/ChangeLog trunk/platforms/unix/cmake/configure trunk/platforms/unix/cmake/squeak.in trunk/platforms/unix/vm/build.cmake trunk/platforms/unix/vm/config.cmake trunk/platforms/unix/vm/sqUnixMain.c Log: support building a VM that runs 64-bit images Modified: trunk/platforms/unix/CMakeLists.txt =================================================================== --- trunk/platforms/unix/CMakeLists.txt 2012-09-17 00:45:13 UTC (rev 2613) +++ trunk/platforms/unix/CMakeLists.txt 2012-09-17 00:58:51 UTC (rev 2614) @@ -1,6 +1,6 @@ # Yes, it's true: you can write makefiles in COBOL. # -# Last edited: 2010-05-13 12:54:20 by piumarta on emilia-2.local +# Last edited: 2012-09-16 21:19:57 by piumarta on linux64 PROJECT (squeak) @@ -13,13 +13,19 @@ ) ENDIF (NOT DEFINED VM_HOST OR NOT DEFINED VM_VERSION) +IF (DEFINED OPT--image64) + SET (SQ_VI_BYTES_PER_WORD 8) + SET (versionsuffix "_64bit") + SET (scriptsuffix "64") +ENDIF (DEFINED OPT--image64) + SET (prefix ${CMAKE_INSTALL_PREFIX}) SET (version ${VM_VERSION}) SET (bindir bin) SET (imgdir lib/squeak) -SET (plgdir lib/squeak/${version}) +SET (plgdir lib/squeak/${version}${versionsuffix}) SET (mandir man/man1) SET (docdir share/doc/squeak-${version}) Modified: trunk/platforms/unix/ChangeLog =================================================================== --- trunk/platforms/unix/ChangeLog 2012-09-17 00:45:13 UTC (rev 2613) +++ trunk/platforms/unix/ChangeLog 2012-09-17 00:58:51 UTC (rev 2614) @@ -1,3 +1,25 @@ +2012-09-17 piumarta <com -dot- gmail -at- piumarta (backwards)> + + * CMakeLists.txt: Add option '--image64'. With --image64 + specified: append '_64bit' to plgdir, set scriptsuffix to '64' and + versionsuffix to '64_bit'. + + * vm/config.cmake: Configure VM_VERSION_INFO as VM_VERSION with + versionsuffix appended. + + * vm/sqUnixMain.c: Use VM_VERSION_INFO in output of '-version'. + + * vm/build.cmake: Append ${scriptsuffix} to squeakvm. + + * cmake/squeak.in: Search plgdir and plgd64 for 'ckformat' + program. Append '64_bit' to plgdir when 64-bit image detected. + + * cmake/configure: Add option '--image64' to help text. + + * plugins/DropPlugin/sqUnixDragDrop.c, + plugins/HostWindowPlugin/sqUnixHostWindowPlugin.c: Fix prototypes + for 64 bits. + 2012-09-14 <piumarta@netbsd32> * plugins/UUIDPlugin/sqUnixUUID.c (MakeUUID): Always prefer Modified: trunk/platforms/unix/cmake/configure =================================================================== --- trunk/platforms/unix/cmake/configure 2012-09-17 00:45:13 UTC (rev 2613) +++ trunk/platforms/unix/cmake/configure 2012-09-17 00:58:51 UTC (rev 2614) @@ -1,6 +1,6 @@ #!/bin/sh -# Last edited: 2012-09-12 17:16:25 by piumarta on margaux1 +# Last edited: 2012-09-16 21:35:15 by piumarta on linux64 RELEASE_TAG="" @@ -15,6 +15,7 @@ --without-<plugin> do not build the named plugin --without-gl disable everything that depends on OpenGL --without-SUGAR disable support for SUGAR environment + --image64 build a VM for running 64-bit images Notes: 1. By default the CFLAGS will be set to create optimised binaries. If you are debugging the VM you probably want to use '--CFLAGS=-g' when invoking this Modified: trunk/platforms/unix/cmake/squeak.in =================================================================== --- trunk/platforms/unix/cmake/squeak.in 2012-09-17 00:45:13 UTC (rev 2613) +++ trunk/platforms/unix/cmake/squeak.in 2012-09-17 00:58:51 UTC (rev 2614) @@ -3,7 +3,7 @@ # Launch squeakvm from the command line or a menu script, with a good # plugin path, text encodings and pulseaudio kludge # -# Last edited: 2012-09-14 00:56:50 by piumarta on emilia.local +# Last edited: 2012-09-17 09:06:59 by piumarta on linux64 PATH=/usr/bin:/bin @@ -36,6 +36,7 @@ ck="ckformat" squeakvm="squeakvm" squeakvm64="squeakvm64" +plgd64="${plgdir}_64bit" cogvm="cogvm" cogvm64="cogvm64" vm="" @@ -70,7 +71,9 @@ # try to find the image file format -if test -x "${plgdir}/${ck}"; then ck="${plgdir}/${ck}" +if test -x "${plgd64}/${ck}"; then ck="${plgd64}/${ck}" +elif test -x "${plgdir}/${ck}"; then ck="${plgdir}/${ck}" +elif test -x "${libdir}/${ck}"; then ck="${libdir}/${ck}" elif test -x "${bindir}/${ck}"; then ck="${bindir}/${ck}" elif test -x "`which ${ck}`"; then ck="`which ${ck}`" fi @@ -97,9 +100,9 @@ 6502) vms="${squeakvm}";; 6504) vms="${cogvm} ${squeakvm}";; 6505) vms="${cogvm} ${squeakvm}";; - 68000) vms="${squeakvm64}";; - 68002) vms="${squeakvm64}";; - 68003) vms="${squeakvm64}";; + 68000) vms="${squeakvm64}"; plgdir="${plgd64}";; + 68002) vms="${squeakvm64}"; plgdir="${plgd64}";; + 68003) vms="${squeakvm64}"; plgdir="${plgd64}";; *) vms="${squeakvm}";; esac fi Modified: trunk/platforms/unix/vm/build.cmake =================================================================== --- trunk/platforms/unix/vm/build.cmake 2012-09-17 00:45:13 UTC (rev 2613) +++ trunk/platforms/unix/vm/build.cmake 2012-09-17 00:58:51 UTC (rev 2614) @@ -1,6 +1,6 @@ LINK_DIRECTORIES (${vm_link_directories}) -ADD_EXECUTABLE (squeakvm +ADD_EXECUTABLE (squeakvm${scriptsuffix} ${bld}/${interp}.c ${unix}/vm/aio.c ${unix}/vm/debug.c @@ -43,11 +43,11 @@ ${vm_include_directories} ) -SET_TARGET_PROPERTIES (squeakvm PROPERTIES LINK_FLAGS "${CMAKE_EXE_EXPORTS_C_FLAG}") +SET_TARGET_PROPERTIES (squeakvm${scriptsuffix} PROPERTIES LINK_FLAGS "${CMAKE_EXE_EXPORTS_C_FLAG}") -TARGET_LINK_LIBRARIES (squeakvm m ${squeak_libs} ${vm_link_libraries}) +TARGET_LINK_LIBRARIES (squeakvm${scriptsuffix} m ${squeak_libs} ${vm_link_libraries}) -INSTALL (PROGRAMS ${bld}/squeakvm DESTINATION ${plgdir}) +INSTALL (PROGRAMS ${bld}/squeakvm${scriptsuffix} DESTINATION ${plgdir}) IF (vm-sound-OSS_disabled) SET (useoss "false") @@ -81,7 +81,7 @@ INSTALL (PROGRAMS ${bld}/ckformat DESTINATION ${plgdir}) -ADD_DEPENDENCIES (squeakvm squeak squeak.sh ckformat) +ADD_DEPENDENCIES (squeakvm${scriptsuffix} squeak squeak.sh ckformat) # manual page @@ -89,5 +89,5 @@ DEPENDS ${unix}/doc/squeak.1 COMMAND sh ${bld}/config ${unix}/doc/squeak.1 ${bld}/squeak.1 ) -ADD_DEPENDENCIES (squeakvm squeak.1) +ADD_DEPENDENCIES (squeakvm${scriptsuffix} squeak.1) INSTALL (FILES ${bld}/squeak.1 DESTINATION share/man/man1) Modified: trunk/platforms/unix/vm/config.cmake =================================================================== --- trunk/platforms/unix/vm/config.cmake 2012-09-17 00:45:13 UTC (rev 2613) +++ trunk/platforms/unix/vm/config.cmake 2012-09-17 00:58:51 UTC (rev 2614) @@ -220,10 +220,12 @@ CONFIG_DEFINE (VM_HOST_VENDOR) CONFIG_DEFINE (VM_HOST_OS) +SET (VM_VERSION_INFO \"${VM_VERSION}${versionsuffix}\") SET (VM_VERSION \"${VM_VERSION}\") SET (PLATFORM_SOURCE_VERSION \"${PLATFORM_SOURCE_VERSION}\") CONFIG_DEFINE (VM_VERSION) +CONFIG_DEFINE (VM_VERSION_INFO) CONFIG_DEFINE (PLATFORM_SOURCE_VERSION) CONFIG_DEFINE (SQ_VERSION) @@ -250,3 +252,7 @@ ENDIF () CONFIG_DEFINE (SUGAR) + +IF (DEFINED SQ_VI_BYTES_PER_WORD) + CONFIG_DEFINE (SQ_VI_BYTES_PER_WORD) +ENDIF (DEFINED SQ_VI_BYTES_PER_WORD) Modified: trunk/platforms/unix/vm/sqUnixMain.c =================================================================== --- trunk/platforms/unix/vm/sqUnixMain.c 2012-09-17 00:45:13 UTC (rev 2613) +++ trunk/platforms/unix/vm/sqUnixMain.c 2012-09-17 00:58:51 UTC (rev 2614) @@ -27,7 +27,7 @@ /* Author: Ian Piumarta <ian.piumarta(a)squeakland.org> * - * Last edited: 2012-09-14 05:15:14 by piumarta on solaris11x86 + * Last edited: 2012-09-16 21:47:24 by piumarta on linux64 */ #include "sq.h" @@ -1184,7 +1184,7 @@ if (verbose) sprintf(info+strlen(info), "Squeak VM version: "); - sprintf(info+strlen(info), "%s #%d", VM_VERSION, vm_serial); + sprintf(info+strlen(info), "%s #%d", VM_VERSION_INFO, vm_serial); #if defined(USE_XSHM) sprintf(info+strlen(info), " XShm"); #endif

1 0

[commit] r2613 - fix prototpes for 64-bit
by commits＠squeakvm.org 17 Sep '12

17 Sep '12

Author: piumarta Date: 2012-09-16 17:45:13 -0700 (Sun, 16 Sep 2012) New Revision: 2613 Modified: trunk/platforms/unix/plugins/DropPlugin/sqUnixDragDrop.c trunk/platforms/unix/plugins/HostWindowPlugin/sqUnixHostWindowPlugin.c Log: fix prototpes for 64-bit Modified: trunk/platforms/unix/plugins/DropPlugin/sqUnixDragDrop.c =================================================================== --- trunk/platforms/unix/plugins/DropPlugin/sqUnixDragDrop.c 2012-09-16 01:29:31 UTC (rev 2612) +++ trunk/platforms/unix/plugins/DropPlugin/sqUnixDragDrop.c 2012-09-17 00:45:13 UTC (rev 2613) @@ -60,10 +60,10 @@ sqInt dndOutAcceptedType(char *type, int ntype); void dndOutSend(char *bytes, int nbytes); -int dropInit(void) { return 1; } -int dropShutdown(void) { return 1; } +sqInt dropInit(void) { return 1; } +sqInt dropShutdown(void) { return 1; } -char *dropRequestFileName(int dropIndex) /* in st coordinates */ +char *dropRequestFileName(sqInt dropIndex) /* in st coordinates */ { if ((dropIndex > 0) && (dropIndex <= uxDropFileCount)) { @@ -73,7 +73,7 @@ return 0; } -int dropRequestFileHandle(int dropIndex) +sqInt dropRequestFileHandle(sqInt dropIndex) { char *path= dropRequestFileName(dropIndex); if (path) @@ -116,6 +116,6 @@ dndOutSend(aByteArray, nbytes); } -int sqSecFileAccessCallback(void *callback) { return 0; } -void sqSetNumberOfDropFiles(int numberOfFiles) { } -void sqSetFileInformation(int dropIndex, void *dropFile) { } +sqInt sqSecFileAccessCallback(void *callback) { return 0; } +void sqSetNumberOfDropFiles(sqInt numberOfFiles) { } +void sqSetFileInformation(sqInt dropIndex, void *dropFile) { } Modified: trunk/platforms/unix/plugins/HostWindowPlugin/sqUnixHostWindowPlugin.c =================================================================== --- trunk/platforms/unix/plugins/HostWindowPlugin/sqUnixHostWindowPlugin.c 2012-09-16 01:29:31 UTC (rev 2612) +++ trunk/platforms/unix/plugins/HostWindowPlugin/sqUnixHostWindowPlugin.c 2012-09-17 00:45:13 UTC (rev 2613) @@ -40,7 +40,7 @@ /* closeWindow: arg is int windowIndex. Fail (return 0) if anything goes wrong * - typically the windowIndex invalid or similar */ -int closeWindow(int index) +sqInt closeWindow(sqInt index) { if (noDisplay) return 0; @@ -55,8 +55,8 @@ * windows already extant (platform dependant), the specified size being * unreasonable etc. */ -int createWindowWidthheightoriginXyattrlength( - int w, int h, int x, int y, char *list, int attributeListLength) +sqInt createWindowWidthheightoriginXyattrlength( + sqInt w, sqInt h, sqInt x, sqInt y, char *list, sqInt attributeListLength) { if (noDisplay) return 0; @@ -88,7 +88,7 @@ * -1 is chosen since itwould correspond to a window size of 64k@64k which * I hope is unlikely for some time to come */ -int ioSizeOfWindow(int windowIndex) +sqInt ioSizeOfWindow(sqInt windowIndex) { if (noDisplay) return -1; @@ -101,7 +101,7 @@ * width / height to make the window. Return the actual size the OS * produced in (width<<16 || height) format or -1 for failure as above. */ -int ioSizeOfWindowSetxy(int windowIndex, int w, int h) +sqInt ioSizeOfWindowSetxy(sqInt windowIndex, sqInt w, sqInt h) { if (noDisplay) return -1; @@ -114,7 +114,7 @@ * window in (left<<16 || top) format like ioScreenSize. * Return -1 (as above) for failure - typically invalid windowIndex */ -int ioPositionOfWindow(int windowIndex) +sqInt ioPositionOfWindow(sqInt windowIndex) { if (noDisplay) return -1; @@ -127,7 +127,7 @@ * origin x/y for the window. Return the actual origin the OS * produced in (left<<16 || top) format or -1 for failure, as above */ -int ioPositionOfWindowSetxy(int windowIndex, int x, int y) +sqInt ioPositionOfWindowSetxy(sqInt windowIndex, sqInt x, sqInt y) { if (noDisplay) return -1; @@ -140,7 +140,7 @@ * int size of new title. Fail with -1 if windowIndex is invalid, string is too * long for platform etc. Leave previous title in place on failure */ -int ioSetTitleOfWindow(int windowIndex, char *newTitle, int sizeOfTitle) +sqInt ioSetTitleOfWindow(sqInt windowIndex, char *newTitle, sqInt sizeOfTitle) { if (noDisplay) return -1; @@ -153,7 +153,7 @@ * Close all the windows that appear to be open. * No useful return value since we're getting out of Dodge anyway. */ -int ioCloseAllWindows(void) +sqInt ioCloseAllWindows(void) { if (noDisplay) return 0;

1 0

[commit] r2605 - src from VMM 4.10.2
by David T. Lewis 16 Sep '12

16 Sep '12

Message blocked due to size, forwarding trimmed version ----- Forwarded message from vm-dev-owner(a)lists.squeakfoundation.org ----- Date: Sat, 15 Sep 2012 18:24:20 -0700 To: vm-dev(a)lists.squeakfoundation.org From: commits(a)squeakvm.org Subject: [commit] r2605 - src from VMM 4.10.2 Author: piumarta Date: 2012-09-15 18:24:20 -0700 (Sat, 15 Sep 2012) New Revision: 2605 Added: trunk/platforms/win32/build/src/ trunk/platforms/win32/build/src/ADPCMCodecPlugin/ trunk/platforms/win32/build/src/ADPCMCodecPlugin/ADPCMCodecPlugin.c trunk/platforms/win32/build/src/AsynchFilePlugin/ trunk/platforms/win32/build/src/AsynchFilePlugin/AsynchFilePlugin.c trunk/platforms/win32/build/src/B2DPlugin/ trunk/platforms/win32/build/src/B2DPlugin/B2DPlugin.c trunk/platforms/win32/build/src/B3DAcceleratorPlugin/ trunk/platforms/win32/build/src/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c trunk/platforms/win32/build/src/BMPReadWriterPlugin/ trunk/platforms/win32/build/src/BMPReadWriterPlugin/BMPReadWriterPlugin.c trunk/platforms/win32/build/src/BitBltPlugin/ trunk/platforms/win32/build/src/BitBltPlugin/BitBltPlugin.c trunk/platforms/win32/build/src/CroquetPlugin/ trunk/platforms/win32/build/src/CroquetPlugin/CroquetPlugin.c trunk/platforms/win32/build/src/DSAPrims/ trunk/platforms/win32/build/src/DSAPrims/DSAPrims.c trunk/platforms/win32/build/src/DropPlugin/ trunk/platforms/win32/build/src/DropPlugin/DropPlugin.c trunk/platforms/win32/build/src/FFTPlugin/ trunk/platforms/win32/build/src/FFTPlugin/FFTPlugin.c trunk/platforms/win32/build/src/FT2Plugin/ trunk/platforms/win32/build/src/FT2Plugin/FT2Plugin.c trunk/platforms/win32/build/src/FilePlugin/ trunk/platforms/win32/build/src/FilePlugin/FilePlugin.c trunk/platforms/win32/build/src/FloatArrayPlugin/ trunk/platforms/win32/build/src/FloatArrayPlugin/FloatArrayPlugin.c trunk/platforms/win32/build/src/FloatMathPlugin/ trunk/platforms/win32/build/src/FloatMathPlugin/FloatMathPlugin.c trunk/platforms/win32/build/src/GeniePlugin/ trunk/platforms/win32/build/src/GeniePlugin/GeniePlugin.c trunk/platforms/win32/build/src/HostWindowPlugin/ trunk/platforms/win32/build/src/HostWindowPlugin/HostWindowPlugin.c trunk/platforms/win32/build/src/JPEGReadWriter2Plugin/ trunk/platforms/win32/build/src/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c trunk/platforms/win32/build/src/JPEGReaderPlugin/ trunk/platforms/win32/build/src/JPEGReaderPlugin/JPEGReaderPlugin.c trunk/platforms/win32/build/src/JoystickTabletPlugin/ trunk/platforms/win32/build/src/JoystickTabletPlugin/JoystickTabletPlugin.c trunk/platforms/win32/build/src/Klatt/ trunk/platforms/win32/build/src/Klatt/Klatt.c trunk/platforms/win32/build/src/LargeIntegers/ trunk/platforms/win32/build/src/LargeIntegers/LargeIntegers.c trunk/platforms/win32/build/src/LocalePlugin/ trunk/platforms/win32/build/src/LocalePlugin/LocalePlugin.c trunk/platforms/win32/build/src/MIDIPlugin/ trunk/platforms/win32/build/src/MIDIPlugin/MIDIPlugin.c trunk/platforms/win32/build/src/Matrix2x3Plugin/ trunk/platforms/win32/build/src/Matrix2x3Plugin/Matrix2x3Plugin.c trunk/platforms/win32/build/src/MiscPrimitivePlugin/ trunk/platforms/win32/build/src/MiscPrimitivePlugin/MiscPrimitivePlugin.c trunk/platforms/win32/build/src/Mpeg3Plugin/ trunk/platforms/win32/build/src/Mpeg3Plugin/Mpeg3Plugin.c trunk/platforms/win32/build/src/RePlugin/ trunk/platforms/win32/build/src/RePlugin/RePlugin.c trunk/platforms/win32/build/src/SecurityPlugin/ trunk/platforms/win32/build/src/SecurityPlugin/SecurityPlugin.c trunk/platforms/win32/build/src/SerialPlugin/ trunk/platforms/win32/build/src/SerialPlugin/SerialPlugin.c trunk/platforms/win32/build/src/SocketPlugin/ trunk/platforms/win32/build/src/SocketPlugin/SocketPlugin.c trunk/platforms/win32/build/src/SoundCodecPrims/ trunk/platforms/win32/build/src/SoundCodecPrims/SoundCodecPrims.c trunk/platforms/win32/build/src/SoundGenerationPlugin/ trunk/platforms/win32/build/src/SoundGenerationPlugin/SoundGenerationPlugin.c trunk/platforms/win32/build/src/SoundPlugin/ trunk/platforms/win32/build/src/SoundPlugin/SoundPlugin.c trunk/platforms/win32/build/src/Squeak3D/ trunk/platforms/win32/build/src/Squeak3D/Squeak3D.c trunk/platforms/win32/build/src/SqueakFFIPrims/ trunk/platforms/win32/build/src/SqueakFFIPrims/SqueakFFIPrims.c trunk/platforms/win32/build/src/StarSqueakPlugin/ trunk/platforms/win32/build/src/StarSqueakPlugin/StarSqueakPlugin.c trunk/platforms/win32/build/src/SurfacePlugin/ trunk/platforms/win32/build/src/UUIDPlugin/ trunk/platforms/win32/build/src/UUIDPlugin/UUIDPlugin.c trunk/platforms/win32/build/src/ZipPlugin/ trunk/platforms/win32/build/src/ZipPlugin/ZipPlugin.c trunk/platforms/win32/build/src/ckformat.c trunk/platforms/win32/build/src/plugins.ext trunk/platforms/win32/build/src/plugins.int trunk/platforms/win32/build/src/vm/ trunk/platforms/win32/build/src/vm/interp.c trunk/platforms/win32/build/src/vm/interp.h trunk/platforms/win32/build/src/vm/sqNamedPrims.h Log: src from VMM 4.10.2 Added: trunk/platforms/win32/build/src/ADPCMCodecPlugin/ADPCMCodecPlugin.c =================================================================== --- trunk/platforms/win32/build/src/ADPCMCodecPlugin/ADPCMCodecPlugin.c (rev 0) +++ trunk/platforms/win32/build/src/ADPCMCodecPlugin/ADPCMCodecPlugin.c 2012-09-16 01:24:20 UTC (rev 2605) @@ -0,0 +1,802 @@ <snip>

1 0

[commit] r2612 - provide build instructions
by commits＠squeakvm.org 16 Sep '12

16 Sep '12

Author: piumarta Date: 2012-09-15 18:29:31 -0700 (Sat, 15 Sep 2012) New Revision: 2612 Modified: trunk/platforms/win32/HowToBuild.txt Log: provide build instructions Modified: trunk/platforms/win32/HowToBuild.txt =================================================================== --- trunk/platforms/win32/HowToBuild.txt 2012-09-16 01:29:05 UTC (rev 2611) +++ trunk/platforms/win32/HowToBuild.txt 2012-09-16 01:29:31 UTC (rev 2612) @@ -1 +1,83 @@ -Please see docs/compiling.html for a detailed description of the build process. \ No newline at end of file +0. Prerequisites + +You will need a working installation of MinGW (for the compilation environment) +and MSYS (for the configuration and build environment). See: + + http://www.mingw.org/wiki/Getting_Started + +You will also need the DX7 SDK. This can be obtained from: + + http://squeakvm.org/win32 + +In the instructions that follow we assume that you are working in an MSYS +terminal window. + + +1. Obtain the Squeak VM sources + +A recent, reliable set of sources can be obtained from http://squeakvm.org/win32 +as a zip archive. Unpack them and descend one level into the folder structure +that is created. + + unzip SqueakX.Y.Z-N.win32-src.zip + cd SqueakX.Y.Z-N + +If you prefer to live dangerously, the current developers' sources can be +checked out from the Sqeuak VM repository: + + svn co http://squeakvm.org/svn/squeak/trunk/platforms + +In either case, you should now have a folder called 'platforms' in the current +working directory. + + +2. Create and configure a build environment + +Create a folder in which to build the VM and 'cd' into it. This can be +anywhere, but a folder next to 'platforms' is typical. If you followed the +instructions above, you might simply type: + + mkdir build + cd build + +Configure the build environment by running the 'platforms/win32/build/configure' +script from within your build folder. + + ../platforms/win32/build/configure + +This will attempt to locate the roots of your MinGW and DX7SDK trees. If it +fails then you must run the script with one or more of the following options to +tell it where to look: + + .../configure MINGW=<path-to-your-MinGW-folder> + .../configure DX7SDK=<path-to-your-dx7sdk-folder> + +(Note that there is another option: + + .../configure SRC=<path-to-your-src-folder> + +to specify the location of the generated 'src' tree to use. If you run VMMaker +yourself then this option tells the build to use your 'src' tree instead of the +one bundled in the zip file and repository under platforms/win32/build/src.) + + +3. Compile the VM + +Running: + + make + +should leave a folder in your working directory called SqueakX.Y.Z-N that +contains the VM .exe file, the .dll files that it uses, and the default .ini +file. (Note that parallel builds, using "make -j N", are not supported at this +time.) + +The VM is 'portable' and can be run directly from the Squeak.X.Y.Z-N folder. + + +4. Install the VM + +Just copy the above SqueakX.Y.Z-N folder from your build directory to +"C:\Program Files" or some other location. Since it is 'portable' you can also +copy it to any media (USB flash drive, etc.) and run it directly, without +installation, from that media.

1 0

[commit] r2611 - include correct float.h; disable conflicting definitions of OSVERSIONINFOEX, DISPLAY_DEVICE; fix asignments to non-lvalues
by commits＠squeakvm.org 16 Sep '12

16 Sep '12

Author: piumarta Date: 2012-09-15 18:29:05 -0700 (Sat, 15 Sep 2012) New Revision: 2611 Modified: trunk/platforms/win32/vm/sqWin32Intel.c Log: include correct float.h; disable conflicting definitions of OSVERSIONINFOEX, DISPLAY_DEVICE; fix asignments to non-lvalues Modified: trunk/platforms/win32/vm/sqWin32Intel.c =================================================================== --- trunk/platforms/win32/vm/sqWin32Intel.c 2012-09-16 01:27:19 UTC (rev 2610) +++ trunk/platforms/win32/vm/sqWin32Intel.c 2012-09-16 01:29:05 UTC (rev 2611) @@ -24,7 +24,7 @@ #include <stdio.h> #include <string.h> #include <fcntl.h> /* _O_BINARY */ -#include <Float.h> +#include <mingw-include/float.h> /* prevent the one in lib/gcc/XYZ/include from interfering */ #include <ole2.h> #include "sq.h" #include "sqWin32Args.h" @@ -266,7 +266,7 @@ if(!hShell) hShell = LoadLibrary(TEXT("shell32.dll")); if(!hShell) return; /* should not happen */ /* On WinNT 3.* the following will just return NULL */ - (FARPROC)ShellNotifyIcon = GetProcAddress(hShell, "Shell_NotifyIconA"); + ShellNotifyIcon = GetProcAddress(hShell, "Shell_NotifyIconA"); if(!ShellNotifyIcon) return; /* ok, we don't have it */ nid.cbSize = sizeof(nid); nid.hWnd = stWindow; @@ -329,6 +329,8 @@ return NULL; } +#if 0 + typedef struct _OSVERSIONINFOEX { DWORD dwOSVersionInfoSize; DWORD dwMajorVersion; @@ -352,6 +354,8 @@ TCHAR DeviceKey[128]; } DISPLAY_DEVICE, *PDISPLAY_DEVICE; +#endif + typedef BOOL (CALLBACK *pfnEnumDisplayDevices)( LPCTSTR lpDevice, // device name DWORD iDevNum, // display device

1 0

[commit] r2610 - provide default definition for STACK_SIZE_PARAM_IS_A_RESERVATION
by commits＠squeakvm.org 16 Sep '12

16 Sep '12

Author: piumarta Date: 2012-09-15 18:27:19 -0700 (Sat, 15 Sep 2012) New Revision: 2610 Modified: trunk/platforms/win32/plugins/MIDIPlugin/sqWin32MIDI.c Log: provide default definition for STACK_SIZE_PARAM_IS_A_RESERVATION Modified: trunk/platforms/win32/plugins/MIDIPlugin/sqWin32MIDI.c =================================================================== --- trunk/platforms/win32/plugins/MIDIPlugin/sqWin32MIDI.c 2012-09-16 01:26:51 UTC (rev 2609) +++ trunk/platforms/win32/plugins/MIDIPlugin/sqWin32MIDI.c 2012-09-16 01:27:19 UTC (rev 2610) @@ -21,6 +21,10 @@ #ifndef NO_MIDI +#ifndef STACK_SIZE_PARAM_IS_A_RESERVATION +# define STACK_SIZE_PARAM_IS_A_RESERVATION 0x00010000 +#endif + #ifndef NO_RCSID static char RCSID[] = "$Id$"; #endif

1 0

[commit] r2609 - fix syntax errors
by commits＠squeakvm.org 16 Sep '12

16 Sep '12

Author: piumarta Date: 2012-09-15 18:26:51 -0700 (Sat, 15 Sep 2012) New Revision: 2609 Modified: trunk/platforms/win32/vm/sqGnu.h Log: fix syntax errors Modified: trunk/platforms/win32/vm/sqGnu.h =================================================================== --- trunk/platforms/win32/vm/sqGnu.h 2012-09-16 01:26:27 UTC (rev 2608) +++ trunk/platforms/win32/vm/sqGnu.h 2012-09-16 01:26:51 UTC (rev 2609) @@ -1,6 +1,6 @@ /* Definitions for "gnuified" interp.c; author: Ian Piumarta (ian.piumarta(a)inria.fr) * - * last edited: Sun Jun 20 14:56:09 1999 by piumarta (Ian Piumarta) on clotho + * last edited: 2012-09-15 20:42:11 by piumarta on W530 * * NOTES: * this file is #included *IN PLACE OF* sq.h @@ -175,7 +175,7 @@ #define PROFILE_BYTECODE(x) __asm__("movl %0, _bcProfileCurrent" : : "i" (x)) -#define PROFILE_BYTECODE_END __asm__(" +#define PROFILE_BYTECODE_END __asm__("\ cmpl $0, _profilerActive;\ je 0f;\ pushl %ebx;\

1 0

[commit] r2608 - provide default definition for STACK_SIZE_PARAM_IS_A_RESERVATION
by commits＠squeakvm.org 16 Sep '12

16 Sep '12

Author: piumarta Date: 2012-09-15 18:26:27 -0700 (Sat, 15 Sep 2012) New Revision: 2608 Modified: trunk/platforms/win32/plugins/AsynchFilePlugin/sqWin32AsyncFilePrims.c Log: provide default definition for STACK_SIZE_PARAM_IS_A_RESERVATION Modified: trunk/platforms/win32/plugins/AsynchFilePlugin/sqWin32AsyncFilePrims.c =================================================================== --- trunk/platforms/win32/plugins/AsynchFilePlugin/sqWin32AsyncFilePrims.c 2012-09-16 01:25:49 UTC (rev 2607) +++ trunk/platforms/win32/plugins/AsynchFilePlugin/sqWin32AsyncFilePrims.c 2012-09-16 01:26:27 UTC (rev 2608) @@ -54,6 +54,10 @@ /* Async file handle (defined in header file): */ +#ifndef STACK_SIZE_PARAM_IS_A_RESERVATION +# define STACK_SIZE_PARAM_IS_A_RESERVATION 0x00010000 +#endif + typedef struct { /* Win stuff */ HANDLE hFile; /* The file handle we're operating on */

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev September 2012