Vm-dev June 2014

vm-dev@lists.squeakfoundation.org

37 participants
268 discussions

Re: [Pharo-dev] Solaris VM ?
by Nicolas Cellier 08 Jun '14

08 Jun '14

Great. This shall typically be posted on vm-dev. 2014-05-29 2:52 GMT+02:00 aglynn42 <aglynn42(a)gmail.com>: > <quote author="Andreas Wacknitz"> This pdf has a lot of info on porting > linux code to solaris 11. > http://www.google.com/url?sa=t&rct=j&q=&esrc=s&source=web&cd=1&ved=0CCkQFjA… Hi > Jannik, PharoVM is based on Cog. My old VM’s were traditional SqueakVM’s. I > am not aware of precompiled Solaris VM’s based on Cog or PharoVM, so you > have to build them by yourself. This should be possible; you only need some > supporting libraries (e.g. GMP (earlier named GNUmp) and MPFR)) and > probably CMake. When I did compile it for myself I used Solaris 10 (both, > x86 and SPARC). Which variant do your customers have? Nowadays there are > Solaris 10, Solaris 11, and a bunch of OpenSolaris derivates. There are > some differences in the tool chains and libraries (versions). If you are > not familiar with Solaris or UNIX you should be aware that UNIX in Squeak’s > view is (most probably only) Linux. And this is problematic because you > will most probably find some areas where there are differences between a > „real“ UNIX (like Solaris) and Linux. Good luck, Andreas > ------------------------------ > View this message in context: Re: Solaris VM ?<http://forum.world.st/Solaris-VM-tp4725204p4760786.html> > Sent from the Pharo Smalltalk Developers mailing list archive<http://forum.world.st/Pharo-Smalltalk-Developers-f1294837.html>at Nabble.com. >

5 13

[commit][2958] Set the ignore properties on the flat linux32x86 & win32x86 build dirs.
by commits＠squeakvm.org 08 Jun '14

08 Jun '14

Revision: 2958 Author: eliot Date: 2014-06-08 09:40:23 -0700 (Sun, 08 Jun 2014) Log Message: ----------- Set the ignore properties on the flat linux32x86 & win32x86 build dirs. Property Changed: ---------------- branches/Cog/build.linux32x86/newspeak.cog.spur/build/ branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert/ branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert.itimerheartbeat/ branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug/ branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug.itimerheartbeat/ branches/Cog/build.linux32x86/newspeak.cog.spur/build.itimerheartbeat/ branches/Cog/build.linux32x86/newspeak.cog.v3/build/ branches/Cog/build.linux32x86/newspeak.cog.v3/build.assert/ branches/Cog/build.linux32x86/newspeak.cog.v3/build.assert.itimerheartbeat/ branches/Cog/build.linux32x86/newspeak.cog.v3/build.debug/ branches/Cog/build.linux32x86/newspeak.cog.v3/build.debug.itimerheartbeat/ branches/Cog/build.linux32x86/newspeak.cog.v3/build.itimerheartbeat/ branches/Cog/build.linux32x86/newspeak.sista.spur/build/ branches/Cog/build.linux32x86/newspeak.sista.spur/build.assert/ branches/Cog/build.linux32x86/newspeak.sista.spur/build.assert.itimerheartbeat/ branches/Cog/build.linux32x86/newspeak.sista.spur/build.debug/ branches/Cog/build.linux32x86/newspeak.sista.spur/build.debug.itimerheartbeat/ branches/Cog/build.linux32x86/newspeak.sista.spur/build.itimerheartbeat/ branches/Cog/build.linux32x86/newspeak.sista.v3/build/ branches/Cog/build.linux32x86/newspeak.sista.v3/build.assert/ branches/Cog/build.linux32x86/newspeak.sista.v3/build.assert.itimerheartbeat/ branches/Cog/build.linux32x86/newspeak.sista.v3/build.debug/ branches/Cog/build.linux32x86/newspeak.sista.v3/build.debug.itimerheartbeat/ branches/Cog/build.linux32x86/newspeak.sista.v3/build.itimerheartbeat/ branches/Cog/build.linux32x86/newspeak.stack.spur/build/ branches/Cog/build.linux32x86/newspeak.stack.spur/build.assert/ branches/Cog/build.linux32x86/newspeak.stack.spur/build.assert.itimerheartbeat/ branches/Cog/build.linux32x86/newspeak.stack.spur/build.debug/ branches/Cog/build.linux32x86/newspeak.stack.spur/build.debug.itimerheartbeat/ branches/Cog/build.linux32x86/newspeak.stack.spur/build.itimerheartbeat/ branches/Cog/build.linux32x86/newspeak.stack.v3/build/ branches/Cog/build.linux32x86/newspeak.stack.v3/build.assert/ branches/Cog/build.linux32x86/newspeak.stack.v3/build.assert.itimerheartbeat/ branches/Cog/build.linux32x86/newspeak.stack.v3/build.debug/ branches/Cog/build.linux32x86/newspeak.stack.v3/build.debug.itimerheartbeat/ branches/Cog/build.linux32x86/newspeak.stack.v3/build.itimerheartbeat/ branches/Cog/build.linux32x86/squeak.cog.spur/build/ branches/Cog/build.linux32x86/squeak.cog.spur/build.assert/ branches/Cog/build.linux32x86/squeak.cog.spur/build.assert.itimerheartbeat/ branches/Cog/build.linux32x86/squeak.cog.spur/build.debug/ branches/Cog/build.linux32x86/squeak.cog.spur/build.debug.itimerheartbeat/ branches/Cog/build.linux32x86/squeak.cog.spur/build.itimerheartbeat/ branches/Cog/build.linux32x86/squeak.cog.v3/build/ branches/Cog/build.linux32x86/squeak.cog.v3/build.assert/ branches/Cog/build.linux32x86/squeak.cog.v3/build.assert.itimerheartbeat/ branches/Cog/build.linux32x86/squeak.cog.v3/build.debug/ branches/Cog/build.linux32x86/squeak.cog.v3/build.debug.itimerheartbeat/ branches/Cog/build.linux32x86/squeak.cog.v3/build.itimerheartbeat/ branches/Cog/build.linux32x86/squeak.cog.v3/build.multithreaded/ branches/Cog/build.linux32x86/squeak.cog.v3/build.multithreaded.assert/ branches/Cog/build.linux32x86/squeak.cog.v3/build.multithreaded.debug/ branches/Cog/build.linux32x86/squeak.sista.spur/build/ branches/Cog/build.linux32x86/squeak.sista.spur/build.assert/ branches/Cog/build.linux32x86/squeak.sista.spur/build.assert.itimerheartbeat/ branches/Cog/build.linux32x86/squeak.sista.spur/build.debug/ branches/Cog/build.linux32x86/squeak.sista.spur/build.debug.itimerheartbeat/ branches/Cog/build.linux32x86/squeak.sista.spur/build.itimerheartbeat/ branches/Cog/build.linux32x86/squeak.sista.v3/build/ branches/Cog/build.linux32x86/squeak.sista.v3/build.assert/ branches/Cog/build.linux32x86/squeak.sista.v3/build.assert.itimerheartbeat/ branches/Cog/build.linux32x86/squeak.sista.v3/build.debug/ branches/Cog/build.linux32x86/squeak.sista.v3/build.debug.itimerheartbeat/ branches/Cog/build.linux32x86/squeak.sista.v3/build.itimerheartbeat/ branches/Cog/build.linux32x86/squeak.stack.spur/build/ branches/Cog/build.linux32x86/squeak.stack.spur/build.assert/ branches/Cog/build.linux32x86/squeak.stack.spur/build.assert.itimerheartbeat/ branches/Cog/build.linux32x86/squeak.stack.spur/build.debug/ branches/Cog/build.linux32x86/squeak.stack.spur/build.debug.itimerheartbeat/ branches/Cog/build.linux32x86/squeak.stack.spur/build.itimerheartbeat/ branches/Cog/build.linux32x86/squeak.stack.v3/build/ branches/Cog/build.linux32x86/squeak.stack.v3/build.assert/ branches/Cog/build.linux32x86/squeak.stack.v3/build.assert.itimerheartbeat/ branches/Cog/build.linux32x86/squeak.stack.v3/build.debug/ branches/Cog/build.linux32x86/squeak.stack.v3/build.debug.itimerheartbeat/ branches/Cog/build.linux32x86/squeak.stack.v3/build.itimerheartbeat/ branches/Cog/build.win32x86/newspeak.cog.spur/ branches/Cog/build.win32x86/newspeak.cog.v3/ branches/Cog/build.win32x86/newspeak.sista.spur/ branches/Cog/build.win32x86/newspeak.sista.v3/ branches/Cog/build.win32x86/newspeak.stack.spur/ branches/Cog/build.win32x86/newspeak.stack.v3/ branches/Cog/build.win32x86/squeak.cog.spur/ branches/Cog/build.win32x86/squeak.cog.v3/ branches/Cog/build.win32x86/squeak.sista.spur/ branches/Cog/build.win32x86/squeak.sista.v3/ branches/Cog/build.win32x86/squeak.stack.spur/ branches/Cog/build.win32x86/squeak.stack.v3/ Property changes on: branches/Cog/build.linux32x86/newspeak.cog.spur/build ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.cog.spur/build.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.cog.v3/build ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.cog.v3/build.assert ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.cog.v3/build.assert.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.cog.v3/build.debug ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.cog.v3/build.debug.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.cog.v3/build.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.sista.spur/build ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.sista.spur/build.assert ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.sista.spur/build.assert.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.sista.spur/build.debug ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.sista.spur/build.debug.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.sista.spur/build.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.sista.v3/build ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.sista.v3/build.assert ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.sista.v3/build.assert.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.sista.v3/build.debug ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.sista.v3/build.debug.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.sista.v3/build.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.stack.spur/build ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.stack.spur/build.assert ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.stack.spur/build.assert.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.stack.spur/build.debug ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.stack.spur/build.debug.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.stack.spur/build.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.stack.v3/build ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.stack.v3/build.assert ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.stack.v3/build.assert.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.stack.v3/build.debug ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.stack.v3/build.debug.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/newspeak.stack.v3/build.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.cog.spur/build ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.cog.spur/build.assert ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.cog.spur/build.assert.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.cog.spur/build.debug ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.cog.spur/build.debug.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.cog.spur/build.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.cog.v3/build ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.cog.v3/build.assert ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.cog.v3/build.assert.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.cog.v3/build.debug ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.cog.v3/build.debug.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.cog.v3/build.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.cog.v3/build.multithreaded ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.cog.v3/build.multithreaded.assert ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.cog.v3/build.multithreaded.debug ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.sista.spur/build ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.sista.spur/build.assert ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.sista.spur/build.assert.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.sista.spur/build.debug ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.sista.spur/build.debug.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.sista.spur/build.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.sista.v3/build ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.sista.v3/build.assert ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.sista.v3/build.assert.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.sista.v3/build.debug ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.sista.v3/build.debug.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.sista.v3/build.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.stack.spur/build ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.stack.spur/build.assert ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.stack.spur/build.assert.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.stack.spur/build.debug ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.stack.spur/build.debug.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.stack.spur/build.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.stack.v3/build ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.stack.v3/build.assert ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.stack.v3/build.assert.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.stack.v3/build.debug ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.stack.v3/build.debug.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.linux32x86/squeak.stack.v3/build.itimerheartbeat ___________________________________________________________________ Added: svn:ignore + * Property changes on: branches/Cog/build.win32x86/newspeak.cog.spur ___________________________________________________________________ Added: svn:ignore + build buildast builddbg eitheror.exe mkNamedPrims.exe sqNamedPrims.h Property changes on: branches/Cog/build.win32x86/newspeak.cog.v3 ___________________________________________________________________ Added: svn:ignore + build buildast builddbg eitheror.exe mkNamedPrims.exe sqNamedPrims.h Property changes on: branches/Cog/build.win32x86/newspeak.sista.spur ___________________________________________________________________ Added: svn:ignore + build buildast builddbg eitheror.exe mkNamedPrims.exe sqNamedPrims.h Property changes on: branches/Cog/build.win32x86/newspeak.sista.v3 ___________________________________________________________________ Added: svn:ignore + build buildast builddbg eitheror.exe mkNamedPrims.exe sqNamedPrims.h Property changes on: branches/Cog/build.win32x86/newspeak.stack.spur ___________________________________________________________________ Added: svn:ignore + build buildast builddbg eitheror.exe mkNamedPrims.exe sqNamedPrims.h Property changes on: branches/Cog/build.win32x86/newspeak.stack.v3 ___________________________________________________________________ Added: svn:ignore + build buildast builddbg eitheror.exe mkNamedPrims.exe sqNamedPrims.h Property changes on: branches/Cog/build.win32x86/squeak.cog.spur ___________________________________________________________________ Added: svn:ignore + build buildast builddbg eitheror.exe mkNamedPrims.exe sqNamedPrims.h Property changes on: branches/Cog/build.win32x86/squeak.cog.v3 ___________________________________________________________________ Added: svn:ignore + build buildast builddbg eitheror.exe mkNamedPrims.exe sqNamedPrims.h Property changes on: branches/Cog/build.win32x86/squeak.sista.spur ___________________________________________________________________ Added: svn:ignore + build buildast builddbg eitheror.exe mkNamedPrims.exe sqNamedPrims.h Property changes on: branches/Cog/build.win32x86/squeak.sista.v3 ___________________________________________________________________ Added: svn:ignore + build buildast builddbg eitheror.exe mkNamedPrims.exe sqNamedPrims.h Property changes on: branches/Cog/build.win32x86/squeak.stack.spur ___________________________________________________________________ Added: svn:ignore + build buildast builddbg eitheror.exe mkNamedPrims.exe sqNamedPrims.h Property changes on: branches/Cog/build.win32x86/squeak.stack.v3 ___________________________________________________________________ Added: svn:ignore + build buildast builddbg eitheror.exe mkNamedPrims.exe sqNamedPrims.h

1 0

[commit][2957] Fix compilation of the FFI plugin on win32 ( exclude ARMFFIPlugin.c)
by commits＠squeakvm.org 08 Jun '14

08 Jun '14

