Vm-dev January 2013

vm-dev@lists.squeakfoundation.org

27 participants
148 discussions

[commit][2665] update makefile, add a readme
by commits＠squeakvm.org 10 Jan '13

10 Jan '13

Revision: 2665 Author: rowledge Date: 2013-01-09 16:04:43 -0800 (Wed, 09 Jan 2013) Log Message: ----------- update makefile, add a readme Modified Paths: -------------- trunk/platforms/RiscOS/misc/ToCopy/!Squeak/modules/HALTimer trunk/platforms/RiscOS/misc/ToCopy/MakeFile Added Paths: ----------- trunk/platforms/RiscOS/misc/ToCopy/READMERIGHTNOW Modified: trunk/platforms/RiscOS/misc/ToCopy/!Squeak/modules/HALTimer =================================================================== (Binary files differ) Modified: trunk/platforms/RiscOS/misc/ToCopy/MakeFile =================================================================== --- trunk/platforms/RiscOS/misc/ToCopy/MakeFile 2013-01-09 02:14:39 UTC (rev 2664) +++ trunk/platforms/RiscOS/misc/ToCopy/MakeFile 2013-01-10 00:04:43 UTC (rev 2665) @@ -1,5 +1,5 @@ -# Project: sq38plugin -# Make the pluginised VM for v3.8 +# Project: squeak +# Make the pluginised VM for v3.9 # Reworked to use VMMaker non-copying of platform & cross files # Add check for Squeak3D dir to optionally compile the Squeak3D plugin # Ditto for HostWindow and LocalePlugin @@ -11,7 +11,7 @@ #CCVMflags = $(ccflags) -g CCVMflags = $(ccflags) # likewise, linkflags with -debug... -Linkflags = -aif -c++ -o $@ +Linkflags = -aif -c++ -o $@ #Linkflags = -aif -c++ -debug -o $@ ObjAsmflags = -throwback -NoCache -depend !Depend LibFileflags = -c -o $@ @@ -50,19 +50,19 @@ vm: $(Sqk).!Runimage vmobjdir @ - + clean: $(MAKEFILEDIR).each @ -type d -name o -exec wipe %0.* ~C ";" # User-editable dependencies: -vmobjdir: +vmobjdir: @ifthere $(Sqk) then else CDir $(Sqk) @ifthere @.vm.o then else CDir @.vm.o @ifthere @.vm.o.sqRPCVersion then delete @.vm.o.sqRPCVersion -pluginDir: - @ifthere $(SqPlugins) then else CDir $(SqPlugins) +pluginDir: + @ifthere $(SqPlugins) then else CDir $(SqPlugins) @ifthere @.o then else CDir @.o plugins: $(pluginList) pluginDir @@ -72,18 +72,18 @@ @.vm.o.sqNamedPrims @.vm.o.sqRPCClipboard @.vm.o.sqRPCVersion \ @.vm.o.sqRPCEvents @.vm.o.sqRPCExternalPrims @.vm.o.sqRPCFormPrint \ @.vm.o.sqRPCWindows @.vm.o.sqVirtualMachine @.vm.o.osExports \ - @.vm.o.fperrors OSLib:o.OSLib32 C:o.stubs @.vm.o.ptrblock C:^.rink.o.rink_rtsys + @.vm.o.fperrors OSLib:o.OSLib32 C:o.stubs @.vm.o.ptrblock C:^.rink.o.rink_rtsys link $(linkflags) @.vm.o.sqRPCMain @.vm.o.interp @.vm.o.sqArgument \ @.vm.o.sqNamedPrims @.vm.o.sqRPCClipboard @.vm.o.sqRPCVersion \ @.vm.o.sqRPCEvents @.vm.o.sqRPCExternalPrims @.vm.o.sqRPCFormPrint \ @.vm.o.sqRPCWindows @.vm.o.sqVirtualMachine @.vm.o.osExports \ - @.vm.o.fperrors OSLib:o.OSLib32 C:o.stubs @.vm.o.ptrblock C:^.rink.o.rink_rtsys + @.vm.o.fperrors OSLib:o.OSLib32 C:o.stubs @.vm.o.ptrblock C:^.rink.o.rink_rtsys # extract the link info for rink to use # relies upon the partially populated !squeak directory having been copied to # the working directory -@.vm.o.ptrblock: $(Sqk).ptrblkmap +@.vm.o.ptrblock: $(Sqk).ptrblkmap rinkptr $(rinkptrflags) $(Sqk).ptrblkmap @.vm.o.ptrblock $(Sqk).ptrblkmap: C:o.stubs @.vm.o.sqRPCMain @.vm.o.sqRPCWindows $(PVM).dsc.block @@ -113,7 +113,7 @@ ########### # B2D Plugin -# Very simple, only the one source file +# Very simple, only the one source file ########### B2DPlugin: $(SqPlugins).B2DPlugin @echo done $* @@ -164,7 +164,7 @@ -a $(SPlug).BMPReadWriterPlugin.o.BMPReadWriterPlugin $(SPlug).BMPReadWriterPlugin.o.BMPReadWriterPlugin: $(SPlug).BMPReadWriterPlugin.c.BMPReadWriterPlugin $(PlHdr) - cc $(ccflags) -o $@ $*.c + cc $(ccflags) -o $@ $*.c ########### @@ -229,14 +229,14 @@ -m $(Sqk).ptrblkmap \ -a $(SPlug).FilePlugin.o.FilePlugin \ $(SPlug).FilePlugin.o.sqRPCDirectory \ - $(SPlug).FilePlugin.o.sqFilePluginBasicPrims + $(SPlug).FilePlugin.o.sqFilePluginBasicPrims $(SPlug).FilePlugin.o.FilePlugin: $(SPlug).FilePlugin.c.FilePlugin $(PlHdr) - cc $(ccflags) -I$(CPlug).FilePlugin -o $@ $(SPlug).FilePlugin.c.FilePlugin + cc $(ccflags) -I$(CPlug).FilePlugin -o $@ $(SPlug).FilePlugin.c.FilePlugin $(SPlug).FilePlugin.o.sqRPCDirectory: $(PPlug).FilePlugin.c.sqRPCDirectory $(PlHdr) - cc $(ccflags) -o $@ $(PPlug).FilePlugin.c.sqRPCDirectory + cc $(ccflags) -o $@ $(PPlug).FilePlugin.c.sqRPCDirectory $(SPlug).FilePlugin.o.sqFilePluginBasicPrims: $(PPlug).FilePlugin.c.sqFilePluginBasicPrims $(PlHdr) - cc $(ccflags) -I$(CPlug).FilePlugin -o $@ $(PPlug).FilePlugin.c.sqFilePluginBasicPrims + cc $(ccflags) -I$(CPlug).FilePlugin -o $@ $(PPlug).FilePlugin.c.sqFilePluginBasicPrims @@ -260,12 +260,12 @@ -h $(SPlug).FileCopyPlugin.dsc.FileCopyPlugin \ -m $(Sqk).ptrblkmap \ -a $(SPlug).FileCopyPlugin.o.FileCopyPlugin \ - $(SPlug).FileCopyPlugin.o.sqRPCFileCopy + $(SPlug).FileCopyPlugin.o.sqRPCFileCopy $(SPlug).FileCopyPlugin.o.FileCopyPlugin: $(SPlug).FileCopyPlugin.c.FileCopyPlugin $(PlHdr) - cc $(ccflags) -I$(CPlug).FileCopyPlugin -o $@ $*.c + cc $(ccflags) -I$(CPlug).FileCopyPlugin -o $@ $*.c $(SPlug).FileCopyPlugin.o.sqRPCFileCopy: $(PPlug).FileCopyPlugin.c.sqRPCFileCopy - cc $(ccflags) -o $@ $(PPlug).FileCopyPlugin.c.sqRPCFileCopy + cc $(ccflags) -o $@ $(PPlug).FileCopyPlugin.c.sqRPCFileCopy ########### @@ -323,7 +323,7 @@ -a $(SPlug).HostWindowPlugin.o.HostWindowPlugin $(SPlug).HostWindowPlugin.o.HostWindowPlugin: $(SPlug).HostWindowPlugin.c.HostWindowPlugin $(PlHdr) - cc $(ccflags) -I$(CPlug).HostWindowPlugin -o $@ $*.c + cc $(ccflags) -I$(CPlug).HostWindowPlugin -o $@ $*.c @@ -387,10 +387,10 @@ -h $(SPlug).LocalePlugin.dsc.LocalePlugin \ -m $(Sqk).ptrblkmap \ -a $(SPlug).LocalePlugin.o.LocalePlugin \ - $(SPlug).LocalePlugin.o.sqRPCLocale + $(SPlug).LocalePlugin.o.sqRPCLocale $(SPlug).LocalePlugin.o.LocalePlugin: $(SPlug).LocalePlugin.c.LocalePlugin $(PlHdr) - cc $(ccflags) -I$(CPlug).LocalePlugin -o $@ $*.c + cc $(ccflags) -I$(CPlug).LocalePlugin -o $@ $*.c $(SPlug).LocalePlugin.o.sqRPCLocale: $(PPlug).LocalePlugin.c.sqRPCLocale $(PlHdr) cc $(ccflags) -I$(CPlug).LocalePlugin -o $@ $(PPlug).LocalePlugin.c.sqRPCLocale @@ -428,7 +428,7 @@ -a $(SPlug).MiscPrimitivePlugin.o.MiscPrimitivePlugin $(SPlug).MiscPrimitivePlugin.o.MiscPrimitivePlugin: $(SPlug).MiscPrimitivePlugin.c.MiscPrimitivePlugin $(PlHdr) - cc $(ccflags) -o $@ $*.c + cc $(ccflags) -o $@ $*.c ########### # Regular expressions Plugin make rule. @@ -454,20 +454,20 @@ $(SPlug).RePlugin.o.chartables \ $(SPlug).RePlugin.o.get \ $(SPlug).RePlugin.o.pcre \ - $(SPlug).RePlugin.o.study + $(SPlug).RePlugin.o.study $(SPlug).RePlugin.o.RePlugin: $(SPlug).RePlugin.c.RePlugin $(PlHdr) cc $(ccflags) -I$(CPlug).RePlugin -o $@ $(SPlug).RePlugin.c.RePlugin - + $(SPlug).RePlugin.o.chartables: $(CPlug).RePlugin.c.chartables cc $(ccflags) -o $@ $(CPlug).RePlugin.c.chartables - + $(SPlug).RePlugin.o.get: $(CPlug).RePlugin.c.get cc $(ccflags) -o $@ $(CPlug).RePlugin.c.get $(SPlug).RePlugin.o.pcre: $(CPlug).RePlugin.c.pcre cc $(ccflags) -o $@ $(CPlug).RePlugin.c.pcre - + $(SPlug).RePlugin.o.study: $(CPlug).RePlugin.c.study cc $(ccflags) -o $@ $(CPlug).RePlugin.c.study @@ -491,10 +491,10 @@ -h $(SPlug).SecurityPlugin.dsc.SecurityPlugin \ -m $(Sqk).ptrblkmap \ -a $(SPlug).SecurityPlugin.o.SecurityPlugin \ - $(SPlug).SecurityPlugin.o.sqRPCSecurity + $(SPlug).SecurityPlugin.o.sqRPCSecurity $(SPlug).SecurityPlugin.o.SecurityPlugin: $(SPlug).SecurityPlugin.c.SecurityPlugin $(PlHdr) - cc $(ccflags) -I$(CPlug).SecurityPlugin -o $@ $*.c + cc $(ccflags) -I$(CPlug).SecurityPlugin -o $@ $*.c $(SPlug).SecurityPlugin.o.sqRPCSecurity: $(PPlug).SecurityPlugin.c.sqRPCSecurity $(PlHdr) cc $(ccflags) -I$(CPlug).SecurityPlugin -o $@ $(PPlug).SecurityPlugin.c.sqRPCSecurity @@ -506,7 +506,7 @@ # SocketPlugin.c is generated # SocketPlugin.h is in Cross # sqRPCNetPlugin.c is in RiscOS -# and the socket includes are needed as well +# and the socket includes are needed as well ########### SocketPlugin: $(SqPlugins).SocketPlugin @echo done $* @@ -527,10 +527,10 @@ ######$(SokLib)inetlibzm $(SokLib)socklib $(SokLib)unixlib $(SPlug).SocketPlugin.o.SocketPlugin: $(SPlug).SocketPlugin.c.SocketPlugin $(PlHdr) - cc $(ccflags) -I$(PPlug).SocketPlugin,$(CPlug).SocketPlugin -o $@ $(SPlug).SocketPlugin.c.SocketPlugin + cc $(ccflags) -I$(PPlug).SocketPlugin,$(CPlug).SocketPlugin -o $@ $(SPlug).SocketPlugin.c.SocketPlugin $(SPlug).SocketPlugin.o.sqRPCNetPlugin: $(PPlug).SocketPlugin.c.sqRPCNetPlugin $(PlHdr) - cc $(ccflags) -I$(PPlug).SocketPlugin,$(CPlug).SocketPlugin,$(Soklib) -o $@ $(PPlug).SocketPlugin.c.sqRPCNetPlugin + cc $(ccflags) -I$(PPlug).SocketPlugin,$(CPlug).SocketPlugin,$(Soklib) -o $@ $(PPlug).SocketPlugin.c.sqRPCNetPlugin ########### # Sound Plugin make rule. @@ -538,7 +538,6 @@ # SoundPlugin.c is generated # SoundPlugin.h is in Cross # sqRPCSound.c is in RiscOS - ########### SoundPlugin: $(SqPlugins).SoundPlugin @echo done $* @@ -551,10 +550,10 @@ -h $(SPlug).SoundPlugin.dsc.SoundPlugin \ -m $(Sqk).ptrblkmap \ -a $(SPlug).SoundPlugin.o.SoundPlugin \ - $(SPlug).SoundPlugin.o.sqRPCSound + $(SPlug).SoundPlugin.o.sqRPCSound $(SPlug).SoundPlugin.o.SoundPlugin: $(SPlug).SoundPlugin.c.SoundPlugin $(PlHdr) - cc $(ccflags) -I$(CPlug).SoundPlugin -o $@ $*.c + cc $(ccflags) -I$(CPlug).SoundPlugin -o $@ $*.c $(SPlug).SoundPlugin.o.sqRPCSound: $(PPlug).SoundPlugin.c.sqRPCSound $(PlHdr) cc $(ccflags) -I$(CPlug).SoundPlugin -o $@ $(PPlug).SoundPlugin.c.sqRPCSound @@ -587,15 +586,15 @@ $(SPlug).Squeak3D.o.Squeak3D $(SPlug).Squeak3D.o.Squeak3D: $(SPlug).Squeak3D.c.Squeak3D $(PlHdr) - cc $(ccflags) -I$(CPlug).Squeak3D -o $@ $*.c + cc $(ccflags) -I$(CPlug).Squeak3D -o $@ $*.c $(SPlug).Squeak3D.o.b3dalloc: $(CPlug).Squeak3D.c.b3dalloc - cc $(ccflags) -I$(CPlug).Squeak3D -o $@ $(CPlug).Squeak3D.c.b3dalloc + cc $(ccflags) -I$(CPlug).Squeak3D -o $@ $(CPlug).Squeak3D.c.b3dalloc $(SPlug).Squeak3D.o.b3ddraw: $(CPlug).Squeak3D.c.b3ddraw cc $(ccflags) -I$(CPlug).Squeak3D -o $@ $(CPlug).Squeak3D.c.b3ddraw $(SPlug).Squeak3D.o.b3dinit: $(CPlug).Squeak3D.c.b3dinit - cc $(ccflags) -I$(CPlug).Squeak3D -o $@ $(CPlug).Squeak3D.c.b3dinit + cc $(ccflags) -I$(CPlug).Squeak3D -o $@ $(CPlug).Squeak3D.c.b3dinit $(SPlug).Squeak3D.o.b3dmain: $(CPlug).Squeak3D.c.b3dmain - cc $(ccflags) -I$(CPlug).Squeak3D -o $@ $(CPlug).Squeak3D.c.b3dmain + cc $(ccflags) -I$(CPlug).Squeak3D -o $@ $(CPlug).Squeak3D.c.b3dmain $(SPlug).Squeak3D.o.b3dremap: $(CPlug).Squeak3D.c.b3dremap cc $(ccflags) -I$(CPlug).Squeak3D -o $@ $(CPlug).Squeak3D.c.b3dremap @@ -615,7 +614,7 @@ -a $(SPlug).StarSqueakPlugin.o.StarSqueakPlugin $(SPlug).StarSqueakPlugin.o.StarSqueakPlugin: $(SPlug).StarSqueakPlugin.c.StarSqueakPlugin $(PlHdr) - cc $(ccflags) -o $@ $*.c + cc $(ccflags) -o $@ $*.c ########### # Surface Plugin @@ -623,7 +622,7 @@ # SurfacePlugin.c & .h are BOTH on Cross # only the .dsc file is generated ########### -SurfacePlugin: $(SqPlugins).SurfacePlugin +SurfacePlugin: $(SqPlugins).SurfacePlugin @echo done $* $(SqPlugins).SurfacePlugin: $(SPlug).SurfacePlugin.o.SurfacePlugin \ @@ -635,13 +634,13 @@ -a $(SPlug).SurfacePlugin.o.SurfacePlugin $(SPlug).SurfacePlugin.o.SurfacePlugin: $(CPlug).SurfacePlugin.c.SurfacePlugin $(PlHdr) - cc $(ccflags) -I$(CPlug).SurfacePlugin -o $@ $(CPlug).SurfacePlugin.c.SurfacePlugin + cc $(ccflags) -I$(CPlug).SurfacePlugin -o $@ $(CPlug).SurfacePlugin.c.SurfacePlugin ########### # Zip Plugin -# Very simple, only the one source file -########### +# Very simple, only the one source file +########### ZipPlugin: $(SqPlugins).ZipPlugin @echo done $* @@ -661,27 +660,27 @@ # platform specific code @.vm.o.osExports: $(PVM).c.osExports cc $(ccvmflags) -o $@ $(PVM).c.osExports - + @.vm.o.sqArgument: $(PVM).c.sqArgument $(PVM).h.sqArguments $(VMHdr) cc $(ccvmflags) -o $@ $(PVM).c.sqArgument - + @.vm.o.sqRPCClipboard: $(PVM).c.sqRPCClipboard $(VMHdr) cc $(ccvmflags) -o $@ $(PVM).c.sqRPCClipboard - + @.vm.o.sqRPCEvents: $(PVM).c.sqRPCEvents $(VMHdr) cc $(ccvmflags) -o $@ $(PVM).c.sqRPCEvents - + @.vm.o.sqRPCExternalPrims: $(PVM).c.sqRPCExternalPrims $(VMHdr) cc $(ccvmflags) -o $@ $(PVM).c.sqRPCExternalPrims - + @.vm.o.sqRPCFormPrint: $(PVM).c.sqRPCFormPrint $(VMHdr) cc $(ccvmflags) -o $@ $(PVM).c.sqRPCFormPrint - + @.vm.o.sqRPCSyscall: $(PVM).c.sqRPCSyscall $(VMHdr) cc $(ccvmflags) -o $@ $(PVM).c.sqRPCSysCall # sqRPCVersion depends on all the obj files (except its own) -# so that it will always be recompiled if any other file is +# so that it will always be recompiled if any other file is @.vm.o.sqRPCVersion: $(PVM).c.sqRPCVersion @.vm.o.interp @.vm.o.sqArgument \ @.vm.o.sqNamedPrims @.vm.o.sqRPCClipboard \ @.vm.o.sqRPCEvents @.vm.o.sqRPCExternalPrims @.vm.o.sqRPCFormPrint \ @@ -701,14 +700,14 @@ # cross platform code @.vm.o.sqNamedPrims: $(CVM).c.sqNamedPrims $(VMHdr) cc $(ccvmflags) -o $@ $(CVM).c.sqNamedPrims - + @.vm.o.sqVirtualMachine: $(CVM).c.sqVirtualMachine $(VMHdr) cc $(ccvmflags) -o $@ $(CVM).c.sqVirtualMachine - + @.vm.o.interp: $(SVM).c.interp $(VMHdr) cc $(ccvmflags) -o $@ $(SVM).c.interp - + # Dynamic dependencies: Added: trunk/platforms/RiscOS/misc/ToCopy/READMERIGHTNOW =================================================================== --- trunk/platforms/RiscOS/misc/ToCopy/READMERIGHTNOW (rev 0) +++ trunk/platforms/RiscOS/misc/ToCopy/READMERIGHTNOW 2013-01-10 00:04:43 UTC (rev 2665) @@ -0,0 +1,16 @@ +What to do next + +This zipfile contains the basic !Squeak application; before you can do anything useful with it you will need to + +1) fetch three files +a) the image and changelog files. + The image file is the recorded state of a Squeak system and the changelog is a matching audit trail of what code changes have been made since a certain point in time. You can obtain those two files from the www.squeak.org site and visiting the downloads page and then going to the FTP archive - specifially ftp.squeak.org/4.0/Squeak4.0-basic.zip +b) the sources file. + This is not the sources for the !Squeak application but for the Smalltalk system code. This file is large and has all the Smalltalk code, all the class definitions and comments, for the system. It does not change very often and is not written to by the running system. It too can be obtained from the Squeak site, specifically ftp.squeak.org/4.0/SqueakV40.sources.gz +2) unzip the Squeak4.0-basic.zip file. + You should end up with a file Squeak4/0-basic/image of size 13478196 bytes, and another file Squeak4/0-basic/changes of size 694 bytes. Change the filetype of the Squeak4/0-basic/image file to faa (STimage). If you don't know how to do this you will need to read that fine manual for RISC OS. +3) unzip the SqueakV40/sources/gz file - depending on exctly how you downloaded it you may find that it has already been decompressed. I don't know why that seems to happen. You should end up with SqueakV40/sources file of size 16748347 bytes. +4) move the SqueakV40/sources file *into the !Squeak application*. If you don't know how to do this you will need to read that fine manual for RISC OS. +5) While you have the aplication directory open, take a moment to *read the frickin !Help file* + +Now, you have an installation that can run. Double-click on the Squeak4/0-basic/image file and wait a moment for it to be read in and started up. You should see a medium sized window labelled with the path of the image file and containing a number of slightly odd looking windows. For further help, read the contents of the www.squeak.org site, join the mailing list(s) and ask questions. \ No newline at end of file

