Vm-dev August 2014

vm-dev@lists.squeakfoundation.org

12 participants
89 discussions

New CogVMs available
by Eliot Miranda 05 Aug '14

05 Aug '14

...at http://www.mirandabanda.org/files/Cog/VM/VM.r3058/. CogVM binaries as per VMMaker.oscog-eem.842/r3058 Spur: Provide unpinObject: for InterpreterProxy. Fix initialization of the heap-resident remembered set added by VMMaker.oscog-eem.827. It must be created /after/ old space is initialized. Fix two become bugs surfaced when adding/removing inst vars to/from Association, Binding et al. First, the class table must be scanned to ensure there are no forwarders to classes (much cheaper than the full hierarchy walk to follow method dictionaries etc that was done). Second, machine code methods that gain a new reference through become must get added to the youngReferrers. Add a new become effect flag, OldBecameNew that captures this and respond to it in CoInterpreter>>postBecomeAction: by adding all methods to youngReferrers so that on the next scavenge all will be made right. Fix GC of machine code, which must follow forwarders when doing markAndTraceLiteral: and again add to youngReferrers if following gains a new ref. Refactoring of markAndTraceLiteral: into markAndTraceLiteral:in:at: et al required. Fix assert in addFreeSubTree:. General: Support the alternate bytecode set header in all VMs to ease testing of multiple bytecode sets. This means methods with the sign bit set have no primitive field and a larger num literals field, but no more. Fix longPrintOop: (actually printOopShortInner:) for global variable printing in face of new Environments. Cogit: Clean up adding to the youngReferrers by providing ensureInYoungReferrers:. Since there always is room on youngReferrers, nuke roomOnYoungReferrersList, canLinkToYoungClasses and caller code, simplifying ceSend:super:to:numArgs: etc. Fix assert in followForwardedLiteralsIn: General: Change the scanning for initial nils scheme in the StackToRegisterMappingCogit to answer the number of push nils in a bytecode, instead of whether the bytecode is a push nil. Refactor genReturnTopFromBlock into genBlockReturn. These changes accomodate Sista. Rationalize the length functions, deleting byteLengthOf:, fetchLong32LengthOf: & fetchWordLengthOf: and providing numBytesOf:, num16BitUnitsOf:, num32BitUnitsOf:, num64BitUnitsOf: and numBytesOf:. Provide fetch/storeShort16:ofObject:[withValue:] and fetch/storeLong64:ofObject:[withValue:]. -- best, Eliot

1 0

[commit][3058] CogVM source as per VMMaker.oscog-eem.842
by commits＠squeakvm.org 05 Aug '14

05 Aug '14