Revision: 2957 Author: eliot Date: 2014-06-08 09:36:51 -0700 (Sun, 08 Jun 2014) Log Message: ----------- Fix compilation of the FFI plugin on win32 (exclude ARMFFIPlugin.c) Fix ioFindExternalFunctionInAccessorDepthInto when there's no accessorDepthPtr. Add the new flat build structure for win32. Modified Paths: -------------- branches/Cog/platforms/win32/vm/sqWin32ExternalPrims.c branches/Cog/platforms/win32/vm/sqWin32Heartbeat.c Added Paths: ----------- branches/Cog/build.win32x86/ branches/Cog/build.win32x86/newspeak.cog.spur/ branches/Cog/build.win32x86/newspeak.cog.spur/Makefile branches/Cog/build.win32x86/newspeak.cog.spur/Makefile.plugin branches/Cog/build.win32x86/newspeak.cog.spur/installer/ branches/Cog/build.win32x86/newspeak.cog.spur/installer/Component-with-sources.idt.in branches/Cog/build.win32x86/newspeak.cog.spur/installer/Component.idt.in branches/Cog/build.win32x86/newspeak.cog.spur/installer/Directory-with-sources.idt.in branches/Cog/build.win32x86/newspeak.cog.spur/installer/Directory.idt.in branches/Cog/build.win32x86/newspeak.cog.spur/installer/Feature.idt.in branches/Cog/build.win32x86/newspeak.cog.spur/installer/FeatureComponents-with-sources.idt.in branches/Cog/build.win32x86/newspeak.cog.spur/installer/FeatureComponents.idt.in branches/Cog/build.win32x86/newspeak.cog.spur/installer/File-with-sources.idt.in branches/Cog/build.win32x86/newspeak.cog.spur/installer/File.idt.in branches/Cog/build.win32x86/newspeak.cog.spur/installer/Icon.idt.in branches/Cog/build.win32x86/newspeak.cog.spur/installer/InstallerBackground.bmp branches/Cog/build.win32x86/newspeak.cog.spur/installer/Makefile branches/Cog/build.win32x86/newspeak.cog.spur/installer/Media.idt.in branches/Cog/build.win32x86/newspeak.cog.spur/installer/NewspeakLicence.txt branches/Cog/build.win32x86/newspeak.cog.spur/installer/Property.idt.in branches/Cog/build.win32x86/newspeak.cog.spur/installer/Registry.idt.in branches/Cog/build.win32x86/newspeak.cog.spur/installer/Shortcut.idt.in branches/Cog/build.win32x86/newspeak.cog.spur/installer/Upgrade.idt.in branches/Cog/build.win32x86/newspeak.cog.spur/installer/branding-sed-rules.gmk branches/Cog/build.win32x86/newspeak.cog.spur/installer/branding.gmk branches/Cog/build.win32x86/newspeak.cog.spur/installer/documentation.gmk branches/Cog/build.win32x86/newspeak.cog.spur/installer/files-with-sources.ddf.in branches/Cog/build.win32x86/newspeak.cog.spur/installer/files.ddf.in branches/Cog/build.win32x86/newspeak.cog.spur/installer/index.html branches/Cog/build.win32x86/newspeak.cog.spur/installer/installer-Windows.gmk branches/Cog/build.win32x86/newspeak.cog.spur/installer/links branches/Cog/build.win32x86/newspeak.cog.spur/installer/nopMain.c branches/Cog/build.win32x86/newspeak.cog.spur/installer/nsvm.rc branches/Cog/build.win32x86/newspeak.cog.spur/mvm branches/Cog/build.win32x86/newspeak.cog.spur/nsvm.exe.manifest branches/Cog/build.win32x86/newspeak.cog.spur/nsvm.rc branches/Cog/build.win32x86/newspeak.cog.spur/plugins.ext branches/Cog/build.win32x86/newspeak.cog.spur/plugins.int branches/Cog/build.win32x86/newspeak.cog.v3/ branches/Cog/build.win32x86/newspeak.cog.v3/HowToBuild branches/Cog/build.win32x86/newspeak.cog.v3/Makefile branches/Cog/build.win32x86/newspeak.cog.v3/Makefile.plugin branches/Cog/build.win32x86/newspeak.cog.v3/installer/ branches/Cog/build.win32x86/newspeak.cog.v3/installer/Component-with-sources.idt.in branches/Cog/build.win32x86/newspeak.cog.v3/installer/Component.idt.in branches/Cog/build.win32x86/newspeak.cog.v3/installer/Directory-with-sources.idt.in branches/Cog/build.win32x86/newspeak.cog.v3/installer/Directory.idt.in branches/Cog/build.win32x86/newspeak.cog.v3/installer/Feature.idt.in branches/Cog/build.win32x86/newspeak.cog.v3/installer/FeatureComponents-with-sources.idt.in branches/Cog/build.win32x86/newspeak.cog.v3/installer/FeatureComponents.idt.in branches/Cog/build.win32x86/newspeak.cog.v3/installer/File-with-sources.idt.in branches/Cog/build.win32x86/newspeak.cog.v3/installer/File.idt.in branches/Cog/build.win32x86/newspeak.cog.v3/installer/Icon.idt.in branches/Cog/build.win32x86/newspeak.cog.v3/installer/InstallerBackground.bmp branches/Cog/build.win32x86/newspeak.cog.v3/installer/Makefile branches/Cog/build.win32x86/newspeak.cog.v3/installer/Media.idt.in branches/Cog/build.win32x86/newspeak.cog.v3/installer/NewspeakLicence.txt branches/Cog/build.win32x86/newspeak.cog.v3/installer/Property.idt.in branches/Cog/build.win32x86/newspeak.cog.v3/installer/Registry.idt.in branches/Cog/build.win32x86/newspeak.cog.v3/installer/Shortcut.idt.in branches/Cog/build.win32x86/newspeak.cog.v3/installer/Upgrade.idt.in branches/Cog/build.win32x86/newspeak.cog.v3/installer/branding-sed-rules.gmk branches/Cog/build.win32x86/newspeak.cog.v3/installer/branding.gmk branches/Cog/build.win32x86/newspeak.cog.v3/installer/documentation.gmk branches/Cog/build.win32x86/newspeak.cog.v3/installer/files-with-sources.ddf.in branches/Cog/build.win32x86/newspeak.cog.v3/installer/files.ddf.in branches/Cog/build.win32x86/newspeak.cog.v3/installer/index.html branches/Cog/build.win32x86/newspeak.cog.v3/installer/installer-Windows.gmk branches/Cog/build.win32x86/newspeak.cog.v3/installer/links branches/Cog/build.win32x86/newspeak.cog.v3/installer/nopMain.c branches/Cog/build.win32x86/newspeak.cog.v3/installer/nsvm.rc branches/Cog/build.win32x86/newspeak.cog.v3/mvm branches/Cog/build.win32x86/newspeak.cog.v3/nsvm.def.in branches/Cog/build.win32x86/newspeak.cog.v3/nsvm.exe.manifest branches/Cog/build.win32x86/newspeak.cog.v3/nsvm.ico branches/Cog/build.win32x86/newspeak.cog.v3/nsvm.rc branches/Cog/build.win32x86/newspeak.cog.v3/plugins.ext branches/Cog/build.win32x86/newspeak.cog.v3/plugins.int branches/Cog/build.win32x86/newspeak.sista.spur/ branches/Cog/build.win32x86/newspeak.sista.spur/NotYetImplemented branches/Cog/build.win32x86/newspeak.sista.v3/ branches/Cog/build.win32x86/newspeak.sista.v3/NotYetImplemented branches/Cog/build.win32x86/newspeak.stack.spur/ branches/Cog/build.win32x86/newspeak.stack.spur/Makefile branches/Cog/build.win32x86/newspeak.stack.spur/Makefile.plugin branches/Cog/build.win32x86/newspeak.stack.spur/mvm branches/Cog/build.win32x86/newspeak.stack.spur/nsvm.exe.manifest branches/Cog/build.win32x86/newspeak.stack.spur/nsvm.rc branches/Cog/build.win32x86/newspeak.stack.spur/plugins.ext branches/Cog/build.win32x86/newspeak.stack.spur/plugins.int branches/Cog/build.win32x86/newspeak.stack.v3/ branches/Cog/build.win32x86/newspeak.stack.v3/HowToBuild branches/Cog/build.win32x86/newspeak.stack.v3/Makefile branches/Cog/build.win32x86/newspeak.stack.v3/Makefile.plugin branches/Cog/build.win32x86/newspeak.stack.v3/mvm branches/Cog/build.win32x86/newspeak.stack.v3/nsvm.def.in branches/Cog/build.win32x86/newspeak.stack.v3/nsvm.exe.manifest branches/Cog/build.win32x86/newspeak.stack.v3/nsvm.ico branches/Cog/build.win32x86/newspeak.stack.v3/nsvm.rc branches/Cog/build.win32x86/newspeak.stack.v3/plugins.ext branches/Cog/build.win32x86/newspeak.stack.v3/plugins.int branches/Cog/build.win32x86/squeak.cog.spur/ branches/Cog/build.win32x86/squeak.cog.spur/Croquet.def.in branches/Cog/build.win32x86/squeak.cog.spur/Croquet.exe.manifest branches/Cog/build.win32x86/squeak.cog.spur/Croquet.ico branches/Cog/build.win32x86/squeak.cog.spur/Croquet.rc branches/Cog/build.win32x86/squeak.cog.spur/GreenCogSqueak.ico branches/Cog/build.win32x86/squeak.cog.spur/HowToBuild branches/Cog/build.win32x86/squeak.cog.spur/Makefile branches/Cog/build.win32x86/squeak.cog.spur/Makefile.plugin branches/Cog/build.win32x86/squeak.cog.spur/Squeak.def.in branches/Cog/build.win32x86/squeak.cog.spur/Squeak.exe.manifest branches/Cog/build.win32x86/squeak.cog.spur/Squeak.rc branches/Cog/build.win32x86/squeak.cog.spur/mvm branches/Cog/build.win32x86/squeak.cog.spur/plugins.ext branches/Cog/build.win32x86/squeak.cog.spur/plugins.int branches/Cog/build.win32x86/squeak.cog.spur/squeak.ico branches/Cog/build.win32x86/squeak.cog.v3/ branches/Cog/build.win32x86/squeak.cog.v3/Croquet.def.in branches/Cog/build.win32x86/squeak.cog.v3/Croquet.exe.manifest branches/Cog/build.win32x86/squeak.cog.v3/Croquet.ico branches/Cog/build.win32x86/squeak.cog.v3/Croquet.rc branches/Cog/build.win32x86/squeak.cog.v3/GreenCogSqueak.ico branches/Cog/build.win32x86/squeak.cog.v3/HowToBuild branches/Cog/build.win32x86/squeak.cog.v3/Makefile branches/Cog/build.win32x86/squeak.cog.v3/Makefile.plugin branches/Cog/build.win32x86/squeak.cog.v3/Squeak.def.in branches/Cog/build.win32x86/squeak.cog.v3/Squeak.exe.manifest branches/Cog/build.win32x86/squeak.cog.v3/Squeak.rc branches/Cog/build.win32x86/squeak.cog.v3/mvm branches/Cog/build.win32x86/squeak.cog.v3/plugins.ext branches/Cog/build.win32x86/squeak.cog.v3/plugins.int branches/Cog/build.win32x86/squeak.cog.v3/squeak.ico branches/Cog/build.win32x86/squeak.sista.spur/ branches/Cog/build.win32x86/squeak.sista.spur/NotYetImplemented branches/Cog/build.win32x86/squeak.sista.v3/ branches/Cog/build.win32x86/squeak.sista.v3/NotYetImplemented branches/Cog/build.win32x86/squeak.stack.spur/ branches/Cog/build.win32x86/squeak.stack.spur/Croquet.def.in branches/Cog/build.win32x86/squeak.stack.spur/Croquet.exe.manifest branches/Cog/build.win32x86/squeak.stack.spur/Croquet.ico branches/Cog/build.win32x86/squeak.stack.spur/Croquet.rc branches/Cog/build.win32x86/squeak.stack.spur/GreenCogSqueak.ico branches/Cog/build.win32x86/squeak.stack.spur/HowToBuild branches/Cog/build.win32x86/squeak.stack.spur/Makefile branches/Cog/build.win32x86/squeak.stack.spur/Makefile.plugin branches/Cog/build.win32x86/squeak.stack.spur/Squeak.def.in branches/Cog/build.win32x86/squeak.stack.spur/Squeak.exe.manifest branches/Cog/build.win32x86/squeak.stack.spur/Squeak.rc branches/Cog/build.win32x86/squeak.stack.spur/mvm branches/Cog/build.win32x86/squeak.stack.spur/plugins.ext branches/Cog/build.win32x86/squeak.stack.spur/plugins.int branches/Cog/build.win32x86/squeak.stack.spur/squeak.ico branches/Cog/build.win32x86/squeak.stack.v3/ branches/Cog/build.win32x86/squeak.stack.v3/Croquet.def.in branches/Cog/build.win32x86/squeak.stack.v3/Croquet.exe.manifest branches/Cog/build.win32x86/squeak.stack.v3/Croquet.ico branches/Cog/build.win32x86/squeak.stack.v3/Croquet.rc branches/Cog/build.win32x86/squeak.stack.v3/GreenCogSqueak.ico branches/Cog/build.win32x86/squeak.stack.v3/HowToBuild branches/Cog/build.win32x86/squeak.stack.v3/Makefile branches/Cog/build.win32x86/squeak.stack.v3/Makefile.plugin branches/Cog/build.win32x86/squeak.stack.v3/Squeak.def.in branches/Cog/build.win32x86/squeak.stack.v3/Squeak.exe.manifest branches/Cog/build.win32x86/squeak.stack.v3/Squeak.rc branches/Cog/build.win32x86/squeak.stack.v3/mvm branches/Cog/build.win32x86/squeak.stack.v3/plugins.ext branches/Cog/build.win32x86/squeak.stack.v3/plugins.int branches/Cog/build.win32x86/squeak.stack.v3/squeak.ico Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Added: branches/Cog/build.win32x86/newspeak.cog.spur/Makefile =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/Makefile (rev 0) +++ branches/Cog/build.win32x86/newspeak.cog.spur/Makefile 2014-06-08 16:36:51 UTC (rev 2957) @@ -0,0 +1,327 @@ +############################################################################# +# Makefile for Win32 Cog Spur Newspeak VM using gcc-3.4.x and cygwin +# Do make init to allow make -n to function. +############################################################################# + +############################################################################# +# Base definitions: +# default configuration from product, assert & debug +# +CONFIGURATION=product + +# The name of the VM to build +VM:=nsvm +VM_NAME?=Newspeak Virtual Machine + +############################################################################# +# Default locations +# +ifndef BASEDIR +BASEDIR:=. +endif + +ifeq ("$(CONFIGURATION)","product") +BUILD:=build +else ifeq ("$(CONFIGURATION)","assert") +BUILD:=buildast +else +BUILD:=builddbg +endif +PLUGINSRCDIR:= ../../nscogsrc +VMSRCDIR:= ../../nsspursrc +BLDDIR:= $(BASEDIR)/$(BUILD) +OBJDIR:= $(BLDDIR)/vm + +# N.B. PLATDIR *must* be a relative path, see -f../../$(shell ./eitheror ... below +PLATDIR:=../../platforms +CROSSDIR:=$(PLATDIR)/Cross/vm +WIN32DIR:=$(PLATDIR)/win32/vm +MAKERDIR:=$(VMSRCDIR)/vm +WIN32MISCDIR:=$(PLATDIR)/win32/misc +WIN32UTILDIR:=$(PLATDIR)/win32/util + +CROSSSRC:= $(wildcard $(CROSSDIR)/*.c) $(wildcard $(CROSSDIR)/*.cpp) +WIN32SRC:= $(wildcard $(WIN32DIR)/*.c) $(wildcard $(WIN32DIR)/*.cpp) +MAKERSRC:= $(MAKERDIR)/gcc3x-cointerp.c $(MAKERDIR)/cogit.c +VMSRC:= $(notdir $(MAKERSRC) $(WIN32SRC) $(CROSSSRC)) + +VPATH:= $(MAKERDIR) $(WIN32DIR) $(CROSSDIR) + +############################################################################# +# The internal (.lib) and external (.dll) plugins +# +include plugins.ext +include plugins.int + +LIBS:= $(addprefix $(OBJDIR)/, $(addsuffix .lib, $(INTERNAL_PLUGINS))) +DLLS:= $(addprefix $(OBJDIR)/, $(addsuffix .dll, $(EXTERNAL_PLUGINS))) + +############################################################################# +# Generic VM source file definitions +# +VMDIR:= $(VMSRCDIR)/vm +VMOBJ:= $(VMSRC:.c=.o) +VMOBJ:= $(addprefix $(OBJDIR)/,$(VMOBJ)) + +#LIBSRC:= $(wildcard *.c) +#LIBOBJ:= $(LIBSRC:.c=.o) + +############################################################################# +# SqueakVM definitions +# +ifeq ("$(CONFIGURATION)","product") +VMEXE:= $(OBJDIR)/$(VM)Unstripped.exe +CONSOLEVMEXE:= $(OBJDIR)/$(VM)ConsoleUnstripped.exe +STRIPEXE:= $(OBJDIR)/$(VM).exe +STRIPCONSOLEEXE:= $(OBJDIR)/$(VM)Console.exe +else +VMEXE:= $(OBJDIR)/$(VM).exe +CONSOLEVMEXE:= $(OBJDIR)/$(VM)Console.exe +STRIPEXE:= +STRIPCONSOLEEXE:= +endif +VMDEF:= $(VM).def +VMEXP:= $(OBJDIR)/$(VM).exp +VMMAP:= $(OBJDIR)/$(VM).map +CONSOLEVMMAP:= $(OBJDIR)/$(VM)Console.map +VMLIB:= $(VM).lib +VMRES:= $(VM).res +VMDEFIN:=$(BASEDIR)/$(VM).def.in +BTOBJ:= $(OBJDIR)/btext.o +ETOBJ:= $(OBJDIR)/etext.o + + +.PRECIOUS: eitheror.exe mkNamedPrims.exe + +############################################################################# +# DirectX definitions +# +DXDIR:= $(PLATDIR)/win32/third-party/dx9sdk/Include + +############################################################################# +# C compiler settings (gcc-3.4.4 cygwin 19.24) +# +CC:=gcc + +# VM config flags. +ifeq ("$(CONFIGURATION)","product") +OFLAGS:= -D_MT -O2 -march=pentium4 -momit-leaf-frame-pointer -funroll-loops +NDEBUG:=-DNDEBUG -D'VM_LABEL(foo) 0' # Define NDEBUG for production to exclude asserts +DEBUGVM=0 +else ifeq ("$(CONFIGURATION)","assert") +OFLAGS:= -D_MT -O1 -march=pentium4 -fno-omit-frame-pointer +NDEBUG:=-D'VM_LABEL(foo) 0' +DEBUGVM=0 +else +OFLAGS:= -D_MT -march=pentium4 +NDEBUG:=-DNODBGPRINT=1 -D'VM_LABEL(foo)=0' -D'bzero(p,s)=__builtin_bzero((p),(s))' +DEBUGVM=1 +endif + +# Set minimum version to WindowsXP (see /cygwin/usr/include//w32api/w32api.h) +WINVER:=-D_WIN32_WINNT=0x0501 -DWINVER=0x0501 +WINDEFS:=$(WINVER) -DWIN32 -DWIN32_FILE_SUPPORT -DNO_STD_FILE_SUPPORT + +INCLUDEPATH:= -isystem/usr/include/mingw -I/usr/include/w32api +# define _MT to eliminate the inline versions of printf et al in mingw/stdio.h +NOBUILTIN:= -D_MT -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf +CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mthreads -mno-cygwin -mwin32 \ + -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) $(NOBUILTIN) +DEFS:= -DMULTIPLEBYTECODESETS=1 -D'VM_NAME="$(VM_NAME)"' -DDEBUGVM=$(DEBUGVM) \ + $(WINDEFS) -DNO_ISNAN -DNO_SERVICE $(NDEBUG) -DLSB_FIRST -DX86 $(XDEFS) +XDEFS:= -DSQUEAK_BUILTIN_PLUGIN +INCLUDES:= -I. -I$(VMDIR) -I$(WIN32DIR) -I$(CROSSDIR) -I$(DXDIR) $(XINC) + +############################################################################# +# Linker settings +# +# Note: I had to use 'gcc' instead of 'ld' to prevent unresolved symbols +# The switch '-mwindows' gives us a GUI app instead of a console app. +# Newer cygwins want --export-all-symbols in place of --export-dynamic. +# +LD:= gcc +LDFLAGS:= -mno-cygwin -mwindows -Wl,--export-dynamic -L/usr/lib/mingw +CONSOLELDFLAGS:= -mno-cygwin -mconsole -Wl,--export-dynamic -L/usr/lib/mingw +#LDFLAGS:= -mno-cygwin -mwindows -Wl,--export-all-symbols -L/usr/lib/mingw +#CONSOLELDFLAGS:= -mno-cygwin -mconsole -Wl,--export-all-symbols -L/usr/lib/mingw +STDLIBS:= -lddraw -ldinput -lopengl32 -lwsock32 -lcomdlg32 -lole32 -lwinmm \ + -lversion -lwininet -luser32 -lgdi32 -lpsapi -lkernel32 -lcrtdll \ + -ldsound -lsecur32 + +############################################################################# +# Tools to use +# +AR:= ar rc +CP:= cp +RM:= rm +DLLTOOL:= dlltool +DLLWRAP:= dllwrap +STRIP:= strip +OBJCOPY:= objcopy + +############################################################################# +# RC settings +# +# Note: RC compiles the .rc files into linkable .o files +# +RC:= windres +SVNREV:= $(shell sed -e "s/^static.*SvnRawRevisionString.*Rev: $[0-9][0-9]*$.*/\\1/p" -e d $(PLATDIR)/Cross/vm/sqSCCSVersion.h) +RCFLAGS:= --include-dir $(PLATDIR)/win32/misc -D_WIN32 -DFILEVERSIONVALUES=4,0,$(SVNREV),0 '-DFILEVERSIONSTRING=\"4.0.$(SVNREV)\\0\"' + +.SUFFIXES: +.SUFFIXES: .ccg .cc .c .o .s .i .rc .res .cg .hg .ccg .cpp + + + +############################################################################# +# Common build rules +# +default: print-settings init $(VMEXE) $(CONSOLEVMEXE) $(DLLS) $(STRIPEXE) $(STRIPCONSOLEEXE) + +product:; + $(MAKE) -f $(MAKEFILE_LIST) CONFIGURATION=product $(@,product=) default + +assert: + $(MAKE) -f $(MAKEFILE_LIST) CONFIGURATION=assert $(@,assert=) default + +debug: + $(MAKE) -f $(MAKEFILE_LIST) CONFIGURATION=debug $(@,debug=) default + +# Do make init to allow make -n to function. +init: $(OBJDIR) eitheror.exe mkNamedPrims.exe + +cleanall: clean cleanast cleandbg + +clean: + rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe build + +cleanast: + rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe buildast + +cleandbg: + rm -rf sqNamedPrims.h eitheror.exe mkNamedPrims.exe builddbg + +print-settings: + @echo ---------------- Makefile settings ------------------ + @echo CONFIGURATION=$(CONFIGURATION) + @echo VPATH=$(VPATH) + @echo INCLUDES=$(INCLUDES) + @echo CFLAGS=$(CFLAGS) + @echo INTERNAL_PLUGINS=$(INTERNAL_PLUGINS) + @echo EXTERNAL_PLUGINS=$(EXTERNAL_PLUGINS) + @echo LIBS=$(LIBS) + @echo DLLS=$(DLLS) + @echo ----------------------------------------------------- + +print-objects: + @echo ---------------- Makefile objects ------------------ + @echo VMOBJ=$(VMOBJ) + @echo ----------------------------------------------------- + +eitheror.exe: $(WIN32UTILDIR)/eitheror.c + $(CC) -o $@ -O1 -mconsole -mno-cygwin $< + +mkNamedPrims.exe: $(WIN32UTILDIR)/mkNamedPrims.c + $(CC) -o $@ -mconsole -mno-cygwin $< + +$(BTOBJ): $(WIN32MISCDIR)/btext.c + $(CC) -c -o $@ -fomit-frame-pointer -O2 $< + +$(ETOBJ): $(WIN32MISCDIR)/etext.c + $(CC) -c -o $@ -fomit-frame-pointer -O2 $< + +vm: $(VMEXE) + +$(VMEXE): $(VMOBJ) $(LIBS) $(VMEXP) resource.o $(BTOBJ) $(ETOBJ) + $(CC) -o $(OBJDIR)/version.o $(CFLAGS) $(INCLUDES) $(DEFS) -c $(WIN32DIR)/version.c + $(LD) $(LDFLAGS) -o $(VMEXE) \ + $(BTOBJ) $(VMOBJ) $(VMEXP) $(OBJDIR)/resource.o $(LIBS) $(STDLIBS) $(ETOBJ) + nm --numeric-sort --defined-only -f bsd $(VMEXE) >$(VMMAP) + +$(CONSOLEVMEXE): $(VMOBJ) $(LIBS) $(VMEXP) resource.o $(BTOBJ) $(ETOBJ) + $(CC) -o $(OBJDIR)/version.o $(CFLAGS) $(INCLUDES) $(DEFS) -c $(WIN32DIR)/version.c + $(LD) $(CONSOLELDFLAGS) -o $(CONSOLEVMEXE) \ + $(BTOBJ) $(VMOBJ) $(VMEXP) $(OBJDIR)/resource.o $(LIBS) $(STDLIBS) $(ETOBJ) + nm --numeric-sort --defined-only -f bsd $(CONSOLEVMEXE) >$(CONSOLEVMMAP) + +ifneq ($STRIPEXE,) +$(STRIPEXE): $(VMEXE) + $(STRIP) --strip-unneeded -o $(STRIPEXE) $(VMEXE) + $(OBJCOPY) --add-gnu-debuglink=$(VMEXE) $(STRIPEXE) + +$(STRIPCONSOLEEXE): $(CONSOLEVMEXE) + $(STRIP) --strip-unneeded -o $(STRIPCONSOLEEXE) $(CONSOLEVMEXE) + $(OBJCOPY) --add-gnu-debuglink=$(CONSOLEVMEXE) $(STRIPCONSOLEEXE) +endif + +$(OBJDIR): + @-mkdir $(BLDDIR) + mkdir $(OBJDIR) +ifneq ($(INTERNAL_PLUGINS),) + mkdir $(addprefix $(BLDDIR)/, $(INTERNAL_PLUGINS)) +endif +ifneq ($(EXTERNAL_PLUGINS),) + mkdir $(addprefix $(BLDDIR)/, $(EXTERNAL_PLUGINS)) +endif + +############################################################################# +# The exports for named primitives from Squeak (required by VM) +# +$(VMDEF) $(VMEXP) $(VMLIB): $(VMOBJ) + $(DLLTOOL) --input-def $(VMDEFIN) --output-def $(OBJDIR)/$(VMDEF) --output-exp $(VMEXP) --output-lib $(OBJDIR)/$(VMLIB) $(VMOBJ) + +############################################################################# +# Building plugins +# +.PHONY: FORCE + +# Internal plugin. Build as lib then link in lib +# Check for Makefile in win32 plugins directory otherwise use default Makefile +# N.B. PLATDIR *must* be a relative path for this to work +$(OBJDIR)/%.lib: FORCE + @-mkdir $(BLDDIR)/$(*F) + $(MAKE) $(MFLAGS) -C $(BLDDIR)/$(*F) BUILD=$(BUILD) \ + -f../../$(shell ./eitheror.exe $(PLATDIR)/win32/plugins/$(*F)/Makefile Makefile.plugin) \ + PLATDIR=../../$(PLATDIR) BASEDIR=../../$(BASEDIR) \ + PLUGINSRCDIR=../../$(PLUGINSRCDIR) VMSRCDIR=../../$(VMSRCDIR) \ + LIBNAME=$(*F) XDEFS=-DSQUEAK_BUILTIN_PLUGIN \ + ../../$(OBJDIR)/$(*F).lib + +# External plugin. Build as dll and copy to vm dir ($(OBJDIR)). +# Check for Makefile in win32 plugins directory otherwise use default Makefile +$(OBJDIR)/%.dll: FORCE + @-mkdir $(BLDDIR)/$(*F) + $(MAKE) $(MFLAGS) -C $(BLDDIR)/$(*F) BUILD=$(BUILD) \ + -f../../$(shell ./eitheror.exe $(PLATDIR)/win32/plugins/$(*F)/Makefile Makefile.plugin) \ + PLATDIR=../../$(PLATDIR) BASEDIR=../../$(BASEDIR) \ + PLUGINSRCDIR=../../$(PLUGINSRCDIR) VMSRCDIR=../../$(VMSRCDIR) \ + LIBNAME=$(*F) ../../$(OBJDIR)/$(*F).dll + +FORCE: + +############################################################################# +# Basic rules +# +$(OBJDIR)/%.o: %.c $(wildcard $(CROSSDIR)/*.h) $(wildcard $(WIN32DIR)/*.h) $(wildcard $(MAKERDIR)/*.h) + $(CC) -o $@ $(CFLAGS) $(INCLUDES) $(DEFS) -c $< + +.c.s: + $(CC) -S -o $@ -fverbose-asm -Wa,ah $(CFLAGS) $(INCLUDES) $(DEFS) -c $< + +.rc.res: + $(RC) $(RCFLAGS) -i $< -o $(OBJDIR)/$@ + +$(VMRES): $(BASEDIR)/$(VM).rc + $(RC) $(RCFLAGS) -i $(BASEDIR)/$(VM).rc -o $(OBJDIR)/$@ + $(CP) $(VM).exe.manifest $(OBJDIR) + +resource.o: $(VMRES) + $(RC) $(RCFLAGS) -i $(OBJDIR)/$< -o $(OBJDIR)/$@ + +############################################################################# +# Extra specific dependencies +# +sqNamedPrims.h: plugins.int mkNamedPrims.exe + ./mkNamedPrims.exe $(INTERNAL_PLUGINS) > sqNamedPrims.h + +$(OBJDIR)/sqNamedPrims.o: sqNamedPrims.c sqNamedPrims.h Added: branches/Cog/build.win32x86/newspeak.cog.spur/Makefile.plugin =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/Makefile.plugin (rev 0) +++ branches/Cog/build.win32x86/newspeak.cog.spur/Makefile.plugin 2014-06-08 16:36:51 UTC (rev 2957) @@ -0,0 +1,182 @@ +############################################################################# +# Generic Makefile for plugins +############################################################################# +AR:= ar rc +CP:= cp +RM:= rm + +# The following are the four key locations (set via invocation): +# PLUGINSRCDIR: Where is the root of the src plugins source tree? +# VMSRCDIR: Where is the root of the src vm source tree? +# PLATDIR: Where is the root of the platforms tree? +# BUILDDIR: Where is the root of the build tree? + +############################################################################# +# Standard directory locations: +# CROSSDIR: The location of the cross platform sources +# WIN32DIR: The location of the win32 sources +# MAKERDIR: The location of the VMMaker generated sources +# BUILDDIR: The location where the plugin is built +# +PLUGINSRCDIR:= ../../../../src +VMSRCDIR:= ../../../../src +CROSSDIR:= $(PLATDIR)/Cross/plugins/$(LIBNAME) +WIN32DIR:= $(PLATDIR)/win32/plugins/$(LIBNAME) +MAKERDIR:= $(PLUGINSRCDIR)/plugins/$(LIBNAME) +BUILDDIR:= $(BASEDIR)/$(BUILD)/$(LIBNAME) + +# Support directory locations +CROSSVMDIR:=$(PLATDIR)/Cross/vm +WIN32VMDIR:=$(PLATDIR)/win32/vm +MAKERVMDIR:=$(VMSRCDIR)/vm + +DXDIR:= $(PLATDIR)/win32/third-party/dx9sdk/Include + +INCLUDES:= -I. -I$(DXDIR) \ + -I$(MAKERVMDIR) -I$(WIN32VMDIR) -I$(CROSSVMDIR) \ + -I$(MAKERDIR) -I$(WIN32DIR) -I$(CROSSDIR) + +############################################################################# +# If no source files were given, use standard set +# + +CROSSSRC:= $(wildcard $(CROSSDIR)/*.c) $(wildcard $(CROSSDIR)/*.cpp) +WIN32SRC:= $(wildcard $(WIN32DIR)/*.c) $(wildcard $(WIN32DIR)/*.cpp) +MAKERSRC:= $(wildcard $(MAKERDIR)/*.c) +LIBSRC:= $(notdir $(MAKERSRC) $(WIN32SRC) $(CROSSSRC)) + +############################################################################# +# C compiler settings (gcc-3.4.4 cygwin 19.24) +# +NDEBUG:=-DNDEBUG +# Set minimum version to WindowsXP (see /cygwin/usr/include//w32api/w32api.h) +WINVER:=-D_WIN32_WINNT=0x0501 -DWINVER=0x0501 +CC:= gcc +# define _MT to eliminate the inline versions of printf et al in mingw/stdio.h +OFLAGS:= -D_MT -O1 -march=pentium4 -momit-leaf-frame-pointer -funroll-loops \ + -fno-builtin-printf -fno-builtin-putchar -fno-builtin-fprintf +INCLUDEPATH:= -isystem/usr/include/mingw -I/usr/include/w32api +CFLAGS:= $(INCLUDEPATH) -msse2 -ggdb2 -mwindows -mdll -mno-cygwin -mwin32 \ + -mno-rtd -mms-bitfields -mno-accumulate-outgoing-args $(OFLAGS) +DEFS:= $(WINVER) -DWIN32 -DWIN32_FILE_SUPPORT -DNO_ISNAN \ + -DNO_SERVICE -DNO_STD_FILE_SUPPORT \ + $(NDEBUG) -DLSB_FIRST -DVM_NAME=\"$(VM)\" -DX86 $(XDEFS) + +############################################################################# +# DLL settings +# +# Note: By default DLLTOOL/DLLWRAP do the work for everything related to plugins +# but if LINK_WITH_GCC we use gcc and if LINK_WITH_GPP we use g++. +# +DLLTOOL:= dlltool +DLLWRAP:= dllwrap -mno-cygwin +#OPTSTRIP:= strip # for production +OPTSTRIP:= echo not doing strip + +.SUFFIXES: .c .cpp .o .s .rc .res .dep + +############################################################################# +# Plugin settings +# +OBJDIR:= $(BASEDIR)/$(BUILD)/$(LIBNAME) +VMDIR:= $(BASEDIR)/$(BUILD)/vm +PLUGINLIB:= $(VMDIR)/$(LIBNAME).lib +PLUGINDLL:= $(VMDIR)/$(LIBNAME).dll +LIBOBJ ?= $(patsubst %.c,%.o,$(patsubst %.cpp,%.o,$(LIBSRC))) + + +VPATH:= $(MAKERDIR) $(WIN32DIR) $(CROSSDIR) $(OBJDIR) + +all: $(PLUGINLIB) $(PLUGINDLL) + +print-settings: + @echo ---------------- Makefile settings ------------------ + @echo VPATH=$(VPATH) + @echo INCLUDES=$(INCLUDES) + @echo CFLAGS=$(CFLAGS) + @echo PLUGINSRCDIR=$(PLUGINSRCDIR) + @echo VMSRCDIR=$(VMSRCDIR) + @echo CROSSDIR=$(CROSSDIR) + @echo WIN32DIR=$(WIN32DIR) + @echo MAKERDIR=$(MAKERDIR) + @echo CROSSSRC=$(CROSSSRC) + @echo WIN32SRC=$(WIN32SRC) + @echo MAKERSRC=$(MAKERSRC) + @echo LIBSRC=$(LIBSRC) + @echo LIBOBJ=$(LIBOBJ) + @echo OBJDIR=$(OBJDIR) + @echo VMDIR=$(VMDIR) + @echo PLUGINLIB=$(PLUGINLIB) + @echo PLUGINDLL=$(PLUGINDLL) + @echo LIBOBJ=$(LIBOBJ) + @echo ----------------------------------------------------- + +$(OBJDIR): + mkdir $(OBJDIR) + +$(VMDIR): + mkdir $(VMDIR) + +$(PLUGINLIB): $(VMDIR) $(OBJDIR) $(LIBOBJ) + -$(RM) $(PLUGINLIB) + $(AR) $(PLUGINLIB) $(LIBOBJ) + +$(PLUGINDLL): $(VMDIR) $(OBJDIR) $(LIBOBJ) + $(DLLTOOL) \ + --output-def $(LIBNAME).def \ + --output-exp $(LIBNAME).exp \ + --output-lib $(LIBNAME).lib \ + $(DLLTOOLEXTRAS) \ + $(LIBOBJ) +ifneq ($(LINK_WITH_GCC),) + gcc -shared \ + -mno-cygwin \ + -def $(LIBNAME).def \ + -o $(VMDIR)/$(LIBNAME).dll \ + --entry _DllMain@12 \ + $(GCCLINKEXTRAS) \ + $(LIBOBJ) $(EXTRALIBS) +else ifneq ($(LINK_WITH_GPP),) + g++ -shared \ + -mno-cygwin \ + -def $(LIBNAME).def \ + -o $(VMDIR)/$(LIBNAME).dll \ + --entry _DllMain@12 \ + $(GPPLINKEXTRAS) \ + $(LIBOBJ) $(EXTRALIBS) +else + $(DLLWRAP) -mwindows \ + -def $(LIBNAME).def \ + -o $(VMDIR)/$(LIBNAME).dll \ + --entry _DllMain@12 \ + $(DLLWRAPEXTRAS) \ + $(LIBNAME).exp \ + $(LIBOBJ) $(EXTRALIBS) +endif + $(OPTSTRIP) --strip-all $(VMDIR)/$(LIBNAME).dll + -$(RM) $(LIBNAME).lib + +############################################################################# +# Rules for automated builds +# + +.c.o: + $(CC) $(CFLAGS) $(INCLUDES) $(DEFS) -c $< + +.c.s: + $(CC) -S -o $@ -fverbose-asm -Wa,ah $(CFLAGS) $(INCLUDES) $(DEFS) -c $< + +.rc.res: + $(RC) $(RCFLAGS) -i $< -o $@ + +.c.dep: + $(CC) -M -o $(notdir $@) $(CFLAGS) $(INCLUDES) $(DEFS) -c $< + +.cpp.o: + $(CC) $(CFLAGS) $(INCLUDES) $(DEFS) -c $< + +.cpp.s: + $(CC) -S -o $@ -fverbose-asm -Wa,ah $(CFLAGS) $(INCLUDES) $(DEFS) -c $< + +.cpp.dep: + $(CC) -M -o $(notdir $@) $(CFLAGS) $(INCLUDES) $(DEFS) -c $< Added: branches/Cog/build.win32x86/newspeak.cog.spur/installer/Component-with-sources.idt.in =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/installer/Component-with-sources.idt.in (rev 0) +++ branches/Cog/build.win32x86/newspeak.cog.spur/installer/Component-with-sources.idt.in 2014-06-08 16:36:51 UTC (rev 2957) @@ -0,0 +1,6 @@ +Component ComponentId Directory_ Attributes Condition KeyPath +s72 S38 s72 i2 S255 S72 +Component Component +AdvertisedShortcut {@@FRESH_GUID1@@} BASEAPPDIR 0 @@VM_EXECUTABLE@@ +Support {@@FRESH_GUID2@@} BASEAPPDIR 0 @@VM_EXECUTABLE_MANIFEST@@ +Sources {@@FRESH_GUID3@@} BASEAPPDIR 0 @@SOURCEFILENAME1@@ Added: branches/Cog/build.win32x86/newspeak.cog.spur/installer/Component.idt.in =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/installer/Component.idt.in (rev 0) +++ branches/Cog/build.win32x86/newspeak.cog.spur/installer/Component.idt.in 2014-06-08 16:36:51 UTC (rev 2957) @@ -0,0 +1,6 @@ +Component ComponentId Directory_ Attributes Condition KeyPath +s72 S38 s72 i2 S255 S72 +Component Component +AdvertisedShortcut {@@FRESH_GUID1@@} BASEAPPDIR 0 @@VM_EXECUTABLE@@ +Support {@@FRESH_GUID2@@} BASEAPPDIR 0 @@VM_EXECUTABLE_MANIFEST@@ +Documentation {@@FRESH_GUID3@@} DOCDIR 0 index.html Added: branches/Cog/build.win32x86/newspeak.cog.spur/installer/Directory-with-sources.idt.in =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/installer/Directory-with-sources.idt.in (rev 0) +++ branches/Cog/build.win32x86/newspeak.cog.spur/installer/Directory-with-sources.idt.in 2014-06-08 16:36:51 UTC (rev 2957) @@ -0,0 +1,8 @@ +Directory Directory_Parent DefaultDir +s72 S72 l255 +Directory Directory +TARGETDIR SourceDir +ProgramFilesFolder TARGETDIR . +BASEAPPDIR ProgramFilesFolder @@BRAND_DIR@@:. +ProgramMenuFolder BASEAPPDIR . +DOCDIR BASEAPPDIR doc:. Added: branches/Cog/build.win32x86/newspeak.cog.spur/installer/Directory.idt.in =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/installer/Directory.idt.in (rev 0) +++ branches/Cog/build.win32x86/newspeak.cog.spur/installer/Directory.idt.in 2014-06-08 16:36:51 UTC (rev 2957) @@ -0,0 +1,8 @@ +Directory Directory_Parent DefaultDir +s72 S72 l255 +Directory Directory +TARGETDIR SourceDir +ProgramFilesFolder TARGETDIR . +BASEAPPDIR ProgramFilesFolder @@BRAND_DIR@@:. +ProgramMenuFolder BASEAPPDIR . +DOCDIR BASEAPPDIR doc:. Added: branches/Cog/build.win32x86/newspeak.cog.spur/installer/Feature.idt.in =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/installer/Feature.idt.in (rev 0) +++ branches/Cog/build.win32x86/newspeak.cog.spur/installer/Feature.idt.in 2014-06-08 16:36:51 UTC (rev 2957) @@ -0,0 +1,4 @@ +Feature Feature_Parent Title Description Display Level Directory_ Attributes +s38 S38 L64 L255 I2 i2 S72 i2 +Feature Feature +Typical Typical Install Typical 1 3 BASEAPPDIR 0 Added: branches/Cog/build.win32x86/newspeak.cog.spur/installer/FeatureComponents-with-sources.idt.in =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/installer/FeatureComponents-with-sources.idt.in (rev 0) +++ branches/Cog/build.win32x86/newspeak.cog.spur/installer/FeatureComponents-with-sources.idt.in 2014-06-08 16:36:51 UTC (rev 2957) @@ -0,0 +1,6 @@ +Feature_ Component_ +s38 s72 +FeatureComponents Feature_ Component_ +Typical AdvertisedShortcut +Typical Support +Typical Sources Added: branches/Cog/build.win32x86/newspeak.cog.spur/installer/FeatureComponents.idt.in =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/installer/FeatureComponents.idt.in (rev 0) +++ branches/Cog/build.win32x86/newspeak.cog.spur/installer/FeatureComponents.idt.in 2014-06-08 16:36:51 UTC (rev 2957) @@ -0,0 +1,6 @@ +Feature_ Component_ +s38 s72 +FeatureComponents Feature_ Component_ +Typical AdvertisedShortcut +Typical Support +Typical Documentation Added: branches/Cog/build.win32x86/newspeak.cog.spur/installer/File-with-sources.idt.in =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/installer/File-with-sources.idt.in (rev 0) +++ branches/Cog/build.win32x86/newspeak.cog.spur/installer/File-with-sources.idt.in 2014-06-08 16:36:51 UTC (rev 2957) @@ -0,0 +1,7 @@ +File Component_ FileName FileSize Version Language Attributes Sequence +s72 s72 l255 i4 S72 S20 I2 i2 +File File +@@VM_EXECUTABLE@@ AdvertisedShortcut @@VM_EXECUTABLE@@ 0 16896 1 +@@VM_EXECUTABLE_MANIFEST@@ Support @@VM_MANIFEST_8DOT3@@|@@VM_EXECUTABLE_MANIFEST@@ 0 16896 1 +@@SOURCEFILENAME1@@ Sources source1.src|@@SOURCEFILENAME1@@ 0 16896 1 +@@VM_EXECUTABLE_MAP@@ Support @@VM_EXECUTABLE_MAP@@ 0 16896 1 Added: branches/Cog/build.win32x86/newspeak.cog.spur/installer/File.idt.in =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/installer/File.idt.in (rev 0) +++ branches/Cog/build.win32x86/newspeak.cog.spur/installer/File.idt.in 2014-06-08 16:36:51 UTC (rev 2957) @@ -0,0 +1,7 @@ +File Component_ FileName FileSize Version Language Attributes Sequence +s72 s72 l255 i4 S72 S20 I2 i2 +File File +@@VM_EXECUTABLE@@ AdvertisedShortcut @@VM_EXECUTABLE@@ 0 16896 1 +@@VM_EXECUTABLE_MANIFEST@@ Support @@VM_MANIFEST_8DOT3@@|@@VM_EXECUTABLE_MANIFEST@@ 0 16896 1 +index.html Documentation index.htm|index.html 0 16896 1 +@@VM_EXECUTABLE_MAP@@ Support @@VM_EXECUTABLE_MAP@@ 0 16896 1 Added: branches/Cog/build.win32x86/newspeak.cog.spur/installer/Icon.idt.in =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/installer/Icon.idt.in (rev 0) +++ branches/Cog/build.win32x86/newspeak.cog.spur/installer/Icon.idt.in 2014-06-08 16:36:51 UTC (rev 2957) @@ -0,0 +1,4 @@ +Name Data +s72 v0 +Icon Name +@@VM_ICON@@.exe @@VM_ICON@@.exe.ibd Added: branches/Cog/build.win32x86/newspeak.cog.spur/installer/InstallerBackground.bmp =================================================================== (Binary files differ) Property changes on: branches/Cog/build.win32x86/newspeak.cog.spur/installer/InstallerBackground.bmp ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/Cog/build.win32x86/newspeak.cog.spur/installer/Makefile =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/installer/Makefile (rev 0) +++ branches/Cog/build.win32x86/newspeak.cog.spur/installer/Makefile 2014-06-08 16:36:51 UTC (rev 2957) @@ -0,0 +1,53 @@ +# Makefile for the Windows installer on cygwin. Produces a Microsoft .MSI file +# given an executable, and possibly an image file. +# +# How to build: +# On unix edit and run ./links to get .exe, .map and sources, then on cygwin +# run make + +SOURCES := yes +DOCUMENTATION_DIR := doc +GUID_UPGRADE_CODE := FB4E770A-413B-4745-913B-D7EE7041AA48 + +include branding.gmk + +# Cab contents: +VM_EXECUTABLE := $(VM_BASE_NAME).exe +VM_EXECUTABLE_MAP := $(VM_BASE_NAME).map +VM_EXECUTABLE_MANIFEST := $(VM_EXECUTABLE).manifest +VM_MANIFEST_8DOT3 := $(VM_BASE_NAME).man +VM_ICON := $(VM_BASE_NAME).ico +SOURCEFILENAME1 := SqueakV41.sources + +CAB_FILES := $(VM_EXECUTABLE) $(VM_EXECUTABLE_MAP) $(VM_EXECUTABLE_MANIFEST) +ifeq ($(strip $(SOURCES)),yes) +CAB_FILES := $(CAB_FILES) $(SOURCEFILENAME1) +endif + +CC := /usr/bin/gcc +CP := /usr/bin/cp +SED := /usr/bin/sed +WINDRES := /usr/bin/windres + +icon.o: $(VM_BASE_NAME).rc + $(WINDRES) --include-dir=.. --define _WIN32 -l 0 -i $< -o $@ + +$(VM_EXECUTABLE): ../build/vm/$(VM_EXECUTABLE) + rm -f $@ + cp $< $@ + +$(VM_EXECUTABLE_MAP): ../build/vm/$(VM_EXECUTABLE_MAP) + rm -f $@ + grep " [tT] " $< | grep -v ' t \.text' >$@ + +$(VM_EXECUTABLE_MANIFEST): ../build/vm/$(VM_EXECUTABLE_MANIFEST) + rm -f $@ + cp $< $@ + +echovars: + @echo '$$(VERSION)='$(VERSION) + @echo '$$(VM_ICON)='$(VM_ICON) + @echo '$$(DOCUMENTATION_DIR)='$(DOCUMENTATION_DIR) + @echo 'cygpath $$(DOCUMENTATION_DIR)='"$(shell cygpath -wa $(DOCUMENTATION_DIR))\\" + +include installer-Windows.gmk Added: branches/Cog/build.win32x86/newspeak.cog.spur/installer/Media.idt.in =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/installer/Media.idt.in (rev 0) +++ branches/Cog/build.win32x86/newspeak.cog.spur/installer/Media.idt.in 2014-06-08 16:36:51 UTC (rev 2957) @@ -0,0 +1,4 @@ +DiskId LastSequence DiskPrompt Cabinet VolumeLabel Source +i2 i2 L64 S255 S32 S72 +Media DiskId +1 1 #files.cab Added: branches/Cog/build.win32x86/newspeak.cog.spur/installer/NewspeakLicence.txt =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/installer/NewspeakLicence.txt (rev 0) +++ branches/Cog/build.win32x86/newspeak.cog.spur/installer/NewspeakLicence.txt 2014-06-08 16:36:51 UTC (rev 2957) @@ -0,0 +1,5 @@ +Copyright 2008, Cadence Design Systems + +Licensed under the Apache License, Version 2.0 (the ''License''); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. Added: branches/Cog/build.win32x86/newspeak.cog.spur/installer/Property.idt.in =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/installer/Property.idt.in (rev 0) +++ branches/Cog/build.win32x86/newspeak.cog.spur/installer/Property.idt.in 2014-06-08 16:36:51 UTC (rev 2957) @@ -0,0 +1,51 @@ +Property Value +s72 l0 +Property Property +AppsShutdownOption All +BannerBitmap bannrbmp +ButtonText_Back < &Back +ButtonText_Browse Br&owse +ButtonText_Cancel Cancel +ButtonText_Exit &Exit +ButtonText_Finish &Finish +ButtonText_Ignore &Ignore +ButtonText_Install &Install +ButtonText_Next &Next > +ButtonText_No &No +ButtonText_OK OK +ButtonText_Remove &Remove +ButtonText_Repair &Repair +ButtonText_Reset &Reset +ButtonText_Resume &Resume +ButtonText_Retry &Retry +ButtonText_Return &Return +ButtonText_Yes &Yes +CompleteSetupIcon completi +CustomSetupIcon custicon +DefaultUIFont DlgFont8 +DialogBitmap dlgbmp +DlgTitleFont {&DlgFontBold8} +ErrorDialog ErrorDlg +ExclamationIcon exclamic +IAgree No +INSTALLLEVEL 3 +InfoIcon info +InstallMode Typical +InstallerIcon insticon +Manufacturer @@MANUFACTURER@@ +PIDTemplate 12345<###-%%%%%%%>@@@@@ +PROMPTROLLBACKCOST P +ProductCode {@@FRESH_GUID1@@} +ProductID none +ProductLanguage 1033 +ProductName @@PRODUCT_NAME@@ +ProductVersion @@PRODUCT_VERSION@@ +Progress1 Installing +Progress2 installs +RemoveIcon removico +RepairIcon repairic +SecureCustomProperties {@@GUID_UPGRADE_CODE@@} +Setup Setup +ShowUserRegistrationDlg 0 +UpgradeCode {@@GUID_UPGRADE_CODE@@} +Wizard Setup Wizard Added: branches/Cog/build.win32x86/newspeak.cog.spur/installer/Registry.idt.in =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/installer/Registry.idt.in (rev 0) +++ branches/Cog/build.win32x86/newspeak.cog.spur/installer/Registry.idt.in 2014-06-08 16:36:51 UTC (rev 2957) @@ -0,0 +1,7 @@ +Registry Root Key Name Value Component_ +s72 i2 l255 L255 L0 s72 +Registry Registry +FileType 0 .image Newspeak.VirtualMachine.1 AdvertisedShortcut +ProgId 0 Newspeak.VirtualMachine.1 Newspeak Image AdvertisedShortcut +CurVer 0 Newspeak.VirtualMachine.1\CurVer Newspeak.VirtualMachine.1 AdvertisedShortcut +OpenCommand 0 Newspeak.VirtualMachine.1\shell\open\command #%"[#@@VM_EXECUTABLE@@]" "%1" AdvertisedShortcut Added: branches/Cog/build.win32x86/newspeak.cog.spur/installer/Shortcut.idt.in =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/installer/Shortcut.idt.in (rev 0) +++ branches/Cog/build.win32x86/newspeak.cog.spur/installer/Shortcut.idt.in 2014-06-08 16:36:51 UTC (rev 2957) @@ -0,0 +1,4 @@ +Shortcut Directory_ Name Component_ Target Arguments Description Hotkey Icon_ IconIndex ShowCmd WkDir DisplayResourceDLL DisplayResourceId DescriptionResourceDLL DescriptionResourceId +s72 s72 l128 s72 s72 S255 L255 I2 S72 I2 I2 S72 S100 I4 S100 I4 +Shortcut Shortcut +scAdvertisedShortcut ProgramMenuFolder @@VM_EXECUTABLE@@|@@VM_LOCALIZED_NAME@@ AdvertisedShortcut Typical @@VM_ICON@@.exe Added: branches/Cog/build.win32x86/newspeak.cog.spur/installer/Upgrade.idt.in =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/installer/Upgrade.idt.in (rev 0) +++ branches/Cog/build.win32x86/newspeak.cog.spur/installer/Upgrade.idt.in 2014-06-08 16:36:51 UTC (rev 2957) @@ -0,0 +1,4 @@ +UpgradeCode VersionMin VersionMax Language Attributes Remove ActionProperty +s38 S20 S20 S255 i4 S255 s72 +Upgrade UpgradeCode VersionMin VersionMax Language Attributes +{@@GUID_UPGRADE_CODE@@} 255.255.0 0 {@@GUID_UPGRADE_CODE@@} Added: branches/Cog/build.win32x86/newspeak.cog.spur/installer/branding-sed-rules.gmk =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/installer/branding-sed-rules.gmk (rev 0) +++ branches/Cog/build.win32x86/newspeak.cog.spur/installer/branding-sed-rules.gmk 2014-06-08 16:36:51 UTC (rev 2957) @@ -0,0 +1,18 @@ +SED_RULES := -e 's%@@BRAND_DIR@@%$(SHORT_BRAND_DIR)|$(BRAND_DIR)%g;' +SED_RULES += -e 's%@@VM_EXECUTABLE@@%$(VM_EXECUTABLE)%g;' +SED_RULES += -e 's%@@VM_EXECUTABLE_MAP@@%$(VM_EXECUTABLE_MAP)%g;' +SED_RULES += -e 's%@@VM_EXECUTABLE_MANIFEST@@%$(VM_EXECUTABLE_MANIFEST)%g;' +SED_RULES += -e 's%@@VM_MANIFEST_8DOT3@@%$(VM_MANIFEST_8DOT3)%g;' +SED_RULES += -e 's%@@VM_BASE_NAME@@%$(VM_BASE_NAME)%g;' +SED_RULES += -e 's%@@PROJECT_REVERSE_DOMAIN@@%$(PROJECT_REVERSE_DOMAIN)%g;' +SED_RULES += -e 's%@@VM_ICON@@%$(notdir $(VM_ICON))%g;' +SED_RULES += -e 's%@@VM_LOCALIZED_NAME@@%$(VM_LOCALIZED_NAME)%g;' +SED_RULES += -e 's%@@GUID_UPGRADE_CODE@@%$(GUID_UPGRADE_CODE)%g;' +SED_RULES += -e 's%@@MANUFACTURER@@%$(MANUFACTURER)%g;' +SED_RULES += -e 's%@@PRODUCT_NAME@@%$(PRODUCT_NAME)%g;' +SED_RULES += -e 's%@@PRODUCT_VERSION@@%$(PRODUCT_VERSION)%g;' +SED_RULES += -e 's%@@IMAGE@@%$(IMAGE)%g;' +SED_RULES += -e 's%@@SOURCEFILENAME1@@%$(SOURCEFILENAME1)%g;' +SED_RULES += -e 's%@@SOURCEFILENAME2@@%$(SOURCEFILENAME2)%g;' +SED_RULES += -e 's%@@INSTALLER_BACKGROUND@@%$(INSTALLER_BACKGROUND)%g;' +SED_RULES += -e 's/^\#.*//;' Added: branches/Cog/build.win32x86/newspeak.cog.spur/installer/branding.gmk =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/installer/branding.gmk (rev 0) +++ branches/Cog/build.win32x86/newspeak.cog.spur/installer/branding.gmk 2014-06-08 16:36:51 UTC (rev 2957) @@ -0,0 +1,62 @@ +# Version should follow the Windows convention (0-255.0-255.0-65535) +# For the prototype, use YY.MM.DDNN (NN should come from the image +# name, e.g., nsboot-20YY-MM-DD.NN.image) +# For Cog would like to use YY.MMDD.SVN where SVN is the Subversion checkin +# id taken from platforms/Cross/vm/sqSCCSVersion.h. But that doesn't fit +# the 0-255 field. So use YY.WW.SVN where WW is the week number. +#VERSION:= 07.11.0101 +SVNREV := $(shell grep '\$Rev: ' ../../../platforms/Cross/vm/sqSCCSVersion.h | sed 's/.*$Rev: $[0-9][0-9]*$.*/\1/' ) +#VERSION:= $(shell date +%g.%m%d.$(SVNREV)) +VERSION := $(shell date +%g.%U.$(SVNREV)) + +# Base name of the executable (.exe is appended on Windows) +ifndef VM_BASE_NAME +VM_BASE_NAME := nsvm +endif + +# Product name as compiled into the executable and installers +ifndef PRODUCT_NAME +PRODUCT_NAME := Newspeak Virtual Machine +endif + +# Base name of the installer (.msi is appended on Windows) +ifndef INSTALLER_BASE_NAME +INSTALLER_BASE_NAME := $(VM_BASE_NAME) +endif + +# Where to install the product (relative to C:/Program Files on +# Windows, /Applications on Mac, and not used on Linux) +ifndef BRAND_DIR +BRAND_DIR := $(PRODUCT_NAME) +endif + +# Used for Desktop/menubar shortcuts +ifndef VM_LOCALIZED_NAME +VM_LOCALIZED_NAME := $(PRODUCT_NAME) +endif + +ifndef MANUFACTURER +MANUFACTURER := Cadence Design Systems, Inc. +endif + +ifndef PROJECT_REVERSE_DOMAIN +PROJECT_REVERSE_DOMAIN := org.newspeakplatform +endif + +ifndef INSTALLER_BACKGROUND +INSTALLER_BACKGROUND := InstallerBackground +endif + +ifndef INSTALLER_ICON +INSTALLER_ICON := VolumeIcon +endif + +# DO NOT use the same GUID for other projects. If you base a +# different project on this file, generate a new GUID using uuidgen +# from Microsoft Windows SDK (no-cost download). For reasons beyond +# comprehension, most tools generate GUIDs in lowercase. However, +# Windows Installer insists that GUIDs must be UPPER CASE, so be sure +# to supply the /c option to uuidgen. +ifndef GUID_UPGRADE_CODE +$(warning GUID_UPGRADE_CODE not provided) +endif Added: branches/Cog/build.win32x86/newspeak.cog.spur/installer/documentation.gmk =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/installer/documentation.gmk (rev 0) +++ branches/Cog/build.win32x86/newspeak.cog.spur/installer/documentation.gmk 2014-06-08 16:36:51 UTC (rev 2957) @@ -0,0 +1,7 @@ +ifdef DOCUMENTATION_DIR +-include $(DOCUMENTATION_DIR)documentation.gmk +endif + +.PHONY: testdocs +testdocs: + @echo $(DOCUMENTATION_INDEX) $(DOCUMENTATION_FILES) | xargs -n 1 Added: branches/Cog/build.win32x86/newspeak.cog.spur/installer/files-with-sources.ddf.in =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/installer/files-with-sources.ddf.in (rev 0) +++ branches/Cog/build.win32x86/newspeak.cog.spur/installer/files-with-sources.ddf.in 2014-06-08 16:36:51 UTC (rev 2957) @@ -0,0 +1,15 @@ +.Set Cabinet=ON +.Set CabinetNameTemplate=files.cab +.Set Compress=ON +.Set CompressionType=LZX +.Set DiskDirectoryTemplate= +.Set MaxDiskSize=0 +.Set RptFileName=nul +.Set InfFileName=nul +.Set UniqueFiles=ON +; Sequence of files in cabinet must be same as sequence in File table +; see http://msdn.microsoft.com/en-us/library/windows/desktop/aa368596(v=vs.85).a… +@@VM_EXECUTABLE@@ +@@VM_EXECUTABLE_MANIFEST@@ +%SourcesDir%\@@SOURCEFILENAME1@@ @@SOURCEFILENAME1@@ +@@VM_EXECUTABLE_MAP@@ Added: branches/Cog/build.win32x86/newspeak.cog.spur/installer/files.ddf.in =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/installer/files.ddf.in (rev 0) +++ branches/Cog/build.win32x86/newspeak.cog.spur/installer/files.ddf.in 2014-06-08 16:36:51 UTC (rev 2957) @@ -0,0 +1,15 @@ +.Set Cabinet=ON +.Set CabinetNameTemplate=files.cab +.Set Compress=ON +.Set CompressionType=LZX +.Set DiskDirectoryTemplate= +.Set MaxDiskSize=0 +.Set RptFileName=nul +.Set InfFileName=nul +.Set UniqueFiles=ON +; Sequence of files in cabinet must be same as sequence in File table +; see http://msdn.microsoft.com/en-us/library/windows/desktop/aa368596(v=vs.85).a… +@@VM_EXECUTABLE@@ +@@VM_EXECUTABLE_MANIFEST@@ +index.html index.html +@@VM_EXECUTABLE_MAP@@ Added: branches/Cog/build.win32x86/newspeak.cog.spur/installer/index.html =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/installer/index.html (rev 0) +++ branches/Cog/build.win32x86/newspeak.cog.spur/installer/index.html 2014-06-08 16:36:51 UTC (rev 2957) @@ -0,0 +1,15 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html> + <head> + <title>Newspeak Documentation</title> + </head> + <body> + <H3>Newspeak Documentation</H3> + <div class="documentationIndex"> + <div class="documentationItem"><a href="http://www.newspeaklanguage.org">Website</a></div> + <div class="documentationItem"><a href="http://bracha.org/newspeak-101.pdf">Tutorial</a></div> + <div class="documentationItem"><a href="http://bracha.org/newspeak-spec.pdf">Specification</a></div> + </div> + </body> +</html> Added: branches/Cog/build.win32x86/newspeak.cog.spur/installer/installer-Windows.gmk =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/installer/installer-Windows.gmk (rev 0) +++ branches/Cog/build.win32x86/newspeak.cog.spur/installer/installer-Windows.gmk 2014-06-08 16:36:51 UTC (rev 2957) @@ -0,0 +1,147 @@ +# Copyright 2008 Cadence Design Systems, Inc. +# +# Licensed under the Apache License, Version 2.0 (the ''License''); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 +# +# This is the result of stakhanovite effort from Peter von der Ahe. Thanks! + +# components such as MsiFiler.exe et al available from +# Windows SDK Components for Windows Installer Developers +# http://msdn.microsoft.com/en-us/library/aa370834(v=vs.85).aspx + +WIN_SDK_VER := v7.0 + +WIN_SDK := /cygdrive/c/Program\ Files/Microsoft\ SDKs/Windows/$(WIN_SDK_VER)/ +MSIVAL2_DIR := /cygdrive/c/Program\ Files/MsiVal2/ + +MSI_NAME := $(INSTALLER_BASE_NAME)-$(VERSION).msi +.DEFAULT_GOAL := $(MSI_NAME) +all: $(MSI_NAME) + +# See http://msdn.microsoft.com/en-us/library/aa372834(v=VS.85).aspx +MSIDB := $(WIN_SDK)Bin/MsiDb.Exe +UUIDGEN := $(WIN_SDK)Bin/Uuidgen.Exe +MSIFILER := $(WIN_SDK)Bin/MsiFiler.Exe +MSIINFO := $(WIN_SDK)Bin/MsiInfo.Exe +MSIVAL2 := $(MSIVAL2_DIR)msival2.exe +CUB := $(MSIVAL2_DIR)/XPlogo.cub +UISAMPLE_MSI := $(WIN_SDK)Bin/msitools/Templates/MSI/UISample.Msi +PRODUCT_VERSION := $(VERSION) + +dosname = $(shell touch "$(TMP)/$(1)"; basename "$$(cygpath -s -m "$(TMP)/$(1)")") + +SHORT_BRAND_DIR := $(call dosname,$(BRAND_DIR)) + +include branding-sed-rules.gmk +include documentation.gmk +FRESH_GUID = $(shell $(UUIDGEN) /c) +FRESH_GUID_RULE1 = -e 's/@@FRESH_GUID1@@/$(FRESH_GUID)/g;' +FRESH_GUID_RULE2 = -e 's/@@FRESH_GUID2@@/$(FRESH_GUID)/g;' +FRESH_GUID_RULE3 = -e 's/@@FRESH_GUID3@@/$(FRESH_GUID)/g;' +FRESH_GUID_RULE = $(FRESH_GUID_RULE1) $(FRESH_GUID_RULE2) $(FRESH_GUID_RULE3) + +REGULAR_IDTS := Feature.idt +REGULAR_IDTS += Icon.idt +REGULAR_IDTS += Media.idt +REGULAR_IDTS += Property.idt +REGULAR_IDTS += Registry.idt +REGULAR_IDTS += Shortcut.idt +REGULAR_IDTS += Upgrade.idt + +ifeq ($(strip $(SOURCES)),yes) +SOURCES_IDTS += Directory.idt +SOURCES_IDTS += Component.idt +SOURCES_IDTS += FeatureComponents.idt +File.idt : File-with-sources.idt.in +files.ddf : files-with-sources.ddf.in +files.cab: files.ddf $(VM_EXECUTABLE) $(VM_EXECUTABLE_MAP) $(VM_EXECUTABLE_MANIFEST) $(SOURCEFILENAME1) +else +REGULAR_IDTS += Directory.idt +REGULAR_IDTS += Component.idt +REGULAR_IDTS += FeatureComponents.idt +File.idt : File.idt.in +files.ddf : files.ddf.in $(DOCUMENTATION_FILES) $(DOCUMENTATION_INDEX) +files.cab : files.ddf $(VM_EXECUTABLE) $(VM_EXECUTABLE_MAP) $(VM_EXECUTABLE_MANIFEST) +endif + +IDTS := File.idt $(REGULAR_IDTS) $(SOURCES_IDTS) + +$(REGULAR_IDTS) : %.idt : %.idt.in Makefile + $(SED) $(SED_RULES) $(FRESH_GUID_RULE) < $< > $@ + +$(SOURCES_IDTS) : %.idt : %-with-sources.idt.in Makefile + $(SED) $(SED_RULES) $(FRESH_GUID_RULE) < $< > $@ + +SED_FILTER_CONTROL := -e 's/1$\t\t[[]DialogBitmap]$/1048577\1/g;' +# 0x00800003 = 8388611. +# 0x00800000 is the User Account Control (UAC) elevation icon (shield +# icon) (a Windows Vista only feature). We are verifying against +# XPlogo, not Vista so we get a warning unless we clear that bit: +SED_FILTER_CONTROL += -e 's/$PushButton\t[0-9]*\t[0-9]*\t[0-9]*\t[0-9]*\t$8388611\t/\13\t/g;' +GREP_FILTER_CONTROL := -E $$'^LicenseAgreementDlg\tAgreementText\tScrollableText.*' + +%.msi: TMP_MSI = $(@:.msi=.tmp.msi) + +%.ibd: % + $(CP) -p $< $@ + +MSPWD := $(shell cygpath -wa .) + +$(MSI_NAME): $(UISAMPLE_MSI) $(IDTS) Icon/$(notdir $(VM_ICON)).exe.ibd files.cab $(INSTALLER_BACKGROUND).bmp copyright.rtf $(MSIVAL2) + @touch $@ + rm -f $@ + $(CP) "$<" $(TMP_MSI) + $(MSIDB) -e -d "$(shell cygpath -wa $(TMP_MSI))" -f "$(MSPWD)" Binary Control + $(CP) -p $(filter %$(INSTALLER_BACKGROUND).bmp,$^) Binary/dlgbmp.ibd + mv Control.idt Control.idt.orig + $(SED) $(SED_FILTER_CONTROL) Control.idt.orig | grep -v $(GREP_FILTER_CONTROL) > Control.idt + printf 'LicenseAgreementDlg\tAgreementText\t' >> Control.idt + printf 'ScrollableText\t20\t60\t330\t120\t7\t\t' >> Control.idt + cat copyright.rtf >> Control.idt + printf '\tButtons\t\n' >> Control.idt + $(MSIDB) -i -d "$(shell cygpath -wa $(TMP_MSI))" $(patsubst %,-a %,$(filter %.cab,$^)) -f "$(shell cygpath -wa .)" $(filter %.idt,$^) Binary.idt Control.idt + $(MSIFILER) -nologo -d $(TMP_MSI) -h + $(MSIFILER) -nologo -d $(TMP_MSI) -h -s "$(MSPWD)\\" +ifdef DOCUMENTATION_DIR + $(MSIFILER) -nologo -d $(TMP_MSI) -h -s "$(shell cygpath -wa $(DOCUMENTATION_DIR))\\" +endif + $(MSIINFO) "$(shell cygpath -wa $(TMP_MSI))" -T "Installation Database" -J "$(PRODUCT_NAME) $(PRODUCT_VERSION)" -A "$(MANUFACTURER)" -K "Installer, MSI, Database" -O "This installer database contains the logic and data required to install $(PRODUCT_NAME)." -P ";1033" -V "{$(FRESH_GUID)}" -G 200 -W 0 -N "GNU Make" -U 0 -nologo + $(MSIVAL2) "$(shell cygpath -wa $(TMP_MSI))" "$(shell cygpath -wa $(CUB))" -f + chmod a+rx $(TMP_MSI) + mv $(TMP_MSI) $@ + +Icon/$(notdir $(VM_ICON)).exe: icon.o nopMain.o + mkdir -p $(dir $@) + gcc -mwindows $^ -o $@ + strip $@ + +files.ddf: + $(SED) $(SED_RULES) $(FRESH_GUID_RULE) < $< > $@.tmp + @echo $(DOCUMENTATION_INDEX) $(DOCUMENTATION_FILES) | xargs -n 1 >> $@.tmp + mv $@.tmp $@ + +File.idt: Makefile +File.idt: + $(SED) $(SED_RULES) $(FRESH_GUID_RULE) < $< > $@.tmp + echo $(foreach docfile,$(strip $(DOCUMENTATION_FILES)), '$(notdir $(docfile))' '$(call dosname,$(notdir $(docfile)))' '$(notdir $(docfile))') | xargs -r -n 3 printf '%s\tDocumentation\t%s|%s\t0\t\t\t16896\t1\n' >> $@.tmp + mv $@.tmp $@ + +files.cab: + makecab /D SourcesDir='$(shell cygpath -wa .)' /f $< + @echo + +SED_RTF_RULES := -e 's/$$/\\par /g;' +SED_RTF_RULES += -e "s/([cC])/\\\\'a9/g;" + +copyright.rtf: NewspeakLicence.txt + printf '%s' '{\rtf1\ansi\deff0{\fonttbl{\f0\fnil\fcharset0 Courier New;}}' > $@ + printf '%s' '\viewkind4\uc1\pard\lang1033\f0\fs20 ' >> $@ + $(SED) $(SED_RTF_RULES) $< | tr -d \\r\\n >> $@ + printf '}' >>$@ + +$(MSIVAL2): $(WIN_SDK)Bin/MsiVal2.Msi + msiexec /passive /i "$(shell cygpath -wa '$<')" + +installer: $(MSI_NAME) + +clean:: + -rm -rf $(IDTS) Icon Binary Binary.idt *.msi "$(BRAND_DIR)" files.ddf files.cab setup.inf nopMain.o Control.idt.orig Control.idt copyright.rtf icon.o Added: branches/Cog/build.win32x86/newspeak.cog.spur/installer/links =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/installer/links (rev 0) +++ branches/Cog/build.win32x86/newspeak.cog.spur/installer/links 2014-06-08 16:36:51 UTC (rev 2957) @@ -0,0 +1,10 @@ +#!/bin/sh +if [ "$1" = rm -o "$1" = mk ]; then + rm SqueakV41.sources +fi +if [ "$1" = mk ]; then + ln ../../../sources/SqueakV41.sources . +fi +if [ $ "$1" != rm $ -a $ "$1" != mk $ ]; then + echo usage: $0 'mk|rm' +fi Property changes on: branches/Cog/build.win32x86/newspeak.cog.spur/installer/links ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.win32x86/newspeak.cog.spur/installer/nopMain.c =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/installer/nopMain.c (rev 0) +++ branches/Cog/build.win32x86/newspeak.cog.spur/installer/nopMain.c 2014-06-08 16:36:51 UTC (rev 2957) @@ -0,0 +1,9 @@ +#include <windows.h> + +int WINAPI WinMain (HINSTANCE hInstance, + HINSTANCE hPrevInstance, + PSTR szCmdLine, + int iCmdShow) +{ + return 0; +} Added: branches/Cog/build.win32x86/newspeak.cog.spur/installer/nsvm.rc =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/installer/nsvm.rc (rev 0) +++ branches/Cog/build.win32x86/newspeak.cog.spur/installer/nsvm.rc 2014-06-08 16:36:51 UTC (rev 2957) @@ -0,0 +1,5 @@ +#ifdef _WIN32 +1 ICON DISCARDABLE "nsvm.ico" +2 ICON DISCARDABLE "nsvm.ico" +3 ICON DISCARDABLE "nsvm.ico" +#endif Added: branches/Cog/build.win32x86/newspeak.cog.spur/mvm =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/mvm (rev 0) +++ branches/Cog/build.win32x86/newspeak.cog.spur/mvm 2014-06-08 16:36:51 UTC (rev 2957) @@ -0,0 +1,11 @@ +#!/bin/sh +rm -rf build*/vm/nsvm*.exe +make debug;make assert;make +ls -rlt build*/vm/nsvm*.exe +if test -f ../../sources/SqueakV41.sources; then + for d in build buildast builddbg; do + if [ -d $d/vm -a ! -f $d/vm/SqueakV41.sources ]; then + ln ../../sources/SqueakV41.sources $d/vm + fi + done +fi Property changes on: branches/Cog/build.win32x86/newspeak.cog.spur/mvm ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.win32x86/newspeak.cog.spur/nsvm.exe.manifest =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/nsvm.exe.manifest (rev 0) +++ branches/Cog/build.win32x86/newspeak.cog.spur/nsvm.exe.manifest 2014-06-08 16:36:51 UTC (rev 2957) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity + version="1.0.0.0" + processorArchitecture="*" + name="www.mirandabanda.org.Cog.Newspeak" + type="win32" +/> +<description>Newspeak Virtual Machine</description> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="*" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> Added: branches/Cog/build.win32x86/newspeak.cog.spur/nsvm.rc =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/nsvm.rc (rev 0) +++ branches/Cog/build.win32x86/newspeak.cog.spur/nsvm.rc 2014-06-08 16:36:51 UTC (rev 2957) @@ -0,0 +1,40 @@ +#ifdef _WIN32 +1 ICON DISCARDABLE "nsvm.ico" +2 ICON DISCARDABLE "nsvm.ico" +3 ICON DISCARDABLE "nsvm.ico" +#ifndef RT_MANIFEST +# define RT_MANIFEST 24 +#endif + +#ifndef CREATEPROCESS_MANIFEST_RESOURCE_ID +# define CREATEPROCESS_MANIFEST_RESOURCE_ID 1 +#endif + +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "nsvm.exe.manifest" + +1 VERSIONINFO + FILEVERSION FILEVERSIONVALUES + PRODUCTVERSION 4,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", "newspeaklanguage.org\0" + VALUE "FileDescription", "Newsqueak Cog Spur Virtual Machine\0" + VALUE "FileVersion", FILEVERSIONSTRING + VALUE "ProductName", "Newsqueak Cog Spur\0" + VALUE "ProductVersion", "4.0\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END +#endif Added: branches/Cog/build.win32x86/newspeak.cog.spur/plugins.ext =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/plugins.ext (rev 0) +++ branches/Cog/build.win32x86/newspeak.cog.spur/plugins.ext 2014-06-08 16:36:51 UTC (rev 2957) @@ -0,0 +1,4 @@ +# Copied, perhaps edited, from ../../nscogsrc/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 = @@ Diff output truncated at 50000 characters. @@

1 0

Re: [squeak-dev] opening a write-only file
by Douglas McPherson 08 Jun '14

08 Jun '14

Hi All, I've tested a fix for this on OS X and Linux. The fix simply adds an extra attempt to open the file after the "w+b" attempt using this code: if (getFile(f) == NULL) { setFile(f, fopen(cFileName, "wb")); } If the previous attempts to open the file failed (because the file exists with write-only permission, no read permission) then the above will actually open the file write-only. Adding the extra attempt preserves existing behaviour for the success paths, so the change should be transparent to existing code. BTW, AFAICT the same issue exists in Pharo. Thoughts? Doug On Jun 1, 2014, at 19:44 , Douglas McPherson wrote: > It turns out #forceNewFileNamed: does not work either. > > I believe the immediate cause of the problem is in the function you pointed me at: sqFileOpen() in platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c: > > if (writeFlag) { > /* First try to open an existing file read/write: */ > setFile(f, fopen(cFileName, "r+b")); > if (getFile(f) == NULL) { > /* Previous call fails if file does not exist. In that case, > try opening it in write mode to create a new, empty file. > */ > setFile(f, fopen(cFileName, "w+b")); > if (getFile(f) != NULL) { > char type[4],creator[4]; > dir_GetMacFileTypeAndCreator(sqFileName, sqFileNameSize, type, creator); > if (strncmp(type,"BINA",4) == 0 || strncmp(type,"????",4) == 0 || *(int *)type == 0 ) > dir_SetMacFileTypeAndCreator(sqFileName, sqFileNameSize,"TEXT","R*ch"); > } > } > > The first call to fopen() indeed fails if the file does not exist. But it also fails if the file exists but does not have both read and write "r+b" permission. So in that case the intent, as you mentioned, is to try to open in write-only but "w+b" is not the write-only mode, it is also a read and write mode, see [1]. So this fopen() attempt also fails if the file has write-only permission. A fix may be to use mode "wb" instead of "w+b", but I'm not sure if there are unintended consequences to doing this. > > [1] http://en.wikibooks.org/wiki/C_Programming/C_Reference/stdio.h/fopen > > On May 31, 2014, at 14:45 , Douglas McPherson wrote: > >> Ahh, thanks. I'll try it out when back in front of my machine. >> >> Thanks, >> Doug >> >> Sent from my iPhone >> >> On May 31, 2014, at 14:23, Eliot Miranda <eliot.miranda(a)gmail.com> wrote: >> >>> Hi Doug, >>> >>> >>> On Sat, May 31, 2014 at 10:00 AM, Douglas McPherson <djm1329(a)san.rr.com> wrote: >>> Is there a way to open a write-only file in Squeak? On both Mac and Linux attempting to open such a file fails. >>> >>> Squeak has forceNewFileNamed: & forceNewFileNamed:do:. If you look at sqFileOpen in platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c you'll see it first attempts to open read-write and if that fails, opens write-only. So it should work. >>> >>> HTH >>> >>> For example, if you create a write-only file, i.e. in a shell, after cd to default directory >>> >>> echo nada > foo >>> chmod 200 foo >>> >>> Then from Squeak >>> >>> StandardFileStream fileNamed: 'foo' >>> >>> returns nil. >>> >>> If the file is given read permission (i.e. chmod 600 foo) then Squeak can open it. >>> >>> Anyone know a workaround? >>> >>> Thanks, >>> Doug >>> >>> >>> -- >>> best, >>> Eliot >>> >> > >

6 12

bash script inline to create the flat source tree
by gettimothy 08 Jun '14

08 Jun '14

Hi Eliot. you may find this script useful as you port to the flat build system...it creates the skeleton structure you have in place. #!/bin/bash -x #build the new oscogvm flat directory structure create_child_directories(){ echo $p for l in "${language[@]}" do for v in "${vm[@]}" do for i in "${image[@]}" do cd $p echo ${l}$dot${v}$dot${i} mkdir ${l}$dot${v}$dot${i} cd ${l}$dot${v}$dot${i} mkdir build mkdir build.assert mkdir build.assert.itimerheartbeat mkdir build.debug mkdir build.debug.itimerheartbeat mkdir build.itimerheartbeat cd - cd ../ done done done } platform=( build.linux32x86 build.macosx32x86 build.macospowerpc build.win32x86 build.linux32x86_64 cmake_build.linux32x86 cmake_build.macosx32x86 cmake_build.win32x86 cmake_build.linux32x86_64) language=(newspeak squeak) vm=(cog sista stack) image=(spur v3) dot="." mkdir neoscogvm cd neoscogvm for p in "${platform[@]}" do mkdir $p create_child_directories $p done cd ../

1 0

Output directory for builds?
by gettimothy 08 Jun '14

08 Jun '14

Howdy. The pharo team dumps their output into oscogvm/results I know the GNU builds dumps into directories specified at the top of the mvm in $INSTALLDIR. For the CMake stuff, should I mimic the mvm stuff prefaced with a cmake_ or do we want to standardize that too? cheers. tty

2 2

[commit][2953] In sqFileOpen() ensure that Mac file characteristics are set only when a new file is created
by commits＠squeakvm.org 08 Jun '14

08 Jun '14

Revision: 2953 Author: lewis Date: 2014-06-06 16:36:45 -0700 (Fri, 06 Jun 2014) Log Message: ----------- In sqFileOpen() ensure that Mac file characteristics are set only when a new file is created Modified Paths: -------------- trunk/platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c Modified: trunk/platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c =================================================================== --- trunk/platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c 2014-06-06 22:37:22 UTC (rev 2952) +++ trunk/platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c 2014-06-06 23:36:45 UTC (rev 2953) @@ -251,10 +251,21 @@ if (getFile(f) == NULL) setFile(f, fopen(cFileName, "ab")); if (getFile(f) != NULL) { + /* New file created, set Mac file characteristics */ char type[4],creator[4]; dir_GetMacFileTypeAndCreator(sqFileName, sqFileNameSize, type, creator); if (strncmp(type,"BINA",4) == 0 || strncmp(type,"????",4) == 0 || *(int *)type == 0 ) dir_SetMacFileTypeAndCreator(sqFileName, sqFileNameSize,"TEXT","R*ch"); + } else { + /* If the file could not be opened read/write and if a new file + could not be created, then it may be that the file exists but + does not permit read access. Try opening as a write only file, + opened for append to preserve existing file contents. + */ + setFile(f, fopen(cFileName, "ab")); + if (getFile(f) == NULL) { + return interpreterProxy->success(false); + } } } f->writable = true;