1 0

[commit][2664] CogVm source as per VMMaker.oscog-eem.252.
by commits＠squeakvm.org 09 Jan '13

09 Jan '13

Revision: 2664 Author: eliot Date: 2013-01-08 18:14:39 -0800 (Tue, 08 Jan 2013) Log Message: ----------- CogVm source as per VMMaker.oscog-eem.252. Issue 117. Fix primitiveRemLargeIntegers. The result should be negated iff receiver negative. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2013-01-09 02:01:40 UTC (rev 2663) +++ branches/Cog/nscogsrc/vm/cointerp.c 2013-01-09 02:14:39 UTC (rev 2664) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.252 uuid: 50d6c392-d32d-49a5-9251-32ad9c299572 from - CoInterpreter VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 + CoInterpreter VMMaker.oscog-eem.252 uuid: 50d6c392-d32d-49a5-9251-32ad9c299572 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.252 uuid: 50d6c392-d32d-49a5-9251-32ad9c299572 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1928,7 +1928,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.251"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.252"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -39461,7 +39461,6 @@ usqLong a; sqInt aIsNegative; usqLong b; - sqInt bIsNegative; sqInt oopArg; sqInt oopRcvr; sqInt oopResult; @@ -39471,7 +39470,6 @@ oopArg = longAt(GIV(stackPointer) + (0 * BytesPerWord)); oopRcvr = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aIsNegative = isNegativeIntegerValueOf(oopRcvr); - bIsNegative = isNegativeIntegerValueOf(oopArg); a = magnitude64BitValueOf(oopRcvr); b = magnitude64BitValueOf(oopArg); if (b == 0) { @@ -39484,7 +39482,7 @@ return; } result = a % b; - oopResult = magnitude64BitIntegerForneg(result, aIsNegative != bIsNegative); + oopResult = magnitude64BitIntegerForneg(result, aIsNegative); if (!GIV(primFailCode)) { /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), oopResult); Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2013-01-09 02:01:40 UTC (rev 2663) +++ branches/Cog/nscogsrc/vm/cointerp.h 2013-01-09 02:14:39 UTC (rev 2664) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.252 uuid: 50d6c392-d32d-49a5-9251-32ad9c299572 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-01-09 02:01:40 UTC (rev 2663) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-01-09 02:14:39 UTC (rev 2664) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.252 uuid: 50d6c392-d32d-49a5-9251-32ad9c299572 from - CoInterpreter VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 + CoInterpreter VMMaker.oscog-eem.252 uuid: 50d6c392-d32d-49a5-9251-32ad9c299572 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.252 uuid: 50d6c392-d32d-49a5-9251-32ad9c299572 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1931,7 +1931,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.251"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.252"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -39470,7 +39470,6 @@ usqLong a; sqInt aIsNegative; usqLong b; - sqInt bIsNegative; sqInt oopArg; sqInt oopRcvr; sqInt oopResult; @@ -39480,7 +39479,6 @@ oopArg = longAt(GIV(stackPointer) + (0 * BytesPerWord)); oopRcvr = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aIsNegative = isNegativeIntegerValueOf(oopRcvr); - bIsNegative = isNegativeIntegerValueOf(oopArg); a = magnitude64BitValueOf(oopRcvr); b = magnitude64BitValueOf(oopArg); if (b == 0) { @@ -39493,7 +39491,7 @@ return; } result = a % b; - oopResult = magnitude64BitIntegerForneg(result, aIsNegative != bIsNegative); + oopResult = magnitude64BitIntegerForneg(result, aIsNegative); if (!GIV(primFailCode)) { /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), oopResult); Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2013-01-09 02:01:40 UTC (rev 2663) +++ branches/Cog/nscogsrc/vm/interp.h 2013-01-09 02:14:39 UTC (rev 2664) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.252 uuid: 50d6c392-d32d-49a5-9251-32ad9c299572 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2013-01-09 02:01:40 UTC (rev 2663) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2013-01-09 02:14:39 UTC (rev 2664) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.252 uuid: 50d6c392-d32d-49a5-9251-32ad9c299572 */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue Jan 8 13:54:09 PST 2013 + Tue Jan 8 18:13:58 PST 2013 Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2013-01-09 02:01:40 UTC (rev 2663) +++ branches/Cog/src/vm/cointerp.c 2013-01-09 02:14:39 UTC (rev 2664) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.252 uuid: 50d6c392-d32d-49a5-9251-32ad9c299572 from - CoInterpreter VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 + CoInterpreter VMMaker.oscog-eem.252 uuid: 50d6c392-d32d-49a5-9251-32ad9c299572 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.252 uuid: 50d6c392-d32d-49a5-9251-32ad9c299572 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1918,7 +1918,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.251]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.252]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -34952,7 +34952,6 @@ usqLong a; sqInt aIsNegative; usqLong b; - sqInt bIsNegative; sqInt oopArg; sqInt oopRcvr; sqInt oopResult; @@ -34962,7 +34961,6 @@ oopArg = longAt(GIV(stackPointer) + (0 * BytesPerWord)); oopRcvr = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aIsNegative = isNegativeIntegerValueOf(oopRcvr); - bIsNegative = isNegativeIntegerValueOf(oopArg); a = magnitude64BitValueOf(oopRcvr); b = magnitude64BitValueOf(oopArg); if (b == 0) { @@ -34975,7 +34973,7 @@ return; } result = a % b; - oopResult = magnitude64BitIntegerForneg(result, aIsNegative != bIsNegative); + oopResult = magnitude64BitIntegerForneg(result, aIsNegative); if (!GIV(primFailCode)) { /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), oopResult); Modified: branches/Cog/src/vm/cointerp.h =================================================================== --- branches/Cog/src/vm/cointerp.h 2013-01-09 02:01:40 UTC (rev 2663) +++ branches/Cog/src/vm/cointerp.h 2013-01-09 02:14:39 UTC (rev 2664) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.252 uuid: 50d6c392-d32d-49a5-9251-32ad9c299572 */ Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2013-01-09 02:01:40 UTC (rev 2663) +++ branches/Cog/src/vm/cointerpmt.c 2013-01-09 02:14:39 UTC (rev 2664) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.252 uuid: 50d6c392-d32d-49a5-9251-32ad9c299572 from - CoInterpreterMT VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 + CoInterpreterMT VMMaker.oscog-eem.252 uuid: 50d6c392-d32d-49a5-9251-32ad9c299572 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.252 uuid: 50d6c392-d32d-49a5-9251-32ad9c299572 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2017,7 +2017,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.251]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.252]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -36283,7 +36283,6 @@ usqLong a; sqInt aIsNegative; usqLong b; - sqInt bIsNegative; sqInt oopArg; sqInt oopRcvr; sqInt oopResult; @@ -36293,7 +36292,6 @@ oopArg = longAt(GIV(stackPointer) + (0 * BytesPerWord)); oopRcvr = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aIsNegative = isNegativeIntegerValueOf(oopRcvr); - bIsNegative = isNegativeIntegerValueOf(oopArg); a = magnitude64BitValueOf(oopRcvr); b = magnitude64BitValueOf(oopArg); if (b == 0) { @@ -36306,7 +36304,7 @@ return; } result = a % b; - oopResult = magnitude64BitIntegerForneg(result, aIsNegative != bIsNegative); + oopResult = magnitude64BitIntegerForneg(result, aIsNegative); if (!GIV(primFailCode)) { /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), oopResult); Modified: branches/Cog/src/vm/cointerpmt.h =================================================================== --- branches/Cog/src/vm/cointerpmt.h 2013-01-09 02:01:40 UTC (rev 2663) +++ branches/Cog/src/vm/cointerpmt.h 2013-01-09 02:14:39 UTC (rev 2664) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.252 uuid: 50d6c392-d32d-49a5-9251-32ad9c299572 */ Modified: branches/Cog/src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerp.c 2013-01-09 02:01:40 UTC (rev 2663) +++ branches/Cog/src/vm/gcc3x-cointerp.c 2013-01-09 02:14:39 UTC (rev 2664) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.252 uuid: 50d6c392-d32d-49a5-9251-32ad9c299572 from - CoInterpreter VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 + CoInterpreter VMMaker.oscog-eem.252 uuid: 50d6c392-d32d-49a5-9251-32ad9c299572 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.252 uuid: 50d6c392-d32d-49a5-9251-32ad9c299572 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1921,7 +1921,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.251]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.252]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -34961,7 +34961,6 @@ usqLong a; sqInt aIsNegative; usqLong b; - sqInt bIsNegative; sqInt oopArg; sqInt oopRcvr; sqInt oopResult; @@ -34971,7 +34970,6 @@ oopArg = longAt(GIV(stackPointer) + (0 * BytesPerWord)); oopRcvr = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aIsNegative = isNegativeIntegerValueOf(oopRcvr); - bIsNegative = isNegativeIntegerValueOf(oopArg); a = magnitude64BitValueOf(oopRcvr); b = magnitude64BitValueOf(oopArg); if (b == 0) { @@ -34984,7 +34982,7 @@ return; } result = a % b; - oopResult = magnitude64BitIntegerForneg(result, aIsNegative != bIsNegative); + oopResult = magnitude64BitIntegerForneg(result, aIsNegative); if (!GIV(primFailCode)) { /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), oopResult); Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-01-09 02:01:40 UTC (rev 2663) +++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-01-09 02:14:39 UTC (rev 2664) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.252 uuid: 50d6c392-d32d-49a5-9251-32ad9c299572 from - CoInterpreterMT VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 + CoInterpreterMT VMMaker.oscog-eem.252 uuid: 50d6c392-d32d-49a5-9251-32ad9c299572 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.252 uuid: 50d6c392-d32d-49a5-9251-32ad9c299572 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2020,7 +2020,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.251]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.252]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -36292,7 +36292,6 @@ usqLong a; sqInt aIsNegative; usqLong b; - sqInt bIsNegative; sqInt oopArg; sqInt oopRcvr; sqInt oopResult; @@ -36302,7 +36301,6 @@ oopArg = longAt(GIV(stackPointer) + (0 * BytesPerWord)); oopRcvr = longAt(GIV(stackPointer) + (1 * BytesPerWord)); aIsNegative = isNegativeIntegerValueOf(oopRcvr); - bIsNegative = isNegativeIntegerValueOf(oopArg); a = magnitude64BitValueOf(oopRcvr); b = magnitude64BitValueOf(oopArg); if (b == 0) { @@ -36315,7 +36313,7 @@ return; } result = a % b; - oopResult = magnitude64BitIntegerForneg(result, aIsNegative != bIsNegative); + oopResult = magnitude64BitIntegerForneg(result, aIsNegative); if (!GIV(primFailCode)) { /* begin pop:thenPush: */ longAtput((sp = GIV(stackPointer) + ((2 - 1) * BytesPerWord)), oopResult); Modified: branches/Cog/src/vm/interp.h =================================================================== --- branches/Cog/src/vm/interp.h 2013-01-09 02:01:40 UTC (rev 2663) +++ branches/Cog/src/vm/interp.h 2013-01-09 02:14:39 UTC (rev 2664) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.252 uuid: 50d6c392-d32d-49a5-9251-32ad9c299572 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/src/vm/vmCallback.h =================================================================== --- branches/Cog/src/vm/vmCallback.h 2013-01-09 02:01:40 UTC (rev 2663) +++ branches/Cog/src/vm/vmCallback.h 2013-01-09 02:14:39 UTC (rev 2664) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.252 uuid: 50d6c392-d32d-49a5-9251-32ad9c299572 */ #define VM_CALLBACK_INC 1

1 0

VM Maker: VMMaker.oscog-eem.252.mcz
by commits＠source.squeak.org 09 Jan '13

09 Jan '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.252.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.252 Author: eem Time: 8 January 2013, 6:08:27.042 pm UUID: 50d6c392-d32d-49a5-9251-32ad9c299572 Ancestors: VMMaker.oscog-eem.251 Issue 117. Fix primitiveRemLargeIntegers. The result should be negated iff receiver negative. =============== Diff against VMMaker.oscog-eem.251 =============== Item was changed: ----- Method: InterpreterPrimitives>>primitiveRemLargeIntegers (in category 'arithmetic largeint primitives') ----- primitiveRemLargeIntegers "Primitive arithmetic operations for large integers in 64 bit range" + | result oopResult a aIsNegative b oopArg oopRcvr | - | result oopResult a aIsNegative b bIsNegative oopArg oopRcvr | <export: true> <var: 'a' type: 'usqLong'> <var: 'b' type: 'usqLong'> <var: 'result' type: 'usqLong'> oopArg := self stackValue: 0. oopRcvr := self stackValue: 1. aIsNegative := self isNegativeIntegerValueOf: oopRcvr. - bIsNegative := self isNegativeIntegerValueOf: oopArg. a := self magnitude64BitValueOf: oopRcvr. b := self magnitude64BitValueOf: oopArg. b = 0 ifTrue:[self primitiveFail]. self successful ifFalse:[^nil]. result := a \\ b. + oopResult := self magnitude64BitIntegerFor: result neg: aIsNegative. - oopResult := self magnitude64BitIntegerFor: result neg: aIsNegative ~= bIsNegative. self successful ifTrue: [self pop: 2 thenPush: oopResult].!

1 0

VM Maker: VMMaker-dtl.296.mcz
by commits＠source.squeak.org 09 Jan '13

09 Jan '13

David T. Lewis uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-dtl.296.mcz ==================== Summary ==================== Name: VMMaker-dtl.296 Author: dtl Time: 8 January 2013, 8:57:03.954 pm UUID: e4c9a45b-3d6d-494e-98d8-dc6d90ea5460 Ancestors: VMMaker-dtl.295 VMMaker 4.10.10 Fix copy and paste bug in primitiveRemLargeIntegers. Reference http://code.google.com/p/cog/issues/detail?id=117 =============== Diff against VMMaker-dtl.295 =============== Item was changed: ----- Method: InterpreterPrimitives>>primitiveRemLargeIntegers (in category 'arithmetic largeint primitives') ----- primitiveRemLargeIntegers "Primitive arithmetic operations for large integers in 64 bit range" + | result oopResult a aIsNegative b oopArg oopRcvr | - | result oopResult a aIsNegative b bIsNegative oopArg oopRcvr | <export: true> <var: 'a' type: 'usqLong'> <var: 'b' type: 'usqLong'> <var: 'result' type: 'usqLong'> oopArg := self stackValue: 0. oopRcvr := self stackValue: 1. aIsNegative := self isNegativeIntegerValueOf: oopRcvr. - bIsNegative := self isNegativeIntegerValueOf: oopArg. a := self magnitude64BitValueOf: oopRcvr. b := self magnitude64BitValueOf: oopArg. b = 0 ifTrue:[self primitiveFail]. self successful ifFalse:[^nil]. result := a \\ b. + oopResult := self magnitude64BitIntegerFor: result neg: aIsNegative. - oopResult := self magnitude64BitIntegerFor: result neg: aIsNegative ~= bIsNegative. self successful ifTrue: [self pop: 2 thenPush: oopResult].! Item was changed: ----- Method: VMMaker class>>versionString (in category 'version testing') ----- versionString "VMMaker versionString" + ^'4.10.10'! - ^'4.10.9'!

1 0

[commit][2661] Add yet another libc line to the linux launch script(s), and try and make the
by commits＠squeakvm.org 09 Jan '13

09 Jan '13

Revision: 2661 Author: eliot Date: 2013-01-08 11:57:41 -0800 (Tue, 08 Jan 2013) Log Message: ----------- Add yet another libc line to the linux launch script(s), and try and make the script suggest users extend it themselves. you can lead a horse to water... Rationalize the includes in sqUnixUUID.c. Modified Paths: -------------- branches/Cog/platforms/unix/config/bin.squeak.sh.in branches/Cog/platforms/unix/config/squeak.sh.in branches/Cog/platforms/unix/plugins/UUIDPlugin/sqUnixUUID.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Mon Jan 7 13:52:47 PST 2013 + Tue Jan 8 11:56:08 PST 2013 Modified: branches/Cog/platforms/unix/config/bin.squeak.sh.in =================================================================== --- branches/Cog/platforms/unix/config/bin.squeak.sh.in 2013-01-07 21:54:37 UTC (rev 2660) +++ branches/Cog/platforms/unix/config/bin.squeak.sh.in 2013-01-08 19:57:41 UTC (rev 2661) @@ -14,15 +14,18 @@ # libc (e.g. through the FFI) then it must use the same version that the VM uses # and so it should take precedence over /lib libc. This is done by setting # LD_LIBRARY_PATH appropriately, based on ldd's idea of the libc use by the VM. -case `/usr/bin/ldd "$BIN/squeak" | /bin/fgrep /libc. | sed 's/^.*=> //'` in +LIBC_SO="`/usr/bin/ldd "$BIN/squeak" | /bin/fgrep /libc. | sed 's/^.*=> //'`" +case "$LIBC_SO" in /lib/libc*) SVMLLP="/lib:/usr/lib";; /lib32/libc*) SVMLLP="/lib32:/usr/lib32";; /lib64/libc*) SVMLLP="/lib64:/usr/lib64";; /lib/tls/libc*) SVMLLP="/lib/tls:/lib:/usr/lib/tls:/usr/lib";; /lib/i386-linux-gnu/libc*) \ - SVMLLP="/lib/i386-linux-gnu:/usr/lib/i386-linux-gnu";; + SVMLLP="/lib/i386-linux-gnu:/lib:/usr/lib/i386-linux-gnu:/usr/lib";; /lib/tls/i686/cmov/libc*) \ SVMLLP="/lib/tls/i686/cmov:/lib:/usr/lib/tls/i686/cmov:/usr/lib";; +/lib/386-linux-gnu/i686/cmov/libc*) \ + SVMLLP="/lib/386-linux-gnu/i686/cmov:/lib:/usr/lib/386-linux-gnu/i686/cmov:/usr/lib";; /lib/tls/i686/nosegneg/libc*) \ SVMLLP="/lib/i686/nosegneg/tls:/lib:/usr/lib/i686/nosegneg/tls:/usr/lib";; "") case `/bin/uname -m || /usr/bin/uname -m` in @@ -30,7 +33,7 @@ *) echo "/usr/bin/ldd didn't produce any output. Can't infer base LD_LIBRARY_PATH. Aborting." 1>&2 esac exit 1;; -*) echo "Can't infer base LD_LIBRARY_PATH. Aborting." 1>&2 +*) echo "Can't infer base LD_LIBRARY_PATH. Aborting. Try adding a line for $LIBC_SO to $0. Please report your edit to squeak vm-dev." 1>&2 exit 1 esac # prepending is less flexible but safer because it ensures we find the plugins Modified: branches/Cog/platforms/unix/config/squeak.sh.in =================================================================== --- branches/Cog/platforms/unix/config/squeak.sh.in 2013-01-07 21:54:37 UTC (rev 2660) +++ branches/Cog/platforms/unix/config/squeak.sh.in 2013-01-08 19:57:41 UTC (rev 2661) @@ -14,15 +14,18 @@ # libc (e.g. through the FFI) then it must use the same version that the VM uses # and so it should take precedence over /lib libc. This is done by setting # LD_LIBRARY_PATH appropriately, based on ldd's idea of the libc use by the VM. -case `/usr/bin/ldd "$BIN/squeak" | /bin/fgrep /libc. | sed 's/^.*=> //'` in +LIBC_SO="`/usr/bin/ldd "$BIN/squeak" | /bin/fgrep /libc. | sed 's/^.*=> //'`" +case "$LIBC_SO" in /lib/libc*) SVMLLP="/lib:/usr/lib";; /lib32/libc*) SVMLLP="/lib32:/usr/lib32";; /lib64/libc*) SVMLLP="/lib64:/usr/lib64";; /lib/tls/libc*) SVMLLP="/lib/tls:/lib:/usr/lib/tls:/usr/lib";; /lib/i386-linux-gnu/libc*) \ - SVMLLP="/lib/i386-linux-gnu:/usr/lib/i386-linux-gnu";; + SVMLLP="/lib/i386-linux-gnu:/lib:/usr/lib/i386-linux-gnu:/usr/lib";; /lib/tls/i686/cmov/libc*) \ SVMLLP="/lib/tls/i686/cmov:/lib:/usr/lib/tls/i686/cmov:/usr/lib";; +/lib/386-linux-gnu/i686/cmov/libc*) \ + SVMLLP="/lib/386-linux-gnu/i686/cmov:/lib:/usr/lib/386-linux-gnu/i686/cmov:/usr/lib";; /lib/tls/i686/nosegneg/libc*) \ SVMLLP="/lib/i686/nosegneg/tls:/lib:/usr/lib/i686/nosegneg/tls:/usr/lib";; "") case `/bin/uname -m || /usr/bin/uname -m` in @@ -30,7 +33,7 @@ *) echo "/usr/bin/ldd didn't produce any output. Can't infer base LD_LIBRARY_PATH. Aborting." 1>&2 esac exit 1;; -*) echo "Can't infer base LD_LIBRARY_PATH. Aborting." 1>&2 +*) echo "Can't infer base LD_LIBRARY_PATH. Aborting. Try adding a line for $LIBC_SO to $0. Please report your edit to squeak vm-dev." 1>&2 exit 1 esac # prepending is less flexible but safer because it ensures we find the plugins Modified: branches/Cog/platforms/unix/plugins/UUIDPlugin/sqUnixUUID.c =================================================================== --- branches/Cog/platforms/unix/plugins/UUIDPlugin/sqUnixUUID.c 2013-01-07 21:54:37 UTC (rev 2660) +++ branches/Cog/platforms/unix/plugins/UUIDPlugin/sqUnixUUID.c 2013-01-08 19:57:41 UTC (rev 2661) @@ -3,12 +3,12 @@ #if defined(HAVE_SYS_UUID_H) # include <sys/types.h> # include <sys/uuid.h> -#endif -#if defined(HAVE_UUID_UUID_H) +#elif defined(HAVE_UUID_UUID_H) # include <uuid/uuid.h> -#endif -#if defined(HAVE_UUID_H) +#elif defined(HAVE_UUID_H) # include <uuid.h> +#else +# error cannot find a uuid.h to include #endif #include "sq.h"

3 3

[commit][2662] Cog VM source as per VMMsker.oscog-eem.251.
by commits＠squeakvm.org 08 Jan '13

08 Jan '13

Revision: 2662 Author: eliot Date: 2013-01-08 13:55:32 -0800 (Tue, 08 Jan 2013) Log Message: ----------- Cog VM source as per VMMsker.oscog-eem.251. Give primitiveRemLargeIntegers primitive # 20. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2013-01-08 19:57:41 UTC (rev 2661) +++ branches/Cog/nscogsrc/vm/cointerp.c 2013-01-08 21:55:32 UTC (rev 2662) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 from - CoInterpreter VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + CoInterpreter VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -934,7 +934,7 @@ static void primitiveQuo(void); EXPORT(void) primitiveQuoLargeIntegers(void); static void primitiveRelinquishProcessor(void); -EXPORT(sqInt) primitiveRemLargeIntegers(void); +EXPORT(void) primitiveRemLargeIntegers(void); static void primitiveResume(void); EXPORT(sqInt) primitiveRootTable(void); EXPORT(sqInt) primitiveRootTableAt(void); @@ -1369,7 +1369,7 @@ /* 17 */ primitiveBitShift, /* 18 */ primitiveMakePoint, /* 19 */ (void (*)(void))0, - /* 20 */ (void (*)(void))0, + /* 20 */ primitiveRemLargeIntegers, /* 21 */ primitiveAddLargeIntegers, /* 22 */ primitiveSubtractLargeIntegers, /* 23 */ primitiveLessThanLargeIntegers, @@ -1928,7 +1928,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.248"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.251"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -39455,7 +39455,7 @@ /* Primitive arithmetic operations for large integers in 64 bit range */ -EXPORT(sqInt) +EXPORT(void) primitiveRemLargeIntegers(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT usqLong a; @@ -39481,7 +39481,7 @@ } } if (!(!GIV(primFailCode))) { - return null; + return; } result = a % b; oopResult = magnitude64BitIntegerForneg(result, aIsNegative != bIsNegative); Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2013-01-08 19:57:41 UTC (rev 2661) +++ branches/Cog/nscogsrc/vm/cointerp.h 2013-01-08 21:55:32 UTC (rev 2662) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-01-08 19:57:41 UTC (rev 2661) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2013-01-08 21:55:32 UTC (rev 2662) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 from - CoInterpreter VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + CoInterpreter VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -937,7 +937,7 @@ static void primitiveQuo(void); EXPORT(void) primitiveQuoLargeIntegers(void); static void primitiveRelinquishProcessor(void); -EXPORT(sqInt) primitiveRemLargeIntegers(void); +EXPORT(void) primitiveRemLargeIntegers(void); static void primitiveResume(void); EXPORT(sqInt) primitiveRootTable(void); EXPORT(sqInt) primitiveRootTableAt(void); @@ -1372,7 +1372,7 @@ /* 17 */ primitiveBitShift, /* 18 */ primitiveMakePoint, /* 19 */ (void (*)(void))0, - /* 20 */ (void (*)(void))0, + /* 20 */ primitiveRemLargeIntegers, /* 21 */ primitiveAddLargeIntegers, /* 22 */ primitiveSubtractLargeIntegers, /* 23 */ primitiveLessThanLargeIntegers, @@ -1931,7 +1931,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.248"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.251"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -39464,7 +39464,7 @@ /* Primitive arithmetic operations for large integers in 64 bit range */ -EXPORT(sqInt) +EXPORT(void) primitiveRemLargeIntegers(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT usqLong a; @@ -39490,7 +39490,7 @@ } } if (!(!GIV(primFailCode))) { - return null; + return; } result = a % b; oopResult = magnitude64BitIntegerForneg(result, aIsNegative != bIsNegative); Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2013-01-08 19:57:41 UTC (rev 2661) +++ branches/Cog/nscogsrc/vm/interp.h 2013-01-08 21:55:32 UTC (rev 2662) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2013-01-08 19:57:41 UTC (rev 2661) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2013-01-08 21:55:32 UTC (rev 2662) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 */ #define VM_CALLBACK_INC 1 Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Tue Jan 8 11:56:08 PST 2013 + Tue Jan 8 13:54:09 PST 2013 Modified: branches/Cog/src/vm/cointerp.c =================================================================== --- branches/Cog/src/vm/cointerp.c 2013-01-08 19:57:41 UTC (rev 2661) +++ branches/Cog/src/vm/cointerp.c 2013-01-08 21:55:32 UTC (rev 2662) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 from - CoInterpreter VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + CoInterpreter VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -925,7 +925,7 @@ static void primitiveQuo(void); EXPORT(void) primitiveQuoLargeIntegers(void); static void primitiveRelinquishProcessor(void); -EXPORT(sqInt) primitiveRemLargeIntegers(void); +EXPORT(void) primitiveRemLargeIntegers(void); static void primitiveResume(void); EXPORT(sqInt) primitiveRootTable(void); EXPORT(sqInt) primitiveRootTableAt(void); @@ -1359,7 +1359,7 @@ /* 17 */ primitiveBitShift, /* 18 */ primitiveMakePoint, /* 19 */ (void (*)(void))0, - /* 20 */ (void (*)(void))0, + /* 20 */ primitiveRemLargeIntegers, /* 21 */ primitiveAddLargeIntegers, /* 22 */ primitiveSubtractLargeIntegers, /* 23 */ primitiveLessThanLargeIntegers, @@ -1918,7 +1918,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.248]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.251]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -34946,7 +34946,7 @@ /* Primitive arithmetic operations for large integers in 64 bit range */ -EXPORT(sqInt) +EXPORT(void) primitiveRemLargeIntegers(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT usqLong a; @@ -34972,7 +34972,7 @@ } } if (!(!GIV(primFailCode))) { - return null; + return; } result = a % b; oopResult = magnitude64BitIntegerForneg(result, aIsNegative != bIsNegative); Modified: branches/Cog/src/vm/cointerp.h =================================================================== --- branches/Cog/src/vm/cointerp.h 2013-01-08 19:57:41 UTC (rev 2661) +++ branches/Cog/src/vm/cointerp.h 2013-01-08 21:55:32 UTC (rev 2662) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 */ Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2013-01-08 19:57:41 UTC (rev 2661) +++ branches/Cog/src/vm/cointerpmt.c 2013-01-08 21:55:32 UTC (rev 2662) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 from - CoInterpreterMT VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + CoInterpreterMT VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -989,7 +989,7 @@ static void primitiveQuo(void); EXPORT(void) primitiveQuoLargeIntegers(void); static void primitiveRelinquishProcessor(void); -EXPORT(sqInt) primitiveRemLargeIntegers(void); +EXPORT(void) primitiveRemLargeIntegers(void); static void primitiveResume(void); EXPORT(sqInt) primitiveRootTable(void); EXPORT(sqInt) primitiveRootTableAt(void); @@ -1458,7 +1458,7 @@ /* 17 */ primitiveBitShift, /* 18 */ primitiveMakePoint, /* 19 */ (void (*)(void))0, - /* 20 */ (void (*)(void))0, + /* 20 */ primitiveRemLargeIntegers, /* 21 */ primitiveAddLargeIntegers, /* 22 */ primitiveSubtractLargeIntegers, /* 23 */ primitiveLessThanLargeIntegers, @@ -2017,7 +2017,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.248]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.251]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -36277,7 +36277,7 @@ /* Primitive arithmetic operations for large integers in 64 bit range */ -EXPORT(sqInt) +EXPORT(void) primitiveRemLargeIntegers(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT usqLong a; @@ -36303,7 +36303,7 @@ } } if (!(!GIV(primFailCode))) { - return null; + return; } result = a % b; oopResult = magnitude64BitIntegerForneg(result, aIsNegative != bIsNegative); Modified: branches/Cog/src/vm/cointerpmt.h =================================================================== --- branches/Cog/src/vm/cointerpmt.h 2013-01-08 19:57:41 UTC (rev 2661) +++ branches/Cog/src/vm/cointerpmt.h 2013-01-08 21:55:32 UTC (rev 2662) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 */ Modified: branches/Cog/src/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerp.c 2013-01-08 19:57:41 UTC (rev 2661) +++ branches/Cog/src/vm/gcc3x-cointerp.c 2013-01-08 21:55:32 UTC (rev 2662) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 from - CoInterpreter VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + CoInterpreter VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -928,7 +928,7 @@ static void primitiveQuo(void); EXPORT(void) primitiveQuoLargeIntegers(void); static void primitiveRelinquishProcessor(void); -EXPORT(sqInt) primitiveRemLargeIntegers(void); +EXPORT(void) primitiveRemLargeIntegers(void); static void primitiveResume(void); EXPORT(sqInt) primitiveRootTable(void); EXPORT(sqInt) primitiveRootTableAt(void); @@ -1362,7 +1362,7 @@ /* 17 */ primitiveBitShift, /* 18 */ primitiveMakePoint, /* 19 */ (void (*)(void))0, - /* 20 */ (void (*)(void))0, + /* 20 */ primitiveRemLargeIntegers, /* 21 */ primitiveAddLargeIntegers, /* 22 */ primitiveSubtractLargeIntegers, /* 23 */ primitiveLessThanLargeIntegers, @@ -1921,7 +1921,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.248]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.251]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -34955,7 +34955,7 @@ /* Primitive arithmetic operations for large integers in 64 bit range */ -EXPORT(sqInt) +EXPORT(void) primitiveRemLargeIntegers(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT usqLong a; @@ -34981,7 +34981,7 @@ } } if (!(!GIV(primFailCode))) { - return null; + return; } result = a % b; oopResult = magnitude64BitIntegerForneg(result, aIsNegative != bIsNegative); Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-01-08 19:57:41 UTC (rev 2661) +++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2013-01-08 21:55:32 UTC (rev 2662) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 from - CoInterpreterMT VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + CoInterpreterMT VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -992,7 +992,7 @@ static void primitiveQuo(void); EXPORT(void) primitiveQuoLargeIntegers(void); static void primitiveRelinquishProcessor(void); -EXPORT(sqInt) primitiveRemLargeIntegers(void); +EXPORT(void) primitiveRemLargeIntegers(void); static void primitiveResume(void); EXPORT(sqInt) primitiveRootTable(void); EXPORT(sqInt) primitiveRootTableAt(void); @@ -1461,7 +1461,7 @@ /* 17 */ primitiveBitShift, /* 18 */ primitiveMakePoint, /* 19 */ (void (*)(void))0, - /* 20 */ (void (*)(void))0, + /* 20 */ primitiveRemLargeIntegers, /* 21 */ primitiveAddLargeIntegers, /* 22 */ primitiveSubtractLargeIntegers, /* 23 */ primitiveLessThanLargeIntegers, @@ -2020,7 +2020,7 @@ 0 }; static void (*externalPrimitiveTable[MaxExternalPrimitiveTableSize + 1 /* 4097 */])(void); static usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.248]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.251]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -36286,7 +36286,7 @@ /* Primitive arithmetic operations for large integers in 64 bit range */ -EXPORT(sqInt) +EXPORT(void) primitiveRemLargeIntegers(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT usqLong a; @@ -36312,7 +36312,7 @@ } } if (!(!GIV(primFailCode))) { - return null; + return; } result = a % b; oopResult = magnitude64BitIntegerForneg(result, aIsNegative != bIsNegative); Modified: branches/Cog/src/vm/interp.h =================================================================== --- branches/Cog/src/vm/interp.h 2013-01-08 19:57:41 UTC (rev 2661) +++ branches/Cog/src/vm/interp.h 2013-01-08 21:55:32 UTC (rev 2662) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/src/vm/vmCallback.h =================================================================== --- branches/Cog/src/vm/vmCallback.h 2013-01-08 19:57:41 UTC (rev 2661) +++ branches/Cog/src/vm/vmCallback.h 2013-01-08 21:55:32 UTC (rev 2662) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.251 uuid: beb7dbb2-ac3b-4628-8fca-330de6592c00 */ #define VM_CALLBACK_INC 1

1 0

Squeak Oversight Board Election 2013
by Ron Teitelbaum 08 Jan '13

08 Jan '13

Hi All, Its that time again. First I would like to take a moment to thank Göran for running the elections all these past years. I would also like to thank you for your vote of confidence in letting me step in to run the elections. I hope that I can live up to Göran excellent example. Every year we elect the SOB (Squeak Oversight Board) consisting of seven members from our community. The current board is: http://www.squeak.org/Foundation/Board Everything about the election, including schedule and more, can be tracked here: http://wiki.squeak.org/squeak/6191 *** Now until Monday 28th of January 3PM (20.00 UTC): Nominations of SOB members and campaigning! Candidates should nominate themselves and start their campaign on the squeak-dev mailing list. Or if you nominate someone else, make sure that person really wants to run. :) I will not put anyone on the candidate list until that person makes it known on squeak-dev that he/she does run. During this period, the candidates should ideally present themselves on squeak-dev, unless they have already done so, and the community can ask questions. I encourage you to reach out to potential candidates, people that are active in the community and represent your views, and ask them to run. Some people will not run without encouragement. *** Monday 28th of January 2013 3PM (20.00 UTC): The candidate list is finalized. *** Monday 28th of January 2013 6PM (23.00 UTC): Online election starts The voting period is one week long and ballots are sent out via email. And how do you end up on the voter list? See below. :) IMPORTANT: New voters will NOT be added once the election is started. You MUST try to get on the voter list before the 28th of January 2013 or you will NOT be able to vote. If your Email has changed make sure it is changed on the list of voters before the election starts. *** Monday 4th February 6PM (23.00 UTC): Online election ends Results will be announced immediately when the election ends. -------------------------- If you were invited to vote last year you are already on the voter list, no worries! If you are a new Squeaker and wish to vote do ONE of the following: * Get a "known" Squeaker to vouch for you. If a known Squeaker sends an email to voters (at) squeak.org giving me name and email for you, then I will add you. * Send an email to voters at squeak.org yourself (and CC to squeak-dev if you like) with information/arguments showing me that you are indeed serious about voting and that you are indeed a Squeaker. And no, I don't have any hints on what you should write! :) Unless you totally screw that up, you will probably be added. And no, don't send me a 10 page essay ;) When the voting period starts all voters will receive an email with instructions and a link to the voting website. If there are any further questions, just reply *in this thread* and I will closely track it - or send email to voters (at) squeak.org which points to me. ...so let's get on with it! regards, Ron Teitelbaum

1 0

VM Maker: VMMaker.oscog-eem.251.mcz
by commits＠source.squeak.org 07 Jan '13

07 Jan '13

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.251.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.251 Author: eem Time: 7 January 2013, 2:33:11.56 pm UUID: beb7dbb2-ac3b-4628-8fca-330de6592c00 Ancestors: VMMaker.oscog-eem.250 Give primitiveRemLargeIntegers primitive # 20. =============== Diff against VMMaker.oscog-eem.250 =============== Item was changed: ----- Method: Interpreter class>>initializePrimitiveTable (in category 'initialization') ----- (excessive size, no diff calculated) Item was changed: ----- Method: NewspeakInterpreter class>>initializePrimitiveTable (in category 'initialization') ----- (excessive size, no diff calculated) Item was changed: ----- Method: StackInterpreter class>>initializePrimitiveTable (in category 'initialization') ----- (excessive size, no diff calculated)

1 0

Assign primitive number 20 to primitiveRemLargeIntegers? (was: The Trunk: Kernel-nice.725.mcz)
by David T. Lewis 07 Jan '13

07 Jan '13

On Tue, Jan 01, 2013 at 03:47:54PM +0000, commits(a)source.squeak.org wrote: > Nicolas Cellier uploaded a new version of Kernel to project The Trunk: > http://source.squeak.org/trunk/Kernel-nice.725.mcz > > ==================== Summary ==================== > > Name: Kernel-nice.725 > Author: nice > Time: 1 January 2013, 4:47:30.911 pm > UUID: 52a4994f-63bc-4f71-9f8f-6f2fad460bde > Ancestors: Kernel-nice.724 > > Fast-up large integer modulo operations (\\ and rem:) > > Implementation notes: > Quotient and remainder are computed in a single LargeIntegersPlugin primitive (see digitDiv:neg:) so it's faster to just use it. > For LargeInteger with 64 bits or less, LargeInteger primitives (31 32 33) are faster than the plugin (especially in COG) so try them first. > This results in a 2x speed up of modulo operations in 4.2.5 VM (whatever bit length), and a 2x speed up in COG VM for bit length > 64. > There is a penalty of 15% in COG for #rem: when bit length <= 64 because there is no primitiveRem... > Well, I added primitiveRem and it is in both VM branches, but it has no primitive number assigned. > If we assign a primitive number (20 ?) we can expect a 5x speed up for rem and bitLength <= 64. Should we assign primitive number 20 to primitiveRemLargeIntegers? It is in the range of numbered primitives allocated for large integer prims, and is currently unused in both the interpreter VM and Cog. I can't think of any reason not to do this, so someone please speak up if it might cause problems. Eliot, is this ok for Cog and Newspeak etc? Dave

2 2

[commit][2660] CogVM source as per VMMaker.oscog-eem.250.
by commits＠squeakvm.org 07 Jan '13

07 Jan '13

Revision: 2660 Author: eliot Date: 2013-01-07 13:54:37 -0800 (Mon, 07 Jan 2013) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.250. Fix (old) bug in ssAllocateRequiredRegMask:upThrough: that would flush entire stack if allocating any register. Implement absent receiver sends in the Cogit. Refactor pushImplicitReceiver into genGetImplicitReceiverFor: and clients and use genGetImplicitReceiverFor: for absent receiver sends. Use Arg1Reg in place of Arg0Reg in ceImplicitReceiverTrampoline. Fix CurrentImageCoInterpreterFacade for Newspeak methods. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2013-01-05 15:10:09 UTC (rev 2659) +++ branches/Cog/nscogsrc/vm/cogit.c 2013-01-07 21:54:37 UTC (rev 2660) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + CCodeGenerator VMMaker.oscog-eem.250 uuid: e0de5572-7682-4c5e-b5a0-ca2f32cf0c81 from - StackToRegisterMappingCogit VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + StackToRegisterMappingCogit VMMaker.oscog-eem.250 uuid: e0de5572-7682-4c5e-b5a0-ca2f32cf0c81 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.250 uuid: e0de5572-7682-4c5e-b5a0-ca2f32cf0c81 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -628,6 +628,7 @@ static sqInt genGetDoubleValueOfinto(sqInt srcReg, sqInt destFPReg); static sqInt genGetFixedFieldsOfPointerNonIntintoscratchReg(sqInt instReg, sqInt destReg, sqInt scratchReg); static sqInt genGetHashFieldNonIntOfasSmallIntegerInto(sqInt instReg, sqInt destReg); +static sqInt genGetImplicitReceiverFor(sqInt selector); static sqInt genGetLeafCallStackPointer(void); static void genGetLeafCallStackPointerFunction(AbstractInstruction * self_in_genGetLeafCallStackPointerFunction); static sqInt genInnerPICAbortTrampoline(char *name); @@ -752,6 +753,7 @@ static sqInt genSaveStackPointers(void); static sqInt genSecondExtendedSendBytecode(void); static sqInt genSendAbsentImplicit0ArgsBytecode(void); +static sqInt genSendAbsentImplicitnumArgs(sqInt selector, sqInt numArgs); static sqInt genSendLiteralSelector0ArgsBytecode(void); static sqInt genSendLiteralSelector1ArgBytecode(void); static sqInt genSendLiteralSelector2ArgsBytecode(void); @@ -888,6 +890,7 @@ void markMethodAndReferents(CogBlockMethod *aCogMethod); static sqInt markNSYoungObjectspcmethod(sqInt annotation, char *mcpc, sqInt cogMethod); static sqInt markYoungObjectspcmethod(sqInt annotation, char *mcpc, sqInt cogMethod); +static void marshallImplicitReceiverSendArguments(sqInt numArgs); static void marshallSendArguments(sqInt numArgs); usqInt maxCogMethodAddress(void); static sqInt maybeFreeCogMethodDoesntLookKosher(CogMethod *cogMethod); @@ -909,6 +912,7 @@ static sqInt noCogMethodsMaximallyMarked(void); static void nopsFromto(AbstractInstruction * self_in_nopsFromto, sqInt startAddr, sqInt endAddr); static sqInt noTargetsFreeInClosedPIC(CogMethod *cPIC); +static sqInt numberOfSpillsInTopNItems(sqInt n); static sqInt numCheckFeaturesOpcodes(AbstractInstruction * self_in_numCheckFeaturesOpcodes); static sqInt numICacheFlushOpcodes(AbstractInstruction * self_in_numICacheFlushOpcodes); static sqInt numLowLevelLockOpcodes(AbstractInstruction * self_in_numLowLevelLockOpcodes); @@ -8992,8 +8996,14 @@ static sqInt genExtSendAbsentImplicitBytecode(void) { - error("shouldBeImplemented"); - return EncounteredUnknownBytecode; + sqInt litIndex; + sqInt nArgs; + + litIndex = (((usqInt) byte1) >> 3) + (extA << 5); + extA = 0; + nArgs = (byte1 & 7) + (extB << 3); + extB = 0; + return genSendAbsentImplicitnumArgs(literalofMethod(litIndex, methodObj), nArgs); } @@ -9546,9 +9556,9 @@ genoperandoperandoperand(MoveMwrR, 0, SPReg, TempReg); /* begin MoveMw:r:R: */ offset = jumpShortByteSize(backEnd); - genoperandoperandoperand(MoveMwrR, offset, TempReg, Arg0Reg); + genoperandoperandoperand(MoveMwrR, offset, TempReg, Arg1Reg); /* begin CmpR:R: */ - genoperandoperand(CmpRR, ClassReg, Arg0Reg); + genoperandoperand(CmpRR, ClassReg, Arg1Reg); /* begin JumpNonZero: */ jumpMiss = genoperand(JumpNonZero, ((sqInt)0)); /* begin MoveMw:r:R: */ @@ -9961,6 +9971,53 @@ } +/* Cached implicit receiver implementation. Caller looks like + mov selector, ClassReg + call cePushImplicitReceiver + br continue + Lclass .word + Lmixin: .word + continue: + If class matches class of receiver then mixin contains either 0 or the + implicit receiver. + If 0, answer the actual receiver. This is done in the trampoline. + See generateNewspeakRuntime. */ +/* Cached implicit receiver implementation. Caller looks like + mov selector, ClassReg + call cePushImplicitReceiver + br continue + Lclass .word + Lmixin: .word + continue: + If class matches class of receiver then mixin contains either 0 or the + implicit receiver. + If 0, answer the actual receiver. This is done in the trampoline. + See generateNewspeakRuntime. */ + +static sqInt +genGetImplicitReceiverFor(sqInt selector) +{ + AbstractInstruction *skip; + + ssAllocateCallRegandandand(SendNumArgsReg, ReceiverResultReg, ClassReg, Arg1Reg); + if (isYoung(selector)) { + hasYoungReferent = 1; + } + assert(needsFrame); + /* begin MoveCw:R: */ + genoperandoperand(MoveCwR, selector, SendNumArgsReg); + CallNewspeakSend(ceImplicitReceiverTrampoline); + /* begin Jump: */ + skip = genoperand(Jump, ((sqInt)0)); + /* begin Fill32: */ + genoperand(Fill32, 0); + /* begin Fill32: */ + genoperand(Fill32, 0); + jmpTarget(skip, gLabel()); + return 0; +} + + /* Generate a routine that answers the stack pointer immedately after a leaf call, used for checking stack pointer alignment. */ @@ -11805,40 +11862,15 @@ return ssPushRegister(ReceiverResultReg); } - -/* Cached push implicit receiver implementation. Caller looks like - mov selector, ClassReg - call cePushImplicitReceiver - br continue - Lclass .word - Lmixin: .word - continue: - If class matches class of receiver then mixin contains either 0 or the - implicit receiver. - If 0, push the actual receiver. */ - static sqInt genPushImplicitReceiverBytecode(void) { - sqInt selector; - AbstractInstruction *skip; + sqInt result; - ssAllocateCallRegandandand(SendNumArgsReg, ReceiverResultReg, ClassReg, Arg0Reg); - selector = literalofMethod(byte1, methodObj); - if (isYoung(selector)) { - hasYoungReferent = 1; + result = genGetImplicitReceiverFor(literalofMethod(byte1, methodObj)); + if (result != 0) { + return result; } - assert(needsFrame); - /* begin MoveCw:R: */ - genoperandoperand(MoveCwR, selector, SendNumArgsReg); - CallNewspeakSend(ceImplicitReceiverTrampoline); - /* begin Jump: */ - skip = genoperand(Jump, ((sqInt)0)); - /* begin Fill32: */ - genoperand(Fill32, 0); - /* begin Fill32: */ - genoperand(Fill32, 0); - jmpTarget(skip, gLabel()); return ssPushRegister(ReceiverResultReg); } @@ -12395,17 +12427,33 @@ /* 160-175 1010 i i i i Send To Absent Implicit Receiver Literal Selector - #iiii With 0 Arguments + #iiii With 0 Arguments. */ static sqInt genSendAbsentImplicit0ArgsBytecode(void) { - error("shouldBeImplemented"); - return EncounteredUnknownBytecode; + return genSendAbsentImplicitnumArgs(literalofMethod(byte0 & 15, methodObj), 0); } + +/* Get the implicit receiver and marshall arguments, shuffling the + stack to push the implicit receiver if necessary. Then send. */ + static sqInt +genSendAbsentImplicitnumArgs(sqInt selector, sqInt numArgs) +{ + sqInt result; + + result = genGetImplicitReceiverFor(selector); + if (result != 0) { + return result; + } + marshallImplicitReceiverSendArguments(numArgs); + return genMarshalledSendnumArgs(selector, numArgs); +} + +static sqInt genSendLiteralSelector0ArgsBytecode(void) { return genSendnumArgs(literalofMethod(byte0 & 15, methodObj), 0); @@ -15408,6 +15456,70 @@ /* Spill everything on the simulated stack that needs spilling (that below + arguments). Marshall arguments to stack and/or registers depending on arg + count. If the args don't fit in registers push receiver and args (spill + everything). Assume + receiver already in ResultReceiverReg so shuffle args and push it if + necessary. */ + +static void +marshallImplicitReceiverSendArguments(sqInt numArgs) +{ + sqInt index; + sqInt numSpilled; + + if (numArgs > (numRegArgs())) { + + /* The arguments must be pushed to the stack, and hence the receiver + must be inserted beneath the args. Reduce or eliminate the argument + shuffle by only moving already spilled items. */ + + numSpilled = numberOfSpillsInTopNItems(numArgs); + if (numSpilled > 0) { + /* begin MoveMw:r:R: */ + genoperandoperandoperand(MoveMwrR, 0, SPReg, TempReg); + /* begin PushR: */ + genoperand(PushR, TempReg); + for (index = 2; index <= numSpilled; index += 1) { + /* begin MoveMw:r:R: */ + genoperandoperandoperand(MoveMwrR, index * BytesPerWord, SPReg, TempReg); + /* begin MoveR:Mw:r: */ + genoperandoperandoperand(MoveRMwr, TempReg, (index - 1) * BytesPerWord, SPReg); + } + /* begin MoveR:Mw:r: */ + genoperandoperandoperand(MoveRMwr, ReceiverResultReg, numSpilled * BytesPerWord, SPReg); + } + else { + /* begin PushR: */ + genoperand(PushR, ReceiverResultReg); + } + ssFlushTo(simStackPtr); + } + else { + ssFlushTo((simStackPtr - numArgs) - 1); + if (numArgs > 0) { + if (((numRegArgs()) > 1) + && (numArgs > 1)) { + ssAllocateRequiredRegupThrough(Arg0Reg, simStackPtr - 2); + ssAllocateRequiredRegupThrough(Arg1Reg, simStackPtr - 1); + } + else { + ssAllocateRequiredRegupThrough(Arg0Reg, simStackPtr - 1); + } + } + if (((numRegArgs()) > 1) + && (numArgs > 1)) { + popToReg(simStackAt(simStackPtr), Arg1Reg); + } + if (numArgs > 0) { + popToReg(simStackAt((simStackPtr - numArgs) + 1), Arg0Reg); + } + } + ssPop(numArgs); +} + + +/* Spill everything on the simulated stack that needs spilling (that below receiver and arguments). Marshall receiver and arguments to stack and/or registers depending on arg count. If the args don't fit in registers push receiver and args (spill @@ -15717,7 +15829,20 @@ return 1; } +static sqInt +numberOfSpillsInTopNItems(sqInt n) +{ + sqInt i; + for (i = simStackPtr; i >= ((simStackPtr - n) + 1); i += -1) { + if (((simStackAt(i)->type)) == SSSpill) { + return n - (simStackPtr - i); + } + } + return 0; +} + + /* Answer the number of opcodes required to compile the CPUID call to extract the extended features information. */ @@ -17361,7 +17486,7 @@ liveRegs = registerMaskForand(FPReg, SPReg); for (i = (((simSpillBase < 0) ? 0 : simSpillBase)); i <= stackPtr; i += 1) { liveRegs = liveRegs | (registerMask(simStackAt(i))); - if ((liveRegs & requiredRegsMask) != 0) { + if (((registerMask(simStackAt(i))) & requiredRegsMask) != 0) { lastRequired = i; } } Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2013-01-05 15:10:09 UTC (rev 2659) +++ branches/Cog/nscogsrc/vm/cogit.h 2013-01-07 21:54:37 UTC (rev 2660) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + CCodeGenerator VMMaker.oscog-eem.250 uuid: e0de5572-7682-4c5e-b5a0-ca2f32cf0c81 */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2013-01-05 15:10:09 UTC (rev 2659) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2013-01-07 21:54:37 UTC (rev 2660) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + CCodeGenerator VMMaker.oscog-eem.250 uuid: e0de5572-7682-4c5e-b5a0-ca2f32cf0c81 */ typedef struct { Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Jan 4 12:43:14 PST 2013 + Mon Jan 7 13:52:47 PST 2013 Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2013-01-05 15:10:09 UTC (rev 2659) +++ branches/Cog/src/vm/cogit.c 2013-01-07 21:54:37 UTC (rev 2660) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + CCodeGenerator VMMaker.oscog-eem.250 uuid: e0de5572-7682-4c5e-b5a0-ca2f32cf0c81 from - StackToRegisterMappingCogit VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + StackToRegisterMappingCogit VMMaker.oscog-eem.250 uuid: e0de5572-7682-4c5e-b5a0-ca2f32cf0c81 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.250 uuid: e0de5572-7682-4c5e-b5a0-ca2f32cf0c81 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -16045,7 +16045,7 @@ liveRegs = registerMaskForand(FPReg, SPReg); for (i = (((simSpillBase < 0) ? 0 : simSpillBase)); i <= stackPtr; i += 1) { liveRegs = liveRegs | (registerMask(simStackAt(i))); - if ((liveRegs & requiredRegsMask) != 0) { + if (((registerMask(simStackAt(i))) & requiredRegsMask) != 0) { lastRequired = i; } } Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2013-01-05 15:10:09 UTC (rev 2659) +++ branches/Cog/src/vm/cogit.h 2013-01-07 21:54:37 UTC (rev 2660) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + CCodeGenerator VMMaker.oscog-eem.250 uuid: e0de5572-7682-4c5e-b5a0-ca2f32cf0c81 */ Modified: branches/Cog/src/vm/cogmethod.h =================================================================== --- branches/Cog/src/vm/cogmethod.h 2013-01-05 15:10:09 UTC (rev 2659) +++ branches/Cog/src/vm/cogmethod.h 2013-01-07 21:54:37 UTC (rev 2660) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.248 uuid: 325b96ad-3c25-438e-af36-04a93839f195 + CCodeGenerator VMMaker.oscog-eem.250 uuid: e0de5572-7682-4c5e-b5a0-ca2f32cf0c81 */ typedef struct {

1 0

← Newer
1
...
9
10
11
12
13
14
15
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 January 2013