Revision: 3058 Author: eliot Date: 2014-08-04 19:15:28 -0700 (Mon, 04 Aug 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.842 Fix typo in initializeCTranslationDictionary and hence rescue Newspeak cogits Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogmethod.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2014-08-05 01:55:33 UTC (rev 3057) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-08-05 02:15:28 UTC (rev 3058) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGenerator VMMaker.oscog-eem.842 uuid: 1355259a-aa6e-48eb-8348-f0890328e7a6 from - StackToRegisterMappingCogit VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + StackToRegisterMappingCogit VMMaker.oscog-eem.842 uuid: 1355259a-aa6e-48eb-8348-f0890328e7a6 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.842 uuid: 1355259a-aa6e-48eb-8348-f0890328e7a6 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -13092,7 +13092,7 @@ if (cacheTagIsMarked(class)) { if (((mixin = unalignedLongAt(backEnd, cacheAddress + BytesPerOop))) != 0) { /* begin markAndTraceLiteral:in:at: */ - address1 = asAddressput(cacheAddress + BytesPerOop, unalignedLongAtput(backEnd, cacheAddress + BytesPerOop, val)); + address1 = (cacheAddress + BytesPerOop); markAndTraceLiteral(mixin); } } @@ -13173,7 +13173,7 @@ if (cacheTagIsMarked(class)) { if (((mixin = unalignedLongAt(backEnd, cacheAddress + BytesPerOop))) != 0) { /* begin markAndTraceLiteral:in:at: */ - address = asAddressput(cacheAddress + BytesPerOop, unalignedLongAtput(backEnd, cacheAddress + BytesPerOop, val)); + address = (cacheAddress + BytesPerOop); markAndTraceLiteral(mixin); } } Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-08-05 01:55:33 UTC (rev 3057) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-08-05 02:15:28 UTC (rev 3058) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGenerator VMMaker.oscog-eem.842 uuid: 1355259a-aa6e-48eb-8348-f0890328e7a6 */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2014-08-05 01:55:33 UTC (rev 3057) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2014-08-05 02:15:28 UTC (rev 3058) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGenerator VMMaker.oscog-eem.842 uuid: 1355259a-aa6e-48eb-8348-f0890328e7a6 */ typedef struct { Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2014-08-05 01:55:33 UTC (rev 3057) +++ branches/Cog/nsspursrc/vm/cogit.c 2014-08-05 02:15:28 UTC (rev 3058) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGenerator VMMaker.oscog-eem.842 uuid: 1355259a-aa6e-48eb-8348-f0890328e7a6 from - StackToRegisterMappingCogit VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + StackToRegisterMappingCogit VMMaker.oscog-eem.842 uuid: 1355259a-aa6e-48eb-8348-f0890328e7a6 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.842 uuid: 1355259a-aa6e-48eb-8348-f0890328e7a6 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -12843,7 +12843,7 @@ cacheAddress = implicitReceiveCacheAt(backEnd, mcpc); if (((class = unalignedLongAt(backEnd, cacheAddress))) != 0) { if (((mixin = unalignedLongAt(backEnd, cacheAddress + BytesPerOop))) != 0) { - markAndTraceLiteralinat(mixin, ((CogMethod *) cogMethod), asAddressput(cacheAddress + BytesPerOop, unalignedLongAtput(backEnd, cacheAddress + BytesPerOop, val))); + markAndTraceLiteralinat(mixin, ((CogMethod *) cogMethod), (cacheAddress + BytesPerOop)); } } Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2014-08-05 01:55:33 UTC (rev 3057) +++ branches/Cog/nsspursrc/vm/cogit.h 2014-08-05 02:15:28 UTC (rev 3058) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGenerator VMMaker.oscog-eem.842 uuid: 1355259a-aa6e-48eb-8348-f0890328e7a6 */ Modified: branches/Cog/nsspursrc/vm/cogmethod.h =================================================================== --- branches/Cog/nsspursrc/vm/cogmethod.h 2014-08-05 01:55:33 UTC (rev 3057) +++ branches/Cog/nsspursrc/vm/cogmethod.h 2014-08-05 02:15:28 UTC (rev 3058) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 + CCodeGenerator VMMaker.oscog-eem.842 uuid: 1355259a-aa6e-48eb-8348-f0890328e7a6 */ typedef struct { Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Mon Aug 4 18:47:31 PDT 2014 + Mon Aug 4 19:14:37 PDT 2014

1 0

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

05 Aug '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.842.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.842 Author: eem Time: 4 August 2014, 7:10:14.987 pm UUID: 1355259a-aa6e-48eb-8348-f0890328e7a6 Ancestors: VMMaker.oscog-eem.841 Fix typo in initializeCTranslationDictionary =============== Diff against VMMaker.oscog-eem.841 =============== Item was changed: ----- Method: CCodeGenerator>>initializeCTranslationDictionary (in category 'C translation') ----- initializeCTranslationDictionary "Initialize the dictionary mapping message names to actions for C code generation." | pairs | translationDict := Dictionary new: 200. pairs := #( #& #generateAnd:on:indent: #| #generateOr:on:indent: #and: #generateSequentialAnd:on:indent: #or: #generateSequentialOr:on:indent: #not #generateNot:on:indent: #+ #generatePlus:on:indent: #- #generateMinus:on:indent: #negated #generateNegated:on:indent: #* #generateTimes:on:indent: #/ #generateDivide:on:indent: #// #generateDivide:on:indent: #\\ #generateModulo:on:indent: #<< #generateShiftLeft:on:indent: #>> #generateShiftRight:on:indent: #min: #generateMin:on:indent: #max: #generateMax:on:indent: #between:and: #generateBetweenAnd:on:indent: #bitAnd: #generateBitAnd:on:indent: #bitOr: #generateBitOr:on:indent: #bitXor: #generateBitXor:on:indent: #bitShift: #generateBitShift:on:indent: #signedBitShift: #generateSignedBitShift:on:indent: #bitInvert32 #generateBitInvert32:on:indent: #bitClear: #generateBitClear:on:indent: #truncateTo: #generateTruncateTo:on:indent: #rounded #generateRounded:on:indent: #< #generateLessThan:on:indent: #<= #generateLessThanOrEqual:on:indent: #= #generateEqual:on:indent: #> #generateGreaterThan:on:indent: #>= #generateGreaterThanOrEqual:on:indent: #~= #generateNotEqual:on:indent: #== #generateEqual:on:indent: #~~ #generateNotEqual:on:indent: #isNil #generateIsNil:on:indent: #notNil #generateNotNil:on:indent: #whileTrue: #generateWhileTrue:on:indent: #whileFalse: #generateWhileFalse:on:indent: #whileTrue #generateDoWhileTrue:on:indent: #whileFalse #generateDoWhileFalse:on:indent: #to:do: #generateToDo:on:indent: #to:by:do: #generateToByDo:on:indent: #repeat #generateRepeat:on:indent: #ifTrue: #generateIfTrue:on:indent: #ifFalse: #generateIfFalse:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalse:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrue:on:indent: #ifNotNil: #generateIfNotNil:on:indent: #ifNil: #generateIfNil:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNil:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNil:on:indent: #at: #generateAt:on:indent: #at:put: #generateAtPut:on:indent: #basicAt: #generateAt:on:indent: #basicAt:put: #generateAtPut:on:indent: #integerValueOf: #generateIntegerValueOf:on:indent: #integerObjectOf: #generateIntegerObjectOf:on:indent: #isIntegerObject: #generateIsIntegerObject:on:indent: #cCode: #generateInlineCCode:on:indent: #cCode:inSmalltalk: #generateInlineCCode:on:indent: #cPreprocessorDirective: #generateInlineCPreprocessorDirective:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElse:on:indent: #cppIf:ifTrue: #generateInlineCppIfElse:on:indent: #cCoerce:to: #generateCCoercion:on:indent: #cCoerceSimple:to: #generateCCoercion:on:indent: #addressOf: #generateAddressOf:on:indent: #addressOf:put: #generateAddressOf:on:indent: + #asAddress:put: #generateAsAddress:on:indent: - #aaAddress:put: #generateAsAddress:on:indent: #signedIntFromLong #generateSignedIntFromLong:on:indent: #signedIntToLong #generateSignedIntToLong:on:indent: #signedIntFromShort #generateSignedIntFromShort:on:indent: #signedIntToShort #generateSignedIntToShort:on:indent: #preIncrement #generatePreIncrement:on:indent: #preDecrement #generatePreDecrement:on:indent: #inline: #generateInlineDirective:on:indent: #asFloat #generateAsFloat:on:indent: #asInteger #generateAsInteger:on:indent: #asUnsignedInteger #generateAsUnsignedInteger:on:indent: #asLong #generateAsLong:on:indent: #asUnsignedLong #generateAsUnsignedLong:on:indent: #asVoidPointer #generateAsVoidPointer:on:indent: #asSymbol #generateAsSymbol:on:indent: #flag: #generateFlag:on:indent: #anyMask: #generateBitAnd:on:indent: #noMask: #generateNoMask:on:indent: #raisedTo: #generateRaisedTo:on:indent: #touch: #generateTouch:on:indent: #bytesPerWord #generateBytesPerWord:on:indent: #baseHeaderSize #generateBaseHeaderSize:on:indent: #sharedCodeNamed:inCase: #generateSharedCodeDirective:on:indent: #perform: #generatePerform:on:indent: #perform:with: #generatePerform:on:indent: #perform:with:with: #generatePerform:on:indent: #perform:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with:with: #generatePerform:on:indent: #value #generateValue:on:indent: #value: #generateValue:on:indent: #value:value: #generateValue:on:indent: #value:value:value: #generateValue:on:indent: #deny: #generateDeny:on:indent: #shouldNotImplement #generateSmalltalkMetaError:on:indent: #shouldBeImplemented #generateSmalltalkMetaError:on:indent: #subclassResponsibility #generateSmalltalkMetaError:on:indent: ). 1 to: pairs size by: 2 do: [:i | translationDict at: (pairs at: i) put: (pairs at: i + 1)]. pairs := #( #ifTrue: #generateIfTrueAsArgument:on:indent: #ifFalse: #generateIfFalseAsArgument:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalseAsArgument:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrueAsArgument:on:indent: #ifNotNil: #generateIfNotNilAsArgument:on:indent: #ifNil: #generateIfNilAsArgument:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNilAsArgument:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNilAsArgument:on:indent: #cCode: #generateInlineCCodeAsArgument:on:indent: #cCode:inSmalltalk: #generateInlineCCodeAsArgument:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElseAsArgument:on:indent: #cppIf:ifTrue: #generateInlineCppIfElseAsArgument:on:indent: #value #generateValueAsArgument:on:indent: #value: #generateValueAsArgument:on:indent: #value:value: #generateValueAsArgument:on:indent: ). asArgumentTranslationDict := Dictionary new: 8. 1 to: pairs size by: 2 do: [:i | asArgumentTranslationDict at: (pairs at: i) put: (pairs at: i + 1)]. !

1 0

[commit][3057] CogVM source as per VMMaker.oscog-eem.841
by commits＠squeakvm.org 05 Aug '14

05 Aug '14

Revision: 3057 Author: eliot Date: 2014-08-04 18:55:33 -0700 (Mon, 04 Aug 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.841 Spur: Provide unpinObject: for InterpreterProxy. Fix initialization of the heap-resident remembered set added by VMMaker.oscog-eem.827. It must be created /after/ old space is initialized. Fix two become bugs surfaced when adding/removing inst vars to/from Association, Binding et al. First, the class table must be scanned to ensure there are no forwarders to classes (much cheaper than the full hierarchy walk to follow method dictionaries etc that was done). Second, machine code methods that gain a new reference through become must get added to the youngReferrers. Add a new become effect flag, OldBecameNew that captures this and respond to it in CoInterpreter>>postBecomeAction: by adding all methods to youngReferrers so that on the next scavenge all will be made right. Fix GC of machine code, which must follow forwarders when doing markAndTraceLiteral: and again add to youngReferrers if following gains a new ref. Refactoring of markAndTraceLiteral: into markAndTraceLiteral:in:at: et al required. Fix assert in addFreeSubTree:. General: Support the alternate bytecode set header in all VMs to ease testing of multiple bytecode sets. This means methods with the sign bit set have no primitive field and a larger num literals field, but no more. Fix longPrintOop: (actually printOopShortInner:) for global variable printing in face of new Environments. Cogit: Clean up adding to the youngReferrers by providing ensureInYoungReferrers:. Since there always is room on youngReferrers, nuke roomOnYoungReferrersList, canLinkToYoungClasses and caller code, simplifying ceSend:super:to:numArgs: etc. Fix assert in followForwardedLiteralsIn: General: Change the scanning for initial nils scheme in the StackToRegisterMappingCogit to answer the number of push nils in a bytecode, instead of whether the bytecode is a push nil. Refactor genReturnTopFromBlock into genBlockReturn. These changes accomodate Sista. Rationalize the length functions, deleting byteLengthOf:, fetchLong32LengthOf: & fetchWordLengthOf: and providing numBytesOf:, num16BitUnitsOf:, num32BitUnitsOf:, num64BitUnitsOf: and numBytesOf:. Provide fetch/storeShort16:ofObject:[withValue:] and fetch/storeLong64:ofObject:[withValue:]. Sista: Fix slip in CoInterpreter>>ceCounterTripped: that would break Spur (classForClassTag: instead of classTagForClass:). Modified Paths: -------------- branches/Cog/build.win32x86/HowToBuild branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogmethod.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/interp.h branches/Cog/nsspursrc/vm/vmCallback.h branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/nsspurstacksrc/vm/interp.h branches/Cog/nsspurstacksrc/vm/vmCallback.h branches/Cog/platforms/Cross/vm/sqVirtualMachine.c branches/Cog/platforms/Cross/vm/sqVirtualMachine.h branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cogmethod.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/sistasrc/vm/interp.h branches/Cog/sistasrc/vm/vmCallback.h branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogmethod.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/interp.h branches/Cog/spursistasrc/vm/vmCallback.h branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogmethod.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/interp.h branches/Cog/spursrc/vm/vmCallback.h branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/spurstacksrc/vm/vmCallback.h branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c branches/Cog/stacksrc/vm/interp.h branches/Cog/stacksrc/vm/vmCallback.h Added Paths: ----------- branches/Cog/build.macos32x86/makesista branches/Cog/build.macos32x86/makespur Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Added: branches/Cog/build.macos32x86/makesista =================================================================== --- branches/Cog/build.macos32x86/makesista (rev 0) +++ branches/Cog/build.macos32x86/makesista 2014-08-05 01:55:33 UTC (rev 3057) @@ -0,0 +1,14 @@ +#!/bin/bash +trap 'exit 2' HUP INT PIPE TERM +DIRS="squeak.sista.spur squeak.sista.v3" +for d in $DIRS; do + if test -d "$d"; then + (cd $d;./mvm -A) + else + echo no $d directory found + fi +done +echo no news is good news... +for d in $DIRS; do + test -d $d && grep 'BUILD FAILED' $d/LOG* +done Property changes on: branches/Cog/build.macos32x86/makesista ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/build.macos32x86/makespur =================================================================== --- branches/Cog/build.macos32x86/makespur (rev 0) +++ branches/Cog/build.macos32x86/makespur 2014-08-05 01:55:33 UTC (rev 3057) @@ -0,0 +1,14 @@ +#!/bin/bash +trap 'exit 2' HUP INT PIPE TERM +DIRS="newspeak.cog.spur newspeak.stack.spur squeak.cog.spur squeak.sista.spur squeak.stack.spur" +for d in $DIRS; do + if test -d "$d"; then + (cd $d;./mvm -A) + else + echo no $d directory found + fi +done +echo no news is good news... +for d in $DIRS; do + test -d $d && grep 'BUILD FAILED' $d/LOG* +done Property changes on: branches/Cog/build.macos32x86/makespur ___________________________________________________________________ Added: svn:executable + * Modified: branches/Cog/build.win32x86/HowToBuild =================================================================== --- branches/Cog/build.win32x86/HowToBuild 2014-07-24 17:12:40 UTC (rev 3056) +++ branches/Cog/build.win32x86/HowToBuild 2014-08-05 01:55:33 UTC (rev 3057) @@ -10,6 +10,7 @@ - Building the Bochs Support Libraries - Building an MSI installer (Newspeak) - Optimization level and gcc version (please read!) + - Debugging with gdb Overview @@ -144,3 +145,14 @@ -fcaller-saves See http://smallissimo.blogspot.fr/2013/02/compiling-squeak-cog-virtual-machine… + +Debugging with gdb +------------------ + +Note that even the stripped production VM can be used for debug using the +unstripped VM to provide symbols, e.g. + U:\ gdb bin/Squeak.exe + ... + (no debugging symbols found) + (gdb) file SqueakUnstripped.exe + (gdb) run trunk.image Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2014-07-24 17:12:40 UTC (rev 3056) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-08-05 01:55:33 UTC (rev 3057) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad + CCodeGenerator VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 from - StackToRegisterMappingCogit VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad + StackToRegisterMappingCogit VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -328,6 +328,7 @@ #define ShouldNotJIT -8 #define SIB1 0 #define SIB4 2 +#define SistaVM 0 #define Size4Bit 0 #define SizeMask 0xFC #define SPReg -2 @@ -788,12 +789,14 @@ static void voidImplicitReceiverCacheAt(sqInt mcpc) NoDbgRegParms; static AbstractInstruction * gXorCwR(sqInt wordConstant, sqInt reg) NoDbgRegParms; static void zeroOpcodeIndex(void); +void addAllToYoungReferrers(void); static void addToOpenPICList(CogMethod *anOpenPIC) NoDbgRegParms; static void addToUnpairedMethodList(CogMethod *aCogMethod) NoDbgRegParms; static void addToYoungReferrers(CogMethod *cogMethod) NoDbgRegParms; static sqInt allocate(sqInt numBytes) NoDbgRegParms; static void clearCogCompiledCode(void); static void compactCompiledCode(void); +static void ensureInYoungReferrers(CogMethod *cogMethod) NoDbgRegParms; static CogMethod * findPreviouslyCompiledVersionOfwith(sqInt aMethodObj, sqInt aSelectorOop) NoDbgRegParms; static void freeMethod(CogMethod *cogMethod) NoDbgRegParms; static void freeOlderMethodsForCompaction(void); @@ -816,7 +819,6 @@ static sqInt relocateAndPruneYoungReferrers(void); static sqInt removeFromOpenPICList(CogMethod *anOpenPIC) NoDbgRegParms; static sqInt removeFromUnpairedMethodList(CogMethod *aCogMethod) NoDbgRegParms; -static sqInt roomOnYoungReferrersList(void); static void voidYoungReferrersPostTenureAll(void); char * whereIsMaybeCodeThing(sqInt anOop); static sqInt checkValidObjectReference(sqInt anOop) NoDbgRegParms; @@ -836,7 +838,6 @@ static void maybeCompileRetryonPrimitiveFail(AbstractInstruction *retryInst, sqInt primIndex) NoDbgRegParms; static sqInt allYoungObjectsAgeInFullGC(void); static sqInt cacheTagIsMarked(sqInt cacheTag) NoDbgRegParms; -sqInt canLinkToYoungClasses(void); static sqInt checkValidInlineCacheTag(sqInt cacheTag) NoDbgRegParms; static sqInt checkValidOopReference(sqInt anOop) NoDbgRegParms; static sqInt compactClassFieldMask(void); @@ -905,6 +906,7 @@ static sqInt extendedStoreAndPopBytecode(void); static sqInt extendedStoreBytecode(void); static sqInt frameOffsetOfTemporary(sqInt index) NoDbgRegParms; +static sqInt genBlockReturn(void); static AbstractInstruction * genDoubleFailIfZeroArgRcvrarg(sqInt rcvrReg, sqInt argReg) NoDbgRegParms; static sqInt genDynamicSuperSendBytecode(void); static sqInt genExtendedSendBytecode(void); @@ -1144,7 +1146,7 @@ static CogSimStackEntry * ssValue(sqInt n) NoDbgRegParms; static sqInt tryCollapseTempVectorInitializationOfSize(sqInt slots) NoDbgRegParms; static sqInt v3or4PushNilSize(sqInt aMethodObj) NoDbgRegParms; -static sqInt v3or4IsPushNil(BytecodeDescriptor *descriptor, sqInt pc, sqInt nExts, sqInt aMethodObj) NoDbgRegParms; +static sqInt v3or4NumPushNils(BytecodeDescriptor *descriptor, sqInt pc, sqInt nExts, sqInt aMethodObj) NoDbgRegParms; static sqInt oopisGreaterThanOrEqualTo(sqInt anOop, sqInt otherOop) NoDbgRegParms; static sqInt oopisGreaterThan(sqInt anOop, sqInt otherOop) NoDbgRegParms; static sqInt oopisLessThan(sqInt anOop, sqInt otherOop) NoDbgRegParms; @@ -2134,6 +2136,7 @@ #define traceMerge(ign) 0 #define traceSimStack() 0 #define traceSpill(ign) 0 +#define allocatype(numElements, elementType) alloca((numElements)*sizeof(elementType)) #define numElementsIn(anArray) (sizeof(anArray)/sizeof(anArray[0])) @@ -8553,7 +8556,7 @@ || ((((usqInt) (byteAt(map))) >> AnnotationShift) == IsDisplacementX2N)))); latestContinuation = startbcpc; aMethodObj = (homeMethod->methodObject); - endbcpc = (byteLengthOf(aMethodObj)) - 1; + endbcpc = (numBytesOf(aMethodObj)) - 1; /* begin bytecodeSetOffsetForHeader: */ methodHeader = (homeMethod->methodHeader); bsOffset = (headerIndicatesAlternateBytecodeSet(methodHeader) @@ -8901,12 +8904,7 @@ && (isYoung(rcvrClass))) || ((mixin != receiver) && (isYoung(mixin)))) { - if (!(roomOnYoungReferrersList())) { - callForCogCompiledCodeCompaction(); - return mixin; - } - (cogMethod->cmRefersToYoung = 1); - addToYoungReferrers(cogMethod); + ensureInYoungReferrers(cogMethod); } } unalignedLongAtput(backEnd, classpc, inlineCacheTagForClass(rcvrClass)); @@ -8944,12 +8942,7 @@ && (isYoung(rcvrClass))) || ((mixin != receiver) && (isYoung(mixin)))) { - if (!(roomOnYoungReferrersList())) { - callForCogCompiledCodeCompaction(); - return mixin; - } - (cogMethod->cmRefersToYoung = 1); - addToYoungReferrers(cogMethod); + ensureInYoungReferrers(cogMethod); } } unalignedLongAtput(backEnd, cacheAddress, inlineCacheTagForClass(rcvrClass)); @@ -10545,7 +10538,7 @@ ? 256 : 0); nExts = 0; - end = byteLengthOf(aMethod); + end = numBytesOf(aMethod); while (pc <= end) { byte = fetchByteofObject(pc, aMethod); descriptor = generatorAt(byte + bsOffset); @@ -11500,6 +11493,7 @@ generateRunTimeTrampolines(); generateNewspeakRuntime(); + generateEnilopmarts(); generateTracingTrampolines(); recordGeneratedRunTimeaddress("methodZoneBase", methodZoneBase); @@ -12170,11 +12164,8 @@ inlineCacheTag = (theEntryOffset == cmNoCheckEntryOffset ? (targetMethod->selector) : inlineCacheTagForInstance(receiver)); - if ((!((sendingMethod->cmRefersToYoung))) - && (inlineCacheTagIsYoung(inlineCacheTag))) { - assert((occurrencesInYoungReferrers(sendingMethod)) == 0); - (sendingMethod->cmRefersToYoung = 1); - addToYoungReferrers(sendingMethod); + if (inlineCacheTagIsYoung(inlineCacheTag)) { + ensureInYoungReferrers(sendingMethod); } address = (((sqInt)targetMethod)) + theEntryOffset; extent = rewriteInlineCacheAttagtarget(backEnd, callSiteReturnAddress, inlineCacheTag, address); @@ -12419,10 +12410,7 @@ 0; l1: /* end mapFor:performUntil:arg: */; if (hasYoungObj) { - if (!((cogMethod->cmRefersToYoung))) { - (cogMethod->cmRefersToYoung = 1); - addToYoungReferrers(cogMethod); - } + ensureInYoungReferrers(cogMethod); hasYoungObj = 0; } else { @@ -12714,7 +12702,11 @@ void markAndTraceMachineCodeOfMarkedMethods(void) { + sqInt *address; + sqInt *address1; CogMethod *cogMethod; + sqInt literal; + sqInt literal1; sqInt map; sqInt map1; sqInt mapByte; @@ -12723,6 +12715,8 @@ sqInt mcpc1; sqInt result; sqInt result1; + sqInt val; + sqInt val1; if (leakCheckFullGC()) { assert(allMachineCodeObjectReferencesValid()); @@ -12739,7 +12733,10 @@ || ((((cogMethod->cmType)) == CMOpenPIC) && ((isImmediate((cogMethod->selector))) || (isMarked((cogMethod->selector)))))); - markAndTraceLiteral((cogMethod->selector)); + /* begin markAndTraceLiteral:in:at: */ + literal = (cogMethod->selector); + address = (&((cogMethod->selector))); + markAndTraceLiteral(literal); maybeMarkCountersIn(cogMethod); /* begin maybeMarkIRCsIn: */ @@ -12779,7 +12776,10 @@ || ((((cogMethod->cmType)) == CMOpenPIC) && ((isImmediate((cogMethod->selector))) || (isMarked((cogMethod->selector)))))); - markAndTraceLiteral((cogMethod->selector)); + /* begin markAndTraceLiteral:in:at: */ + literal1 = (cogMethod->selector); + address1 = (&((cogMethod->selector))); + markAndTraceLiteral(literal1); maybeMarkCountersIn(cogMethod); /* begin maybeMarkIRCsIn: */ @@ -12835,8 +12835,10 @@ for (i = 0; i < runtimeObjectRefIndex; i += 1) { mcpc = objectReferencesInRuntime[i]; - literal = literalBeforeFollowingAddress(backEnd, ((sqInt)mcpc)); + literal = literalBeforeFollowingAddress(backEnd, ((usqInt)mcpc)); + /* begin markAndTraceLiteral:in:atpc: */ markAndTraceLiteral(literal); + 0; } } @@ -12868,10 +12870,13 @@ static sqInt markAndTraceOrFreeCogMethodfirstVisit(CogMethod *cogMethod, sqInt firstVisit) { + sqInt *address; + sqInt literal; sqInt map; sqInt mapByte; sqInt mcpc; sqInt result; + sqInt val; if (((cogMethod->cmType)) == CMFree) { return 1; @@ -12886,7 +12891,10 @@ /* begin markLiteralsAndUnlinkUnmarkedSendsIn: */ assert(((cogMethod->cmType)) == CMMethod); assert(isMarked((cogMethod->methodObject))); - markAndTraceLiteral((cogMethod->selector)); + /* begin markAndTraceLiteral:in:at: */ + literal = (cogMethod->selector); + address = (&((cogMethod->selector))); + markAndTraceLiteral(literal); maybeMarkCountersIn(cogMethod); /* begin maybeMarkIRCsIn: */ @@ -12978,6 +12986,8 @@ static sqInt markLiteralsAndUnlinkIfUnmarkedSendpcmethod(sqInt annotation, char *mcpc, sqInt cogMethod) { + sqInt *address; + sqInt *address1; usqInt cacheAddress; sqInt cacheTag; sqInt cacheTag1; @@ -12986,6 +12996,7 @@ sqInt entryPoint; sqInt entryPoint1; sqInt literal; + sqInt literal1; sqInt mixin; sqInt sendTable; sqInt *sendTable1; @@ -12994,10 +13005,15 @@ sqInt targetMethod; CogMethod *targetMethod1; sqInt unlinkedRoutine; + sqInt val; if (annotation == IsObjectReference) { - literal = literalBeforeFollowingAddress(backEnd, ((sqInt)mcpc)); + literal = literalBeforeFollowingAddress(backEnd, ((usqInt)mcpc)); markAndTraceLiteral(literal); + goto l1; + codeModified = 1; + l1: ; + } if ((annotation == IsSendCall) || (annotation == IsNSSendCall)) { @@ -13048,20 +13064,35 @@ unlinkedRoutine = sendTable1[((((targetMethod1->cmNumArgs)) < (NumSendTrampolines - 1)) ? ((targetMethod1->cmNumArgs)) : (NumSendTrampolines - 1))]; rewriteInlineCacheAttagtarget(backEnd, ((sqInt)mcpc), (targetMethod1->selector), unlinkedRoutine); codeModified = 1; - markAndTraceLiteral((targetMethod1->selector)); + /* begin markAndTraceLiteral:in:at: */ + literal1 = (targetMethod1->selector); + address = (&((targetMethod1->selector))); + markAndTraceLiteral(literal1); } } else { + + /* cacheTag is selector */ + markAndTraceLiteral(cacheTag1); + goto l5; + codeModified = 1; + l5: ; + if (entryPoint1 == ceImplicitReceiverTrampoline) { markAndTraceLiteral(cacheTag1); + goto l4; + codeModified = 1; + l4: ; + assert(NumOopsPerIRC == 2); cacheAddress = (((usqInt)mcpc)) + (jumpShortByteSize(backEnd)); - class = unalignedLongAt(backEnd, cacheAddress); - if (class != 0) { + if (((class = unalignedLongAt(backEnd, cacheAddress))) != 0) { if (cacheTagIsMarked(class)) { if (((mixin = unalignedLongAt(backEnd, cacheAddress + BytesPerOop))) != 0) { + /* begin markAndTraceLiteral:in:at: */ + address1 = asAddressput(cacheAddress + BytesPerOop, unalignedLongAtput(backEnd, cacheAddress + BytesPerOop, val)); markAndTraceLiteral(mixin); } } @@ -13089,6 +13120,7 @@ static sqInt markLiteralspcmethod(sqInt annotation, char *mcpc, sqInt cogMethod) { + sqInt *address; usqInt cacheAddress; sqInt cacheTag; sqInt cacheTag1; @@ -13099,10 +13131,15 @@ sqInt mixin; sqInt tagCouldBeObj; sqInt tagCouldBeObj1; + sqInt val; if (annotation == IsObjectReference) { - literal = literalBeforeFollowingAddress(backEnd, ((sqInt)mcpc)); + literal = literalBeforeFollowingAddress(backEnd, ((usqInt)mcpc)); markAndTraceLiteral(literal); + goto l1; + codeModified = 1; + l1: ; + } if ((annotation == IsSendCall) || (annotation == IsNSSendCall)) { @@ -13124,14 +13161,19 @@ && ((((((CogMethod *) (entryPoint1 - cmEntryOffset)))->cmType)) == CMOpenPIC)))); if (tagCouldBeObj1) { markAndTraceLiteral(cacheTag1); + goto l3; + codeModified = 1; + l3: ; + } if (entryPoint1 == ceImplicitReceiverTrampoline) { assert(NumOopsPerIRC == 2); cacheAddress = (((usqInt)mcpc)) + (jumpShortByteSize(backEnd)); - class = unalignedLongAt(backEnd, cacheAddress); - if (class != 0) { + if (((class = unalignedLongAt(backEnd, cacheAddress))) != 0) { if (cacheTagIsMarked(class)) { if (((mixin = unalignedLongAt(backEnd, cacheAddress + BytesPerOop))) != 0) { + /* begin markAndTraceLiteral:in:at: */ + address = asAddressput(cacheAddress + BytesPerOop, unalignedLongAtput(backEnd, cacheAddress + BytesPerOop, val)); markAndTraceLiteral(mixin); } } @@ -13378,7 +13420,7 @@ || ((((usqInt) (byteAt(map))) >> AnnotationShift) == IsDisplacementX2N)))); latestContinuation = startbcpc; aMethodObj = (homeMethod->methodObject); - endbcpc = (byteLengthOf(aMethodObj)) - 1; + endbcpc = (numBytesOf(aMethodObj)) - 1; /* begin bytecodeSetOffsetForHeader: */ methodHeader = (homeMethod->methodHeader); bsOffset = (headerIndicatesAlternateBytecodeSet(methodHeader) @@ -13523,7 +13565,7 @@ || (((temporaryCountOfMethodHeader(headerA)) != (temporaryCountOfMethodHeader(headerB))) || (((primitiveIndexOfMethodheader(methodA, headerA)) != (primitiveIndexOfMethodheader(methodB, headerB))) || ((numLitsA != (literalCountOfHeader(headerB))) - || (endPCA > (byteLengthOf(methodB))))))) { + || (endPCA > (numBytesOf(methodB))))))) { return 0; } for (li = 1; li < numLitsA; li += 1) { @@ -14235,11 +14277,8 @@ compilationBreakpoint(aSelectorOop, lengthOf(aSelectorOop)); assert(((cogMethod->cmType)) == CMMethod); (cogMethod->selector = aSelectorOop); - if ((!((cogMethod->cmRefersToYoung))) - && (isYoung(aSelectorOop))) { - assert((occurrencesInYoungReferrers(cogMethod)) == 0); - (cogMethod->cmRefersToYoung = 1); - addToYoungReferrers(cogMethod); + if (isYoung(aSelectorOop)) { + ensureInYoungReferrers(cogMethod); } } @@ -14251,7 +14290,7 @@ sqInt pc; pc = startPC; - end = byteLengthOf(methodObj); + end = numBytesOf(methodObj); while (pc <= end) { descriptor = generatorAt((fetchByteofObject(pc, methodObj)) + bytecodeSetOffset); pc += (descriptor->numBytes); @@ -14834,6 +14873,21 @@ opcodeIndex = 0; } +void +addAllToYoungReferrers(void) +{ + CogMethod *cogMethod; + + cogMethod = ((CogMethod *) baseAddress); + while (cogMethod < (limitZony())) { + if ((((cogMethod->cmType)) == CMMethod) + || (((cogMethod->cmType)) == CMOpenPIC)) { + ensureInYoungReferrers(cogMethod); + } + cogMethod = ((CogMethod *) (roundUpLength((((sqInt)cogMethod)) + ((cogMethod->blockSize))))); + } +} + static void addToOpenPICList(CogMethod *anOpenPIC) { @@ -14861,7 +14915,9 @@ assert(youngReferrers <= limitAddress); assert((occurrencesInYoungReferrers(cogMethod)) == 0); assert((cogMethod->cmRefersToYoung)); - if (!(asserta(roomOnYoungReferrersList()))) { + assert((youngReferrers <= limitAddress) + && (youngReferrers >= (limitAddress - (methodCount * BytesPerWord)))); + if (!(asserta((limitAddress - (methodCount * BytesPerWord)) >= mzFreeStart))) { error("no room on youngReferrers list"); } youngReferrers -= BytesPerWord; @@ -14881,7 +14937,6 @@ allocation = mzFreeStart; mzFreeStart += roundedBytes; methodCount += 1; - assert(roomOnYoungReferrersList()); return allocation; } @@ -14985,7 +15040,17 @@ methodBytesFreedSinceLastCompaction = 0; } +static void +ensureInYoungReferrers(CogMethod *cogMethod) +{ + if (!((cogMethod->cmRefersToYoung))) { + assert((occurrencesInYoungReferrers(cogMethod)) == 0); + (cogMethod->cmRefersToYoung = 1); + addToYoungReferrers(cogMethod); + } +} + /* Newspeak uses a set of methods to implement accessors, a setter and a getter for each inst var offset (e.g. 0 to 255). These accessors are installed under @@ -15461,26 +15526,6 @@ } } - -/* The youngReferrers list holds methods that may contain a reference to a - young object and hence need to be visited during young-space garbage - collection. The - list saves walking through all of code space to do so, as in typical - circumstances there are no methods that refer to young objects.However, - events like become: - can potentially cause every method to refer to a new object (becomming - true for - example). So there needs to be room on the list for as many methods as - exist. */ - -static sqInt -roomOnYoungReferrersList(void) -{ - assert((youngReferrers <= limitAddress) - && (youngReferrers >= (limitAddress - (methodCount * BytesPerWord)))); - return (limitAddress - (methodCount * BytesPerWord)) >= mzFreeStart; -} - static void voidYoungReferrersPostTenureAll(void) { @@ -15679,12 +15724,6 @@ return isMarked(cacheTag); } -sqInt -canLinkToYoungClasses(void) -{ - return roomOnYoungReferrersList(); -} - static sqInt checkValidInlineCacheTag(sqInt cacheTag) { @@ -17387,6 +17426,24 @@ : (FoxMFReceiver - BytesPerWord) + ((methodOrBlockNumArgs - index) * BytesPerWord)); } + +/* Return from block, assuming result already loaded into ReceiverResultReg. */ + +static sqInt +genBlockReturn(void) +{ + if (needsFrame) { + /* begin MoveR:R: */ + genoperandoperand(MoveRR, FPReg, SPReg); + /* begin PopR: */ + genoperand(PopR, FPReg); + } + + /* begin RetN: */ + genoperand(RetN, (methodOrBlockNumArgs + 1) * BytesPerWord); + return 0; +} + static AbstractInstruction * genDoubleFailIfZeroArgRcvrarg(sqInt rcvrReg, sqInt argReg) { @@ -17467,7 +17524,8 @@ } -/* 221 11011101 Nop */ +/* NewspeakV4: 221 11011101 Nop */ +/* SistaV1: 91 01011011' Nop */ static sqInt genExtNopBytecode(void) @@ -17477,7 +17535,9 @@ } -/* 229 11100101 i i i i i i i i Push Integer #iiiiiiii (+ Extend B * 256, +/* NewsqueakV4: 229 11100101 iiiiiiii Push Integer #iiiiiiii (+ Extend B * + 256, where bbbbbbbb = sddddddd, e.g. -32768 = i=0, a=0, s=1) + SistaV1: 232 11101000 iiiiiiii Push Integer #iiiiiiii (+ Extend B * 256, where bbbbbbbb = sddddddd, e.g. -32768 = i=0, a=0, s=1) */ @@ -19046,7 +19106,7 @@ initialPC = startPCOfMethod(methodObj); endPC = (isQuickPrimitiveIndex(primitiveIndex) ? initialPC - 1 - : byteLengthOf(methodObj)); + : numBytesOf(methodObj)); numBytecodes = (endPC - initialPC) + 1; allocateOpcodesbytecodesifFail((numBytecodes + extra) * 10, numBytecodes, return ((CogMethod *) MethodTooBig)); if (((numBlocks = scanMethod())) < 0) { @@ -21092,16 +21152,7 @@ assert(inBlock); popToReg(ssTop(), ReceiverResultReg); ssPop(1); - if (needsFrame) { - /* begin MoveR:R: */ - genoperandoperand(MoveRR, FPReg, SPReg); - /* begin PopR: */ - genoperand(PopR, FPReg); - } - - /* begin RetN: */ - genoperand(RetN, (methodOrBlockNumArgs + 1) * BytesPerWord); - return 0; + return genBlockReturn(); } static sqInt @@ -22435,8 +22486,9 @@ BytecodeDescriptor *descriptor; sqInt end; sqInt framelessStackDelta; - sqInt (* const isPushNilFunction)(struct _BytecodeDescriptor *,sqInt,sqInt,sqInt) = v3or4IsPushNil; sqInt nExts; + sqInt numPushNils; + sqInt (* const numPushNilsFunction)(struct _BytecodeDescriptor *,sqInt,sqInt,sqInt) = v3or4NumPushNils; sqInt pc; sqInt pushingNils; @@ -22465,15 +22517,24 @@ /* Count the initial number of pushed nils acting as temp initializers. We can't tell whether an initial pushNil is an operand reference or a temp initializer, except - when the pushNil is a jump target (has a fixup) in which case it is definitely an - operand reference. So rarely we may end up over-estimating. We will correct - by checking the stack depth at the end of the block in compileBlockBodies. */ + when the pushNil is a jump target (has a fixup), which never happens: + self systemNavigation browseAllSelect: + [:m| | ebc | + (ebc := m embeddedBlockClosures + select: [:ea| ea decompile statements first isMessage] + thenCollect: [:ea| ea decompile statements first selector]) notEmpty + and: [(#(whileTrue whileFalse whileTrue: whileFalse:) intersection: ebc) notEmpty]] + or if the bytecode set has a push multiple nils bytecode. We simply count initial nils. + Rarely we may end up over-estimating. We will correct by checking the stack depth + at the end of the block in compileBlockBodies. */ - if ((pushingNils = (isPushNilFunction(descriptor, pc, nExts, methodObj)) - && ((((fixupAt(pc - initialPC))->targetInstruction)) == 0))) { + if (((numPushNils = numPushNilsFunction(descriptor, pc, nExts, methodObj))) > 0) { assert(((descriptor->numBytes)) == 1); - (blockStart->numInitialNils = ((blockStart->numInitialNils)) + 1); + (blockStart->numInitialNils = ((blockStart->numInitialNils)) + numPushNils); } + else { + pushingNils = 0; + } } pc = (pc + ((descriptor->numBytes))) + (((descriptor->isBlockCreation) ? ((descriptor->spanFunction))(descriptor, pc, nExts, methodObj) @@ -22977,13 +23038,21 @@ } static sqInt -v3or4IsPushNil(BytecodeDescriptor *descriptor, sqInt pc, sqInt nExts, sqInt aMethodObj) +v3or4NumPushNils(BytecodeDescriptor *descriptor, sqInt pc, sqInt nExts, sqInt aMethodObj) { - return (((descriptor->generator)) == genPushConstantNilBytecode) - || ((((descriptor->generator)) == genExtPushPseudoVariableOrOuterBytecode) + sqInt numNils; + + if (((numNils = (((descriptor->generator)) == genPushConstantNilBytecode + ? 1 + : 0))) > 0) { + return numNils; + } + return ((((descriptor->generator)) == genExtPushPseudoVariableOrOuterBytecode) && ((assert((fetchByteofObject(pc, aMethodObj)) == 77), (nExts == 1) - && ((fetchByteofObject(pc - 1, aMethodObj)) == 2)))); + && ((fetchByteofObject(pc - 1, aMethodObj)) == 2))) + ? 1 + : 0); } Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-07-24 17:12:40 UTC (rev 3056) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-08-05 01:55:33 UTC (rev 3057) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad + CCodeGenerator VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 */ @@ -70,6 +70,7 @@ void unlinkSendsOfisMNUSelector(sqInt selector, sqInt isMNUSelector); void unlinkSendsToFree(void); void unlinkSendsToandFreeIf(sqInt targetMethodObject, sqInt freeIfTrue); +void addAllToYoungReferrers(void); CogMethod * methodFor(void *address); sqInt numMethodsOfType(sqInt cogMethodType); void printCogMethods(void); @@ -80,7 +81,6 @@ void printCogYoungReferrers(void); void printOpenPICList(void); char * whereIsMaybeCodeThing(sqInt anOop); -sqInt canLinkToYoungClasses(void); sqInt numRegArgs(void); sqInt genQuickReturnConst(void); sqInt genQuickReturnInstVar(void); Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2014-07-24 17:12:40 UTC (rev 3056) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2014-08-05 01:55:33 UTC (rev 3057) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad + CCodeGenerator VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 */ typedef struct { Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-07-24 17:12:40 UTC (rev 3056) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-08-05 01:55:33 UTC (rev 3057) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 from - CoInterpreter VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c + CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.830 uuid: ad7e3584-5924-4500-be7c-ea7ebac3f71c " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.841 uuid: 6b9e05e0-8058-4d62-9349-faff621ab0e6 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -39,7 +39,7 @@ void warning(char *s) { /* Print an error message but don't exit. */ if (warnpid) - printf("\n%s pid %ld\n", s, warnpid); + printf("\n%s pid %ld\n", s, (long)warnpid); else printf("\n%s\n", s); } @@ -271,6 +271,7 @@ #define NewspeakVM 1 #define NextLinkIndex 0 #define NilObject 0 +#define OldBecameNewFlag 4 #define PrimCallCollectsProfileSamples 8 #define PrimCallDoNotJIT 32 #define PrimCallMayCallBack 4 @@ -315,6 +316,7 @@ #define SelectorUnknownBytecode 57 #define SenderIndex 0 #define ShiftForWord 2 +#define SistaVM 0 #define Size4Bit 0 #define SizeMask 0xFC #define SmallContextSlots 22 @@ -819,7 +821,6 @@ void fullGC(void); static sqInt fwdTableInit(sqInt blkSize) NoDbgRegParms; static sqInt fwdTableSize(sqInt blkSize) NoDbgRegParms; -static sqInt goodContextSize(sqInt oop) NoDbgRegParms; static sqInt imageSegmentVersion(void); static sqInt incCompBody(void); static sqInt incCompMakeFwd(void); @@ -838,7 +839,6 @@ void longPrintReferencesTo(sqInt anOop); static void mapPointersInObjectsFromto(sqInt memStart, sqInt memEnd) NoDbgRegParms; static void markPhase(sqInt fullGCFlag) NoDbgRegParms; -sqInt numSlotsOf(sqInt obj); sqInt objectAfter(sqInt oop); static sqInt okayOop(sqInt signedOop) NoDbgRegParms; static sqInt oopHasAcceptableClass(sqInt signedOop) NoDbgRegParms; @@ -850,7 +850,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 usqInt safeObjectAfter(sqInt oop) NoDbgRegParms; +static sqInt safeObjectAfter(sqInt oop) NoDbgRegParms; static sqInt safePrintStringOf(sqInt oop) NoDbgRegParms; static sqInt shortentoIndexableSize(sqInt obj, sqInt nSlots) NoDbgRegParms; static sqInt sizeBitsOfSafe(sqInt oop) NoDbgRegParms; @@ -860,6 +860,7 @@ static sqInt sufficientSpaceToAllocate(sqInt bytes) NoDbgRegParms; static sqInt sweepPhase(void); static sqInt sweepPhaseForFullGC(void); +void unpinObject(sqInt objOop); static void verifyCleanHeaders(void); EXPORT(sqInt) addGCRoot(sqInt *varLoc); sqInt addressCouldBeOop(sqInt address); @@ -870,7 +871,6 @@ void beRootIfOld(sqInt oop); static void beRootWhileForwarding(sqInt oop) NoDbgRegParms; static sqInt byteFormatMask(void); -sqInt byteLengthOf(sqInt obj); sqInt byteSizeOf(sqInt oop); sqInt byteSwapped(sqInt w); static sqInt changeClassOfto(sqInt rcvr, sqInt argClass) NoDbgRegParms; @@ -901,6 +901,7 @@ sqInt classUnsafeAlien(void); static void clearRootsTable(void); sqInt compactClassAt(sqInt ccIndex); +sqInt compactClassIndexOfClass(sqInt classObj); sqInt compactClassIndexOfHeader(sqInt header); sqInt compactClassIndexOf(sqInt oop); static sqInt compactIndexOfClass(sqInt aClassOop) NoDbgRegParms; @@ -912,7 +913,6 @@ sqInt fetchClassOf(sqInt oop); sqInt fetchLong32ofObject(sqInt fieldIndex, sqInt oop); sqInt fetchPointerofObject(sqInt fieldIndex, sqInt oop); -static sqInt fetchWordLengthOf(sqInt objectPointer) NoDbgRegParms; static void finalizeReference(usqInt oop) NoDbgRegParms; sqInt firstByteFormat(void); sqInt firstCompiledMethodFormat(void); @@ -925,6 +925,7 @@ static sqInt followForwarded(sqInt objOop) NoDbgRegParms; sqInt formatOfClass(sqInt classPointer); static sqInt fwdBlockValid(sqInt addr) NoDbgRegParms; +static sqInt goodContextSize(sqInt oop) NoDbgRegParms; static sqInt headerWhileForwardingOf(sqInt oop) NoDbgRegParms; sqInt indexablePointersFormat(void); sqInt instanceSizeOf(sqInt classObj); @@ -932,6 +933,7 @@ static sqInt instSpecOfClass(sqInt classPointer) NoDbgRegParms; sqInt integerObjectOf(sqInt value); sqInt integerValueOf(sqInt objectPointer); +sqInt isArrayNonImm(sqInt oop); sqInt isArray(sqInt oop); sqInt isBytes(sqInt oop); sqInt isCharacterObject(sqInt oop); @@ -972,6 +974,8 @@ sqInt maybeSplObj(sqInt index); sqInt nilObject(void); sqInt noShiftCompactClassIndexOfHeader(sqInt header); +sqInt numBytesOf(sqInt objOop); +sqInt numSlotsOf(sqInt obj); sqInt objectBefore(sqInt address); sqInt objectExactlyBefore(sqInt oop); sqInt obsoleteDontUseThisFetchWordofObject(sqInt fieldIndex, sqInt oop); @@ -1200,7 +1204,7 @@ void printStackPages(void); void printStackPagesInUse(void); static void printStackPage(StackPage *page) NoDbgRegParms; -static sqInt printStringOf(sqInt oop) NoDbgRegParms; +static void printStringOf(sqInt oop) NoDbgRegParms; void print(char *s); void pushBool(sqInt trueOrFalse); static sqInt pushedReceiverOrClosureOfFrame(char *theFP) NoDbgRegParms; @@ -2078,7 +2082,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.830"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.841"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -2121,6 +2125,7 @@ #define dispatchFunctionPointer(aFunctionPointer) (aFunctionPointer)() #define flush() fflush(stdout) #define printFloat(f) printf("%g", f) +#define allocatype(numElements, elementType) alloca((numElements)*sizeof(elementType)) #define numElementsIn(anArray) (sizeof(anArray)/sizeof(anArray[0])) @@ -4871,7 +4876,6 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - null; goto l301; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); @@ -4889,7 +4893,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - null; + /* return self */ l301: /* end baseFrameReturn */; goto l300; } @@ -5173,338 +5177,337 @@ ? (longAt(rcvr - BaseHeaderSize)) & AllButTypeMask : longAt(((longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (CompactClasses << ShiftForWord))) + BaseHeaderSize) + ((ccIndex - 1) << ShiftForWord)))); assert(lkupClassTag != (nilObject())); - /* goto commonSend */ - } - - commonSend: - /* commonSend */ - { - CogMethod *cogMethod; - CogMethod *cogMethod1; - sqInt errorCode; - sqInt hash; - sqInt i; - sqInt localPrimIndex; - sqInt methodHeader; - sqInt methodHeader1; - sqInt methodHeader2; - sqInt nArgs; - sqInt numTemps; - sqInt object; - sqInt ok; - sqInt probe; - sqInt rcvr; - char *savedFramePointer; - char *savedStackPointer; - sqInt succeeded; - sqInt switched; - sqInt table; + + commonSend: + /* commonSend */ + { + CogMethod *cogMethod; + CogMethod *cogMethod1; + sqInt errorCode; + sqInt hash; + sqInt i; + sqInt localPrimIndex; + sqInt methodHeader; + sqInt methodHeader1; + sqInt methodHeader2; + sqInt nArgs; + sqInt numTemps; + sqInt object; + sqInt ok; + sqInt probe; + sqInt rcvr; + char *savedFramePointer; + char *savedStackPointer; + sqInt succeeded; + sqInt switched; + sqInt table; - VM_LABEL(0commonSend); - /* begin sendBreakpoint:receiver: */ - sendBreakpointreceiver(firstFixedFieldOfMaybeImmediate(GIV(messageSelector)), lengthOfMaybeImmediate(GIV(messageSelector)), longAtPointer(localSP + (GIV(argumentCount) * BytesPerOop))); - if (recordSendTrace()) { - /* begin recordTrace:thing:source: */ - GIV(traceLog)[GIV(traceLogIndex)] = lkupClassTag; - GIV(traceLog)[GIV(traceLogIndex) + 1] = GIV(messageSelector); - GIV(traceLog)[GIV(traceLogIndex) + 2] = TraceIsFromInterpreter; - GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; - if (printOnTrace()) { - printActivationNameForSelectorstartClass(GIV(messageSelector), lkupClassTag); - /* begin cr */ - printf("\n"); + VM_LABEL(0commonSend); + /* begin sendBreakpoint:receiver: */ + sendBreakpointreceiver(firstFixedFieldOfMaybeImmediate(GIV(messageSelector)), lengthOfMaybeImmediate(GIV(messageSelector)), longAtPointer(localSP + (GIV(argumentCount) * BytesPerOop))); + if (recordSendTrace()) { + /* begin recordTrace:thing:source: */ + GIV(traceLog)[GIV(traceLogIndex)] = lkupClassTag; + GIV(traceLog)[GIV(traceLogIndex) + 1] = GIV(messageSelector); + GIV(traceLog)[GIV(traceLogIndex) + 2] = TraceIsFromInterpreter; + GIV(traceLogIndex) = (GIV(traceLogIndex) + 3) % TraceBufferSize; + if (printOnTrace()) { + printActivationNameForSelectorstartClass(GIV(messageSelector), lkupClassTag); + /* begin cr */ + printf("\n"); + } } - } - /* begin internalFindNewMethod */ - VM_LABEL(0internalFindNewMethod); - /* begin inlineLookupInMethodCacheSel:classTag: */ + /* begin internalFindNewMethod */ + VM_LABEL(0internalFindNewMethod); + /* begin inlineLookupInMethodCacheSel:classTag: */ - /* shift drops two low-order zeros from addresses */ + /* shift drops two low-order zeros from addresses */ - hash = GIV(messageSelector) ^ lkupClassTag; + hash = GIV(messageSelector) ^ lkupClassTag; - /* first probe */ + /* first probe */ - probe = hash & MethodCacheMask; - if (((GIV(methodCache)[probe + MethodCacheSelector]) == GIV(messageSelector)) - && ((GIV(methodCache)[probe + MethodCacheClass]) == lkupClassTag)) { - GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; - primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); - ok = 1; - goto l307; - } + probe = hash & MethodCacheMask; + if (((GIV(methodCache)[probe + MethodCacheSelector]) == GIV(messageSelector)) + && ((GIV(methodCache)[probe + MethodCacheClass]) == lkupClassTag)) { + GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; + primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); + ok = 1; + goto l307; + } - /* second probe */ + /* second probe */ - probe = (((usqInt) hash) >> 1) & MethodCacheMask; - if (((GIV(methodCache)[probe + MethodCacheSelector]) == GIV(messageSelector)) - && ((GIV(methodCache)[probe + MethodCacheClass]) == lkupClassTag)) { - GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; - primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); - ok = 1; - goto l307; - } - probe = (((usqInt) hash) >> 2) & MethodCacheMask; - if (((GIV(methodCache)[probe + MethodCacheSelector]) == GIV(messageSelector)) - && ((GIV(methodCache)[probe + MethodCacheClass]) == lkupClassTag)) { - GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; - primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); - ok = 1; - goto l307; - } - ok = 0; - l307: /* end inlineLookupInMethodCacheSel:classTag: */; - if (ok) { - /* begin ifAppropriateCompileToNativeCode:selector: */ - VM_LABEL(0ifAppropriateCompileToNativeCodeselector); - methodHeader2 = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); - if (isCogMethodReference(methodHeader2)) { + probe = (((usqInt) hash) >> 1) & MethodCacheMask; + if (((GIV(methodCache)[probe + MethodCacheSelector]) == GIV(messageSelector)) + && ((GIV(methodCache)[probe + MethodCacheClass]) == lkupClassTag)) { + GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; + primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); + ok = 1; + goto l307; + } + probe = (((usqInt) hash) >> 2) & MethodCacheMask; + if (((GIV(methodCache)[probe + MethodCacheSelector]) == GIV(messageSelector)) + && ((GIV(methodCache)[probe + MethodCacheClass]) == lkupClassTag)) { + GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; + primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); + ok = 1; + goto l307; + } + ok = 0; + l307: /* end inlineLookupInMethodCacheSel:classTag: */; + if (ok) { + /* begin ifAppropriateCompileToNativeCode:selector: */ + VM_LABEL(0ifAppropriateCompileToNativeCodeselector); + methodHeader2 = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); + if (isCogMethodReference(methodHeader2)) { - /* makeBaseFrame: can create cog methods with nil selectors. */ + /* makeBaseFrame: can create cog methods with nil selectors. */ - cogMethod = ((CogMethod *) methodHeader2); - if (((cogMethod->selector)) == GIV(nilObj)) { - setSelectorOfto(cogMethod, GIV(messageSelector)); + cogMethod = ((CogMethod *) methodHeader2); + if (((cogMethod->selector)) == GIV(nilObj)) { + setSelectorOfto(cogMethod, GIV(messageSelector)); + } } - } - else { - if ((((((sqInt) methodHeader2)) < 0 - ? (((usqInt) methodHeader2) >> 1) & 0xFFFF - : (((usqInt) methodHeader2) >> 10) & 0xFF)) <= maxLiteralCountForCompile) { - cogselector(GIV(newMethod), GIV(messageSelector)); - } else { - maybeFlagMethodAsInterpreted(GIV(newMethod)); + if ((((((sqInt) methodHeader2)) < 0 + ? (((usqInt) methodHeader2) >> 1) & 0xFFFF + : (((usqInt) methodHeader2) >> 10) & 0xFF)) <= maxLiteralCountForCompile) { + cogselector(GIV(newMethod), GIV(messageSelector)); + } + else { + maybeFlagMethodAsInterpreted(GIV(newMethod)); + } } } - } - else { - /* begin externalizeIPandSP */ - assert((((usqInt)localIP)) != (ceReturnToInterpreterPC())); - GIV(instructionPointer) = oopForPointer(localIP); - GIV(stackPointer) = localSP; - GIV(framePointer) = localFP; - - GIV(lkupClass) = lkupClassTag; - lookupMethodInClass(GIV(lkupClass)); - /* begin internalizeIPandSP */ - assert(GIV(instructionPointer) != (ceReturnToInterpreterPC())); - localIP = pointerForOop(GIV(instructionPointer)); - localSP = pointerForOop(GIV(stackPointer)); - localFP = pointerForOop(GIV(framePointer)); - addNewMethodToCache(GIV(lkupClass)); - } - l304: /* end internalFindNewMethod */; - /* begin internalExecuteNewMethod */ - VM_LABEL(0internalExecuteNewMethod); - if (primitiveFunctionPointer != 0) { - if ((((unsigned long) primitiveFunctionPointer)) <= MaxQuickPrimitiveIndex) { - /* begin internalQuickPrimitiveResponse */ - VM_LABEL(0internalQuickPrimitiveResponse); - assert(isPrimitiveFunctionPointerAnIndex()); - localPrimIndex = ((sqInt) primitiveFunctionPointer); - assert((localPrimIndex > 0xFF) - && (localPrimIndex < 520)); - if (localPrimIndex >= 264) { - longAtPointerput(localSP, longAt(((longAtPointer(localSP)) + BaseHeaderSize) + ((localPrimIndex - 264) << ShiftForWord))); + else { + /* begin externalizeIPandSP */ + assert((((usqInt)localIP)) != (ceReturnToInterpreterPC())); + GIV(instructionPointer) = oopForPointer(localIP); + GIV(stackPointer) = localSP; + GIV(framePointer) = localFP; + + GIV(lkupClass) = lkupClassTag; + lookupMethodInClass(GIV(lkupClass)); + /* begin internalizeIPandSP */ + assert(GIV(instructionPointer) != (ceReturnToInterpreterPC())); + localIP = pointerForOop(GIV(instructionPointer)); + localSP = pointerForOop(GIV(stackPointer)); + localFP = pointerForOop(GIV(framePointer)); + addNewMethodToCache(GIV(lkupClass)); + } + l304: /* end internalFindNewMethod */; + /* begin internalExecuteNewMethod */ + VM_LABEL(0internalExecuteNewMethod); + if (primitiveFunctionPointer != 0) { + if ((((unsigned long) primitiveFunctionPointer)) <= MaxQuickPrimitiveIndex) { + /* begin internalQuickPrimitiveResponse */ + VM_LABEL(0internalQuickPrimitiveResponse); + assert(isPrimitiveFunctionPointerAnIndex()); + localPrimIndex = ((sqInt) primitiveFunctionPointer); + assert((localPrimIndex > 0xFF) + && (localPrimIndex < 520)); + if (localPrimIndex >= 264) { + longAtPointerput(localSP, longAt(((longAtPointer(localSP)) + BaseHeaderSize) + ((localPrimIndex - 264) << ShiftForWord))); + 1; + goto l308; + } + if (localPrimIndex == 256) { + 1; + goto l308; + } + if (localPrimIndex == 257) { + longAtPointerput(localSP, GIV(trueObj)); + 1; + goto l308; + } + if (localPrimIndex == 258) { + longAtPointerput(localSP, GIV(falseObj)); + 1; + goto l308; + } + if (localPrimIndex == 259) { + longAtPointerput(localSP, GIV(nilObj)); + 1; + goto l308; + } + longAtPointerput(localSP, (((localPrimIndex - 261) << 1) | 1)); 1; - goto l308; + l308: /* end internalQuickPrimitiveResponse */; + goto l306; } - if (localPrimIndex == 256) { - 1; - goto l308; + /* begin externalizeIPandSP */ + assert((((usqInt)localIP)) != (ceReturnToInterpreterPC())); + GIV(instructionPointer) = oopForPointer(localIP); + GIV(stackPointer) = localSP; + GIV(framePointer) = localFP; + /* begin slowPrimitiveResponse */ + if (recordPrimTrace()) { + /* begin fastLogPrim: */ + GIV(primTraceLog)[GIV(primTraceLogIndex)] = GIV(messageSelector); + primTraceLogIndex(GIV(primTraceLogIndex) + 1); } - if (localPrimIndex == 257) { - longAtPointerput(localSP, GIV(trueObj)); - 1; - goto l308; - } - if (localPrimIndex == 258) { - longAtPointerput(localSP, GIV(falseObj)); - 1; - goto l308; - } - if (localPrimIndex == 259) { - longAtPointerput(localSP, GIV(nilObj)); - 1; - goto l308; - } - longAtPointerput(localSP, (((localPrimIndex - 261) << 1) | 1)); - 1; - l308: /* end internalQuickPrimitiveResponse */; - goto l306; - } - /* begin externalizeIPandSP */ - assert((((usqInt)localIP)) != (ceReturnToInterpreterPC())); - GIV(instructionPointer) = oopForPointer(localIP); - GIV(stackPointer) = localSP; - GIV(framePointer) = localFP; - /* begin slowPrimitiveResponse */ - if (recordPrimTrace()) { - /* begin fastLogPrim: */ - GIV(primTraceLog)[GIV(primTraceLogIndex)] = GIV(messageSelector); - primTraceLogIndex(GIV(primTraceLogIndex) + 1); - } - assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); - nArgs = GIV(argumentCount); - savedStackPointer = GIV(stackPointer); - savedFramePointer = GIV(framePointer); + assert(!(isOopForwarded(stackValue(GIV(argumentCount))))); + nArgs = GIV(argumentCount); + savedStackPointer = GIV(stackPointer); + savedFramePointer = GIV(framePointer); - /* begin initPrimCall */ - GIV(primFailCode) = 0; - dispatchFunctionPointer(primitiveFunctionPointer); - - /* begin maybeFailForLastObjectOverwrite */ - if (checkAllocFiller) { - if (((freeStart()) < GIV(scavengeThreshold)) - && ((longAt(freeStart())) != (freeStart()))) { - GIV(primFailCode) = PrimErrWritePastObject; + /* begin initPrimCall */ + GIV(primFailCode) = 0; + dispatchFunctionPointer(primitiveFunctionPointer); + + /* begin maybeFailForLastObjectOverwrite */ + if (checkAllocFiller) { + if (((freeStart()) < GIV(scavengeThreshold)) + && ((longAt(freeStart())) != (freeStart()))) { + GIV(primFailCode) = PrimErrWritePastObject; + } } - } - if (FailImbalancedPrimitives - && ((!GIV(primFailCode)) - && ((GIV(framePointer) == savedFramePointer) - && (!((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())))))) { + if (FailImbalancedPrimitives + && ((!GIV(primFailCode)) + && ((GIV(framePointer) == savedFramePointer) + && (!((((usqInt)(longAt(GIV(framePointer) + FoxMethod)))) < (startOfMemory())))))) { - /* Don't fail if primitive has done something radical, e.g. perform: */ + /* Don't fail if primitive has done something radical, e.g. perform: */ - if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { - flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); - GIV(stackPointer) = savedStackPointer; - failUnbalancedPrimitive(); + if (GIV(stackPointer) != (savedStackPointer + (nArgs * BytesPerWord))) { + flag("Would be nice to make this a message send of e.g. unbalancedPrimitive to the current process or context"); + GIV(stackPointer) = savedStackPointer; + failUnbalancedPrimitive(); + } } + if (GIV(nextProfileTick) > 0) { + checkProfileTick(GIV(newMethod)); + } + succeeded = !GIV(primFailCode); + if (GIV(instructionPointer) == (ceReturnToInterpreterPC())) { + GIV(instructionPointer) = longAt(GIV(framePointer) + FoxIFSavedIP); + } + /* begin internalizeIPandSP */ + assert(GIV(instructionPointer) != (ceReturnToInterpreterPC())); + localIP = pointerForOop(GIV(instructionPointer)); + localSP = pointerForOop(GIV(stackPointer)); + localFP = pointerForOop(GIV(framePointer)); + if (succeeded) { + returntoExecutive(popStack(), 1); + browserPluginReturnIfNeeded(); + null; + goto l306; + } } - if (GIV(nextProfileTick) > 0) { - checkProfileTick(GIV(newMethod)); + if (methodHasCogMethod(GIV(newMethod))) { + /* begin iframeSavedIP:put: */ + assert(!(isMachineCodeFrame(localFP))); + longAtput(localFP + FoxIFSavedIP, ((sqInt)localIP)); + GIV(instructionPointer) = ceReturnToInterpreterPC(); + /* begin externalizeFPandSP */ + assert((localSP < ((GIV(stackPage)->baseAddress))) + && (localSP > (((GIV(stackPage)->realStackLimit)) - LargeContextSize))); + GIV(stackPointer) = localSP; + GIV(framePointer) = localFP; + activateCoggedNewMethod(1); + /* begin internalizeIPandSP */ + assert(GIV(instructionPointer) != (ceReturnToInterpreterPC())); + localIP = pointerForOop(GIV(instructionPointer)); + localSP = pointerForOop(GIV(stackPointer)); + localFP = pointerForOop(GIV(framePointer)); } - succeeded = !GIV(primFailCode); - if (GIV(instructionPointer) == (ceReturnToInterpreterPC())) { - GIV(instructionPointer) = longAt(GIV(framePointer) + FoxIFSavedIP); - } - /* begin internalizeIPandSP */ - assert(GIV(instructionPointer) != (ceReturnToInterpreterPC())); - localIP = pointerForOop(GIV(instructionPointer)); - localSP = pointerForOop(GIV(stackPointer)); - localFP = pointerForOop(GIV(framePointer)); - if (succeeded) { - returntoExecutive(popStack(), 1); - browserPluginReturnIfNeeded(); - null; - goto l306; - } - } - if (methodHasCogMethod(GIV(newMethod))) { - /* begin iframeSavedIP:put: */ - assert(!(isMachineCodeFrame(localFP))); - longAtput(localFP + FoxIFSavedIP, ((sqInt)localIP)); - GIV(instructionPointer) = ceReturnToInterpreterPC(); - /* begin externalizeFPandSP */ - assert((localSP < ((GIV(stackPage)->baseAddress))) - && (localSP > (((GIV(stackPage)->realStackLimit)) - LargeContextSize))); - GIV(stackPointer) = localSP; - GIV(framePointer) = localFP; - activateCoggedNewMethod(1); - /* begin internalizeIPandSP */ - assert(GIV(instructionPointer) != (ceReturnToInterpreterPC())); - localIP = pointerForOop(GIV(instructionPointer)); - localSP = pointerForOop(GIV(stackPointer)); - localFP = pointerForOop(GIV(framePointer)); - } - else { - /* begin internalActivateNewMethod */ - VM_LABEL(0internalActivateNewMethod); - methodHeader = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); @@ Diff output truncated at 50000 characters. @@

1 0

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

05 Aug '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.841.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.841 Author: eem Time: 4 August 2014, 6:38:10.42 pm UUID: 6b9e05e0-8058-4d62-9349-faff621ab0e6 Ancestors: VMMaker.oscog-eem.840 Spur: Fix two become bugs surfaced when adding/removing inst vars to/from Association, Binding et al. First, the class table must be scanned to ensure there are no forwarders to classes (much cheaper than the full hierarchy walk to follow method dictionaries etc that was done). Second, machine code methods that gain a new reference through become must get added to the youngReferrers. Add a new become effect flag, OldBecameNew that captures this and respond to it in CoInterpreter>>postBecomeAction: by adding all methods to youngReferrers so that on the next scavenge all will be made right. Fix GC of machine code, which must follow forwarders when doign markAndTraceLiteral: and again add to youngReferrers if following gains a new ref. Refactoring of markAndTraceLiteral: into markAndTraceLiteral:in:at: et al required. Fix assert in addFreeSubTree:. General: Support the alternate bytecode set header in all VMs to ease testing of multiple bytecode sets. This means methods with the sign bit set have no primitive field and a larger num literals field, but no more. Fix longPrintOop: (actually printOopShortInner:) for global variable printing in face of new Environments. Cogit: Clean up adding to the youngReferrers by providing CogMethodZone>>ensureInYoungReferrers:. Since there always is room on youngReferrers, nuke roomOnYoungReferrersList, canLinkToYoungClasses and caller code, simplifying ceSend:super:to:numArgs: et al. Fix assert in followForwardedLiteralsIn: Simulator: Fix debugStackPointersFor: for alternate bytecode sets. Add two Sista bytecodes to StackDepthFinder. Define Sista's BytecodeEncoderClassName when defining its bytecode table. =============== Diff against VMMaker.oscog-eem.840 =============== Item was added: + ----- Method: CCodeGenerator>>generateAsAddress:on:indent: (in category 'C translation') ----- + generateAsAddress: msgNode on: aStream indent: level + "Generate the C code for this message onto the given stream." + + self emitCExpression: msgNode args first on: aStream! Item was changed: ----- Method: CCodeGenerator>>initializeCTranslationDictionary (in category 'C translation') ----- initializeCTranslationDictionary "Initialize the dictionary mapping message names to actions for C code generation." | pairs | translationDict := Dictionary new: 200. pairs := #( #& #generateAnd:on:indent: #| #generateOr:on:indent: #and: #generateSequentialAnd:on:indent: #or: #generateSequentialOr:on:indent: #not #generateNot:on:indent: #+ #generatePlus:on:indent: #- #generateMinus:on:indent: #negated #generateNegated:on:indent: #* #generateTimes:on:indent: #/ #generateDivide:on:indent: #// #generateDivide:on:indent: #\\ #generateModulo:on:indent: #<< #generateShiftLeft:on:indent: #>> #generateShiftRight:on:indent: #min: #generateMin:on:indent: #max: #generateMax:on:indent: #between:and: #generateBetweenAnd:on:indent: #bitAnd: #generateBitAnd:on:indent: #bitOr: #generateBitOr:on:indent: #bitXor: #generateBitXor:on:indent: #bitShift: #generateBitShift:on:indent: #signedBitShift: #generateSignedBitShift:on:indent: #bitInvert32 #generateBitInvert32:on:indent: #bitClear: #generateBitClear:on:indent: #truncateTo: #generateTruncateTo:on:indent: #rounded #generateRounded:on:indent: #< #generateLessThan:on:indent: #<= #generateLessThanOrEqual:on:indent: #= #generateEqual:on:indent: #> #generateGreaterThan:on:indent: #>= #generateGreaterThanOrEqual:on:indent: #~= #generateNotEqual:on:indent: #== #generateEqual:on:indent: #~~ #generateNotEqual:on:indent: #isNil #generateIsNil:on:indent: #notNil #generateNotNil:on:indent: #whileTrue: #generateWhileTrue:on:indent: #whileFalse: #generateWhileFalse:on:indent: #whileTrue #generateDoWhileTrue:on:indent: #whileFalse #generateDoWhileFalse:on:indent: #to:do: #generateToDo:on:indent: #to:by:do: #generateToByDo:on:indent: #repeat #generateRepeat:on:indent: #ifTrue: #generateIfTrue:on:indent: #ifFalse: #generateIfFalse:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalse:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrue:on:indent: #ifNotNil: #generateIfNotNil:on:indent: #ifNil: #generateIfNil:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNil:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNil:on:indent: #at: #generateAt:on:indent: #at:put: #generateAtPut:on:indent: #basicAt: #generateAt:on:indent: #basicAt:put: #generateAtPut:on:indent: #integerValueOf: #generateIntegerValueOf:on:indent: #integerObjectOf: #generateIntegerObjectOf:on:indent: #isIntegerObject: #generateIsIntegerObject:on:indent: #cCode: #generateInlineCCode:on:indent: #cCode:inSmalltalk: #generateInlineCCode:on:indent: #cPreprocessorDirective: #generateInlineCPreprocessorDirective:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElse:on:indent: #cppIf:ifTrue: #generateInlineCppIfElse:on:indent: #cCoerce:to: #generateCCoercion:on:indent: #cCoerceSimple:to: #generateCCoercion:on:indent: #addressOf: #generateAddressOf:on:indent: #addressOf:put: #generateAddressOf:on:indent: + #aaAddress:put: #generateAsAddress:on:indent: #signedIntFromLong #generateSignedIntFromLong:on:indent: #signedIntToLong #generateSignedIntToLong:on:indent: #signedIntFromShort #generateSignedIntFromShort:on:indent: #signedIntToShort #generateSignedIntToShort:on:indent: #preIncrement #generatePreIncrement:on:indent: #preDecrement #generatePreDecrement:on:indent: #inline: #generateInlineDirective:on:indent: #asFloat #generateAsFloat:on:indent: #asInteger #generateAsInteger:on:indent: #asUnsignedInteger #generateAsUnsignedInteger:on:indent: #asLong #generateAsLong:on:indent: #asUnsignedLong #generateAsUnsignedLong:on:indent: #asVoidPointer #generateAsVoidPointer:on:indent: #asSymbol #generateAsSymbol:on:indent: #flag: #generateFlag:on:indent: #anyMask: #generateBitAnd:on:indent: #noMask: #generateNoMask:on:indent: #raisedTo: #generateRaisedTo:on:indent: #touch: #generateTouch:on:indent: #bytesPerWord #generateBytesPerWord:on:indent: #baseHeaderSize #generateBaseHeaderSize:on:indent: #sharedCodeNamed:inCase: #generateSharedCodeDirective:on:indent: #perform: #generatePerform:on:indent: #perform:with: #generatePerform:on:indent: #perform:with:with: #generatePerform:on:indent: #perform:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with:with: #generatePerform:on:indent: #value #generateValue:on:indent: #value: #generateValue:on:indent: #value:value: #generateValue:on:indent: #value:value:value: #generateValue:on:indent: #deny: #generateDeny:on:indent: #shouldNotImplement #generateSmalltalkMetaError:on:indent: #shouldBeImplemented #generateSmalltalkMetaError:on:indent: #subclassResponsibility #generateSmalltalkMetaError:on:indent: ). 1 to: pairs size by: 2 do: [:i | translationDict at: (pairs at: i) put: (pairs at: i + 1)]. pairs := #( #ifTrue: #generateIfTrueAsArgument:on:indent: #ifFalse: #generateIfFalseAsArgument:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalseAsArgument:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrueAsArgument:on:indent: #ifNotNil: #generateIfNotNilAsArgument:on:indent: #ifNil: #generateIfNilAsArgument:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNilAsArgument:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNilAsArgument:on:indent: #cCode: #generateInlineCCodeAsArgument:on:indent: #cCode:inSmalltalk: #generateInlineCCodeAsArgument:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElseAsArgument:on:indent: #cppIf:ifTrue: #generateInlineCppIfElseAsArgument:on:indent: #value #generateValueAsArgument:on:indent: #value: #generateValueAsArgument:on:indent: #value:value: #generateValueAsArgument:on:indent: ). asArgumentTranslationDict := Dictionary new: 8. 1 to: pairs size by: 2 do: [:i | asArgumentTranslationDict at: (pairs at: i) put: (pairs at: i + 1)]. ! Item was changed: ----- Method: CoInterpreter>>ceDynamicSuperSend:to:numArgs: (in category 'trampolines') ----- ceDynamicSuperSend: selector to: rcvr numArgs: numArgs "Entry-point for an unlinked dynamic super send in a CogMethod. Smalltalk stack looks like receiver args head sp -> sender return pc If an MNU then defer to handleMNUInMachineCodeTo:... which will dispatch the MNU and may choose to allocate a closed PIC with a fast MNU dispatch for this send. Otherwise attempt to link the send site as efficiently as possible. All link attempts may fail; e.g. because we're out of code memory. Continue execution via either executeMethod or interpretMethodFromMachineCode: depending on whether the target method is cogged or not." <api> <option: #NewspeakVM> + | classTag errSelIdx cogMethod mClassMixin mixinApplication | - | class classTag canLinkCacheTag errSelIdx cogMethod mClassMixin mixinApplication | <inline: false> <var: #cogMethod type: #'CogMethod *'> <var: #newCogMethod type: #'CogMethod *'> "self printExternalHeadFrame" "self printStringOf: selector" cogit assertCStackWellAligned. self assert: (objectMemory addressCouldBeOop: rcvr). self sendBreakpoint: selector receiver: rcvr. mClassMixin := self mMethodClass. mixinApplication := self findApplicationOfTargetMixin: mClassMixin startingAtBehavior: (objectMemory fetchClassOf: rcvr). self assert: (objectMemory lengthOf: mixinApplication) > (InstanceSpecificationIndex + 1). classTag := objectMemory classTagForClass: (self superclassOf: mixinApplication). - class := objectMemory fetchClassOf: rcvr. "what about the read barrier??" - canLinkCacheTag := (objectMemory isYoungObject: class) not or: [cogit canLinkToYoungClasses]. argumentCount := numArgs. (self lookupInMethodCacheSel: selector classTag: classTag) ifTrue:"check for coggability because method is in the cache" [self ifAppropriateCompileToNativeCode: newMethod selector: selector] ifFalse: [(objectMemory isOopForwarded: selector) ifTrue: [^self ceDynamicSuperSend: (self handleForwardedSelectorFaultFor: selector) to: rcvr numArgs: numArgs]. (objectMemory isForwardedClassTag: classTag) ifTrue: [^self ceDynamicSuperSend: selector to: (self handleForwardedSendFaultForReceiver: rcvr stackDelta: 1 "skip return pc") numArgs: numArgs]. messageSelector := selector. (errSelIdx := self lookupMethodNoMNUEtcInClass: (objectMemory classForClassTag: classTag)) ~= 0 ifTrue: [self handleMNU: errSelIdx InMachineCodeTo: rcvr classForMessage: (objectMemory classForClassTag: classTag). self assert: false "NOTREACHED"]]. "Method found and has a cog method. Attempt to link to it." (self maybeMethodHasCogMethod: newMethod) ifTrue: [cogMethod := self cogMethodOf: newMethod. cogMethod selector = objectMemory nilObject ifTrue: [cogit setSelectorOf: cogMethod to: selector] ifFalse: ["Deal with anonymous accessors, e.g. in Newspeak. The cogMethod may not have the correct selector. If not, try and compile a new method with the correct selector." cogMethod selector ~= selector ifTrue: [(cogit cog: newMethod selector: selector) ifNotNil: [:newCogMethod| cogMethod := newCogMethod]]]. + cogMethod selector = selector ifTrue: - (cogMethod selector = selector - and: [canLinkCacheTag]) ifTrue: [cogit linkSendAt: (stackPages longAt: stackPointer) in: (self mframeHomeMethod: framePointer) to: cogMethod offset: cogit dynSuperEntryOffset receiver: rcvr]. instructionPointer := self popStack. self executeNewMethod. self assert: false "NOTREACHED"]. instructionPointer := self popStack. ^self interpretMethodFromMachineCode "NOTREACHED"! Item was changed: ----- Method: CoInterpreter>>ceSend:super:to:numArgs: (in category 'trampolines') ----- ceSend: selector super: superNormalBar to: rcvr numArgs: numArgs "Entry-point for an unlinked send in a CogMethod. Smalltalk stack looks like receiver args head sp -> sender return pc If an MNU then defer to handleMNUInMachineCodeTo:... which will dispatch the MNU and may choose to allocate a closed PIC with a fast MNU dispatch for this send. Otherwise attempt to link the send site as efficiently as possible. All link attempts may fail; e.g. because we're out of code memory. Continue execution via either executeMethod or interpretMethodFromMachineCode: depending on whether the target method is cogged or not." <api> + | classTag errSelIdx cogMethod | - | classTag canLinkCacheTag errSelIdx cogMethod | <inline: false> <var: #cogMethod type: #'CogMethod *'> <var: #newCogMethod type: #'CogMethod *'> "self printExternalHeadFrame" "self printStringOf: selector" cogit assertCStackWellAligned. self assert: (objectMemory addressCouldBeOop: rcvr). self sendBreakpoint: selector receiver: rcvr. superNormalBar = 0 ifTrue: [classTag := objectMemory fetchClassTagOf: rcvr] ifFalse: [classTag := objectMemory classTagForClass: (self superclassOf: (self methodClassOf: (self frameMethodObject: framePointer)))]. - canLinkCacheTag := cogit canLinkToYoungClasses or: [(objectMemory isYoungObject: classTag) not]. argumentCount := numArgs. (self lookupInMethodCacheSel: selector classTag: classTag) ifTrue:"check for coggability because method is in the cache" [self ifAppropriateCompileToNativeCode: newMethod selector: selector] ifFalse: [(objectMemory isOopForwarded: selector) ifTrue: [^self ceSend: (self handleForwardedSelectorFaultFor: selector) super: superNormalBar to: rcvr numArgs: numArgs]. (objectMemory isForwardedClassTag: classTag) ifTrue: [self assert: superNormalBar = 0. ^self ceSend: selector super: superNormalBar to: (self handleForwardedSendFaultForReceiver: rcvr stackDelta: 1 "skip return pc") numArgs: numArgs]. messageSelector := selector. (errSelIdx := self lookupMethodNoMNUEtcInClass: (objectMemory classForClassTag: classTag)) ~= 0 ifTrue: + [(errSelIdx = SelectorDoesNotUnderstand - [(canLinkCacheTag - and: [errSelIdx = SelectorDoesNotUnderstand and: [(cogMethod := cogit cogMNUPICSelector: messageSelector methodOperand: (self mnuMethodOrNilFor: rcvr) numArgs: argumentCount) asUnsignedInteger + > cogit minCogMethodAddress]) ifTrue: - > cogit minCogMethodAddress]]) ifTrue: [cogit linkSendAt: (stackPages longAt: stackPointer) in: (self mframeHomeMethod: framePointer) to: cogMethod offset: (superNormalBar = 0 ifTrue: [cogit entryOffset] ifFalse: [cogit noCheckEntryOffset]) receiver: rcvr]. self handleMNU: errSelIdx InMachineCodeTo: rcvr classForMessage: (objectMemory classForClassTag: classTag). self assert: false "NOTREACHED"]]. "Method found and has a cog method. Attempt to link to it. The receiver's class may be young. If the Cogit can't store young classes in inline caches we can link to an open PIC instead." (self maybeMethodHasCogMethod: newMethod) ifTrue: [cogMethod := self cogMethodOf: newMethod. cogMethod selector = objectMemory nilObject ifTrue: [cogit setSelectorOf: cogMethod to: selector] ifFalse: ["Deal with anonymous accessors, e.g. in Newspeak. The cogMethod may not have the correct selector. If not, try and compile a new method with the correct selector." cogMethod selector ~= selector ifTrue: [(cogit cog: newMethod selector: selector) ifNotNil: [:newCogMethod| cogMethod := newCogMethod]]]. + cogMethod selector = selector - (cogMethod selector = selector - and: [canLinkCacheTag]) ifTrue: [cogit linkSendAt: (stackPages longAt: stackPointer) in: (self mframeHomeMethod: framePointer) to: cogMethod offset: (superNormalBar = 0 ifTrue: [cogit entryOffset] ifFalse: [cogit noCheckEntryOffset]) receiver: rcvr] ifFalse: "If patchToOpenPICFor:.. returns we're out of code memory" [cogit patchToOpenPICFor: selector numArgs: numArgs receiver: rcvr]. instructionPointer := self popStack. self executeNewMethod. self assert: false "NOTREACHED"]. instructionPointer := self popStack. ^self interpretMethodFromMachineCode "NOTREACHED"! Item was changed: ----- Method: CoInterpreter>>postBecomeAction: (in category 'object memory support') ----- postBecomeAction: theBecomeEffectsFlags "Clear the gcMode var and let the Cogit do its post GC checks." super postBecomeAction: theBecomeEffectsFlags. + (objectMemory hasSpurMemoryManagerAPI + and: [theBecomeEffectsFlags anyMask: OldBecameNewFlag]) ifTrue: + [cogit addAllToYoungReferrers]. cogit cogitPostGCAction: gcMode. lastCoggableInterpretedBlockMethod := lastUncoggableInterpretedBlockMethod := nil. gcMode := 0! Item was added: + ----- Method: CogMethodZone>>addAllToYoungReferrers (in category 'young referers') ----- + addAllToYoungReferrers + <api> + <returnTypeC: #void> + | cogMethod | + <var: #cogMethod type: #'CogMethod *'> + cogMethod := coInterpreter cCoerceSimple: baseAddress to: #'CogMethod *'. + [cogMethod < self limitZony] whileTrue: + [(cogMethod cmType = CMMethod + or: [cogMethod cmType = CMOpenPIC]) ifTrue: + [self ensureInYoungReferrers: cogMethod]. + cogMethod := self methodAfter: cogMethod]! Item was changed: ----- Method: CogMethodZone>>addToYoungReferrers: (in category 'young referers') ----- addToYoungReferrers: cogMethod <var: #cogMethod type: #'CogMethod *'> self assert: youngReferrers <= limitAddress. self assert: (self occurrencesInYoungReferrers: cogMethod) = 0. self assert: cogMethod cmRefersToYoung. + self assert: (youngReferrers <= limitAddress + and: [youngReferrers >= (limitAddress - (methodCount * BytesPerWord))]). + (self asserta: limitAddress - (methodCount * BytesPerWord) >= mzFreeStart) ifFalse: - (self asserta: self roomOnYoungReferrersList) ifFalse: [self error: 'no room on youngReferrers list']. youngReferrers := youngReferrers - BytesPerWord. objectMemory longAt: youngReferrers put: cogMethod asUnsignedInteger! Item was changed: ----- Method: CogMethodZone>>allocate: (in category 'allocating') ----- allocate: numBytes | roundedBytes allocation | roundedBytes := numBytes + 7 bitAnd: -8. mzFreeStart + roundedBytes >= (limitAddress - (methodCount * BytesPerWord)) ifTrue: [^0]. allocation := mzFreeStart. mzFreeStart := mzFreeStart + roundedBytes. methodCount := methodCount + 1. - self assert: self roomOnYoungReferrersList. self cCode: '' inSmalltalk: [(cogit breakPC isInteger and: [cogit breakPC between: allocation and: mzFreeStart]) ifTrue: [cogit singleStep: true]]. ^allocation! Item was added: + ----- Method: CogMethodZone>>ensureInYoungReferrers: (in category 'young referers') ----- + ensureInYoungReferrers: cogMethod + <var: #cogMethod type: #'CogMethod *'> + cogMethod cmRefersToYoung ifFalse: + [self assert: (self occurrencesInYoungReferrers: cogMethod) = 0. + cogMethod cmRefersToYoung: true. + self addToYoungReferrers: cogMethod]! Item was removed: - ----- Method: CogMethodZone>>roomOnYoungReferrersList (in category 'young referers') ----- - roomOnYoungReferrersList - "The youngReferrers list holds methods that may contain a reference to a young - object and hence need to be visited during young-space garbage collection. The - list saves walking through all of code space to do so, as in typical circumstances - there are no methods that refer to young objects.However, events like become: - can potentially cause every method to refer to a new object (becomming true for - example). So there needs to be room on the list for as many methods as exist." - self assert: (youngReferrers <= limitAddress - and: [youngReferrers >= (limitAddress - (methodCount * BytesPerWord))]). - ^limitAddress - (methodCount * BytesPerWord) >= mzFreeStart! Item was removed: - ----- Method: CogObjectRepresentation>>canLinkToYoungClasses (in category 'in-line cacheing') ----- - canLinkToYoungClasses - ^self subclassResponsibility! Item was added: + ----- Method: CogObjectRepresentation>>markAndTraceCacheTagLiteral:in:atpc: (in category 'garbage collection') ----- + markAndTraceCacheTagLiteral: literal in: cogMethodOrNil atpc: address + "Mark and trace a literal in an inline cache preceeding address in cogMethodOrNil. + Answer if code was modified." + <var: #cogMethodOrNil type: #'CogMethod *'> + <var: #address type: #usqInt> + self subclassResponsibility! Item was added: + ----- Method: CogObjectRepresentation>>markAndTraceLiteral:in:at: (in category 'garbage collection') ----- + markAndTraceLiteral: literal in: cogMethod at: address + "Mark and trace a literal in a sqInt variable of cogMethod." + <var: #cogMethod type: #'CogMethod *'> + <var: #address type: #'sqInt *'> + self subclassResponsibility! Item was added: + ----- Method: CogObjectRepresentation>>markAndTraceLiteral:in:atpc: (in category 'garbage collection') ----- + markAndTraceLiteral: literal in: cogMethodOrNil atpc: address + "Mark and trace a literal in a machine code instruction preceeding address in cogMethodOrNil. + Answer if code was modified." + <var: #cogMethodOrNil type: #'CogMethod *'> + <var: #address type: #usqInt> + self subclassResponsibility! Item was removed: - ----- Method: CogObjectRepresentationForSpur>>canLinkToYoungClasses (in category 'in-line cacheing') ----- - canLinkToYoungClasses - <api> - <cmacro: '() true'> - ^true! Item was added: + ----- Method: CogObjectRepresentationForSpur>>markAndTraceCacheTagLiteral:in:atpc: (in category 'garbage collection') ----- + markAndTraceCacheTagLiteral: literal in: cogMethodOrNil atpc: address + "Mark and trace a literal in an inline cache preceeding address in cogMethodOrNil. + Answer if code was modified." + <var: #cogMethodOrNil type: #'CogMethod *'> + <var: #address type: #usqInt> + | objOop | + (self couldBeObject: literal) ifFalse: + [^false]. + self assert: (objectMemory addressCouldBeObj: literal). + (objectMemory isForwarded: literal) ifFalse: + [objectMemory markAndTrace: literal. + ^false]. + objOop := objectMemory followForwarded: literal. + cogit backEnd rewriteInlineCacheTag: objOop at: address. + self markAndTraceUpdatedLiteral: objOop in: cogMethodOrNil. + ^true! Item was added: + ----- Method: CogObjectRepresentationForSpur>>markAndTraceLiteral:in:at: (in category 'garbage collection') ----- + markAndTraceLiteral: literal in: cogMethod at: address + "Mark and trace a literal in a sqInt variable of cogMethod." + <var: #cogMethod type: #'CogMethod *'> + <var: #address type: #'sqInt *'> + | objOop | + (self couldBeObject: literal) ifFalse: + [^self]. + self assert: (objectMemory addressCouldBeObj: literal). + (objectMemory isForwarded: literal) ifFalse: + [objectMemory markAndTrace: literal. + ^self]. + objOop := objectMemory followForwarded: literal. + address at: 0 put: objOop. + self markAndTraceUpdatedLiteral: objOop in: cogMethod! Item was added: + ----- Method: CogObjectRepresentationForSpur>>markAndTraceLiteral:in:atpc: (in category 'garbage collection') ----- + markAndTraceLiteral: literal in: cogMethodOrNil atpc: address + "Mark and trace a literal in a machine code instruction preceeding address in cogMethodOrNil. + Answer if code was modified." + <var: #cogMethodOrNil type: #'CogMethod *'> + <var: #address type: #usqInt> + | objOop | + (self couldBeObject: literal) ifFalse: + [^false]. + self assert: (objectMemory addressCouldBeObj: literal). + (objectMemory isForwarded: literal) ifFalse: + [objectMemory markAndTrace: literal. + ^false]. + objOop := objectMemory followForwarded: literal. + cogit backEnd storeLiteral: objOop beforeFollowingAddress: address. + self markAndTraceUpdatedLiteral: objOop in: cogMethodOrNil. + ^true! Item was added: + ----- Method: CogObjectRepresentationForSpur>>markAndTraceUpdatedLiteral:in: (in category 'garbage collection') ----- + markAndTraceUpdatedLiteral: objOop in: cogMethodOrNil + "Common code to mark a literal in cogMethod and add + the cogMethod to youngReferrers if the literal is young." + <var: #cogMethodOrNil type: #'CogMethod *'> + (objectMemory isNonImmediate: objOop) ifTrue: + [(cogMethodOrNil notNil + and: [objectMemory isYoungObject: objOop]) ifTrue: + [methodZone ensureInYoungReferrers: cogMethodOrNil]. + objectMemory markAndTrace: objOop]! Item was removed: - ----- Method: CogObjectRepresentationForSqueakV3>>canLinkToYoungClasses (in category 'in-line cacheing') ----- - canLinkToYoungClasses - <api> - ^methodZone roomOnYoungReferrersList! Item was added: + ----- Method: CogObjectRepresentationForSqueakV3>>markAndTraceCacheTagLiteral:in:atpc: (in category 'garbage collection') ----- + markAndTraceCacheTagLiteral: literal in: cogMethodOrNil atpc: address + "Mark and trace a literal in an inline cache preceeding address in cogMethodOrNil. + Answer if code was modified." + <var: #cogMethodOrNil type: #'CogMethod *'> + <var: #address type: #usqInt> + <inline: true> + self markAndTraceLiteral: literal. + ^false! Item was added: + ----- Method: CogObjectRepresentationForSqueakV3>>markAndTraceLiteral:in:at: (in category 'garbage collection') ----- + markAndTraceLiteral: literal in: cogMethod at: address + "Mark and trace a literal in a sqInt variable of cogMethod." + <var: #cogMethod type: #'CogMethod *'> + <var: #address type: #'sqInt *'> + <inline: true> + self markAndTraceLiteral: literal! Item was added: + ----- Method: CogObjectRepresentationForSqueakV3>>markAndTraceLiteral:in:atpc: (in category 'garbage collection') ----- + markAndTraceLiteral: literal in: cogMethodOrNil atpc: address + "Mark and trace a literal in a machine code instruction preceeding address in cogMethodOrNil. + Answer if code was modified." + <var: #cogMethodOrNil type: #'CogMethod *'> + <var: #address type: #usqInt> + <inline: true> + self markAndTraceLiteral: literal. + ^false! Item was changed: ----- Method: CogVMSimulator>>shortPrint: (in category 'debug support') ----- shortPrint: oop | name classOop | (objectMemory isImmediate: oop) ifTrue: [(objectMemory isImmediateCharacter: oop) ifTrue: [^(objectMemory characterValueOf: oop) < 256 ifTrue: ['=$' , (objectMemory characterValueOf: oop) printString , ' (' , (String with: (Character value: (objectMemory characterValueOf: oop))) , ')'] ifFalse: ['=$' , (objectMemory characterValueOf: oop) printString, '(???)']]. (objectMemory isIntegerObject: oop) ifTrue: [^ '=' , (objectMemory integerValueOf: oop) printString , ' (' , (objectMemory integerValueOf: oop) hex , ')']. ^'= UNKNOWN IMMEDIATE', ' (' , (objectMemory integerValueOf: oop) hex , ')']. (objectMemory addressCouldBeObj: oop) ifFalse: [^(oop bitAnd: objectMemory allocationUnit - 1) ~= 0 ifTrue: [' is misaligned'] ifFalse: [self whereIs: oop]]. (objectMemory isFreeObject: oop) ifTrue: [^' is a free chunk of size ', (objectMemory sizeOfFree: oop) printString]. (objectMemory isForwarded: oop) ifTrue: [^' is a forwarded object to ', (objectMemory followForwarded: oop) hex, ' of slot size ', (objectMemory numSlotsOfAny: oop) printString]. classOop := objectMemory fetchClassOfNonImm: oop. (objectMemory numSlotsOf: classOop) = metaclassNumSlots ifTrue: [^'class ' , (self nameOfClass: oop)]. name := self nameOfClass: classOop. name size = 0 ifTrue: [name := '??']. name = 'String' ifTrue: [^ (self stringOf: oop) printString]. name = 'ByteString' ifTrue: [^ (self stringOf: oop) printString]. name = 'Symbol' ifTrue: [^ '#' , (self stringOf: oop)]. name = 'ByteSymbol' ifTrue: [^ '#' , (self stringOf: oop)]. name = 'Character' ifTrue: "SpurMemoryManager has immediate Characters; ObjectMemory does not" [^ '=' , (Character value: (objectMemory integerValueOf: (objectMemory fetchPointer: 0 ofObject: oop))) printString]. name = 'UndefinedObject' ifTrue: [^ 'nil']. name = 'False' ifTrue: [^ 'false']. name = 'True' ifTrue: [^ 'true']. name = 'Float' ifTrue: [^ '=' , (self dbgFloatValueOf: oop) printString]. + "Try to spot association-like things; they're all subclasses of LookupKey" + ((objectMemory isPointersNonImm: oop) + and: [((objectMemory instanceSizeOf: classOop) between: ValueIndex + 1 and: ValueIndex + 2) + and: [(objectMemory isBytes: (objectMemory fetchPointer: KeyIndex ofObject: oop))]]) ifTrue: + [| classLookupKey | + classLookupKey := objectMemory fetchClassOfNonImm: (objectMemory splObj: SchedulerAssociation). + [classLookupKey = objectMemory nilObject ifTrue: + [^(('AEIOU' includes: name first) ifTrue: ['an '] ifFalse: ['a ']), name]. + (objectMemory instanceSizeOf: classLookupKey) = (KeyIndex + 1)] whileFalse: + [classLookupKey := self superclassOf: classLookupKey]. + (self includesBehavior: classOop ThatOf: classLookupKey) ifTrue: + [^(('AEIOU' includes: name first) ifTrue: ['an '] ifFalse: ['a ']), name, + ' ', (self shortPrint: (objectMemory fetchPointer: KeyIndex ofObject: oop)), + ' -> ', + (objectMemory fetchPointer: ValueIndex ofObject: oop) hex8]]. - (#('Association' 'ReadOnlyVariableBinding' 'VariableBinding') includes: name) ifTrue: - [^ '(' , - (self shortPrint: (self longAt: oop + BaseHeaderSize)) , - ' -> ' , - (self longAt: oop + BaseHeaderSize + BytesPerWord) hex8 , ')']. ^(('AEIOU' includes: name first) ifTrue: ['an '] ifFalse: ['a ']), name! Item was added: + ----- Method: Cogit>>addAllToYoungReferrers (in category 'jit - api') ----- + addAllToYoungReferrers + <doNotGenerate> + methodZone addAllToYoungReferrers! Item was removed: - ----- Method: Cogit>>canLinkToYoungClasses (in category 'jit - api') ----- - canLinkToYoungClasses - <doNotGenerate> - ^objectRepresentation canLinkToYoungClasses! Item was changed: ----- Method: Cogit>>ceImplicitReceiverFor:receiver: (in category 'in-line cacheing') ----- ceImplicitReceiverFor: selector receiver: receiver "Cached implicit receiver implementation. Caller looks like mov selector, ClassReg call ceImplicitReceiver br continue Lclass .word Lmixin: .word continue: The trampoline has already fetched the class and probed the cache and found that the cache missed. Compute the implicit receiver for the receiver's class and reload the class tag. If either the class tag or the mixin are young then the method needs to be added to the youngReferrers list to ensure correct GC." <option: #SqueakV3ObjectMemory> | rcvrClass retpc classpc mixinpc mixin cogMethod | <var: #cogMethod type: #'CogMethod *'> retpc := coInterpreter stackTop. classpc := retpc + backEnd jumpShortByteSize. mixinpc := retpc + backEnd jumpShortByteSize + BytesPerOop. mixin := coInterpreter implicitReceiverFor: receiver mixin: coInterpreter mMethodClass implementing: selector. rcvrClass := objectMemory fetchClassOf: receiver. cogMethod := coInterpreter mframeHomeMethodExport. cogMethod cmRefersToYoung ifFalse: [((objectRepresentation inlineCacheTagsMayBeObjects and: [objectMemory isYoung: rcvrClass]) or: [mixin ~= receiver and: [objectMemory isYoung: mixin]]) ifTrue: + [methodZone ensureInYoungReferrers: cogMethod]]. - [methodZone roomOnYoungReferrersList ifFalse: - [coInterpreter callForCogCompiledCodeCompaction. - ^mixin]. - cogMethod cmRefersToYoung: true. - methodZone addToYoungReferrers: cogMethod]]. backEnd unalignedLongAt: classpc put: (objectRepresentation inlineCacheTagForClass: rcvrClass); unalignedLongAt: mixinpc put: (mixin = receiver ifTrue: [0] ifFalse: [mixin]). ^mixin! Item was changed: ----- Method: Cogit>>ceImplicitReceiverFor:receiver:cache: (in category 'in-line cacheing') ----- ceImplicitReceiverFor: selector receiver: receiver cache: cacheAddress "Cached implicit receiver implementation. Caller looks like mov Lclass, Arg1Reg mov selector, SendNumArgsReg call ceImplicitReceiver and Lclass: .word; Lmixin: .word is somewhere on the heap. The trampoline has already fetched the class and probed the cache and found that the cache missed. Compute the implicit receiver for the receiver's class and reload the class tag. If either the class tag or the mixin are young then the method needs to be added to the youngReferrers list to ensure correct GC." <option: #SpurMemoryManager> <var: #cacheAddress type: #usqInt> | rcvrClass mixin cogMethod | <var: #cogMethod type: #'CogMethod *'> mixin := coInterpreter implicitReceiverFor: receiver mixin: coInterpreter mMethodClass implementing: selector. rcvrClass := objectMemory fetchClassOf: receiver. cogMethod := coInterpreter mframeHomeMethodExport. cogMethod cmRefersToYoung ifFalse: [((objectRepresentation inlineCacheTagsMayBeObjects and: [objectMemory isYoung: rcvrClass]) or: [mixin ~= receiver and: [objectMemory isYoung: mixin]]) ifTrue: + [methodZone ensureInYoungReferrers: cogMethod]]. - [methodZone roomOnYoungReferrersList ifFalse: - [coInterpreter callForCogCompiledCodeCompaction. - ^mixin]. - cogMethod cmRefersToYoung: true. - methodZone addToYoungReferrers: cogMethod]]. backEnd unalignedLongAt: cacheAddress put: (objectRepresentation inlineCacheTagForClass: rcvrClass); unalignedLongAt: cacheAddress + BytesPerOop put: (mixin = receiver ifTrue: [0] ifFalse: [mixin]). ^mixin! Item was changed: ----- Method: Cogit>>followForwardedLiteralsIn: (in category 'garbage collection') ----- followForwardedLiteralsIn: cogMethod <api> <option: #SpurObjectMemory> <var: #cogMethod type: #'CogMethod *'> + self assert: (objectMemory isForwarded: cogMethod methodObject) not. - self assert: (objectMemory shouldRemapOop: cogMethod methodObject) not. (objectMemory shouldRemapOop: cogMethod selector) ifTrue: + [cogMethod selector: (objectMemory remapObj: cogMethod selector). + (objectMemory isYoung: cogMethod selector) ifTrue: + [methodZone ensureInYoungReferrers: cogMethod]]. - [cogMethod selector: (objectMemory remapObj: cogMethod selector)]. self mapFor: cogMethod performUntil: #remapIfObjectRef:pc:hasYoung: arg: 0! Item was changed: ----- Method: Cogit>>followForwardedMethods (in category 'garbage collection') ----- followForwardedMethods <api> <option: #SpurObjectMemory> <var: #cogMethod type: #'CogMethod *'> | cogMethod freedPIC | <var: #cogMethod type: #'CogMethod *'> freedPIC := false. cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'. [cogMethod < methodZone limitZony] whileTrue: [cogMethod cmType = CMMethod ifTrue: [(objectMemory isForwarded: cogMethod methodObject) ifTrue: [cogMethod methodObject: (objectMemory followForwarded: cogMethod methodObject). + (objectMemory isYoungObject: cogMethod methodObject) ifTrue: + [methodZone ensureInYoungReferrers: cogMethod]]]. - (cogMethod cmRefersToYoung not - and: [objectMemory isYoungObject: cogMethod methodObject]) ifTrue: - [methodZone addToYoungReferrers: cogMethod]]]. cogMethod cmType = CMClosedPIC ifTrue: [(self followMethodReferencesInClosedPIC: cogMethod) ifTrue: [freedPIC := true. methodZone freeMethod: cogMethod]]. cogMethod := methodZone methodAfter: cogMethod]. freedPIC ifTrue: [self unlinkSendsToFree. methodZone pruneYoungReferrers. processor flushICacheFrom: codeBase to: methodZone limitZony asInteger]! Item was changed: ----- Method: Cogit>>linkSendAt:in:to:offset:receiver: (in category 'in-line cacheing') ----- linkSendAt: callSiteReturnAddress in: sendingMethod to: targetMethod offset: theEntryOffset receiver: receiver <api> <var: #sendingMethod type: #'CogMethod *'> <var: #targetMethod type: #'CogMethod *'> | inlineCacheTag address extent | self cppIf: NewspeakVM ifTrue: [self assert: (theEntryOffset = cmEntryOffset or: [theEntryOffset = cmNoCheckEntryOffset or: [theEntryOffset = cmDynSuperEntryOffset]])] ifFalse: [self assert: (theEntryOffset = cmEntryOffset or: [theEntryOffset = cmNoCheckEntryOffset])]. self assert: (callSiteReturnAddress between: methodZoneBase and: methodZone freeStart). inlineCacheTag := theEntryOffset = cmNoCheckEntryOffset ifTrue: [targetMethod selector "i.e. no change"] ifFalse: [objectRepresentation inlineCacheTagForInstance: receiver]. + (objectRepresentation inlineCacheTagIsYoung: inlineCacheTag) ifTrue: + [methodZone ensureInYoungReferrers: sendingMethod]. - (sendingMethod cmRefersToYoung not - and: [(objectRepresentation inlineCacheTagIsYoung: inlineCacheTag)]) ifTrue: - [self assert: (methodZone occurrencesInYoungReferrers: sendingMethod) = 0. - sendingMethod cmRefersToYoung: true. - methodZone addToYoungReferrers: sendingMethod]. address := targetMethod asInteger + theEntryOffset. extent := backEnd rewriteInlineCacheAt: callSiteReturnAddress tag: inlineCacheTag target: address. processor flushICacheFrom: callSiteReturnAddress - 1 - extent to: callSiteReturnAddress - 1! Item was changed: ----- Method: Cogit>>mapObjectReferencesInMachineCodeForBecome (in category 'garbage collection') ----- mapObjectReferencesInMachineCodeForBecome "Update all references to objects in machine code for a become. Unlike incrementalGC or fullGC a method that does not refer to young may refer to young as a result of the become operation. Unlike incrementalGC or fullGC the reference from a Cog method to its methodObject *must not* change since the two are two halves of the same object." | cogMethod hasYoungObj hasYoungObjPtr freedPIC | <var: #cogMethod type: #'CogMethod *'> hasYoungObj := false. hasYoungObjPtr := (self addressOf: hasYoungObj put: [:val| hasYoungObj := val]) asInteger. codeModified := freedPIC := false. self mapObjectReferencesInGeneratedRuntime. cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'. [cogMethod < methodZone limitZony] whileTrue: [self assert: hasYoungObj not. cogMethod cmType ~= CMFree ifTrue: [self assert: (self cogMethodDoesntLookKosher: cogMethod) = 0. cogMethod selector: (objectRepresentation remapOop: cogMethod selector). cogMethod cmType = CMClosedPIC ifTrue: [((objectMemory isYoung: cogMethod selector) or: [self mapObjectReferencesInClosedPIC: cogMethod]) ifTrue: [freedPIC := true. methodZone freeMethod: cogMethod]] ifFalse: [(objectMemory isYoung: cogMethod selector) ifTrue: [hasYoungObj := true]. cogMethod cmType = CMMethod ifTrue: [| remappedMethod | self assert: cogMethod objectHeader = objectMemory nullHeaderForMachineCodeMethod. remappedMethod := objectRepresentation remapOop: cogMethod methodObject. remappedMethod ~= cogMethod methodObject ifTrue: [(coInterpreter methodHasCogMethod: remappedMethod) ifTrue: [self error: 'attempt to become two cogged methods']. (objectMemory withoutForwardingOn: cogMethod methodObject and: remappedMethod with: cogMethod cmUsesPenultimateLit sendToCogit: #method:hasSameCodeAs:checkPenultimate:) ifFalse: [self error: 'attempt to become cogged method into different method']. "For non-Newspeak there should ne a one-to-one mapping between bytecoded and cog methods. For Newspeak not necessarily, but only for anonymous accessors." "Only reset the method object's header if it is referring to this CogMethod." (coInterpreter rawHeaderOf: cogMethod methodObject) = cogMethod asInteger ifTrue: [coInterpreter rawHeaderOf: cogMethod methodObject put: cogMethod methodHeader. cogMethod methodHeader: (coInterpreter rawHeaderOf: remappedMethod); methodObject: remappedMethod. coInterpreter rawHeaderOf: remappedMethod put: cogMethod asInteger] ifFalse: + [self assert: (self noAssertMethodClassAssociationOf: cogMethod methodObject) - [ self assert: (self noAssertMethodClassAssociationOf: cogMethod methodObject) = objectMemory nilObject. cogMethod methodHeader: (coInterpreter rawHeaderOf: remappedMethod); methodObject: remappedMethod]]. (objectMemory isYoung: cogMethod methodObject) ifTrue: [hasYoungObj := true]]. self mapFor: cogMethod performUntil: #remapIfObjectRef:pc:hasYoung: arg: hasYoungObjPtr. hasYoungObj ifTrue: + [methodZone ensureInYoungReferrers: cogMethod. - [cogMethod cmRefersToYoung ifFalse: - [cogMethod cmRefersToYoung: true. - methodZone addToYoungReferrers: cogMethod]. hasYoungObj := false] + ifFalse: + [cogMethod cmRefersToYoung: false]]]. - ifFalse: [cogMethod cmRefersToYoung: false]]]. cogMethod := methodZone methodAfter: cogMethod]. methodZone pruneYoungReferrers. freedPIC ifTrue: [self unlinkSendsToFree. codeModified := true]. codeModified ifTrue: "After updating oops in inline caches we need to flush the icache." [processor flushICacheFrom: codeBase to: methodZone limitZony asInteger]! Item was changed: ----- Method: Cogit>>markAndTraceLiteralsIn: (in category 'garbage collection') ----- markAndTraceLiteralsIn: cogMethod <option: #SpurMemoryManager> "Unlink sends that have unmarked classes in inline caches or freed/freeable targets. Nil-out inline caches linked to open PICs. Assert that any selectors are marked. We can do this since this is only run on marked methods and thus any selectors they reference should already be marked." <var: #cogMethod type: #'CogMethod *'> <inline: true> self assert: ((cogMethod cmType = CMMethod and: [objectMemory isMarked: cogMethod methodObject]) or: [cogMethod cmType = CMOpenPIC and: [(objectMemory isImmediate: cogMethod selector) or: [objectMemory isMarked: cogMethod selector]]]). + objectRepresentation + markAndTraceLiteral: cogMethod selector + in: cogMethod + at: (self addressOf: cogMethod selector put: [:val| cogMethod selector: val]). - objectRepresentation markAndTraceLiteral: cogMethod selector. self maybeMarkCountersIn: cogMethod. self maybeMarkIRCsIn: cogMethod. self mapFor: cogMethod performUntil: #markLiterals:pc:method: arg: cogMethod asInteger! Item was changed: ----- Method: Cogit>>markAndTraceObjectReferencesInGeneratedRuntime (in category 'jit - api') ----- markAndTraceObjectReferencesInGeneratedRuntime "Mark and trace any object references in the generated run-time." 0 to: runtimeObjectRefIndex - 1 do: [:i| | mcpc literal | mcpc := objectReferencesInRuntime at: i. + literal := backEnd literalBeforeFollowingAddress: mcpc asUnsignedInteger. + objectRepresentation + markAndTraceLiteral: literal + in: (self cCoerceSimple: nil to: #'CogMethod *') + atpc: mcpc asUnsignedInteger]! - literal := backEnd literalBeforeFollowingAddress: mcpc asInteger. - objectRepresentation markAndTraceLiteral: literal]! Item was changed: ----- Method: Cogit>>markLiterals:pc:method: (in category 'garbage collection') ----- markLiterals: annotation pc: mcpc method: cogMethod "Mark and trace literals. Additionally in Newspeak, void push implicits that have unmarked classes." <var: #mcpc type: #'char *'> | literal | annotation = IsObjectReference ifTrue: + [literal := backEnd literalBeforeFollowingAddress: mcpc asUnsignedInteger. + (objectRepresentation + markAndTraceLiteral: literal + in: (self cCoerceSimple: cogMethod to: #'CogMethod *') + atpc: mcpc asUnsignedInteger) ifTrue: + [codeModified := true]]. - [literal := backEnd literalBeforeFollowingAddress: mcpc asInteger. - objectRepresentation markAndTraceLiteral: literal]. (self isSendAnnotation: annotation) ifTrue: [self offsetCacheTagAndCouldBeObjectAt: mcpc annotation: annotation into: [:entryPoint :cacheTag :tagCouldBeObj | tagCouldBeObj ifTrue: + [(objectRepresentation + markAndTraceCacheTagLiteral: cacheTag + in: (self cCoerceSimple: cogMethod to: #'CogMethod *') + atpc: mcpc asUnsignedInteger) ifTrue: + [codeModified := true]]. "cacheTag is selector" - [objectRepresentation markAndTraceLiteral: cacheTag]. "cacheTag is selector" self cppIf: NewspeakVM ifTrue: [entryPoint = ceImplicitReceiverTrampoline ifTrue: [| cacheAddress class mixin | self assert: NumOopsPerIRC = 2. cacheAddress := self implicitReceiverCacheAddressAt: mcpc. + (class := backEnd unalignedLongAt: cacheAddress) ~= 0 - class := backEnd unalignedLongAt: cacheAddress. - class ~= 0 ifTrue: [(objectRepresentation cacheTagIsMarked: class) ifTrue: [(mixin := backEnd unalignedLongAt: cacheAddress + BytesPerOop) ~= 0 ifTrue: + [objectRepresentation + markAndTraceLiteral: mixin + in: (self cCoerceSimple: cogMethod to: #'CogMethod *') + at: (self asAddress: cacheAddress + BytesPerOop + put: [:val| backEnd unalignedLongAt: cacheAddress + BytesPerOop put: val])]] - [objectRepresentation markAndTraceLiteral: mixin]] ifFalse: [backEnd unalignedLongAt: cacheAddress put: 0; unalignedLongAt: cacheAddress + BytesPerOop put: 0. codeModified := true]] ifFalse: [self assert: (backEnd unalignedLongAt: cacheAddress + BytesPerOop) = 0]]]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>markLiteralsAndUnlinkIfUnmarkedSend:pc:method: (in category 'garbage collection') ----- markLiteralsAndUnlinkIfUnmarkedSend: annotation pc: mcpc method: cogMethod "Mark and trace literals. Unlink sends that have unmarked cache tags or targets." <var: #mcpc type: #'char *'> | literal | annotation = IsObjectReference ifTrue: + [literal := backEnd literalBeforeFollowingAddress: mcpc asUnsignedInteger. + (objectRepresentation + markAndTraceLiteral: literal + in: (self cCoerceSimple: cogMethod to: #'CogMethod *') + atpc: mcpc asUnsignedInteger) ifTrue: + [codeModified := true]]. - [literal := backEnd literalBeforeFollowingAddress: mcpc asInteger. - objectRepresentation markAndTraceLiteral: literal]. (self isSendAnnotation: annotation) ifTrue: [self offsetCacheTagAndCouldBeObjectAt: mcpc annotation: annotation into: [:entryPoint :cacheTag :tagCouldBeObj | | cacheTagMarked | cacheTagMarked := tagCouldBeObj and: [objectRepresentation cacheTagIsMarked: cacheTag]. entryPoint > methodZoneBase ifTrue: "It's a linked send." [self targetMethodAndSendTableFor: entryPoint into: [:targetMethod :sendTable| | unlinkedRoutine | (cacheTagMarked not + or: [self markAndTraceOrFreeCogMethod: targetMethod + firstVisit: targetMethod asUnsignedInteger > mcpc asUnsignedInteger]) ifTrue: - or: [self markAndTraceOrFreeCogMethod: targetMethod firstVisit: targetMethod asUnsignedInteger > mcpc asUnsignedInteger]) ifTrue: ["Either the cacheTag is unmarked (e.g. new class) or the target has been freed (because it is unmarked), so unlink the send." unlinkedRoutine := sendTable at: (targetMethod cmNumArgs min: NumSendTrampolines - 1). backEnd rewriteInlineCacheAt: mcpc asInteger tag: targetMethod selector target: unlinkedRoutine. codeModified := true. + objectRepresentation + markAndTraceLiteral: targetMethod selector + in: targetMethod + at: (self addressOf: targetMethod selector put: [:val| targetMethod selector: val])]]] + ifFalse: "cacheTag is selector" + [(objectRepresentation + markAndTraceCacheTagLiteral: cacheTag + in: cogMethod + atpc: mcpc asUnsignedInteger) ifTrue: + [codeModified := true]. - objectRepresentation markAndTraceLiteral: targetMethod selector]]] - ifFalse: - [objectRepresentation markAndTraceLiteral: cacheTag. "cacheTag is selector" self cppIf: NewspeakVM ifTrue: [entryPoint = ceImplicitReceiverTrampoline ifTrue: [| cacheAddress class mixin | + (objectRepresentation + markAndTraceCacheTagLiteral: cacheTag + in: cogMethod + atpc: mcpc asUnsignedInteger) ifTrue: + [codeModified := true]. "cacheTag is selector" - objectRepresentation markAndTraceLiteral: cacheTag. "cacheTag is selector" self assert: NumOopsPerIRC = 2. cacheAddress := self implicitReceiverCacheAddressAt: mcpc. + (class := backEnd unalignedLongAt: cacheAddress) ~= 0 - class := backEnd unalignedLongAt: cacheAddress. - class ~= 0 ifTrue: [(objectRepresentation cacheTagIsMarked: class) ifTrue: [(mixin := backEnd unalignedLongAt: cacheAddress + BytesPerOop) ~= 0 ifTrue: + [objectRepresentation + markAndTraceLiteral: mixin + in: (self cCoerceSimple: cogMethod to: #'CogMethod *') + at: (self asAddress: cacheAddress + BytesPerOop + put: [:val| backEnd unalignedLongAt: cacheAddress + BytesPerOop put: val])]] - [objectRepresentation markAndTraceLiteral: mixin]] ifFalse: [backEnd unalignedLongAt: cacheAddress put: 0; unalignedLongAt: cacheAddress + BytesPerOop put: 0. codeModified := true]] ifFalse: [self assert: (backEnd unalignedLongAt: cacheAddress + BytesPerOop) = 0]]]]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>markLiteralsAndUnlinkUnmarkedSendsIn: (in category 'garbage collection') ----- markLiteralsAndUnlinkUnmarkedSendsIn: cogMethod "Unlink sends that have unmarked classes in inline caches or freed/freeable targets. Nil-out inline caches linked to open PICs. Assert that any selectors are marked. We can do this since this is only run on marked methods and thus any selectors they reference should already be marked." <var: #cogMethod type: #'CogMethod *'> <inline: true> self assert: cogMethod cmType = CMMethod. self assert: (objectMemory isMarked: cogMethod methodObject). + objectRepresentation + markAndTraceLiteral: cogMethod selector + in: cogMethod + at: (self addressOf: cogMethod selector put: [:val| cogMethod selector: val]). - objectRepresentation markAndTraceLiteral: cogMethod selector. self maybeMarkCountersIn: cogMethod. self maybeMarkIRCsIn: cogMethod. self mapFor: cogMethod performUntil: #markLiteralsAndUnlinkIfUnmarkedSend:pc:method: arg: cogMethod asInteger! Item was changed: ----- Method: Cogit>>setSelectorOf:to: (in category 'jit - api') ----- setSelectorOf: cogMethod to: aSelectorOop <api> "If a method is compiled to machine code via a block entry it won't have a selector. A subsequent send can find the method and hence fill in the selector." <var: #cogMethod type: #'CogMethod *'> "self disassembleMethod: cogMethod" coInterpreter compilationBreak: aSelectorOop point: (objectMemory lengthOf: aSelectorOop). self assert: cogMethod cmType = CMMethod. cogMethod selector: aSelectorOop. + (objectMemory isYoung: aSelectorOop) ifTrue: + [methodZone ensureInYoungReferrers: cogMethod]! - (cogMethod cmRefersToYoung not - and: [objectMemory isYoung: aSelectorOop]) ifTrue: - [self assert: (methodZone occurrencesInYoungReferrers: cogMethod) = 0. - cogMethod cmRefersToYoung: true. - methodZone addToYoungReferrers: cogMethod]! Item was changed: ----- Method: CurrentImageCoInterpreterFacade>>debugStackPointersFor: (in category 'accessing') ----- debugStackPointersFor: anOop ^CArrayAccessor on: + ((StackDepthFinder on: (objectMap keyAtValue: anOop)) + encoderClass: (coInterpreter encoderClassForHeader: (objectMap keyAtValue: anOop) header); + stackPointers)! - (StackDepthFinder on: (objectMap keyAtValue: anOop)) - stackPointers! Item was added: + ----- Method: CurrentImageCoInterpreterFacade>>isArrayNonImm: (in category 'testing') ----- + isArrayNonImm: anOop + ^(self objectForOop: anOop) class instSpec = Array instSpec! Item was added: + ----- Method: CurrentImageCoInterpreterFacadeForSqueakV3ObjectRepresentation>>numSlotsOf: (in category 'accessing') ----- + 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. + 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 changed: ----- Method: InterpreterPrimitives>>primitiveNewMethod (in category 'compiled methods') ----- primitiveNewMethod | header bytecodeCount class size theMethod literalCount | header := self stackTop. bytecodeCount := self stackIntegerValue: 1. self success: (objectMemory isIntegerObject: header). self successful ifFalse: [^nil]. class := self stackValue: 2. + literalCount := self literalCountOfHeader: header. + size := literalCount + 1 * BytesPerWord + bytecodeCount. - size := (self literalCountOfHeader: header) + 1 * BytesPerWord + bytecodeCount. theMethod := objectMemory instantiateClass: class indexableSize: size. objectMemory storePointerUnchecked: HeaderIndex ofObject: theMethod withValue: header. - literalCount := self literalCountOfHeader: header. 1 to: literalCount do: [:i | objectMemory storePointer: i ofObject: theMethod withValue: objectMemory nilObject]. self pop: 3 thenPush: theMethod! Item was changed: ----- Method: SpurMemoryManager class>>initializeSpurObjectRepresentationConstants (in category 'class initialization') ----- initializeSpurObjectRepresentationConstants "SpurMemoryManager initializeSpurObjectRepresentationConstants" BecamePointerObjectFlag := 1. BecameCompiledMethodFlag := 2. + OldBecameNewFlag := 4. + "BecameClassFlag := 8" "this turns out not to be actionable" - "BecameClassFlag := 4" "this turns out not to be actionable" ! Item was changed: ----- Method: SpurMemoryManager>>addFreeSubTree: (in category 'free space') ----- addFreeSubTree: freeTree "Add a freeChunk sub tree back into the large free chunk tree. This is for allocateOldSpaceChunkOf[Exactly]Bytes:[suchThat:]." | bytesInArg treeNode bytesInNode subNode | "N.B. *can't* use numSlotsOfAny: because of rounding up of odd slots and/or step in size at 1032 bytes in 32-bits or 2048 bytes in 64-bits." self assert: (self isFreeObject: freeTree). bytesInArg := self bytesInObject: freeTree. self assert: bytesInArg >= (self numFreeLists * self allocationUnit). treeNode := freeLists at: 0. self assert: treeNode ~= 0. [bytesInNode := self bytesInObject: treeNode. + self assert: ((self oop: freeTree + bytesInArg isLessThanOrEqualTo: treeNode) - self assert: ((self oop: freeTree + bytesInArg isLessThan: treeNode) or: [self oop: freeTree isGreaterThanOrEqualTo: treeNode + bytesInNode]). self assert: bytesInNode >= (self numFreeLists * self allocationUnit). self assert: bytesInArg ~= bytesInNode. bytesInNode > bytesInArg ifTrue: [subNode := self fetchPointer: self freeChunkSmallerIndex ofFreeChunk: treeNode. subNode = 0 ifTrue: [self storePointer: self freeChunkSmallerIndex ofFreeChunk: treeNode withValue: freeTree. self storePointer: self freeChunkParentIndex ofFreeChunk: freeTree withValue: treeNode. ^self]] ifFalse: [subNode := self fetchPointer: self freeChunkLargerIndex ofFreeChunk: treeNode. subNode = 0 ifTrue: [self storePointer: self freeChunkLargerIndex ofFreeChunk: treeNode withValue: freeTree. self storePointer: self freeChunkParentIndex ofFreeChunk: freeTree withValue: treeNode. ^self]]. treeNode := subNode] repeat! Item was changed: ----- Method: SpurMemoryManager>>become:with:twoWay:copyHash: (in category 'become api') ----- become: array1 with: array2 twoWay: twoWayFlag copyHash: copyHashFlag "All references to each object in array1 are swapped with all references to the corresponding object in array2. That is, all pointers to one object are replaced with with pointers to the other. The arguments must be arrays of the same length. Answers PrimNoErr if the primitive succeeds, otherwise a relevant error code." "Implementation: Uses lazy forwarding to defer updating references until message send." | ec | self assert: becomeEffectsFlags = 0. self leakCheckBecome ifTrue: [self runLeakCheckerForFullGC: true]. (self isArray: array1) ifFalse: [^PrimErrBadReceiver]. ((self isArray: array2) and: [(self numSlotsOf: array1) = (self numSlotsOf: array2)]) ifFalse: [^PrimErrBadArgument]. (twoWayFlag or: [copyHashFlag]) ifTrue: [ec := self containsOnlyValidBecomeObjects: array1 and: array2] ifFalse: [self followForwardedObjectFields: array2 toDepth: 0. ec := self containsOnlyValidBecomeObjects: array1]. ec ~= 0 ifTrue: [^ec]. coInterpreter preBecomeAction. twoWayFlag ifTrue: [self innerBecomeObjectsIn: array1 and: array2 copyHash: copyHashFlag] ifFalse: [self innerBecomeObjectsIn: array1 to: array2 copyHash: copyHashFlag]. self followSpecialObjectsOop. + self postBecomeScanClassTable: becomeEffectsFlags. coInterpreter postBecomeAction: becomeEffectsFlags. becomeEffectsFlags := 0. self assert: self validClassTableHashes. self leakCheckBecome ifTrue: [self runLeakCheckerForFullGC: true]. ^PrimNoErr "success"! Item was changed: ----- Method: SpurMemoryManager>>doBecome:to:copyHash: (in category 'become implementation') ----- doBecome: obj1 to: obj2 copyHash: copyHashFlag | o1HashBits o2HashBits | o1HashBits := self rawHashBitsOf: obj1. o2HashBits := self rawHashBitsOf: obj2. self forward: obj1 to: obj2. + ((self isOldObject: obj1) + and: [self isYoungObject: obj2]) ifTrue: + [becomeEffectsFlags := becomeEffectsFlags bitOr: OldBecameNewFlag]. copyHashFlag ifTrue: [self setHashBitsOf: obj2 to: o1HashBits]. "obj1 is on its way out. Remove it from the classTable" (o1HashBits ~= 0 and: [(self classAtIndex: o1HashBits) = obj1]) ifTrue: [self expungeFromClassTable: obj1] ifFalse: [o1HashBits := 0]. "= 0 implies was not in class table" self deny: (self isForwarded: obj2). "o1HashBits ~= 0 implies obj1 was in class table and hence may have had instances. Therefore o1HashBits needs to refer to obj2 (put obj2 in table at o1HashBits)." o1HashBits ~= 0 ifTrue: [o2HashBits = 0 ifTrue: "obj2 has no hash; we're free to assign one" [self setHashBitsOf: obj2 to: o1HashBits]. self classAtIndex: o1HashBits put: obj2]! Item was changed: ----- Method: SpurMemoryManager>>outOfPlaceBecome:and:copyHashFlag: (in category 'become implementation') ----- outOfPlaceBecome: obj1 and: obj2 copyHashFlag: copyHashFlag "Allocate two new objects, n1 & n2. Copy the contents appropriately. Convert obj1 and obj2 into forwarding objects pointing to n2 and n1 respectively" | clone1 clone2 | clone1 := (self isContextNonImm: obj1) ifTrue: [coInterpreter cloneContext: obj1] ifFalse: [self clone: obj1]. clone2 := (self isContextNonImm: obj2) ifTrue: [coInterpreter cloneContext: obj2] ifFalse: [self clone: obj2]. copyHashFlag ifTrue: [self setHashBitsOf: clone1 to: (self rawHashBitsOf: obj2). self setHashBitsOf: clone2 to: (self rawHashBitsOf: obj1)] ifFalse: [self setHashBitsOf: clone1 to: (self rawHashBitsOf: obj1). self setHashBitsOf: clone2 to: (self rawHashBitsOf: obj2)]. self forward: obj1 to: clone2; + forward: obj2 to: clone1. + ((self isYoungObject: obj1) ~= (self isYoungObject: clone2) + or: [(self isYoungObject: obj2) ~= (self isYoungObject: clone1)]) ifTrue: + [becomeEffectsFlags := becomeEffectsFlags bitOr: OldBecameNewFlag]! - forward: obj2 to: clone1! Item was added: + ----- Method: SpurMemoryManager>>postBecomeScanClassTable: (in category 'become implementation') ----- + postBecomeScanClassTable: effectsFlags + "Scan the class table post-become (iff a pointer object was becommed) to ensure no forwarding + pointers exist in the class table. + Note that one-way become can cause duplications in the class table. + When can these be eliminated? We use the classTableBitmap to mark classTable entries + (not the classes themselves, since marking a class doesn't help in knowing if its index is used). + On image load, and during incrememtal scan-mark and full GC, classIndices are marked. + We can somehow avoid following classes from the classTable until after this mark phase." + self assert: self validClassTableRootPages. + + (effectsFlags anyMask: BecamePointerObjectFlag) ifFalse: [^self]. + + 0 to: numClassTablePages - 1 do: + [:i| | page | + page := self fetchPointer: i ofObject: hiddenRootsObj. + self assert: (self isForwarded: page) not. + 0 to: (self numSlotsOf: page) - 1 do: + [:j| | classOrNil | + classOrNil := self fetchPointer: j ofObject: page. + (classOrNil ~= nilObj + and: [self isForwarded: classOrNil]) ifTrue: + [classOrNil := self followForwarded: classOrNil. + self storePointer: j ofObject: page withValue: classOrNil]]]! Item was changed: InstructionStream subclass: #StackDepthFinder + instanceVariableNames: 'stackp joins encoderClass' - instanceVariableNames: 'stackp joins' classVariableNames: '' poolDictionaries: '' category: 'VMMaker-Support'! Item was added: + ----- Method: StackDepthFinder>>blockReturnConstant: (in category 'instruction decoding') ----- + blockReturnConstant: value + "Return Constant From Block bytecode." + self resetStackAfterBranchOrReturn! Item was added: + ----- Method: StackDepthFinder>>encoderClass (in category 'accessing') ----- + encoderClass + + ^encoderClass! Item was added: + ----- Method: StackDepthFinder>>encoderClass: (in category 'accessing') ----- + encoderClass: anObject + + encoderClass := anObject! Item was changed: ----- Method: StackDepthFinder>>interpretNextInstructionFor: (in category 'decoding') ----- interpretNextInstructionFor: client joins at: pc put: stackp. + ^encoderClass + ifNil: [super interpretNextInstructionFor: client] + ifNotNil: [encoderClass interpretNextInstructionFor: client in: self]! - ^super interpretNextInstructionFor: client! Item was changed: ----- Method: StackDepthFinder>>stackPointers (in category 'accessing') ----- stackPointers "Collect the stack depth for each bytecode in the method. For the convenience of clients, write the stack depth for extended bytecodes to the bytecode pc, as well as the bytecocdes' extensions' pcs." + | method stackPointers end | - | method encoderClass stackPointers end | stackPointers := Array new: (end := (method := self method) endPC). + encoderClass ifNil: [encoderClass := method encoderClass]. - encoderClass := method encoderClass. [pc <= end] whileTrue: [stackPointers at: pc put: stackp. encoderClass extensionsAt: pc in: method into: [:extA :extB :delta| delta > 0 ifTrue: [stackPointers at: pc + delta put: stackp]]. self interpretNextInstructionFor: self]. ^stackPointers! Item was added: + ----- Method: StackDepthFinder>>trapIfNotInstanceOf: (in category 'instruction decoding') ----- + trapIfNotInstanceOf: behaviorOrArrayOfBehavior + "If the top of stack is not an instance of either the argument, or, if the argument is an Array, + any of the elements of the argument, send the class trap message to the current context." + self drop! Item was changed: ----- Method: StackInterpreter class>>initializeBytecodeTableForSistaV1 (in category 'initialization') ----- initializeBytecodeTableForSistaV1 "See e.g. the cass comment for EncoderForSistaV1" "StackInterpreter initializeBytecodeTableForSistaV1" "Note: This table will be used to generate a C switch statement." BytecodeTable := Array new: 256. + BytecodeEncoderClassName := #EncoderForSistaV1. self table: BytecodeTable from: #( "1 byte bytecodes" ( 0 15 pushReceiverVariableBytecode) ( 16 31 pushLiteralVariable16CasesBytecode) ( 32 63 pushLiteralConstantBytecode) ( 64 75 pushTemporaryVariableBytecode) ( 76 pushReceiverBytecode) ( 77 pushConstantTrueBytecode) ( 78 pushConstantFalseBytecode) ( 79 pushConstantNilBytecode) ( 80 pushConstantZeroBytecode) ( 81 pushConstantOneBytecode) ( 82 extPushPseudoVariable) ( 83 duplicateTopBytecode) ( 84 87 unknownBytecode) ( 88 returnReceiver) ( 89 returnTrue) ( 90 returnFalse) ( 91 returnNil) ( 92 returnTopFromMethod) ( 93 returnNilFromBlock) ( 94 returnTopFromBlock) ( 95 extNopBytecode) ( 96 bytecodePrimAdd) ( 97 bytecodePrimSubtract) ( 98 bytecodePrimLessThanSistaV1) "for booleanCheatSistaV1:" ( 99 bytecodePrimGreaterThanSistaV1) "for booleanCheatSistaV1:" (100 bytecodePrimLessOrEqualSistaV1) "for booleanCheatSistaV1:" (101 bytecodePrimGreaterOrEqualSistaV1) "for booleanCheatSistaV1:" (102 bytecodePrimEqualSistaV1) "for booleanCheatSistaV1:" (103 bytecodePrimNotEqualSistaV1) "for booleanCheatSistaV1:" (104 bytecodePrimMultiply) (105 bytecodePrimDivide) (106 bytecodePrimMod) (107 bytecodePrimMakePoint) (108 bytecodePrimBitShift) (109 bytecodePrimDiv) (110 bytecodePrimBitAnd) (111 bytecodePrimBitOr) (112 bytecodePrimAt) (113 bytecodePrimAtPut) (114 bytecodePrimSize) (115 bytecodePrimNext) "i.e. a 0 arg special selector" (116 bytecodePrimNextPut) "i.e. a 1 arg special selector" (117 bytecodePrimAtEnd) (118 bytecodePrimIdenticalSistaV1) "for booleanCheatSistaV1:" (119 bytecodePrimClass) (120 bytecodePrimSpecialSelector24) "was blockCopy:" (121 bytecodePrimValue) (122 bytecodePrimValueWithArg) (123 bytecodePrimDo) "i.e. a 1 arg special selector" (124 bytecodePrimNew) "i.e. a 0 arg special selector" (125 bytecodePrimNewWithArg) "i.e. a 1 arg special selector" (126 bytecodePrimPointX) "i.e. a 0 arg special selector" (127 bytecodePrimPointY) "i.e. a 0 arg special selector" (128 143 sendLiteralSelector0ArgsBytecode) (144 159 sendLiteralSelector1ArgBytecode) (160 175 sendLiteralSelector2ArgsBytecode) (176 183 shortUnconditionalJump) (184 191 shortConditionalJumpTrue) (192 199 shortConditionalJumpFalse) (200 207 storeAndPopReceiverVariableBytecode) (208 215 storeAndPopTemporaryVariableBytecode) (216 popStackBytecode) (217 223 unknownBytecode) "2 byte bytecodes" (224 extABytecode) (225 extBBytecode) (226 extPushReceiverVariableBytecode) (227 extPushLiteralVariableBytecode) (228 extPushLiteralBytecode) (229 longPushTemporaryVariableBytecode) (230 pushClosureTempsBytecode) (231 pushNewArrayBytecode) (232 extPushIntegerBytecode) (233 extPushCharacterBytecode) (234 extSendBytecode) (235 extSendSuperBytecode) (236 extTrapIfNotInstanceOfBehaviorsBytecode) (237 extUnconditionalJump) (238 extJumpIfTrue) (239 extJumpIfFalse) (240 extStoreAndPopReceiverVariableBytecode) (241 extStoreAndPopLiteralVariableBytecode) (242 longStoreAndPopTemporaryVariableBytecode) (243 extStoreReceiverVariableBytecode) (244 extStoreLiteralVariableBytecode) (245 longStoreTemporaryVariableBytecode) (246 247 unknownBytecode) "3 byte bytecodes" (248 callPrimitiveBytecode) (249 unknownBytecode) "reserved for Push Float" (250 extPushClosureBytecode) (251 pushRemoteTempLongBytecode) (252 storeRemoteTempLongBytecode) (253 storeAndPopRemoteTempLongBytecode) (254 255 unknownBytecode) )! Item was changed: ----- Method: StackInterpreter>>literalCountOfHeader: (in category 'compiled methods') ----- literalCountOfHeader: headerPointer <api> + "We support two method header formats, as selected by the sign flag. Even if the VM only + has one bytecode set, supporting teh two formats here allows for instantiating methods in + the other format for testing, etc." + ^(self headerIndicatesAlternateBytecodeSet: headerPointer) + ifTrue: [self literalCountOfAlternateHeader: headerPointer] - ^self cppIf: MULTIPLEBYTECODESETS - ifTrue: [(self headerIndicatesAlternateBytecodeSet: headerPointer) - ifTrue: [self literalCountOfAlternateHeader: headerPointer] - ifFalse: [self literalCountOfOriginalHeader: headerPointer]] ifFalse: [self literalCountOfOriginalHeader: headerPointer]! Item was changed: ----- Method: StackInterpreter>>printOopShortInner: (in category 'debug printing') ----- printOopShortInner: oop | classOop name nameLen | <var: #name type: #'char *'> <inline: true> (objectMemory isImmediate: oop) ifTrue: [(objectMemory isImmediateCharacter: oop) ifTrue: [^self printChar: $$; printChar: (objectMemory characterValueOf: oop); printChar: $(; printHex: (objectMemory integerValueOf: oop); printChar: $)]. ^self printNum: (objectMemory integerValueOf: oop); printChar: $(; printHex: (objectMemory integerValueOf: oop); printChar: $)]. (objectMemory addressCouldBeObj: oop) ifFalse: [^self print: ((oop bitAnd: objectMemory allocationUnit - 1) ~= 0 ifTrue: [' is misaligned'] ifFalse: [self whereIs: oop])]. (objectMemory isFreeObject: oop) ifTrue: [^self print: ' is a free chunk']. (objectMemory isForwarded: oop) ifTrue: [^self print: ' is a forwarder to '; printHex: (objectMemory followForwarded: oop)]. (self isFloatObject: oop) ifTrue: [^self printFloat: (self dbgFloatValueOf: oop)]. classOop := objectMemory fetchClassOfNonImm: oop. (objectMemory addressCouldBeObj: classOop) ifFalse: [^self print: 'a ??']. (objectMemory numSlotsOf: classOop) = metaclassNumSlots ifTrue: [^self printNameOfClass: oop count: 5]. oop = objectMemory nilObject ifTrue: [^self print: 'nil']. oop = objectMemory trueObject ifTrue: [^self print: 'true']. oop = objectMemory falseObject ifTrue: [^self print: 'false']. nameLen := self lengthOfNameOfClass: classOop. nameLen = 0 ifTrue: [^self print: 'a ??']. name := self nameOfClass: classOop. nameLen = 10 ifTrue: [(self str: name n: 'ByteString' cmp: 10) = 0 "strncmp is weird" ifTrue: [^self printChar: $'; printStringOf: oop; printChar: $']. (self str: name n: 'ByteSymbol' cmp: 10) = 0 "strncmp is weird" ifTrue: [self printChar: $#; printStringOf: oop. ^self]]. (nameLen = 9 and: [(self str: name n: 'Character' cmp: 9) = 0]) ifTrue: [^self printChar: $$; printChar: (objectMemory integerValueOf: (objectMemory fetchPointer: 0 ofObject: oop))]. self print: 'a(n) '. self cCode: [0 to: nameLen - 1 do: [:i| self printChar: (name at: i)]] inSmalltalk: [name isString ifTrue: [self print: name] ifFalse: [0 to: nameLen - 1 do: [:i| self printChar: (name at: i)]]]. "Try to spot association-like things; they're all subclasses of LookupKey" + ((objectMemory isPointersNonImm: oop) + and: [(objectMemory instanceSizeOf: classOop) = (ValueIndex + 1) + and: [(objectMemory isBytes: (objectMemory fetchPointer: KeyIndex ofObject: oop))]]) ifTrue: + [| classLookupKey | + classLookupKey := objectMemory fetchClassOfNonImm: (objectMemory splObj: SchedulerAssociation). + [classLookupKey = objectMemory nilObject ifTrue: + [^self]. + (objectMemory instanceSizeOf: classLookupKey) = (KeyIndex + 1)] whileFalse: + [classLookupKey := self superclassOf: classLookupKey]. + (self includesBehavior: classOop ThatOf: classLookupKey) ifTrue: + [self space; + printOopShort: (objectMemory fetchPointer: KeyIndex ofObject: oop); + print: ' -> '; + printHex: (objectMemory fetchPointer: ValueIndex ofObject: oop)]]! - ((objectMemory instanceSizeOf: classOop) = (ValueIndex + 1) - and: [(self superclassOf: classOop) = (self superclassOf: (objectMemory fetchClassOfNonImm: (objectMemory splObj: SchedulerAssociation))) - and: [objectMemory isBytes: (objectMemory fetchPointer: KeyIndex ofObject: oop)]]) ifTrue: - [self space; - printOopShort: (objectMemory fetchPointer: KeyIndex ofObject: oop); - print: ' -> '; - printHex: (objectMemory fetchPointer: ValueIndex ofObject: oop)]! Item was added: + ----- Method: VMClass>>asAddress:put: (in category 'translation support') ----- + asAddress: address put: aBlock + <doNotGenerate> + "Simulate a C pointer. Translates into address in C. Provides something + that evaluates aBlock with the new value in response to at:put:" + ^CPluggableAccessor new + setObject: nil; + atBlock: [:obj :idx| self error: 'cannot dereference pseudo-pointers'] + atPutBlock: [:obj :idx :val| aBlock value: val]! Item was changed: VMBasicConstants subclass: #VMSpurObjectRepresentationConstants instanceVariableNames: '' + classVariableNames: 'BecameCompiledMethodFlag BecamePointerObjectFlag OldBecameNewFlag' - classVariableNames: 'BecameCompiledMethodFlag BecamePointerObjectFlag' poolDictionaries: '' category: 'VMMaker-Interpreter'!

1 0

VM Maker: BytecodeSets-eem.8.mcz
by commits＠source.squeak.org 01 Aug '14

01 Aug '14

Eliot Miranda uploaded a new version of BytecodeSets to project VM Maker: http://source.squeak.org/VMMaker/BytecodeSets-eem.8.mcz ==================== Summary ==================== Name: BytecodeSets-eem.8 Author: eem Time: 1 August 2014, 7:49:32.498 am UUID: cc38f5a1-1f71-4460-bae8-dcabb95e0bc4 Ancestors: BytecodeSets-eem.7 Implement the 1-byte and jump bytecode decoders for SistaV1 and add the blockReturnConstant: bytecode (for blockReturnNil).. Implement the genTrapIfNotInstanceOf: encoder. =============== Diff against BytecodeSets-eem.7 =============== Item was added: + ----- Method: BlockLocalTempCounter>>blockReturnConstant: (in category '*BytecodeSets-instruction decoding') ----- + blockReturnConstant: value + "Return Constant From Block bytecode." + scanner pc < blockEnd ifTrue: + [self doJoin]! Item was added: + ----- Method: ClosureExtractor>>blockReturnConstant: (in category '*BytecodeSets-instruction decoding') ----- + blockReturnConstant: value + currentContext := currentContext sender! Item was added: + ----- Method: Decompiler>>blockReturnConstant: (in category '*BytecodeSets-instruction decoding') ----- + blockReturnConstant: value + + self pushConstant: value; blockReturnTop! Item was added: + ----- Method: EncoderForSistaV1>>genTrapIfNotInstanceOf: (in category 'bytecode generation') ----- + genTrapIfNotInstanceOf: literalIndex + "* 236 11101100 iiiiiiii Trap If Not Instance Of Behavior/Array Of Behavior #iiiiiiii (+ Extend A * 256, where Extend A >= 0)" + + | extendedIndex | + (literalIndex < 0 or: [literalIndex > 65535]) ifTrue: + [^self outOfRangeError: 'index' index: literalIndex range: 0 to: 65536]. + (extendedIndex := literalIndex) > 255 ifTrue: + [self genUnsignedSingleExtendA: extendedIndex // 256. + extendedIndex := extendedIndex \\ 256]. + stream + nextPut: 236; + nextPut: extendedIndex! Item was added: + ----- Method: InstructionClient>>blockReturnConstant: (in category '*BytecodeSets-instruction decoding') ----- + blockReturnConstant: value + "Return Constant From Block bytecode." + + ! Item was added: + ----- Method: InstructionPrinter>>blockReturnConstant: (in category '*BytecodeSets-instruction decoding') ----- + blockReturnConstant: value + "Print the Return Constant From Block bytecode." + + self print: 'blockReturn: ', value printString! Item was added: + ----- Method: InstructionStream>>interpretNextSistaV1InstructionFor: (in category '*BytecodeSets-SistaV1-decoding') ----- + interpretNextSistaV1InstructionFor: client + "Send to the argument, client, a message that specifies the next instruction." + + | byte div16 offset method extA extB savedPC | + method := self method. + "For a table of the bytecode set, see EncoderForSistaV1's class comment." + "consume and compute any extensions first." + extA := extB := 0. + savedPC := pc. + [byte := self method at: pc. + pc := pc + 1. + byte >= 16rE0 and: [byte <= 16rE1]] whileTrue: + [| extByte | + extByte := self method at: pc. + pc := pc + 1. + byte = 16rE0 + ifTrue: + [extA := (extA bitShift: 8) + extByte] + ifFalse: + [extB := (extB = 0 and: [extByte > 127]) + ifTrue: [extByte - 256] + ifFalse: [(extB bitShift: 8) + extByte]]]. + div16 := byte // 16. + offset := byte \\ 16. + "We do an inline quasi-binary search on each of the possible 16 values of div16" + div16 < 11 ifTrue: + [div16 < 5 ifTrue: + [div16 < 2 ifTrue: + [div16 = 0 ifTrue: + [^client pushReceiverVariable: offset]. + ^client pushLiteralVariable: (method literalAt: offset + 1)]. "div16 = 1" + ^client pushConstant: (method literalAt: byte \\ 32 + 1)]. + div16 < 6 + ifTrue: + [div16 = 4 ifTrue: + [offset < 12 ifTrue: + [^client pushTemporaryVariable: offset]. + offset = 12 ifTrue: + [^client pushReceiver]. + offset = 13 ifTrue: + [^client pushConstant: true]. + offset = 14 ifTrue: + [^client pushConstant: false]. + offset = 15 ifTrue: + [^client pushConstant: nil]]. + offset < 2 ifTrue: + [^client pushConstant: offset]. + offset = 3 ifTrue: + [^self interpretSistaV1ExtendedPush: extB for: client]. + offset = 4 ifTrue: + [^client doDup]. + offset = 8 ifTrue: + [^client methodReturnReceiver]. + offset = 9 ifTrue: + [^client methodReturnConstant: true]. + offset = 10 ifTrue: + [^client methodReturnConstant: false]. + offset = 11 ifTrue: + [^client methodReturnConstant: nil]. + offset = 12 ifTrue: + [^client methodReturnTop]. + offset = 13 ifTrue: + [^client blockReturnConstant: nil]. + offset = 14 ifTrue: + [^client blockReturnTop]. + offset = 15 ifTrue: + [^client doNop]. + ^self unusedBytecode: client at: savedPC]. + "short sends" + div16 < 8 ifTrue: "special selector sends" + [div16 = 6 ifTrue: + [^client + send: (Smalltalk specialSelectorAt: offset + 1) + super: false + numArgs: (Smalltalk specialNargsAt: offset + 1)]. + ^client + send: (Smalltalk specialSelectorAt: offset + 17) + super: false + numArgs: (Smalltalk specialNargsAt: offset + 17)]. + ^client + send: (method literalAt: offset + 1) + super: false + numArgs: div16 - 8]. + "div16 >= 11; bytecode >= 176" + div16 < 14 ifTrue: + [div16 = 11 ifTrue: + [offset < 8 ifTrue: + [^client jump: offset + 1]. + ^client jump: offset - 7 if: true]. + div16 = 12 ifTrue: + [offset < 8 ifTrue: + [^client jump: offset + 1 if: false]. + ^client popIntoReceiverVariable: offset - 8]. + "div16 = 13" + offset < 8 ifTrue: + [^client popIntoTemporaryVariable: offset]. + offset = 9 ifTrue: + [^client doDup]. + ^self unusedBytecode: client at: savedPC]. + "2 byte and 3 byte codes" + byte < 248 ifTrue: + [^self interpretNext2ByteSistaV1Instruction: byte for: client extA: extA extB: extB startPC: savedPC]. + ^self interpretNext3ByteSistaV1Instruction: byte for: client extA: extA extB: extB startPC: savedPC! Item was added: + ----- Method: InstructionStream>>interpretSistaV1ExtendedPush:for: (in category '*BytecodeSets-SistaV1-decoding') ----- + interpretSistaV1ExtendedPush: extB for: client + "Implement the extended push for non-zero extensions." + "* 82 01010010 Push thisContext, (then Extend B = 1 => push thisProcess)" + extB = 0 ifTrue: + [^client pushActiveContext]. + extB = 1 ifTrue: + [^client pushActiveProcess]. + self error: 'undefined extended push'! Item was added: + ----- Method: InstructionStream>>interpretSistaV1Jump (in category '*BytecodeSets-SistaV1-decoding') ----- + interpretSistaV1Jump + "If the instruction at pc is an unconditional jump, interpret it, advancing the pc, + and answering the jump distance. Otherwise answer nil." + + " 176-183 10110 iii Jump iii + 1 (i.e., 1 through 8) + * 225/16rE1 11100001 sbbbbbbb Extend B (Ext B = Ext B prev * 256 + Ext B) + * 237 11101101 iiiiiiii Jump #iiiiiiii (+ Extend B * 256, where bbbbbbbb = sddddddd, e.g. -32768 = i=0, a=0, s=1)" + | method byte nextpc extB | + method := self method. + "consume and compute any extension first." + extB := 0. + nextpc := pc. "must not advance pc unless this is a jump." + [byte := self method at: nextpc. + nextpc := nextpc + 1. + byte = 16rE1] whileTrue: + [| extByte | + extByte := self method at: nextpc. + nextpc := nextpc + 1. + extB := (extB = 0 and: [extByte > 127]) + ifTrue: [extByte - 256] + ifFalse: [(extB bitShift: 8) + extByte]]. + (byte between: 176 and: 183) ifTrue: + [pc := nextpc. + ^byte - 191]. + byte = 237 ifTrue: + [byte := method at: nextpc. + pc := nextpc + 1. + ^(extB bitShift: 8) + byte]. + ^nil! Item was added: + ----- Method: InstructionStream>>interpretSistaV1JumpIfCond (in category '*BytecodeSets-SistaV1-decoding') ----- + interpretSistaV1JumpIfCond + "If the instruction at pc is a conditional jump, interpret it, advancing the pc, + and answering the jump distance. Otherwise answer nil." + + " 184-191 10111 iii Pop and Jump 0n True iii +1 (i.e., 1 through 8) + 192-199 11000 iii Pop and Jump 0n False iii +1 (i.e., 1 through 8) + * 225/E1 11100001 sbbbbbbb Extend B (Ext B = Ext B prev * 256 + Ext B) + * 238 11101110 iiiiiiii Pop and Jump 0n True #iiiiiiii (+ Extend B * 256, where Extend B >= 0) + * 239 11101111 iiiiiiii Pop and Jump 0n False #iiiiiiii (+ Extend B * 256, where Extend B >= 0)" + | method byte nextpc extB | + method := self method. + "consume and compute any extension first." + extB := 0. + nextpc := pc. "must not advance pc unless this is a jump." + [byte := self method at: nextpc. + nextpc := nextpc + 1. + byte = 16rE1] whileTrue: + [| extByte | + extByte := self method at: nextpc. + nextpc := nextpc + 1. + extB := (extB = 0 and: [extByte > 127]) + ifTrue: [extByte - 256] + ifFalse: [(extB bitShift: 8) + extByte]]. + (byte between: 184 and: 199) ifTrue: + [pc := nextpc. + ^(byte bitAnd: 7) + 1]. + (byte between: 238 and: 239) ifTrue: + [byte := method at: nextpc. + pc := nextpc + 1. + ^(extB bitShift: 8) + byte]. + ^nil! Item was added: + ----- Method: MethodContext>>blockReturnConstant: (in category '*BytecodeSets-instruction decoding') ----- + blockReturnConstant: value + "Simulate the interpreter's action when a ReturnConstantToCaller bytecode is + encountered in the receiver. This should only happen in a closure activation." + self assert: closureOrNil isClosure. + ^self return: value from: self!

1 0

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

01 Aug '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.178.mcz ==================== Summary ==================== Name: Cog-eem.178 Author: eem Time: 1 August 2014, 7:42:55.562 am UUID: ad922a94-347a-4388-a3ba-b7909353c4b9 Ancestors: Cog-eem.177 Avoid assigning to ifNotNil: block args in some SpurBootstap methods =============== Diff against Cog-eem.177 =============== 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]. - [:class| - symIsMeta ifTrue: [class := oldHeap fetchClassOfNonImm: class]. self prototypeClassNameMetaSelectorMethodDo: [:className :isMeta :selector :method| | methodOrNil | (className = sym 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 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]. - [:class| - symIsMeta ifTrue: [class := oldHeap fetchClassOfNonImm: class]. self prototypeClassNameMetaSelectorMethodDo: [:className :isMeta :selector :method| | replacement methodDict index | (className = sym 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.177.mcz
by commits＠source.squeak.org 01 Aug '14

01 Aug '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.177.mcz ==================== Summary ==================== Name: Cog-eem.177 Author: eem Time: 31 July 2014, 10:48:21.716 pm UUID: c93172a9-43d7-4591-b624-ffb06e5ded82 Ancestors: Cog-eem.176 SpurBootstrap: Support different prototypes of the same method for Pharo and Squeak. Allow a trailing .image on the image name. Use hex in the debugger. Allow prototypes on missing classes. Use bigger eden and smaller stack zone, and turn off assertValidExecutionPointersAtEachStep for Spur image. Tidy up report. Needs VMMaker.oscog-eem.840 =============== Diff against Cog-eem.176 =============== Item was changed: ----- Method: SpurBootstrap class>>bootstrapImage:type: (in category 'utilities') ----- + bootstrapImage: imageFileNameOrBaseName type: typeName - bootstrapImage: imageFileBaseName type: typeName "SpurBootstrap bootstrapImage: '/Users/eliot/Squeak/Squeak4.5/Squeak4.5-13680'" + | imageFileBaseName imageFormat | + imageFileBaseName := (imageFileNameOrBaseName endsWith: '.image') + ifTrue: [imageFileNameOrBaseName allButLast: 6] + ifFalse: [imageFileNameOrBaseName]. - | imageFormat | imageFormat := ImageFormat fromFile: imageFileBaseName, '.image'. imageFormat requiresClosureSupport ifFalse: [self error: 'Can''t bootstrap this image since Spur assumes closure support.']. imageFormat requiresSpurSupport ifTrue: [self error: 'This image is already in Spur format.']. imageFormat is32Bit ifTrue: + [^SpurBootstrap32 new bootstrapImage: imageFileBaseName type: typeName]. - [^ SpurBootstrap32 new bootstrapImage: imageFileBaseName type: typeName ]. self error: '64-bit support and 64-bit generation as-yet-unimplemented'! Item was added: + ----- Method: SpurBootstrap class>>defaultIntegerBaseInDebugger (in category 'debugger') ----- + defaultIntegerBaseInDebugger + ^16! 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: + [:class| + symIsMeta ifTrue: [class := oldHeap fetchClassOfNonImm: class]. + self prototypeClassNameMetaSelectorMethodDo: + [:className :isMeta :selector :method| | methodOrNil | + (className = sym + 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 - [:sym :symIsMeta| | class | - class := self findClassNamed: (literalMap at: sym). - symIsMeta ifTrue: [class := oldHeap fetchClassOfNonImm: class]. - self prototypeClassNameMetaSelectorMethodDo: - [:className :isMeta :selector :method| | methodOrNil | - (className = sym - 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: 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)]]]]]! - 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 changed: ----- Method: SpurBootstrap>>interpreter:object:perform:withArguments: (in category 'bootstrap methods') ----- interpreter: sim object: receiver perform: selector withArguments: arguments "Interpret an expression in oldHeap using oldInterpreter. Answer the result." | fp savedpc savedsp result startByteCount | + self assert: ({receiver. selector}, arguments allSatisfy: + [:oop| oop isInteger and: [sim objectMemory addressCouldBeOop: oop]]). savedpc := sim localIP. savedsp := sim localSP. sim internalPush: receiver. arguments do: [:arg| sim internalPush: arg]. sim argumentCount: arguments size; messageSelector: selector. fp := sim localFP. startByteCount := sim byteCount. "sim byteCount = 66849 ifTrue: [self halt]." sim normalSend. sim incrementByteCount. "otherwise, send is not counted" ["sim printFrame: sim localFP WithSP: sim localSP" "sim setBreakSelector: #elementsForwardIdentityTo:" "sim byteCount = 66849 ifTrue: [self halt]." "(sim byteCount > 7508930 and: [sim localFP = -16r27894]) ifTrue: [self halt]." fp = sim localFP] whileFalse: [sim singleStep]. result := sim internalPopStack. self assert: savedsp = sim localSP. self assert: sim localIP - 1 = savedpc. sim localIP: savedpc. ^result! Item was changed: ----- Method: SpurBootstrap>>on: (in category 'initialize-release') ----- on: imageName StackInterpreter initializeWithOptions: Dictionary new. (oldInterpreter := StackInterpreterSimulator new) openOn: imageName extraMemory: 0; assertValidExecutionPointersAtEachStep: false. oldHeap := oldInterpreter objectMemory. newHeap := Spur32BitMMLESimulator new. newHeap allocateMemoryOfSize: (oldHeap youngStart * 3 / 2 roundUpTo: 1024 * 1024) + newSpaceSize: 4 * 1024 * 1024 + stackSize: 16 * 1024 - newSpaceSize: 2 * 1024 * 1024 - stackSize: 1024 * 1024 codeSize: 0. newHeap setCheckForLeaks: 15 - 6. "don't check become; or newSpace; soooo many rehashes in bootstrap" newHeap bootstrapping: true. self initMaps! Item was changed: ----- Method: SpurBootstrap>>rehashImage (in category 'bootstrap image') ----- rehashImage "Rehash all collections in newHeap. Find out which classes implement rehash, entering a 1 against their classIndex in rehashFlags. Enumerate all objects, rehashing those whose class has a bit set in rehashFlags." | n sim rehashFlags | sim := StackInterpreterSimulator onObjectMemory: newHeap. sim setImageHeaderFlagsFrom: oldInterpreter getImageHeaderFlags; + imageName: 'spur image'; + assertValidExecutionPointersAtEachStep: false.. - imageName: 'spur image'. newHeap coInterpreter: sim. sim bootstrapping: true. sim initializeInterpreter: 0. sim instVarNamed: 'methodDictLinearSearchLimit' put: SmallInteger maxVal. newHeap setHashBitsOf: newHeap nilObject to: 1; setHashBitsOf: newHeap falseObject to: 2; setHashBitsOf: newHeap trueObject to: 3. rehashFlags := ByteArray new: newHeap numClassTablePages * newHeap classTablePageSize. n := 0. newHeap classTableObjectsDo: [:class| | classIndex | sim messageSelector: (map at: rehashSym). "Lookup rehash but don't be fooled by ProtoObject>>rehash, which is just ^self." ((sim lookupMethodNoMNUEtcInClass: class) = 0 and: [(sim isQuickPrimitiveIndex: (sim primitiveIndexOf: (sim instVarNamed: 'newMethod'))) not]) ifTrue: [n := n + 1. classIndex := newHeap rawHashBitsOf: class. rehashFlags at: classIndex >> 3 + 1 put: ((rehashFlags at: classIndex >> 3 + 1) bitOr: (1 << (classIndex bitAnd: 7)))]]. Transcript cr; print: n; nextPutAll: ' classes understand rehash. rehashing instances...'; flush. n := 0. self withExecutableInterpreter: sim do: [sim setBreakSelector: 'error:'. "don't rehash twice (actually without limit), so don't rehash any new objects created." newHeap allExistingOldSpaceObjectsDo: [:o| | classIndex | classIndex := newHeap classIndexOf: o. ((rehashFlags at: classIndex >> 3 + 1) anyMask: 1 << (classIndex bitAnd: 7)) ifTrue: + [(n := n + 1) \\ 16 = 0 ifTrue: - [(n := n + 1) \\ 8 = 0 ifTrue: [Transcript nextPut: $.; flush]. "2845 = n ifTrue: [self halt]." "Rehash an object if its size is > 0. Symbol implements rehash, but let's not waste time rehashing it; in Squeak up to 2013 symbols are kept in a set which will get reashed anyway.. Don't rehash empty collections; they may be large for a reason and rehashing will shrink them." ((sim addressCouldBeClassObj: o) or: [(self interpreter: sim object: o perform: (map at: sizeSym) withArguments: #()) = (newHeap integerObjectOf: 0)]) ifFalse: [self interpreter: sim object: o perform: (map at: rehashSym) withArguments: #()]]]]! 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: + [:class| + symIsMeta ifTrue: [class := oldHeap fetchClassOfNonImm: class]. + self prototypeClassNameMetaSelectorMethodDo: + [:className :isMeta :selector :method| | replacement methodDict index | + (className = sym + 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]]]]]! - [:sym :symIsMeta| | class | - class := self findClassNamed: (literalMap at: sym). - symIsMeta ifTrue: [class := oldHeap fetchClassOfNonImm: class]. - self prototypeClassNameMetaSelectorMethodDo: - [:className :isMeta :selector :method| | replacement methodDict index | - (className = sym - 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]]]]! Item was changed: ----- Method: SpurBootstrap>>reportSizes (in category 'bootstrap image') ----- reportSizes | change oldAvgBytes newAvgBytes | change := newHeapSize - oldHeapSize / oldHeapSize. oldAvgBytes := oldHeapSize asFloat / oldHeapNumObjs. Transcript nextPutAll: 'done.'; cr; + nextPutAll: 'old heap size: '; nextPutAll: oldHeapSize asStringWithCommas; tab; + nextPutAll: ' (avg obj bytes '; print: oldAvgBytes maxDecimalPlaces: 2; nextPutAll: ' words '; print: oldAvgBytes / self wordSize maxDecimalPlaces: 2; nextPut: $); cr; + nextPutAll: 'initial new heap size: '; nextPutAll: newHeapSize asStringWithCommas; cr; + nextPutAll: 'change: '; print: change * 100.0 maxDecimalPlaces: 2; nextPut: $%; cr; - nextPutAll: 'old heap size: '; print: oldHeapSize; tab; - nextPutAll: ' (avg obj bytes '; print: (oldAvgBytes roundTo: 0.01); nextPutAll: ' words '; print: (oldAvgBytes / self wordSize roundTo: 0.01); nextPut: $); cr; - nextPutAll: 'initial new heap size: '; print: newHeapSize; cr; - nextPutAll: 'change: '; print: (change * 100.0 roundTo: 0.01); nextPut: $%; cr; flush. newHeapSize := newHeap endOfMemory - newHeap scavenger eden limit - newHeap totalFreeListBytes. change := newHeapSize - oldHeapSize / oldHeapSize. newAvgBytes := newHeapSize asFloat / newHeapNumObjs. Transcript + nextPutAll: 'final new heap size: '; nextPutAll: newHeapSize asStringWithCommas; tab; + nextPutAll: ' (avg obj bytes '; print: newAvgBytes maxDecimalPlaces: 2; nextPutAll: ' words '; print: newAvgBytes / self wordSize maxDecimalPlaces: 2; nextPut: $); cr; + nextPutAll: 'change: '; print: change * 100.0 maxDecimalPlaces: 2; nextPut: $%; cr; - nextPutAll: 'final new heap size: '; print: newHeapSize; tab; - nextPutAll: ' (avg obj bytes '; print: (newAvgBytes roundTo: 0.01); nextPutAll: ' words '; print: (newAvgBytes / self wordSize roundTo: 0.01); nextPut: $); cr; - nextPutAll: 'change: '; print: (change * 100.0 roundTo: 0.01); nextPut: $%; cr; flush!

1 0

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

01 Aug '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.840.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.840 Author: eem Time: 31 July 2014, 10:42:47.947 pm UUID: 2e1a90f6-f8c0-40d1-9af5-28d14899bdf2 Ancestors: VMMaker.oscog-eem.839 SpurBootstrap: Reduce use of bootstrap hack. Move assertVEPAES test into assertValidExecutionPointers to speed up singleStep simulation and hence the bootstrap. Simulator: Have VMCompiledMethodProxy>>encoderClass answer those associated with the simulated image, not those associated with the current system. Don't print scavenge report if bootstrapping (again for speed). Sista: Implement part of the Squeak V3 class trap code. =============== Diff against VMMaker.oscog-eem.839 =============== Item was added: + ----- Method: CogObjectRepresentationForSqueakV3>>branchIfInstanceOfBehavior:branches: (in category 'sista support') ----- + branchIfInstanceOfBehavior: classObj branches: branches + <var: #branches type: #'AbstractInstruction *'> + | jmpImmediate compactClassIndex | + <var: #jmpImmediate type: #'AbstractInstruction *'> + cogit MoveR: ReceiverResultReg R: TempReg. + jmpImmediate := self genJumpSmallIntegerInScratchReg: TempReg. + classObj = (objectMemory splObj: ClassSmallInteger) ifTrue: + [branches at: 0 put: jmpImmediate. + ^0]. + (compactClassIndex := objectMemory compactClassIndexOfClass: classObj) ~= 0 + ifTrue: + [self genGetCompactClassIndexNonImmOf: ReceiverResultReg into: TempReg. + cogit CmpCq: compactClassIndex R: TempReg] + ifFalse: + [self genGetClassObjectOfNonCompact: ReceiverResultReg into: TempReg. + cogit + annotate: (cogit CmpCw: classObj R: TempReg) + objRef: classObj]. + branches at: 0 put: (cogit JumpZero: 0). + ^0! Item was added: + ----- Method: CogObjectRepresentationForSqueakV3>>genGetClassObjectOfNonCompact:into: (in category 'compile abstract instructions') ----- + genGetClassObjectOfNonCompact: instReg into: destReg + cogit + MoveMw: objectMemory classFieldOffset r: instReg R: destReg; + AndCq: AllButTypeMask signedIntFromLong R: destReg. + ^0! Item was added: + ----- Method: ObjectMemory>>compactClassIndexOfClass: (in category 'object format') ----- + compactClassIndexOfClass: classObj + <api> + ^self compactClassIndexOfHeader: (self formatOfClass: classObj)! Item was changed: ----- Method: SpurGenerationScavengerSimulator>>scavenge: (in category 'scavenger') ----- scavenge: tenuringCriterion + manager bootstrapping ifFalse: + [coInterpreter transcript nextPutAll: 'scavenging('; print: manager statScavenges; nextPutAll: ')...'; flush]. - coInterpreter transcript nextPutAll: 'scavenging('; print: manager statScavenges; nextPutAll: ')...'; flush. ^super scavenge: tenuringCriterion! Item was changed: ----- Method: SpurMemoryManager>>allNewSpaceEntitiesDo: (in category 'object enumeration') ----- allNewSpaceEntitiesDo: aBlock "Enumerate all new space objects, including free objects." <inline: true> | prevObj prevPrevObj objOop limit | prevPrevObj := prevObj := nil. "After a scavenge eden is empty, futureSpace is empty, and all newSpace objects are in pastSpace. Objects are allocated in eden. So enumerate only pastSpace and eden." + self assert: (scavenger pastSpace start < scavenger eden start). - self assert: (self bootstrapping or: [scavenger pastSpace start < scavenger eden start]). objOop := self objectStartingAt: scavenger pastSpace start. limit := pastSpaceStart. [self oop: objOop isLessThan: limit] whileTrue: [aBlock value: objOop. prevPrevObj := prevObj. prevObj := objOop. objOop := self objectAfter: objOop limit: limit]. objOop := self objectStartingAt: scavenger eden start. [self oop: objOop isLessThan: freeStart] whileTrue: [aBlock value: objOop. prevPrevObj := prevObj. prevObj := objOop. objOop := self objectAfter: objOop limit: freeStart]. self touch: prevPrevObj. self touch: prevObj! Item was changed: ----- Method: SpurMemoryManager>>initializeObjectMemory: (in category 'initialization') ----- initializeObjectMemory: bytesToShift "Initialize object memory variables at startup time. Assume endOfMemory at al are initialised by the image-reading code via setHeapBase:memoryLimit:endOfMemory:. endOfMemory is assumed to point to the end of the last object in the image. Assume: image reader also initializes the following variables: specialObjectsOop lastHash" <inline: false> | freeListObj | "Catch mis-initializations leading to bad translations to C" self assert: BaseHeaderSize = self baseHeaderSize. self assert: (self maxSlotsForAlloc * BytesPerWord) asInteger > 0. self bootstrapping ifFalse: [self initSegmentBridgeWithBytes: self bridgeSize at: endOfMemory - self bridgeSize]. segmentManager adjustSegmentSwizzlesBy: bytesToShift. "image may be at a different address; adjust oops for new location" self adjustAllOopsBy: bytesToShift. specialObjectsOop := segmentManager swizzleObj: specialObjectsOop. "heavily used special objects" nilObj := self splObj: NilObject. falseObj := self splObj: FalseObject. trueObj := self splObj: TrueObject. "In Cog we insist that nil, true & false are next to each other (Cogit generates tighter conditional branch code as a result). In addition, Spur places the free lists and class table root page immediately following them." self assert: nilObj = oldSpaceStart. self assert: falseObj = (self objectAfter: nilObj). self assert: trueObj = (self objectAfter: falseObj). freeListObj := self objectAfter: trueObj. self reInitializeClassTablePostLoad: (self objectAfter: freeListObj). markStack := self swizzleObjStackAt: MarkStackRootIndex. weaklingStack := self swizzleObjStackAt: WeaklingStackRootIndex. ephemeronQueue := self swizzleObjStackAt: EphemeronQueueRootIndex. self assert: self validObjStacks. self assert: (self isEmptyObjStack: markStack). self assert: (self isEmptyObjStack: weaklingStack). self initializeFreeSpacePostLoad: freeListObj. segmentManager collapseSegmentsPostSwizzle. self computeFreeSpacePostSwizzle. self initializeOldSpaceFirstFree: freeOldSpaceStart. "initializes endOfMemory, freeStart, free space" + "self bootstrapping ifFalse: + ["self initializeNewSpaceVariables. + scavenger initializeRememberedSet"]". - self bootstrapping ifFalse: - [self initializeNewSpaceVariables. - scavenger initializeRememberedSet]. segmentManager checkSegments. numCompactionPasses := CompactionPassesForGC. "These defaults should depend on machine size; e.g. too small on a powerful laptop, too big on a Pi." growHeadroom := 16*1024*1024. "headroom when growing" shrinkThreshold := 32*1024*1024. "free space before shrinking" self setHeapSizeAtPreviousGC. heapGrowthToSizeGCRatio := 0.333333. "By default GC after scavenge if heap has grown by a third since the last GC"! Item was added: + ----- Method: StackInterpreter>>encoderClassForHeader: (in category 'simulation') ----- + encoderClassForHeader: headerInteger + ^Smalltalk classNamed: ((self headerIndicatesAlternateBytecodeSet: headerInteger) + ifTrue: [AltBytecodeEncoderClassName] + ifFalse: [BytecodeEncoderClassName])! Item was added: + ----- Method: StackInterpreterSimulator>>assertValidExecutionPointers (in category 'debug support') ----- + assertValidExecutionPointers + assertVEPAES ifTrue: + [super assertValidExecutionPointers]! Item was changed: ----- Method: StackInterpreterSimulator>>initialize (in category 'initialization') ----- initialize "Initialize the StackInterpreterSimulator when running the interpreter inside Smalltalk. The primary responsibility of this method is to allocate Smalltalk Arrays for variables that will be declared as statically-allocated global arrays in the translated code." super initialize. bootstrapping := false. transcript := Transcript. objectMemory ifNil: [objectMemory := self class objectMemoryClass simulatorClass new]. objectMemory coInterpreter: self. "Note: we must initialize ConstMinusOne differently for simulation, due to the fact that the simulator works only with +ve 32-bit values" ConstMinusOne := objectMemory integerObjectOf: -1. methodCache := Array new: MethodCacheSize. atCache := Array new: AtCacheTotalSize. self flushMethodCache. gcSemaphoreIndex := 0. externalSemaphoreSignalRequests := externalSemaphoreSignalResponses := #(). externalPrimitiveTable := CArrayAccessor on: (Array new: MaxExternalPrimitiveTableSize). externalPrimitiveTableFirstFreeIndex := 0. primitiveTable := self class primitiveTable copy. mappedPluginEntries := OrderedCollection new. objectMemory hasSpurMemoryManagerAPI ifTrue: [primitiveAccessorDepthTable := Array new: primitiveTable size. pluginList := {}. self loadNewPlugin: ''] ifFalse: [pluginList := {'' -> self }]. desiredNumStackPages := desiredEdenBytes := 0. "This is initialized on loading the image, but convenient for testing stack page values..." numStackPages := self defaultNumStackPages. startMicroseconds := Time totalSeconds * 1000000. "initialize InterpreterSimulator variables used for debugging" byteCount := 0. sendCount := 0. quitBlock := [^self]. traceOn := true. printSends := printReturns := printFrameAtEachStep := printBytecodeAtEachStep := false. myBitBlt := BitBltSimulator new setInterpreter: self. displayForm := 'Display has not yet been installed' asDisplayText form. eventQueue := SharedQueue new. suppressHeartbeatFlag := false. systemAttributes := Dictionary new. extSemTabSize := 256. disableBooleanCheat := false. + assertVEPAES := true. "a flag so the assertValidExecutionPointers can be disabled for simulation speed"! - assertVEPAES := true. "a flag so the assertValidExecutionPointers in run can be turned off for simulation speed"! Item was changed: ----- Method: StackInterpreterSimulator>>run (in category 'testing') ----- run "Just run" quitBlock := [displayView ifNotNil: [displayView containingWindow ifNotNil: [:topWindow| ((World submorphs includes: topWindow) and: [UIManager default confirm: 'close?']) ifTrue: [topWindow delete]]]. ^self]. self initStackPages. self loadInitialContext. self internalizeIPandSP. self fetchNextBytecode. [true] whileTrue: + [self assertValidExecutionPointers. - [assertVEPAES ifTrue: [self assertValidExecutionPointers]. atEachStepBlock value. "N.B. may be nil" self dispatchOn: currentBytecode in: BytecodeTable. self incrementByteCount]. localIP := localIP - 1. "undo the pre-increment of IP before returning" self externalizeIPandSP! Item was changed: ----- Method: VMCompiledMethodProxy>>encoderClass (in category 'accessing') ----- encoderClass + ^coInterpreter encoderClassForHeader: self header! - ^(coInterpreter headerIndicatesAlternateBytecodeSet: self header) - ifTrue: [EncoderForNewsqueakV4] - ifFalse: [EncoderForV3PlusClosures]!

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev August 2014