5 10

VM Maker: CMakeVMMakerSqueak-tty.37.mcz
by commits＠source.squeak.org 08 Jun '14

08 Jun '14

Timothy M uploaded a new version of CMakeVMMakerSqueak to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMakerSqueak-tty.37.mcz ==================== Summary ==================== Name: CMakeVMMakerSqueak-tty.37 Author: tty Time: 7 June 2014, 6:20:37.118 pm UUID: 2b82e831-8db0-4d44-a7eb-e659b82b704f Ancestors: CMakeVMMakerSqueak-tty.36 All tests pass. This does not mean the classes are configured correctly for source,output and build directories. It does mean nothing structural is preventing that from being implemented. Coming up in tomorrows exciting, rock-em, socke-em episode is getting each configuration to report on its directories and clean them up. sourceDirectoriesForTarget:#Pow outputDirectoriesForTarget:#Zounds buildDirectoriesForTarget:#Crash buildDirectoryForTarget:#Zing withBuildType: #assert cleanBuildDirectoriesForTarget:#Batman cleanBuildDirectoryForTarget:#Robin withBuildType: #debug This episode was brought to you by "tty, the liquid detergent professional dishwashers use. =============== Diff against CMakeVMMakerSqueak-tty.36 =============== Item was added: + ----- Method: Linux32x86Config>>outputDir (in category 'squeak compatibility') ----- + outputDir + ^ outputDir ifNil: [ outputDir := (FileDirectory default directoryNamed: (self oscogvm,FileDirectory slash, self dirOutput)) assureExistence] + + ! Item was added: + ----- Method: Linux32x86Config>>srcDir (in category 'squeak compatibility') ----- + srcDir + ^ srcDir ifNil: [ srcDir := (self topDir directoryNamed: 'src' )]! Item was added: + ----- Method: Linux32x86SqueakStackSpurConfig>>outputDir (in category 'squeak compatibility') ----- + outputDir + ^ outputDir ifNil: [ outputDir := (FileDirectory default directoryNamed: (self oscogvm,FileDirectory slash, self dirOutput)) assureExistence] + ! Item was added: + ----- Method: Linux32x86SqueakStackSpurConfig>>srcDir (in category 'squeak compatibility') ----- + srcDir + ^ srcDir ifNil: [ srcDir := (self topDir directoryNamed: 'src' )]! Item was changed: ----- Method: SqueakAndroidStackEvtConfig>>outputDir (in category 'directories') ----- outputDir + ^outputDir ifNil: [ outputDir := (self topDir / self outputDirName) ] - outputDir ifNil: [ outputDir := (self topDir / self outputDirName) ] ! Item was added: + ----- Method: SqueakIA32BochsConfig>>outputDir (in category 'squeak compatibility') ----- + outputDir + ^ outputDir ifNil: [ outputDir := (self topDir / self outputDirName) ] ! Item was added: + ----- Method: SqueakIA32BochsConfig>>srcDir (in category 'squeak compatibility') ----- + srcDir + ^ srcDir ifNil: [ srcDir := (self topDir directoryNamed: 'src' )]! Item was added: + ----- Method: SqueakMacOSConfig>>outputDir (in category 'squeak compatibility') ----- + outputDir + ^ outputDir ifNil: [ outputDir := (self topDir / self outputDirName) ] ! Item was added: + ----- Method: SqueakMacOSConfig>>srcDir (in category 'squeak compatibility') ----- + srcDir + ^ srcDir ifNil: [ srcDir := (self topDir directoryNamed: 'src' )]! Item was changed: ----- Method: SqueakMacOSV3Config>>srcDir (in category 'accessing') ----- srcDir ^ srcDir ifNil: [ srcDir := (self topDir directoryNamed: 'src' )]! Item was added: + ----- Method: SqueakSunOS32x8664CogConfig>>outputDir (in category 'squeak compatibility') ----- + outputDir + ^ outputDir ifNil: [ outputDir := (self topDir / self outputDirName) ] + ! Item was added: + ----- Method: SqueakSunOS32x8664CogConfig>>srcDir (in category 'squeak compatibility') ----- + srcDir + ^ srcDir ifNil: [ srcDir := (self topDir directoryNamed: 'src' )]! Item was added: + ----- Method: SqueakSunOS32x86CogConfig>>outputDir (in category 'squeak compatibility') ----- + outputDir + ^ outputDir ifNil: [ outputDir := (self topDir / self outputDirName) ] + ! Item was added: + ----- Method: SqueakSunOS32x86CogConfig>>srcDir (in category 'squeak compatibility') ----- + srcDir + ^ srcDir ifNil: [ srcDir := (self topDir directoryNamed: 'src' )]! Item was changed: ----- Method: SqueakWin32x86CogFamilyConfig>>defaultExternalPlugins (in category 'plugins') ----- defaultExternalPlugins "expertly cut-n-pasted from Cog/cygwinbuild/plugins.ext" + ^#( - #( BochsIA32Plugin SqueakFFIPrims Win32OSProcessPlugin )! Item was changed: ----- Method: SqueakWin32x86CogFamilyConfig>>defaultInternalPlugins (in category 'plugins') ----- defaultInternalPlugins "expertly cut-n-pasted from Cog/cygwinbuild/plugins.int" + ^#( - #( 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 UUIDPlugin )! Item was changed: ----- Method: SqueakWin32x86CogFamilyConfig>>outputDir (in category 'directories') ----- outputDir "the directory where built binaries will be stored" + ^ outputDir ifNil: [ outputDir := (self topDir / self outputDirName) ]! - ^ outputDir ifNil: [ outputDir := self msysPathFor: (self topDir / self outputDirName) ]! Item was added: + ----- Method: TCPlatformConfigForSqueak>>dirOutput (in category 'cmake') ----- + dirOutput + ^'results'! Item was added: + ----- Method: TCPlatformConfigForSqueak>>dirSource (in category 'cmake') ----- + dirSource + ^'src'! Item was changed: ----- Method: Win32x86NewspeakCogV3Config>>defaultExternalPlugins (in category 'plugins') ----- defaultExternalPlugins "expertly cut-n-pasted from Cog/cygwinbuild/plugins.ext" + ^#( - #( BochsIA32Plugin SqueakFFIPrims Win32OSProcessPlugin )! Item was changed: ----- Method: Win32x86NewspeakCogV3Config>>defaultInternalPlugins (in category 'plugins') ----- defaultInternalPlugins "expertly cut-n-pasted from Cog/cygwinbuild/plugins.int" + ^#( - #( 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 UUIDPlugin )! Item was added: + ----- Method: Win32x86NewspeakCogV3Config>>outputDir (in category 'squeak compatibility') ----- + outputDir + ^ outputDir ifNil: [ outputDir := (self topDir / self outputDirName) ] + + ! Item was added: + ----- Method: Win32x86NewspeakCogV3Config>>srcDir (in category 'squeak compatibility') ----- + srcDir + ^ srcDir ifNil: [ srcDir := (self topDir directoryNamed: 'src' )]! Item was changed: ----- Method: Win32x86NewspeakStackV3Config>>defaultExternalPlugins (in category 'plugins') ----- defaultExternalPlugins "expertly cut-n-pasted from Cog/cygwinbuild/plugins.ext" + ^#( - #( BochsIA32Plugin SqueakFFIPrims Win32OSProcessPlugin )! Item was changed: ----- Method: Win32x86NewspeakStackV3Config>>defaultInternalPlugins (in category 'plugins') ----- defaultInternalPlugins "expertly cut-n-pasted from Cog/cygwinbuild/plugins.int" + ^#( - #( 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 UUIDPlugin )! Item was added: + ----- Method: Win32x86NewspeakStackV3Config>>outputDir (in category 'squeak compatibility') ----- + outputDir + ^ outputDir ifNil: [ outputDir := (self topDir / self outputDirName) ] + ! Item was added: + ----- Method: Win32x86NewspeakStackV3Config>>srcDir (in category 'squeak compatibility') ----- + srcDir + ^ srcDir ifNil: [ srcDir := (self topDir directoryNamed: 'src' )]! Item was changed: ----- Method: Win32x86SqueakCogSpurConfig>>defaultExternalPlugins (in category 'plugins') ----- defaultExternalPlugins "expertly cut-n-pasted from Cog/cygwinbuild/plugins.ext" + ^#( - #( BochsIA32Plugin SqueakFFIPrims Win32OSProcessPlugin )! Item was changed: ----- Method: Win32x86SqueakCogSpurConfig>>defaultInternalPlugins (in category 'plugins') ----- defaultInternalPlugins "expertly cut-n-pasted from Cog/cygwinbuild/plugins.int" + ^#( - #( 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 UUIDPlugin )! Item was added: + ----- Method: Win32x86SqueakCogSpurConfig>>outputDir (in category 'squeak compatibility') ----- + outputDir + ^ outputDir ifNil: [ outputDir := (self topDir / self outputDirName) ] + + ! Item was added: + ----- Method: Win32x86SqueakCogSpurConfig>>srcDir (in category 'squeak compatibility') ----- + srcDir + ^ srcDir ifNil: [ srcDir := (self topDir directoryNamed: 'src' )]! Item was changed: ----- Method: Win32x86SqueakStackSpurConfig>>defaultExternalPlugins (in category 'plugins') ----- defaultExternalPlugins "expertly cut-n-pasted from Cog/cygwinbuild/plugins.ext" + ^#( - #( BochsIA32Plugin SqueakFFIPrims Win32OSProcessPlugin )! Item was changed: ----- Method: Win32x86SqueakStackSpurConfig>>defaultInternalPlugins (in category 'plugins') ----- defaultInternalPlugins "expertly cut-n-pasted from Cog/cygwinbuild/plugins.int" + ^#( - #( 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 UUIDPlugin )! Item was added: + ----- Method: Win32x86SqueakStackSpurConfig>>outputDir (in category 'squeak compatibility') ----- + outputDir + ^ outputDir ifNil: [ outputDir := (self topDir / self outputDirName) ] + + ! Item was added: + ----- Method: Win32x86SqueakStackSpurConfig>>srcDir (in category 'squeak compatibility') ----- + srcDir + ^ srcDir ifNil: [ srcDir := (self topDir directoryNamed: 'src' )]!

