Vm-dev August 2014

vm-dev@lists.squeakfoundation.org

12 participants
89 discussions

[commit][3064] CogVM source as per VMMaker.oscog-eem.865
by commits＠squeakvm.org 26 Aug '14

26 Aug '14

Revision: 3064 Author: eliot Date: 2014-08-26 01:52:44 -0700 (Tue, 26 Aug 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.865 Sista: Fix primitiveSistaMethodPICAndCounterData after the VMMaker.oscog-eem.814 change moving counters to the heap. Add several modifications to the current image facade so we can get the send and branch data for an in-image compilation. Fix header printing of counters and IR caches. Implement genBinaryConstOpVarInlinePrimitive: & genBinaryVarOpConstInlinePrimitive: and correct genBinaryVarOpVarInlinePrimitive: for Slang. V3: Fix bug with become where duplicate entries in the input array would crash the system (thanks Igor). Spur: Add an assert to check for a valid mehtodClassAssociation in methods (arguably dubious) to help catch malformed methods in multiple bytecode shenannigans. Reduce the possibility for heisenbugs by providing noFixupFollowField:ofObject: and using it in debugging code. General: Make nameOfClass: more robust, in both the real and simulated VMs. Modified Paths: -------------- branches/Cog/image/BuildSqueak45VMMakerImage.st branches/Cog/image/LoadSpurPackagesFromTempDir.st branches/Cog/image/WriteSpurPackagesToTempDir.st branches/Cog/image/buildspurtrunkimage.sh branches/Cog/image/getGoodCogVM.sh branches/Cog/image/getGoodSpurVM.sh branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.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/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/scripts/uploadvms branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.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/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Added Paths: ----------- branches/Cog/image/uploadspurimage.sh Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/image/BuildSqueak45VMMakerImage.st =================================================================== --- branches/Cog/image/BuildSqueak45VMMakerImage.st 2014-08-14 19:43:38 UTC (rev 3063) +++ branches/Cog/image/BuildSqueak45VMMakerImage.st 2014-08-26 08:52:44 UTC (rev 3064) @@ -23,6 +23,10 @@ {repository. order. packages}] valueWithArguments: tuple]) sort: [:a :b| a second <= b second]. +Character instSize > 0 ifTrue: + [#('callPrimitiveShimForV3.st') do: + [:fileName| (FileDirectory default fileNamed: fileName) fileIn]]. + ((MCMcmUpdater defaultUpdateURL endsWith: 'trunk') ifTrue: [#( "'FT2Constants.st'" Modified: branches/Cog/image/LoadSpurPackagesFromTempDir.st =================================================================== --- branches/Cog/image/LoadSpurPackagesFromTempDir.st 2014-08-14 19:43:38 UTC (rev 3063) +++ branches/Cog/image/LoadSpurPackagesFromTempDir.st 2014-08-26 08:52:44 UTC (rev 3064) @@ -1,7 +1,9 @@ | dir tempRepo | dir := FileDirectory default directoryNamed: 'temp-spur-repository'. tempRepo := MCDirectoryRepository path: dir fullName. -#('Collections' 'Kernel' 'System') do: +"I dug a deep hole with the compiler changes here. This hack gets me out." +EncoderForV3 removeSelector: #computeMethodHeaderForNumArgs:numTemps:numLits:primitive:. +#('Collections' 'Compiler' 'Kernel' 'System') do: [:package| | versionName version | versionName := (tempRepo versionNamesForPackageNamed: package) first. version := tempRepo versionNamed: versionName. Modified: branches/Cog/image/WriteSpurPackagesToTempDir.st =================================================================== --- branches/Cog/image/WriteSpurPackagesToTempDir.st 2014-08-14 19:43:38 UTC (rev 3063) +++ branches/Cog/image/WriteSpurPackagesToTempDir.st 2014-08-26 08:52:44 UTC (rev 3064) @@ -3,7 +3,7 @@ dir assureExistence. tempRepo := MCDirectoryRepository path: dir fullName. trunkRepo := MCRepositoryGroup default repositories detect:[:r| r description = 'http://source.squeak.org/trunk']. -#('Collections' 'Kernel' 'System') do: +#('Collections' 'Compiler' 'Kernel' 'System') do: [:package| | currentVersion | currentVersion := (MCPackage named: package) workingCopy ancestry ancestors first versionName. tempRepo storeVersion: (trunkRepo versionNamed: currentVersion, '.mcz')]. Modified: branches/Cog/image/buildspurtrunkimage.sh =================================================================== --- branches/Cog/image/buildspurtrunkimage.sh 2014-08-14 19:43:38 UTC (rev 3063) +++ branches/Cog/image/buildspurtrunkimage.sh 2014-08-26 08:52:44 UTC (rev 3064) @@ -3,7 +3,7 @@ ./getsqueak45.sh . ./getGoodCogVM.sh -if [ "$1" -ne -skiptrunkbuild ]; then +if [ "$1" != -skiptrunkbuild ]; then cp -p $SQUEAK45.image trunk46forspur.image cp -p $SQUEAK45.changes trunk46forspur.changes @@ -52,5 +52,5 @@ # Now load the modified packages . ./getGoodSpurVM.sh -echo $VM trunk46-spur.image LoadSpurPackagesFromTempDir.st -$VM trunk46-spur.image LoadSpurPackagesFromTempDir.st +echo $VM -blockonerror trunk46-spur.image LoadSpurPackagesFromTempDir.st +$VM -blockonerror trunk46-spur.image LoadSpurPackagesFromTempDir.st Modified: branches/Cog/image/getGoodCogVM.sh =================================================================== --- branches/Cog/image/getGoodCogVM.sh 2014-08-14 19:43:38 UTC (rev 3063) +++ branches/Cog/image/getGoodCogVM.sh 2014-08-26 08:52:44 UTC (rev 3064) @@ -1,31 +1,31 @@ #!/bin/sh -# Sets the VM env var to the r3060 Cog VM for the current platform. +# Sets the VM env var to the r3063 Cog VM for the current platform. # will download and install the VM in this directory if necessary. -TAG=14.31.3060 -REV=3060 +TAG=14.32.3063 +REV=3063 URL=http://www.mirandabanda.org/files/Cog/VM/VM.r$REV/ . ./envvars.sh case "$OS" in Darwin) get_vm_from_tar \ - Cog.app/Contents/MacOS/Squeak b9d79576423fe79f9f77383f676d37d6 \ - Cog.app-$TAG.tgz 2d93340bed9902bd8913067f372c7371 + Cog.app/Contents/MacOS/Squeak efd6128a2e0ca36035bbe5ace4fd8e80 \ + Cog.app-$TAG.tgz 658e5e3a5085529959a744c11b78f7d9 VM=Cog.app/Contents/MacOS/Squeak;; Linux) if expr $OSREL \> 2.6.12; then get_vm_from_tar \ - coglinuxht/lib/squeak/4.0-$REV/squeak 35c003d9bd2c614850ca5b99c86155e9 \ - coglinuxht-$TAG.tgz a9e34f56f4923fff1ab4fc82f6ec93a0 + coglinuxht/lib/squeak/4.0-$REV/squeak badd6e33775c1176e478b2262cffe177 \ + coglinuxht-$TAG.tgz 1b58e26c4c6c92ca8b141e94c04b0ed9 else get_vm_from_tar \ - coglinux/lib/squeak/4.0-$REV/squeak 8327eef0d7dda150f3fcf809df940bf5 \ - coglinux-$TAG.tgz 81466c4732d2fa5d8aec991938e714c8 + coglinux/lib/squeak/4.0-$REV/squeak 817f87fa0cf4b7d90ef9599d7b762fe5 \ + coglinux-$TAG.tgz 1394d1bfd1749b711a2266621dc8ff5b fi;; CYGWIN*) get_vm_from_zip \ - cogwin/SqueakConsole.exe 6655d9ea5c7f0919f61a9cf5ad58b202 \ - cogwin-$TAG.zip 8fa6ba2df26e72342889b0279f17bb6d + cogwin/SqueakConsole.exe 8edd0cc2355232726330ecbc967c7ce0 \ + cogwin-$TAG.zip 888ca7a978e34176763c8be34fa13860 VM=cogwin/SqueakConsole.exe;; *) echo "don't know how to run Squeak on your system. bailing out." 1>&2; exit 2 esac Modified: branches/Cog/image/getGoodSpurVM.sh =================================================================== --- branches/Cog/image/getGoodSpurVM.sh 2014-08-14 19:43:38 UTC (rev 3063) +++ branches/Cog/image/getGoodSpurVM.sh 2014-08-26 08:52:44 UTC (rev 3064) @@ -1,25 +1,25 @@ #!/bin/sh -# Sets the VM env var to the r3060 Cog Spur VM for the current platform. +# Sets the VM env var to the r3063 Cog Spur VM for the current platform. # will download and install the VM in this directory if necessary. -TAG=14.31.3060 -REV=3060 +TAG=14.32.3063 +REV=3063 URL=http://www.mirandabanda.org/files/Cog/VM/VM.r$REV/ . ./envvars.sh case "$OS" in Darwin) get_vm_from_tar \ - CogSpur.app/Contents/MacOS/Squeak d71657f3596108f1ee26ddde98d2a6e1 \ - CogSpur.app-$TAG.tgz 775fc34a65293eb7c6b1fe585b29343c + CogSpur.app/Contents/MacOS/Squeak 80a55ecfb5abeabf3890c87898ee5914 \ + CogSpur.app-$TAG.tgz 741a5355c22f20cda33db969bb5e3d7a VM=CogSpur.app/Contents/MacOS/Squeak;; Linux) get_vm_from_tar \ - cogspurlinuxht/lib/squeak/4.0-$REV/squeak c0df39147de2ac7d76aee7d7aa073f36 \ - cogspurlinuxht-$TAG.tgz 70421b720be1f5f843c96b48fbe8d07e + cogspurlinuxht/lib/squeak/4.0-$REV/squeak \ + cogspurlinuxht-$TAG.tgz af8988545c1042a9813e3166390af6cb VM=cogspurlinuxht/squeak;; CYGWIN*) get_vm_from_zip \ - cogspurwin/SqueakConsole.exe 83454062da3b7855b81e3fb5a8c6d360 \ - cogspurwin-$TAG.zip 463d2fe92c95f4c7083ac37cd9baf84f + cogspurwin/SqueakConsole.exe a7bc32115050dab7e9060e8391025c4e \ + cogspurwin-$TAG.zip 6945ef0ff89bc5c1da00f6076868f3e6 VM=cogspurwin/SqueakConsole.exe;; *) echo "don't know how to run Squeak on your system. bailing out." 1>&2; exit 2 esac Added: branches/Cog/image/uploadspurimage.sh =================================================================== --- branches/Cog/image/uploadspurimage.sh (rev 0) +++ branches/Cog/image/uploadspurimage.sh 2014-08-26 08:52:44 UTC (rev 3064) @@ -0,0 +1,22 @@ +#!/bin/sh +# Upload a trunk46-spur.image/.changes to mirandabanda.org +RemoteUser=eliotmiranda(a)highland-park.dreamhost.com +RemoteRoot=mirandabanda.org/files/Cog/SpurImages +IFS=" +" +DATE=`date +%Y-%m-%d` +BASENAME=trunk46-spur +cd `dirname $0` + +DIR=$RemoteRoot/$DATE +echo ssh -x $RemoteUser mkdir $DIR +ssh -x $RemoteUser mkdir $DIR +echo scp -p $BASENAME.image $BASENAME.changes "$@" $RemoteUser:$DIR +scp -p $BASENAME.image $BASENAME.changes "$@" $RemoteUser:$DIR +echo ssh $RemoteUser chmod a-w $DIR/* \\\; ls -al $DIR +ssh $RemoteUser chmod a-w $DIR/* \; ls -al $DIR +echo ssh $RemoteUser rm $RemoteRoot/{$BASENAME.image,$BASENAME.changes} +ssh $RemoteUser rm $RemoteRoot/{$BASENAME.image,$BASENAME.changes} +echo ssh $RemoteUser ln -s $DIR/{$BASENAME.image,$BASENAME.changes} $RemoteRoot +ssh $RemoteUser ln -s $DIR/{$BASENAME.image,$BASENAME.changes} $RemoteRoot +ssh $RemoteUser ls -l $RemoteRoot Property changes on: branches/Cog/image/uploadspurimage.sh ___________________________________________________________________ Added: svn:executable + * Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2014-08-14 19:43:38 UTC (rev 3063) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-08-26 08:52:44 UTC (rev 3064) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.848 uuid: 2aa6755a-a96a-4834-bc08-5c0a831c4648 + CCodeGenerator VMMaker.oscog-eem.865 uuid: 4efffc12-280e-4060-b741-9066fb3fc970 from - StackToRegisterMappingCogit VMMaker.oscog-eem.848 uuid: 2aa6755a-a96a-4834-bc08-5c0a831c4648 + StackToRegisterMappingCogit VMMaker.oscog-eem.865 uuid: 4efffc12-280e-4060-b741-9066fb3fc970 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.848 uuid: 2aa6755a-a96a-4834-bc08-5c0a831c4648 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.865 uuid: 4efffc12-280e-4060-b741-9066fb3fc970 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -120,6 +120,7 @@ #define AlignmentNops 2 #define AllButTypeMask 0xFFFFFFFCUL #define AltBlockCreationBytecodeSize 3 +#define AltFirstSpecialSelector 80 #define AltNSSendIsPCAnnotated 0 #define AndCqR 93 #define AndCwR 100 @@ -183,6 +184,7 @@ #define FirstAnnotation 64 #define FirstJump 12 #define FirstShortJump 15 +#define FirstSpecialSelector 176 #define FoxCallerSavedIP 4 #define FoxMethod -4 #define FoxMFReceiver -12 @@ -385,6 +387,7 @@ static sqInt abstractRegisterForConcreteRegister(AbstractInstruction * self_in_abstractRegisterForConcreteRegister, sqInt reg) NoDbgRegParms; static AbstractInstruction * addDependent(AbstractInstruction * self_in_addDependent, AbstractInstruction *anInstruction) NoDbgRegParms; +static sqInt availableRegisterOrNilFor(AbstractInstruction * self_in_availableRegisterOrNilFor, sqInt liveRegsMask) NoDbgRegParms; static sqInt computeJumpTargetOffsetPlus(AbstractInstruction * self_in_computeJumpTargetOffsetPlus, sqInt anPCOffset) NoDbgRegParms; static sqInt concretizeLabel(AbstractInstruction * self_in_concretizeLabel) NoDbgRegParms; static sqInt genAlignCStackSavingRegistersnumArgswordAlignment(AbstractInstruction * self_in_genAlignCStackSavingRegistersnumArgswordAlignment, sqInt saveRegs, sqInt numArgs, sqInt alignment) NoDbgRegParms; @@ -492,7 +495,6 @@ static sqInt concretizeXCHGRR(AbstractInstruction * self_in_concretizeXCHGRR) NoDbgRegParms; static sqInt concretizeXorCwR(AbstractInstruction * self_in_concretizeXorCwR) NoDbgRegParms; static sqInt concretizeXorRR(AbstractInstruction * self_in_concretizeXorRR) NoDbgRegParms; -static sqInt counterTargetFromFollowingAddress(AbstractInstruction * self_in_counterTargetFromFollowingAddress, sqInt nextInstructionAddress) NoDbgRegParms; static sqInt cResultRegister(AbstractInstruction * self_in_cResultRegister) NoDbgRegParms; static void dispatchConcretize(AbstractInstruction * self_in_dispatchConcretize) NoDbgRegParms; static AbstractInstruction * genDivRRQuoRem(AbstractInstruction * self_in_genDivRRQuoRem, sqInt abstractRegDivisor, sqInt abstractRegDividend, sqInt abstractRegQuotient, sqInt abstractRegRemainder) NoDbgRegParms; @@ -2094,6 +2096,7 @@ #define ceCheckFeatures() ceCheckFeaturesFunction() #define ceReturnToInterpreterPC() ((usqInt)ceReturnToInterpreterTrampoline) #define cFramePointerAddress() ((unsigned long)&CFramePointer) +#define compileSendTrace() (traceFlags & 2) #define cr() putchar('\n') #define cStackPointerAddress() ((unsigned long)&CStackPointer) #define dynSuperEntryOffset() cmDynSuperEntryOffset @@ -2183,6 +2186,31 @@ } +/* Answer an unused abstract register in the liveRegMask. + Subclasses with more registers can override to answer them. */ + +static sqInt +availableRegisterOrNilFor(AbstractInstruction * self_in_availableRegisterOrNilFor, sqInt liveRegsMask) +{ + if (!(liveRegsMask & (registerMaskFor(Arg1Reg)))) { + return Arg1Reg; + } + if (!(liveRegsMask & (registerMaskFor(Arg0Reg)))) { + return Arg0Reg; + } + if (!(liveRegsMask & (registerMaskFor(SendNumArgsReg)))) { + return SendNumArgsReg; + } + if (!(liveRegsMask & (registerMaskFor(ClassReg)))) { + return ClassReg; + } + if (!(liveRegsMask & (registerMaskFor(ReceiverResultReg)))) { + return ReceiverResultReg; + } + return null; +} + + /* Since it's an extraction from other methods. */ static sqInt @@ -4675,17 +4703,6 @@ } -/* Answer the address of the MoveAw:R or MoveR:Aw: instruction preceeding - nextInstructionAddress - */ - -static sqInt -counterTargetFromFollowingAddress(AbstractInstruction * self_in_counterTargetFromFollowingAddress, sqInt nextInstructionAddress) -{ - return literalBeforeFollowingAddress(self_in_counterTargetFromFollowingAddress, nextInstructionAddress); -} - - /* Answer the abstract register for the C result register. Only partially implemented. Works on x86 since TempReg = EAX = C result reg. */ @@ -8663,7 +8680,6 @@ ? nExts + 1 : 0); } - /* begin maybeRememberPrevMap:absPCMcpc: */ } else { mcpc1 += (mapByte >= DisplacementX2N @@ -10268,7 +10284,7 @@ genoperand(JumpNonZero, ((sqInt)sendMiss)); /* begin Label */ noCheckEntry = genoperandoperand(Label, (labelCounter += 1), bytecodePC); - if (recordSendTrace()) { + if (compileSendTrace()) { CallRT(ceTraceLinkedSendTrampoline); } } @@ -10694,7 +10710,7 @@ } (method->cmUsageCount = initialMethodUsageCount()); (method->cpicHasMNUCase = 0); - (method->cmUsesPenultimateLit = maxLitIndex >= ((literalCountOfHeader(methodHeader)) - 2)); + (method->cmUsesPenultimateLit = maxLitIndex >= ((literalCountOfMethodHeader(methodHeader)) - 2)); (method->blockEntryOffset = (blockEntryLabel != null ? ((blockEntryLabel->address)) - (((sqInt)method)) : 0)); @@ -12990,7 +13006,7 @@ { sqInt *address; sqInt *address1; - usqInt cacheAddress; + sqInt cacheAddress; sqInt cacheTag; sqInt cacheTag1; sqInt cacheTagMarked; @@ -13123,7 +13139,7 @@ markLiteralspcmethod(sqInt annotation, char *mcpc, sqInt cogMethod) { sqInt *address; - usqInt cacheAddress; + sqInt cacheAddress; sqInt cacheTag; sqInt cacheTag1; sqInt class; @@ -13239,7 +13255,7 @@ static sqInt markYoungObjectspcmethod(sqInt annotation, char *mcpc, sqInt cogMethod) { - usqInt cacheAddress; + sqInt cacheAddress; sqInt cacheTag; sqInt cacheTag1; sqInt class; @@ -13530,7 +13546,6 @@ ? nExts + 1 : 0); } - /* begin maybeRememberPrevMap:absPCMcpc: */ } else { mcpc += (mapByte >= DisplacementX2N @@ -13559,14 +13574,14 @@ sqInt li; sqInt numLitsA; - headerA = headerOf(methodA); - headerB = headerOf(methodB); - numLitsA = literalCountOfHeader(headerA); + headerA = methodHeaderOf(methodA); + headerB = methodHeaderOf(methodB); + numLitsA = literalCountOfMethodHeader(headerA); endPCA = endPCOf(methodA); if (((argumentCountOfMethodHeader(headerA)) != (argumentCountOfMethodHeader(headerB))) || (((temporaryCountOfMethodHeader(headerA)) != (temporaryCountOfMethodHeader(headerB))) || (((primitiveIndexOfMethodheader(methodA, headerA)) != (primitiveIndexOfMethodheader(methodB, headerB))) - || ((numLitsA != (literalCountOfHeader(headerB))) + || ((numLitsA != (literalCountOfMethodHeader(headerB))) || (endPCA > (numBytesOf(methodB))))))) { return 0; } @@ -13619,7 +13634,7 @@ static sqInt noAssertMethodClassAssociationOf(sqInt methodPointer) { - return literalofMethod((literalCountOfHeader(noAssertHeaderOf(methodPointer))) - 1, methodPointer); + return literalofMethod((literalCountOfMethodHeader(noAssertHeaderOf(methodPointer))) - 1, methodPointer); } @@ -14086,7 +14101,7 @@ static sqInt remapIfObjectRefpchasYoung(sqInt annotation, char *mcpc, sqInt hasYoungPtr) { - usqInt cacheAddress; + sqInt cacheAddress; sqInt cacheTag; sqInt cacheTag1; sqInt entryPoint; @@ -14850,7 +14865,7 @@ static void voidImplicitReceiverCacheAt(sqInt mcpc) { - usqInt cacheAddress; + sqInt cacheAddress; assert(NumOopsPerIRC == 2); cacheAddress = (((usqInt)mcpc)) + (jumpShortByteSize(backEnd)); @@ -17065,9 +17080,13 @@ } -/* 249 11111001 i i i i i i i i jjjjjjjj Call Primitive #iiiiiiii + +/* V3PlusClosures: 139 10001011 iiiiiiii jjjjjjjj Call Primitive #iiiiiiii + (jjjjjjjj * 256) - */ + NewsqueakV4: 249 11111001 iiiiiiii jjjjjjjj Call Primitive #iiiiiiii + + (jjjjjjjj * 256) + SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + ( + jjjjjjj * 256) + m=1 means inlined primitive, no hard return after execution. */ static sqInt callPrimitiveBytecode(void) @@ -18417,8 +18436,8 @@ sqInt selector; index = byte0 - ((bytecodeSetOffset == 256 - ? 80 + 256 - : 176)); + ? AltFirstSpecialSelector + 256 + : FirstSpecialSelector)); selector = specialSelector(index); numArgs = specialSelectorNumArgs(index); return genSendnumArgs(selector, numArgs); @@ -19209,7 +19228,7 @@ if (!needsFrame) { return 0; } - methodHeader = headerOf(methodObj); + methodHeader = methodHeaderOf(methodObj); /* begin PushR: */ genoperand(PushR, FPReg); @@ -21503,8 +21522,8 @@ genoperandoperand(MoveCqR, argInt, Arg0Reg); } genMarshalledSendnumArgs(specialSelector(byte0 - ((bytecodeSetOffset == 256 - ? 80 + 256 - : 176))), 1); + ? AltFirstSpecialSelector + 256 + : FirstSpecialSelector))), 1); jmpTarget(jumpContinue, gLabel()); return 0; } @@ -21660,8 +21679,8 @@ genoperandoperand(MoveCqR, argInt, Arg0Reg); } return genMarshalledSendnumArgs(specialSelector(byte0 - ((bytecodeSetOffset == 256 - ? 80 + 256 - : 176))), 1); + ? AltFirstSpecialSelector + 256 + : FirstSpecialSelector))), 1); } static sqInt Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-08-14 19:43:38 UTC (rev 3063) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-08-26 08:52:44 UTC (rev 3064) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.848 uuid: 2aa6755a-a96a-4834-bc08-5c0a831c4648 + CCodeGenerator VMMaker.oscog-eem.865 uuid: 4efffc12-280e-4060-b741-9066fb3fc970 */ @@ -134,6 +134,7 @@ #define ceBaseFrameReturnPC() ceBaseFrameReturnTrampoline #define ceCannotResumePC() ((usqInt)ceCannotResumeTrampoline) #define ceReturnToInterpreterPC() ((usqInt)ceReturnToInterpreterTrampoline) +#define compileSendTrace() (traceFlags & 2) #define dynSuperEntryOffset() cmDynSuperEntryOffset #define entryOffset() cmEntryOffset #define getCFramePointer() CFramePointer Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-08-14 19:43:38 UTC (rev 3063) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-08-26 08:52:44 UTC (rev 3064) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.848 uuid: 2aa6755a-a96a-4834-bc08-5c0a831c4648 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.865 uuid: 4efffc12-280e-4060-b741-9066fb3fc970 from - CoInterpreter VMMaker.oscog-eem.848 uuid: 2aa6755a-a96a-4834-bc08-5c0a831c4648 + CoInterpreter VMMaker.oscog-eem.865 uuid: 4efffc12-280e-4060-b741-9066fb3fc970 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.848 uuid: 2aa6755a-a96a-4834-bc08-5c0a831c4648 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.865 uuid: 4efffc12-280e-4060-b741-9066fb3fc970 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -458,7 +458,6 @@ sqInt getCheckAllocFiller(void); sqInt getCurrentBytecode(void); static sqInt handleMNUInMachineCodeToclassForMessage(sqInt selectorIndex, sqInt rcvr, sqInt classForMessage) NoDbgRegParms; -sqInt headerOf(sqInt methodPointer); static sqInt iframeIsBlockActivation(char *theFP) NoDbgRegParms; static sqInt iframeReceiver(char *theFP) NoDbgRegParms; static sqInt iframeSavedIP(char *theFP) NoDbgRegParms; @@ -792,9 +791,11 @@ static sqInt copyObjtoSegmentaddrstopAtsaveOopAtheaderAt(sqInt oop, sqInt segmentWordArray, sqInt lastSeg, sqInt stopAddr, sqInt oopPtr, sqInt hdrPtr) NoDbgRegParms; usqInt freeStartAddress(void); sqInt isReallyYoungObject(sqInt obj); +sqInt methodHeaderOf(sqInt methodObj); sqInt noShiftCompactClassIndexOf(sqInt oop); sqInt nullHeaderForMachineCodeMethod(void); usqInt scavengeThresholdAddress(void); +sqInt smallIntegerTag(void); sqInt withoutForwardingOnandsendToCogit(sqInt obj1, sqInt obj2, sqInt (*selector)(sqInt,sqInt)); sqInt withoutForwardingOnandwithsendToCogit(sqInt obj1, sqInt obj2, sqInt aBool, sqInt (*selector)(sqInt,sqInt,sqInt)); usqInt youngStartAddress(void); @@ -830,11 +831,12 @@ static void initializeObjectMemory(sqInt bytesToShift) NoDbgRegParms; static sqInt isContextHeader(sqInt aHeader) NoDbgRegParms; sqInt isYoungObject(sqInt obj); -sqInt lastPointerOf(sqInt oop); +sqInt lastPointerOf(sqInt objOop); sqInt leakCheckBecome(void); sqInt leakCheckFullGC(void); sqInt leakCheckIncrementalGC(void); sqInt leakCheckNewSpaceGC(void); +sqInt literalCountOfMethodHeader(sqInt header); static sqInt loadImageSegmentFromoutPointers(sqInt segmentWordArray, sqInt outPointerArray) NoDbgRegParms; void longPrintReferencesTo(sqInt anOop); static void mapPointersInObjectsFromto(sqInt memStart, sqInt memEnd) NoDbgRegParms; @@ -850,7 +852,7 @@ void printWronglySizedContexts(sqInt printContexts); static void restoreHeadersFromtofromandtofrom(sqInt firstIn, sqInt lastIn, sqInt hdrBaseIn, sqInt firstOut, sqInt lastOut, sqInt hdrBaseOut) NoDbgRegParms; static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms; -static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms; +static usqInt safeObjectAfter(sqInt oop) NoDbgRegParms; static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms; static sqInt shortentoIndexableSize(sqInt obj, sqInt nSlots) NoDbgRegParms; static sqInt sizeBitsOfSafe(sqInt oop) NoDbgRegParms; @@ -926,6 +928,7 @@ sqInt formatOfClass(sqInt classPointer); static sqInt fwdBlockValid(sqInt addr) NoDbgRegParms; static sqInt goodContextSize(sqInt oop) NoDbgRegParms; +static sqInt hasForwardingBlock(sqInt objOop) NoDbgRegParms; static sqInt headerWhileForwardingOf(sqInt oop) NoDbgRegParms; sqInt indexablePointersFormat(void); sqInt instanceSizeOf(sqInt classObj); @@ -968,11 +971,13 @@ static sqInt lengthOfMaybeImmediate(sqInt oop) NoDbgRegParms; sqInt lengthOf(sqInt oop); static sqInt lengthOfbaseHeaderformat(sqInt oop, sqInt hdr, sqInt fmt) NoDbgRegParms; +sqInt literalCountOf(sqInt methodPointer); void longPrintInstancesOf(sqInt aClassOop); static sqInt lowestFreeAfter(sqInt chunk) NoDbgRegParms; sqInt markAndTrace(sqInt oop); sqInt maybeSplObj(sqInt index); sqInt nilObject(void); +static sqInt noFixupFollowFieldofObject(sqInt fieldIndex, sqInt anObject) NoDbgRegParms; sqInt noShiftCompactClassIndexOfHeader(sqInt header); sqInt numBytesOf(sqInt objOop); sqInt numSlotsOf(sqInt obj); @@ -1104,7 +1109,7 @@ static usqInt iframeMethod(char *theFP) NoDbgRegParms; static sqInt imageFormatVersion(void); sqInt includesBehaviorThatOf(sqInt aClass, sqInt aSuperclass); -sqInt initialPCForHeadermethod(sqInt methodHeader, sqInt theMethod); +static sqInt initialPCForHeadermethod(sqInt methodHeader, sqInt theMethod) NoDbgRegParms; sqInt integerArg(sqInt index); void ioFilenamefromStringofLengthresolveAliases(char *aCharBuffer, char *aFilenameString, sqInt filenameLength, sqInt aBoolean); static sqInt isBaseFrame(char *theFP) NoDbgRegParms; @@ -1124,8 +1129,6 @@ sqInt isKindOf(sqInt oop, char *className); sqInt isMemberOf(sqInt oop, char *className); static sqInt lengthOfNameOfClass(sqInt classOop) NoDbgRegParms; -sqInt literalCountOfHeader(sqInt headerPointer); -sqInt literalCountOf(sqInt methodPointer); sqInt literalofMethod(sqInt offset, sqInt methodPointer); sqInt loadBitBltFrom(sqInt bb); void loadInitialContext(void); @@ -1148,6 +1151,7 @@ sqInt methodClassAssociationOf(sqInt methodPointer); sqInt methodClassOf(sqInt methodPointer); static sqInt methodHeaderHasPrimitive(sqInt methodHeader) NoDbgRegParms; +static sqInt methodHeaderIndicatesLargeFrame(sqInt methodHeader) NoDbgRegParms; sqInt methodPrimitiveIndex(void); sqInt methodReturnValue(sqInt oop); sqInt methodUsesAlternateBytecodeSet(sqInt aMethodObj); @@ -1220,6 +1224,8 @@ static sqInt removeFirstLinkOfList(sqInt aList) NoDbgRegParms; EXPORT(sqInt) returnAsThroughCallbackContext(sqInt returnTypeOop, VMCallbackContext *vmCallbackContext, sqInt callbackMethodContext); static sqInt reverseDisplayFromto(sqInt startIndex, sqInt endIndex) NoDbgRegParms; +static sqInt safeMethodClassOf(sqInt methodPointer) NoDbgRegParms; +static sqInt saneMethodClassAssociationInnumLiterals(sqInt methodObj, sqInt numLiterals) NoDbgRegParms; void setBreakSelector(char *aString); void setFullScreenFlag(sqInt value); EXPORT(void (*setInterruptCheckChain(void (*aFunction)(void)))()) ; @@ -1383,6 +1389,7 @@ _iss usqInt compEnd; _iss sqInt externalPrimitiveTableFirstFreeIndex; _iss sqInt flagInterpretedMethods; +_iss sqInt thisClassIndex; _iss sqInt edenBytes; _iss usqInt fwdTableLast; _iss usqLong gcStartUsecs; @@ -1394,7 +1401,6 @@ _iss usqLong statIOProcessEvents; _iss sqInt statMkFwdCount; _iss sqInt tenuringThreshold; -_iss sqInt thisClassIndex; _iss sqInt forceTenureFlag; _iss sqInt longRunningPrimitiveCheckSequenceNumber; _iss sqInt methodDictLinearSearchLimit; @@ -1492,8 +1498,8 @@ sqInt desiredNumStackPages; sqInt extraVMMemory; sqInt desiredCogCodeSize; +sqInt breakSelectorLength = -1; usqInt heapBase; -sqInt breakSelectorLength = -1; void * showSurfaceFn; char * breakSelector; sqInt deferDisplayUpdates; @@ -2082,7 +2088,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.848"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.865"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -2104,6 +2110,7 @@ #define getCodeCompactionMSecs() integerObjectOf((GIV(statCodeCompactionUsecs) + 500) / 1000) #define getCogCodeSize() integerObjectOf(GIV(cogCodeSize)) #define getDesiredCogCodeSize() integerObjectOf(desiredCogCodeSize) +#define heapBase() heapBase #define initialEnterSmalltalkExecutive() enterSmalltalkExecutiveImplementation() #define primTraceLogIndex(aValue) (GIV(primTraceLogIndex) = (aValue)) #define setDesiredCogCodeSize(dccs) (desiredCogCodeSize = (dccs)) @@ -4415,7 +4422,7 @@ ctxtOrNilOrZero = findMethodWithPrimitiveFromFPUpToContext(198, GIV(framePointer), home); if (ctxtOrNilOrZero == 0) { theMethod = longAt((home + BaseHeaderSize) + (MethodIndex << ShiftForWord)); - if ((primitiveIndexOfMethodheader(theMethod, headerOf(theMethod))) == 198) { + if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == 198) { unwindContextOrNilOrZero = home; goto l299; } @@ -4664,7 +4671,7 @@ assert((((usqInt)(longAt(localFP + FoxMethod)))) >= (startOfMemory())); GIV(method) = longAt(localFP + FoxMethod); assert(isOopCompiledMethod(GIV(method))); - GIV(bytecodeSetSelector) = (headerIndicatesAlternateBytecodeSet(headerOf(GIV(method))) + GIV(bytecodeSetSelector) = (headerIndicatesAlternateBytecodeSet(methodHeaderOf(GIV(method))) ? 256 : 0); @@ -4876,7 +4883,6 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - null; goto l303; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -4886,7 +4892,7 @@ assert((((usqInt)(longAt(localFP + FoxMethod)))) >= (startOfMemory())); GIV(method) = longAt(localFP + FoxMethod); assert(isOopCompiledMethod(GIV(method))); - GIV(bytecodeSetSelector) = (headerIndicatesAlternateBytecodeSet(headerOf(GIV(method))) + GIV(bytecodeSetSelector) = (headerIndicatesAlternateBytecodeSet(methodHeaderOf(GIV(method))) ? 256 : 0); @@ -4894,7 +4900,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - null; + /* return self */ l303: /* end baseFrameReturn */; goto l302; } @@ -4933,7 +4939,7 @@ assert((((usqInt)(longAt(localFP + FoxMethod)))) >= (startOfMemory())); GIV(method) = longAt(localFP + FoxMethod); assert(isOopCompiledMethod(GIV(method))); - GIV(bytecodeSetSelector) = (headerIndicatesAlternateBytecodeSet(headerOf(GIV(method))) + GIV(bytecodeSetSelector) = (headerIndicatesAlternateBytecodeSet(methodHeaderOf(GIV(method))) ? 256 : 0); @@ -5259,7 +5265,6 @@ l309: /* end inlineLookupInMethodCacheSel:classTag: */; if (ok) { /* begin ifAppropriateCompileToNativeCode:selector: */ - VM_LABEL(0ifAppropriateCompileToNativeCodeselector); methodHeader2 = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); if (isCogMethodReference(methodHeader2)) { @@ -5271,9 +5276,7 @@ } } else { - if ((((((sqInt) methodHeader2)) < 0 - ? (((usqInt) methodHeader2) >> 1) & 0xFFFF - : (((usqInt) methodHeader2) >> 10) & 0xFF)) <= maxLiteralCountForCompile) { + if ((literalCountOfMethodHeader(methodHeader2)) <= maxLiteralCountForCompile) { cogselector(GIV(newMethod), GIV(messageSelector)); } else { @@ -5434,7 +5437,7 @@ /* begin setMethod:methodHeader: */ GIV(method) = GIV(newMethod); assert(isOopCompiledMethod(GIV(method))); - assert((headerOf(GIV(method))) == methodHeader); + assert((methodHeaderOf(GIV(method))) == methodHeader); GIV(bytecodeSetSelector) = ((((sqInt) methodHeader)) < 0 ? 256 : 0); @@ -5454,19 +5457,17 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(nilObj)); } - localIP = pointerForOop(((GIV(newMethod) + ((LiteralStart + (((((sqInt) methodHeader)) < 0 - ? (((usqInt) methodHeader) >> 1) & 0xFFFF - : (((usqInt) methodHeader) >> 10) & 0xFF))) * BytesPerOop)) + (BaseHeaderSize)) - 1); + localIP = pointerForOop((initialPCForHeadermethod(methodHeader, GIV(newMethod))) - 1); if (((((sqInt) methodHeader)) < 0 - ? methodHeader & (65536 << SmallIntegerShift) - : (methodHeader & 536871934) != 0)) { + ? methodHeader & (65536 << SmallIntegerShift) + : (methodHeader & 536871934) != 0)) { /* Skip the CallPrimitive bytecode, if it's there, and store the error code if the method starts with a long store temp. Strictly no need to skip the store because it's effectively a noop. */ localIP += ((((sqInt) methodHeader)) < 0 - ? 3 - : 0); + ? 3 + : 0); if (GIV(primFailCode) != 0) { if ((byteAt(localIP + 1)) == (((((sqInt) methodHeader)) < 0 ? AltLongStoreBytecode @@ -6377,7 +6378,7 @@ ? (FoxIFrameFlags + BytesPerWord) - 1 : FoxIFrameFlags))); if (((backwardJumpCountByte -= 2)) == 1) { - if (methodWithHeaderShouldBeCogged(headerOf(GIV(method)))) { + if (methodWithHeaderShouldBeCogged(methodHeaderOf(GIV(method)))) { /* begin externalizeIPandSP */ assert((((usqInt)localIP)) != (ceReturnToInterpreterPC())); GIV(instructionPointer) = oopForPointer(localIP); @@ -8452,7 +8453,7 @@ } else { if ((fmt2 < 12) - || (((index >> 1)) >= ((((literalCountOfHeader(headerOf(rcvr))) + LiteralStart) * BytesPerOop) + 1))) { + || (((index >> 1)) >= ((((literalCountOf(rcvr)) + LiteralStart) * BytesPerOop) + 1))) { result = (((byteAt((rcvr + BaseHeaderSize) + (((index >> 1)) - 1))) << 1) | 1); goto l117; } @@ -8696,7 +8697,7 @@ } else { if ((fmt2 >= 12) - && (((index >> 1)) < ((((literalCountOfHeader(headerOf(rcvr))) + LiteralStart) * BytesPerOop) + 1))) { + && (((index >> 1)) < ((((literalCountOf(rcvr)) + LiteralStart) * BytesPerOop) + 1))) { GIV(primFailCode) = PrimErrBadIndex; goto l127; } @@ -11346,7 +11347,7 @@ } else { if ((fmt2 < 12) - || (((index >> 1)) >= ((((literalCountOfHeader(headerOf(rcvr))) + LiteralStart) * BytesPerOop) + 1))) { + || (((index >> 1)) >= ((((literalCountOf(rcvr)) + LiteralStart) * BytesPerOop) + 1))) { result = (((byteAt((rcvr + BaseHeaderSize) + (((index >> 1)) - 1))) << 1) | 1); goto l253; } @@ -11590,7 +11591,7 @@ } else { if ((fmt2 >= 12) - && (((index >> 1)) < ((((literalCountOfHeader(headerOf(rcvr))) + LiteralStart) * BytesPerOop) + 1))) { + && (((index >> 1)) < ((((literalCountOf(rcvr)) + LiteralStart) * BytesPerOop) + 1))) { GIV(primFailCode) = PrimErrBadIndex; goto l263; } @@ -12924,7 +12925,7 @@ ? (FoxIFrameFlags + BytesPerWord) - 1 : FoxIFrameFlags))); if (((backwardJumpCountByte -= 2)) == 1) { - if (methodWithHeaderShouldBeCogged(headerOf(GIV(method)))) { + if (methodWithHeaderShouldBeCogged(methodHeaderOf(GIV(method)))) { /* begin externalizeIPandSP */ assert((((usqInt)localIP)) != (ceReturnToInterpreterPC())); GIV(instructionPointer) = oopForPointer(localIP); @@ -13222,16 +13223,14 @@ GIV(stackPointer) = sp2; } if (((((sqInt) methodHeader)) < 0 - ? methodHeader & (65536 << SmallIntegerShift) - : (methodHeader & 536871934) != 0)) { + ? methodHeader & (65536 << SmallIntegerShift) + : (methodHeader & 536871934) != 0)) { /* Store the error code if the method starts with a long store temp. No instructionPointer skip because we're heading for machine code. */ - initialPC = ((GIV(newMethod) + ((LiteralStart + (((((sqInt) methodHeader)) < 0 - ? (((usqInt) methodHeader) >> 1) & 0xFFFF - : (((usqInt) methodHeader) >> 10) & 0xFF))) * BytesPerOop)) + (BaseHeaderSize)) + (((((sqInt) methodHeader)) < 0 - ? 3 - : 0)); + initialPC = (initialPCForHeadermethod(methodHeader, GIV(newMethod))) + (((((sqInt) methodHeader)) < 0 + ? 3 + : 0)); if (GIV(primFailCode) != 0) { if ((byteAt(initialPC)) == (((((sqInt) methodHeader)) < 0 ? AltLongStoreBytecode @@ -13272,10 +13271,10 @@ activateNewMethod(void) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt errorCode; + sqInt header; sqInt i; sqInt inInterpreter; sqInt methodHeader; - sqInt methodHeader1; sqInt numArgs; sqInt numTemps; sqInt object; @@ -13291,12 +13290,14 @@ sqInt switched; sqInt table; - /* begin headerOf: */ - methodHeader1 = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); - methodHeader = (isCogMethodReference(methodHeader1) - ? (assert((((((CogMethod *) methodHeader1))->objectHeader)) == (nullHeaderForMachineCodeMethod())), - ((((CogMethod *) methodHeader1))->methodHeader)) - : methodHeader1); + /* begin methodHeaderOf: */ + assert(isCompiledMethod(GIV(newMethod))); + header = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + methodHeader = ((header & 1) + ? header + : (assert((((usqInt)header)) < (heapBase())), + assert((((((CogMethod *) header))->objectHeader)) == (nullHeaderForMachineCodeMethod())), + ((((CogMethod *) header))->methodHeader))); numTemps = (((usqInt) methodHeader) >> 19) & 0x3F; numArgs = (((usqInt) methodHeader) >> 25) & 15; @@ -13322,7 +13323,7 @@ /* begin setMethod:methodHeader: */ GIV(method) = GIV(newMethod); assert(isOopCompiledMethod(GIV(method))); - assert((headerOf(GIV(method))) == methodHeader); + assert((methodHeaderOf(GIV(method))) == methodHeader); GIV(bytecodeSetSelector) = ((((sqInt) methodHeader)) < 0 ? 256 : 0); @@ -13347,19 +13348,17 @@ longAtput((sp = GIV(stackPointer) - BytesPerWord), GIV(nilObj)); GIV(stackPointer) = sp; } - GIV(instructionPointer) = ((GIV(newMethod) + ((LiteralStart + (((((sqInt) methodHeader)) < 0 - ? (((usqInt) methodHeader) >> 1) & 0xFFFF - : (((usqInt) methodHeader) >> 10) & 0xFF))) * BytesPerOop)) + (BaseHeaderSize)) - 1; + GIV(instructionPointer) = (initialPCForHeadermethod(methodHeader, GIV(newMethod))) - 1; if (((((sqInt) methodHeader)) < 0 - ? methodHeader & (65536 << SmallIntegerShift) - : (methodHeader & 536871934) != 0)) { + ? methodHeader & (65536 << SmallIntegerShift) + : (methodHeader & 536871934) != 0)) { /* Skip the CallPrimitive bytecode, if it's there, and store the error code if the method starts with a long store temp. Strictly no need to skip the store because it's effectively a noop. */ GIV(instructionPointer) += ((((sqInt) methodHeader)) < 0 - ? 3 - : 0); + ? 3 + : 0); if (GIV(primFailCode) != 0) { if ((byteAt(GIV(instructionPointer) + 1)) == (((((sqInt) methodHeader)) < 0 ? AltLongStoreBytecode @@ -13405,8 +13404,8 @@ { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt firstBytecode; sqInt hash; + sqInt header; sqInt methodHeader; - sqInt methodHeader1; sqInt p; sqInt primBits; sqInt primitiveIndex; @@ -13424,19 +13423,21 @@ if (((GIV(newMethod) & 1) == 0) && (((((usqInt) (longAt(GIV(newMethod)))) >> (instFormatFieldLSB())) & 15) >= 12)) { /* begin primitiveIndexOfMethod:header: */ - /* begin headerOf: */ - methodHeader1 = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); - methodHeader = (isCogMethodReference(methodHeader1) - ? (assert((((((CogMethod *) methodHeader1))->objectHeader)) == (nullHeaderForMachineCodeMethod())), - ((((CogMethod *) methodHeader1))->methodHeader)) - : methodHeader1); + /* begin methodHeaderOf: */ + assert(isCompiledMethod(GIV(newMethod))); + header = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + methodHeader = ((header & 1) + ? header + : (assert((((usqInt)header)) < (heapBase())), + assert((((((CogMethod *) header))->objectHeader)) == (nullHeaderForMachineCodeMethod())), + ((((CogMethod *) header))->methodHeader))); primitiveIndex = ((((sqInt) methodHeader)) < 0 - ? (methodHeader & (65536 << SmallIntegerShift) - ? ((firstBytecode = (GIV(newMethod) + ((LiteralStart + ((((usqInt) methodHeader) >> 1) & 0xFFFF)) * BytesPerWord)) + BaseHeaderSize), - (byteAt(firstBytecode + 1)) + ((byteAt(firstBytecode + 2)) << 8)) - : 0) - : ((primBits = ((usqInt) methodHeader) >> 1), - (primBits & 0x1FF) + ((((usqInt) primBits) >> 19) & 512))); + ? (methodHeader & (65536 << SmallIntegerShift) + ? ((firstBytecode = (GIV(newMethod) + ((LiteralStart + ((((usqInt) methodHeader) >> 1) & 0xFFFF)) * BytesPerOop)) + (BaseHeaderSize)), + (byteAt(firstBytecode + 1)) + ((byteAt(firstBytecode + 2)) << 8)) + : 0) + : ((primBits = (methodHeader >> 1)), + (primBits & 0x1FF) + ((((usqInt) primBits) >> 19) & 512))); /* begin functionPointerFor:inClass: */ primitiveFunctionPointer = ((void (*)(void)) ((primitiveIndex > MaxPrimitiveIndex ? 0 @@ -13731,9 +13732,7 @@ else { /* begin startPCOfMethodHeader: */ aCompiledMethodHeader = (cogMethod->methodHeader); - startBcpc = ((((((sqInt) aCompiledMethodHeader)) < 0 - ? (((usqInt) aCompiledMethodHeader) >> 1) & 0xFFFF - : (((usqInt) aCompiledMethodHeader) >> 10) & 0xFF)) + LiteralStart) * BytesPerOop; + startBcpc = ((literalCountOfMethodHeader(aCompiledMethodHeader)) + LiteralStart) * BytesPerOop; cogMethod2 = ((CogBlockMethod *) cogMethod); methodField = ((sqInt)cogMethod); } @@ -13778,7 +13777,7 @@ volatile void *currentCFramePointer; volatile void *currentCStackPointer; volatile sqInt header; - volatile sqInt methodHeader; + volatile sqInt header1; volatile jmp_buf savedReenterInterpreter; volatile sqInt wasInMachineCode; volatile sqInt xArray; @@ -13827,12 +13826,14 @@ GIV(newMethod) = GIV(suspendedMethods)[GIV(jmpDepth)]; /* begin argumentCountOfMethodHeader: */ - /* begin headerOf: */ - methodHeader = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); - header = (isCogMethodReference(methodHeader) - ? (assert((((((CogMethod *) methodHeader))->objectHeader)) == (nullHeaderForMachineCodeMethod())), - ((((CogMethod *) methodHeader))->methodHeader)) - : methodHeader); + /* begin methodHeaderOf: */ + assert(isCompiledMethod(GIV(newMethod))); + header1 = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + header = ((header1 & 1) + ? header1 + : (assert((((usqInt)header1)) < (heapBase())), + assert((((((CogMethod *) header1))->objectHeader)) == (nullHeaderForMachineCodeMethod())), + ((((CogMethod *) header1))->methodHeader))); GIV(argumentCount) = (((usqInt) header) >> 25) & 15; assert(wasInMachineCode == (isMachineCodeFrame(GIV(framePointer)))); if (calledFromMachineCode) { @@ -14110,7 +14111,7 @@ assert((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) >= (startOfMemory())); GIV(method) = longAt(GIV(framePointer) + FoxMethod); assert(isOopCompiledMethod(GIV(method))); - GIV(bytecodeSetSelector) = (headerIndicatesAlternateBytecodeSet(headerOf(GIV(method))) + GIV(bytecodeSetSelector) = (headerIndicatesAlternateBytecodeSet(methodHeaderOf(GIV(method))) ? 256 : 0); @@ -14298,9 +14299,7 @@ } } else { - if ((((((sqInt) methodHeader)) < 0 - ? (((usqInt) methodHeader) >> 1) & 0xFFFF - : (((usqInt) methodHeader) >> 10) & 0xFF)) <= maxLiteralCountForCompile) { + if ((literalCountOfMethodHeader(methodHeader)) <= maxLiteralCountForCompile) { cogselector(GIV(newMethod), selector); } else { @@ -14367,8 +14366,8 @@ ceInterpretMethodFromPICreceiver(sqInt aMethodObj, sqInt rcvr) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt firstBytecode; + sqInt header; sqInt methodHeader; - sqInt methodHeader1; CogMethod *pic; sqInt primBits; sqInt primitiveIndex; @@ -14393,19 +14392,21 @@ GIV(messageSelector) = (pic->selector); GIV(newMethod) = aMethodObj; /* begin primitiveIndexOfMethod:header: */ - /* begin headerOf: */ - methodHeader1 = longAt((aMethodObj + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); - methodHeader = (isCogMethodReference(methodHeader1) - ? (assert((((((CogMethod *) methodHeader1))->objectHeader)) == (nullHeaderForMachineCodeMethod())), - ((((CogMethod *) methodHeader1))->methodHeader)) - : methodHeader1); + /* begin methodHeaderOf: */ + assert(isCompiledMethod(aMethodObj)); + header = longAt((aMethodObj + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + methodHeader = ((header & 1) + ? header + : (assert((((usqInt)header)) < (heapBase())), + assert((((((CogMethod *) header))->objectHeader)) == (nullHeaderForMachineCodeMethod())), + ((((CogMethod *) header))->methodHeader))); primitiveIndex = ((((sqInt) methodHeader)) < 0 - ? (methodHeader & (65536 << SmallIntegerShift) - ? ((firstBytecode = (aMethodObj + ((LiteralStart + ((((usqInt) methodHeader) >> 1) & 0xFFFF)) * BytesPerWord)) + BaseHeaderSize), - (byteAt(firstBytecode + 1)) + ((byteAt(firstBytecode + 2)) << 8)) - : 0) - : ((primBits = ((usqInt) methodHeader) >> 1), - (primBits & 0x1FF) + ((((usqInt) primBits) >> 19) & 512))); + ? (methodHeader & (65536 << SmallIntegerShift) + ? ((firstBytecode = (aMethodObj + ((LiteralStart + ((((usqInt) methodHeader) >> 1) & 0xFFFF)) * BytesPerOop)) + (BaseHeaderSize)), + (byteAt(firstBytecode + 1)) + ((byteAt(firstBytecode + 2)) << 8)) + : 0) + : ((primBits = (methodHeader >> 1)), + (primBits & 0x1FF) + ((((usqInt) primBits) >> 19) & 512))); /* begin functionPointerFor:inClass: */ primitiveFunctionPointer = ((void (*)(void)) ((primitiveIndex > MaxPrimitiveIndex ? 0 @@ -14425,8 +14426,8 @@ sqInt ccIndex1; CogMethod *cPIC; sqInt firstBytecode; + sqInt header; sqInt methodHeader; - sqInt methodHeader1; sqInt primBits; sqInt primitiveIndex; char *sp; @@ -14462,19 +14463,21 @@ } GIV(newMethod) = aMethodObj; /* begin primitiveIndexOfMethod:header: */ - /* begin headerOf: */ - methodHeader1 = longAt((aMethodObj + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); - methodHeader = (isCogMethodReference(methodHeader1) - ? (assert((((((CogMethod *) methodHeader1))->objectHeader)) == (nullHeaderForMachineCodeMethod())), - ((((CogMethod *) methodHeader1))->methodHeader)) - : methodHeader1); + /* begin methodHeaderOf: */ + assert(isCompiledMethod(aMethodObj)); + header = longAt((aMethodObj + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + methodHeader = ((header & 1) + ? header + : (assert((((usqInt)header)) < (heapBase())), + assert((((((CogMethod *) header))->objectHeader)) == (nullHeaderForMachineCodeMethod())), + ((((CogMethod *) header))->methodHeader))); primitiveIndex = ((((sqInt) methodHeader)) < 0 - ? (methodHeader & (65536 << SmallIntegerShift) - ? ((firstBytecode = (aMethodObj + ((LiteralStart + ((((usqInt) methodHeader) >> 1) & 0xFFFF)) * BytesPerWord)) + BaseHeaderSize), - (byteAt(firstBytecode + 1)) + ((byteAt(firstBytecode + 2)) << 8)) - : 0) - : ((primBits = ((usqInt) methodHeader) >> 1), - (primBits & 0x1FF) + ((((usqInt) primBits) >> 19) & 512))); + ? (methodHeader & (65536 << SmallIntegerShift) + ? ((firstBytecode = (aMethodObj + ((LiteralStart + ((((usqInt) methodHeader) >> 1) & 0xFFFF)) * BytesPerOop)) + (BaseHeaderSize)), + (byteAt(firstBytecode + 1)) + ((byteAt(firstBytecode + 2)) << 8)) + : 0) + : ((primBits = (methodHeader >> 1)), + (primBits & 0x1FF) + ((((usqInt) primBits) >> 19) & 512))); /* begin functionPointerFor:inClass: */ primitiveFunctionPointer = ((void (*)(void)) ((primitiveIndex > MaxPrimitiveIndex ? 0 @@ -14583,7 +14586,7 @@ ctxtOrNilOrZero = findMethodWithPrimitiveFromFPUpToContext(198, GIV(framePointer), home); if (ctxtOrNilOrZero == 0) { theMethod = longAt((home + BaseHeaderSize) + (MethodIndex << ShiftForWord)); - if ((primitiveIndexOfMethodheader(theMethod, headerOf(theMethod))) == 198) { + if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == 198) { unwindContextOrNilOrZero = home; goto l3; } @@ -14839,7 +14842,7 @@ assert((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) >= (startOfMemory())); GIV(method) = longAt(GIV(framePointer) + FoxMethod); assert(isOopCompiledMethod(GIV(method))); - GIV(bytecodeSetSelector) = (headerIndicatesAlternateBytecodeSet(headerOf(GIV(method))) + GIV(bytecodeSetSelector) = (headerIndicatesAlternateBytecodeSet(methodHeaderOf(GIV(method))) ? 256 : 0); @@ -14903,9 +14906,7 @@ } } else { - if ((((((sqInt) methodHeader)) < 0 - ? (((usqInt) methodHeader) >> 1) & 0xFFFF - : (((usqInt) methodHeader) >> 10) & 0xFF)) <= maxLiteralCountForCompile) { + if ((literalCountOfMethodHeader(methodHeader)) <= maxLiteralCountForCompile) { cogselector(GIV(newMethod), selector); } else { @@ -14983,9 +14984,7 @@ } } else { - if ((((((sqInt) methodHeader)) < 0 - ? (((usqInt) methodHeader) >> 1) & 0xFFFF - : (((usqInt) methodHeader) >> 10) & 0xFF)) <= maxLiteralCountForCompile) { + if ((literalCountOfMethodHeader(methodHeader)) <= maxLiteralCountForCompile) { cogselector(GIV(newMethod), selector); } else { @@ -15110,9 +15109,7 @@ } } else { - if ((((((sqInt) methodHeader)) < 0 - ? (((usqInt) methodHeader) >> 1) & 0xFFFF - : (((usqInt) methodHeader) >> 10) & 0xFF)) <= maxLiteralCountForCompile) { + if ((literalCountOfMethodHeader(methodHeader)) <= maxLiteralCountForCompile) { cogselector(GIV(newMethod), selector); } else { @@ -15378,7 +15375,7 @@ ? (longAt(oop - BaseHeaderSize)) & AllButTypeMask : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord))))); if (((((usqInt) (longAt(oop))) >> (instFormatFieldLSB())) & 15) >= 12) { - i = ((literalCountOfHeader(headerOf(oop))) + LiteralStart) - 1; + i = ((literalCountOfMethodHeader(methodHeaderOf(oop))) + LiteralStart) - 1; } else { if (((oop & 1) == 0) @@ -15958,7 +15955,7 @@ assert((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) >= (startOfMemory())); GIV(method) = longAt(GIV(framePointer) + FoxMethod); assert(isOopCompiledMethod(GIV(method))); - GIV(bytecodeSetSelector) = (headerIndicatesAlternateBytecodeSet(headerOf(GIV(method))) + GIV(bytecodeSetSelector) = (headerIndicatesAlternateBytecodeSet(methodHeaderOf(GIV(method))) ? 256 : 0); @@ -16130,9 +16127,7 @@ } methodHeader = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); if (!(isCogMethodReference(methodHeader))) { - if ((((((sqInt) methodHeader)) < 0 - ? (((usqInt) methodHeader) >> 1) & 0xFFFF - : (((usqInt) methodHeader) >> 10) & 0xFF)) <= maxLiteralCountForCompile) { + if ((literalCountOfMethodHeader(methodHeader)) <= maxLiteralCountForCompile) { cogselector(GIV(newMethod), GIV(nilObj)); methodHeader = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); } @@ -16322,9 +16317,7 @@ } } else { - if ((((((sqInt) methodHeader)) < 0 - ? (((usqInt) methodHeader) >> 1) & 0xFFFF - : (((usqInt) methodHeader) >> 10) & 0xFF)) <= maxLiteralCountForCompile) { + if ((literalCountOfMethodHeader(methodHeader)) <= maxLiteralCountForCompile) { cogselector(GIV(newMethod), GIV(messageSelector)); } else { @@ -16357,7 +16350,7 @@ { sqInt lit; - if (!((literalCountOfHeader(headerOf(methodObj))) > 0)) { + if (!((literalCountOfMethodHeader(methodHeaderOf(methodObj))) > 0)) { return null; } lit = longAt((methodObj + BaseHeaderSize) + ((0 + LiteralStart) << ShiftForWord)); @@ -16619,7 +16612,7 @@ if (functionPointer == primitiveExternalCall) { /* begin functionForPrimitiveExternalCall: */ setPostCompileHook(recordCallOffsetInof); - if (!((literalCountOfHeader(headerOf(methodObj))) > 0)) { + if (!((literalCountOfMethodHeader(methodHeaderOf(methodObj))) > 0)) { return ((void (*)(void)) primitiveExternalCall); } @@ -16706,9 +16699,7 @@ } } else { - if ((((((sqInt) methodHeader)) < 0 - ? (((usqInt) methodHeader) >> 1) & 0xFFFF - : (((usqInt) methodHeader) >> 10) & 0xFF)) <= maxLiteralCountForCompile) { + if ((literalCountOfMethodHeader(methodHeader)) <= maxLiteralCountForCompile) { cogselector(GIV(newMethod), GIV(messageSelector)); } else { @@ -16740,19 +16731,7 @@ @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.865.mcz
by commits＠source.squeak.org 26 Aug '14

26 Aug '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.865.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.865 Author: eem Time: 26 August 2014, 9:33:50.954 am UUID: 4efffc12-280e-4060-b741-9066fb3fc970 Ancestors: VMMaker.oscog-eem.864 Fix a simulation only method by marking it <doNotGenerate>. =============== Diff against VMMaker.oscog-eem.864 =============== Item was changed: ----- Method: SpurSegmentManager>>initSegmentForInImageCompilationFrom:to: (in category 'simulation') ----- initSegmentForInImageCompilationFrom: base to: limit + <doNotGenerate> | bridge | self allocateOrExtendSegmentInfos. numSegments := 1. bridge := manager initSegmentBridgeWithBytes: manager memory byteSize - limit at: limit - manager bridgeSize. segments := {SpurSegmentInfo new segStart: base; segSize: limit - base; yourself}. segments := CArrayAccessor on: segments!

1 0

VM Maker: VMMaker.oscog-eem.864.mcz
by commits＠source.squeak.org 26 Aug '14

26 Aug '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.864.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.864 Author: eem Time: 26 August 2014, 9:28:33.064 am UUID: 6a9b157d-24d8-47eb-bbc0-0a467b390e26 Ancestors: VMMaker.oscog-eem.863 Sista: Fix primitiveSistaMethodPICAndCounterData after the VMMaker.oscog-eem.814 change moving counters to the heap. Add several modifications to the current image facade so we can get the send and branch data for an in-image compilation. Fix header printing of counters and IR caches. Implement genBinaryConstOpVarInlinePrimitive: & genBinaryVarOpConstInlinePrimitive: and correct genBinaryVarOpVarInlinePrimitive: for Slang. V3: Fix bug with become where duplicate entries in the input array would crash the system (thanks Igor). =============== Diff against VMMaker.oscog-eem.863 =============== Item was added: + ----- Method: CogARMCompiler>>isBigEndian (in category 'testing') ----- + isBigEndian + ^false! Item was removed: - ----- Method: CogIA32Compiler>>counterTargetFromFollowingAddress: (in category 'sista counters') ----- - counterTargetFromFollowingAddress: nextInstructionAddress - "Answer the address of the MoveAw:R or MoveR:Aw: instruction preceeding nextInstructionAddress" - ^self literalBeforeFollowingAddress: nextInstructionAddress! Item was added: + ----- Method: Cogit>>cCoerce:to: (in category 'simulation only') ----- + cCoerce: value to: cTypeString + "Type coercion for translation only; just return the value when running in Smalltalk." + <doNotGenerate> + ^value == nil + ifTrue: [value] + ifFalse: [value coerceTo: cTypeString sim: objectMemory]! 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)(BytecodeDescriptor *desc, sqInt isBackwardBranch, char *mcpc, sqInt bcpc, void *arg)'> <var: #arg type: #'void *'> <inline: true> | 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]]]). latestContinuation := startbcpc. aMethodObj := homeMethod methodObject. endbcpc := (objectMemory numBytesOf: 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: nil with: false 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 isBackwardBranch | 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]]. isBackwardBranch := descriptor isBranch and: [self isBackwardBranch: descriptor at: bcpc exts: nExts in: aMethodObj]. result := self perform: functionSymbol with: descriptor with: isBackwardBranch with: (self cCoerceSimple: mcpc to: #'char *') with: bcpc with: arg. result ~= 0 ifTrue: [^result]. bcpc := nextBcpc. + nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]]] - nExts := descriptor isExtension ifTrue: [nExts + 1] ifFalse: [0]]. - self maybeRememberPrevMap: annotation absPCMcpc: mcpc] ifFalse: [mcpc := mcpc + (mapByte >= DisplacementX2N ifTrue: [mapByte - DisplacementX2N << AnnotationShift] ifFalse: [mapByte])]. map := map - 1]. ^0! Item was changed: ----- Method: Cogit>>printMethodHeader:on: (in category 'disassembly') ----- printMethodHeader: cogMethod on: aStream <doNotGenerate> self cCode: '' inSmalltalk: [cogMethod isInteger ifTrue: [^self printMethodHeader: (self cogMethodOrBlockSurrogateAt: cogMethod) on: aStream]]. aStream ensureCr. cogMethod asInteger printOn: aStream base: 16. aStream crtab. cogMethod cmType = CMMethod ifTrue: [aStream nextPutAll: 'objhdr: '. cogMethod objectHeader printOn: aStream base: 16]. cogMethod cmType = CMBlock ifTrue: [aStream nextPutAll: 'homemth: '. cogMethod cmHomeMethod asUnsignedInteger printOn: aStream base: 16. aStream crtab; nextPutAll: 'startpc: '; print: cogMethod startpc]. aStream crtab; nextPutAll: 'nArgs: '; print: cogMethod cmNumArgs; tab; nextPutAll: 'type: '; print: cogMethod cmType. (cogMethod cmType ~= 0 and: [cogMethod cmType ~= CMBlock]) ifTrue: [aStream crtab; nextPutAll: 'blksiz: '. cogMethod blockSize printOn: aStream base: 16. aStream crtab; nextPutAll: 'method: '. cogMethod methodObject printOn: aStream base: 16. aStream crtab; nextPutAll: 'mthhdr: '. cogMethod methodHeader printOn: aStream base: 16. aStream crtab; nextPutAll: 'selctr: '. cogMethod selector printOn: aStream base: 16. (coInterpreter lookupAddress: cogMethod selector) ifNotNil: [:string| aStream nextPut: $=; nextPutAll: string]. aStream crtab; nextPutAll: 'blkentry: '. cogMethod blockEntryOffset printOn: aStream base: 16. cogMethod blockEntryOffset ~= 0 ifTrue: [aStream nextPutAll: ' => '. cogMethod asInteger + cogMethod blockEntryOffset printOn: aStream base: 16]]. cogMethod cmType = CMClosedPIC ifTrue: [aStream crtab; nextPutAll: 'cPICNumCases: '. cogMethod cPICNumCases printOn: aStream base: 16.] ifFalse: [aStream crtab; nextPutAll: 'stackCheckOffset: '. cogMethod stackCheckOffset printOn: aStream base: 16. cogMethod stackCheckOffset > 0 ifTrue: [aStream nextPut: $/. cogMethod asInteger + cogMethod stackCheckOffset printOn: aStream base: 16]. cogMethod cmType ~= CMBlock ifTrue: [aStream crtab; nextPutAll: 'cmRefersToYoung: '; nextPutAll: (cogMethod cmRefersToYoung ifTrue: ['yes'] ifFalse: ['no'])]. cogMethod cmType = CMMethod ifTrue: [([cogMethod nextMethodOrIRCs] on: MessageNotUnderstood do: [:ex| nil]) ifNotNil: [:nmoircs| aStream crtab; nextPutAll: 'nextMethodOrIRCs: '. + nmoircs = 0 ifTrue: [aStream print: nmoircs] ifFalse: [coInterpreter printHex: nmoircs]]. - nmoircs = 0 ifTrue: [aStream print: nmoircs] ifFalse: [self printHex: nmoircs]]. ([cogMethod counters] on: MessageNotUnderstood do: [:ex| nil]) ifNotNil: [:cntrs| aStream crtab; nextPutAll: 'counters: '. + cntrs = 0 ifTrue: [aStream print: cntrs] ifFalse: [coInterpreter printHex: cntrs]]]]. - cntrs = 0 ifTrue: [aStream print: cntrs] ifFalse: [self printHex: cntrs]]]]. aStream cr; flush! Item was changed: CogClass subclass: #CurrentImageCoInterpreterFacade instanceVariableNames: 'memory cogit coInterpreter objectMemory objectMap headerToMethodMap cachedObject cachedOop variables' classVariableNames: '' + poolDictionaries: 'VMBasicConstants VMObjectIndices VMSqueakClassIndices' - poolDictionaries: 'VMBasicConstants VMObjectIndices' category: 'VMMaker-Support'! !CurrentImageCoInterpreterFacade commentStamp: 'eem 8/6/2014 14:59' prior: 0! A CurrentImageCoInterpreterFacade is a stand-in for an object memory (ObjectMemory, SpurMemoryManager, etc) that allows the Cogits to access image objects as if they were in the simulator VM's heap. hence it allows the Cogits to generate code for methdos in the current image, for testing, etc. Instance Variables cachedObject: <Object> cachedOop: <Integer> coInterpreter: <CoInterpreter> cogit: <Cogit> headerToMethodMap: <Dictionary> memory: <ByteArray> objectMap: <IdentityDictionary> objectMemory: <NewObjectMemory|SpurMemoryManager> variables: <Dictionary> cachedObject - the object matching cachedOop, to speed-up oop to obejct mapping cachedOop - the last used oop coInterpreter - the CoInterpreter simulator used by the cogit. cogit - the code egnerator in use headerToMethodMap - a map from header to CompiledMethod memory - a rump memory for holding various interpreter variables (e.g. stackLimit) that are accessed as memory locations by generated code objectMap - map from objects to their oops objectMemory - the object memory used to encode various values, answer queries, etc variables - a map from the names of variables to their addresses in memory ! Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>addressForLabel: (in category 'labels') ----- addressForLabel: l + ^variables at: l ifAbsentPut: [variables size * 4 + self variablesBase]! - ^variables at: l ifAbsentPut: [variables size * 4 + 131072]! Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>byteAt: (in category 'accessing') ----- byteAt: index + ^objectMemory byteAt: index! - ^memory at: index + 1! Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>byteAt:put: (in category 'accessing') ----- byteAt: index put: value + ^objectMemory byteAt: index put: value! - ^memory at: index + 1 put: value! Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>cogCodeSize (in category 'accessing') ----- cogCodeSize + ^memory byteSize / 4! - ^memory size / 2! Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>cogit: (in category 'initialize-release') ----- cogit: aCogit cogit := aCogit. coInterpreter cogit: aCogit. (objectMemory respondsTo: #cogit:) ifTrue: + [objectMemory cogit: aCogit]. + (objectMemory respondsTo: #coInterpreter:) ifTrue: + [objectMemory coInterpreter: coInterpreter]! - [objectMemory cogit: aCogit]! Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>initialize (in category 'initialize-release') ----- initialize + memory := (VMBIGENDIAN + ifTrue: [Bitmap] + ifFalse: [LittleEndianBitmap]) new: 1024*1024/4. + objectMemory := self class objectMemoryClass simulatorClass new. + objectMemory memory: memory. - memory := ByteArray new: 262144. - objectMemory := self class objectMemoryClass new. coInterpreter := CoInterpreter new. coInterpreter instVarNamed: 'objectMemory' put: objectMemory; instVarNamed: 'primitiveTable' put: (CArrayAccessor on: CoInterpreter primitiveTable copy). variables := Dictionary new. #('stackLimit') do: [:l| self addressForLabel: l]. self initializeObjectMap! Item was added: + ----- Method: CurrentImageCoInterpreterFacade>>long32At: (in category 'accessing') ----- + long32At: index + ^objectMemory long32At: index! Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>long32At:put: (in category 'accessing') ----- long32At: index put: value + ^objectMemory long32At: index put: value! - ^memory longAt: index + 1 put: value bigEndian: false! Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>longAt: (in category 'accessing') ----- + longAt: index + ^objectMemory longAt: index! - longAt: index - ^memory unsignedLongAt: index + 1! Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>longAt:put: (in category 'accessing') ----- longAt: index put: value + ^objectMemory longAt: index put: value! - ^memory longAt: index + 1 put: value bigEndian: false! Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>methodCacheAddress (in category 'accessing') ----- methodCacheAddress + "Use the top half of memory for variables, methodcache and rumpCStack, + and the bottom half for allocating code and objects: + + 0 - 256k: code zone + 256k to 512k object zone + 512k to 768k variables + 768k to 1023k method cache + 1023k to 1024k rump C stack" + ^memory byteSize * 3 / 4! - ^memory size * 3 / 4! Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>numSlotsOf: (in category 'accessing') ----- + numSlotsOf: objOop - numSlotsOf: objOop "Answer the number of slots in the given non-immediate object. Does not adjust the size of contexts by stackPointer." | obj elementSize wordSize | obj := self objectForOop: objOop. + obj = objOop ifTrue: + [^objectMemory numSlotsOf: objOop]. self deny: ([obj class isImmediateClass] on: MessageNotUnderstood do: [:ex| obj class == SmallInteger]). wordSize := Smalltalk wordSize. elementSize := [obj class elementSize] on: MessageNotUnderstood do: [:ex| obj class isBytes ifTrue: [1] ifFalse: [wordSize]]. wordSize = 4 ifTrue: [^elementSize caseOf: { [1] -> [obj basicSize + 3 // wordSize]. [2] -> [obj basicSize * 2 + 3 // wordSize]. [4] -> [obj basicSize + obj class instSize] }]. ^elementSize caseOf: { [1] -> [obj basicSize + (wordSize - 1) // wordSize]. [2] -> [obj basicSize * 2 + (wordSize - 1) // wordSize]. [4] -> [obj basicSize * 2 + (wordSize - 1) // wordSize]. [8] -> [obj basicSize + obj class instSize] }! Item was added: + ----- Method: CurrentImageCoInterpreterFacade>>printHex: (in category 'printing') ----- + printHex: anInteger + coInterpreter printHex: anInteger! Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>rumpCStackAddress (in category 'accessing') ----- rumpCStackAddress + "Use the top half of memory for variables, methodcache and rumpCStack, + and the bottom half for allocating code and objects: + + 0 - 256k: code zone + 256k to 512k object zone + 512k to 768k variables + 768k to 1023k method cache + 1023k to 1024k rump C stack" + ^memory byteSize - 1024! - ^memory size / 4 * 3 + 1024! Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>startOfMemory (in category 'accessing') ----- startOfMemory + "Use the top half of memory for variables, methodcache and rumpCStack, + and the bottom half for allocating code and objects: + + 0 - 256k: code zone + 256k to 512k object zone + 512k to 768k variables + 768k to 1023k method cache + 1023k to 1024k rump C stack" + ^memory byteSize / 4! - ^memory size! Item was removed: - ----- Method: CurrentImageCoInterpreterFacade>>unalignedLongAt: (in category 'accessing') ----- - unalignedLongAt: index - ^memory unsignedLongAt: index + 1! Item was added: + ----- Method: CurrentImageCoInterpreterFacade>>variablesBase (in category 'private') ----- + variablesBase + "Use the top half of memory for variables, methodcache and rumpCStack, and the bottom half for allocating code and objects: + + 0 - 256k: code zone + 256k to 512k object zone + 512k to 768k variables + 768k to 1023k method cache + 1023k to 1024k rump C stack" + ^memory byteSize / 2! Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>wordSize (in category 'accessing') ----- wordSize + ^objectMemory wordSize! - ^self memMgr wordSize! Item was changed: CurrentImageCoInterpreterFacade subclass: #CurrentImageCoInterpreterFacadeForSpurObjectRepresentation + instanceVariableNames: 'hiddenRoots' - instanceVariableNames: 'memMgr hiddenRoots' classVariableNames: '' poolDictionaries: '' category: 'VMMaker-Support'! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>allocatePinnedSlots: (in category 'cog jit support') ----- + allocatePinnedSlots: nSlots + ^(objectMemory allocatePinnedSlots: nSlots) + ifNil: [nil] + ifNotNil: + [:objOop | + objectMap at: objOop put: objOop]! Item was changed: ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>classIndexMask (in category 'accessing') ----- classIndexMask + ^objectMemory classIndexMask! - ^self memMgr classIndexMask! Item was changed: ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>classTableRootObj (in category 'accessing') ----- classTableRootObj hiddenRoots ifNil: + [hiddenRoots := Array new: objectMemory classTableRootSlots + objectMemory hiddenRootSlots]. - [hiddenRoots := Array new: self memMgr classTableRootSlots + self memMgr hiddenRootSlots]. ^self oopForObject: hiddenRoots! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>eeInstantiateClassIndex:format:numSlots: (in category 'cog jit support') ----- + eeInstantiateClassIndex: knownClassIndex format: objFormat numSlots: numSlots + self assert: knownClassIndex = ClassArrayCompactIndex. + ^self oopForObject: (Array new: numSlots)! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>initialize (in category 'initialize-release') ----- + initialize + super initialize. + objectMemory + initializeFreeSpaceForFacadeFrom: self startOfMemory + to: self variablesBase! Item was removed: - ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>memMgr (in category 'accessing') ----- - memMgr - ^memMgr ifNil: - [memMgr := Spur32BitCoMemoryManager new]! Item was removed: - ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>memMgr: (in category 'accessing') ----- - memMgr: aSpurMemoryManagerSubclassInstance - memMgr := aSpurMemoryManagerSubclassInstance! Item was changed: ----- Method: CurrentImageCoInterpreterFacadeForSpurObjectRepresentation>>tagMask (in category 'testing') ----- tagMask + ^objectMemory tagMask! - ^self memMgr tagMask! Item was added: + ----- Method: NewCoObjectMemory>>coInterpreter (in category 'accessing') ----- + coInterpreter + <doNotGenerate> + ^coInterpreter! Item was added: + ----- Method: NewCoObjectMemory>>coInterpreter: (in category 'accessing') ----- + coInterpreter: aCoInterpreter + <doNotGenerate> + coInterpreter := aCoInterpreter! Item was added: + ----- Method: NewCoObjectMemory>>headerIndicatesAlternateBytecodeSet: (in category 'simulation') ----- + headerIndicatesAlternateBytecodeSet: methodHeader + "this is here only for in-image compilation" + <doNotGenerate> + "A negative header selects the alternate bytecode set." + ^methodHeader signedIntFromLong < 0! Item was added: + ----- Method: NewCoObjectMemory>>smallIntegerTag (in category 'cog jit support') ----- + smallIntegerTag + <api> + ^1! Item was changed: ----- Method: NewObjectMemory>>initForwardBlock:mapping:to:withBackPtr: (in category 'gc -- compaction') ----- + initForwardBlock: fwdBlock mapping: objOop to: newOop withBackPtr: backFlag - initForwardBlock: fwdBlock mapping: oop to: newOop withBackPtr: backFlag "Initialize the given forwarding block to map oop to newOop, + and replace oop's header with a pointer to the fowarding block." - and replace oop's header with a pointer to the fowarding - block. " "Details: The mark bit is used to indicate that an oop is forwarded. When an oop is forwarded, its header (minus the mark bit) contains the address of its forwarding block. (The forwarding block address is actually shifted right by one bit so that its top-most bit does not conflict with the header's mark bit; since fowarding blocks are stored on word boundaries, the low two bits of the address are always zero.) The first word of the forwarding block is the new oop; the second word is the oop's orginal header. In the case of a forward become, a four-word block is used, with the third field being a backpointer to the old oop (for header fixup), and the fourth word is unused. The type bits of the forwarding header are the same as those of the original header. " | originalHeader originalHeaderType | <inline: true> + <asmLabel: false> - <asmLabel: false> - originalHeader := self longAt: oop. self assert: fwdBlock ~= nil. "ran out of forwarding blocks in become" + self deny: (self hasForwardingBlock: objOop). "'object already has a forwarding table entry" + originalHeader := self longAt: objOop. - self assert: (originalHeader bitAnd: MarkBit) = 0. "'object already has a forwarding table entry" originalHeaderType := originalHeader bitAnd: TypeMask. self longAt: fwdBlock put: newOop. self longAt: fwdBlock + BytesPerWord put: originalHeader. + backFlag ifTrue: [self longAt: fwdBlock + (BytesPerWord*2) put: objOop]. + self longAt: objOop put: (fwdBlock >> 1 bitOr: (MarkBit bitOr: originalHeaderType))! - backFlag ifTrue: [self longAt: fwdBlock + (BytesPerWord*2) put: oop]. - self longAt: oop put: (fwdBlock >> 1 bitOr: (MarkBit bitOr: originalHeaderType))! Item was changed: ----- Method: NewObjectMemory>>prepareForwardingTableForBecoming:with:twoWay: (in category 'become') ----- prepareForwardingTableForBecoming: array1 with: array2 twoWay: twoWayFlag "Ensure that there are enough forwarding blocks to accomodate this become, then prepare forwarding blocks for the pointer swap. Return true if successful." "Details: Doing a GC might generate enough space for forwarding blocks if we're short. However, this is an uncommon enough case that it is better handled by primitive fail code at the Smalltalk level." "Important note on multiple references to same object - since the preparation of fwdBlocks is NOT idempotent we get VM crashes if the same object is referenced more than once in such a way as to require multiple fwdBlocks. oop1 forwardBecome: oop1 is ok since only a single fwdBlock is needed. oop1 become: oop1 would fail because the second fwdBlock woudl not have the actual object header but rather the mutated ref to the first fwdBlock. Further problems can arise with an array1 or array2 that refer multiply to the same object. This would notbe expected input for programmer writen code but might arise from automatic usage such as in ImageSegment loading. To avoid the simple and rather common case of oop1 become*: oop1, we skip such pairs and simply avoid making fwdBlocks - it is redundant anyway" | entriesNeeded entriesAvailable fieldOffset oop1 oop2 fwdBlock fwdBlkSize | entriesNeeded := (self lastPointerOf: array1) // BytesPerWord. "need enough entries for all oops" "Note: Forward blocks must be quadword aligned - see fwdTableInit:." twoWayFlag ifTrue: ["Double the number of blocks for two-way become" entriesNeeded := entriesNeeded * 2. fwdBlkSize := BytesPerWord * 2] ifFalse: ["One-way become needs backPointers in fwd blocks." fwdBlkSize := BytesPerWord * 4]. entriesAvailable := self fwdTableInit: fwdBlkSize. entriesAvailable < entriesNeeded ifTrue: [self initializeMemoryFirstFree: freeStart. "re-initialize the free block" ^false]. fieldOffset := self lastPointerOf: array1. [fieldOffset >= BaseHeaderSize] whileTrue: [oop1 := self longAt: array1 + fieldOffset. oop2 := self longAt: array2 + fieldOffset. "if oop1 == oop2, no need to do any work for this pair. May still be other entries in the arrays though so keep looking" + oop1 ~= oop2 ifTrue: + [(self hasForwardingBlock: oop1) ifFalse: "Don't allocate multiple forwarding entries for duplicates." - oop1 = oop2 ifFalse: - [fwdBlock := self fwdBlockGet: fwdBlkSize. - self - initForwardBlock: fwdBlock - mapping: oop1 - to: oop2 - withBackPtr: twoWayFlag not. - twoWayFlag ifTrue: "Second block maps oop2 back to oop1 for two-way become" [fwdBlock := self fwdBlockGet: fwdBlkSize. self initForwardBlock: fwdBlock + mapping: oop1 + to: oop2 + withBackPtr: twoWayFlag not]. + (twoWayFlag + and: [(self hasForwardingBlock: oop2) not]) ifTrue: "Again don't get confused by duplicates" + ["Second block maps oop2 back to oop1 for two-way become" + fwdBlock := self fwdBlockGet: fwdBlkSize. + self + initForwardBlock: fwdBlock + mapping: oop2 + to: oop1 + withBackPtr: twoWayFlag not]]. - mapping: oop2 - to: oop1 - withBackPtr: twoWayFlag not]]. fieldOffset := fieldOffset - BytesPerWord]. ^true! Item was added: + ----- Method: ObjectMemory>>hasForwardingBlock: (in category 'header access') ----- + hasForwardingBlock: objOop + ^self isMarked: objOop! Item was changed: ----- Method: ObjectMemory>>prepareForwardingTableForBecoming:with:twoWay: (in category 'become') ----- prepareForwardingTableForBecoming: array1 with: array2 twoWay: twoWayFlag "Ensure that there are enough forwarding blocks to accomodate this become, then prepare forwarding blocks for the pointer swap. Return true if successful." "Details: Doing a GC might generate enough space for forwarding blocks if we're short. However, this is an uncommon enough case that it is better handled by primitive fail code at the Smalltalk level." "Important note on multiple references to same object - since the preparation of fwdBlocks is NOT idempotent we get VM crashes if the same object is referenced more than once in such a way as to require multiple fwdBlocks. oop1 forwardBecome: oop1 is ok since only a single fwdBlock is needed. oop1 become: oop1 would fail because the second fwdBlock woudl not have the actual object header but rather the mutated ref to the first fwdBlock. Further problems can arise with an array1 or array2 that refer multiply to the same object. This would notbe expected input for programmer writen code but might arise from automatic usage such as in ImageSegment loading. To avoid the simple and rather common case of oop1 become*: oop1, we skip such pairs and simply avoid making fwdBlocks - it is redundant anyway" | entriesNeeded entriesAvailable fieldOffset oop1 oop2 fwdBlock fwdBlkSize | entriesNeeded := (self lastPointerOf: array1) // BytesPerWord. "need enough entries for all oops" "Note: Forward blocks must be quadword aligned - see fwdTableInit:." twoWayFlag ifTrue: ["Double the number of blocks for two-way become" entriesNeeded := entriesNeeded * 2. fwdBlkSize := BytesPerWord * 2] ifFalse: ["One-way become needs backPointers in fwd blocks." fwdBlkSize := BytesPerWord * 4]. entriesAvailable := self fwdTableInit: fwdBlkSize. entriesAvailable < entriesNeeded ifTrue: [self initializeMemoryFirstFree: freeBlock. "re-initialize the free block" ^ false]. fieldOffset := self lastPointerOf: array1. [fieldOffset >= BaseHeaderSize] whileTrue: [oop1 := self longAt: array1 + fieldOffset. oop2 := self longAt: array2 + fieldOffset. "if oop1 == oop2, no need to do any work for this pair. May still be other entries in the arrays though so keep looking" + oop1 ~= oop2 ifTrue: + [(self hasForwardingBlock: oop1) ifFalse: "Don't allocate multiple forwarding entries for duplicates." + [fwdBlock := self fwdBlockGet: fwdBlkSize. + self - oop1 = oop2 - ifFalse: [fwdBlock := self fwdBlockGet: fwdBlkSize. - self initForwardBlock: fwdBlock mapping: oop1 to: oop2 + withBackPtr: twoWayFlag not]. + (twoWayFlag + and: [(self hasForwardingBlock: oop2) not]) ifTrue: "Again don't get confused by duplicates" + ["Second block maps oop2 back to oop1 for two-way become" - withBackPtr: twoWayFlag not. - twoWayFlag - ifTrue: ["Second block maps oop2 back to oop1 for two-way become" fwdBlock := self fwdBlockGet: fwdBlkSize. self initForwardBlock: fwdBlock mapping: oop2 to: oop1 withBackPtr: twoWayFlag not]]. fieldOffset := fieldOffset - BytesPerWord]. ^ true! Item was changed: StackToRegisterMappingCogit subclass: #SistaStackToRegisterMappingCogit + instanceVariableNames: 'picDataIndex picData numCounters counters counterIndex initialCounterValue ceClassTrapTrampoline' - instanceVariableNames: 'picDataIndex picData numCounters counters counterIndex initialCounterValue prevMapAbsPCMcpc ceClassTrapTrampoline' classVariableNames: 'CounterBytes MaxCounterValue' poolDictionaries: 'VMSqueakClassIndices' category: 'VMMaker-JIT'! !SistaStackToRegisterMappingCogit commentStamp: 'eem 4/7/2014 12:23' prior: 0! A SistaStackToRegisterMappingCogit is a refinement of StackToRegisterMappingCogit that generates code suitable for dynamic optimization by Sista, the Speculative Inlining Smalltalk Architecture, a project by Clément Bera and Eliot Miranda. Sista is an optimizer that exists in the Smalltalk image, /not/ in the VM, and optimizes by substituting normal bytecoded methods by optimized bytecoded methods that may use special bytecodes for which the Cogit can generate faster code. These bytecodes eliminate overheads such as bounds checks or polymorphic code (indexing Array, ByteArray, String etc). But the bulk of the optimization performed is in inlining blocks and sends for the common path. The basic scheme is that SistaStackToRegisterMappingCogit generates code containing performance counters. When these counters trip, a callback into the image is performed, at which point Sista analyses some portion of the stack, looking at performance data for the methods on the stack, and optimises based on the stack and performance data. Execution then resumes in the optimized code. SistaStackToRegisterMappingCogit adds counters to conditional branches. Each branch has an executed and a taken count, implemented at the two 16-bit halves of a single 32-bit word. Each counter pair is initialized with initialCounterValue. On entry to the branch the executed count is decremented and if the count goes below zero the ceMustBeBooleanAdd[True|False] trampoline called. The trampoline distinguishes between true mustBeBoolean and counter trips because in the former the register temporarily holding the counter value will contain zero. Then the condition is tested, and if the branch is taken the taken count is decremented. The two counter values allow an optimizer to collect basic block execution paths and to know what are the "hot" paths through execution that are worth agressively optimizing. Since conditional branches are about 1/6 as frequent as sends, and since they can be used to determine the hot path through code, they are a better choice to count than, for example, method or block entry. SistaStackToRegisterMappingCogit implements picDataFor:into: that fills an Array with the state of the counters in a method and the state of each linked send in a method. This is used to implement a primitive used by the optimizer to answer the branch and send data for a method as an Array. Instance Variables counterIndex: <Integer> counterMethodCache: <CogMethod> counters: <Array of AbstractInstruction> initialCounterValue: <Integer> numCounters: <Integer> picData: <Integer Oop> picDataIndex: <Integer> prevMapAbsPCMcpc: <Integer> counterIndex - xxxxx counterMethodCache - xxxxx counters - xxxxx initialCounterValue - xxxxx numCounters - xxxxx picData - xxxxx picDataIndex - xxxxx prevMapAbsPCMcpc - xxxxx ! Item was removed: - ----- Method: SistaStackToRegisterMappingCogit>>mapFor:bcpc:performUntil:arg: (in category 'method map') ----- - mapFor: cogMethod bcpc: startbcpc performUntil: functionSymbol arg: arg - "as a hack for collecting counters, remember the prev mcpc in a static variable." - prevMapAbsPCMcpc := 0. - ^super mapFor: cogMethod bcpc: startbcpc performUntil: functionSymbol arg: arg! Item was removed: - ----- Method: SistaStackToRegisterMappingCogit>>maybeRememberPrevMap:absPCMcpc: (in category 'method map') ----- - maybeRememberPrevMap: annotation absPCMcpc: mcpc - "Remember the previous IsAbsPCReference's mcpc for collecting send and branch data." - <inline: true> - annotation = IsAbsPCReference ifTrue: - [self assert: mcpc ~= 0. - prevMapAbsPCMcpc := mcpc]! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>picDataFor:IsBackwardBranch:Mcpc:Bcpc:Method: (in category 'method introspection') ----- picDataFor: descriptor IsBackwardBranch: IsBackwardBranch Mcpc: mcpc Bcpc: bcpc Method: cogMethodArg <var: #descriptor type: #'BytecodeDescriptor *'> <var: #mcpc type: #'char *'> <var: #cogMethodArg type: #'void *'> + | entryPoint tuple counter | + <var: #counter type: #'unsigned long'> + - | entryPoint tuple | descriptor isNil ifTrue: [^0]. descriptor isBranch ifTrue: ["it's a branch; conditional?" (descriptor isBranchTrue or: [descriptor isBranchFalse]) ifTrue: + [counter := (self + cCoerce: ((self + cCoerceSimple: cogMethodArg + to: #'CogMethod *') counters) + to: #'unsigned long *') + at: counterIndex. + tuple := self picDataForCounter: counter at: bcpc + 1. - [tuple := self picDataForConditionalBranch: prevMapAbsPCMcpc at: bcpc + descriptor numBytes. tuple = 0 ifTrue: [^PrimErrNoMemory]. objectMemory storePointer: picDataIndex ofObject: picData withValue: tuple. + picDataIndex := picDataIndex + 1. + counterIndex := counterIndex + 1]. - 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]. entryPoint := backEnd callTargetFromReturnAddress: mcpc asUnsignedInteger. entryPoint <= methodZoneBase ifTrue: "send is not linked, or is not a send" [^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]. tuple = 0 ifTrue: [^PrimErrNoMemory]. objectMemory storePointer: picDataIndex ofObject: picData withValue: tuple. picDataIndex := picDataIndex + 1. ^0! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>picDataFor:into: (in category 'method introspection') ----- picDataFor: cogMethod into: arrayObj "Collect the branch and send data for cogMethod, storing it into arrayObj." <api> <var: #cogMethod type: #'CogMethod *'> | errCode | cogMethod stackCheckOffset = 0 ifTrue: [^0]. + picDataIndex := counterIndex := 0. - picDataIndex := 0. picData := arrayObj. errCode := self mapFor: (self cCoerceSimple: cogMethod to: #'CogBlockMethod *') bcpc: (coInterpreter startPCOfMethod: cogMethod methodObject) performUntil: #picDataFor:IsBackwardBranch:Mcpc:Bcpc:Method: arg: cogMethod asVoidPointer. errCode ~= 0 ifTrue: [self assert: errCode = PrimErrNoMemory. ^-1]. cogMethod blockEntryOffset ~= 0 ifTrue: [errCode := self blockDispatchTargetsFor: cogMethod perform: #picDataForBlockEntry:Method: arg: cogMethod asInteger. errCode ~= 0 ifTrue: [self assert: errCode = PrimErrNoMemory. ^-1]]. ^picDataIndex! Item was removed: - ----- Method: SistaStackToRegisterMappingCogit>>picDataForConditionalBranch:at: (in category 'method introspection') ----- - picDataForConditionalBranch: counterReferenceMcpc at: bcpc - | address counter executedCount tuple untakenCount | - <var: #counter type: #'unsigned long'> - tuple := objectMemory - eeInstantiateClassIndex: ClassArrayCompactIndex - format: objectMemory arrayFormat - numSlots: 3. - tuple = 0 ifTrue: - [^0]. - self assert: CounterBytes = 4. - address := backEnd counterTargetFromFollowingAddress: counterReferenceMcpc. - counter := objectMemory longAt: address. - executedCount := initialCounterValue - (counter >> 16). - untakenCount := initialCounterValue - (counter bitAnd: 16rFFFF). - objectMemory - storePointerUnchecked: 0 ofObject: tuple withValue: (objectMemory integerObjectOf: bcpc); - storePointerUnchecked: 1 ofObject: tuple withValue: (objectMemory integerObjectOf: executedCount); - storePointerUnchecked: 2 ofObject: tuple withValue: (objectMemory integerObjectOf: untakenCount). - ^tuple! Item was added: + ----- Method: SistaStackToRegisterMappingCogit>>picDataForCounter:at: (in category 'method introspection') ----- + picDataForCounter: counter at: bcpc + | executedCount tuple untakenCount | + <var: #counter type: #'unsigned long'> + tuple := objectMemory + eeInstantiateClassIndex: ClassArrayCompactIndex + format: objectMemory arrayFormat + numSlots: 3. + tuple = 0 ifTrue: + [^0]. + self assert: CounterBytes = 4. + executedCount := initialCounterValue - (counter >> 16). + untakenCount := initialCounterValue - (counter bitAnd: 16rFFFF). + objectMemory + storePointerUnchecked: 0 ofObject: tuple withValue: (objectMemory integerObjectOf: bcpc); + storePointerUnchecked: 1 ofObject: tuple withValue: (objectMemory integerObjectOf: executedCount); + storePointerUnchecked: 2 ofObject: tuple withValue: (objectMemory integerObjectOf: untakenCount). + ^tuple! Item was added: + ----- Method: Spur32BitCoMemoryManager>>initializeFreeSpaceForFacadeFrom:to: (in category 'simulation only') ----- + initializeFreeSpaceForFacadeFrom: base to: limit + "c.f. initializeFreeSpacePostLoad: freeListObj." + | freeListObj freeBytes | + newSpaceLimit := oldSpaceStart := freeStart := base. + endOfMemory := scavengeThreshold := limit.. + segmentManager initSegmentForInImageCompilationFrom: base to: limit. + freeListObj := self allocateSlots: self numFreeLists + format: self wordIndexableFormat + classIndex: self wordSizeClassIndexPun. + freeLists := self firstIndexableField: freeListObj. + freeListsMask := 0. + 0 to: self numFreeLists - 1 do: + [:i| + (freeLists at: i) ~= 0 ifTrue: + [freeListsMask := freeListsMask bitOr: (1 << i). + freeLists at: i put: (segmentManager swizzleObj: (freeLists at: i))]]. + freeBytes := segmentManager lastSegment segLimit - self bridgeSize - freeStart. + freeLists at: 0 put: (self initFreeChunkWithBytes: freeBytes at: freeStart). + totalFreeOldSpace := freeBytes! Item was changed: ----- Method: SpurMemoryManager>>initializeFreeSpacePostLoad: (in category 'snapshot') ----- initializeFreeSpacePostLoad: freeListObj "Reinitialize the free list info. The freeLists object needs to be swizzled because its neither a free, nor a pointer object. Free objects have already been swizzled in adjustAllOopsBy:" self assert: (self numSlotsOf: freeListObj) = self numFreeLists. + self assert: (self formatOf: freeListObj) = self wordIndexableFormat. - self assert: (self formatOf: freeListObj) = (self wordSize = 4 - ifTrue: [self firstLongFormat] - ifFalse: [self sixtyFourBitIndexableFormat]). freeLists := self firstIndexableField: freeListObj. freeListsMask := 0. 0 to: self numFreeLists - 1 do: [:i| (freeLists at: i) ~= 0 ifTrue: [freeListsMask := freeListsMask bitOr: (1 << i). freeLists at: i put: (segmentManager swizzleObj: (freeLists at: i))]]! Item was added: + ----- Method: SpurSegmentManager>>initSegmentForInImageCompilationFrom:to: (in category 'simulation') ----- + initSegmentForInImageCompilationFrom: base to: limit + | bridge | + self allocateOrExtendSegmentInfos. + numSegments := 1. + bridge := manager initSegmentBridgeWithBytes: manager memory byteSize - limit at: limit - manager bridgeSize. + segments := {SpurSegmentInfo new + segStart: base; + segSize: limit - base; + yourself}. + segments := CArrayAccessor on: segments! Item was added: + ----- Method: StackToRegisterMappingCogit>>genBinaryConstOpVarInlinePrimitive: (in category 'inline primitive generators') ----- + genBinaryConstOpVarInlinePrimitive: prim + "Const op var version of binary inline primitives." + "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. + See EncoderForSistaV1's class comment and StackInterpreter>>#inlinePrimitiveBytecode:" + | ra val untaggedVal | + (ra := backEnd availableRegisterOrNilFor: self liveRegisters) ifNil: + [self ssAllocateRequiredReg: + (ra := optStatus isReceiverResultRegLive + ifTrue: [Arg0Reg] + ifFalse: [ReceiverResultReg])]. + ra = ReceiverResultReg ifTrue: + [optStatus isReceiverResultRegLive: false]. + self ssTop popToReg: ra. + self ssPop: 1. + val := self ssTop constant. + self ssPop: 1. + untaggedVal := val - objectMemory smallIntegerTag. + prim caseOf: { + "0 through 6, +, -, *, /, //, \\, quo:, SmallInteger op SmallInteger => SmallInteger, no overflow" + [0] -> [self AddCq: untaggedVal R: ra]. + [1] -> [self SubCq: untaggedVal R: ra]. + [2] -> [objectRepresentation genRemoveSmallIntegerTagsInScratchReg: ra. + self MoveCq: (objectMemory integerValueOf: val) R: TempReg. + self MulR: TempReg R: ra. + objectRepresentation genAddSmallIntegerTagsTo: ra]. + + "16 through 19, bitAnd:, bitOr:, bitXor, bitShift:, SmallInteger op SmallInteger => SmallInteger, no overflow" + + "32 through 37, >, <, >=, <=. =, ~=, SmallInteger op SmallInteger => Boolean (flags?? then in jump bytecodes if ssTop is a flags value, just generate the instruction!!!!)" + + "64 through 68, Pointer Object>>at:, Byte Object>>at:, Short16 Word Object>>at: LongWord32 Object>>at: Quad64Word Object>>at:. obj op 0-rel SmallInteger => oop" + + "80 through 84, Pointer Object>>at:put:, Byte Object>>at:put:, Short16 Word Object>>at:put: LongWord32 Object>>at:put: Quad64Word Object>>at:put:. obj op 0-rel SmallInteger => oop" + + } + otherwise: [^EncounteredUnknownBytecode]. + self ssPushRegister: ra. + ^0! Item was added: + ----- Method: StackToRegisterMappingCogit>>genBinaryVarOpConstInlinePrimitive: (in category 'inline primitive generators') ----- + genBinaryVarOpConstInlinePrimitive: prim + "Var op const version of inline binary inline primitives." + "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. + See EncoderForSistaV1's class comment and StackInterpreter>>#inlinePrimitiveBytecode:" + | rr val untaggedVal | + (rr := backEnd availableRegisterOrNilFor: self liveRegisters) ifNil: + [self ssAllocateRequiredReg: + (rr := optStatus isReceiverResultRegLive + ifTrue: [Arg0Reg] + ifFalse: [ReceiverResultReg])]. + rr = ReceiverResultReg ifTrue: + [optStatus isReceiverResultRegLive: false]. + val := self ssTop constant. + self ssPop: 1. + self ssTop popToReg: rr. + self ssPop: 1. + untaggedVal := val - objectMemory smallIntegerTag. + prim caseOf: { + "0 through 6, +, -, *, /, //, \\, quo:, SmallInteger op SmallInteger => SmallInteger, no overflow" + [0] -> [self AddCq: untaggedVal R: rr]. + [1] -> [self SubCq: untaggedVal R: rr]. + [2] -> [self flag: 'could use MulCq:R'. + objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: rr. + self MoveCq: (objectMemory integerValueOf: val) R: TempReg. + self MulR: TempReg R: rr. + objectRepresentation genAddSmallIntegerTagsTo: rr]. + + "16 through 19, bitAnd:, bitOr:, bitXor, bitShift:, SmallInteger op SmallInteger => SmallInteger, no overflow" + + "32 through 37, >, <, >=, <=. =, ~=, SmallInteger op SmallInteger => Boolean (flags?? then in jump bytecodes if ssTop is a flags value, just generate the instruction!!!!)" + + "64 through 68, Pointer Object>>at:, Byte Object>>at:, Short16 Word Object>>at: LongWord32 Object>>at: Quad64Word Object>>at:. obj op 0-rel SmallInteger => oop" + + "80 through 84, Pointer Object>>at:put:, Byte Object>>at:put:, Short16 Word Object>>at:put: LongWord32 Object>>at:put: Quad64Word Object>>at:put:. obj op 0-rel SmallInteger => oop" + + } + otherwise: [^EncounteredUnknownBytecode]. + self ssPushRegister: rr. + ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genBinaryVarOpVarInlinePrimitive: (in category 'inline primitive generators') ----- genBinaryVarOpVarInlinePrimitive: prim + "Var op var version of binary inline primitives." "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. See EncoderForSistaV1's class comment and StackInterpreter>>#inlinePrimitiveBytecode:" | ra rr | + (rr := backEnd availableRegisterOrNilFor: self liveRegisters) ifNil: + [self ssAllocateRequiredReg: + (rr := optStatus isReceiverResultRegLive - rr := (backEnd availableRegisterOrNilFor: self liveRegisters) ifNil: - [self ssAllocateRequiredReg: - (optStatus isReceiverResultRegLive ifTrue: [Arg0Reg] ifFalse: [ReceiverResultReg])]. + (ra := backEnd availableRegisterOrNilFor: (self liveRegisters bitOr: (self registerMaskFor: rr))) ifNil: + [self ssAllocateRequiredReg: (rr := Arg1Reg)]. - ra := (backEnd availableRegisterOrNilFor: (self liveRegisters bitOr: (self registerMaskFor: rr))) ifNil: - [self ssAllocateRequiredReg: Arg1Reg]. (rr = ReceiverResultReg or: [ra = ReceiverResultReg]) ifTrue: [optStatus isReceiverResultRegLive: false]. self ssTop popToReg: ra. self ssPop: 1. self ssTop popToReg: rr. self ssPop: 1. prim caseOf: { "0 through 6, +, -, *, /, //, \\, quo:, SmallInteger op SmallInteger => SmallInteger, no overflow" [0] -> [objectRepresentation genRemoveSmallIntegerTagsInScratchReg: ra. self AddR: ra R: rr]. [1] -> [self SubR: ra R: rr. objectRepresentation genAddSmallIntegerTagsTo: rr]. [2] -> [objectRepresentation genRemoveSmallIntegerTagsInScratchReg: rr. objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: ra. self MulR: ra R: rr. objectRepresentation genAddSmallIntegerTagsTo: rr]. "16 through 19, bitAnd:, bitOr:, bitXor, bitShift:, SmallInteger op SmallInteger => SmallInteger, no overflow" "32 through 37, >, <, >=, <=. =, ~=, SmallInteger op SmallInteger => Boolean (flags?? then in jump bytecodes if ssTop is a flags value, just generate the instruction!!!!)" "64 through 68, Pointer Object>>at:, Byte Object>>at:, Short16 Word Object>>at: LongWord32 Object>>at: Quad64Word Object>>at:. obj op 0-rel SmallInteger => oop" "80 through 84, Pointer Object>>at:put:, Byte Object>>at:put:, Short16 Word Object>>at:put: LongWord32 Object>>at:put: Quad64Word Object>>at:put:. obj op 0-rel SmallInteger => oop" } otherwise: [^EncounteredUnknownBytecode]. self ssPushRegister: rr. ^0! Item was added: + ----- Method: StackToRegisterMappingCogit>>genTrinaryInlinePrimitive: (in category 'inline primitive generators') ----- + genTrinaryInlinePrimitive: prim + "Unary inline primitives." + "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. + See EncoderForSistaV1's class comment and StackInterpreter>>#inlinePrimitiveBytecode:" + "not yet implemented" + ^EncounteredUnknownBytecode! Item was added: + ----- Method: StackToRegisterMappingCogit>>genUnaryInlinePrimitive: (in category 'inline primitive generators') ----- + genUnaryInlinePrimitive: prim + "Unary inline primitives." + "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. + See EncoderForSistaV1's class comment and StackInterpreter>>#inlinePrimitiveBytecode:" + "not yet implemented" + ^EncounteredUnknownBytecode!

1 0

VM Maker: VMMaker.oscog-eem.863.mcz
by commits＠source.squeak.org 23 Aug '14

23 Aug '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.863.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.863 Author: eem Time: 23 August 2014, 5:10:37.802 pm UUID: 379b797e-e115-4d63-b667-6d17ce3230d9 Ancestors: VMMaker.oscog-eem.862 Add an assert to check for a valid mehtodClassAssociation in methods (arguably dubious) to help catch malformed methods in multiple bytecode shenannigans. Reduce the possibility for heisenbugs by providing noFixupFollowField:ofObject: and using it in debugging code. =============== Diff against VMMaker.oscog-eem.862 =============== Item was changed: ----- Method: CoInterpreter>>updateStateOfSpouseContextForFrame:WithSP: (in category 'frame access') ----- updateStateOfSpouseContextForFrame: theFP WithSP: theSP "Update the frame's spouse context with the frame's current state except for the sender and instruction pointer, which are used to mark the context as married." | theContext tempIndex pointer argsPointer | <inline: false> <var: #theFP type: #'char *'> <var: #theSP type: #'char *'> <var: #pointer type: #'char *'> <var: #argsPointer type: #'char *'> self assert: (self frameHasContext: theFP). theContext := self frameContext: theFP. self assert: (objectMemory isContext: theContext). + self assert: (self frameReceiver: theFP) + = (objectMemory noFixupFollowField: ReceiverIndex ofObject: theContext). - objectMemory hasSpurMemoryManagerAPI - ifTrue: - ["We do not need to follow forwarding pointer to the receiver; makeBaseFrameFor: does that. - In any case the assignments below updating the non-argument stack contents will do so." - self assert: ((self frameReceiver: theFP) - = (objectMemory fetchPointer: ReceiverIndex ofObject: theContext) - or: [(objectMemory isOopForwarded: (objectMemory fetchPointer: ReceiverIndex ofObject: theContext)) - and: [(objectMemory followForwarded: (objectMemory fetchPointer: ReceiverIndex ofObject: theContext)) - = (self frameReceiver: theFP)]])] - ifFalse: - [self assert: (self frameReceiver: theFP) - = (objectMemory fetchPointer: ReceiverIndex ofObject: theContext)]. (self isMachineCodeFrame: theFP) ifTrue: [tempIndex := self mframeNumArgs: theFP. pointer := theFP + FoxMFReceiver - BytesPerWord] ifFalse: [tempIndex := self iframeNumArgs: theFP. pointer := theFP + FoxIFReceiver - BytesPerWord]. "update the arguments. this would appear not to be strictly necessary, but is for two reasons. First, the fact that arguments are read-only is only as convention in the Smalltalk compiler; other languages may choose to modify arguments. Second, the Squeak runUntilErrorOrReturnFrom: nightmare pops the stack top, which may, in certain circumstances, be the last argument, and hence the last argument may not have been stored into the context." argsPointer := theFP + (self frameStackedReceiverOffsetNumArgs: tempIndex). 1 to: tempIndex do: [:i| argsPointer := argsPointer - BytesPerWord. self assert: (objectMemory addressCouldBeOop: (stackPages longAt: argsPointer)). objectMemory storePointer: ReceiverIndex + i ofObject: theContext withValue: (stackPages longAt: argsPointer)]. "now update the non-argument stack contents." [pointer >= theSP] whileTrue: [self assert: (objectMemory addressCouldBeOop: (stackPages longAt: pointer)). tempIndex := tempIndex + 1. objectMemory storePointer: ReceiverIndex + tempIndex ofObject: theContext withValue: (stackPages longAt: pointer). pointer := pointer - BytesPerWord]. self assert: ReceiverIndex + tempIndex < (objectMemory lengthOf: theContext). objectMemory storePointerUnchecked: StackPointerIndex ofObject: theContext withValue: (objectMemory integerObjectOf: tempIndex)! Item was added: + ----- Method: ObjectMemory>>noFixupFollowField:ofObject: (in category 'forward compatibility') ----- + noFixupFollowField: fieldIndex ofObject: anObject + "Spur compatibility; in V3 this is a synonym for fetchPointer:ofObject:" + <inline: true> + ^self fetchPointer: fieldIndex ofObject: anObject! Item was added: + ----- Method: SpurMemoryManager>>noFixupFollowField:ofObject: (in category 'forwarding') ----- + noFixupFollowField: fieldIndex ofObject: anObject + "Make sure the oop at fieldIndex in anObject is not forwarded (follow the + forwarder there-in if so). Answer the (possibly followed) oop at fieldIndex." + | objOop | + objOop := self fetchPointer: fieldIndex ofObject: anObject. + (self isOopForwarded: objOop) ifTrue: + [objOop := self followForwarded: objOop]. + ^objOop! Item was changed: ----- Method: StackInterpreter>>findClassContainingMethod:startingAt: (in category 'debug support') ----- findClassContainingMethod: meth startingAt: classObj | currClass classDict classDictSize methodArray i | + (objectMemory isOopForwarded: classObj) + ifTrue: [currClass := objectMemory followForwarded: classObj] + ifFalse: [currClass := classObj]. - currClass := classObj. [self assert: (objectMemory isForwarded: currClass) not. + classDict := objectMemory noFixupFollowField: MethodDictionaryIndex ofObject: currClass. - classDict := objectMemory fetchPointer: MethodDictionaryIndex ofObject: currClass. self assert: (objectMemory isForwarded: classDict) not. classDictSize := objectMemory numSlotsOf: classDict. + methodArray := objectMemory noFixupFollowField: MethodArrayIndex ofObject: classDict. - methodArray := objectMemory fetchPointer: MethodArrayIndex ofObject: classDict. self assert: (objectMemory isForwarded: methodArray) not. i := 0. [i < (classDictSize - SelectorStart)] whileTrue: + [meth = (objectMemory noFixupFollowField: i ofObject: methodArray) ifTrue: - [meth = (objectMemory fetchPointer: i ofObject: methodArray) ifTrue: [^currClass]. i := i + 1]. + currClass := self noFixupSuperclassOf: currClass. - currClass := self superclassOf: currClass. currClass = objectMemory nilObject] whileFalse. ^currClass "method not found in superclass chain"! Item was changed: ----- Method: StackInterpreter>>findClassOfMethod:forReceiver: (in category 'debug support') ----- findClassOfMethod: meth forReceiver: rcvr + | rclass mclass | - | rclass | ((objectMemory addressCouldBeOop: rcvr) and: [(objectMemory isOopForwarded: rcvr) not]) ifTrue: [rclass := objectMemory fetchClassOf: rcvr. (self addressCouldBeClassObj: rclass) ifTrue: [rclass := self findClassContainingMethod: meth startingAt: rclass. rclass ~= objectMemory nilObject ifTrue: [^rclass]]]. ((objectMemory addressCouldBeObj: meth) and: [objectMemory isCompiledMethod: meth]) ifFalse: [^objectMemory nilObject]. + mclass := self safeMethodClassOf: meth. + (self addressCouldBeClassObj: mclass) ifTrue: + [^objectMemory nilObject]. + ^self findClassContainingMethod: meth startingAt: (self safeMethodClassOf: meth)! - ^self findClassContainingMethod: meth startingAt: (self methodClassOf: meth)! Item was changed: ----- Method: StackInterpreter>>findSelectorOfMethod: (in category 'debug support') ----- findSelectorOfMethod: methArg | meth classObj classDict classDictSize methodArray i | (objectMemory addressCouldBeObj: methArg) ifFalse: [^objectMemory nilObject]. (objectMemory isForwarded: methArg) ifTrue: [meth := objectMemory followForwarded: methArg] ifFalse: [meth := methArg]. (objectMemory isOopCompiledMethod: meth) ifFalse: [^objectMemory nilObject]. + classObj := self safeMethodClassOf: meth. - classObj := self methodClassOf: meth. (self addressCouldBeClassObj: classObj) ifTrue: [classDict := objectMemory fetchPointer: MethodDictionaryIndex ofObject: classObj. classDictSize := objectMemory numSlotsOf: classDict. methodArray := objectMemory fetchPointer: MethodArrayIndex ofObject: classDict. i := 0. [i < (classDictSize - SelectorStart)] whileTrue: [meth = (objectMemory fetchPointer: i ofObject: methodArray) ifTrue: [^(objectMemory fetchPointer: i + SelectorStart ofObject: classDict)]. i := i + 1]]. ^objectMemory nilObject! Item was changed: ----- Method: StackInterpreter>>initialPCForHeader:method: (in category 'compiled methods') ----- initialPCForHeader: methodHeader method: theMethod + "Answer the initial PC for a method; used only in methods that build a frame. + Hence add an assert to check that there's a sane methodClassAssociation." + <inline: true> + self assert: (self saneMethodClassAssociationIn: theMethod + numLiterals: (objectMemory literalCountOfMethodHeader: methodHeader)). - <api> ^theMethod + ((LiteralStart + (objectMemory literalCountOfMethodHeader: methodHeader)) * BytesPerOop) + objectMemory baseHeaderSize! Item was changed: ----- Method: StackInterpreter>>methodClassOf: (in category 'compiled methods') ----- methodClassOf: methodPointer <api> "Using a read barrier here simplifies the become implementation and costs very little because the class index and ValueIndex of the association almost certainly share a cache line." ^self cppIf: NewspeakVM ifTrue: [| literal | literal := self followLiteral: (objectMemory literalCountOf: methodPointer) - 1 ofMethod: methodPointer. literal = objectMemory nilObject ifTrue: [literal] ifFalse: [objectMemory followField: ValueIndex ofObject: literal]] ifFalse: [| literal | literal := self followLiteral: (objectMemory literalCountOf: methodPointer) - 1 ofMethod: methodPointer. + self assert: ((objectMemory isPointers: literal) and: [(objectMemory numSlotsOf: literal) > ValueIndex]). objectMemory followField: ValueIndex ofObject: literal]! Item was added: + ----- Method: StackInterpreter>>noFixupSuperclassOf: (in category 'message sending') ----- + noFixupSuperclassOf: classPointer + "No fixup version of superclassOf: that should not create heisenbugs" + <inline: true> + ^objectMemory noFixupFollowField: SuperclassIndex ofObject: classPointer! Item was added: + ----- Method: StackInterpreter>>safeMethodClassOf: (in category 'compiled methods') ----- + safeMethodClassOf: methodPointer + "Safe version of methodClassOf: that deals with malformed compiled methods, + etc, and does not fixup forwarding pointers.." + | literal maybeClass | + literal := self literal: (objectMemory literalCountOf: methodPointer) - 1 ofMethod: methodPointer. + (objectMemory isOopForwarded: literal) ifTrue: + [literal := objectMemory followForwarded: literal]. + ((objectMemory isPointers: literal) and: [(objectMemory numSlotsOf: literal) > ValueIndex]) ifFalse: + [^objectMemory nilObject]. + maybeClass := objectMemory fetchPointer: ValueIndex ofObject: literal. + (objectMemory isOopForwarded: maybeClass) ifTrue: + [maybeClass := objectMemory followForwarded: maybeClass]. + ^maybeClass! Item was added: + ----- Method: StackInterpreter>>saneMethodClassAssociationIn:numLiterals: (in category 'compiled methods') ----- + saneMethodClassAssociationIn: methodObj numLiterals: numLiterals + | shouldBeAssoc | + shouldBeAssoc := self literal: numLiterals - 1 ofMethod: methodObj. + (objectMemory isForwarded: shouldBeAssoc) ifTrue: + [shouldBeAssoc := objectMemory followForwarded: shouldBeAssoc]. + ^(objectMemory isPointers: shouldBeAssoc) + and: [(objectMemory numSlotsOf: shouldBeAssoc) > ValueIndex + and: [self addressCouldBeClassObj: (objectMemory noFixupFollowField: ValueIndex ofObject: shouldBeAssoc)]]!

1 0

VM Maker: Cog-eem.197.mcz
by commits＠source.squeak.org 23 Aug '14

23 Aug '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.197.mcz ==================== Summary ==================== Name: Cog-eem.197 Author: eem Time: 23 August 2014, 5:07:26.458 pm UUID: d85c97ce-9ea8-47ce-862e-7e1ee52f987c Ancestors: Cog-eem.196 Take back the split into two ennumerators and hence fix Monticello package patching. =============== Diff against Cog-eem.196 =============== Item was changed: ----- Method: SpurBootstrap>>addNewMethods (in category 'bootstrap methods') ----- addNewMethods "Get the simulator to add any and all missing methods immediately." | cmaiaSym basSym | cmaiaSym := self findSymbol: #compiledMethodAt:ifAbsent:. basSym := self findSymbol: #basicAddSelector:withMethod:. basSym ifNil: [basSym := self findSymbol: #addSelectorSilently:withMethod:]. self allPrototypeClassNamesDo: [:sym :symIsMeta| (self findClassNamed: (literalMap at: sym)) ifNil: [Transcript cr; nextPutAll: 'not installing any methods for '; nextPutAll: sym; nextPutAll: '; class not found in image'; flush.] ifNotNil: [:theClass| | class | class := symIsMeta ifTrue: [oldHeap fetchClassOfNonImm: theClass] ifFalse: [theClass]. self prototypeClassNameMetaSelectorMethodDo: [:className :isMeta :selector :method| | methodOrNil | (className = sym + and: [symIsMeta = isMeta + and: [(method pragmaAt: #remove) isNil]]) ifTrue: - and: [symIsMeta = isMeta]) ifTrue: ["probe method dictionary of the class for each method, installing a dummy if not found." "Transcript cr; nextPutAll: 'checking for '; nextPutAll: selector; flush." methodOrNil := self interpreter: oldInterpreter object: class perform: cmaiaSym withArguments: {literalMap at: selector. oldHeap nilObject}. methodOrNil = oldHeap nilObject ifTrue: "no method. install the real thing now" [Transcript cr; nextPutAll: 'installing '; nextPutAll: className; nextPutAll: (isMeta ifTrue: [' class>>'] ifFalse: ['>>']); store: selector; flush. self interpreter: oldInterpreter object: class perform: basSym withArguments: { literalMap at: selector. self installableMethodFor: method selector: selector className: className isMeta: isMeta}. installedPrototypes add: method selector] ifFalse: "existing method; collect the methodClassAssociation; its needed later" [methodClasses add: (oldInterpreter methodClassAssociationOf: methodOrNil)]]]]]! Item was removed: - ----- Method: SpurBootstrap>>allPrototypeMethodSelectors (in category 'method prototypes') ----- - allPrototypeMethodSelectors - "Answer all prototype selectors except those marked <remove>" - ^(imageTypes - inject: (SpurBootstrap class organization listAtCategoryNamed: #'method prototypes') - into: [:prototypes :type| - prototypes, (SpurBootstrap class organization listAtCategoryNamed: #'method prototypes ', type)]) reject: - [:sel| ((SpurBootstrap class >> sel) pragmaAt: #remove) notNil]! Item was changed: ----- Method: SpurBootstrap>>fileOutPrototypesFor: (in category 'public access') ----- fileOutPrototypesFor: imageTypeOrArrayOfTypes "SpurBootstrap new fileOutPrototypesFor: 'squeak'" | internalStream | imageTypes := imageTypeOrArrayOfTypes isString ifTrue: [{imageTypeOrArrayOfTypes}] ifFalse: [imageTypeOrArrayOfTypes asArray]. internalStream := WriteStream on: (String new: 1000). internalStream header; timeStamp. self prototypeClassNameMetaSelectorMethodDo: [:className :isMeta :selector :method| | class category preamble source | class := Smalltalk classNamed: className. isMeta ifTrue: [class := class class]. + (method pragmaAt: #remove) + ifNil: + [category := (class organization categoryOfElement: selector) ifNil: + [self class categoryForClass: className meta: isMeta selector: selector]. + preamble := class name, ' methodsFor: ' , category asString printString, ' stamp: ''', method timeStamp, ''''. + internalStream nextPut: $!!; nextChunkPut: preamble; cr. + source := method getSourceFromFile asString. + source := source copyFrom: (source indexOfSubCollection: 'PROTOTYPE') + 9 to: source size. + (self selectorForPrototypeMethod: method) isBinary ifTrue: + [source := (self selectorForPrototypeMethod: method), (source copyFrom: (source indexOf: Character space) to: source size)]. + internalStream nextChunkPut: source; space; nextPut: $!!; cr; cr] + ifNotNil: + [source := class name, ' removeSelector: ', selector storeString. + internalStream nextChunkPut: source; cr; cr]]. - category := (class organization categoryOfElement: selector) ifNil: - [self class categoryForClass: className meta: isMeta selector: selector]. - preamble := class name, ' methodsFor: ' , category asString printString, ' stamp: ''', method timeStamp, ''''. - internalStream nextPut: $!!; nextChunkPut: preamble; cr. - source := method getSourceFromFile asString. - source := source copyFrom: (source indexOfSubCollection: 'PROTOTYPE') + 9 to: source size. - (self selectorForPrototypeMethod: method) isBinary ifTrue: - [source := (self selectorForPrototypeMethod: method), (source copyFrom: (source indexOf: Character space) to: source size)]. - internalStream nextChunkPut: source; space; nextPut: $!!; cr; cr]. internalStream trailer. FileStream writeSourceCodeFrom: internalStream baseName: 'SpurBootstrapPrototypes' isSt: true useHtml: false! Item was changed: ----- Method: SpurBootstrap>>prototypeClassNameMetaSelectorMethodDo: (in category 'method prototypes') ----- prototypeClassNameMetaSelectorMethodDo: quaternaryBlock "Evaluate aBlock with class name, class is meta, method and selector. For now find methods in class-side category #'method prototypes'. Scheme could be extended to have different protocols for different Squeak/Pharo versions." + self allPrototypeSelectors do: - self allPrototypeMethodSelectors do: [:protoSelector| | method className isMeta | method := SpurBootstrap class >> protoSelector. className := self classNameForPrototypeMethod: method. (isMeta := className endsWith: 'class') ifTrue: [className := (className allButLast: 5) asSymbol]. (method pragmaAt: #indirect) ifNotNil: [method := (isMeta ifTrue: [(Smalltalk classNamed: className) class] ifFalse: [Smalltalk classNamed: className]) >> protoSelector]. quaternaryBlock value: className value: isMeta value: (self selectorForPrototypeMethod: method) value: method]! Item was removed: - ----- Method: SpurBootstrap>>removalClassNameMetaSelectorDo: (in category 'method prototypes') ----- - removalClassNameMetaSelectorDo: quaternaryBlock - "Evaluate aBlock with class name, class is meta, and selector for - all prototypes marked <remove>." - self allPrototypeSelectors do: - [:protoSelector| | method className isMeta | - method := SpurBootstrap class >> protoSelector. - className := self classNameForPrototypeMethod: method. - (isMeta := className endsWith: 'class') ifTrue: - [className := (className allButLast: 5) asSymbol]. - (method pragmaAt: #remove) ifNotNil: - [quaternaryBlock - value: className - value: isMeta - value: (self selectorForPrototypeMethod: method)]]! Item was changed: ----- Method: SpurBootstrap>>removeMethods (in category 'bootstrap methods') ----- removeMethods "Get the simulator to remove any methods marked with <remove>." | removeSym | removeSym := self findSymbol: #removeSelectorSilently:. removeSym ifNil: [removeSym := self findSymbol: #removeSelector:]. + self prototypeClassNameMetaSelectorMethodDo: + [:className :isMeta :selector :method| | class | + (method pragmaAt: #remove) ifNotNil: + [(self findClassNamed: (literalMap at: className)) ifNotNil: + [:theClass| + class := isMeta ifTrue: [oldHeap fetchClassOfNonImm: theClass] ifFalse: [theClass]. + Transcript + cr; + nextPutAll: 'removing '; + nextPutAll: className; + nextPutAll: (isMeta ifTrue: [' class>>'] ifFalse: ['>>']); + store: selector; + flush. + self interpreter: oldInterpreter + object: class + perform: removeSym + withArguments: {literalMap at: selector}]]]! - self removalClassNameMetaSelectorDo: - [:className :isMeta :selector| | class | - (self findClassNamed: (literalMap at: className)) ifNotNil: - [:theClass| - class := isMeta ifTrue: [oldHeap fetchClassOfNonImm: theClass] ifFalse: [theClass]. - Transcript - cr; - nextPutAll: 'removing '; - nextPutAll: className; - nextPutAll: (isMeta ifTrue: [' class>>'] ifFalse: ['>>']); - store: selector; - flush. - self interpreter: oldInterpreter - object: class - perform: removeSym - withArguments: {literalMap at: selector}]]! Item was changed: ----- Method: SpurBootstrap>>replaceMethods (in category 'bootstrap methods') ----- replaceMethods "Replace all the modified method prototypes." self allPrototypeClassNamesDo: [:sym :symIsMeta| (self findClassNamed: (literalMap at: sym)) ifNil: [Transcript cr; nextPutAll: 'not replacing any methods for '; nextPutAll: sym; nextPutAll: '; class not found in image'; flush.] ifNotNil: [:theClass| | class | class := symIsMeta ifTrue: [oldHeap fetchClassOfNonImm: theClass] ifFalse: [theClass]. self prototypeClassNameMetaSelectorMethodDo: [:className :isMeta :selector :method| | replacement methodDict index | (className = sym + and: [symIsMeta = isMeta + and: [(method pragmaAt: #remove) isNil]]) ifTrue: - and: [symIsMeta = isMeta]) ifTrue: [(installedPrototypes includes: method selector) ifFalse: ["probe method dictionary of the class for each method, installing a dummy if not found." Transcript cr; nextPutAll: 'replacing '; nextPutAll: className; nextPutAll: (isMeta ifTrue: [' class>>'] ifFalse: ['>>']); store: selector; flush. replacement := self installableMethodFor: method selector: selector className: className isMeta: isMeta. methodDict := oldHeap fetchPointer: MethodDictionaryIndex ofObject: class. index := self indexOfSelector: (literalMap at: selector) in: methodDict. oldHeap storePointer: index - SelectorStart ofObject: (oldHeap fetchPointer: MethodArrayIndex ofObject: methodDict) withValue: replacement. installedPrototypes add: method selector]]]]]!

1 0

VM Maker: Cog-eem.196.mcz
by commits＠source.squeak.org 23 Aug '14

23 Aug '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.196.mcz ==================== Summary ==================== Name: Cog-eem.196 Author: eem Time: 23 August 2014, 12:43:18.227 pm UUID: ba7c10a8-52bd-4a00-9b14-80de8a855f2c Ancestors: Cog-eem.195 Fix the <remove> code. There need to be two enumerators of selectoeas, one including the removed, and excluding them. =============== Diff against Cog-eem.195 =============== Item was added: + ----- Method: SpurBootstrap>>allPrototypeMethodSelectors (in category 'method prototypes') ----- + allPrototypeMethodSelectors + "Answer all prototype selectors except those marked <remove>" + ^(imageTypes + inject: (SpurBootstrap class organization listAtCategoryNamed: #'method prototypes') + into: [:prototypes :type| + prototypes, (SpurBootstrap class organization listAtCategoryNamed: #'method prototypes ', type)]) reject: + [:sel| ((SpurBootstrap class >> sel) pragmaAt: #remove) notNil]! Item was removed: - ----- Method: SpurBootstrap>>allPrototypeMethods (in category 'method prototypes') ----- - allPrototypeMethods - ^(imageTypes - inject: (SpurBootstrap class organization listAtCategoryNamed: #'method prototypes') - into: [:prototypes :type| - prototypes, (SpurBootstrap class organization listAtCategoryNamed: #'method prototypes ', type)]) reject: - [:sel| ((SpurBootstrap class >> sel) pragmaAt: #remove) notNil]! Item was added: + ----- Method: SpurBootstrap>>allPrototypeSelectors (in category 'method prototypes') ----- + allPrototypeSelectors + "Answer all prototype selectors, including those marked <remove>" + ^imageTypes + inject: (SpurBootstrap class organization listAtCategoryNamed: #'method prototypes') + into: [:prototypes :type| + prototypes, (SpurBootstrap class organization listAtCategoryNamed: #'method prototypes ', type)]! Item was changed: ----- Method: SpurBootstrap>>prototypeClassNameMetaSelectorMethodDo: (in category 'method prototypes') ----- prototypeClassNameMetaSelectorMethodDo: quaternaryBlock "Evaluate aBlock with class name, class is meta, method and selector. For now find methods in class-side category #'method prototypes'. Scheme could be extended to have different protocols for different Squeak/Pharo versions." + self allPrototypeMethodSelectors do: - self allPrototypeMethods do: [:protoSelector| | method className isMeta | method := SpurBootstrap class >> protoSelector. className := self classNameForPrototypeMethod: method. (isMeta := className endsWith: 'class') ifTrue: [className := (className allButLast: 5) asSymbol]. (method pragmaAt: #indirect) ifNotNil: [method := (isMeta ifTrue: [(Smalltalk classNamed: className) class] ifFalse: [Smalltalk classNamed: className]) >> protoSelector]. quaternaryBlock value: className value: isMeta value: (self selectorForPrototypeMethod: method) value: method]! Item was added: + ----- Method: SpurBootstrap>>removalClassNameMetaSelectorDo: (in category 'method prototypes') ----- + removalClassNameMetaSelectorDo: quaternaryBlock + "Evaluate aBlock with class name, class is meta, and selector for + all prototypes marked <remove>." + self allPrototypeSelectors do: + [:protoSelector| | method className isMeta | + method := SpurBootstrap class >> protoSelector. + className := self classNameForPrototypeMethod: method. + (isMeta := className endsWith: 'class') ifTrue: + [className := (className allButLast: 5) asSymbol]. + (method pragmaAt: #remove) ifNotNil: + [quaternaryBlock + value: className + value: isMeta + value: (self selectorForPrototypeMethod: method)]]! Item was changed: ----- Method: SpurBootstrap>>removeMethods (in category 'bootstrap methods') ----- removeMethods "Get the simulator to remove any methods marked with <remove>." | removeSym | removeSym := self findSymbol: #removeSelectorSilently:. removeSym ifNil: [removeSym := self findSymbol: #removeSelector:]. + self removalClassNameMetaSelectorDo: + [:className :isMeta :selector| | class | + (self findClassNamed: (literalMap at: className)) ifNotNil: + [:theClass| + class := isMeta ifTrue: [oldHeap fetchClassOfNonImm: theClass] ifFalse: [theClass]. + Transcript + cr; + nextPutAll: 'removing '; + nextPutAll: className; + nextPutAll: (isMeta ifTrue: [' class>>'] ifFalse: ['>>']); + store: selector; + flush. + self interpreter: oldInterpreter + object: class + perform: removeSym + withArguments: {literalMap at: selector}]]! - self prototypeClassNameMetaSelectorMethodDo: - [:className :isMeta :selector :method| | class | - (method pragmaAt: #remove) ifNotNil: - [(self findClassNamed: (literalMap at: className)) ifNotNil: - [:theClass| - class := isMeta ifTrue: [oldHeap fetchClassOfNonImm: theClass] ifFalse: [theClass]. - self interpreter: oldInterpreter - object: class - perform: removeSym - withArguments: {literalMap at: selector}]]]!

1 0

VM Maker: Cog-eem.195.mcz
by commits＠source.squeak.org 22 Aug '14

22 Aug '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.195.mcz ==================== Summary ==================== Name: Cog-eem.195 Author: eem Time: 22 August 2014, 11:58:45.028 pm UUID: 823b7ff0-1e55-4ef7-8503-513c5d0a7fc3 Ancestors: Cog-eem.194 Add support for removals to bootstrap and add a removal for EncoderForV3>>#computeMethodHeaderForNumArgs:numTemps:numLits:primitive: =============== Diff against Cog-eem.194 =============== Item was added: + ----- Method: SpurBootstrap class>>EncoderForV3PROTOTYPEcomputeMethodHeaderForNumArgs:numTemps:numLits:primitive: (in category 'method prototypes') ----- + EncoderForV3PROTOTYPEcomputeMethodHeaderForNumArgs: numArgs numTemps: numTemps numLits: numLits primitive: primitiveIndex + <remove>! Item was changed: ----- Method: SpurBootstrap class>>categoryForClass:meta:selector: (in category 'method prototype categorization') ----- categoryForClass: className meta: isMeta selector: selector ^(isMeta ifTrue: [{ className. #class. selector }] ifFalse: [{ className. selector }]) caseOf: { [#(Behavior allInstancesOrNil)] -> [#enumerating]. [#(Behavior byteSizeOfInstance)] -> [#'accessing instances and variables']. [#(Behavior byteSizeOfInstanceOfSize:)] -> [#'accessing instances and variables']. [#(Behavior elementSize)] -> [#'accessing instances and variables']. [#(Behavior handleFailingBasicNew)] -> [#private]. [#(Behavior handleFailingBasicNew:)] -> [#private]. [#(Behavior handleFailingFailingBasicNew)] -> [#private]. [#(Behavior handleFailingFailingBasicNew:)] -> [#private]. [#(Behavior identityHash)] -> [#comparing]. [#(Behavior isEphemeronClass)] -> [#testing]. [#(Behavior isImmediateClass)] -> [#testing]. [#(Character identityHash)] -> [#comparing]. [#(Class immediateSubclass:instanceVariableNames:classVariableNames:poolDictionaries:category:)] -> [#'subclass creation']. [#(ClassBuilder superclass:immediateSubclass:instanceVariableNames:classVariableNames:poolDictionaries:category:)] -> [#public]. + [#(CompiledMethod class handleFailingFailingNewMethod:header:)] + -> [#private]. + [#(CompiledMethod class handleFailingNewMethod:header:)] + -> [#private]. [#(Context class allInstances)] -> [#enumerating]. [#(Context class allInstancesDo:)] -> [#enumerating]. + [#(Context failPrimitiveWith:)] -> [#'system simulation']. + [#(Context isPrimFailToken:)] -> [#private]. + [#(Context send:to:with:lookupIn:)] -> [#controlling]. + [#(ContextPart isPrimFailToken:)] -> [#private]. + [#(ContextPart send:to:with:lookupIn:)] -> [#controlling]. + [#(CompiledMethod class headerFlagForEncoder:)] + -> [#'method encoding']. + [#(CompiledMethod class installPrimaryBytecodeSet:)] + -> [#'class initialization']. + [#(CompiledMethod class installSecondaryBytecodeSet:)] + -> [#'class initialization']. + [#(EncoderForV3PlusClosures genCallPrimitive:)] + -> [#'bytecode generation']. + [#(EncoderForV3PlusClosures class callPrimitiveCode)] + -> [#'bytecode decoding']. + [#(MethodContext failPrimitiveWith:)] -> [#'system simulation']. [#(MethodContext class allInstances)] -> [#enumerating]. [#(MethodContext class allInstancesDo:)] -> [#enumerating]. [#(SmallInteger asCharacter)] -> [#converting]. [#(SmalltalkImage growMemoryByAtLeast:)] -> [#'memory space']. [#(SmalltalkImage maxIdentityHash)] -> [#'system attributes']. [#(SystemDictionary growMemoryByAtLeast:)] -> [#'memory space']. [#(SystemDictionary maxIdentityHash)] -> [#'system attributes']. [#(SystemDictionary setGCParameters)] -> [#'snapshot and quit']. [#(SystemNavigation allObjects)] -> [#query]. [#(SystemNavigation allObjectsOrNil)] -> [#query]. } otherwise: [Transcript nextPutAll: className. isMeta ifTrue: [Transcript nextPutAll: ' class']. Transcript nextPutAll: '>>'; store: selector; nextPutAll: ' is unclassified'; cr; flush. ^Categorizer default]! Item was changed: ----- Method: SpurBootstrap>>allPrototypeMethods (in category 'method prototypes') ----- allPrototypeMethods + ^(imageTypes - ^imageTypes inject: (SpurBootstrap class organization listAtCategoryNamed: #'method prototypes') into: [:prototypes :type| + prototypes, (SpurBootstrap class organization listAtCategoryNamed: #'method prototypes ', type)]) reject: + [:sel| ((SpurBootstrap class >> sel) pragmaAt: #remove) notNil]! - prototypes, (SpurBootstrap class organization listAtCategoryNamed: #'method prototypes ', type)]! Item was changed: ----- Method: SpurBootstrap>>installModifiedMethods (in category 'bootstrap methods') ----- installModifiedMethods "Install all the methods in the class-side method prototypes protocol in the relevant classes in the new image. First use the simulator to get the image to intern all symbols and add dummy methods under new selectors. With that done we can manually replace the relevant methods with the prototypes, mapping selectors and global variables as required." self withExecutableInterpreter: oldInterpreter do: [self internAllSymbols. self addNewMethods. + self removeMethods. self replaceMethods. self modifyCharacterMethods]! Item was added: + ----- Method: SpurBootstrap>>removeMethods (in category 'bootstrap methods') ----- + removeMethods + "Get the simulator to remove any methods marked with <remove>." + | removeSym | + removeSym := self findSymbol: #removeSelectorSilently:. + removeSym ifNil: + [removeSym := self findSymbol: #removeSelector:]. + self prototypeClassNameMetaSelectorMethodDo: + [:className :isMeta :selector :method| | class | + (method pragmaAt: #remove) ifNotNil: + [(self findClassNamed: (literalMap at: className)) ifNotNil: + [:theClass| + class := isMeta ifTrue: [oldHeap fetchClassOfNonImm: theClass] ifFalse: [theClass]. + self interpreter: oldInterpreter + object: class + perform: removeSym + withArguments: {literalMap at: selector}]]]! Item was changed: ----- Method: SpurBootstrapMonticelloPackagePatcher>>packagesAndPatches (in category 'private-accessing') ----- packagesAndPatches "SpurBootstrapMonticelloPackagePatcher new packagesAndPatches" | spurBootstrap | packagesAndPatches ifNotNil: [^packagesAndPatches]. packagesAndPatches := Dictionary new. spurBootstrap := SpurBootstrap new. imageTypes ifNotNil: [spurBootstrap imageTypes: imageTypes]. spurBootstrap prototypeClassNameMetaSelectorMethodDo: + [:className :isMeta :selector :method| | class methodReference source definition | - [:className :isMeta :selector :method| | class methodReference source | class := Smalltalk classNamed: className. isMeta ifTrue: [class := class class]. methodReference := (class includesSelector: selector) ifTrue: [(class >> selector) methodReference]. (methodReference notNil and: [methodReference category = Categorizer default]) ifTrue: [methodReference := nil]. source := method getSourceFromFile asString allButFirst: method selector size - selector size. source first ~= selector first ifTrue: [source replaceFrom: 1 to: selector size with: selector startingAt: 1]. + definition := MCAddition of: (MCMethodDefinition + className: className + classIsMeta: isMeta + selector: selector + category: (methodReference + ifNotNil: [methodReference category] + ifNil: [SpurBootstrap + categoryForClass: className + meta: isMeta + selector: selector]) + timeStamp: method timeStamp + source: source). + (method pragmaAt: #remove) ifNotNil: + [definition := definition inverse]. (packagesAndPatches at: (methodReference ifNotNil: [PackageOrganizer default packageOfMethod: methodReference] ifNil: [PackageOrganizer default packageOfClass: class]) ifAbsentPut: [OrderedCollection new]) + add: definition]. - add: (MCAddition of: (MCMethodDefinition - className: className - classIsMeta: isMeta - selector: selector - category: (methodReference - ifNotNil: [methodReference category] - ifNil: [SpurBootstrap - categoryForClass: className - meta: isMeta - selector: selector]) - timeStamp: method timeStamp - source: source))]. ^packagesAndPatches!

1 0

VM Maker: VMMaker.oscog-eem.862.mcz
by commits＠source.squeak.org 21 Aug '14

21 Aug '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.862.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.862 Author: eem Time: 21 August 2014, 8:14:01.395 am UUID: 34b8f089-7da3-4c40-9996-2d2611fe5111 Ancestors: VMMaker.oscog-eem.861 Make nameOfClass: more robust, in both the real and simulated VMs. Add a documentation method for the structure of a CogMethod. =============== Diff against VMMaker.oscog-eem.861 =============== Item was changed: VMStructType subclass: #CogBlockMethod instanceVariableNames: 'objectHeader homeOffset startpc padToWord cmNumArgs cmType cmRefersToYoung cpicHasMNUCase cmUsageCount cmUsesPenultimateLit cmUnusedFlags stackCheckOffset' classVariableNames: '' poolDictionaries: 'CogMethodConstants VMBasicConstants' category: 'VMMaker-JIT'! + !CogBlockMethod commentStamp: 'eem 8/19/2014 17:07' prior: 0! + I am the rump method header for a block method embedded in a full CogMethod. I am the superclass of CogMethod, which is a Cog method header proper. Instances of both classes have the same second word. The homeOffset and startpc fields are overlaid on the objectHeader in a CogMethod. See Cogit class>>structureOfACogMethod for more information. In C I look like - !CogBlockMethod commentStamp: 'eem 1/9/2011 08:41' prior: 0! - I am the rump method header for a block method embedded in a full CogMethod. I am the superclass of CogMethod, which is a Cog method header proper. Instances of both classes have the same second word. The homeOffset abd startpc fields are overlaid on the objectHeader in a CogMethod. In C I look like typedef struct { unsigned short homeOffset; unsigned short startpc; unsigned cmNumArgs : 8; unsigned cmType : 3; unsigned cmRefersToYoung : 1; unsigned cmIsUnlinked : 1; unsigned cmUsageCount : 3; unsigned stackCheckOffset : 16; } CogBlockMethod; My instances are not actually used. The methods exist only as input to Slang. The simulator uses my surrogates (CogBlockMethodSurrogate32 and CogBlockMethodSurrogate64.! Item was changed: CogBlockMethod subclass: #CogMethod instanceVariableNames: 'blockSize blockEntryOffset methodObject methodHeader selector' classVariableNames: '' poolDictionaries: '' category: 'VMMaker-JIT'! + !CogMethod commentStamp: 'eem 8/19/2014 17:07' prior: 0! + I am a native Cog method or polymorphic inline cache. If the former I have been produced by compiling a bytecoded CompiledMethod into machine code by the JIT, and I have a circular reference to that CompiledMethod. The CompiledMethod's header field is a pointer to me, the CogMethod, and my methodHeader field holds the compiled method's actual header. My objectHeader field looks like a single word object with a compact header with the mark bit set so as to placate the GC, i.e. make a CogMethod look like an object so that the reference to a CogMethod from a compiled method doesn't break the GC. The cmType, stackCheckOffset, cmNumArgs & cmNumTemps fields are early in the structure because we place dummy two-word CogMethod headers within a method for each block within it to record this information for each block method (see my superclass CogBlockMethod). In this case the objectHeader field is overlaid by the homeOffset and startpc fields. The objectHeader field is also used to hold the relocation distance when compacting methods since when functioning as an obhject header it is a constant value and so can easily be reinitialized. See Cogit class>>structureOfACogMethod for more information. - !CogMethod commentStamp: 'eem 1/9/2011 08:49' prior: 0! - I am a native Cog method or polymorphic inline cache. If the former I have been produced by compiling a bytecoded CompiledMethod into machine code by the JIT, and I have a circular reference to that CompiledMethod. The CompiledMethod's header field is a pointer to me, the CogMethod, and my methodHeader field holds the compiled method's actual header. My objectHeader field looks like a single word object with a compact header with the mark bit set so as to placate the GC, i.e. make a CogMethod look like an object so that the reference to a CogMethod from a compiled method doesn't break the GC. The cmType, stackCheckOffset, cmNumArgs & cmNumTemps fields are early in the structure because we place dummy two-word CogMethod headers within a method for each block within it to record this information for each block method (see my superclass CogBlockMethod). In this case the objectHeader field is overlaid by the homeOffset and startpc fields. The objectHeader field is also used to hold the relocation distance when compacting methods since when functioning as an obhject header it is a constant value and so can easily be reinitialized. In C I look like typedef struct { sqInt objectHeader; unsigned cmNumArgs : 8; unsigned cmType : 3; unsigned cmRefersToYoung : 1; unsigned cmIsUnlinked : 1; unsigned cmUsageCount : 3; unsigned stackCheckOffset : 16; unsigned short blockSize; unsigned short blockEntryOffset; sqInt methodObject; sqInt methodHeader; sqInt selector; } CogMethod; Note that in a 64-bit system all fields from cmNumArgs through blockEntry fit in a single 64-bit word. My instances are not actually used. The methods exist only as input to Slang. The simulator uses my surrogates (CogMethodSurrogate32 and CogMethodSurrogate64.! Item was changed: ----- Method: CogVMSimulator>>nameOfClass: (in category 'debug support') ----- nameOfClass: classOop + | numSlots maybeThisClassOop maybeNameOop name | - | numSlots | classNameIndex ifNil: [^'??nil cnidx??']. numSlots := objectMemory numSlotsOf: classOop. numSlots = metaclassNumSlots ifTrue: + [maybeThisClassOop := objectMemory fetchPointer: thisClassIndex ofObject: classOop. + (self addressCouldBeClassObj: maybeThisClassOop) ifTrue: + [name := self nameOfClass: maybeThisClassOop. + (name beginsWith: 'bad ') ifFalse: + [^name, ' class']]. + ^'bad class']. + (numSlots > classNameIndex + and: [maybeNameOop := objectMemory fetchPointer: classNameIndex ofObject: classOop. + objectMemory isBytes: maybeNameOop]) ifFalse: - [^(self nameOfClass: - (objectMemory fetchPointer: thisClassIndex ofObject: classOop)) , ' class']. - numSlots <= classNameIndex ifTrue: [^'bad class']. + ^self stringOf: maybeNameOop! - ^self stringOf: (objectMemory fetchPointer: classNameIndex ofObject: classOop)! Item was added: + ----- Method: Cogit class>>structureOfACogMethod (in category 'tests') ----- + structureOfACogMethod + "A CogMethod is the machine code for executable code in the Cog VM, and in the simulator these are + instances of CogMethod. In actuality they are structures in memory in the CogMethodZone.. There + are four real kinds, defined by the cmType field, free space: CMFree, methods: CMMethod, closed + PICs: CMClosedPIC (finite polymorphic inline caches with up to 6 entries), and open PICs: CMOpenPIC + (infinite megamorphicinline caches that probe the first-level method lookup cache). There is a sixth + kind of method, which is merely a header, for blocks: CMBlock, one which exists only within CMMethods, + and exist only to allow block activations to refer to something that looks like a CogMethod. + + The blockSize field in a CogMethod is the size in bytes of the entire method, including the header. + Methods are aligned to an 8 byte boundary in the CogMethodZone. The size is used to iterate over + the methods in the zone. + + Follwing the header is the abort and entry code. Starting immediately after the header is the call to + the abort routine called when either a send fails or a stack limit check fails. Following that is the + checked entry point that checks the receiver is of the right class, and this code ends in the unchecked + entry point. Following this is either primitive code, followed by frame building code, or frame-building + code, or, for frameless methods, the code for the frameless method. Following that is the code for the + method. If the mehtrod contains blocks then followng the method code will be a CMBlock header, + followed by code for the block, for each block, and following this will be the block dispatch code, + which is pointed to by the blockEntryOffset field in the CogMethod. + + Following either the return in the method, or the block dispatch, is the meta data which identifies + intersting points in the machine code. This meta data starts at the end of teh structure and is read + backwards towards the start of the method, and is terminated by a null byte. So the blockSize is + used to find the start of the metadata. The metadata reveals where object references, sends and + pc-mapping points exist in the machine code. Hence the metadata is parsed when garbage collect- + ing to find and update object references." + ! Item was changed: ----- Method: StackInterpreter>>nameOfClass: (in category 'debug printing') ----- nameOfClass: classOop "Brain-damaged nameOfClass: for C VM. Does *not* answer Foo class for metaclasses. Use e.g. classIsMeta: to avoid being fooled." <inline: false> + <returnTypeC: #'char *'> + | numSlots maybeNameOop maybeThisClassOop | - <returnTypeC: 'char *'> - | numSlots | numSlots := objectMemory numSlotsOf: classOop. numSlots = metaclassNumSlots ifTrue: + [maybeThisClassOop := objectMemory fetchPointer: thisClassIndex ofObject: classOop. + (self addressCouldBeClassObj: maybeThisClassOop) ifTrue: + [^self nameOfClass: (objectMemory fetchPointer: thisClassIndex ofObject: classOop)]. + ^'bad class']. + (numSlots > classNameIndex + and: [maybeNameOop := objectMemory fetchPointer: classNameIndex ofObject: classOop. + objectMemory isBytes: maybeNameOop]) ifFalse: - [^self nameOfClass: (objectMemory fetchPointer: thisClassIndex ofObject: classOop)]. - numSlots <= classNameIndex ifTrue: [^'bad class']. + ^objectMemory firstIndexableField: maybeNameOop! - ^objectMemory firstIndexableField: (objectMemory fetchPointer: classNameIndex ofObject: classOop)! Item was changed: ----- Method: StackInterpreterSimulator>>nameOfClass: (in category 'debug support') ----- nameOfClass: classOop + | numSlots maybeThisClassOop maybeNameOop name | - | numSlots | classNameIndex ifNil: [^'??nil cnidx??']. numSlots := objectMemory numSlotsOf: classOop. numSlots = metaclassNumSlots ifTrue: + [maybeThisClassOop := objectMemory fetchPointer: thisClassIndex ofObject: classOop. + (self addressCouldBeClassObj: maybeThisClassOop) ifTrue: + [name := self nameOfClass: maybeThisClassOop. + (name beginsWith: 'bad ') ifFalse: + [^name, ' class']]. + ^'bad class']. + (numSlots > classNameIndex + and: [maybeNameOop := objectMemory fetchPointer: classNameIndex ofObject: classOop. + objectMemory isBytes: maybeNameOop]) ifFalse: - [^(self nameOfClass: - (objectMemory fetchPointer: thisClassIndex ofObject: classOop)) , ' class']. - numSlots <= classNameIndex ifTrue: [^'bad class']. + ^self stringOf: maybeNameOop! - ^self stringOf: (objectMemory fetchPointer: classNameIndex ofObject: classOop)!

1 0

VM Maker: Cog-eem.194.mcz
by commits＠source.squeak.org 21 Aug '14

21 Aug '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.194.mcz ==================== Summary ==================== Name: Cog-eem.194 Author: eem Time: 21 August 2014, 8:16:40.31 am UUID: b999fc10-6f1c-4df3-968a-717745570d50 Ancestors: Cog-eem.193 Move send of findRequiredGlobals prior to installing any replacement methods, and fix the fall-out this has over classMetaclass initialization. =============== Diff against Cog-eem.193 =============== Item was changed: ----- Method: SpurBootstrap>>bootstrapImage (in category 'bootstrap image') ----- bootstrapImage oldHeap fullGC. self measureOldHeapPostGC. self initMaps. - self findRequiredGlobals. Transcript cr; nextPutAll: 'transforming image...'; flush. self cloneNilTrueAndFalse. self allocateFreeLists. self buildClassMap. self allocateClassTable. self cloneObjects. self fillInObjects. self fillInClassTable. newHeapSize := newHeap freeStart. newHeap initializePostBootstrap. self measureNewHeapPostInitPostBootstrap! Item was changed: ----- Method: SpurBootstrap>>checkReshapeOf: (in category 'bootstrap image') ----- checkReshapeOf: ourMethodClasses "Check the shape of all our method classes match the shape of those in the image to be bootstrapped. Use the simulator to redefine any that need it. Does /not/ reshape metaclasses; these we assume are ok." | toReshape | toReshape := Set new. ourMethodClasses do: [:mc| | binding | binding := literalMap at: mc binding. + self assert: binding ~= oldHeap nilObject. (mc ~~ Character "Character will reshape anyway" and: [mc instSize ~= (oldHeap instanceSizeOf: (oldHeap fetchPointer: ValueIndex ofObject: binding))]) ifTrue: [toReshape add: mc]]. toReshape isEmpty ifTrue: [^self]. "Assume only one class in any subtree needs reshaping. Fast and loose but gets us there for now." toReshape copy do: [:class| toReshape removeAll: (toReshape select: [:ea| ea inheritsFrom: class])]. toReshape do: [:class| Transcript cr; nextPutAll: 'RESHAPING '; print: class; flush. self interpreter: oldInterpreter object: (self oldClassOopFor: Compiler) perform: (self findSymbol: #evaluate:) withArguments: {oldHeap stringForCString: class definition}]! Item was added: + ----- Method: SpurBootstrap>>classMetaclass (in category 'bootstrap image') ----- + classMetaclass + ^classMetaclass ifNil: + [classMetaclass := oldHeap fetchClassOfNonImm: (oldHeap fetchClassOfNonImm: oldHeap classArray)]! Item was changed: ----- Method: SpurBootstrap>>findRequiredGlobals (in category 'bootstrap image') ----- findRequiredGlobals "Look for the necessary gobal bindings in the prototype methods in the old image. This has to be done early by sending bindingOf: to Smalltalk. Collect the class hierarchy of all prototypes that access inst vars (non-local prototypes) to check their shapes. Also find out Metaclass, needed for identifying classes." | globals ourMethodClasses classVars bindingOfSym | globals := Set new. ourMethodClasses := Set new. classVars := Dictionary new. self prototypeClassNameMetaSelectorMethodDo: [:c :m :s :method| | nonMetaClass allNonMetaSupers | allNonMetaSupers := (nonMetaClass := Smalltalk classNamed: c) withAllSuperclasses. method methodClass ~= SpurBootstrap class ifTrue: [ourMethodClasses addAll: allNonMetaSupers]. globals addAll: (allNonMetaSupers collect: [:sc| sc binding]). method literals do: [:l| (l isVariableBinding and: [l key isSymbol]) ifTrue: [(Smalltalk bindingOf: l key) == l ifTrue: [globals add: l] ifFalse: [self assert: (nonMetaClass bindingOf: l key) == l. classVars at: l put: nonMetaClass]]]]. globals add: Compiler binding. "For potential reshaping in checkReshapeOf:" bindingOfSym := self findSymbol: #bindingOf:. self withExecutableInterpreter: oldInterpreter do: [| toBeAdded | globals do: + [:global| | bindingOop | + bindingOop := self interpreter: oldInterpreter + object: (oldHeap splObj: 8) "Smalltalk" + perform: bindingOfSym + withArguments: {self findSymbol: global key}. + self assert: bindingOop ~= oldHeap nilObject. + literalMap at: global put: bindingOop]. - [:global| - literalMap - at: global - put: (self interpreter: oldInterpreter - object: (oldHeap splObj: 8) "Smalltalk" - perform: bindingOfSym - withArguments: {self findSymbol: global key})]. toBeAdded := Dictionary new. classVars keysAndValuesDo: [:var :class| | val | (self findSymbol: var key) "New class inst vars may not yet be interned." ifNil: [toBeAdded at: var put: class] ifNotNil: [:varName| val := self interpreter: oldInterpreter object: (self oldClassOopFor: class) perform: bindingOfSym withArguments: {varName}. val ~= oldHeap nilObject ifTrue: [literalMap at: var put: val] ifFalse: [toBeAdded at: var put: class]]]. "May have to redefine to add missing inst vars and/or add any missing class vars." self checkReshapeOf: ourMethodClasses. + self addMissingClassVars: toBeAdded]! - self addMissingClassVars: toBeAdded]. - classMetaclass := oldHeap fetchClassOfNonImm: (oldHeap fetchClassOfNonImm: oldHeap classArray)! Item was changed: ----- Method: SpurBootstrap>>isOldObjABehavior: (in category 'bootstrap image') ----- isOldObjABehavior: oldObj + | oldObjClass | - | oldObjClass oldObjClassClass | ^(classToIndex includesKey: oldObj) + or: [(oldObjClass := oldHeap fetchClassOfNonImm: oldObj) = self classMetaclass + or: [(oldHeap fetchClassOfNonImm: oldObjClass) = classMetaclass]]! - or: [oldObjClass := oldHeap fetchClassOfNonImm: oldObj. - oldObjClassClass := oldHeap fetchClassOfNonImm: oldObjClass. - oldObjClass = classMetaclass - or: [oldObjClassClass = classMetaclass]]!

1 0

Re: [Pharo-dev] Initial versions for OSWindow and Woden
by btc＠openinworld.com 20 Aug '14

20 Aug '14

Hi Ronie, This is really exciting (and I've cross-posted to vm-dev). I guess this will help multi-monitor displays to have a window on each monitor? Ronie Salgado wrote: > Hello There, > > I have been working in OSWindow, which is a cross platform API for > dealing with native operating system windows. This API requires using > a custom VM and the library SDL2. > > With this API, even the main Pharo window is handled almost completely > in image side using NativeBoost. > > The only support required from the VM is a small periodical check in > the heartbeat about the presence of events. This no more than 10 lines > of code. Is there much you needed to change/delete from the existing VM window initialization. Since the VM is shared with other Smalltalk platforms, how compatible would this be to maintain in parallel with the existing VM windows initialization? cheers -ben > > This is currently working very well in my Linux machine, so I need to > start testing this stuff. > > For Windows, soon I will be building the custom VM. My last built was > very dirty and I want to do something more clean. > > For Mac OS X, I don't have one for testing. But Alex is going allow me > to borrow one for some time. So be patience. > > As for Woden, it is a new 3D graphics engine that I started making. > This one requires currently support of OSWindow and also shows some > cool stuffs. > > As for prebuilt versions of the VM with OSWindow support along with > preloaded images for both, OSWindow and Woden. And screenshots. > > Well, I am putting them here: http://ronie.cl/OSWindow/ > > Greetings, > Ronie

4 3

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev August 2014