Vm-dev April 2014

vm-dev@lists.squeakfoundation.org

39 participants
112 discussions

SqueakSSL +OK Gpop ready for requests from 72.250.235.130 dc2mb105720703oab
by gettimothy 10 Apr '14

10 Apr '14

Okeydokey In the mvm file in unixbuild/bld/ I thought I would try adding the library directly and it allowed the thing to compile. LIBS="-lpthread -lssl -lcrypto"\ David, getting the thing to work on production could be as easy as adding those to doo-hickeys. Running the image and checking built-in modules shows the plugin. Running the tests shows the module being loaded: SqueakSSL * VMMaker.oscog-eem.667 (i) (woot!) Throwing a breakpoint in testGooglePopStream gives the response in the Subject line: +OK Gpop ready for requests from 72.250.235.130 dc2mb105720703oab (SqueakSSLTest selector: #testGooglePopStream) run. Testrunner shows 14 run, 3 passes, 0 expected failures, 6 failures, 5 errors, 0 unexpected passes. HOWEVER, I just recently upgraded my openssl packages and modified my ssl_config per this post: http://alien.slackbook.org/blog/securing-remote-root-access/ which means I have an odd port, and am limited to protocol 2 so it could be stuff like that messing up the tests (my bet it is) I am going to do attempt a rebuild using the 64bit libraries in /lib64 and see what happens, plus debug the errors above. If anybody has not fudgelated their ssl configuration and has the means to test, please give it a go. cheers. tty

1 0

SqueakSSL and libtool
by gettimothy 10 Apr '14

10 Apr '14

Howdy all. Building SqueakSSL compiles just fine, but fails at the libtool stage when compiled as an internal plugin. (formatted for easier reading below. I replace full path with [......] where it helps clean up things) /bin/sh [......]/debugCogSqueakSSL/unixbuild/bld/libtool --mode=link gcc -m32 -g -Og -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DITIMER_HEARTBEAT=1 -DCOGMTVM=0 -DDEBUGVM=0 -DLSB_FIRST=1 -Wl,-z,now -export-dynamic -o squeak vm/vm.a AsynchFilePlugin/AsynchFilePlugin.a B2DPlugin/B2DPlugin.a BitBltPlugin/BitBltPlugin.a FilePlugin/FilePlugin.a SocketPlugin/SocketPlugin.a SqueakSSL/SqueakSSL.a MiscPrimitivePlugin/MiscPrimitivePlugin.a disabledPlugins.o version.o -lutil -ldl -lpthread -lm -lnsl -lpthread vm/vm.a gcc -m32 -g -Og -msse2 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -DNDEBUG -DITIMER_HEARTBEAT=1 -DCOGMTVM=0 -DDEBUGVM=0 -DLSB_FIRST=1 -Wl,-z -Wl,now -o squeak disabledPlugins.o version.o -Wl,--export-dynamic vm/vm.a AsynchFilePlugin/AsynchFilePlugin.a B2DPlugin/B2DPlugin.a BitBltPlugin/BitBltPlugin.a FilePlugin/FilePlugin.a SocketPlugin/SocketPlugin.a SqueakSSL/SqueakSSL.a MiscPrimitivePlugin/MiscPrimitivePlugin.a -lutil -ldl -lpthread -lm -lnsl -lpthread vm/vm.a SqueakSSL/SqueakSSL.a(sqUnixOpenSSL.o): In function `sqCopyBioSSL': [......]/debugCogSqueakSSL/platforms/unix/plugins/SqueakSSL/sqUnixOpenSSL.c:37: undefined reference to `BIO_ctrl_pending' (more errors omitted for brevity. all of them are unresolved references to stuff in /usr/include/openssl/ssl.h . these errors do not happen at compile time, only libtool ing ) Here is what I think is going on with SqueakSSL on linux. SqueakSSL is normally built as an external plugin. My guess external plugins are loaded and linked at load time. Since the thing compiles fine, we don't find the link error and we just get a primitive fail. However, when I moved it from plugins.ext to plugins.int, I get the link failure above. Since discovering this, I have tried two things 1. compile on my pure 64 bit partition...this failed for obvious reasons--we don't have 64 bit Cog yet (: but hey...a guy can hope! 2. I installed openssl compat32 libs alongside the 64 bit versions...as show below. 2.a I made some changes that I kinda-sorta-hoped would work in some strings in the script that had the substring "/lib64 " but that did not work. bash-4.2$ ls lib/*ssl* lib/libssl.so.0 lib/libssl.so.0.9.8 lib/libssl.so.1 lib/libssl.so.1.0.0 bash-4.2$ ls lib64/*ssl* lib64/libssl.so.0 lib64/libssl.so.0.9.8 lib64/libssl.so.1 lib64/libssl.so.1.0.0 I will have to think about this a bit, but I just wanted to post this update in case I am missing something glaringly obvious thx. tty

3 3

[commit][2890] CogVM source as per VMMaker.oscog-eem.670
by commits＠squeakvm.org 09 Apr '14

09 Apr '14

Revision: 2890 Author: eliot Date: 2014-04-09 12:32:17 -0700 (Wed, 09 Apr 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.670 CoInterpreter: Garbage collect/remap the primTraceLog correctly. If a GC happens very early in start-up the log circular buffer may not be full and the existing code assumed it always was. Cogit: Fix bug in unlinkSendsOf:isMNUSelector: (primitiveFlushCacheBySelector) where old code could free the method of an active frame. Fix an assert fail in mapFor:bcpc:performUntil:arg: (this for primitiveClass where the class table reference can be the first map entry). Newspeak: Fix a bug in remapIfObjectRef:pc:hasYoung: with dynamic super sends which could compute an invalid target method. Rename pushExplicitOuterSendReceiverBytecode et al to pushExplicitOuterReceiverBytecode et al. These are not sends. Sista: Cope with doubleExtendedDoAnythingBytecodes which /may/ be sends or not, and hence are problematic for gathering send data. Generate correct counting code for #==, which implies it can't be frameless in Sista. Annotate the right address (the return address of the ceMustBeBooleanFoo call) in counting genJump:if:. Add Spur support for Sista (shorten:toIndexableSize: et al). Implement instantiation in picDataFor:into: in terms of eeInstantiateClassIndex:format:numSlots:. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h 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/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogmethod.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/interp.h branches/Cog/nsspursrc/vm/vmCallback.h branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/nsspurstacksrc/vm/interp.h branches/Cog/nsspurstacksrc/vm/vmCallback.h branches/Cog/scripts/findUnofficialFiles 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/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/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/spurstacksrc/vm/vmCallback.h branches/Cog/src/plugins/BochsIA32Plugin/BochsIA32Plugin.c branches/Cog/src/plugins/FT2Plugin/FT2Plugin.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.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 branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c branches/Cog/stacksrc/vm/interp.h branches/Cog/stacksrc/vm/vmCallback.h Added Paths: ----------- branches/Cog/spursistamacbuild/ branches/Cog/spursistamacbuild/BochsIA32Plugin/ branches/Cog/spursistamacbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/ branches/Cog/spursistamacbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/eliot.mode1 branches/Cog/spursistamacbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/eliot.pbxuser branches/Cog/spursistamacbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj branches/Cog/spursistamacbuild/BochsIA32Plugin/Info.plist branches/Cog/spursistamacbuild/BochsIA32Plugin/makeit branches/Cog/spursistamacbuild/CoreVM.plist branches/Cog/spursistamacbuild/CoreVM.xcodeproj/ branches/Cog/spursistamacbuild/CoreVM.xcodeproj/johnmci.mode1 branches/Cog/spursistamacbuild/CoreVM.xcodeproj/johnmci.pbxuser branches/Cog/spursistamacbuild/CoreVM.xcodeproj/project.pbxproj branches/Cog/spursistamacbuild/CoreVM.xcodeproj/sophie.mode1 branches/Cog/spursistamacbuild/CoreVM.xcodeproj/sophie.pbxuser branches/Cog/spursistamacbuild/CoreVM.xcodeproj/temp branches/Cog/spursistamacbuild/CoreVM.xcodeproj/werdna.pbxuser branches/Cog/spursistamacbuild/CroquetPlugin/ branches/Cog/spursistamacbuild/CroquetPlugin/CroquetPlugin.xcodeproj/ branches/Cog/spursistamacbuild/CroquetPlugin/CroquetPlugin.xcodeproj/project.pbxproj branches/Cog/spursistamacbuild/CroquetPlugin/CroquetPlugin_Prefix.pch branches/Cog/spursistamacbuild/CroquetPlugin/English.lproj/ branches/Cog/spursistamacbuild/CroquetPlugin/English.lproj/InfoPlist.strings branches/Cog/spursistamacbuild/CroquetPlugin/Info.plist branches/Cog/spursistamacbuild/FloatArrayPlugin/ branches/Cog/spursistamacbuild/FloatArrayPlugin/English.lproj/ branches/Cog/spursistamacbuild/FloatArrayPlugin/English.lproj/InfoPlist.strings branches/Cog/spursistamacbuild/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/ branches/Cog/spursistamacbuild/FloatArrayPlugin/FloatArrayPlugin.xcodeproj/project.pbxproj branches/Cog/spursistamacbuild/FloatArrayPlugin/FloatArrayPlugin_Prefix.pch branches/Cog/spursistamacbuild/FloatArrayPlugin/Info.plist branches/Cog/spursistamacbuild/FloatMathPlugin/ branches/Cog/spursistamacbuild/FloatMathPlugin/English.lproj/ branches/Cog/spursistamacbuild/FloatMathPlugin/English.lproj/InfoPlist.strings branches/Cog/spursistamacbuild/FloatMathPlugin/FloatMathPlugin.xcodeproj/ branches/Cog/spursistamacbuild/FloatMathPlugin/FloatMathPlugin.xcodeproj/project.pbxproj branches/Cog/spursistamacbuild/FloatMathPlugin/FloatMathPlugin_Prefix.pch branches/Cog/spursistamacbuild/FloatMathPlugin/Info.plist branches/Cog/spursistamacbuild/HowToBuild branches/Cog/spursistamacbuild/Mpeg3Plugin/ branches/Cog/spursistamacbuild/Mpeg3Plugin/Mpeg3Plugin-Info.plist branches/Cog/spursistamacbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/ branches/Cog/spursistamacbuild/Mpeg3Plugin/Mpeg3Plugin.xcodeproj/project.pbxproj branches/Cog/spursistamacbuild/SqueakFFIPrims/ branches/Cog/spursistamacbuild/SqueakFFIPrims/Info.plist branches/Cog/spursistamacbuild/SqueakFFIPrims/SqueakFFI.xcodeproj/ branches/Cog/spursistamacbuild/SqueakFFIPrims/SqueakFFI.xcodeproj/project.pbxproj branches/Cog/spursistamacbuild/SqueakFFIPrims/SqueakFFIPrims_Prefix.pch branches/Cog/spursistamacbuild/SqueakSSL/ branches/Cog/spursistamacbuild/SqueakSSL/Info.plist branches/Cog/spursistamacbuild/SqueakSSL/SqueakSSL.xcodeproj/ branches/Cog/spursistamacbuild/SqueakSSL/SqueakSSL.xcodeproj/project.pbxproj branches/Cog/spursistamacbuild/SqueakSSL/SqueakSSL_Prefix.pch branches/Cog/spursistamacbuild/Template/ branches/Cog/spursistamacbuild/Template/HowToMakeANewPlugin.txt branches/Cog/spursistamacbuild/Template/Info.plist branches/Cog/spursistamacbuild/Template/Template.xcodeproj/ branches/Cog/spursistamacbuild/Template/Template.xcodeproj/project.pbxproj branches/Cog/spursistamacbuild/Template/Template_Prefix.pch branches/Cog/spursistamacbuild/UnixOSProcessPlugin/ branches/Cog/spursistamacbuild/UnixOSProcessPlugin/English.lproj/ branches/Cog/spursistamacbuild/UnixOSProcessPlugin/English.lproj/InfoPlist.strings branches/Cog/spursistamacbuild/UnixOSProcessPlugin/Info.plist branches/Cog/spursistamacbuild/UnixOSProcessPlugin/PkgInfo branches/Cog/spursistamacbuild/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/ branches/Cog/spursistamacbuild/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/eliot.mode1 branches/Cog/spursistamacbuild/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/eliot.pbxuser branches/Cog/spursistamacbuild/UnixOSProcessPlugin/UnixOSProcessPlugin.xcodeproj/project.pbxproj branches/Cog/spursistamacbuild/UnixOSProcessPlugin/makeit branches/Cog/spursistamacbuild/makeall branches/Cog/spursistamacbuild/makeclean branches/Cog/spursistamacbuild/makevm branches/Cog/spursistamacbuild/mkNamedPrims.sh branches/Cog/spursistamacbuild/mvm branches/Cog/spursistamacbuild/plugins.ext branches/Cog/spursistamacbuild/plugins.int branches/Cog/spursistamacbuild/resources/ branches/Cog/spursistamacbuild/resources/FT2Plugin.bundle/ branches/Cog/spursistamacbuild/resources/FT2Plugin.bundle/Contents/ branches/Cog/spursistamacbuild/resources/FT2Plugin.bundle/Contents/Info.plist branches/Cog/spursistamacbuild/resources/FT2Plugin.bundle/Contents/MacOS/ branches/Cog/spursistamacbuild/resources/FT2Plugin.bundle/Contents/MacOS/FT2Plugin branches/Cog/spursistamacbuild/resources/FT2Plugin.bundle/Contents/PkgInfo branches/Cog/spursistamacbuild/resources/FT2Plugin.bundle/Contents/Resources/ branches/Cog/spursistamacbuild/resources/FT2Plugin.bundle/Contents/Resources/SqueakPlugin.icns branches/Cog/spursistamacbuild/resources/FloatMathPlugin.bundle/ branches/Cog/spursistamacbuild/resources/FloatMathPlugin.bundle/Contents/ branches/Cog/spursistamacbuild/resources/FloatMathPlugin.bundle/Contents/Info.plist branches/Cog/spursistamacbuild/resources/FloatMathPlugin.bundle/Contents/MacOS/ branches/Cog/spursistamacbuild/resources/FloatMathPlugin.bundle/Contents/MacOS/FloatMathPlugin branches/Cog/spursistamacbuild/resources/FloatMathPlugin.bundle/Contents/PkgInfo branches/Cog/spursistamacbuild/resources/FloatMathPlugin.bundle/Contents/Resources/ branches/Cog/spursistamacbuild/resources/FloatMathPlugin.bundle/Contents/Resources/SqueakPlugin.icns branches/Cog/spursistamacbuild/resources/LocalePlugin.bundle/ branches/Cog/spursistamacbuild/resources/LocalePlugin.bundle/Contents/ branches/Cog/spursistamacbuild/resources/LocalePlugin.bundle/Contents/Info.plist branches/Cog/spursistamacbuild/resources/LocalePlugin.bundle/Contents/MacOS/ branches/Cog/spursistamacbuild/resources/LocalePlugin.bundle/Contents/MacOS/LocalePlugin branches/Cog/spursistamacbuild/resources/LocalePlugin.bundle/Contents/PkgInfo branches/Cog/spursistamacbuild/resources/LocalePlugin.bundle/Contents/Resources/ branches/Cog/spursistamacbuild/resources/LocalePlugin.bundle/Contents/Resources/SqueakPlugin.icns branches/Cog/spursistamacbuild/resources/ProjectBuilder/ branches/Cog/spursistamacbuild/resources/ProjectBuilder/Croquet.icns branches/Cog/spursistamacbuild/resources/ProjectBuilder/GreenCogSqueak.icns branches/Cog/spursistamacbuild/resources/ProjectBuilder/Squeak VM.r branches/Cog/spursistamacbuild/resources/ProjectBuilder/Squeak.icns branches/Cog/spursistamacbuild/resources/ProjectBuilder/SqueakChanges.icns branches/Cog/spursistamacbuild/resources/ProjectBuilder/SqueakGeneric.icns branches/Cog/spursistamacbuild/resources/ProjectBuilder/SqueakImage.icns branches/Cog/spursistamacbuild/resources/ProjectBuilder/SqueakPlugin.icns branches/Cog/spursistamacbuild/resources/ProjectBuilder/SqueakProject.icns branches/Cog/spursistamacbuild/resources/ProjectBuilder/SqueakScript.icns branches/Cog/spursistamacbuild/resources/ProjectBuilder/SqueakSources.icns branches/Cog/spursistamacbuild/resources/ProjectBuilder/Teleplace.icns branches/Cog/spursistamacbuild/resources/QuicktimePlugin.bundle/ branches/Cog/spursistamacbuild/resources/QuicktimePlugin.bundle/Contents/ branches/Cog/spursistamacbuild/resources/QuicktimePlugin.bundle/Contents/Info.plist branches/Cog/spursistamacbuild/resources/QuicktimePlugin.bundle/Contents/MacOS/ branches/Cog/spursistamacbuild/resources/QuicktimePlugin.bundle/Contents/MacOS/QuicktimePlugin branches/Cog/spursistamacbuild/resources/QuicktimePlugin.bundle/Contents/PkgInfo branches/Cog/spursistamacbuild/resources/QuicktimePlugin.bundle/Contents/Resources/ branches/Cog/spursistamacbuild/resources/QuicktimePlugin.bundle/Contents/Resources/SqueakPlugin.icns branches/Cog/spursistamacbuild/resources/SpellingPlugin.bundle/ branches/Cog/spursistamacbuild/resources/SpellingPlugin.bundle/Contents/ branches/Cog/spursistamacbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/ branches/Cog/spursistamacbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/ branches/Cog/spursistamacbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/ branches/Cog/spursistamacbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/Info.plist branches/Cog/spursistamacbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/MacOS/ branches/Cog/spursistamacbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/MacOS/SpellCheck branches/Cog/spursistamacbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/Resources/ branches/Cog/spursistamacbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/Resources/English.lproj/ branches/Cog/spursistamacbuild/resources/SpellingPlugin.bundle/Contents/Frameworks/SpellCheck.bundle/Contents/Resources/English.lproj/InfoPlist.strings branches/Cog/spursistamacbuild/resources/SpellingPlugin.bundle/Contents/Info.plist branches/Cog/spursistamacbuild/resources/SpellingPlugin.bundle/Contents/MacOS/ branches/Cog/spursistamacbuild/resources/SpellingPlugin.bundle/Contents/MacOS/SpellingPlugin branches/Cog/spursistamacbuild/resources/SpellingPlugin.bundle/Contents/PkgInfo branches/Cog/spursistamacbuild/resources/SpellingPlugin.bundle/Contents/Resources/ branches/Cog/spursistamacbuild/resources/SpellingPlugin.bundle/Contents/Resources/InfoPlist.strings branches/Cog/spursistamacbuild/resources/SpellingPlugin.bundle/Contents/Resources/PkgInfo branches/Cog/spursistamacbuild/resources/SpellingPlugin.bundle/Contents/Resources/SqueakPlugin.icns branches/Cog/spursistasrc/ branches/Cog/spursistasrc/examplePlugins.ext branches/Cog/spursistasrc/examplePlugins.int branches/Cog/spursistasrc/vm/ 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/exampleSqNamedPrims.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/interp.h branches/Cog/spursistasrc/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2014-04-04 23:23:49 UTC (rev 2889) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-04-09 19:32:17 UTC (rev 2890) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.663 uuid: b4c4ad18-808c-4afb-9ddc-80def5e01086 + CCodeGenerator VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 from - StackToRegisterMappingCogit VMMaker.oscog-eem.663 uuid: b4c4ad18-808c-4afb-9ddc-80def5e01086 + StackToRegisterMappingCogit VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.663 uuid: b4c4ad18-808c-4afb-9ddc-80def5e01086 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -747,8 +747,8 @@ static sqInt genPushConstantOneBytecode(void); static sqInt genPushConstantTrueBytecode(void); static sqInt genPushConstantZeroBytecode(void); -static sqInt genPushExplicitOuterSendReceiverBytecode(void); -static sqInt genPushExplicitOuterSendReceiver(sqInt level); +static sqInt genPushExplicitOuterReceiverBytecode(void); +static sqInt genPushExplicitOuterReceiver(sqInt level); static sqInt genPushImplicitReceiverBytecode(void); static sqInt genPushLiteralConstantBytecode(void); static sqInt genPushLiteralIndex(sqInt literalIndex); @@ -1328,7 +1328,7 @@ { duplicateTopBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0 }, { genPushActiveContextBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0 }, { genPushNewArrayBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0 }, - { genPushExplicitOuterSendReceiverBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 1, 0, 0 }, + { genPushExplicitOuterReceiverBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 1, 0, 0 }, { genPushRemoteTempLongBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0 }, { genStoreRemoteTempLongBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0 }, { genStoreAndPopRemoteTempLongBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0 }, @@ -3047,8 +3047,7 @@ /* It's a linked send; find which kind. */ - /* begin targetMethodAndSendTableFor:annotation:into: */ - assert(annotation == IsSendCall); + /* begin targetMethodAndSendTableFor:into: */ if ((entryPoint & entryPointMask) == checkedEntryAlignment) { targetMethod1 = ((CogMethod *) (entryPoint - cmEntryOffset)); sendTable1 = sendTrampolines; @@ -11179,7 +11178,7 @@ default: if (ext < 0) { - return genPushExplicitOuterSendReceiver(0 - ext); + return genPushExplicitOuterReceiver(0 - ext); } warning("undefined extension for extPushPseudoVariableOrOuter"); return unknownBytecode(); @@ -14358,20 +14357,20 @@ /* Uncached push explicit outer send receiver */ static sqInt -genPushExplicitOuterSendReceiverBytecode(void) +genPushExplicitOuterReceiverBytecode(void) { sqInt levelOop; levelOop = getLiteral(byte1); assert((levelOop & 1)); - return genPushExplicitOuterSendReceiver((levelOop >> 1)); + return genPushExplicitOuterReceiver((levelOop >> 1)); } /* Uncached push explicit outer send receiver */ static sqInt -genPushExplicitOuterSendReceiver(sqInt level) +genPushExplicitOuterReceiver(sqInt level) { assert(needsFrame); (optStatus.isReceiverResultRegLive = 0); @@ -16253,8 +16252,7 @@ /* It's a linked send. */ - /* begin targetMethodAndSendTableFor:annotation:into: */ - assert(annotation == IsSendCall); + /* begin targetMethodAndSendTableFor:into: */ if ((entryPoint & entryPointMask) == checkedEntryAlignment) { targetMethod1 = ((CogMethod *) (entryPoint - cmEntryOffset)); sendTable1 = sendTrampolines; @@ -17247,8 +17245,9 @@ assert(startbcpc == (startPCOfMethodHeader((homeMethod->methodHeader)))); map = ((((usqInt)homeMethod)) + ((homeMethod->blockSize))) - 1; assert(((((usqInt) (byteAt(map))) >> AnnotationShift) == IsAbsPCReference) + || (((((usqInt) (byteAt(map))) >> AnnotationShift) == IsObjectReference) || (((((usqInt) (byteAt(map))) >> AnnotationShift) == IsRelativeCall) - || ((((usqInt) (byteAt(map))) >> AnnotationShift) == IsDisplacementX2N))); + || ((((usqInt) (byteAt(map))) >> AnnotationShift) == IsDisplacementX2N)))); latestContinuation = startbcpc; aMethodObj = (homeMethod->methodObject); endbcpc = (byteLengthOf(aMethodObj)) - 1; @@ -17969,8 +17968,7 @@ /* It's a linked send. */ - /* begin targetMethodAndSendTableFor:annotation:into: */ - assert(annotation == IsSendCall); + /* begin targetMethodAndSendTableFor:into: */ if ((entryPoint1 & entryPointMask) == checkedEntryAlignment) { targetMethod1 = ((CogMethod *) (entryPoint1 - cmEntryOffset)); sendTable1 = sendTrampolines; @@ -19576,16 +19574,18 @@ sqInt cacheTag1; sqInt entryPoint; sqInt entryPoint1; + sqInt ignored; sqInt literal; sqInt mappedCacheTag; sqInt mappedLiteral; sqInt mappedOop; - sqInt offset; sqInt oop; sqInt pc; + sqInt *sendTable; sqInt tagCouldBeObj; sqInt tagCouldBeObj1; CogMethod *targetMethod; + CogMethod *targetMethod1; if (annotation == IsObjectReference) { literal = literalBeforeFollowingAddress(backEnd, ((sqInt)mcpc)); @@ -19666,13 +19666,26 @@ /* It's a linked send. */ - offset = ((entryPoint1 & entryPointMask) == checkedEntryAlignment - ? cmEntryOffset - : cmNoCheckEntryOffset); - targetMethod = ((CogMethod *) (entryPoint1 - offset)); - if (isYoung((targetMethod->selector))) { + /* begin targetMethodAndSendTableFor:into: */ + if ((entryPoint1 & entryPointMask) == checkedEntryAlignment) { + targetMethod1 = ((CogMethod *) (entryPoint1 - cmEntryOffset)); + sendTable = sendTrampolines; + } + else { + if ((entryPoint1 & entryPointMask) == dynSuperEntryAlignment) { + targetMethod1 = ((CogMethod *) (entryPoint1 - cmDynSuperEntryOffset)); + sendTable = dynamicSuperSendTrampolines; + } + else { + targetMethod1 = ((CogMethod *) (entryPoint1 - cmNoCheckEntryOffset)); + sendTable = superSendTrampolines; + } + } + + if (isYoung((targetMethod1->selector))) { (((sqInt *) hasYoungPtr))[0] = 1; } + } } } @@ -20825,8 +20838,7 @@ /* It's a linked send. */ - /* begin targetMethodAndSendTableFor:annotation:into: */ - assert(annotation == IsSendCall); + /* begin targetMethodAndSendTableFor:into: */ if ((entryPoint & entryPointMask) == checkedEntryAlignment) { targetMethod1 = ((CogMethod *) (entryPoint - cmEntryOffset)); sendTable1 = sendTrampolines; @@ -20879,8 +20891,7 @@ /* It's a linked send. */ - /* begin targetMethodAndSendTableFor:annotation:into: */ - assert(annotation == IsSendCall); + /* begin targetMethodAndSendTableFor:into: */ if ((entryPoint & entryPointMask) == checkedEntryAlignment) { targetMethod1 = ((CogMethod *) (entryPoint - cmEntryOffset)); sendTable1 = sendTrampolines; @@ -20924,8 +20935,7 @@ /* It's a linked send. */ - /* begin targetMethodAndSendTableFor:annotation:into: */ - assert(annotation == IsSendCall); + /* begin targetMethodAndSendTableFor:into: */ if ((entryPoint & entryPointMask) == checkedEntryAlignment) { targetMethod1 = ((CogMethod *) (entryPoint - cmEntryOffset)); sendTable1 = sendTrampolines; @@ -20973,8 +20983,7 @@ /* It's a linked send. */ - /* begin targetMethodAndSendTableFor:annotation:into: */ - assert(annotation == IsSendCall); + /* begin targetMethodAndSendTableFor:into: */ if ((entryPoint & entryPointMask) == checkedEntryAlignment) { targetMethod1 = ((CogMethod *) (entryPoint - cmEntryOffset)); sendTable1 = sendTrampolines; @@ -21012,35 +21021,53 @@ } -/* Unlink all sends in cog methods. */ +/* Unlink all sends in cog methods. Free all Closed PICs with the selector, + or with an MNU case if isMNUSelector. First check if any method actually + has the selector; if not there can't be any linked send to it. This + routine (including descendents) is performance critical. It contributes + perhaps 30% of entire execution time in Compiler recompileAll. */ void unlinkSendsOfisMNUSelector(sqInt selector, sqInt isMNUSelector) { CogMethod *cogMethod; - sqInt freeSpace; + sqInt mustScanAndUnlink; if (methodZoneBase == null) { return; } cogMethod = ((CogMethod *) methodZoneBase); - - /* First check if any method actually has the selector; if not there can't - be any linked send to it. */ - - freeSpace = methodBytesFreedSinceLastCompaction(); - while ((cogMethod < (limitZony())) - && (((cogMethod->selector)) != selector)) { - if ((((cogMethod->cmType)) != CMFree) - && ((isMNUSelector - && ((cogMethod->cpicHasMNUCase))) - || (((cogMethod->selector)) == selector))) { - freeMethod(cogMethod); + mustScanAndUnlink = 0; + if (isMNUSelector) { + while (cogMethod < (limitZony())) { + if ((cogMethod->cpicHasMNUCase)) { + assert(((cogMethod->cmType)) == CMClosedPIC); + freeMethod(cogMethod); + mustScanAndUnlink = 1; + } + else { + if (((cogMethod->selector)) == selector) { + mustScanAndUnlink = 1; + if (((cogMethod->cmType)) == CMClosedPIC) { + freeMethod(cogMethod); + } + } + } + cogMethod = ((CogMethod *) (roundUpLength((((sqInt)cogMethod)) + ((cogMethod->blockSize))))); } - cogMethod = ((CogMethod *) (roundUpLength((((sqInt)cogMethod)) + ((cogMethod->blockSize))))); } - if ((cogMethod >= (limitZony())) - && (freeSpace == (methodBytesFreedSinceLastCompaction()))) { + else { + while (cogMethod < (limitZony())) { + if (((cogMethod->selector)) == selector) { + mustScanAndUnlink = 1; + if (((cogMethod->cmType)) == CMClosedPIC) { + freeMethod(cogMethod); + } + } + cogMethod = ((CogMethod *) (roundUpLength((((sqInt)cogMethod)) + ((cogMethod->blockSize))))); + } + } + if (!mustScanAndUnlink) { return; } codeModified = 0; Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-04-04 23:23:49 UTC (rev 2889) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-04-09 19:32:17 UTC (rev 2890) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.663 uuid: b4c4ad18-808c-4afb-9ddc-80def5e01086 + CCodeGenerator VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2014-04-04 23:23:49 UTC (rev 2889) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2014-04-09 19:32:17 UTC (rev 2890) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.663 uuid: b4c4ad18-808c-4afb-9ddc-80def5e01086 + CCodeGenerator VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 */ typedef struct { Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-04-04 23:23:49 UTC (rev 2889) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-04-09 19:32:17 UTC (rev 2890) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.658 uuid: e40c5fd5-9990-433f-bd76-2f8d0324e24f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 from - CoInterpreter VMMaker.oscog-eem.658 uuid: e40c5fd5-9990-433f-bd76-2f8d0324e24f + CoInterpreter VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.658 uuid: e40c5fd5-9990-433f-bd76-2f8d0324e24f " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -763,7 +763,7 @@ sqInt methodArg(sqInt index); void * methodCacheAddress(void); sqInt methodClassAssociationOf(sqInt methodPointer); -static sqInt methodClassOf(sqInt methodPointer); +sqInt methodClassOf(sqInt methodPointer); sqInt methodHasCogMethod(sqInt aMethodOop); static sqInt methodHeaderHasPrimitive(sqInt methodHeader); sqInt methodPrimitiveIndex(void); @@ -1152,7 +1152,7 @@ static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)); static sqInt roomToPushNArgs(sqInt n); static void runLeakCheckerForFullGC(sqInt fullGCFlag); -static sqInt safeObjectAfter(sqInt oop); +static usqInt safeObjectAfter(sqInt oop); static sqInt safePrintStringOf(sqInt oop); usqInt scavengeThresholdAddress(void); EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext); @@ -1299,8 +1299,8 @@ _iss sqInt rootTableCount; _iss usqInt memoryLimit; _iss usqInt endOfMemory; +_iss unsigned char primTraceLogIndex; _iss StackPage * mostRecentlyUsedPage; -_iss unsigned char primTraceLogIndex; _iss usqInt scavengeThreshold; _iss sqInt numStackPages; _iss sqInt needGCFlag; @@ -2040,7 +2040,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.658"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.670"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -5951,14 +5951,14 @@ } break; case 139: - /* pushExplicitOuterSendReceiverBytecode */ + /* pushExplicitOuterReceiverBytecode */ { sqInt anIntOop; sqInt litIndex; sqInt n; sqInt object; - VM_LABEL(0pushExplicitOuterSendReceiverBytecode); + VM_LABEL(0pushExplicitOuterReceiverBytecode); litIndex = byteAtPointer(++localIP); /* begin literal: */ assert(GIV(method) == (iframeMethod(localFP))); @@ -23975,17 +23975,15 @@ sqInt header1; sqInt header2; sqInt header3; - sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - sqInt next; + usqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; - sqInt sz3; sqInt target; usqInt w; @@ -23996,21 +23994,7 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - /* begin objectAfter: */ - if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { - error("no objects after the end of memory"); - } - if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(oop)) & AllButTypeMask; - } - else { - /* begin sizeBitsOf: */ - header3 = longAt(oop); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass - ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); - } - next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); + next = ((sqInt) (objectAfter(oop))); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -24025,7 +24009,7 @@ else { sz1 = realHeader & SizeMask; } - next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); + next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -24079,18 +24063,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz3 = (longAt(newFreeChunk)) & AllButTypeMask; + sz2 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header4 = longAt(newFreeChunk); - sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass + header3 = longAt(newFreeChunk); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header4 & SizeMask); + : header3 & SizeMask); } - next = ((newFreeChunk + sz3) >= GIV(freeStart) + next = ((newFreeChunk + sz2) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); + : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -27500,24 +27484,31 @@ mapPrimTraceLog(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; - sqInt limit; sqInt remainder; sqInt selector; - limit = (((remainder = (GIV(primTraceLogIndex) - 1) % PrimTraceLogSize)) < 0 + if ((GIV(primTraceLog)[(((remainder = (GIV(primTraceLogIndex) - 1) % PrimTraceLogSize)) < 0 ? remainder + PrimTraceLogSize - : remainder); - if ((GIV(primTraceLog)[limit]) == 0) { + : remainder)]) == 0) { return; } if ((GIV(primTraceLog)[GIV(primTraceLogIndex)]) != 0) { - limit = PrimTraceLogSize - 1; + for (i = GIV(primTraceLogIndex); i < PrimTraceLogSize; i += 1) { + selector = GIV(primTraceLog)[i]; + if ((selector != 0) + && (((selector & 1) == 0) + && (((selector & 1) == 0) + && (((longAt(selector)) & MarkBit) != 0)))) { + GIV(primTraceLog)[i] = (remapObj(selector)); + } + } } - for (i = 0; i <= limit; i += 1) { + for (i = 0; i < GIV(primTraceLogIndex); i += 1) { selector = GIV(primTraceLog)[i]; - if (((selector & 1) == 0) + if ((selector != 0) && (((selector & 1) == 0) - && (((longAt(selector)) & MarkBit) != 0))) { + && (((selector & 1) == 0) + && (((longAt(selector)) & MarkBit) != 0)))) { GIV(primTraceLog)[i] = (remapObj(selector)); } } @@ -27762,22 +27753,27 @@ markAndTracePrimTraceLog(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; - sqInt limit; sqInt remainder; sqInt selector; - limit = (((remainder = (GIV(primTraceLogIndex) - 1) % PrimTraceLogSize)) < 0 + if ((GIV(primTraceLog)[(((remainder = (GIV(primTraceLogIndex) - 1) % PrimTraceLogSize)) < 0 ? remainder + PrimTraceLogSize - : remainder); - if ((GIV(primTraceLog)[limit]) == 0) { + : remainder)]) == 0) { return; } if ((GIV(primTraceLog)[GIV(primTraceLogIndex)]) != 0) { - limit = PrimTraceLogSize - 1; + for (i = GIV(primTraceLogIndex); i < PrimTraceLogSize; i += 1) { + selector = GIV(primTraceLog)[i]; + if ((selector != 0) + && ((selector & 1) == 0)) { + markAndTrace(selector); + } + } } - for (i = 0; i <= limit; i += 1) { + for (i = 0; i < GIV(primTraceLogIndex); i += 1) { selector = GIV(primTraceLog)[i]; - if (!((selector & 1))) { + if ((selector != 0) + && ((selector & 1) == 0)) { markAndTrace(selector); } } @@ -28804,7 +28800,7 @@ return longAt((methodPointer + BaseHeaderSize) + ((offset + LiteralStart) << ShiftForWord)); } -static sqInt +sqInt methodClassOf(sqInt methodPointer) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt literal; @@ -48560,7 +48556,13 @@ print("???"); } else { - safePrintStringOf(intOrSelector); + if (intOrSelector == 0) { + printNum(i); + print("!!!"); + } + else { + safePrintStringOf(intOrSelector); + } } } @@ -50524,7 +50526,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static sqInt +static usqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; @@ -51232,7 +51234,7 @@ } -/* Reduce the number if indexable fields in obj, a pointer object, to nSlots. +/* Reduce the number of indexable fields in obj, a pointer object, to nSlots. Convert the unused residual to a free chunk. Word and byte indexable objects are not changed. Answer the number of bytes returned to free memory, which may be Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-04-04 23:23:49 UTC (rev 2889) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-04-09 19:32:17 UTC (rev 2890) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.658 uuid: e40c5fd5-9990-433f-bd76-2f8d0324e24f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 */ @@ -135,6 +135,7 @@ sqInt maybeSplObj(sqInt index); void * methodCacheAddress(void); sqInt methodClassAssociationOf(sqInt methodPointer); +sqInt methodClassOf(sqInt methodPointer); sqInt methodHasCogMethod(sqInt aMethodOop); sqInt methodPrimitiveIndex(void); sqInt methodShouldBeCogged(sqInt aMethodObj); Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-04-04 23:23:49 UTC (rev 2889) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-04-09 19:32:17 UTC (rev 2890) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.658 uuid: e40c5fd5-9990-433f-bd76-2f8d0324e24f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 from - CoInterpreter VMMaker.oscog-eem.658 uuid: e40c5fd5-9990-433f-bd76-2f8d0324e24f + CoInterpreter VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.658 uuid: e40c5fd5-9990-433f-bd76-2f8d0324e24f " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -766,7 +766,7 @@ sqInt methodArg(sqInt index); void * methodCacheAddress(void); sqInt methodClassAssociationOf(sqInt methodPointer); -static sqInt methodClassOf(sqInt methodPointer); +sqInt methodClassOf(sqInt methodPointer); sqInt methodHasCogMethod(sqInt aMethodOop); static sqInt methodHeaderHasPrimitive(sqInt methodHeader); sqInt methodPrimitiveIndex(void); @@ -1155,7 +1155,7 @@ static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)); static sqInt roomToPushNArgs(sqInt n); static void runLeakCheckerForFullGC(sqInt fullGCFlag); -static sqInt safeObjectAfter(sqInt oop); +static usqInt safeObjectAfter(sqInt oop); static sqInt safePrintStringOf(sqInt oop); usqInt scavengeThresholdAddress(void); EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext); @@ -1302,8 +1302,8 @@ _iss sqInt rootTableCount; _iss usqInt memoryLimit; _iss usqInt endOfMemory; +_iss unsigned char primTraceLogIndex; _iss StackPage * mostRecentlyUsedPage; -_iss unsigned char primTraceLogIndex; _iss usqInt scavengeThreshold; _iss sqInt numStackPages; _iss sqInt needGCFlag; @@ -2043,7 +2043,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.658"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.670"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -5960,14 +5960,14 @@ } BREAK; CASE(139) - /* pushExplicitOuterSendReceiverBytecode */ + /* pushExplicitOuterReceiverBytecode */ { sqInt anIntOop; sqInt litIndex; sqInt n; sqInt object; - VM_LABEL(0pushExplicitOuterSendReceiverBytecode); + VM_LABEL(0pushExplicitOuterReceiverBytecode); litIndex = byteAtPointer(++localIP); /* begin literal: */ assert(GIV(method) == (iframeMethod(localFP))); @@ -23984,17 +23984,15 @@ sqInt header1; sqInt header2; sqInt header3; - sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - sqInt next; + usqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; - sqInt sz3; sqInt target; usqInt w; @@ -24005,21 +24003,7 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - /* begin objectAfter: */ - if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { - error("no objects after the end of memory"); - } - if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(oop)) & AllButTypeMask; - } - else { - /* begin sizeBitsOf: */ - header3 = longAt(oop); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass - ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); - } - next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); + next = ((sqInt) (objectAfter(oop))); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -24034,7 +24018,7 @@ else { sz1 = realHeader & SizeMask; } - next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); + next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -24088,18 +24072,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz3 = (longAt(newFreeChunk)) & AllButTypeMask; + sz2 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header4 = longAt(newFreeChunk); - sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass + header3 = longAt(newFreeChunk); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header4 & SizeMask); + : header3 & SizeMask); } - next = ((newFreeChunk + sz3) >= GIV(freeStart) + next = ((newFreeChunk + sz2) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); + : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -27509,24 +27493,31 @@ mapPrimTraceLog(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; - sqInt limit; sqInt remainder; sqInt selector; - limit = (((remainder = (GIV(primTraceLogIndex) - 1) % PrimTraceLogSize)) < 0 + if ((GIV(primTraceLog)[(((remainder = (GIV(primTraceLogIndex) - 1) % PrimTraceLogSize)) < 0 ? remainder + PrimTraceLogSize - : remainder); - if ((GIV(primTraceLog)[limit]) == 0) { + : remainder)]) == 0) { return; } if ((GIV(primTraceLog)[GIV(primTraceLogIndex)]) != 0) { - limit = PrimTraceLogSize - 1; + for (i = GIV(primTraceLogIndex); i < PrimTraceLogSize; i += 1) { + selector = GIV(primTraceLog)[i]; + if ((selector != 0) + && (((selector & 1) == 0) + && (((selector & 1) == 0) + && (((longAt(selector)) & MarkBit) != 0)))) { + GIV(primTraceLog)[i] = (remapObj(selector)); + } + } } - for (i = 0; i <= limit; i += 1) { + for (i = 0; i < GIV(primTraceLogIndex); i += 1) { selector = GIV(primTraceLog)[i]; - if (((selector & 1) == 0) + if ((selector != 0) && (((selector & 1) == 0) - && (((longAt(selector)) & MarkBit) != 0))) { + && (((selector & 1) == 0) + && (((longAt(selector)) & MarkBit) != 0)))) { GIV(primTraceLog)[i] = (remapObj(selector)); } } @@ -27771,22 +27762,27 @@ markAndTracePrimTraceLog(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt i; - sqInt limit; sqInt remainder; sqInt selector; - limit = (((remainder = (GIV(primTraceLogIndex) - 1) % PrimTraceLogSize)) < 0 + if ((GIV(primTraceLog)[(((remainder = (GIV(primTraceLogIndex) - 1) % PrimTraceLogSize)) < 0 ? remainder + PrimTraceLogSize - : remainder); - if ((GIV(primTraceLog)[limit]) == 0) { + : remainder)]) == 0) { return; } if ((GIV(primTraceLog)[GIV(primTraceLogIndex)]) != 0) { - limit = PrimTraceLogSize - 1; + for (i = GIV(primTraceLogIndex); i < PrimTraceLogSize; i += 1) { + selector = GIV(primTraceLog)[i]; + if ((selector != 0) + && ((selector & 1) == 0)) { + markAndTrace(selector); + } + } } - for (i = 0; i <= limit; i += 1) { + for (i = 0; i < GIV(primTraceLogIndex); i += 1) { selector = GIV(primTraceLog)[i]; - if (!((selector & 1))) { + if ((selector != 0) + && ((selector & 1) == 0)) { markAndTrace(selector); } } @@ -28813,7 +28809,7 @@ return longAt((methodPointer + BaseHeaderSize) + ((offset + LiteralStart) << ShiftForWord)); } -static sqInt +sqInt methodClassOf(sqInt methodPointer) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt literal; @@ -48569,7 +48565,13 @@ print("???"); } else { - safePrintStringOf(intOrSelector); + if (intOrSelector == 0) { + printNum(i); + print("!!!"); + } + else { + safePrintStringOf(intOrSelector); + } } } @@ -50533,7 +50535,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static sqInt +static usqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; @@ -51241,7 +51243,7 @@ } -/* Reduce the number if indexable fields in obj, a pointer object, to nSlots. +/* Reduce the number of indexable fields in obj, a pointer object, to nSlots. Convert the unused residual to a free chunk. Word and byte indexable objects are not changed. Answer the number of bytes returned to free memory, which may be Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2014-04-04 23:23:49 UTC (rev 2889) +++ branches/Cog/nscogsrc/vm/interp.h 2014-04-09 19:32:17 UTC (rev 2890) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.658 uuid: e40c5fd5-9990-433f-bd76-2f8d0324e24f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2014-04-04 23:23:49 UTC (rev 2889) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2014-04-09 19:32:17 UTC (rev 2890) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.658 uuid: e40c5fd5-9990-433f-bd76-2f8d0324e24f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2014-04-04 23:23:49 UTC (rev 2889) +++ branches/Cog/nsspursrc/vm/cogit.c 2014-04-09 19:32:17 UTC (rev 2890) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.663 uuid: b4c4ad18-808c-4afb-9ddc-80def5e01086 + CCodeGenerator VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 from - StackToRegisterMappingCogit VMMaker.oscog-eem.663 uuid: b4c4ad18-808c-4afb-9ddc-80def5e01086 + StackToRegisterMappingCogit VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.663 uuid: b4c4ad18-808c-4afb-9ddc-80def5e01086 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -744,8 +744,8 @@ static sqInt genPushConstantOneBytecode(void); static sqInt genPushConstantTrueBytecode(void); static sqInt genPushConstantZeroBytecode(void); -static sqInt genPushExplicitOuterSendReceiverBytecode(void); -static sqInt genPushExplicitOuterSendReceiver(sqInt level); +static sqInt genPushExplicitOuterReceiverBytecode(void); +static sqInt genPushExplicitOuterReceiver(sqInt level); static sqInt genPushImplicitReceiverBytecode(void); static sqInt genPushLiteralConstantBytecode(void); static sqInt genPushLiteralIndex(sqInt literalIndex); @@ -1324,7 +1324,7 @@ { duplicateTopBytecode, 0, needsFrameNever, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0 }, { genPushActiveContextBytecode, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0 }, { genPushNewArrayBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0 }, - { genPushExplicitOuterSendReceiverBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 1, 0, 0 }, + { genPushExplicitOuterReceiverBytecode, 0, 0, 0, 0, 2, 0, 0, 0, 0, 1, 0, 0 }, { genPushRemoteTempLongBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0 }, { genStoreRemoteTempLongBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0 }, { genStoreAndPopRemoteTempLongBytecode, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0 }, @@ -3046,8 +3046,7 @@ /* It's a linked send; find which kind. */ - /* begin targetMethodAndSendTableFor:annotation:into: */ - assert(annotation == IsSendCall); + /* begin targetMethodAndSendTableFor:into: */ if ((entryPoint & entryPointMask) == checkedEntryAlignment) { targetMethod1 = ((CogMethod *) (entryPoint - cmEntryOffset)); sendTable1 = sendTrampolines; @@ -11276,7 +11275,7 @@ default: if (ext < 0) { - return genPushExplicitOuterSendReceiver(0 - ext); + return genPushExplicitOuterReceiver(0 - ext); } warning("undefined extension for extPushPseudoVariableOrOuter"); return unknownBytecode(); @@ -15236,20 +15235,20 @@ /* Uncached push explicit outer send receiver */ static sqInt -genPushExplicitOuterSendReceiverBytecode(void) +genPushExplicitOuterReceiverBytecode(void) { sqInt levelOop; levelOop = getLiteral(byte1); assert((levelOop & 1)); - return genPushExplicitOuterSendReceiver((levelOop >> 1)); + return genPushExplicitOuterReceiver((levelOop >> 1)); } /* Uncached push explicit outer send receiver */ static sqInt -genPushExplicitOuterSendReceiver(sqInt level) +genPushExplicitOuterReceiver(sqInt level) { assert(needsFrame); (optStatus.isReceiverResultRegLive = 0); @@ -17188,8 +17187,7 @@ /* It's a linked send. */ - /* begin targetMethodAndSendTableFor:annotation:into: */ - assert(annotation == IsSendCall); + /* begin targetMethodAndSendTableFor:into: */ if ((entryPoint & entryPointMask) == checkedEntryAlignment) { targetMethod1 = ((CogMethod *) (entryPoint - cmEntryOffset)); sendTable1 = sendTrampolines; @@ -18211,8 +18209,9 @@ assert(startbcpc == (startPCOfMethodHeader((homeMethod->methodHeader)))); map = ((((usqInt)homeMethod)) + ((homeMethod->blockSize))) - 1; assert(((((usqInt) (byteAt(map))) >> AnnotationShift) == IsAbsPCReference) + || (((((usqInt) (byteAt(map))) >> AnnotationShift) == IsObjectReference) || (((((usqInt) (byteAt(map))) >> AnnotationShift) == IsRelativeCall) - || ((((usqInt) (byteAt(map))) >> AnnotationShift) == IsDisplacementX2N))); + || ((((usqInt) (byteAt(map))) >> AnnotationShift) == IsDisplacementX2N)))); latestContinuation = startbcpc; aMethodObj = (homeMethod->methodObject); endbcpc = (byteLengthOf(aMethodObj)) - 1; @@ -20236,16 +20235,18 @@ sqInt cacheTag1; sqInt entryPoint; sqInt entryPoint1; + sqInt ignored; sqInt literal; sqInt mappedCacheTag; sqInt mappedLiteral; sqInt mappedOop; - sqInt offset; sqInt oop; sqInt pc; + sqInt *sendTable; sqInt tagCouldBeObj; sqInt tagCouldBeObj1; CogMethod *targetMethod; + CogMethod *targetMethod1; if (annotation == IsObjectReference) { literal = literalBeforeFollowingAddress(backEnd, ((sqInt)mcpc)); @@ -20326,13 +20327,26 @@ /* It's a linked send. */ - offset = ((entryPoint1 & entryPointMask) == checkedEntryAlignment - ? cmEntryOffset - : cmNoCheckEntryOffset); - targetMethod = ((CogMethod *) (entryPoint1 - offset)); - if (isYoung((targetMethod->selector))) { + /* begin targetMethodAndSendTableFor:into: */ + if ((entryPoint1 & entryPointMask) == checkedEntryAlignment) { + targetMethod1 = ((CogMethod *) (entryPoint1 - cmEntryOffset)); + sendTable = sendTrampolines; + } + else { + if ((entryPoint1 & entryPointMask) == dynSuperEntryAlignment) { + targetMethod1 = ((CogMethod *) (entryPoint1 - cmDynSuperEntryOffset)); + sendTable = dynamicSuperSendTrampolines; + } + else { + targetMethod1 = ((CogMethod *) (entryPoint1 - cmNoCheckEntryOffset)); + sendTable = superSendTrampolines; + } + } + + if (isYoung((targetMethod1->selector))) { (((sqInt *) hasYoungPtr))[0] = 1; } + } } } @@ -21483,8 +21497,7 @@ /* It's a linked send. */ - /* begin targetMethodAndSendTableFor:annotation:into: */ - assert(annotation == IsSendCall); + /* begin targetMethodAndSendTableFor:into: */ if ((entryPoint & entryPointMask) == checkedEntryAlignment) { targetMethod1 = ((CogMethod *) (entryPoint - cmEntryOffset)); sendTable1 = sendTrampolines; @@ -21537,8 +21550,7 @@ /* It's a linked send. */ - /* begin targetMethodAndSendTableFor:annotation:into: */ - assert(annotation == IsSendCall); + /* begin targetMethodAndSendTableFor:into: */ if ((entryPoint & entryPointMask) == checkedEntryAlignment) { targetMethod1 = ((CogMethod *) (entryPoint - cmEntryOffset)); sendTable1 = sendTrampolines; @@ -21582,8 +21594,7 @@ /* It's a linked send. */ - /* begin targetMethodAndSendTableFor:annotation:into: */ - assert(annotation == IsSendCall); + /* begin targetMethodAndSendTableFor:into: */ if ((entryPoint & entryPointMask) == checkedEntryAlignment) { targetMethod1 = ((CogMethod *) (entryPoint - cmEntryOffset)); sendTable1 = sendTrampolines; @@ -21631,8 +21642,7 @@ /* It's a linked send. */ - /* begin targetMethodAndSendTableFor:annotation:into: */ - assert(annotation == IsSendCall); + /* begin targetMethodAndSendTableFor:into: */ if ((entryPoint & entryPointMask) == checkedEntryAlignment) { targetMethod1 = ((CogMethod *) (entryPoint - cmEntryOffset)); sendTable1 = sendTrampolines; @@ -21670,35 +21680,53 @@ } -/* Unlink all sends in cog methods. */ +/* Unlink all sends in cog methods. Free all Closed PICs with the selector, + or with an MNU case if isMNUSelector. First check if any method actually + has the selector; if not there can't be any linked send to it. This + routine (including descendents) is performance critical. It contributes + perhaps 30% of entire execution time in Compiler recompileAll. */ void unlinkSendsOfisMNUSelector(sqInt selector, sqInt isMNUSelector) { CogMethod *cogMethod; - sqInt freeSpace; + sqInt mustScanAndUnlink; if (methodZoneBase == null) { return; } cogMethod = ((CogMethod *) methodZoneBase); - - /* First check if any method actually has the selector; if not there can't - be any linked send to it. */ - - freeSpace = methodBytesFreedSinceLastCompaction(); - while ((cogMethod < (limitZony())) - && (((cogMethod->selector)) != selector)) { - if ((((cogMethod->cmType)) != CMFree) - && ((isMNUSelector - && ((cogMethod->cpicHasMNUCase))) - || (((cogMethod->selector)) == selector))) { - freeMethod(cogMethod); + mustScanAndUnlink = 0; + if (isMNUSelector) { + while (cogMethod < (limitZony())) { + if ((cogMethod->cpicHasMNUCase)) { + assert(((cogMethod->cmType)) == CMClosedPIC); + freeMethod(cogMethod); + mustScanAndUnlink = 1; + } + else { + if (((cogMethod->selector)) == selector) { + mustScanAndUnlink = 1; + if (((cogMethod->cmType)) == CMClosedPIC) { + freeMethod(cogMethod); + } + } + } + cogMethod = ((CogMethod *) (roundUpLength((((sqInt)cogMethod)) + ((cogMethod->blockSize))))); } - cogMethod = ((CogMethod *) (roundUpLength((((sqInt)cogMethod)) + ((cogMethod->blockSize))))); } - if ((cogMethod >= (limitZony())) - && (freeSpace == (methodBytesFreedSinceLastCompaction()))) { + else { + while (cogMethod < (limitZony())) { + if (((cogMethod->selector)) == selector) { + mustScanAndUnlink = 1; + if (((cogMethod->cmType)) == CMClosedPIC) { + freeMethod(cogMethod); + } + } + cogMethod = ((CogMethod *) (roundUpLength((((sqInt)cogMethod)) + ((cogMethod->blockSize))))); + } + } + if (!mustScanAndUnlink) { return; } codeModified = 0; Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2014-04-04 23:23:49 UTC (rev 2889) +++ branches/Cog/nsspursrc/vm/cogit.h 2014-04-09 19:32:17 UTC (rev 2890) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.663 uuid: b4c4ad18-808c-4afb-9ddc-80def5e01086 + CCodeGenerator VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 */ Modified: branches/Cog/nsspursrc/vm/cogmethod.h =================================================================== --- branches/Cog/nsspursrc/vm/cogmethod.h 2014-04-04 23:23:49 UTC (rev 2889) +++ branches/Cog/nsspursrc/vm/cogmethod.h 2014-04-09 19:32:17 UTC (rev 2890) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.663 uuid: b4c4ad18-808c-4afb-9ddc-80def5e01086 + CCodeGenerator VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 */ typedef struct { Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-04-04 23:23:49 UTC (rev 2889) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-04-09 19:32:17 UTC (rev 2890) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.663 uuid: b4c4ad18-808c-4afb-9ddc-80def5e01086 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 from - CoInterpreter VMMaker.oscog-eem.663 uuid: b4c4ad18-808c-4afb-9ddc-80def5e01086 + CoInterpreter VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.663 uuid: b4c4ad18-808c-4afb-9ddc-80def5e01086 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.670 uuid: 071bf6af-04c0-4256-b053-d66378b73d27 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -865,7 +865,7 @@ sqInt methodArg(sqInt index); void * methodCacheAddress(void); sqInt methodClassAssociationOf(sqInt methodPointer); -static sqInt methodClassOf(sqInt methodPointer); +sqInt methodClassOf(sqInt methodPointer); sqInt methodHasCogMethod(sqInt aMethodOop); static sqInt methodHeaderHasPrimitive(sqInt methodHeader); sqInt methodPrimitiveIndex(void); @@ -1262,8 +1262,6 @@ static sqInt rawHashBitsOf(sqInt objOop); sqInt rawHeaderOf(sqInt methodPointer); void rawHeaderOfput(sqInt methodOop, sqInt cogMethodOrMethodHeader); -static usqInt rawNumSlotsOf(sqInt objOop); -static usqInt rawOverflowSlotsOf(sqInt objOop); sqInt readableFormat(sqInt imageVersion); static sqInt readHeapFromImageFiledataBytes(sqImageFile f, sqInt numBytes); size_t readImageFromFileHeapSizeStartingAt(sqImageFile f, usqInt desiredHeapSize, squeakFileOffsetType imageOffset); @@ -1456,12 +1454,12 @@ _iss sqInt firstFreeChunk; _iss SpurNewSpaceSpace pastSpace; _iss sqInt rememberedSetSize; +_iss unsigned char primTraceLogIndex; _iss SpurContiguousObjStack unscannedEphemerons; _iss SpurNewSpaceSpace futureSpace; _iss usqInt newSpaceStart; _iss StackPage * mostRecentlyUsedPage; _iss sqInt numStackPages; -_iss unsigned char primTraceLogIndex; _iss sqInt classTableFirstPage; _iss usqInt oldSpaceStart; _iss sqInt futureSurvivorStart; @@ -2203,7 +2201,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.663"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.670"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -5580,22 +5578,20 @@ mClassMixin = methodClassOf(GIV(method)); mixinApplication = findApplicationOfTargetMixinstartingAtBehavior(mClassMixin, fetchClassOf(rcvr)); /* begin classTagForClass: */ - VM_LABEL(0classTagForClass); assert(addressCouldBeClassObj(longAt((mixinApplication + (BaseHeaderSize)) + (SuperclassIndex << 2)))); /* begin ensureBehaviorHash: */ + VM_LABEL(0ensureBehaviorHash); assert(addressCouldBeClassObj(longAt((mixinApplication + (BaseHeaderSize)) + (SuperclassIndex << 2)))); - if (((newHash = rawHashBitsOf(longAt((mixinApplication + (BaseHeaderSize)) + (SuperclassIndex << 2))))) == 0) { + if (((newHash = (longAt((longAt((mixinApplication + (BaseHeaderSize)) + (SuperclassIndex << 2))) + 4)) & 0x3FFFFF)) == 0) { if (((err = enterIntoClassTable(longAt((mixinApplication + (BaseHeaderSize)) + (SuperclassIndex << 2))))) != 0) { lkupClassTag = -err; goto l1; } - /* begin rawHashBitsOf: */ - flag("endianness"); newHash = (longAt((longAt((mixinApplication + (BaseHeaderSize)) + (SuperclassIndex << 2))) + 4)) & 0x3FFFFF; assert((classAtIndex(newHash)) == (longAt((mixinApplication + (BaseHeaderSize)) + (SuperclassIndex << 2)))); } lkupClassTag = newHash; - l1: /* end classTagForClass: */; + l1: /* end ensureBehaviorHash: */; goto commonSend; } break; @@ -6558,6 +6554,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((rcvr1 + (BaseHeaderSize)) + (byte3 << 2))); } + null; goto l5; } if (opType == 3) { @@ -6567,6 +6564,7 @@ assert(GIV(method) == (iframeMethod(localFP))); object = longAt((GIV(method) + (BaseHeaderSize)) + ((byte3 + LiteralStart) << 2)); longAtPointerput((localSP -= BytesPerOop), object); + null; goto l5; } if (opType == 4) { @@ -6594,6 +6592,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar1 + (BaseHeaderSize)) + (ValueIndex << 2))); + null; goto l5; } top = longAtPointer(localSP); @@ -6800,13 +6799,11 @@ superclass = longAt((classPointer + (BaseHeaderSize)) + (SuperclassIndex << 2)); /* begin ensureBehaviorHash: */ assert(addressCouldBeClassObj(superclass)); - if (((newHash = rawHashBitsOf(superclass))) == 0) { + if (((newHash = (longAt(superclass + 4)) & 0x3FFFFF)) == 0) { if (((err = enterIntoClassTable(superclass))) != 0) { -err; goto l300; } - /* begin rawHashBitsOf: */ - flag("endianness"); newHash = (longAt(superclass + 4)) & 0x3FFFFF; assert((classAtIndex(newHash)) == superclass); } @@ -6816,13 +6813,11 @@ assert(addressCouldBeClassObj(superclass)); /* begin ensureBehaviorHash: */ assert(addressCouldBeClassObj(superclass)); - if (((newHash1 = rawHashBitsOf(superclass))) == 0) { + if (((newHash1 = (longAt(superclass + 4)) & 0x3FFFFF)) == 0) { if (((err1 = enterIntoClassTable(superclass))) != 0) { lkupClassTag = -err1; goto l301; } - /* begin rawHashBitsOf: */ - flag("endianness"); newHash1 = (longAt(superclass + 4)) & 0x3FFFFF; assert((classAtIndex(newHash1)) == superclass); } @@ -6973,14 +6968,14 @@ } break; case 139: - /* pushExplicitOuterSendReceiverBytecode */ + /* pushExplicitOuterReceiverBytecode */ { sqInt anIntOop; sqInt litIndex; sqInt n; sqInt object; - VM_LABEL(0pushExplicitOuterSendReceiverBytecode); + VM_LABEL(0pushExplicitOuterReceiverBytecode); litIndex = byteAtPointer(++localIP); /* begin literal: */ assert(GIV(method) == (iframeMethod(localFP))); @@ -8885,13 +8880,11 @@ VM_LABEL(0eeInstantiateSmallClassnumSlots); /* begin ensureBehaviorHash: */ assert(addressCouldBeClassObj(longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (ClassPoint << 2)))); - if (((newHash = rawHashBitsOf(longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (ClassPoint << 2))))) == 0) { + if (((newHash = (longAt((longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (ClassPoint << 2))) + 4)) & 0x3FFFFF)) == 0) { if (((err = enterIntoClassTable(longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (ClassPoint << 2))))) != 0) { classIndex = -err; goto l90; } - /* begin rawHashBitsOf: */ - flag("endianness"); newHash = (longAt((longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (ClassPoint << 2))) + 4)) & 0x3FFFFF; assert((classAtIndex(newHash)) == (longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (ClassPoint << 2)))); } @@ -8944,13 +8937,11 @@ VM_LABEL(1eeInstantiateSmallClassnumSlots); /* begin ensureBehaviorHash: */ assert(addressCouldBeClassObj(longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (ClassPoint << 2)))); - if (((newHash1 = rawHashBitsOf(longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (ClassPoint << 2))))) == 0) { + if (((newHash1 = (longAt((longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (ClassPoint << 2))) + 4)) & 0x3FFFFF)) == 0) { if (((err1 = enterIntoClassTable(longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (ClassPoint << 2))))) != 0) { classIndex1 = -err1; goto l92; } - /* begin rawHashBitsOf: */ - flag("endianness"); newHash1 = (longAt((longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (ClassPoint << 2))) + 4)) & 0x3FFFFF; assert((classAtIndex(newHash1)) == (longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (ClassPoint << 2)))); } @@ -9036,13 +9027,11 @@ VM_LABEL(2eeInstantiateSmallClassnumSlots); /* begin ensureBehaviorHash: */ assert(addressCouldBeClassObj(longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (ClassPoint << 2)))); - if (((newHash2 = rawHashBitsOf(longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (ClassPoint << 2))))) == 0) { + if (((newHash2 = (longAt((longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (ClassPoint << 2))) + 4)) & 0x3FFFFF)) == 0) { if (((err2 = enterIntoClassTable(longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (ClassPoint << 2))))) != 0) { classIndex2 = -err2; goto l94; } - /* begin rawHashBitsOf: */ - flag("endianness"); newHash2 = (longAt((longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (ClassPoint << 2))) + 4)) & 0x3FFFFF; assert((classAtIndex(newHash2)) == (longAt((GIV(specialObjectsOop) + (BaseHeaderSize)) + (ClassPoint << 2)))); } @@ -9429,10 +9418,10 @@ usqInt numSlots1; usqInt numSlots11; usqInt numSlots2; + usqInt numSlots21; usqInt numSlots3; + usqInt numSlots31; usqInt numSlots4; - usqInt numSlots5; - usqInt numSlots6; sqInt objOop; sqInt rcvr; sqInt reasonCode; @@ -9464,61 +9453,57 @@ VM_LABEL(0installinAtCacheatstring); assert(!(isContext(rcvr))); hdr = longLongAt(rcvr); - fmt = (((unsigned sqLong)hdr) >> 24) & 0x1F; - if ((fmt == 3) + fmt1 = (((unsigned sqLong)hdr) >> 24) & 0x1F; + if ((fmt1 == 3) && ((hdr & 0x3FFFFF) == ClassMethodContextCompactIndex)) { @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.670.mcz
by commits＠source.squeak.org 09 Apr '14

09 Apr '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.670.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.670 Author: eem Time: 9 April 2014, 12:15:08.933 pm UUID: 071bf6af-04c0-4256-b053-d66378b73d27 Ancestors: VMMaker.oscog-eem.669 CoInterpreter: Garbage collect/remap the primTraceLog correctly. If a GC happens ver early in start-up the log circular buffer may not be full and the existing code assumed it always was. Cogit: Fix an assert fail in mapFor:bcpc:performUntil:arg: (this for primitiveClass where the class table reference can be the first map entry). Newspeak: Fix a bug in remapIfObjectRef:pc:hasYoung: with dynamic super sends which could compute an invalid target method. Rename pushExplicitOuterSendReceiverBytecode et al to pushExplicitOuterReceiverBytecode et al. These are not sends. Sista: Fix picDataFor: which must return integers or oops, never nil. Cope with doubleExtendedDoAnythingBytecodes which /may/ be sends or not, and hence are problematic for gathering send data. Generate correct counting code for #==, which implies it can't be frameless in Sista. Annotate the right address (the return address of the ceMustBeBooleanFoo call) in counting genJump:if:. Sista now starts up a Pharo image and can gather send and branch data for all methods. Simulator: Evaluate the cogit's break block on each bytecode in the CogVMSimulator. Add missing ObjectMemory>>ioLoadModule:OfLength:. Cope more gracefully with not finding an image. =============== Diff against VMMaker.oscog-eem.669 =============== Item was changed: ----- Method: CoInterpreter>>mapPrimTraceLog (in category 'debug support') ----- mapPrimTraceLog "The prim trace log is a circular buffer of selectors. If there is an entry at primTraceLogIndex - 1 \\ PrimTraceBufferSize it has entries. If there is something at primTraceLogIndex it has wrapped." <inline: false> + (primTraceLog at: (self safe: primTraceLogIndex - 1 mod: PrimTraceLogSize)) = 0 ifTrue: + [^self]. - | limit | - limit := self safe: primTraceLogIndex - 1 mod: PrimTraceLogSize. - (primTraceLog at: limit) = 0 ifTrue: [^self]. (primTraceLog at: primTraceLogIndex) ~= 0 ifTrue: + [primTraceLogIndex to: PrimTraceLogSize - 1 do: + [:i| | selector | + selector := primTraceLog at: i. + (selector ~= 0 + and: [objectMemory shouldRemapOop: selector]) ifTrue: + [primTraceLog at: i put: (objectMemory remapObj: selector)]]]. + 0 to: primTraceLogIndex - 1 do: - [limit := PrimTraceLogSize - 1]. - 0 to: limit do: [:i| | selector | + selector := primTraceLog at: i. + (selector ~= 0 + and: [objectMemory shouldRemapOop: selector]) ifTrue: - selector := primTraceLog at: i. - (objectMemory shouldRemapOop: selector) ifTrue: [primTraceLog at: i put: (objectMemory remapObj: selector)]]! Item was changed: ----- Method: CoInterpreter>>markAndTracePrimTraceLog (in category 'debug support') ----- markAndTracePrimTraceLog "The prim trace log is a circular buffer of selectors. If there is an entry at primTraceLogIndex - 1 \\ PrimTraceBufferSize it has entries. If there is something at primTraceLogIndex it has wrapped." <inline: false> + (primTraceLog at: (self safe: primTraceLogIndex - 1 mod: PrimTraceLogSize)) = 0 ifTrue: + [^self]. - | limit | - limit := self safe: primTraceLogIndex - 1 mod: PrimTraceLogSize. - (primTraceLog at: limit) = 0 ifTrue: [^self]. (primTraceLog at: primTraceLogIndex) ~= 0 ifTrue: + [primTraceLogIndex to: PrimTraceLogSize - 1 do: + [:i| | selector | + selector := primTraceLog at: i. + (selector ~= 0 + and: [objectMemory isNonImmediate: selector]) ifTrue: + [objectMemory markAndTrace: selector]]]. + 0 to: primTraceLogIndex - 1 do: - [limit := PrimTraceLogSize - 1]. - 0 to: limit do: [:i| | selector | selector := primTraceLog at: i. + (selector ~= 0 + and: [objectMemory isNonImmediate: selector]) ifTrue: - (objectMemory isImmediate: selector) ifFalse: [objectMemory markAndTrace: selector]]! Item was changed: ----- Method: CoInterpreter>>printPrimLogEntryAt: (in category 'debug support') ----- printPrimLogEntryAt: i <inline: false> | intOrSelector | intOrSelector := primTraceLog at: i. (objectMemory isImmediate: intOrSelector) ifTrue: [intOrSelector = TraceIncrementalGC ifTrue: [self print: '**IncrementalGC**'. ^nil]. intOrSelector = TraceFullGC ifTrue: [self print: '**FullGC**'. ^nil]. intOrSelector = TraceCodeCompaction ifTrue: [self print: '**CompactCode**'. ^nil]. self print: '???'] ifFalse: + [intOrSelector = 0 + ifTrue: [self printNum: i; print: '!!!!!!'] + ifFalse: [objectMemory safePrintStringOf: intOrSelector]]! - [objectMemory safePrintStringOf: intOrSelector]! Item was changed: ----- Method: CoInterpreterPrimitives>>picDataFor: (in category 'method introspection support') ----- picDataFor: cogMethod <var: #cogMethod type: #'CogMethod *'> | cm nSlots nEntries data | cm := cogMethod methodObject. nSlots := (objectMemory byteSizeOf: cm) - (self startPCOfMethod: cm) + objectMemory minSlotsForShortening. data := objectMemory instantiateClass: (objectMemory splObj: ClassArray) indexableSize: nSlots. nEntries := cogit picDataFor: cogMethod into: data. nEntries = 0 ifTrue: + [^0]. - [^nil]. nEntries < nSlots ifTrue: [objectMemory shorten: data toIndexableSize: nEntries]. ^data! Item was changed: ----- Method: CogVMSimulator>>dispatchOn:in: (in category 'interpreter shell') ----- dispatchOn: anInteger in: selectorArray "Simulate a case statement via selector table lookup. The given integer must be between 0 and selectorArray size-1, inclusive. For speed, no range test is done, since it is done by the at: operation. Note that, unlike many other arrays used in the Interpreter, this method expect NO CArrayAccessor wrapping - it would duplicate the +1. Maybe this would be better updated to make it all uniform" + cogit breakBlock ifNotNil: + [:bb| (bb value: cogit) ifTrue: [self halt: 'breakpoint reached']]. - self perform: (selectorArray at: (anInteger + 1)).! Item was changed: ----- Method: CogVMSimulator>>openOn:extraMemory: (in category 'initialization') ----- openOn: fileName extraMemory: extraBytes "CogVMSimulator new openOn: 'clone.im' extraMemory: 100000" | f version headerSize dataSize count oldBaseAddr bytesToShift swapBytes headerFlags firstSegSize heapSize hdrNumStackPages hdrEdenBytes hdrMaxExtSemTabSize hdrCogCodeSize stackZoneSize methodCacheSize primTraceLogSize | "open image file and read the header" - ["begin ensure block..." f := FileStream readOnlyFileNamed: fileName. + f ifNil: [^self error: 'no image found']. + + ["begin ensure block..." imageName := f fullName. f binary. + version := self nextLongFrom: f. "current version: 16r1968 (=6504) vive la revolucion!!" (self readableFormat: version) ifTrue: [swapBytes := false] ifFalse: [(version := objectMemory byteSwapped: version) = self imageFormatVersion ifTrue: [swapBytes := true] ifFalse: [self error: 'incomaptible image format']]. headerSize := self getLongFromFile: f swap: swapBytes. dataSize := self getLongFromFile: f swap: swapBytes. "length of heap in file" oldBaseAddr := self getLongFromFile: f swap: swapBytes. "object memory base address of image" objectMemory specialObjectsOop: (self getLongFromFile: f swap: swapBytes). objectMemory lastHash: (self getLongFromFile: f swap: swapBytes). "Should be loaded from, and saved to the image header" savedWindowSize := self getLongFromFile: f swap: swapBytes. headerFlags := self getLongFromFile: f swap: swapBytes. self setImageHeaderFlagsFrom: headerFlags. extraVMMemory := self getLongFromFile: f swap: swapBytes. hdrNumStackPages := self getShortFromFile: f swap: swapBytes. "4 stack pages is small. Should be able to run with as few as three. 4 should be comfortable but slow. 8 is a reasonable default. Can be changed via vmParameterAt: 43 put: n" numStackPages := desiredNumStackPages ~= 0 ifTrue: [desiredNumStackPages] ifFalse: [hdrNumStackPages = 0 ifTrue: [self defaultNumStackPages] ifFalse: [hdrNumStackPages]]. desiredNumStackPages := hdrNumStackPages. stackZoneSize := self computeStackZoneSize. "This slot holds the size of the native method zone in 1k units. (pad to word boundary)." hdrCogCodeSize := (self getShortFromFile: f swap: swapBytes) * 1024. cogCodeSize := desiredCogCodeSize ~= 0 ifTrue: [desiredCogCodeSize] ifFalse: [hdrCogCodeSize = 0 ifTrue: [self defaultCogCodeSize] ifFalse: [hdrCogCodeSize]]. desiredCogCodeSize := hdrCogCodeSize. self assert: f position = 40. hdrEdenBytes := self getLongFromFile: f swap: swapBytes. objectMemory edenBytes: (desiredEdenBytes ~= 0 ifTrue: [desiredEdenBytes] ifFalse: [hdrEdenBytes = 0 ifTrue: [objectMemory defaultEdenBytes] ifFalse: [hdrEdenBytes]]). desiredEdenBytes := hdrEdenBytes. hdrMaxExtSemTabSize := self getShortFromFile: f swap: swapBytes. hdrMaxExtSemTabSize ~= 0 ifTrue: [self setMaxExtSemSizeTo: hdrMaxExtSemTabSize]. "pad to word boundary. This slot can be used for anything else that will fit in 16 bits. Preserve it to be polite to other VMs." the2ndUnknownShort := self getShortFromFile: f swap: swapBytes. self assert: f position = 48. firstSegSize := self getLongFromFile: f swap: swapBytes. objectMemory firstSegmentSize: firstSegSize. "For Open PICs to be able to probe the method cache during simulation the methodCache must be relocated to memory." methodCacheSize := methodCache size * BytesPerWord. primTraceLogSize := primTraceLog size * BytesPerWord. "allocate interpreter memory. This list is in address order, low to high. In the actual VM the stack zone exists on the C stack." heapBase := (Cogit guardPageSize + cogCodeSize + stackZoneSize + methodCacheSize + primTraceLogSize + self rumpCStackSize) roundUpTo: objectMemory allocationUnit. heapSize := dataSize + extraBytes + objectMemory newSpaceBytes + self interpreterAllocationReserveBytes + (objectMemory hasSpurMemoryManagerAPI ifTrue: [headerSize] ifFalse: [0]). heapBase := objectMemory setHeapBase: heapBase memoryLimit: heapBase + heapSize endOfMemory: heapBase + dataSize. self assert: cogCodeSize \\ 4 = 0. self assert: objectMemory memoryLimit \\ 4 = 0. self assert: self rumpCStackSize \\ 4 = 0. "read in the image in bulk, then swap the bytes if necessary" f position: headerSize. objectMemory memory: ((cogit processor endianness == #little ifTrue: [LittleEndianBitmap] ifFalse: [Bitmap]) new: objectMemory memoryLimit // 4). count := objectMemory readHeapFromImageFile: f dataBytes: dataSize. count ~= dataSize ifTrue: [self halt]. ] ensure: [f close]. self moveMethodCacheToMemoryAt: objectMemory cogCodeBase + cogCodeSize + stackZoneSize. self movePrimTraceLogToMemoryAt: objectMemory cogCodeBase + cogCodeSize + stackZoneSize + methodCacheSize. self ensureImageFormatIsUpToDate: swapBytes. bytesToShift := objectMemory memoryBaseForImageRead - oldBaseAddr. "adjust pointers for zero base address" Utilities informUser: 'Relocating object pointers...' during: [self initializeInterpreter: bytesToShift]. self initializeCodeGenerator! Item was added: + ----- Method: Cogit>>breakBlock (in category 'simulation only') ----- + breakBlock + <doNotGenerate> + ^breakBlock! Item was changed: ----- Method: Cogit>>mapFor:bcpc:performUntil:arg: (in category 'method map') ----- mapFor: cogMethod bcpc: startbcpc performUntil: functionSymbol arg: arg "Machine-code <-> bytecode pc mapping support. Evaluate functionSymbol for each mcpc, bcpc pair in the map until the function returns non-zero, answering that result, or 0 if it fails to. This works only for frameful methods." <var: #cogMethod type: #'CogBlockMethod *'> <var: #functionSymbol declareC: 'sqInt (*functionSymbol)(char *mcpc, sqInt bcpc, void *arg)'> <var: #arg type: #'void *'> | isInBlock mcpc bcpc endbcpc map mapByte homeMethod aMethodObj result latestContinuation byte descriptor bsOffset nExts | <var: #descriptor type: #'BytecodeDescriptor *'> <var: #homeMethod type: #'CogMethod *'> self assert: cogMethod stackCheckOffset > 0. "In both CMMethod and CMBlock cases find the start of the map and skip forward to the bytecode pc map entry for the stack check." cogMethod cmType = CMMethod ifTrue: [isInBlock := false. homeMethod := self cCoerceSimple: cogMethod to: #'CogMethod *'. self assert: startbcpc = (coInterpreter startPCOfMethodHeader: homeMethod methodHeader). map := self mapStartFor: homeMethod. self assert: ((objectMemory byteAt: map) >> AnnotationShift = IsAbsPCReference + or: [(objectMemory byteAt: map) >> AnnotationShift = IsObjectReference or: [(objectMemory byteAt: map) >> AnnotationShift = IsRelativeCall + or: [(objectMemory byteAt: map) >> AnnotationShift = IsDisplacementX2N]]]). - or: [(objectMemory byteAt: map) >> AnnotationShift = IsDisplacementX2N]]). latestContinuation := startbcpc. aMethodObj := homeMethod methodObject. endbcpc := (objectMemory byteLengthOf: aMethodObj) - 1. bsOffset := self bytecodeSetOffsetForHeader: homeMethod methodHeader] ifFalse: [isInBlock := true. homeMethod := cogMethod cmHomeMethod. map := self findMapLocationForMcpc: cogMethod asUnsignedInteger + (self sizeof: CogBlockMethod) inMethod: homeMethod. self assert: map ~= 0. self assert: ((objectMemory byteAt: map) >> AnnotationShift = HasBytecodePC "fiducial" or: [(objectMemory byteAt: map) >> AnnotationShift = IsDisplacementX2N]). [(objectMemory byteAt: map) >> AnnotationShift ~= HasBytecodePC] whileTrue: [map := map - 1]. map := map - 1. "skip fiducial; i.e. the map entry for the pc immediately following the method header." aMethodObj := homeMethod methodObject. bcpc := startbcpc - (self blockCreationBytecodeSizeForHeader: homeMethod methodHeader). bsOffset := self bytecodeSetOffsetForHeader: homeMethod methodHeader. byte := (objectMemory fetchByte: bcpc ofObject: aMethodObj) + bsOffset. descriptor := self generatorAt: byte. endbcpc := self nextBytecodePCFor: descriptor at: bcpc exts: -1 in: aMethodObj]. bcpc := startbcpc. mcpc := cogMethod asUnsignedInteger + cogMethod stackCheckOffset. nExts := 0. "The stack check maps to the start of the first bytecode, the first bytecode being effectively after frame build." result := self perform: functionSymbol with: (self cCoerceSimple: mcpc to: #'char *') with: startbcpc with: arg. result ~= 0 ifTrue: [^result]. "Now skip up through the bytecode pc map entry for the stack check." [(objectMemory byteAt: map) >> AnnotationShift ~= HasBytecodePC] whileTrue: [map := map - 1]. map := map - 1. [(mapByte := objectMemory byteAt: map) ~= MapEnd] whileTrue: "defensive; we exit on bcpc" [mapByte >= FirstAnnotation ifTrue: [| annotation nextBcpc | annotation := mapByte >> AnnotationShift. mcpc := mcpc + (mapByte bitAnd: DisplacementMask). (self isPCMappedAnnotation: annotation alternateInstructionSet: bsOffset > 0) ifTrue: [[byte := (objectMemory fetchByte: bcpc ofObject: aMethodObj) + bsOffset. descriptor := self generatorAt: byte. isInBlock ifTrue: [bcpc >= endbcpc ifTrue: [^0]] ifFalse: [(descriptor isReturn and: [bcpc >= latestContinuation]) ifTrue: [^0]. (descriptor isBranch or: [descriptor isBlockCreation]) ifTrue: [| targetPC | targetPC := self latestContinuationPCFor: descriptor at: bcpc exts: nExts in: aMethodObj. latestContinuation := latestContinuation max: targetPC]]. nextBcpc := self nextBytecodePCFor: descriptor at: bcpc exts: nExts in: aMethodObj. descriptor isMapped or: [isInBlock and: [descriptor isMappedInBlock]]] whileFalse: [bcpc := nextBcpc. nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]]. "All subsequent bytecodes except backward branches map to the following bytecode. Backward branches map to themselves other- wise mapping could cause premature breaking out of loops." result := self perform: functionSymbol with: (self cCoerceSimple: mcpc to: #'char *') with: ((descriptor isBranch and: [self isBackwardBranch: descriptor at: bcpc exts: nExts in: aMethodObj]) ifTrue: [bcpc] ifFalse: [bcpc + descriptor numBytes]) with: arg. result ~= 0 ifTrue: [^result]. bcpc := nextBcpc. nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]]] ifFalse: [mcpc := mcpc + (mapByte >= DisplacementX2N ifTrue: [mapByte - DisplacementX2N << AnnotationShift] ifFalse: [mapByte])]. map := map - 1]. ^0! Item was changed: ----- Method: Cogit>>remapIfObjectRef:pc:hasYoung: (in category 'garbage collection') ----- remapIfObjectRef: annotation pc: mcpc hasYoung: hasYoungPtr <var: #mcpc type: #'char *'> <var: #targetMethod type: #'CogMethod *'> annotation = IsObjectReference ifTrue: [| literal mappedLiteral | literal := backEnd literalBeforeFollowingAddress: mcpc asInteger. (objectRepresentation couldBeObject: literal) ifTrue: [mappedLiteral := objectRepresentation remapObject: literal. literal ~= mappedLiteral ifTrue: [backEnd storeLiteral: mappedLiteral beforeFollowingAddress: mcpc asInteger. codeModified := true]. (hasYoungPtr ~= 0 and: [objectMemory isYoung: mappedLiteral]) ifTrue: [(self cCoerceSimple: hasYoungPtr to: #'sqInt *') at: 0 put: true]]]. (self isSendAnnotation: annotation) ifTrue: [self offsetCacheTagAndCouldBeObjectAt: mcpc annotation: annotation into: [:entryPoint :cacheTag :tagCouldBeObj | | mappedCacheTag | (tagCouldBeObj and: [objectRepresentation couldBeObject: cacheTag]) ifTrue: [mappedCacheTag := objectRepresentation remapObject: cacheTag. cacheTag ~= mappedCacheTag ifTrue: [backEnd rewriteInlineCacheTag: mappedCacheTag at: mcpc asInteger. codeModified := true]. (hasYoungPtr ~= 0 and: [objectMemory isYoung: mappedCacheTag]) ifTrue: [(self cCoerceSimple: hasYoungPtr to: #'sqInt *') at: 0 put: true]]. (self cppIf: NewspeakVM ifTrue: [entryPoint = ceImplicitReceiverTrampoline] ifFalse: [false]) ifTrue: [| pc oop mappedOop | pc := mcpc asInteger + backEnd jumpShortByteSize. (oop := backEnd unalignedLongAt: pc) ~= 0 ifTrue: [mappedOop := objectRepresentation remapOop: oop. mappedOop ~= oop ifTrue: [backEnd unalignedLongAt: pc put: mappedOop]. (hasYoungPtr ~= 0 and: [objectMemory isYoung: mappedOop]) ifTrue: [(self cCoerceSimple: hasYoungPtr to: #'sqInt *') at: 0 put: true]. pc := mcpc asInteger + backEnd jumpShortByteSize + BytesPerOop. (oop := backEnd unalignedLongAt: pc) ~= 0 ifTrue: [mappedOop := objectRepresentation remapOop: oop. mappedOop ~= oop ifTrue: [backEnd unalignedLongAt: pc put: mappedOop]. (hasYoungPtr ~= 0 and: [objectMemory isYoung: mappedOop]) ifTrue: [(self cCoerceSimple: hasYoungPtr to: #'sqInt *') at: 0 put: true]]]] ifFalse: [hasYoungPtr ~= 0 ifTrue: + ["Since the unlinking routines may rewrite the cacheTag to the send's selector, and - [| offset targetMethod | - "Since the unlinking routines may rewrite the cacheTag to the send's selector, and since they don't have the cogMethod to hand and can't add it to youngReferrers, the method must remain in youngReferrers if the targetMethod's selector is young." entryPoint > methodZoneBase ifTrue: "It's a linked send." + [self targetMethodAndSendTableFor: entryPoint into: + [:targetMethod :ignored| + (objectMemory isYoung: targetMethod selector) ifTrue: + [(self cCoerceSimple: hasYoungPtr to: #'sqInt *') at: 0 put: true]]]]]]]. - [offset := (entryPoint bitAnd: entryPointMask) = checkedEntryAlignment - ifTrue: [cmEntryOffset] - ifFalse: [cmNoCheckEntryOffset]. - targetMethod := self cCoerceSimple: entryPoint - offset to: #'CogMethod *'. - (objectMemory isYoung: targetMethod selector) ifTrue: - [(self cCoerceSimple: hasYoungPtr to: #'sqInt *') at: 0 put: true]]]]]]. ^0 "keep scanning"! Item was changed: ----- Method: NewspeakInterpreter class>>initializeBytecodeTable (in category 'initialization') ----- initializeBytecodeTable "NewspeakInterpreter initializeBytecodeTable" "Note: This table will be used to generate a C switch statement." BytecodeTable := Array new: 256. self table: BytecodeTable from: #( ( 0 15 pushReceiverVariableBytecode) ( 16 31 pushTemporaryVariableBytecode) ( 32 63 pushLiteralConstantBytecode) ( 64 95 pushLiteralVariableBytecode) ( 96 103 storeAndPopReceiverVariableBytecode) (104 111 storeAndPopTemporaryVariableBytecode) (112 pushReceiverBytecode) (113 pushConstantTrueBytecode) (114 pushConstantFalseBytecode) (115 pushConstantNilBytecode) (116 pushConstantMinusOneBytecode) (117 pushConstantZeroBytecode) (118 pushConstantOneBytecode) (119 pushConstantTwoBytecode) (120 returnReceiver) (121 returnTrue) (122 returnFalse) (123 returnNil) (124 returnTopFromMethod) (125 returnTopFromBlock) "Newspeak bytecodes" (126 dynamicSuperSendBytecode) (127 pushImplicitReceiverBytecode) (128 extendedPushBytecode) (129 extendedStoreBytecode) (130 extendedStoreAndPopBytecode) (131 singleExtendedSendBytecode) (132 doubleExtendedDoAnythingBytecode) (133 singleExtendedSuperBytecode) (134 secondExtendedSendBytecode) (135 popStackBytecode) (136 duplicateTopBytecode) (137 pushActiveContextBytecode) "Closure & Newspeak bytecodes" (138 pushNewArrayBytecode) + (139 pushExplicitOuterReceiverBytecode) - (139 pushExplicitOuterSendReceiverBytecode) (140 pushRemoteTempLongBytecode) (141 storeRemoteTempLongBytecode) (142 storeAndPopRemoteTempLongBytecode) (143 pushClosureCopyCopiedValuesBytecode) (144 151 shortUnconditionalJump) (152 159 shortConditionalJump) (160 167 longUnconditionalJump) (168 171 longJumpIfTrue) (172 175 longJumpIfFalse) "176-191 were sendArithmeticSelectorBytecode" (176 bytecodePrimAdd) (177 bytecodePrimSubtract) (178 bytecodePrimLessThan) (179 bytecodePrimGreaterThan) (180 bytecodePrimLessOrEqual) (181 bytecodePrimGreaterOrEqual) (182 bytecodePrimEqual) (183 bytecodePrimNotEqual) (184 bytecodePrimMultiply) (185 bytecodePrimDivide) (186 bytecodePrimMod) (187 bytecodePrimMakePoint) (188 bytecodePrimBitShift) (189 bytecodePrimDiv) (190 bytecodePrimBitAnd) (191 bytecodePrimBitOr) "192-207 were sendCommonSelectorBytecode" (192 bytecodePrimAt) (193 bytecodePrimAtPut) (194 bytecodePrimSize) (195 bytecodePrimNext) (196 bytecodePrimNextPut) (197 bytecodePrimAtEnd) (198 bytecodePrimEquivalent) (199 bytecodePrimClass) (200 bytecodePrimBlockCopy) (201 bytecodePrimValue) (202 bytecodePrimValueWithArg) (203 bytecodePrimDo) (204 bytecodePrimNew) (205 bytecodePrimNewWithArg) (206 bytecodePrimPointX) (207 bytecodePrimPointY) (208 223 sendLiteralSelector0ArgsBytecode) (224 239 sendLiteralSelector1ArgBytecode) (240 255 sendLiteralSelector2ArgsBytecode) ).! Item was added: + ----- Method: NewspeakInterpreter>>pushExplicitOuterReceiverBytecode (in category 'stack bytecodes') ----- + pushExplicitOuterReceiverBytecode + "Find the appropriate implicit receiver for outer N" + | mClassMixin litIndex n anInt | + <inline: true> + litIndex := self fetchByte. + anInt := self literal: litIndex. + n := self checkedIntegerValueOf: anInt. + self fetchNextBytecode. + mClassMixin := self methodClassOf: method. + self internalPush:(self + explicitOuterReceiver: n + withObject: receiver + withMixin: mClassMixin + ) + ! Item was added: + ----- Method: ObjectMemory>>ioLoadModule:OfLength: (in category 'simulation') ----- + ioLoadModule: moduleNameIndex OfLength: moduleLength + <doNotGenerate> + <returnTypeC: #'void *'> + "Dummy - provided by support code" + ^0! Item was changed: ----- Method: SimpleStackBasedCogit class>>initializeBytecodeTableForNewspeakV3PlusClosures (in category 'class initialization') ----- initializeBytecodeTableForNewspeakV3PlusClosures "SimpleStackBasedCogit initializeBytecodeTableForNewspeakV3PlusClosures" NSSendIsPCAnnotated := true. "IsNSSendCall used by PushImplicitReceiver" self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( (1 0 15 genPushReceiverVariableBytecode) (1 16 31 genPushTemporaryVariableBytecode) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) (1 64 95 genPushLiteralVariableBytecode needsFrameNever: 1) (1 96 103 genStoreAndPopReceiverVariableBytecode needsFrameNever: -1) "N.B. not frameless if immutability" (1 104 111 genStoreAndPopTemporaryVariableBytecode) (1 112 112 genPushReceiverBytecode) (1 113 113 genPushConstantTrueBytecode needsFrameNever: 1) (1 114 114 genPushConstantFalseBytecode needsFrameNever: 1) (1 115 115 genPushConstantNilBytecode needsFrameNever: 1) (1 116 119 genPushQuickIntegerConstantBytecode needsFrameNever: 1) "method returns in blocks need a frame because of nonlocalReturn:through:" (1 120 120 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 121 121 genReturnTrue return needsFrameIfInBlock: isMappedInBlock 0) (1 122 122 genReturnFalse return needsFrameIfInBlock: isMappedInBlock 0) (1 123 123 genReturnNil return needsFrameIfInBlock: isMappedInBlock 0) (1 124 124 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 125 125 genReturnTopFromBlock return needsFrameNever: -1) (3 126 126 genDynamicSuperSendBytecode isMapped) "Newspeak" (2 127 127 genPushImplicitReceiverBytecode isMapped) "Newspeak" (2 128 128 extendedPushBytecode needsFrameNever: 1) (2 129 129 extendedStoreBytecode) (2 130 130 extendedStoreAndPopBytecode) (2 131 131 genExtendedSendBytecode isMapped) (3 132 132 doubleExtendedDoAnythingBytecode isMapped) (2 133 133 genExtendedSuperBytecode isMapped) (2 134 134 genSecondExtendedSendBytecode isMapped) (1 135 135 genPopStackBytecode needsFrameNever: -1) (1 136 136 duplicateTopBytecode needsFrameNever: 1) (1 137 137 genPushActiveContextBytecode) (2 138 138 genPushNewArrayBytecode) + (2 139 139 genPushExplicitOuterReceiverBytecode isMapped) "Newspeak" - (2 139 139 genPushExplicitOuterSendReceiverBytecode isMapped) "Newspeak" (3 140 140 genPushRemoteTempLongBytecode) (3 141 141 genStoreRemoteTempLongBytecode) (3 142 142 genStoreAndPopRemoteTempLongBytecode) (4 143 143 genPushClosureCopyCopiedValuesBytecode block v3:Block:Code:Size:) (1 144 151 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 152 159 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (2 160 163 genLongUnconditionalBackwardJump branch isMapped "because of interrupt check" v3:Long:Branch:Distance:) (2 164 167 genLongUnconditionalForwardJump branch v3:Long:Branch:Distance:) (2 168 171 genLongJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:LongForward:Branch:Distance:) (2 172 175 genLongJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:LongForward:Branch:Distance:) (1 176 197 genSpecialSelectorSend isMapped) (1 198 198 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" (1 199 199 genSpecialSelectorClass needsFrameNever: notMapped 0) "not mapped because it is directly inlined (for now)" (1 200 207 genSpecialSelectorSend isMapped) (1 208 223 genSendLiteralSelector0ArgsBytecode isMapped) (1 224 239 genSendLiteralSelector1ArgBytecode isMapped) (1 240 255 genSendLiteralSelector2ArgsBytecode isMapped))! Item was changed: ----- Method: SimpleStackBasedCogit>>genExtPushPseudoVariableOrOuterBytecode (in category 'bytecode generators') ----- genExtPushPseudoVariableOrOuterBytecode "77 01001101 Push false [* 1:true, 2:nil, 3:thisContext, ..., -N: pushExplicitOuter: N, N = Extend B]" | ext | ext := extB. extB := 0. ext caseOf: { [0] -> [^self genPushLiteral: objectMemory falseObject]. [1] -> [^self genPushLiteral: objectMemory trueObject]. [2] -> [^self genPushLiteral: objectMemory nilObject]. [3] -> [^self genPushActiveContextBytecode] } otherwise: [ext < 0 ifTrue: + [^self genPushExplicitOuterReceiver: 0 - ext]. - [^self genPushExplicitOuterSendReceiver: 0 - ext]. self warning: 'undefined extension for extPushPseudoVariableOrOuter'. ^self unknownBytecode]. ^0! Item was added: + ----- Method: SimpleStackBasedCogit>>genPushExplicitOuterReceiver: (in category 'bytecode generators') ----- + genPushExplicitOuterReceiver: level + "Uncached push explicit outer send receiver" + self assert: needsFrame. "because this should always be followed by a send" + self MoveCq: level R: SendNumArgsReg. + self CallRT: ceExplicitReceiverTrampoline. + self PushR: ReceiverResultReg. + ^0! Item was added: + ----- Method: SimpleStackBasedCogit>>genPushExplicitOuterReceiverBytecode (in category 'bytecode generators') ----- + genPushExplicitOuterReceiverBytecode + "Uncached push explicit outer send receiver" + | levelOop | + levelOop := self getLiteral: byte1. + self assert: (objectMemory isIntegerObject: levelOop). + ^self genPushExplicitOuterReceiver: (objectMemory integerValueOf: levelOop)! Item was removed: - ----- Method: SimpleStackBasedCogit>>genPushExplicitOuterSendReceiver: (in category 'bytecode generators') ----- - genPushExplicitOuterSendReceiver: level - "Uncached push explicit outer send receiver" - self assert: needsFrame. "because this should always be followed by a send" - self MoveCq: level R: SendNumArgsReg. - self CallRT: ceExplicitReceiverTrampoline. - self PushR: ReceiverResultReg. - ^0! Item was removed: - ----- Method: SimpleStackBasedCogit>>genPushExplicitOuterSendReceiverBytecode (in category 'bytecode generators') ----- - genPushExplicitOuterSendReceiverBytecode - "Uncached push explicit outer send receiver" - | levelOop | - levelOop := self getLiteral: byte1. - self assert: (objectMemory isIntegerObject: levelOop). - ^self genPushExplicitOuterSendReceiver: (objectMemory integerValueOf: levelOop)! Item was added: + ----- Method: SistaStackToRegisterMappingCogit class>>generatorTableFrom: (in category 'class initialization') ----- + generatorTableFrom: anArray + "Override to replace the unmapped, non-counting inlined #== with a mapped counting inlined #==." + | table | + table := super generatorTableFrom: anArray. + table object do: + [:descriptor| + descriptor generator == #genSpecialSelectorEqualsEquals ifTrue: + [descriptor + isMapped: true; + isMappedInBlock: true; + needsFrameFunction: nil]]. + ^table! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>genJumpIf:to: (in category 'bytecode generators') ----- genJumpIf: boolean to: targetBytecodePC "The heart of performance counting in Sista. Conditional branches are 6 times less frequent than sends and can provide basic block frequencies (send counters can't). Each conditional has a 32-bit counter split into an upper 16 bits counting executions and a lower half counting untaken executions of the branch. Executing the branch decrements the upper half, tripping if the count goes negative. Not taking the branch decrements the lower half. N.B. We *do not* eliminate dead branches (true ifTrue:/true ifFalse:) so that scanning for send and branch data is simplified and that branch data is correct." <inline: false> | desc ok counter countTripped retry | <var: #desc type: #'CogSimStackEntry *'> <var: #ok type: #'AbstractInstruction *'> <var: #retry type: #'AbstractInstruction *'> <var: #counter type: #'AbstractInstruction *'> <var: #countTripped type: #'AbstractInstruction *'> self ssFlushTo: simStackPtr - 1. desc := self ssTop. self ssPop: 1. desc popToReg: TempReg. self ssAllocateRequiredReg: SendNumArgsReg. "Use this as the count reg." counter := self addressOf: (counters at: counterIndex). counterIndex := counterIndex + 1. self flag: 'will need to use MoveAw32:R: if 64 bits'. self assert: BytesPerWord = CounterBytes. retry := counter addDependent: (self annotateAbsolutePCRef: (self MoveAw: counter asUnsignedInteger R: SendNumArgsReg)). self SubCq: 16r10000 R: SendNumArgsReg. "Count executed" "Don't write back if we trip; avoids wrapping count back to initial value, and if we trip we don't execute." countTripped := self JumpCarry: 0. counter addDependent: (self annotateAbsolutePCRef: (self MoveR: SendNumArgsReg Aw: counter asUnsignedInteger)). "write back" "Cunning trick by LPD. If true and false are contiguous subtract the smaller. Correct result is either 0 or the distance between them. If result is not 0 or their distance send mustBeBoolean." self assert: (objectMemory objectAfter: objectMemory falseObject) = objectMemory trueObject. self annotate: (self SubCw: boolean R: TempReg) objRef: boolean. self JumpZero: (self ensureFixupAt: targetBytecodePC - initialPC). self SubCq: 1 R: SendNumArgsReg. "Count untaken" counter addDependent: (self annotateAbsolutePCRef: (self MoveR: SendNumArgsReg Aw: counter asUnsignedInteger)). "write back" self CmpCq: (boolean == objectMemory falseObject ifTrue: [objectMemory trueObject - objectMemory falseObject] ifFalse: [objectMemory falseObject - objectMemory trueObject]) R: TempReg. ok := self JumpZero: 0. self MoveCq: 0 R: SendNumArgsReg. "if SendNumArgsReg is 0 this is a mustBeBoolean, not a counter trip." countTripped jmpTarget: (self CallRT: (boolean == objectMemory falseObject ifTrue: [ceSendMustBeBooleanAddFalseTrampoline] ifFalse: [ceSendMustBeBooleanAddTrueTrampoline])). "If we're in an image which hasn't got the Sista code loaded then the ceCounterTripped: trampoline will return directly to machine code, returning the boolean. So the code should jump back to the retry point. This is always the point at which the boolean is tested. The register to be tested must be reloaded with the return value of the trampoline, if it differs from cResultRegister. In images with the Sista code loaded, return must be via backing up the PC to after the send, and returning (this time answering the boolean via ReceiverResultReg). For this case, and for normal mustBeBoolean + processing, the return address of the mustBeBoolean trampoline call must be annotated as a bytecode pc." + self annotateBytecode: self Label. + backEnd cResultRegister ~= TempReg ifTrue: + [self MoveR: backEnd cResultRegister R: TempReg]. + self Jump: retry. - processing, the instruction after the mustBeBoolean trampoline must be annotated as having a bytecode pc." - backEnd cResultRegister ~= TempReg - ifTrue: - [self annotateBytecode: (self MoveR: backEnd cResultRegister R: TempReg). - self Jump: retry] - ifFalse: - [self annotateBytecode: (self Jump: retry)]. ok jmpTarget: self Label. ^0! Item was added: + ----- Method: SistaStackToRegisterMappingCogit>>genSpecialSelectorEqualsEquals (in category 'bytecode generators') ----- + genSpecialSelectorEqualsEquals + "Override to count inlined branches if followed by a conditional branch. + We borrow the following conditional branch's counter and when about to + inline the comparison we decrement the counter (without writing it back) + and if it trips simply abort the inlining, falling back to the normal send which + will then continue to the conditional branch which will trip and enter the abort." + | nextPC postBranchPC targetBytecodePC primDescriptor branchDescriptor nExts + counter countTripped | + <var: #primDescriptor type: #'BytecodeDescriptor *'> + <var: #branchDescriptor type: #'BytecodeDescriptor *'> + <var: #counter type: #'AbstractInstruction *'> + <var: #countTripped type: #'AbstractInstruction *'> + self ssFlushTo: simStackPtr - 2. + primDescriptor := self generatorAt: byte0. + + nextPC := bytecodePC + primDescriptor numBytes. + nExts := 0. + [branchDescriptor := self generatorAt: (objectMemory fetchByte: nextPC ofObject: methodObj) + (byte0 bitAnd: 256). + branchDescriptor isExtension] whileTrue: + [nExts := nExts + 1. + nextPC := nextPC + branchDescriptor numBytes]. + "Only interested in inlining if followed by a conditional branch." + (branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]) ifFalse: + [^self genSpecialSelectorSend]. + + targetBytecodePC := nextPC + + branchDescriptor numBytes + + (self spanFor: branchDescriptor at: nextPC exts: nExts in: methodObj). + postBranchPC := nextPC + branchDescriptor numBytes. + self marshallSendArguments: 1. + + self ssAllocateRequiredReg: SendNumArgsReg. "Use this as the count reg." + counter := self addressOf: (counters at: counterIndex). + self flag: 'will need to use MoveAw32:R: if 64 bits'. + self assert: BytesPerWord = CounterBytes. + counter addDependent: (self annotateAbsolutePCRef: + (self MoveAw: counter asUnsignedInteger R: SendNumArgsReg)). + self SubCq: 16r10000 R: SendNumArgsReg. "Count executed" + "If counter trips simply abort the inlined comparison and send continuing to the following + branch *without* writing back. A double decrement will not trip the second time." + countTripped := self JumpCarry: 0. + counter addDependent: (self annotateAbsolutePCRef: + (self MoveR: SendNumArgsReg Aw: counter asUnsignedInteger)). "write back" + + self CmpR: Arg0Reg R: ReceiverResultReg. + "Cmp is weird/backwards so invert the comparison. Further since there is a following conditional + jump bytecode define non-merge fixups and leave the cond bytecode to set the mergeness." + self gen: (branchDescriptor isBranchTrue ifTrue: [JumpZero] ifFalse: [JumpNonZero]) + operand: (self ensureNonMergeFixupAt: targetBytecodePC - initialPC) asUnsignedInteger. + self SubCq: 1 R: SendNumArgsReg. "Count untaken" + counter addDependent: (self annotateAbsolutePCRef: + (self MoveR: SendNumArgsReg Aw: counter asUnsignedInteger)). "write back" + self Jump: (self ensureNonMergeFixupAt: postBranchPC - initialPC). + countTripped jmpTarget: self Label. + ^self genMarshalledSend: (coInterpreter specialSelector: byte0 - self firstSpecialSelectorBytecodeOffset) + numArgs: 1! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>mapFor:bcpc:performUntil:arg: (in category 'method map') ----- mapFor: cogMethod bcpc: startbcpc performUntil: functionSymbol arg: arg "Machine-code <-> bytecode pc mapping support. Evaluate functionSymbol for each mcpc, bcpc pair in the map until the function returns non-zero, answering that result, or 0 if it fails to. This works only for frameful methods." <var: #cogMethod type: #'CogBlockMethod *'> <var: #functionSymbol declareC: 'sqInt (*functionSymbol)(BytecodeDescriptor * desc, char *mcpc, sqInt bcpc, void *arg)'> <var: #arg type: #'void *'> | isInBlock mcpc bcpc endbcpc map mapByte homeMethod aMethodObj result latestContinuation byte descriptor bsOffset nExts | <var: #descriptor type: #'BytecodeDescriptor *'> <var: #homeMethod type: #'CogMethod *'> self assert: cogMethod stackCheckOffset > 0. "In both CMMethod and CMBlock cases find the start of the map and skip forward to the bytecode pc map entry for the stack check." cogMethod cmType = CMMethod ifTrue: [isInBlock := false. homeMethod := self cCoerceSimple: cogMethod to: #'CogMethod *'. self assert: startbcpc = (coInterpreter startPCOfMethodHeader: homeMethod methodHeader). map := self mapStartFor: homeMethod. self assert: ((objectMemory byteAt: map) >> AnnotationShift = IsAbsPCReference + or: [(objectMemory byteAt: map) >> AnnotationShift = IsObjectReference or: [(objectMemory byteAt: map) >> AnnotationShift = IsRelativeCall + or: [(objectMemory byteAt: map) >> AnnotationShift = IsDisplacementX2N]]]). - or: [(objectMemory byteAt: map) >> AnnotationShift = IsDisplacementX2N]]). latestContinuation := startbcpc. aMethodObj := homeMethod methodObject. endbcpc := (objectMemory byteLengthOf: aMethodObj) - 1. bsOffset := self bytecodeSetOffsetForHeader: homeMethod methodHeader] ifFalse: [isInBlock := true. homeMethod := cogMethod cmHomeMethod. map := self findMapLocationForMcpc: cogMethod asUnsignedInteger + (self sizeof: CogBlockMethod) inMethod: homeMethod. self assert: map ~= 0. self assert: ((objectMemory byteAt: map) >> AnnotationShift = HasBytecodePC "fiducial" or: [(objectMemory byteAt: map) >> AnnotationShift = IsDisplacementX2N]). [(objectMemory byteAt: map) >> AnnotationShift ~= HasBytecodePC] whileTrue: [map := map - 1]. map := map - 1. "skip fiducial; i.e. the map entry for the pc immediately following the method header." aMethodObj := homeMethod methodObject. bcpc := startbcpc - (self blockCreationBytecodeSizeForHeader: homeMethod methodHeader). bsOffset := self bytecodeSetOffsetForHeader: homeMethod methodHeader. byte := (objectMemory fetchByte: bcpc ofObject: aMethodObj) + bsOffset. descriptor := self generatorAt: byte. endbcpc := self nextBytecodePCFor: descriptor at: bcpc exts: -1 in: aMethodObj]. bcpc := startbcpc. mcpc := cogMethod asUnsignedInteger + cogMethod stackCheckOffset. nExts := 0. "as a hack for collecting counters, remember the prev mcpc in a static variable." prevMapAbsPCMcpc := 0. "The stack check maps to the start of the first bytecode, the first bytecode being effectively after frame build." result := self perform: functionSymbol with: nil with: (self cCoerceSimple: mcpc to: #'char *') with: startbcpc with: arg. result ~= 0 ifTrue: [^result]. "Now skip up through the bytecode pc map entry for the stack check." [(objectMemory byteAt: map) >> AnnotationShift ~= HasBytecodePC] whileTrue: [map := map - 1]. map := map - 1. [(mapByte := objectMemory byteAt: map) ~= MapEnd] whileTrue: "defensive; we exit on bcpc" [mapByte >= FirstAnnotation ifTrue: [| annotation nextBcpc | annotation := mapByte >> AnnotationShift. mcpc := mcpc + (mapByte bitAnd: DisplacementMask). (self isPCMappedAnnotation: annotation alternateInstructionSet: bsOffset > 0) ifTrue: [[byte := (objectMemory fetchByte: bcpc ofObject: aMethodObj) + bsOffset. descriptor := self generatorAt: byte. isInBlock ifTrue: [bcpc >= endbcpc ifTrue: [^0]] ifFalse: [(descriptor isReturn and: [bcpc >= latestContinuation]) ifTrue: [^0]. (descriptor isBranch or: [descriptor isBlockCreation]) ifTrue: [| targetPC | targetPC := self latestContinuationPCFor: descriptor at: bcpc exts: nExts in: aMethodObj. latestContinuation := latestContinuation max: targetPC]]. nextBcpc := self nextBytecodePCFor: descriptor at: bcpc exts: nExts in: aMethodObj. descriptor isMapped or: [isInBlock and: [descriptor isMappedInBlock]]] whileFalse: [bcpc := nextBcpc. nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]]. "All subsequent bytecodes except backward branches map to the following bytecode. Backward branches map to themselves other- wise mapping could cause premature breaking out of loops." result := self perform: functionSymbol with: descriptor with: (self cCoerceSimple: mcpc to: #'char *') with: ((descriptor isBranch and: [self isBackwardBranch: descriptor at: bcpc exts: nExts in: aMethodObj]) ifTrue: [bcpc] ifFalse: [bcpc + descriptor numBytes]) with: arg. result ~= 0 ifTrue: [^result]. bcpc := nextBcpc. nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]]. annotation = IsAbsPCReference ifTrue: [self assert: mcpc ~= 0. prevMapAbsPCMcpc := mcpc]] ifFalse: [mcpc := mcpc + (mapByte >= DisplacementX2N ifTrue: [mapByte - DisplacementX2N << AnnotationShift] ifFalse: [mapByte])]. map := map - 1]. ^0! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>picDataFor:Mcpc:Bcpc:Method: (in category 'method introspection') ----- picDataFor: descriptor Mcpc: mcpc Bcpc: bcpc Method: cogMethodArg <var: #descriptor type: #'BytecodeDescriptor *'> <var: #mcpc type: #'char *'> <var: #cogMethodArg type: #'void *'> | entryPoint tuple | descriptor isNil ifTrue: [^0]. descriptor isBranch ifTrue: ["it's a branch; conditional?" (descriptor isBranchTrue or: [descriptor isBranchFalse]) ifTrue: [tuple := self picDataForConditionalBranch: prevMapAbsPCMcpc at: bcpc. tuple = 0 ifTrue: [^PrimErrNoMemory]. objectMemory storePointer: picDataIndex ofObject: picData withValue: tuple. picDataIndex := picDataIndex + 1]. ^0]. + "infer it's a send; alas we can't just test the descriptor because of the bloody + doubleExtendedDoAnythingBytecode which does sends as well as other things." + (backEnd isCallPreceedingReturnPC: mcpc asUnsignedInteger) ifFalse: + [^0]. - "infer it's a send" - self assert: (backEnd isCallPreceedingReturnPC: mcpc asUnsignedInteger). entryPoint := backEnd callTargetFromReturnAddress: mcpc asUnsignedInteger. + entryPoint <= methodZoneBase ifTrue: "send is not linked, or is not a send" - entryPoint <= methodZoneBase ifTrue: "send is not linked" [^0]. self targetMethodAndSendTableFor: entryPoint into: "It's a linked send; find which kind." [:targetMethod :sendTable| tuple := self picDataForSendTo: targetMethod methodClassIfSuper: (sendTable = superSendTrampolines ifTrue: [coInterpreter methodClassOf: (self cCoerceSimple: cogMethodArg to: #'CogMethod *') methodObject]) at: mcpc bcpc: bcpc + 1 - descriptor numBytes]. tuple = 0 ifTrue: [^PrimErrNoMemory]. objectMemory storePointer: picDataIndex ofObject: picData withValue: tuple. picDataIndex := picDataIndex + 1. ^0! Item was changed: ----- Method: StackInterpreter class>>initializeBytecodeTableForNewspeakV3PlusClosures (in category 'initialization') ----- initializeBytecodeTableForNewspeakV3PlusClosures "StackInterpreter initializeBytecodeTableForNewspeakV3PlusClosures" "Note: This table will be used to generate a C switch statement." BytecodeTable := Array new: 256. self table: BytecodeTable from: #( ( 0 15 pushReceiverVariableBytecode) ( 16 31 pushTemporaryVariableBytecode) ( 32 63 pushLiteralConstantBytecode) ( 64 95 pushLiteralVariableBytecode) ( 96 103 storeAndPopReceiverVariableBytecode) (104 111 storeAndPopTemporaryVariableBytecode) (112 pushReceiverBytecode) (113 pushConstantTrueBytecode) (114 pushConstantFalseBytecode) (115 pushConstantNilBytecode) (116 pushConstantMinusOneBytecode) (117 pushConstantZeroBytecode) (118 pushConstantOneBytecode) (119 pushConstantTwoBytecode) (120 returnReceiver) (121 returnTrue) (122 returnFalse) (123 returnNil) (124 returnTopFromMethod) (125 returnTopFromBlock) "2 of the 3 Newspeak bytecodes" (126 dynamicSuperSendBytecode) (127 pushImplicitReceiverBytecode) (128 extendedPushBytecode) (129 extendedStoreBytecode) (130 extendedStoreAndPopBytecode) (131 singleExtendedSendBytecode) (132 doubleExtendedDoAnythingBytecode) (133 singleExtendedSuperBytecode) (134 secondExtendedSendBytecode) (135 popStackBytecode) (136 duplicateTopBytecode) (137 pushActiveContextBytecode) (138 pushNewArrayBytecode) "The last of 3 Newspeak bytecodes" + (139 pushExplicitOuterReceiverBytecode) - (139 pushExplicitOuterSendReceiverBytecode) (140 pushRemoteTempLongBytecode) (141 storeRemoteTempLongBytecode) (142 storeAndPopRemoteTempLongBytecode) (143 pushClosureCopyCopiedValuesBytecode) (144 151 shortUnconditionalJump) (152 159 shortConditionalJumpFalse) (160 167 longUnconditionalJump) (168 171 longJumpIfTrue) (172 175 longJumpIfFalse) "176-191 were sendArithmeticSelectorBytecode" (176 bytecodePrimAdd) (177 bytecodePrimSubtract) (178 bytecodePrimLessThan) (179 bytecodePrimGreaterThan) (180 bytecodePrimLessOrEqual) (181 bytecodePrimGreaterOrEqual) (182 bytecodePrimEqual) (183 bytecodePrimNotEqual) (184 bytecodePrimMultiply) (185 bytecodePrimDivide) (186 bytecodePrimMod) (187 bytecodePrimMakePoint) (188 bytecodePrimBitShift) (189 bytecodePrimDiv) (190 bytecodePrimBitAnd) (191 bytecodePrimBitOr) "192-207 were sendCommonSelectorBytecode" (192 bytecodePrimAt) (193 bytecodePrimAtPut) (194 bytecodePrimSize) (195 bytecodePrimNext) (196 bytecodePrimNextPut) (197 bytecodePrimAtEnd) (198 bytecodePrimIdentical) (199 bytecodePrimClass) (200 bytecodePrimSpecialSelector24) (201 bytecodePrimValue) (202 bytecodePrimValueWithArg) (203 bytecodePrimDo) (204 bytecodePrimNew) (205 bytecodePrimNewWithArg) (206 bytecodePrimPointX) (207 bytecodePrimPointY) (208 223 sendLiteralSelector0ArgsBytecode) (224 239 sendLiteralSelector1ArgBytecode) (240 255 sendLiteralSelector2ArgsBytecode) )! Item was added: + ----- Method: StackInterpreter>>pushExplicitOuterReceiverBytecode (in category 'stack bytecodes') ----- + pushExplicitOuterReceiverBytecode + "Find the appropriate implicit receiver for outer N" + | litIndex n anIntOop | + <inline: true> + litIndex := self fetchByte. + anIntOop := self literal: litIndex. + n := (objectMemory isIntegerObject: anIntOop) + ifTrue: [objectMemory integerValueOf: anIntOop] + ifFalse: [0]. + self fetchNextBytecode. + self internalPush:(self + explicitOuterReceiver: n + withObject: self receiver + withMixin: (self methodClassOf: method))! Item was changed: ----- Method: StackInterpreterSimulator>>openOn:extraMemory: (in category 'initialization') ----- openOn: fileName extraMemory: extraBytes "StackInterpreterSimulator new openOn: 'clone.im' extraMemory: 100000" | f version headerSize dataSize count oldBaseAddr bytesToShift swapBytes headerFlags heapBase firstSegSize heapSize hdrNumStackPages hdrEdenBytes hdrMaxExtSemTabSize | "open image file and read the header" - ["begin ensure block..." f := FileStream readOnlyFileNamed: fileName. + f ifNil: [^self error: 'no image found']. + + ["begin ensure block..." imageName := f fullName. f binary. + version := self nextLongFrom: f. "current version: 16r1968 (=6504) vive la revolucion!!" (self readableFormat: version) ifTrue: [swapBytes := false] ifFalse: [(version := objectMemory byteSwapped: version) = self imageFormatVersion ifTrue: [swapBytes := true] ifFalse: [self error: 'incomaptible image format']]. headerSize := self getLongFromFile: f swap: swapBytes. dataSize := self getLongFromFile: f swap: swapBytes. "length of heap in file" oldBaseAddr := self getLongFromFile: f swap: swapBytes. "object memory base address of image" objectMemory specialObjectsOop: (self getLongFromFile: f swap: swapBytes). objectMemory lastHash: (self getLongFromFile: f swap: swapBytes). "Should be loaded from, and saved to the image header" savedWindowSize := self getLongFromFile: f swap: swapBytes. headerFlags := self getLongFromFile: f swap: swapBytes. self setImageHeaderFlagsFrom: headerFlags. extraVMMemory := self getLongFromFile: f swap: swapBytes. hdrNumStackPages := self getShortFromFile: f swap: swapBytes. "4 stack pages is small. Should be able to run with as few as three. 4 should be comfortable but slow. 8 is a reasonable default. Can be changed via vmParameterAt: 43 put: n" numStackPages := desiredNumStackPages ~= 0 ifTrue: [desiredNumStackPages] ifFalse: [hdrNumStackPages = 0 ifTrue: [self defaultNumStackPages] ifFalse: [hdrNumStackPages]]. desiredNumStackPages := hdrNumStackPages. "pad to word boundary. This slot can be used for anything else that will fit in 16 bits. It is used for the cog code size in Cog. Preserve it to be polite to other VMs." theUnknownShort := self getShortFromFile: f swap: swapBytes. self assert: f position = 40. hdrEdenBytes := self getLongFromFile: f swap: swapBytes. objectMemory edenBytes: (hdrEdenBytes = 0 ifTrue: [objectMemory defaultEdenBytes] ifFalse: [hdrEdenBytes]). desiredEdenBytes := hdrEdenBytes. hdrMaxExtSemTabSize := self getShortFromFile: f swap: swapBytes. hdrMaxExtSemTabSize ~= 0 ifTrue: [self setMaxExtSemSizeTo: hdrMaxExtSemTabSize]. "pad to word boundary. This slot can be used for anything else that will fit in 16 bits. Preserve it to be polite to other VMs." the2ndUnknownShort := self getShortFromFile: f swap: swapBytes. self assert: f position = 48. firstSegSize := self getLongFromFile: f swap: swapBytes. objectMemory firstSegmentSize: firstSegSize. "allocate interpreter memory" heapBase := objectMemory startOfMemory. heapSize := dataSize + extraBytes + objectMemory newSpaceBytes + self interpreterAllocationReserveBytes + (objectMemory hasSpurMemoryManagerAPI ifTrue: [headerSize] ifFalse: [0]). objectMemory setHeapBase: heapBase memoryLimit: heapBase + heapSize endOfMemory: heapBase + dataSize. "bogus for Spur" objectMemory memory: (Bitmap new: objectMemory memoryLimit // 4). "read in the image in bulk, then swap the bytes if necessary" f position: headerSize. count := objectMemory readHeapFromImageFile: f dataBytes: dataSize. count ~= dataSize ifTrue: [self halt]. ] ensure: [f close]. self ensureImageFormatIsUpToDate: swapBytes. bytesToShift := objectMemory memoryBaseForImageRead - oldBaseAddr. "adjust pointers for zero base address" Utilities informUser: 'Relocating object pointers...' during: [self initializeInterpreter: bytesToShift]. ! Item was changed: ----- Method: StackToRegisterMappingCogit class>>initializeBytecodeTableForNewspeakV3PlusClosures (in category 'class initialization') ----- initializeBytecodeTableForNewspeakV3PlusClosures "StackToRegisterMappingCogit initializeBytecodeTableForNewspeakV3PlusClosures" isPushNilFunction := #v3:Is:Push:Nil:. pushNilSizeFunction := #v3PushNilSize:. NSSendIsPCAnnotated := true. "IsNSSendCall used by PushImplicitReceiver" self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( (1 0 15 genPushReceiverVariableBytecode needsFrameNever: 1) (1 16 31 genPushTemporaryVariableBytecode needsFrameIfMod16GENumArgs: 1) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) (1 64 95 genPushLiteralVariableBytecode needsFrameNever: 1) (1 96 103 genStoreAndPopReceiverVariableBytecode needsFrameNever: -1) "N.B. not frameless if immutability" (1 104 111 genStoreAndPopTemporaryVariableBytecode) (1 112 112 genPushReceiverBytecode needsFrameNever: 1) (1 113 113 genPushConstantTrueBytecode needsFrameNever: 1) (1 114 114 genPushConstantFalseBytecode needsFrameNever: 1) (1 115 115 genPushConstantNilBytecode needsFrameNever: 1) (1 116 119 genPushQuickIntegerConstantBytecode needsFrameNever: 1) "method returns in blocks need a frame because of nonlocalReturn:through:" (1 120 120 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 121 121 genReturnTrue return needsFrameIfInBlock: isMappedInBlock 0) (1 122 122 genReturnFalse return needsFrameIfInBlock: isMappedInBlock 0) (1 123 123 genReturnNil return needsFrameIfInBlock: isMappedInBlock 0) (1 124 124 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 125 125 genReturnTopFromBlock return needsFrameNever: -1) (3 126 126 genDynamicSuperSendBytecode isMapped) "Newspeak" (2 127 127 genPushImplicitReceiverBytecode isMapped) "Newspeak" (2 128 128 extendedPushBytecode needsFrameNever: 1) (2 129 129 extendedStoreBytecode) (2 130 130 extendedStoreAndPopBytecode) (2 131 131 genExtendedSendBytecode isMapped) (3 132 132 doubleExtendedDoAnythingBytecode isMapped) (2 133 133 genExtendedSuperBytecode isMapped) (2 134 134 genSecondExtendedSendBytecode isMapped) (1 135 135 genPopStackBytecode needsFrameNever: -1) (1 136 136 duplicateTopBytecode needsFrameNever: 1) (1 137 137 genPushActiveContextBytecode) (2 138 138 genPushNewArrayBytecode) + (2 139 139 genPushExplicitOuterReceiverBytecode isMapped) "Newspeak" - (2 139 139 genPushExplicitOuterSendReceiverBytecode isMapped) "Newspeak" (3 140 140 genPushRemoteTempLongBytecode) (3 141 141 genStoreRemoteTempLongBytecode) (3 142 142 genStoreAndPopRemoteTempLongBytecode) (4 143 143 genPushClosureCopyCopiedValuesBytecode block v3:Block:Code:Size:) (1 144 151 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 152 159 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (2 160 163 genLongUnconditionalBackwardJump branch isMapped "because of interrupt check" v3:Long:Branch:Distance:) (2 164 167 genLongUnconditionalForwardJump branch v3:Long:Branch:Distance:) (2 168 171 genLongJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:LongForward:Branch:Distance:) (2 172 175 genLongJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:LongForward:Branch:Distance:) (1 176 176 genSpecialSelectorArithmetic isMapped AddRR) (1 177 177 genSpecialSelectorArithmetic isMapped SubRR) (1 178 178 genSpecialSelectorComparison isMapped JumpLess) (1 179 179 genSpecialSelectorComparison isMapped JumpGreater) (1 180 180 genSpecialSelectorComparison isMapped JumpLessOrEqual) (1 181 181 genSpecialSelectorComparison isMapped JumpGreaterOrEqual) (1 182 182 genSpecialSelectorComparison isMapped JumpZero) (1 183 183 genSpecialSelectorComparison isMapped JumpNonZero) (1 184 189 genSpecialSelectorSend isMapped) " #* #/ #\\ #@ #bitShift: //" (1 190 190 genSpecialSelectorArithmetic isMapped AndRR) (1 191 191 genSpecialSelectorArithmetic isMapped OrRR) (1 192 197 genSpecialSelectorSend isMapped) "#at: #at:put: #size #next #nextPut: #atEnd" (1 198 198 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" (1 199 199 genSpecialSelectorClass needsFrameIfStackGreaterThanOne: notMapped 0) "not mapped because it is directly inlined (for now)" (1 200 207 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y" (1 208 223 genSendLiteralSelector0ArgsBytecode isMapped) (1 224 239 genSendLiteralSelector1ArgBytecode isMapped) (1 240 255 genSendLiteralSelector2ArgsBytecode isMapped))! Item was changed: ----- Method: StackToRegisterMappingCogit class>>newInitializeBytecodeTableForNewspeakV3PlusClosures (in category 'class initialization') ----- newInitializeBytecodeTableForNewspeakV3PlusClosures "StackToRegisterMappingCogit newInitializeBytecodeTableForNewspeakV3PlusClosures" isPushNilFunction := #v3:Is:Push:Nil:. pushNilSizeFunction := #v3PushNilSize:. NSSendIsPCAnnotated := true. "IsNSSendCall used by PushImplicitReceiver" self flag: 'Special selector send class must be inlined to agree with the interpreter, which inlines class. If class is sent to e.g. a general instance of ProtoObject then unless class is inlined there will be an MNU. It must be that the Cointerpreter and Cogit have identical semantics. We get away with not hardwiring the other special selectors either because in the Cointerpreter they are not inlined or because they are inlined only to instances of classes for which there will always be a method.'. self generatorTableFrom: #( (1 0 15 genPushReceiverVariableBytecode needsFrameNever: 1) (1 16 31 genPushTemporaryVariableBytecode needsFrameIfMod16GENumArgs: 1) (1 32 63 genPushLiteralConstantBytecode needsFrameNever: 1) (1 64 95 genPushLiteralVariableBytecode needsFrameNever: 1) (1 96 103 genStoreAndPopReceiverVariableBytecode needsFrameNever: -1) "N.B. not frameless if immutability" (1 104 111 genStoreAndPopTemporaryVariableBytecode) (1 112 112 genPushReceiverBytecode needsFrameNever: 1) (1 113 113 genPushConstantTrueBytecode needsFrameNever: 1) (1 114 114 genPushConstantFalseBytecode needsFrameNever: 1) (1 115 115 genPushConstantNilBytecode needsFrameNever: 1) (1 116 119 genPushQuickIntegerConstantBytecode needsFrameNever: 1) "method returns in blocks need a frame because of nonlocalReturn:through:" (1 120 120 genReturnReceiver return needsFrameIfInBlock: isMappedInBlock 0) (1 121 121 genReturnTrue return needsFrameIfInBlock: isMappedInBlock 0) (1 122 122 genReturnFalse return needsFrameIfInBlock: isMappedInBlock 0) (1 123 123 genReturnNil return needsFrameIfInBlock: isMappedInBlock 0) (1 124 124 genReturnTopFromMethod return needsFrameIfInBlock: isMappedInBlock -1) (1 125 125 genReturnTopFromBlock return needsFrameNever: -1) (3 126 126 genDynamicSuperSendBytecode isMapped) "Newspeak" (2 127 127 genPushImplicitReceiverBytecode isMapped) "Newspeak" (2 128 128 extendedPushBytecode needsFrameNever: 1) (2 129 129 extendedStoreBytecode) (2 130 130 extendedStoreAndPopBytecode) (2 131 131 genExtendedSendBytecode isMapped) (3 132 132 doubleExtendedDoAnythingBytecode isMapped) (2 133 133 genExtendedSuperBytecode isMapped) (2 134 134 genSecondExtendedSendBytecode isMapped) (1 135 135 genPopStackBytecode needsFrameNever: -1) (1 136 136 duplicateTopBytecode needsFrameNever: 1) (1 137 137 genPushActiveContextBytecode) (2 138 138 genPushNewArrayBytecode) + (2 139 139 genPushExplicitOuterReceiverBytecode isMapped) "Newspeak" - (2 139 139 genPushExplicitOuterSendReceiverBytecode isMapped) "Newspeak" (3 140 140 genPushRemoteTempLongBytecode) (3 141 141 genStoreRemoteTempLongBytecode) (3 142 142 genStoreAndPopRemoteTempLongBytecode) (4 143 143 genPushClosureCopyCopiedValuesBytecode block v3:Block:Code:Size:) (1 144 151 genShortUnconditionalJump branch v3:ShortForward:Branch:Distance:) (1 152 159 genShortJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:ShortForward:Branch:Distance:) (2 160 163 genLongUnconditionalBackwardJump branch isMapped "because of interrupt check" v3:Long:Branch:Distance:) (2 164 167 genLongUnconditionalForwardJump branch v3:Long:Branch:Distance:) (2 168 171 genLongJumpIfTrue branch isBranchTrue isMapped "because of mustBeBoolean" v3:LongForward:Branch:Distance:) (2 172 175 genLongJumpIfFalse branch isBranchFalse isMapped "because of mustBeBoolean" v3:LongForward:Branch:Distance:) (1 176 176 genSpecialSelectorArithmetic isMapped AddRR) (1 177 177 genSpecialSelectorArithmetic isMapped SubRR) (1 178 178 genSpecialSelectorComparison isMapped JumpLess) (1 179 179 genSpecialSelectorComparison isMapped JumpGreater) (1 180 180 genSpecialSelectorComparison isMapped JumpLessOrEqual) (1 181 181 genSpecialSelectorComparison isMapped JumpGreaterOrEqual) (1 182 182 genSpecialSelectorComparison isMapped JumpZero) (1 183 183 genSpecialSelectorComparison isMapped JumpNonZero) (1 184 189 genSpecialSelectorSend isMapped) " #* #/ #\\ #@ #bitShift: //" (1 190 190 genSpecialSelectorArithmetic isMapped AndRR) (1 191 191 genSpecialSelectorArithmetic isMapped OrRR) (1 192 197 genSpecialSelectorSend isMapped) "#at: #at:put: #size #next #nextPut: #atEnd" (1 198 198 genSpecialSelectorEqualsEquals needsFrameNever: notMapped -1) "not mapped because it is directly inlined (for now)" (1 199 199 genSpecialSelectorClass needsFrameIfStackGreaterThanOne: notMapped 0) "not mapped because it is directly inlined (for now)" (1 200 207 genSpecialSelectorSend isMapped) "#blockCopy: #value #value: #do: #new #new: #x #y" (1 208 223 genSendLiteralSelector0ArgsBytecode isMapped) (1 224 239 genSendLiteralSelector1ArgBytecode isMapped) (1 240 255 genSendLiteralSelector2ArgsBytecode isMapped))! Item was added: + ----- Method: StackToRegisterMappingCogit>>genPushExplicitOuterReceiver: (in category 'bytecode generators') ----- + genPushExplicitOuterReceiver: level + "Uncached push explicit outer send receiver" + self assert: needsFrame. "because this should always be followed by a send" + optStatus isReceiverResultRegLive: false. + self ssAllocateCallReg: SendNumArgsReg. + self MoveCq: level R: SendNumArgsReg. + self CallRT: ceExplicitReceiverTrampoline. + ^self ssPushRegister: ReceiverResultReg! Item was removed: - ----- Method: StackToRegisterMappingCogit>>genPushExplicitOuterSendReceiver: (in category 'bytecode generators') ----- - genPushExplicitOuterSendReceiver: level - "Uncached push explicit outer send receiver" - self assert: needsFrame. "because this should always be followed by a send" - optStatus isReceiverResultRegLive: false. - self ssAllocateCallReg: SendNumArgsReg. - self MoveCq: level R: SendNumArgsReg. - self CallRT: ceExplicitReceiverTrampoline. - ^self ssPushRegister: ReceiverResultReg!

1 0

FT2Plugin for Freetype: Freetype-Plugin-eem.67.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 08 Apr '14

08 Apr '14

Eliot Miranda uploaded a new version of Freetype-Plugin to project FT2Plugin for Freetype: http://www.squeaksource.com/FreetypePlugin/Freetype-Plugin-eem.67.mcz ==================== Summary ==================== Name: Freetype-Plugin-eem.67 Author: eem Time: 8 April 2014, 9:49:13.238 am UUID: 2b3bfddf-b8e3-4ca1-b093-529c076215bb Ancestors: Freetype-Plugin-dtl.66 Eliminate redundant test from ftEncodingValueFromString:

1 0

SystemTracing: SystemTracing-dtl.25.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 08 Apr '14

08 Apr '14

Dave Lewis uploaded a new version of SystemTracing to project SystemTracing: http://www.squeaksource.com/SystemTracing/SystemTracing-dtl.25.mcz ==================== Summary ==================== Name: SystemTracing-dtl.25 Author: dtl Time: 4 December 2012, 8:05:17 am UUID: 84fb9f54-d512-4ef1-83d4-e2944b3239be Ancestors: SystemTracing-dtl.24 Add SystemTracer64 class>>traceTo64Script to provide an executable start script that documents the process of tracing a 32-bit image to 64-bit format.

2 1

VM Maker: VMMaker.oscog-eem.669.mcz
by commits＠source.squeak.org 08 Apr '14

08 Apr '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.669.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.669 Author: eem Time: 8 April 2014, 9:09:52.873 am UUID: bb746b04-e032-4c6f-9a28-e67a3987c898 Ancestors: VMMaker.oscog-eem.668 Fix bug in unlinkSendsOf:isMNUSelector: (primitiveFlushCacheBySelector) where old code could free the method of an active frame. =============== Diff against VMMaker.oscog-eem.668 =============== Item was changed: ----- Method: Cogit>>unlinkSendsOf:isMNUSelector: (in category 'jit - api') ----- unlinkSendsOf: selector isMNUSelector: isMNUSelector <api> + "Unlink all sends in cog methods. Free all Closed PICs with the selector, + or with an MNU case if isMNUSelector. First check if any method actually + has the selector; if not there can't be any linked send to it. This routine + (including descendents) is performance critical. It contributes perhaps + 30% of entire execution time in Compiler recompileAll." + | cogMethod mustScanAndUnlink | - "Unlink all sends in cog methods." - | freeSpace cogMethod | <var: #cogMethod type: #'CogMethod *'> methodZoneBase isNil ifTrue: [^self]. cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'. + mustScanAndUnlink := false. + isMNUSelector + ifTrue: + [[cogMethod < methodZone limitZony] whileTrue: + [cogMethod cpicHasMNUCase + ifTrue: + [self assert: cogMethod cmType = CMClosedPIC. + methodZone freeMethod: cogMethod. + mustScanAndUnlink := true] + ifFalse: + [cogMethod selector = selector ifTrue: + [mustScanAndUnlink := true. + cogMethod cmType = CMClosedPIC ifTrue: + [methodZone freeMethod: cogMethod]]]. + cogMethod := methodZone methodAfter: cogMethod]] + ifFalse: + [[cogMethod < methodZone limitZony] whileTrue: + [cogMethod selector = selector ifTrue: + [mustScanAndUnlink := true. + cogMethod cmType = CMClosedPIC ifTrue: + [methodZone freeMethod: cogMethod]]. + cogMethod := methodZone methodAfter: cogMethod]]. + mustScanAndUnlink ifFalse: - freeSpace := methodZone methodBytesFreedSinceLastCompaction. - "First check if any method actually has the selector; if not there can't - be any linked send to it." - [cogMethod < methodZone limitZony - and: [cogMethod selector ~= selector]] whileTrue: - [(cogMethod cmType ~= CMFree - and: [(isMNUSelector and: [cogMethod cpicHasMNUCase]) - or: [cogMethod selector = selector]]) ifTrue: - [methodZone freeMethod: cogMethod]. - cogMethod := methodZone methodAfter: cogMethod]. - (cogMethod >= methodZone limitZony - and: [freeSpace = methodZone methodBytesFreedSinceLastCompaction]) ifTrue: [^self]. codeModified := false. cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'. [cogMethod < methodZone limitZony] whileTrue: [cogMethod cmType = CMMethod ifTrue: [self mapFor: cogMethod performUntil: #unlinkIfFreeOrLinkedSend:pc:of: arg: selector]. cogMethod := methodZone methodAfter: cogMethod]. codeModified ifTrue: "After possibly updating inline caches we need to flush the icache." [processor flushICacheFrom: methodZoneBase to: methodZone limitZony asInteger]!

1 0

[Vm-dev] OSProcessPlugin: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.41.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 08 Apr '14

08 Apr '14

Eliot Miranda uploaded a new version of VMConstruction-Plugins-OSProcessPlugin to project OSProcessPlugin: http://www.squeaksource.com/OSProcessPlugin/VMConstruction-Plugins-OSProces… ==================== Summary ==================== Name: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.41 Author: eem Time: 14 December 2012, 4:42:40 am UUID: 0406d3fc-7b8b-4b72-b20a-f254eeb1b893 Ancestors: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.40 Check for needing sigaltstack properly in setSignalNumber:handler:

1 0

[Vm-dev] OSProcessPlugin: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.40.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 08 Apr '14

08 Apr '14

Eliot Miranda uploaded a new version of VMConstruction-Plugins-OSProcessPlugin to project OSProcessPlugin: http://www.squeaksource.com/OSProcessPlugin/VMConstruction-Plugins-OSProces… ==================== Summary ==================== Name: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.40 Author: eem Time: 14 December 2012, 2:00:49 am UUID: 5f1cbe1c-127c-4582-a629-86dab8269efb Ancestors: VMConstruction-Plugins-OSProcessPlugin.oscog-eem.39 Put the dang method in the right place...

1 0

AioPlugin: VMConstruction-Plugins-AioPlugin-eem.15.mcz
by squeak-dev-noreply＠lists.squeakfoundation.org 08 Apr '14

08 Apr '14

Eliot Miranda uploaded a new version of VMConstruction-Plugins-AioPlugin to project AioPlugin: http://www.squeaksource.com/AioPlugin/VMConstruction-Plugins-AioPlugin-eem.… ==================== Summary ==================== Name: VMConstruction-Plugins-AioPlugin-eem.15 Author: eem Time: 18 April 2013, 11:57:08 am UUID: 0029df1c-3720-4b61-8579-4851417d24a7 Ancestors: VMConstruction-Plugins-AioPlugin-dtl.14 eliminate a C compiler warning (signed/unsigned comparison)

1 0

← Newer
1
...
5
6
7
8
9
10
11
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev April 2014