1 0

[commit][2956] nuke bogus build.linux32x86/third-party/makeall*
by commits＠squeakvm.org 08 Jun '14

08 Jun '14

Revision: 2956 Author: eliot Date: 2014-06-07 15:17:22 -0700 (Sat, 07 Jun 2014) Log Message: ----------- nuke bogus build.linux32x86/third-party/makeall* Removed Paths: ------------- branches/Cog/build.linux32x86/third-party/makeallclean branches/Cog/build.linux32x86/third-party/makealldirty Deleted: branches/Cog/build.linux32x86/third-party/makeallclean =================================================================== --- branches/Cog/build.linux32x86/third-party/makeallclean 2014-06-07 22:16:52 UTC (rev 2955) +++ branches/Cog/build.linux32x86/third-party/makeallclean 2014-06-07 22:17:22 UTC (rev 2956) @@ -1,5 +0,0 @@ -#!/bin/sh -for d in `dirname $0`/build*; do - (cd $d - echo y | ./mvm) -done Deleted: branches/Cog/build.linux32x86/third-party/makealldirty =================================================================== --- branches/Cog/build.linux32x86/third-party/makealldirty 2014-06-07 22:16:52 UTC (rev 2955) +++ branches/Cog/build.linux32x86/third-party/makealldirty 2014-06-07 22:17:22 UTC (rev 2956) @@ -1,5 +0,0 @@ -#!/bin/sh -for d in `dirname $0`/build*; do - (cd $d - echo n | ./mvm) -done

1 0

[commit][2955] CogVM source as per VMMaker.oscog-eem.766
by commits＠squeakvm.org 08 Jun '14

08 Jun '14

Revision: 2955 Author: eliot Date: 2014-06-07 15:16:52 -0700 (Sat, 07 Jun 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.766 Add convenience scripts to the build.linux32x86 buids to make all configs. Remove some compilation warnings in cogit.c. Correct some decls in genEnsureOopInRegNotForwarded:scratchReg: Add a pushLinkReg arg to the core trampoline generation routines. This is true everywhere but in the nonLocalReturn and checkForInterrupts trampolines, which on RISCs write the link reg, and on CISCs pop the ret pc to instructionPointer. Remove the callJumpBar: parameter; this is always true. Remember to save and restore the link register around the call to ceCheckProfileTick in the primitive return machinery. Streamline the genPrimReturnEnterCogCodeEnilopmart. Streamline genExternalizePointersForPrimitiveCall Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogmethod.h branches/Cog/scripts/nukeversion branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cogmethod.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/sistasrc/vm/interp.h branches/Cog/sistasrc/vm/vmCallback.h branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogmethod.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/interp.h branches/Cog/spursistasrc/vm/vmCallback.h branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogmethod.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/interp.h branches/Cog/spursrc/vm/vmCallback.h branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerpmt.c Added Paths: ----------- branches/Cog/build.linux32x86/newspeak.cog.spur/makeallclean branches/Cog/build.linux32x86/newspeak.cog.spur/makealldirty branches/Cog/build.linux32x86/newspeak.cog.v3/makeallclean branches/Cog/build.linux32x86/newspeak.cog.v3/makealldirty branches/Cog/build.linux32x86/newspeak.sista.spur/makeallclean branches/Cog/build.linux32x86/newspeak.sista.spur/makealldirty branches/Cog/build.linux32x86/newspeak.sista.v3/makeallclean branches/Cog/build.linux32x86/newspeak.sista.v3/makealldirty branches/Cog/build.linux32x86/newspeak.stack.spur/makeallclean branches/Cog/build.linux32x86/newspeak.stack.spur/makealldirty branches/Cog/build.linux32x86/newspeak.stack.v3/makeallclean branches/Cog/build.linux32x86/newspeak.stack.v3/makealldirty branches/Cog/build.linux32x86/squeak.cog.spur/makeallclean branches/Cog/build.linux32x86/squeak.cog.spur/makealldirty branches/Cog/build.linux32x86/squeak.cog.v3/makeallclean branches/Cog/build.linux32x86/squeak.cog.v3/makealldirty branches/Cog/build.linux32x86/squeak.sista.spur/makeallclean branches/Cog/build.linux32x86/squeak.sista.spur/makealldirty branches/Cog/build.linux32x86/squeak.sista.v3/makeallclean branches/Cog/build.linux32x86/squeak.sista.v3/makealldirty branches/Cog/build.linux32x86/squeak.stack.spur/makeallclean branches/Cog/build.linux32x86/squeak.stack.spur/makealldirty branches/Cog/build.linux32x86/squeak.stack.v3/makeallclean branches/Cog/build.linux32x86/squeak.stack.v3/makealldirty branches/Cog/build.linux32x86/third-party/makeallclean branches/Cog/build.linux32x86/third-party/makealldirty Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Added: branches/Cog/build.linux32x86/newspeak.cog.spur/makeallclean =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.spur/makeallclean (rev 0) +++ branches/Cog/build.linux32x86/newspeak.cog.spur/makeallclean 2014-06-07 22:16:52 UTC (rev 2955) @@ -0,0 +1,5 @@ +#!/bin/sh +for d in `dirname $0`/build*; do + (cd $d + echo y | ./mvm) +done Property changes on: branches/Cog/build.linux32x86/newspeak.cog.spur/makeallclean ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32x86/newspeak.cog.spur/makealldirty =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.spur/makealldirty (rev 0) +++ branches/Cog/build.linux32x86/newspeak.cog.spur/makealldirty 2014-06-07 22:16:52 UTC (rev 2955) @@ -0,0 +1,5 @@ +#!/bin/sh +for d in `dirname $0`/build*; do + (cd $d + echo n | ./mvm) +done Property changes on: branches/Cog/build.linux32x86/newspeak.cog.spur/makealldirty ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32x86/newspeak.cog.v3/makeallclean =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.v3/makeallclean (rev 0) +++ branches/Cog/build.linux32x86/newspeak.cog.v3/makeallclean 2014-06-07 22:16:52 UTC (rev 2955) @@ -0,0 +1,5 @@ +#!/bin/sh +for d in `dirname $0`/build*; do + (cd $d + echo y | ./mvm) +done Property changes on: branches/Cog/build.linux32x86/newspeak.cog.v3/makeallclean ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32x86/newspeak.cog.v3/makealldirty =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.v3/makealldirty (rev 0) +++ branches/Cog/build.linux32x86/newspeak.cog.v3/makealldirty 2014-06-07 22:16:52 UTC (rev 2955) @@ -0,0 +1,5 @@ +#!/bin/sh +for d in `dirname $0`/build*; do + (cd $d + echo n | ./mvm) +done Property changes on: branches/Cog/build.linux32x86/newspeak.cog.v3/makealldirty ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32x86/newspeak.sista.spur/makeallclean =================================================================== --- branches/Cog/build.linux32x86/newspeak.sista.spur/makeallclean (rev 0) +++ branches/Cog/build.linux32x86/newspeak.sista.spur/makeallclean 2014-06-07 22:16:52 UTC (rev 2955) @@ -0,0 +1,5 @@ +#!/bin/sh +for d in `dirname $0`/build*; do + (cd $d + echo y | ./mvm) +done Property changes on: branches/Cog/build.linux32x86/newspeak.sista.spur/makeallclean ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32x86/newspeak.sista.spur/makealldirty =================================================================== --- branches/Cog/build.linux32x86/newspeak.sista.spur/makealldirty (rev 0) +++ branches/Cog/build.linux32x86/newspeak.sista.spur/makealldirty 2014-06-07 22:16:52 UTC (rev 2955) @@ -0,0 +1,5 @@ +#!/bin/sh +for d in `dirname $0`/build*; do + (cd $d + echo n | ./mvm) +done Property changes on: branches/Cog/build.linux32x86/newspeak.sista.spur/makealldirty ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32x86/newspeak.sista.v3/makeallclean =================================================================== --- branches/Cog/build.linux32x86/newspeak.sista.v3/makeallclean (rev 0) +++ branches/Cog/build.linux32x86/newspeak.sista.v3/makeallclean 2014-06-07 22:16:52 UTC (rev 2955) @@ -0,0 +1,5 @@ +#!/bin/sh +for d in `dirname $0`/build*; do + (cd $d + echo y | ./mvm) +done Property changes on: branches/Cog/build.linux32x86/newspeak.sista.v3/makeallclean ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32x86/newspeak.sista.v3/makealldirty =================================================================== --- branches/Cog/build.linux32x86/newspeak.sista.v3/makealldirty (rev 0) +++ branches/Cog/build.linux32x86/newspeak.sista.v3/makealldirty 2014-06-07 22:16:52 UTC (rev 2955) @@ -0,0 +1,5 @@ +#!/bin/sh +for d in `dirname $0`/build*; do + (cd $d + echo n | ./mvm) +done Property changes on: branches/Cog/build.linux32x86/newspeak.sista.v3/makealldirty ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32x86/newspeak.stack.spur/makeallclean =================================================================== --- branches/Cog/build.linux32x86/newspeak.stack.spur/makeallclean (rev 0) +++ branches/Cog/build.linux32x86/newspeak.stack.spur/makeallclean 2014-06-07 22:16:52 UTC (rev 2955) @@ -0,0 +1,5 @@ +#!/bin/sh +for d in `dirname $0`/build*; do + (cd $d + echo y | ./mvm) +done Property changes on: branches/Cog/build.linux32x86/newspeak.stack.spur/makeallclean ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32x86/newspeak.stack.spur/makealldirty =================================================================== --- branches/Cog/build.linux32x86/newspeak.stack.spur/makealldirty (rev 0) +++ branches/Cog/build.linux32x86/newspeak.stack.spur/makealldirty 2014-06-07 22:16:52 UTC (rev 2955) @@ -0,0 +1,5 @@ +#!/bin/sh +for d in `dirname $0`/build*; do + (cd $d + echo n | ./mvm) +done Property changes on: branches/Cog/build.linux32x86/newspeak.stack.spur/makealldirty ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32x86/newspeak.stack.v3/makeallclean =================================================================== --- branches/Cog/build.linux32x86/newspeak.stack.v3/makeallclean (rev 0) +++ branches/Cog/build.linux32x86/newspeak.stack.v3/makeallclean 2014-06-07 22:16:52 UTC (rev 2955) @@ -0,0 +1,5 @@ +#!/bin/sh +for d in `dirname $0`/build*; do + (cd $d + echo y | ./mvm) +done Property changes on: branches/Cog/build.linux32x86/newspeak.stack.v3/makeallclean ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32x86/newspeak.stack.v3/makealldirty =================================================================== --- branches/Cog/build.linux32x86/newspeak.stack.v3/makealldirty (rev 0) +++ branches/Cog/build.linux32x86/newspeak.stack.v3/makealldirty 2014-06-07 22:16:52 UTC (rev 2955) @@ -0,0 +1,5 @@ +#!/bin/sh +for d in `dirname $0`/build*; do + (cd $d + echo n | ./mvm) +done Property changes on: branches/Cog/build.linux32x86/newspeak.stack.v3/makealldirty ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32x86/squeak.cog.spur/makeallclean =================================================================== --- branches/Cog/build.linux32x86/squeak.cog.spur/makeallclean (rev 0) +++ branches/Cog/build.linux32x86/squeak.cog.spur/makeallclean 2014-06-07 22:16:52 UTC (rev 2955) @@ -0,0 +1,5 @@ +#!/bin/sh +for d in `dirname $0`/build*; do + (cd $d + echo y | ./mvm) +done Property changes on: branches/Cog/build.linux32x86/squeak.cog.spur/makeallclean ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32x86/squeak.cog.spur/makealldirty =================================================================== --- branches/Cog/build.linux32x86/squeak.cog.spur/makealldirty (rev 0) +++ branches/Cog/build.linux32x86/squeak.cog.spur/makealldirty 2014-06-07 22:16:52 UTC (rev 2955) @@ -0,0 +1,5 @@ +#!/bin/sh +for d in `dirname $0`/build*; do + (cd $d + echo n | ./mvm) +done Property changes on: branches/Cog/build.linux32x86/squeak.cog.spur/makealldirty ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32x86/squeak.cog.v3/makeallclean =================================================================== --- branches/Cog/build.linux32x86/squeak.cog.v3/makeallclean (rev 0) +++ branches/Cog/build.linux32x86/squeak.cog.v3/makeallclean 2014-06-07 22:16:52 UTC (rev 2955) @@ -0,0 +1,5 @@ +#!/bin/sh +for d in `dirname $0`/build*; do + (cd $d + echo y | ./mvm) +done Property changes on: branches/Cog/build.linux32x86/squeak.cog.v3/makeallclean ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32x86/squeak.cog.v3/makealldirty =================================================================== --- branches/Cog/build.linux32x86/squeak.cog.v3/makealldirty (rev 0) +++ branches/Cog/build.linux32x86/squeak.cog.v3/makealldirty 2014-06-07 22:16:52 UTC (rev 2955) @@ -0,0 +1,5 @@ +#!/bin/sh +for d in `dirname $0`/build*; do + (cd $d + echo n | ./mvm) +done Property changes on: branches/Cog/build.linux32x86/squeak.cog.v3/makealldirty ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32x86/squeak.sista.spur/makeallclean =================================================================== --- branches/Cog/build.linux32x86/squeak.sista.spur/makeallclean (rev 0) +++ branches/Cog/build.linux32x86/squeak.sista.spur/makeallclean 2014-06-07 22:16:52 UTC (rev 2955) @@ -0,0 +1,5 @@ +#!/bin/sh +for d in `dirname $0`/build*; do + (cd $d + echo y | ./mvm) +done Property changes on: branches/Cog/build.linux32x86/squeak.sista.spur/makeallclean ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32x86/squeak.sista.spur/makealldirty =================================================================== --- branches/Cog/build.linux32x86/squeak.sista.spur/makealldirty (rev 0) +++ branches/Cog/build.linux32x86/squeak.sista.spur/makealldirty 2014-06-07 22:16:52 UTC (rev 2955) @@ -0,0 +1,5 @@ +#!/bin/sh +for d in `dirname $0`/build*; do + (cd $d + echo n | ./mvm) +done Property changes on: branches/Cog/build.linux32x86/squeak.sista.spur/makealldirty ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32x86/squeak.sista.v3/makeallclean =================================================================== --- branches/Cog/build.linux32x86/squeak.sista.v3/makeallclean (rev 0) +++ branches/Cog/build.linux32x86/squeak.sista.v3/makeallclean 2014-06-07 22:16:52 UTC (rev 2955) @@ -0,0 +1,5 @@ +#!/bin/sh +for d in `dirname $0`/build*; do + (cd $d + echo y | ./mvm) +done Property changes on: branches/Cog/build.linux32x86/squeak.sista.v3/makeallclean ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32x86/squeak.sista.v3/makealldirty =================================================================== --- branches/Cog/build.linux32x86/squeak.sista.v3/makealldirty (rev 0) +++ branches/Cog/build.linux32x86/squeak.sista.v3/makealldirty 2014-06-07 22:16:52 UTC (rev 2955) @@ -0,0 +1,5 @@ +#!/bin/sh +for d in `dirname $0`/build*; do + (cd $d + echo n | ./mvm) +done Property changes on: branches/Cog/build.linux32x86/squeak.sista.v3/makealldirty ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32x86/squeak.stack.spur/makeallclean =================================================================== --- branches/Cog/build.linux32x86/squeak.stack.spur/makeallclean (rev 0) +++ branches/Cog/build.linux32x86/squeak.stack.spur/makeallclean 2014-06-07 22:16:52 UTC (rev 2955) @@ -0,0 +1,5 @@ +#!/bin/sh +for d in `dirname $0`/build*; do + (cd $d + echo y | ./mvm) +done Property changes on: branches/Cog/build.linux32x86/squeak.stack.spur/makeallclean ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32x86/squeak.stack.spur/makealldirty =================================================================== --- branches/Cog/build.linux32x86/squeak.stack.spur/makealldirty (rev 0) +++ branches/Cog/build.linux32x86/squeak.stack.spur/makealldirty 2014-06-07 22:16:52 UTC (rev 2955) @@ -0,0 +1,5 @@ +#!/bin/sh +for d in `dirname $0`/build*; do + (cd $d + echo n | ./mvm) +done Property changes on: branches/Cog/build.linux32x86/squeak.stack.spur/makealldirty ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32x86/squeak.stack.v3/makeallclean =================================================================== --- branches/Cog/build.linux32x86/squeak.stack.v3/makeallclean (rev 0) +++ branches/Cog/build.linux32x86/squeak.stack.v3/makeallclean 2014-06-07 22:16:52 UTC (rev 2955) @@ -0,0 +1,5 @@ +#!/bin/sh +for d in `dirname $0`/build*; do + (cd $d + echo y | ./mvm) +done Property changes on: branches/Cog/build.linux32x86/squeak.stack.v3/makeallclean ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32x86/squeak.stack.v3/makealldirty =================================================================== --- branches/Cog/build.linux32x86/squeak.stack.v3/makealldirty (rev 0) +++ branches/Cog/build.linux32x86/squeak.stack.v3/makealldirty 2014-06-07 22:16:52 UTC (rev 2955) @@ -0,0 +1,5 @@ +#!/bin/sh +for d in `dirname $0`/build*; do + (cd $d + echo n | ./mvm) +done Property changes on: branches/Cog/build.linux32x86/squeak.stack.v3/makealldirty ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32x86/third-party/makeallclean =================================================================== --- branches/Cog/build.linux32x86/third-party/makeallclean (rev 0) +++ branches/Cog/build.linux32x86/third-party/makeallclean 2014-06-07 22:16:52 UTC (rev 2955) @@ -0,0 +1,5 @@ +#!/bin/sh +for d in `dirname $0`/build*; do + (cd $d + echo y | ./mvm) +done Property changes on: branches/Cog/build.linux32x86/third-party/makeallclean ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.linux32x86/third-party/makealldirty =================================================================== --- branches/Cog/build.linux32x86/third-party/makealldirty (rev 0) +++ branches/Cog/build.linux32x86/third-party/makealldirty 2014-06-07 22:16:52 UTC (rev 2955) @@ -0,0 +1,5 @@ +#!/bin/sh +for d in `dirname $0`/build*; do + (cd $d + echo n | ./mvm) +done Property changes on: branches/Cog/build.linux32x86/third-party/makealldirty ___________________________________________________________________ Added: svn:executable + * Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2014-06-07 00:00:09 UTC (rev 2954) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-06-07 22:16:52 UTC (rev 2955) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.759 uuid: 988e84e2-8576-4edb-984a-98c755c8e2e8 + CCodeGenerator VMMaker.oscog-eem.766 uuid: 3045c341-cfbf-494c-a7b1-fb29c26a7340 from - StackToRegisterMappingCogit VMMaker.oscog-eem.759 uuid: 988e84e2-8576-4edb-984a-98c755c8e2e8 + StackToRegisterMappingCogit VMMaker.oscog-eem.766 uuid: 3045c341-cfbf-494c-a7b1-fb29c26a7340 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.759 uuid: 988e84e2-8576-4edb-984a-98c755c8e2e8 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.766 uuid: 3045c341-cfbf-494c-a7b1-fb29c26a7340 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -464,7 +464,7 @@ static void compileOpenPICnumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms; static sqInt compilePICProlog(sqInt numArgs) NoDbgRegParms; static sqInt compilePrimitive(void); -static void compileTrampolineForcallJumpBarnumArgsargargargargsaveRegsresultReg(void *aRoutine, sqInt callJumpBar, sqInt numArgs, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3, sqInt saveRegs, sqInt resultRegOrNil) NoDbgRegParms; +static void compileTrampolineFornumArgsargargargargsaveRegspushLinkRegresultReg(void *aRoutine, sqInt numArgs, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3, sqInt saveRegs, sqInt pushLinkReg, sqInt resultRegOrNil) NoDbgRegParms; static void computeEntryOffsets(void); static sqInt computeJumpTargetOffsetPlus(AbstractInstruction * self_in_computeJumpTargetOffsetPlus, sqInt anPCOffset) NoDbgRegParms; static sqInt computeMaximumSize(AbstractInstruction * self_in_computeMaximumSize) NoDbgRegParms; @@ -846,7 +846,7 @@ static sqInt genTrampolineForcalledargargargresult(void *aRoutine, char *aString, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt resultReg) NoDbgRegParms; static sqInt genTrampolineForcalledargargresult(void *aRoutine, char *aString, sqInt regOrConst0, sqInt regOrConst1, sqInt resultReg) NoDbgRegParms; static sqInt genTrampolineForcalledargresult(void *aRoutine, char *aString, sqInt regOrConst0, sqInt resultReg) NoDbgRegParms; -static sqInt genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(void *aRoutine, char *trampolineName, sqInt callJumpBar, sqInt numArgs, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3, sqInt saveRegs, sqInt resultRegOrNil, sqInt appendBoolean) NoDbgRegParms; +static sqInt genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(void *aRoutine, char *trampolineName, sqInt numArgs, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3, sqInt saveRegs, sqInt pushLinkReg, sqInt resultRegOrNil, sqInt appendBoolean) NoDbgRegParms; static sqInt genUpArrowReturn(void); static AbstractInstruction * genWriteCResultIntoReg(AbstractInstruction * self_in_genWriteCResultIntoReg, sqInt abstractRegister) NoDbgRegParms; static AbstractInstruction * gen(sqInt opcode) NoDbgRegParms; @@ -1731,7 +1731,7 @@ static sqInt inBlock; static sqInt initialPC; static AbstractInstruction * interpretCall; -static sqInt interpretLabel; +static AbstractInstruction * interpretLabel; static int labelCounter; static sqInt lastSend; static usqInt limitAddress; @@ -5260,7 +5260,6 @@ } -/* <Boolean> */ /* Generate a trampoline with up to four arguments. Generate either a call or a jump to aRoutine as requested by callJumpBar. If generating a call and resultRegOrNil is @@ -5268,21 +5267,22 @@ back in resultRegOrNil. Hack: a negative value indicates an abstract register, a non-negative value indicates a constant. */ -/* If on a RISC processor the return address needs to be pushed to the +/* If on a RISC processor, the return address needs to be pushed to the stack so that the interpreter sees the same stack layout as on CISC. */ static void -compileTrampolineForcallJumpBarnumArgsargargargargsaveRegsresultReg(void *aRoutine, sqInt callJumpBar, sqInt numArgs, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3, sqInt saveRegs, sqInt resultRegOrNil) +compileTrampolineFornumArgsargargargargsaveRegspushLinkRegresultReg(void *aRoutine, sqInt numArgs, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3, sqInt saveRegs, sqInt pushLinkReg, sqInt resultRegOrNil) { - ; + if (pushLinkReg + && (hasLinkRegister(backEnd))) { + /* begin PushR: */ + genoperand(PushR, LinkReg); + } genSmalltalkToCStackSwitch(); if (cStackAlignment > BytesPerWord) { genAlignCStackSavingRegistersnumArgswordAlignment(backEnd, saveRegs, numArgs, ((sqInt) cStackAlignment >> 2)); } if (saveRegs) { - if (!callJumpBar) { - error("why save registers when you're not going to return?"); - } genSaveRegisters(backEnd); } if (numArgs > 0) { @@ -5317,29 +5317,26 @@ genPassConstasArgument(backEnd, regOrConst0, 0); } } - genoperand((callJumpBar - ? Call - : Jump), ((usqInt)aRoutine)); - if (callJumpBar) { - if (!(resultRegOrNil == null)) { - genWriteCResultIntoReg(backEnd, resultRegOrNil); + /* begin Call: */ + genoperand(Call, ((usqInt)aRoutine)); + if (!(resultRegOrNil == null)) { + genWriteCResultIntoReg(backEnd, resultRegOrNil); + } + if (saveRegs) { + if (numArgs > 0) { + genRemoveNArgsFromStack(backEnd, numArgs); } - if (saveRegs) { - if (numArgs > 0) { - genRemoveNArgsFromStack(backEnd, numArgs); - } - if (resultRegOrNil == null) { - genRestoreRegs(backEnd); - } - else { - genRestoreRegsExcept(backEnd, resultRegOrNil); - } + if (resultRegOrNil == null) { + genRestoreRegs(backEnd); } - genLoadStackPointers(backEnd); - - /* begin RetN: */ - genoperand(RetN, 0); + else { + genRestoreRegsExcept(backEnd, resultRegOrNil); + } } + genLoadStackPointers(backEnd); + + /* begin RetN: */ + genoperand(RetN, 0); } @@ -10861,7 +10858,7 @@ /* begin RetN: */ genoperand(RetN, 0); jmpTarget(jumpSingle, gLabel()); - return genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(ceActiveContext, "ceActiveContextTrampoline", 1, 0, null, null, null, null, 0, ReceiverResultReg, 1); + return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceActiveContext, "ceActiveContextTrampoline", 0, null, null, null, null, 0, 1, ReceiverResultReg, 1); } static sqInt @@ -10947,7 +10944,7 @@ address1 = instructionPointerAddress(); genoperandoperand(MoveRAw, TempReg, address1); - return genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(ceCheckForInterrupts, "ceCheckForInterruptsTrampoline", 1, 0, null, null, null, null, 0, null, 1); + return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceCheckForInterrupts, "ceCheckForInterruptsTrampoline", 0, null, null, null, null, 0, 0, null, 1); } static sqInt @@ -11462,23 +11459,21 @@ sqInt address1; sqInt address2; sqInt address3; + sqInt address4; genPushRegisterArgs(); - /* begin MoveMw:r:R: */ - genoperandoperandoperand(MoveMwrR, 0, SPReg, ClassReg); - /* begin MoveR:Aw: */ - address2 = framePointerAddress(); - genoperandoperand(MoveRAw, FPReg, address2); - /* begin LoadEffectiveAddressMw:r:R: */ - genoperandoperandoperand(LoadEffectiveAddressMwrR, BytesPerWord, SPReg, TempReg); + address4 = framePointerAddress(); + genoperandoperand(MoveRAw, FPReg, address4); + /* begin PopR: */ + genoperand(PopR, TempReg); /* begin MoveR:Aw: */ - address1 = instructionPointerAddress(); - genoperandoperand(MoveRAw, ClassReg, address1); - + address2 = instructionPointerAddress(); + genoperandoperand(MoveRAw, TempReg, address2); /* begin MoveR:Aw: */ address3 = stackPointerAddress(); - genoperandoperand(MoveRAw, TempReg, address3); + genoperandoperand(MoveRAw, SPReg, address3); + return 0; } @@ -12287,7 +12282,7 @@ genoperandoperand(MoveRR, ClassReg, ReceiverResultReg); jmpTarget(jumpItsTheReceiverStupid, gRetN(0)); jmpTarget(jumpMiss, gLabel()); - ceImplicitReceiverTrampoline = genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(ceImplicitReceiverForreceiverclass, "ceImplicitReceiverTrampoline", 1, 3, SendNumArgsReg, ReceiverResultReg, ClassReg, null, 0, ReceiverResultReg, 1); + ceImplicitReceiverTrampoline = genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceImplicitReceiverForreceiverclass, "ceImplicitReceiverTrampoline", 3, SendNumArgsReg, ReceiverResultReg, ClassReg, null, 0, 1, ReceiverResultReg, 1); } static void @@ -12851,9 +12846,9 @@ genoperandoperand(CmpCqR, 0, ClassReg); /* begin JumpZero: */ jumpMNUCase = genoperand(JumpZero, ((sqInt)0)); - compileTrampolineForcallJumpBarnumArgsargargargargsaveRegsresultReg(ceInterpretMethodFromPICreceiver, 1, 2, SendNumArgsReg, ReceiverResultReg, null, null, 0, null); + compileTrampolineFornumArgsargargargargsaveRegspushLinkRegresultReg(ceInterpretMethodFromPICreceiver, 2, SendNumArgsReg, ReceiverResultReg, null, null, 0, 1, null); jmpTarget(jumpMNUCase, gLabel()); - return genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(ceMNUFromPICMNUMethodreceiver, name, 1, 2, SendNumArgsReg, ReceiverResultReg, null, null, 0, null, 1); + return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceMNUFromPICMNUMethodreceiver, name, 2, SendNumArgsReg, ReceiverResultReg, null, null, 0, 1, null, 1); } @@ -13799,12 +13794,12 @@ /* begin JumpNonZero: */ jumpSICMiss = genoperand(JumpNonZero, ((sqInt)0)); - compileTrampolineForcallJumpBarnumArgsargargargargsaveRegsresultReg(ceStackOverflow, 1, 1, SendNumArgsReg, null, null, null, 0, null); + compileTrampolineFornumArgsargargargargsaveRegspushLinkRegresultReg(ceStackOverflow, 1, SendNumArgsReg, null, null, null, 0, 1, null); jmpTarget(jumpSICMiss, gLabel()); genPushRegisterArgsForAbortMissNumArgs(backEnd, numArgs); - return genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(ceSICMiss, trampolineNamenumArgs("ceMethodAbort", (numArgs <= 1 + return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceSICMiss, trampolineNamenumArgs("ceMethodAbort", (numArgs <= 1 ? numArgs - : -1)), 1, 1, ReceiverResultReg, null, null, null, 0, null, 1); + : -1)), 1, ReceiverResultReg, null, null, null, 0, 1, null, 1); } static AbstractInstruction * @@ -13824,7 +13819,7 @@ assert(!(shouldAnnotateObjectReference(boolean))); /* begin AddCq:R: */ genoperandoperand(AddCqR, boolean, TempReg); - return genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(ceSendMustBeBoolean, trampolineName, 1, 1, TempReg, null, null, null, 0, null, 1); + return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceSendMustBeBoolean, trampolineName, 1, TempReg, null, null, null, 0, 1, null, 1); } @@ -13847,6 +13842,11 @@ sqInt address; sqInt address1; + + /* write the return address to the coInterpreter instructionPointerAddress; + CISCs will have pushed it on the stack, so pop it first; RISCs will have it in + their link register so just write it directly. */ + opcodeIndex = 0; /* begin PopR: */ genoperand(PopR, TempReg); @@ -13854,7 +13854,7 @@ address1 = instructionPointerAddress(); genoperandoperand(MoveRAw, TempReg, address1); - return genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(ceNonLocalReturn, "ceNonLocalReturnTrampoline", 1, 1, ReceiverResultReg, null, null, null, 0, null, 1); + return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceNonLocalReturn, "ceNonLocalReturnTrampoline", 1, ReceiverResultReg, null, null, null, 0, 0, null, 1); } static sqInt @@ -13903,9 +13903,9 @@ opcodeIndex = 0; genPushRegisterArgsForNumArgs(backEnd, numArgs); - genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(ceCPICMissreceiver, trampolineNamenumArgs("cePICMiss", (numArgs <= 1 + genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceCPICMissreceiver, trampolineNamenumArgs("cePICMiss", (numArgs <= 1 ? numArgs - : -1)), 1, 2, ClassReg, ReceiverResultReg, null, null, 0, null, 1); + : -1)), 2, ClassReg, ReceiverResultReg, null, null, 0, 1, null, 1); return startAddress; } @@ -14760,6 +14760,7 @@ sqInt address3; sqInt address4; sqInt address5; + sqInt address6; AbstractInstruction *continuePostSample; AbstractInstruction *jmpFail; AbstractInstruction *jmpSample; @@ -14785,8 +14786,8 @@ continuePostSample = genoperandoperand(Label, (labelCounter += 1), bytecodePC); } /* begin MoveAw:R: */ - address3 = primFailCodeAddress(); - genoperandoperand(MoveAwR, address3, TempReg); + address5 = primFailCodeAddress(); + genoperandoperand(MoveAwR, address5, TempReg); flag("ask concrete code gen if move sets condition codes?"); /* begin CmpCq:R: */ genoperandoperand(CmpCqR, 0, TempReg); @@ -14796,17 +14797,17 @@ address4 = instructionPointerAddress(); genoperandoperand(MoveAwR, address4, ClassReg); genLoadStackPointers(backEnd); - /* begin PushR: */ - genoperand(PushR, ClassReg); /* begin MoveMw:r:R: */ - genoperandoperandoperand(MoveMwrR, BytesPerWord, SPReg, ReceiverResultReg); - flag("currently caller pushes result"); + genoperandoperandoperand(MoveMwrR, 0, SPReg, ReceiverResultReg); + /* begin MoveR:Mw:r: */ + genoperandoperandoperand(MoveRMwr, ClassReg, 0, SPReg); /* begin RetN: */ - genoperand(RetN, BytesPerWord); + genoperand(RetN, 0); + jmpTarget(jmpFail, gMoveAwR(newMethodAddress(), SendNumArgsReg)); /* begin MoveAw:R: */ - address5 = cStackPointerAddress(); - genoperandoperand(MoveAwR, address5, SPReg); + address6 = cStackPointerAddress(); + genoperandoperand(MoveAwR, address6, SPReg); if (cStackAlignment > BytesPerWord) { genAlignCStackSavingRegistersnumArgswordAlignment(backEnd, 0, 1, ((sqInt) cStackAlignment >> 2)); } @@ -14814,11 +14815,13 @@ CallRT((unsigned long)ceActivateFailingPrimitiveMethod); if (profiling) { - /* Call ceCheckProfileTick: to record sample and then continue. - newMethod should be up-to-date. */ + /* Call ceCheckProfileTick: to record sample and then continue. newMethod + should be up-to-date. Need to save and restore the link reg around this call. */ jmpTarget(jmpSample, gLabel()); + CallRT((unsigned long)ceCheckProfileTick); + /* begin Jump: */ genoperand(Jump, ((sqInt)continuePostSample)); } @@ -15446,7 +15449,7 @@ static sqInt genSafeTrampolineForcalledarg(void *aRoutine, char *aString, sqInt regOrConst0) { - return genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(aRoutine, aString, 1, 1, regOrConst0, null, null, null, 1, null, 0); + return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(aRoutine, aString, 1, regOrConst0, null, null, null, 1, 1, null, 0); } @@ -15456,7 +15459,7 @@ static sqInt genSafeTrampolineForcalledargarg(void *aRoutine, char *aString, sqInt regOrConst0, sqInt regOrConst1) { - return genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(aRoutine, aString, 1, 2, regOrConst0, regOrConst1, null, null, 1, null, 0); + return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(aRoutine, aString, 2, regOrConst0, regOrConst1, null, null, 1, 1, null, 0); } @@ -15605,7 +15608,7 @@ startAddress = methodZoneBase; opcodeIndex = 0; genPushRegisterArgsForNumArgs(backEnd, numArgs); - genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(aRoutine, aString, 1, 3, regOrConst0, regOrConst1, regOrConst2, null, 0, null, 1); + genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(aRoutine, aString, 3, regOrConst0, regOrConst1, regOrConst2, null, 0, 1, null, 1); return startAddress; } @@ -15622,7 +15625,7 @@ startAddress = methodZoneBase; opcodeIndex = 0; genPushRegisterArgsForNumArgs(backEnd, numArgs); - genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(aRoutine, aString, 1, 4, regOrConst0, regOrConst1, regOrConst2, regOrConst3, 0, null, 1); + genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(aRoutine, aString, 4, regOrConst0, regOrConst1, regOrConst2, regOrConst3, 0, 1, null, 1); return startAddress; } @@ -16512,7 +16515,7 @@ static sqInt genTrampolineForcalled(void *aRoutine, char *aString) { - return genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(aRoutine, aString, 1, 0, null, null, null, null, 0, null, 0); + return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(aRoutine, aString, 0, null, null, null, null, 0, 1, null, 0); } @@ -16523,7 +16526,7 @@ static sqInt genTrampolineForcalledarg(void *aRoutine, char *aString, sqInt regOrConst0) { - return genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(aRoutine, aString, 1, 1, regOrConst0, null, null, null, 0, null, 0); + return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(aRoutine, aString, 1, regOrConst0, null, null, null, 0, 1, null, 0); } @@ -16534,7 +16537,7 @@ static sqInt genTrampolineForcalledargargargresult(void *aRoutine, char *aString, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt resultReg) { - return genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(aRoutine, aString, 1, 3, regOrConst0, regOrConst1, regOrConst2, null, 0, resultReg, 0); + return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(aRoutine, aString, 3, regOrConst0, regOrConst1, regOrConst2, null, 0, 1, resultReg, 0); } @@ -16545,7 +16548,7 @@ static sqInt genTrampolineForcalledargargresult(void *aRoutine, char *aString, sqInt regOrConst0, sqInt regOrConst1, sqInt resultReg) { - return genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(aRoutine, aString, 1, 2, regOrConst0, regOrConst1, null, null, 0, resultReg, 0); + return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(aRoutine, aString, 2, regOrConst0, regOrConst1, null, null, 0, 1, resultReg, 0); } @@ -16556,11 +16559,10 @@ static sqInt genTrampolineForcalledargresult(void *aRoutine, char *aString, sqInt regOrConst0, sqInt resultReg) { - return genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(aRoutine, aString, 1, 1, regOrConst0, null, null, null, 0, resultReg, 0); + return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(aRoutine, aString, 1, regOrConst0, null, null, null, 0, 1, resultReg, 0); } -/* <Boolean> */ /* Generate a trampoline with up to four arguments. Generate either a call or a jump to aRoutineOrNil as requested by callJumpBar. If generating a call and resultRegOrNil is @@ -16570,7 +16572,7 @@ value indicates a constant. */ static sqInt -genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(void *aRoutine, char *trampolineName, sqInt callJumpBar, sqInt numArgs, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3, sqInt saveRegs, sqInt resultRegOrNil, sqInt appendBoolean) +genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(void *aRoutine, char *trampolineName, sqInt numArgs, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3, sqInt saveRegs, sqInt pushLinkReg, sqInt resultRegOrNil, sqInt appendBoolean) { sqInt startAddress; @@ -16578,7 +16580,7 @@ if (!appendBoolean) { opcodeIndex = 0; } - compileTrampolineForcallJumpBarnumArgsargargargargsaveRegsresultReg(aRoutine, callJumpBar, numArgs, regOrConst0, regOrConst1, regOrConst2, regOrConst3, saveRegs, resultRegOrNil); + compileTrampolineFornumArgsargargargargsaveRegspushLinkRegresultReg(aRoutine, numArgs, regOrConst0, regOrConst1, regOrConst2, regOrConst3, saveRegs, pushLinkReg, resultRegOrNil); outputInstructionsForGeneratedRuntimeAt(startAddress); recordGeneratedRunTimeaddress(trampolineName, startAddress); recordRunTimeObjectReferences(); @@ -19952,7 +19954,7 @@ for (i = 0; i < trampolineTableIndex; i += 2) { printHex(((sqInt)(trampolineAddresses[i + 1]))); print(": "); - print(trampolineAddresses[i]); + print(((char *) (trampolineAddresses[i]))); cr(); } } @@ -20196,7 +20198,7 @@ && ((cogMethod->cmRefersToYoung))) { assert(source < (dest - BytesPerWord)); if (((cogMethod->objectHeader)) != 0) { - cogMethod = ((CogMethod *) ((((sqInt)cogMethod)) + ((cogMethod->objectHeader)))); + cogMethod = ((CogMethod *) ((((sqInt)cogMethod)) + (((sqInt)((cogMethod->objectHeader)))))); } longAtput((dest -= BytesPerWord), ((sqInt)cogMethod)); } Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-06-07 00:00:09 UTC (rev 2954) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-06-07 22:16:52 UTC (rev 2955) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.759 uuid: 988e84e2-8576-4edb-984a-98c755c8e2e8 + CCodeGenerator VMMaker.oscog-eem.766 uuid: 3045c341-cfbf-494c-a7b1-fb29c26a7340 */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2014-06-07 00:00:09 UTC (rev 2954) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2014-06-07 22:16:52 UTC (rev 2955) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.759 uuid: 988e84e2-8576-4edb-984a-98c755c8e2e8 + CCodeGenerator VMMaker.oscog-eem.766 uuid: 3045c341-cfbf-494c-a7b1-fb29c26a7340 */ typedef struct { Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2014-06-07 00:00:09 UTC (rev 2954) +++ branches/Cog/nsspursrc/vm/cogit.c 2014-06-07 22:16:52 UTC (rev 2955) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.759 uuid: 988e84e2-8576-4edb-984a-98c755c8e2e8 + CCodeGenerator VMMaker.oscog-eem.766 uuid: 3045c341-cfbf-494c-a7b1-fb29c26a7340 from - StackToRegisterMappingCogit VMMaker.oscog-eem.759 uuid: 988e84e2-8576-4edb-984a-98c755c8e2e8 + StackToRegisterMappingCogit VMMaker.oscog-eem.766 uuid: 3045c341-cfbf-494c-a7b1-fb29c26a7340 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.759 uuid: 988e84e2-8576-4edb-984a-98c755c8e2e8 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.766 uuid: 3045c341-cfbf-494c-a7b1-fb29c26a7340 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -457,7 +457,7 @@ static void compileOpenPICnumArgs(sqInt selector, sqInt numArgs) NoDbgRegParms; static sqInt compilePICProlog(sqInt numArgs) NoDbgRegParms; static sqInt compilePrimitive(void); -static void compileTrampolineForcallJumpBarnumArgsargargargargsaveRegsresultReg(void *aRoutine, sqInt callJumpBar, sqInt numArgs, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3, sqInt saveRegs, sqInt resultRegOrNil) NoDbgRegParms; +static void compileTrampolineFornumArgsargargargargsaveRegspushLinkRegresultReg(void *aRoutine, sqInt numArgs, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3, sqInt saveRegs, sqInt pushLinkReg, sqInt resultRegOrNil) NoDbgRegParms; static void computeEntryOffsets(void); static sqInt computeJumpTargetOffsetPlus(AbstractInstruction * self_in_computeJumpTargetOffsetPlus, sqInt anPCOffset) NoDbgRegParms; static sqInt computeMaximumSize(AbstractInstruction * self_in_computeMaximumSize) NoDbgRegParms; @@ -582,7 +582,7 @@ static void freeOlderMethodsForCompaction(void); static void freePICsWithFreedTargets(void); void freeUnmarkedMachineCode(void); -static sqInt genActiveContextTrampolineLargeinBlockcalled(sqInt isLarge, sqInt isInBlock, sqInt aString) NoDbgRegParms; +static sqInt genActiveContextTrampolineLargeinBlockcalled(sqInt isLarge, sqInt isInBlock, char *aString) NoDbgRegParms; static sqInt genAddSmallIntegerTagsTo(sqInt aRegister) NoDbgRegParms; static sqInt genAlignCStackSavingRegistersnumArgswordAlignment(AbstractInstruction * self_in_genAlignCStackSavingRegistersnumArgswordAlignment, sqInt saveRegs, sqInt numArgs, sqInt alignment) NoDbgRegParms; static AbstractInstruction * genAllocFloatValueintoscratchRegscratchReg(sqInt dpreg, sqInt resultReg, sqInt scratch1, sqInt scratch2) NoDbgRegParms; @@ -855,7 +855,7 @@ static sqInt genTrampolineForcalledargargargresult(void *aRoutine, char *aString, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt resultReg) NoDbgRegParms; static sqInt genTrampolineForcalledargargresult(void *aRoutine, char *aString, sqInt regOrConst0, sqInt regOrConst1, sqInt resultReg) NoDbgRegParms; static sqInt genTrampolineForcalledargresult(void *aRoutine, char *aString, sqInt regOrConst0, sqInt resultReg) NoDbgRegParms; -static sqInt genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(void *aRoutine, char *trampolineName, sqInt callJumpBar, sqInt numArgs, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3, sqInt saveRegs, sqInt resultRegOrNil, sqInt appendBoolean) NoDbgRegParms; +static sqInt genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(void *aRoutine, char *trampolineName, sqInt numArgs, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3, sqInt saveRegs, sqInt pushLinkReg, sqInt resultRegOrNil, sqInt appendBoolean) NoDbgRegParms; static sqInt genUpArrowReturn(void); static AbstractInstruction * genWriteCResultIntoReg(AbstractInstruction * self_in_genWriteCResultIntoReg, sqInt abstractRegister) NoDbgRegParms; static AbstractInstruction * gen(sqInt opcode) NoDbgRegParms; @@ -1740,7 +1740,7 @@ static sqInt inBlock; static sqInt initialPC; static AbstractInstruction * interpretCall; -static sqInt interpretLabel; +static AbstractInstruction * interpretLabel; static int labelCounter; static sqInt lastSend; static usqInt limitAddress; @@ -5200,7 +5200,6 @@ } -/* <Boolean> */ /* Generate a trampoline with up to four arguments. Generate either a call or a jump to aRoutine as requested by callJumpBar. If generating a call and resultRegOrNil is @@ -5208,21 +5207,22 @@ back in resultRegOrNil. Hack: a negative value indicates an abstract register, a non-negative value indicates a constant. */ -/* If on a RISC processor the return address needs to be pushed to the +/* If on a RISC processor, the return address needs to be pushed to the stack so that the interpreter sees the same stack layout as on CISC. */ static void -compileTrampolineForcallJumpBarnumArgsargargargargsaveRegsresultReg(void *aRoutine, sqInt callJumpBar, sqInt numArgs, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3, sqInt saveRegs, sqInt resultRegOrNil) +compileTrampolineFornumArgsargargargargsaveRegspushLinkRegresultReg(void *aRoutine, sqInt numArgs, sqInt regOrConst0, sqInt regOrConst1, sqInt regOrConst2, sqInt regOrConst3, sqInt saveRegs, sqInt pushLinkReg, sqInt resultRegOrNil) { - ; + if (pushLinkReg + && (hasLinkRegister(backEnd))) { + /* begin PushR: */ + genoperand(PushR, LinkReg); + } genSmalltalkToCStackSwitch(); if (cStackAlignment > BytesPerWord) { genAlignCStackSavingRegistersnumArgswordAlignment(backEnd, saveRegs, numArgs, ((sqInt) cStackAlignment >> 2)); } if (saveRegs) { - if (!callJumpBar) { - error("why save registers when you're not going to return?"); - } genSaveRegisters(backEnd); } if (numArgs > 0) { @@ -5257,29 +5257,26 @@ genPassConstasArgument(backEnd, regOrConst0, 0); } } - genoperand((callJumpBar - ? Call - : Jump), ((usqInt)aRoutine)); - if (callJumpBar) { - if (!(resultRegOrNil == null)) { - genWriteCResultIntoReg(backEnd, resultRegOrNil); + /* begin Call: */ + genoperand(Call, ((usqInt)aRoutine)); + if (!(resultRegOrNil == null)) { + genWriteCResultIntoReg(backEnd, resultRegOrNil); + } + if (saveRegs) { + if (numArgs > 0) { + genRemoveNArgsFromStack(backEnd, numArgs); } - if (saveRegs) { - if (numArgs > 0) { - genRemoveNArgsFromStack(backEnd, numArgs); - } - if (resultRegOrNil == null) { - genRestoreRegs(backEnd); - } - else { - genRestoreRegsExcept(backEnd, resultRegOrNil); - } + if (resultRegOrNil == null) { + genRestoreRegs(backEnd); } - genLoadStackPointers(backEnd); - - /* begin RetN: */ - genoperand(RetN, 0); + else { + genRestoreRegsExcept(backEnd, resultRegOrNil); + } } + genLoadStackPointers(backEnd); + + /* begin RetN: */ + genoperand(RetN, 0); } @@ -10898,7 +10895,7 @@ Assume numArgs is in SendNumArgsReg and ClassReg is free. */ static sqInt -genActiveContextTrampolineLargeinBlockcalled(sqInt isLarge, sqInt isInBlock, sqInt aString) +genActiveContextTrampolineLargeinBlockcalled(sqInt isLarge, sqInt isInBlock, char *aString) { sqInt startAddress; @@ -10996,7 +10993,7 @@ address1 = instructionPointerAddress(); genoperandoperand(MoveRAw, TempReg, address1); - return genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(ceCheckForInterrupts, "ceCheckForInterruptsTrampoline", 1, 0, null, null, null, null, 0, null, 1); + return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceCheckForInterrupts, "ceCheckForInterruptsTrampoline", 0, null, null, null, null, 0, 0, null, 1); } static sqInt @@ -11516,8 +11513,8 @@ genEnsureOopInRegNotForwardedscratchReg(sqInt reg, sqInt scratch) { AbstractInstruction *loop; - AbstractInstruction * okImm; - AbstractInstruction * okObj; + AbstractInstruction *okImm; + AbstractInstruction *okObj; sqInt quickConstant; assert(reg != scratch); @@ -11617,23 +11614,21 @@ sqInt address1; sqInt address2; sqInt address3; + sqInt address4; genPushRegisterArgs(); - /* begin MoveMw:r:R: */ - genoperandoperandoperand(MoveMwrR, 0, SPReg, ClassReg); - /* begin MoveR:Aw: */ - address2 = framePointerAddress(); - genoperandoperand(MoveRAw, FPReg, address2); - /* begin LoadEffectiveAddressMw:r:R: */ - genoperandoperandoperand(LoadEffectiveAddressMwrR, BytesPerWord, SPReg, TempReg); + address4 = framePointerAddress(); + genoperandoperand(MoveRAw, FPReg, address4); + /* begin PopR: */ + genoperand(PopR, TempReg); /* begin MoveR:Aw: */ - address1 = instructionPointerAddress(); - genoperandoperand(MoveRAw, ClassReg, address1); - + address2 = instructionPointerAddress(); + genoperandoperand(MoveRAw, TempReg, address2); /* begin MoveR:Aw: */ address3 = stackPointerAddress(); - genoperandoperand(MoveRAw, TempReg, address3); + genoperandoperand(MoveRAw, SPReg, address3); + return 0; } @@ -12453,7 +12448,7 @@ genoperandoperand(MoveRR, ClassReg, ReceiverResultReg); jmpTarget(jumpItsTheReceiverStupid, gRetN(0)); jmpTarget(jumpMiss, gLabel()); - ceImplicitReceiverTrampoline = genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(ceImplicitReceiverForreceiverclass, "ceImplicitReceiverTrampoline", 1, 3, SendNumArgsReg, ReceiverResultReg, ClassReg, null, 0, ReceiverResultReg, 1); + ceImplicitReceiverTrampoline = genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceImplicitReceiverForreceiverclass, "ceImplicitReceiverTrampoline", 3, SendNumArgsReg, ReceiverResultReg, ClassReg, null, 0, 1, ReceiverResultReg, 1); } static void @@ -13251,9 +13246,9 @@ genoperandoperand(CmpCqR, 0, ClassReg); /* begin JumpZero: */ jumpMNUCase = genoperand(JumpZero, ((sqInt)0)); - compileTrampolineForcallJumpBarnumArgsargargargargsaveRegsresultReg(ceInterpretMethodFromPICreceiver, 1, 2, SendNumArgsReg, ReceiverResultReg, null, null, 0, null); + compileTrampolineFornumArgsargargargargsaveRegspushLinkRegresultReg(ceInterpretMethodFromPICreceiver, 2, SendNumArgsReg, ReceiverResultReg, null, null, 0, 1, null); jmpTarget(jumpMNUCase, gLabel()); - return genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(ceMNUFromPICMNUMethodreceiver, name, 1, 2, SendNumArgsReg, ReceiverResultReg, null, null, 0, null, 1); + return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceMNUFromPICMNUMethodreceiver, name, 2, SendNumArgsReg, ReceiverResultReg, null, null, 0, 1, null, 1); } static sqInt @@ -15328,12 +15323,12 @@ /* begin JumpNonZero: */ jumpSICMiss = genoperand(JumpNonZero, ((sqInt)0)); - compileTrampolineForcallJumpBarnumArgsargargargargsaveRegsresultReg(ceStackOverflow, 1, 1, SendNumArgsReg, null, null, null, 0, null); + compileTrampolineFornumArgsargargargargsaveRegspushLinkRegresultReg(ceStackOverflow, 1, SendNumArgsReg, null, null, null, 0, 1, null); jmpTarget(jumpSICMiss, gLabel()); genPushRegisterArgsForAbortMissNumArgs(backEnd, numArgs); - return genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(ceSICMiss, trampolineNamenumArgs("ceMethodAbort", (numArgs <= 2 + return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceSICMiss, trampolineNamenumArgs("ceMethodAbort", (numArgs <= 2 ? numArgs - : -1)), 1, 1, ReceiverResultReg, null, null, null, 0, null, 1); + : -1)), 1, ReceiverResultReg, null, null, null, 0, 1, null, 1); } static AbstractInstruction * @@ -15353,7 +15348,7 @@ assert(!(shouldAnnotateObjectReference(boolean))); /* begin AddCq:R: */ genoperandoperand(AddCqR, boolean, TempReg); - return genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(ceSendMustBeBoolean, trampolineName, 1, 1, TempReg, null, null, null, 0, null, 1); + return genTrampolineForcallednumArgsargargargargsaveRegspushLinkRegresultRegappendOpcodes(ceSendMustBeBoolean, trampolineName, 1, TempReg, null, null, null, 0, 1, null, 1); } @@ -15422,6 +15417,11 @@ sqInt address; sqInt address1; + + /* write the return address to the coInterpreter instructionPointerAddress; + CISCs will have pushed it on the stack, so pop it first; RISCs will have it in + their link register so just write it directly. */ + opcodeIndex = 0; /* begin PopR: */ genoperand(PopR, TempReg); @@ -15429,7 +15429,7 @@ address1 = instructionPointerAddress(); genoperandoperand(MoveRAw, TempReg, address1); - return genTrampolineForcalledcallJumpBarnumArgsargargargargsaveRegsresultRegappendOpcodes(ceNonLocalReturn, "ceNonLocalReturnTrampoline", 1, 1, ReceiverResultReg, null, null, null, 0, null, 1); @@ Diff output truncated at 50000 characters. @@

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev June 2014