Vm-dev September 2014

vm-dev@lists.squeakfoundation.org

25 participants
90 discussions

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

26 Sep '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.886.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.886 Author: eem Time: 25 September 2014, 3:54:29.308 pm UUID: fb69945a-ff92-425c-9f6e-e2d9bba462ac Ancestors: VMMaker.oscog-eem.882 Fix regression in youngReferrers management in V3 become introduced in VMMaker.oscog-eem.882. We /must/ priune young referrers if mapObjectReferencesInMachineCodeForBecome removes a cog method from youngReferrers because it may get added back and youngReferrers cannot contain duplicates. Commit this separate from VMMaker.oscog-eem.885 to have it separate from the flush caches on Spur become changes from VMMaker.oscog-eem.883/884. To be clear, this is a branch. The head is 885. =============== Diff against VMMaker.oscog-eem.882 =============== 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) = 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. hasYoungObj := false] ifFalse: [cogMethod cmRefersToYoung: false]]]. cogMethod := methodZone methodAfter: cogMethod]. + "we /must/ prune youngReferrers here because a) the [cogMethod cmRefersToYoung: false] + block could have removed a method and subsequently it could be added back, and b) we + can not tolerate duplicates in the youngReferrers list." + methodZone pruneYoungReferrers. freedPIC ifTrue: [self unlinkSendsToFree]. codeModified ifTrue: "After updating oops in inline caches we need to flush the icache." [processor flushICacheFrom: codeBase to: methodZone limitZony asInteger]!

1 0

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

26 Sep '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.885.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.885 Author: eem Time: 25 September 2014, 3:34:13.601 pm UUID: 292f0a8d-0afa-4943-90fd-be53fb40772a Ancestors: VMMaker.oscog-eem.884 Fix regression in youngReferrers management in V3 become introduced in VMMaker.oscog-eem.882. We /must/ priune young referrers if mapObjectReferencesInMachineCodeForBecome removes a cog method from youngReferrers because it may get added back and youngReferrers cannot contain duplicates. Fix potential bug in Spur become argument validation. Check for immediates needs to come /after/ following forwarders since an object can become-forward to an immediate. Fix cPICHasForwardedClass:; this did /not/ enumerate the classIndices in a Spur Closed PIC. Fix codeGeneratorToComputeAccessorDepth. I went to all that trouble in VMMaker.oscog-eem.873 to not rely on cogitClass et al but forgot to change the operative case. =============== Diff against VMMaker.oscog-eem.884 =============== Item was changed: ----- Method: CogVMSimulator>>codeGeneratorToComputeAccessorDepth (in category 'primitive support') ----- codeGeneratorToComputeAccessorDepth ^VMMaker new - cogitClass: self class cogitClass; buildCodeGeneratorForInterpreter: CoInterpreterPrimitives includeAPIMethods: false initializeClasses: false! Item was changed: ----- Method: Cogit>>cPICHasForwardedClass: (in category 'in-line cacheing') ----- cPICHasForwardedClass: cPIC <var: #cPIC type: #'CogMethod *'> | pc | + pc := cPIC asUnsignedInteger + + firstCPICCaseOffset + + cPICCaseSize + - backEnd jumpLongConditionalByteSize. + 2 to: cPIC cPICNumCases do: - pc := cPIC asInteger + firstCPICCaseOffset. - 1 to: cPIC cPICNumCases do: [:i| | classIndex | + classIndex := backEnd inlineCacheTagAt: pc. - classIndex := backEnd inlineCacheTagAt: pc - - backEnd jumpLongConditionalByteSize - - backEnd loadLiteralByteSize. (objectMemory isForwardedClassIndex: classIndex) ifTrue: [^true]. pc := pc + cPICCaseSize]. ^false! 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) = 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. hasYoungObj := false] ifFalse: [cogMethod cmRefersToYoung: false]]]. cogMethod := methodZone methodAfter: cogMethod]. + "we /must/ prune youngReferrers here because a) the [cogMethod cmRefersToYoung: false] + block could have removed a method and subsequently it could be added back, and b) we + can not tolerate duplicates in the youngReferrers list." + methodZone pruneYoungReferrers. freedPIC ifTrue: [self unlinkSendsToFree]. 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: SpurMemoryManager>>containsOnlyValidBecomeObjects: (in category 'become implementation') ----- containsOnlyValidBecomeObjects: array "Answer 0 if the array contains only unpinned non-immediates. Otherwise answer an informative error code. Can't become: immediates!! Shouldn't become pinned objects." | fieldOffset effectsFlags oop | fieldOffset := self lastPointerOf: array. effectsFlags := 0. "same size as array2" [fieldOffset >= self baseHeaderSize] whileTrue: [oop := self longAt: array + fieldOffset. + (self isOopForwarded: oop) ifTrue: - (self isImmediate: oop) ifTrue: [^PrimErrInappropriate]. - (self isForwarded: oop) ifTrue: [oop := self followForwarded: oop. self longAt: array + fieldOffset put: oop]. + (self isImmediate: oop) ifTrue: [^PrimErrInappropriate]. (self isPinned: oop) ifTrue: [^PrimErrObjectIsPinned]. effectsFlags := effectsFlags bitOr: (self becomeEffectFlagsFor: oop). fieldOffset := fieldOffset - BytesPerOop]. "only set flags after checking all args." becomeEffectsFlags := effectsFlags. ^0! Item was changed: ----- Method: SpurMemoryManager>>containsOnlyValidBecomeObjects:and: (in category 'become implementation') ----- containsOnlyValidBecomeObjects: array1 and: array2 "Answer 0 if neither array contains only unpinned non-immediates. Otherwise answer an informative error code. Can't become: immediates!! Shouldn't become pinned objects." | fieldOffset effectsFlags oop | fieldOffset := self lastPointerOf: array1. effectsFlags := 0. "same size as array2" [fieldOffset >= self baseHeaderSize] whileTrue: [oop := self longAt: array1 + fieldOffset. + (self isOopForwarded: oop) ifTrue: - (self isImmediate: oop) ifTrue: [^PrimErrInappropriate]. - (self isForwarded: oop) ifTrue: [oop := self followForwarded: oop. self longAt: array1 + fieldOffset put: oop]. + (self isImmediate: oop) ifTrue: [^PrimErrInappropriate]. (self isPinned: oop) ifTrue: [^PrimErrObjectIsPinned]. effectsFlags := effectsFlags bitOr: (self becomeEffectFlagsFor: oop). oop := self longAt: array2 + fieldOffset. + (self isOopForwarded: oop) ifTrue: - (self isImmediate: oop) ifTrue: [^PrimErrInappropriate]. - (self isForwarded: oop) ifTrue: [oop := self followForwarded: oop. self longAt: array2 + fieldOffset put: oop]. + (self isImmediate: oop) ifTrue: [^PrimErrInappropriate]. (self isPinned: oop) ifTrue: [^PrimErrObjectIsPinned]. effectsFlags := effectsFlags bitOr: (self becomeEffectFlagsFor: oop). fieldOffset := fieldOffset - BytesPerOop]. "only set flags after checking all args." becomeEffectsFlags := effectsFlags. ^0!

1 0

[commit][3082] CogVM source as per VMMaker.oscog-eem.882
by commits＠squeakvm.org 25 Sep '14

25 Sep '14

Revision: 3082 Author: eliot Date: 2014-09-25 10:53:41 -0700 (Thu, 25 Sep 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.882 Spur: Fix bug in sweepToFollowForwardersForPigCompact which failed to update and answer lowest forwarder. Fixes numForwarders == 0 assert failures. Fix bug with become and class table not removing classes which become causes them to be unhashed. Fix bogus assert fail in synchronousSignal:. Refactor following code into ensureSemaphoreForwardedThroughContext: and fix the assert there-in. Use rawOverflowSlotsOf: in bytesInObject:. Make a little more progress on Spur image segment support. Provide a classTableEntriesDo: and use it to compute an arrayOfUnmarkedClasses. Cogit: Make sure voidImplicitReceiverCacheAt: sets codeModified if IRCs are inline. Make sure freeMethod: clears cmRefersToYoung Fix assert in cogitPostGCAction: that would fire erroneously in Spur become. Nuke some unneeded pruneYoungReferrers calls. Factor-out send-site unlinking into unlinkSendAt:targetMethod:sendTable: Sista: Rename ceClassTrap: et al to ceSistaTrap: given that Sista may trap in more cases than just unknown classes. Renumber the primitives in StackInterpreter>>callPrimitiveBytecode. Modified Paths: -------------- branches/Cog/build.linux32x86/HowToBuild branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/scripts/revertIfEssentiallyUnchanged branches/Cog/scripts/svnrevert branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.linux32x86/HowToBuild =================================================================== --- branches/Cog/build.linux32x86/HowToBuild 2014-09-18 17:12:31 UTC (rev 3081) +++ branches/Cog/build.linux32x86/HowToBuild 2014-09-25 17:53:41 UTC (rev 3082) @@ -188,6 +188,8 @@ N.B. The plugin set is defined by plugins.ext and plugins.int in the build dir. +Be prepared to install libuuid support. e.g. on CentOS 6.5 use +sudo yum -y install libuuid-devel Testing an external plugin has completely linked Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2014-09-18 17:12:31 UTC (rev 3081) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-09-25 17:53:41 UTC (rev 3082) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + CCodeGenerator VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d from - StackToRegisterMappingCogit VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + StackToRegisterMappingCogit VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -9413,7 +9413,8 @@ voidYoungReferrersPostTenureAll(); } assert(allMethodsHaveCorrectHeader()); - assert(kosherYoungReferrers()); + assert((gcMode == GCModeBecome) + || (kosherYoungReferrers())); } @@ -12114,10 +12115,8 @@ } cogMethod = ((CogMethod *) (roundUpLength((((sqInt)cogMethod)) + ((cogMethod->blockSize))))); } - pruneYoungReferrers(); if (freedPIC) { unlinkSendsToFree(); - codeModified = 1; } if (codeModified) { @@ -12553,7 +12552,7 @@ { sqInt *address; sqInt *address1; - usqInt cacheAddress; + sqInt cacheAddress; sqInt cacheTag; sqInt cacheTag1; sqInt cacheTagMarked; @@ -12626,6 +12625,7 @@ /* Either the cacheTag is unmarked (e.g. new class) or the target has been freed (because it is unmarked), so unlink the send. */ + /* begin unlinkSendAt:targetMethod:sendTable: */ unlinkedRoutine = sendTable1[((((targetMethod1->cmNumArgs)) < (NumSendTrampolines - 1)) ? ((targetMethod1->cmNumArgs)) : (NumSendTrampolines - 1))]; rewriteInlineCacheAttagtarget(backEnd, ((sqInt)mcpc), (targetMethod1->selector), unlinkedRoutine); codeModified = 1; @@ -12722,7 +12722,7 @@ static sqInt markYoungObjectspcmethod(sqInt annotation, char *mcpc, sqInt cogMethod) { - usqInt cacheAddress; + sqInt cacheAddress; sqInt cacheTag; sqInt cacheTag1; sqInt class; @@ -13813,7 +13813,7 @@ static sqInt remapIfObjectRefpchasYoung(sqInt annotation, char *mcpc, sqInt hasYoungPtr) { - usqInt cacheAddress; + sqInt cacheAddress; sqInt cacheTag; sqInt cacheTag1; sqInt entryPoint; @@ -14150,6 +14150,7 @@ if ((((targetMethod1->cmType)) == CMFree) || (((targetMethod1->selector)) == theSelector)) { + /* begin unlinkSendAt:targetMethod:sendTable: */ unlinkedRoutine = sendTable1[((((targetMethod1->cmNumArgs)) < (NumSendTrampolines - 1)) ? ((targetMethod1->cmNumArgs)) : (NumSendTrampolines - 1))]; rewriteInlineCacheAttagtarget(backEnd, ((sqInt)mcpc), (targetMethod1->selector), unlinkedRoutine); codeModified = 1; @@ -14201,6 +14202,7 @@ } if (((targetMethod1->cmType)) == CMFree) { + /* begin unlinkSendAt:targetMethod:sendTable: */ unlinkedRoutine = sendTable1[((((targetMethod1->cmNumArgs)) < (NumSendTrampolines - 1)) ? ((targetMethod1->cmNumArgs)) : (NumSendTrampolines - 1))]; rewriteInlineCacheAttagtarget(backEnd, ((sqInt)mcpc), (targetMethod1->selector), unlinkedRoutine); codeModified = 1; @@ -14244,8 +14246,10 @@ } } + /* begin unlinkSendAt:targetMethod:sendTable: */ unlinkedRoutine = sendTable1[((((targetMethod1->cmNumArgs)) < (NumSendTrampolines - 1)) ? ((targetMethod1->cmNumArgs)) : (NumSendTrampolines - 1))]; rewriteInlineCacheAttagtarget(backEnd, ((sqInt)mcpc), (targetMethod1->selector), unlinkedRoutine); + codeModified = 1; } else { @@ -14292,6 +14296,7 @@ } if ((((sqInt)targetMethod1)) == theCogMethod) { + /* begin unlinkSendAt:targetMethod:sendTable: */ unlinkedRoutine = sendTable1[((((targetMethod1->cmNumArgs)) < (NumSendTrampolines - 1)) ? ((targetMethod1->cmNumArgs)) : (NumSendTrampolines - 1))]; rewriteInlineCacheAttagtarget(backEnd, ((sqInt)mcpc), (targetMethod1->selector), unlinkedRoutine); codeModified = 1; @@ -14577,12 +14582,14 @@ static void voidImplicitReceiverCacheAt(sqInt mcpc) { - usqInt cacheAddress; + sqInt cacheAddress; assert(NumOopsPerIRC == 2); cacheAddress = (((usqInt)mcpc)) + (jumpShortByteSize(backEnd)); unalignedLongAtput(backEnd, cacheAddress, 0); unalignedLongAtput(backEnd, cacheAddress + BytesPerOop, 0); + codeModified = 1; + } static AbstractInstruction * @@ -14842,12 +14849,11 @@ } /* begin maybeFreeCountersOf: */ - (cogMethod->cmRefersToYoung = 0); } if (((cogMethod->cmType)) == CMOpenPIC) { removeFromOpenPICList(cogMethod); - (cogMethod->cmRefersToYoung = 0); } + (cogMethod->cmRefersToYoung = 0); (cogMethod->cmType = CMFree); methodBytesFreedSinceLastCompaction += (cogMethod->blockSize); } @@ -15117,8 +15123,15 @@ while (pointer < limitAddress) { cogMethod = ((CogMethod *) (longAt(pointer))); if (!((cogMethod->cmRefersToYoung))) { - print("* "); + print("*"); } + if (((cogMethod->cmType)) == CMFree) { + print("!"); + } + if (!(((cogMethod->cmRefersToYoung)) + && (((cogMethod->cmType)) != CMFree))) { + print(" "); + } printCogMethod(cogMethod); pointer += BytesPerWord; } Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-09-18 17:12:31 UTC (rev 3081) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-09-25 17:53:41 UTC (rev 3082) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + CCodeGenerator VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d */ Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-09-18 17:12:31 UTC (rev 3081) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-09-25 17:53:41 UTC (rev 3082) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d from - CoInterpreter VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 + CoInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -852,7 +852,7 @@ void printWronglySizedContexts(sqInt printContexts); static void restoreHeadersFromtofromandtofrom(sqInt firstIn, sqInt lastIn, sqInt hdrBaseIn, sqInt firstOut, sqInt lastOut, sqInt hdrBaseOut) NoDbgRegParms; static void runLeakCheckerForFullGC(sqInt fullGCFlag) NoDbgRegParms; -static 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; @@ -923,7 +923,6 @@ void * firstIndexableField(sqInt oop); sqInt firstLongFormat(void); static sqInt fixedFieldsOfformatlength(sqInt oop, sqInt fmt, sqInt wordLength) NoDbgRegParms; -static void followForwardedObjectFieldstoDepth(sqInt objOop, sqInt depth) NoDbgRegParms; static sqInt followForwarded(sqInt objOop) NoDbgRegParms; sqInt formatOfClass(sqInt classPointer); static sqInt fwdBlockValid(sqInt addr) NoDbgRegParms; @@ -2086,7 +2085,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.881"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.882"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -4385,7 +4384,7 @@ ? ((longAt(localFP + FoxMethod)) & MFMethodFlagIsBlockFlag) != 0 : (byteAt((localFP + FoxIFrameFlags) + 3)) != 0))) { goto commonCallerReturn; - goto l297; + goto l298; } closure = longAt(localFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(localFP + FoxMethod)))) < (startOfMemory()) ? ((mframeCogMethod(localFP))->cmNumArgs) @@ -4422,11 +4421,11 @@ theMethod = longAt((home + BaseHeaderSize) + (MethodIndex << ShiftForWord)); if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == 198) { unwindContextOrNilOrZero = home; - goto l299; + goto l300; } } unwindContextOrNilOrZero = ctxtOrNilOrZero; - l299: /* end internalFindUnwindThroughContext: */; + l300: /* end internalFindUnwindThroughContext: */; if (unwindContextOrNilOrZero == GIV(nilObj)) { /* error: can't find home on chain; cannot return */ @@ -4440,10 +4439,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext = longAt(localFP + FoxThisContext); - goto l301; + goto l302; } ourContext = marryFrameSP(localFP, localSP); - l301: /* end ensureFrameIsMarried:SP: */; + l302: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext); /* begin internalPush: */ @@ -4452,7 +4451,7 @@ GIV(argumentCount) = 1; goto normalSend; /* return self */ - goto l297; + goto l298; } if (unwindContextOrNilOrZero != 0) { /* begin internalAboutToReturn:through: */ @@ -4464,10 +4463,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext1 = longAt(localFP + FoxThisContext); - goto l298; + goto l299; } ourContext1 = marryFrameSP(localFP, localSP); - l298: /* end ensureFrameIsMarried:SP: */; + l299: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext1); /* begin internalPush: */ @@ -4478,7 +4477,7 @@ GIV(argumentCount) = 2; goto normalSend; /* return self */ - goto l297; + goto l298; } contextToReturnTo = null; if (((longAt((home + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) { @@ -4537,10 +4536,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext2 = longAt(localFP + FoxThisContext); - goto l300; + goto l301; } ourContext2 = marryFrameSP(localFP, localSP); - l300: /* end ensureFrameIsMarried:SP: */; + l301: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext2); /* begin internalPush: */ @@ -4549,7 +4548,7 @@ GIV(argumentCount) = 1; goto normalSend; /* return self */ - goto l297; + goto l298; } } assert(pageListIsWellFormed()); @@ -4660,7 +4659,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - goto l297; + goto l298; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } @@ -4678,7 +4677,7 @@ /* return self */ } - l297: /* end case */; + l298: /* end case */; break; case 121: /* returnTrue */ @@ -4798,27 +4797,27 @@ fp = (thePage->headFP); if (fp == theFP) { frameAbove = 0; - goto l304; + goto l305; } while (((callerFP = frameCallerFP(fp))) != 0) { if (callerFP == theFP) { frameAbove = fp; - goto l304; + goto l305; } fp = callerFP; } error("did not find theFP in stack page"); frameAbove = 0; - l304: /* end findFrameAbove:inPage: */; + l305: /* end findFrameAbove:inPage: */; /* begin newStackPage */ lruOrFree = ((mostRecentlyUsedPage())->nextPage); if (isFree(lruOrFree)) { newPage = lruOrFree; - goto l305; + goto l306; } divorceFramesIn(lruOrFree); newPage = lruOrFree; - l305: /* end newStackPage */; + l306: /* end newStackPage */; assert(newPage == GIV(stackPage)); moveFramesInthroughtoPage(thePage, frameAbove, newPage); markStackPageMostRecentlyUsed(newPage); @@ -4842,7 +4841,7 @@ longAtput((sp2 = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); GIV(stackPointer) = sp2; ceSendAborttonumArgs(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorCannotReturn << ShiftForWord)), contextToReturnFrom, 1); - goto l303; + goto l304; } GIV(instructionPointer) = 0; thePage = makeBaseFrameFor(contextToReturnTo); @@ -4881,7 +4880,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - goto l303; + goto l304; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } @@ -4899,8 +4898,8 @@ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); /* return self */ - l303: /* end baseFrameReturn */; - goto l302; + l304: /* end baseFrameReturn */; + goto l303; } /* begin frameCallerSavedIP: */ localIP = pointerForOop(longAt(localFP + FoxCallerSavedIP)); @@ -4929,7 +4928,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - goto l302; + goto l303; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } @@ -4946,7 +4945,7 @@ longAtPointerput(localSP, localReturnValue); } - l302: /* end case */; + l303: /* end case */; break; case 126: /* dynamicSuperSendBytecode */ @@ -5238,7 +5237,7 @@ GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); ok = 1; - goto l309; + goto l310; } /* second probe */ @@ -5249,7 +5248,7 @@ GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); ok = 1; - goto l309; + goto l310; } probe = (((usqInt) hash) >> 2) & MethodCacheMask; if (((GIV(methodCache)[probe + MethodCacheSelector]) == GIV(messageSelector)) @@ -5257,10 +5256,10 @@ GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); ok = 1; - goto l309; + goto l310; } ok = 0; - l309: /* end inlineLookupInMethodCacheSel:classTag: */; + l310: /* end inlineLookupInMethodCacheSel:classTag: */; if (ok) { /* begin ifAppropriateCompileToNativeCode:selector: */ methodHeader2 = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); @@ -5298,7 +5297,7 @@ localFP = pointerForOop(GIV(framePointer)); addNewMethodToCache(GIV(lkupClass)); } - l306: /* end internalFindNewMethod */; + l307: /* end internalFindNewMethod */; /* begin internalExecuteNewMethod */ VM_LABEL(0internalExecuteNewMethod); if (primitiveFunctionPointer != 0) { @@ -5312,31 +5311,31 @@ if (localPrimIndex >= 264) { longAtPointerput(localSP, longAt(((longAtPointer(localSP)) + BaseHeaderSize) + ((localPrimIndex - 264) << ShiftForWord))); 1; - goto l310; + goto l311; } if (localPrimIndex == 256) { 1; - goto l310; + goto l311; } if (localPrimIndex == 257) { longAtPointerput(localSP, GIV(trueObj)); 1; - goto l310; + goto l311; } if (localPrimIndex == 258) { longAtPointerput(localSP, GIV(falseObj)); 1; - goto l310; + goto l311; } if (localPrimIndex == 259) { longAtPointerput(localSP, GIV(nilObj)); 1; - goto l310; + goto l311; } longAtPointerput(localSP, (((localPrimIndex - 261) << 1) | 1)); 1; - l310: /* end internalQuickPrimitiveResponse */; - goto l308; + l311: /* end internalQuickPrimitiveResponse */; + goto l309; } /* begin externalizeIPandSP */ assert((((usqInt)localIP)) != (ceReturnToInterpreterPC())); @@ -5394,7 +5393,7 @@ returntoExecutive(popStack(), 1); browserPluginReturnIfNeeded(); null; - goto l308; + goto l309; } } if (methodHasCogMethod(GIV(newMethod))) { @@ -5475,11 +5474,11 @@ table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << ShiftForWord)); if (GIV(primFailCode) <= ((lastPointerOf(table)) / BytesPerWord)) { errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << ShiftForWord)); - goto l307; + goto l308; } } errorCode = ((GIV(primFailCode) << 1) | 1); - l307: /* end getErrorObjectFromPrimFailCode */; + l308: /* end getErrorObjectFromPrimFailCode */; longAtPointerput(localSP, errorCode); } GIV(primFailCode) = 0; @@ -5503,7 +5502,7 @@ localFP = pointerForOop(GIV(framePointer)); } } - l308: /* end internalExecuteNewMethod */; + l309: /* end internalExecuteNewMethod */; /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); @@ -6899,7 +6898,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l311; + goto l312; } if (bytecode == 172) { @@ -6909,7 +6908,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l311; + goto l312; } if (bytecode > 167) { @@ -6920,7 +6919,7 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l311; + goto l312; } } currentBytecode = bytecode + GIV(bytecodeSetSelector); @@ -6928,7 +6927,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(trueObj)); } - l311: /* end case */; + l312: /* end case */; break; case 179: /* bytecodePrimGreaterThan */ @@ -7078,7 +7077,7 @@ localIP = (localIP + (bytecode - 151)) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l312; + goto l313; } if (bytecode == 172) { @@ -7089,14 +7088,14 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l312; + goto l313; } currentBytecode = bytecode + GIV(bytecodeSetSelector); /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(falseObj)); } - l312: /* end case */; + l313: /* end case */; break; case 180: /* bytecodePrimLessOrEqual */ @@ -9793,7 +9792,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l313; + goto l314; } if (bytecode == 244) { @@ -9803,7 +9802,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l313; + goto l314; } if (bytecode == 243) { @@ -9814,7 +9813,7 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l313; + goto l314; } } currentBytecode = bytecode + GIV(bytecodeSetSelector); @@ -9822,7 +9821,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(trueObj)); } - l313: /* end case */; + l314: /* end case */; break; case 339: /*83*/ /* bytecodePrimGreaterThanV4 */ @@ -9972,7 +9971,7 @@ localIP = (localIP + (bytecode - 207)) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l314; + goto l315; } if (bytecode == 244) { @@ -9983,14 +9982,14 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l314; + goto l315; } currentBytecode = bytecode + GIV(bytecodeSetSelector); /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(falseObj)); } - l314: /* end case */; + l315: /* end case */; break; case 340: /*84*/ /* bytecodePrimLessOrEqualV4 */ @@ -12137,10 +12136,10 @@ : (byteAt((theFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(theFP))); ourContext = longAt(theFP + FoxThisContext); - goto l315; + goto l316; } ourContext = marryFrameSP(theFP, theSP); - l315: /* end ensureFrameIsMarried:SP: */; + l316: /* end ensureFrameIsMarried:SP: */; localIP -= 1; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext); @@ -13043,11 +13042,13 @@ { sqInt byte1; sqInt byte2; + sqInt prim; VM_LABEL(0callPrimitiveBytecode); error("callPrimitiveBytecode should not be evaluated. method activation should step beyond this bytecode."); } + l296: /* end case */; break; case 509: /*253*/ /* extPushClosureBytecode */ @@ -13081,10 +13082,10 @@ : (byteAt((theFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(theFP))); context = longAt(theFP + FoxThisContext); - goto l296; + goto l297; } context = marryFrameSP(theFP, theSP); - l296: /* end ensureFrameIsMarried:SP: */; + l297: /* end ensureFrameIsMarried:SP: */; /* begin closureIn:numArgs:instructionPointer:numCopiedValues: */ VM_LABEL(1closureInnumArgsinstructionPointernumCopiedValues); newClosure1 = eeInstantiateSmallClassnumSlots(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassBlockClosure << ShiftForWord)), ClosureFirstCopiedValueIndex + numCopied); @@ -20426,7 +20427,6 @@ synchronousSignal(sqInt aSemaphore) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt excessSignals; - sqInt firstLink; if (isEmptyList(aSemaphore)) { @@ -20446,7 +20446,7 @@ null; return 0; } - + /* begin ensureSemaphoreForwardedThroughContext: */ return resumepreemptedYieldingIffrom(removeFirstLinkOfList(aSemaphore), GIV(preemptionYields), CSSignal); } @@ -36766,15 +36766,17 @@ sqInt header1; sqInt header2; sqInt header3; + sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - usqInt next; + sqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; + sqInt sz3; sqInt target; usqInt w; @@ -36785,7 +36787,21 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - next = ((sqInt) (objectAfter(oop))); + /* begin objectAfter: */ + if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { + error("no objects after the end of memory"); + } + if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { + sz2 = (longAt(oop)) & AllButTypeMask; + } + else { + /* begin sizeBitsOf: */ + header3 = longAt(oop); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask + : header3 & SizeMask); + } + next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -36800,7 +36816,7 @@ else { sz1 = realHeader & SizeMask; } - next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); + next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -36854,18 +36870,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(newFreeChunk)) & AllButTypeMask; + sz3 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header3 = longAt(newFreeChunk); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + header4 = longAt(newFreeChunk); + sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); + : header4 & SizeMask); } - next = ((newFreeChunk + sz2) >= GIV(freeStart) + next = ((newFreeChunk + sz3) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); + : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -38737,7 +38753,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static usqInt +static sqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; @@ -40850,12 +40866,6 @@ return (((((usqInt) classFormat) >> 11) & 192) + ((((usqInt) classFormat) >> 2) & 0x3F)) - 1; } -static void -followForwardedObjectFieldstoDepth(sqInt objOop, sqInt depth) -{ - error("shouldNotImplement"); -} - static sqInt followForwarded(sqInt objOop) { Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-09-18 17:12:31 UTC (rev 3081) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-09-25 17:53:41 UTC (rev 3082) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-09-18 17:12:31 UTC (rev 3081) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-09-25 17:53:41 UTC (rev 3082) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d from - CoInterpreter VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 + CoInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.881 uuid: 539d444b-dd24-4254-a007-bd1e298e84f7 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -855,7 +855,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; @@ -926,7 +926,6 @@ void * firstIndexableField(sqInt oop); sqInt firstLongFormat(void); static sqInt fixedFieldsOfformatlength(sqInt oop, sqInt fmt, sqInt wordLength) NoDbgRegParms; -static void followForwardedObjectFieldstoDepth(sqInt objOop, sqInt depth) NoDbgRegParms; static sqInt followForwarded(sqInt objOop) NoDbgRegParms; sqInt formatOfClass(sqInt classPointer); static sqInt fwdBlockValid(sqInt addr) NoDbgRegParms; @@ -2089,7 +2088,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.881"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.882"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -4394,7 +4393,7 @@ ? ((longAt(localFP + FoxMethod)) & MFMethodFlagIsBlockFlag) != 0 : (byteAt((localFP + FoxIFrameFlags) + 3)) != 0))) { goto commonCallerReturn; - goto l297; + goto l298; } closure = longAt(localFP + (frameStackedReceiverOffsetNumArgs(((((usqInt)(longAt(localFP + FoxMethod)))) < (startOfMemory()) ? ((mframeCogMethod(localFP))->cmNumArgs) @@ -4431,11 +4430,11 @@ theMethod = longAt((home + BaseHeaderSize) + (MethodIndex << ShiftForWord)); if ((primitiveIndexOfMethodheader(theMethod, methodHeaderOf(theMethod))) == 198) { unwindContextOrNilOrZero = home; - goto l299; + goto l300; } } unwindContextOrNilOrZero = ctxtOrNilOrZero; - l299: /* end internalFindUnwindThroughContext: */; + l300: /* end internalFindUnwindThroughContext: */; if (unwindContextOrNilOrZero == GIV(nilObj)) { /* error: can't find home on chain; cannot return */ @@ -4449,10 +4448,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext = longAt(localFP + FoxThisContext); - goto l301; + goto l302; } ourContext = marryFrameSP(localFP, localSP); - l301: /* end ensureFrameIsMarried:SP: */; + l302: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext); /* begin internalPush: */ @@ -4461,7 +4460,7 @@ GIV(argumentCount) = 1; goto normalSend; /* return self */ - goto l297; + goto l298; } if (unwindContextOrNilOrZero != 0) { /* begin internalAboutToReturn:through: */ @@ -4473,10 +4472,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext1 = longAt(localFP + FoxThisContext); - goto l298; + goto l299; } ourContext1 = marryFrameSP(localFP, localSP); - l298: /* end ensureFrameIsMarried:SP: */; + l299: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext1); /* begin internalPush: */ @@ -4487,7 +4486,7 @@ GIV(argumentCount) = 2; goto normalSend; /* return self */ - goto l297; + goto l298; } contextToReturnTo = null; if (((longAt((home + BaseHeaderSize) + (SenderIndex << ShiftForWord))) & 1)) { @@ -4546,10 +4545,10 @@ : (byteAt((localFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(localFP))); ourContext2 = longAt(localFP + FoxThisContext); - goto l300; + goto l301; } ourContext2 = marryFrameSP(localFP, localSP); - l300: /* end ensureFrameIsMarried:SP: */; + l301: /* end ensureFrameIsMarried:SP: */; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext2); /* begin internalPush: */ @@ -4558,7 +4557,7 @@ GIV(argumentCount) = 1; goto normalSend; /* return self */ - goto l297; + goto l298; } } assert(pageListIsWellFormed()); @@ -4669,7 +4668,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - goto l297; + goto l298; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } @@ -4687,7 +4686,7 @@ /* return self */ } - l297: /* end case */; + l298: /* end case */; BREAK; CASE(121) /* returnTrue */ @@ -4807,27 +4806,27 @@ fp = (thePage->headFP); if (fp == theFP) { frameAbove = 0; - goto l304; + goto l305; } while (((callerFP = frameCallerFP(fp))) != 0) { if (callerFP == theFP) { frameAbove = fp; - goto l304; + goto l305; } fp = callerFP; } error("did not find theFP in stack page"); frameAbove = 0; - l304: /* end findFrameAbove:inPage: */; + l305: /* end findFrameAbove:inPage: */; /* begin newStackPage */ lruOrFree = ((mostRecentlyUsedPage())->nextPage); if (isFree(lruOrFree)) { newPage = lruOrFree; - goto l305; + goto l306; } divorceFramesIn(lruOrFree); newPage = lruOrFree; - l305: /* end newStackPage */; + l306: /* end newStackPage */; assert(newPage == GIV(stackPage)); moveFramesInthroughtoPage(thePage, frameAbove, newPage); markStackPageMostRecentlyUsed(newPage); @@ -4851,7 +4850,7 @@ longAtput((sp2 = GIV(stackPointer) - BytesPerWord), GIV(instructionPointer)); GIV(stackPointer) = sp2; ceSendAborttonumArgs(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (SelectorCannotReturn << ShiftForWord)), contextToReturnFrom, 1); - goto l303; + goto l304; } GIV(instructionPointer) = 0; thePage = makeBaseFrameFor(contextToReturnTo); @@ -4890,7 +4889,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - goto l303; + goto l304; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } @@ -4908,8 +4907,8 @@ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); /* return self */ - l303: /* end baseFrameReturn */; - goto l302; + l304: /* end baseFrameReturn */; + goto l303; } /* begin frameCallerSavedIP: */ localIP = pointerForOop(longAt(localFP + FoxCallerSavedIP)); @@ -4938,7 +4937,7 @@ GIV(framePointer) = localFP; ceEnterCogCodePopReceiverReg(); - goto l302; + goto l303; } localIP = pointerForOop(longAt(localFP + FoxIFSavedIP)); } @@ -4955,7 +4954,7 @@ longAtPointerput(localSP, localReturnValue); } - l302: /* end case */; + l303: /* end case */; BREAK; CASE(126) /* dynamicSuperSendBytecode */ @@ -5247,7 +5246,7 @@ GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); ok = 1; - goto l309; + goto l310; } /* second probe */ @@ -5258,7 +5257,7 @@ GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); ok = 1; - goto l309; + goto l310; } probe = (((usqInt) hash) >> 2) & MethodCacheMask; if (((GIV(methodCache)[probe + MethodCacheSelector]) == GIV(messageSelector)) @@ -5266,10 +5265,10 @@ GIV(newMethod) = GIV(methodCache)[probe + MethodCacheMethod]; primitiveFunctionPointer = ((void (*)()) (GIV(methodCache)[probe + MethodCachePrimFunction])); ok = 1; - goto l309; + goto l310; } ok = 0; - l309: /* end inlineLookupInMethodCacheSel:classTag: */; + l310: /* end inlineLookupInMethodCacheSel:classTag: */; if (ok) { /* begin ifAppropriateCompileToNativeCode:selector: */ methodHeader2 = longAt((GIV(newMethod) + BaseHeaderSize) + (HeaderIndex << ShiftForWord)); @@ -5307,7 +5306,7 @@ localFP = pointerForOop(GIV(framePointer)); addNewMethodToCache(GIV(lkupClass)); } - l306: /* end internalFindNewMethod */; + l307: /* end internalFindNewMethod */; /* begin internalExecuteNewMethod */ VM_LABEL(0internalExecuteNewMethod); if (primitiveFunctionPointer != 0) { @@ -5321,31 +5320,31 @@ if (localPrimIndex >= 264) { longAtPointerput(localSP, longAt(((longAtPointer(localSP)) + BaseHeaderSize) + ((localPrimIndex - 264) << ShiftForWord))); 1; - goto l310; + goto l311; } if (localPrimIndex == 256) { 1; - goto l310; + goto l311; } if (localPrimIndex == 257) { longAtPointerput(localSP, GIV(trueObj)); 1; - goto l310; + goto l311; } if (localPrimIndex == 258) { longAtPointerput(localSP, GIV(falseObj)); 1; - goto l310; + goto l311; } if (localPrimIndex == 259) { longAtPointerput(localSP, GIV(nilObj)); 1; - goto l310; + goto l311; } longAtPointerput(localSP, (((localPrimIndex - 261) << 1) | 1)); 1; - l310: /* end internalQuickPrimitiveResponse */; - goto l308; + l311: /* end internalQuickPrimitiveResponse */; + goto l309; } /* begin externalizeIPandSP */ assert((((usqInt)localIP)) != (ceReturnToInterpreterPC())); @@ -5403,7 +5402,7 @@ returntoExecutive(popStack(), 1); browserPluginReturnIfNeeded(); null; - goto l308; + goto l309; } } if (methodHasCogMethod(GIV(newMethod))) { @@ -5484,11 +5483,11 @@ table = longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (PrimErrTableIndex << ShiftForWord)); if (GIV(primFailCode) <= ((lastPointerOf(table)) / BytesPerWord)) { errorCode = longAt((table + BaseHeaderSize) + ((GIV(primFailCode) - 1) << ShiftForWord)); - goto l307; + goto l308; } } errorCode = ((GIV(primFailCode) << 1) | 1); - l307: /* end getErrorObjectFromPrimFailCode */; + l308: /* end getErrorObjectFromPrimFailCode */; longAtPointerput(localSP, errorCode); } GIV(primFailCode) = 0; @@ -5512,7 +5511,7 @@ localFP = pointerForOop(GIV(framePointer)); } } - l308: /* end internalExecuteNewMethod */; + l309: /* end internalExecuteNewMethod */; /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); @@ -6908,7 +6907,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l311; + goto l312; } if (bytecode == 172) { @@ -6918,7 +6917,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l311; + goto l312; } if (bytecode > 167) { @@ -6929,7 +6928,7 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l311; + goto l312; } } currentBytecode = bytecode + GIV(bytecodeSetSelector); @@ -6937,7 +6936,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(trueObj)); } - l311: /* end case */; + l312: /* end case */; BREAK; CASE(179) /* bytecodePrimGreaterThan */ @@ -7087,7 +7086,7 @@ localIP = (localIP + (bytecode - 151)) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l312; + goto l313; } if (bytecode == 172) { @@ -7098,14 +7097,14 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l312; + goto l313; } currentBytecode = bytecode + GIV(bytecodeSetSelector); /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(falseObj)); } - l312: /* end case */; + l313: /* end case */; BREAK; CASE(180) /* bytecodePrimLessOrEqual */ @@ -9802,7 +9801,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l313; + goto l314; } if (bytecode == 244) { @@ -9812,7 +9811,7 @@ /* begin fetchNextBytecode */ currentBytecode = (byteAtPointer(++localIP)) + GIV(bytecodeSetSelector); - goto l313; + goto l314; } if (bytecode == 243) { @@ -9823,7 +9822,7 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l313; + goto l314; } } currentBytecode = bytecode + GIV(bytecodeSetSelector); @@ -9831,7 +9830,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(trueObj)); } - l313: /* end case */; + l314: /* end case */; BREAK; CASE(339) /*83*/ /* bytecodePrimGreaterThanV4 */ @@ -9981,7 +9980,7 @@ localIP = (localIP + (bytecode - 207)) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l314; + goto l315; } if (bytecode == 244) { @@ -9992,14 +9991,14 @@ localIP = (localIP + offset) + 1; currentBytecode = (byteAtPointer(localIP)) + GIV(bytecodeSetSelector); - goto l314; + goto l315; } currentBytecode = bytecode + GIV(bytecodeSetSelector); /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), GIV(falseObj)); } - l314: /* end case */; + l315: /* end case */; BREAK; CASE(340) /*84*/ /* bytecodePrimLessOrEqualV4 */ @@ -12146,10 +12145,10 @@ : (byteAt((theFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(theFP))); ourContext = longAt(theFP + FoxThisContext); - goto l315; + goto l316; } ourContext = marryFrameSP(theFP, theSP); - l315: /* end ensureFrameIsMarried:SP: */; + l316: /* end ensureFrameIsMarried:SP: */; localIP -= 1; /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), ourContext); @@ -13052,11 +13051,13 @@ { sqInt byte1; sqInt byte2; + sqInt prim; VM_LABEL(0callPrimitiveBytecode); error("callPrimitiveBytecode should not be evaluated. method activation should step beyond this bytecode."); } + l296: /* end case */; BREAK; CASE(509) /*253*/ /* extPushClosureBytecode */ @@ -13090,10 +13091,10 @@ : (byteAt((theFP + FoxIFrameFlags) + 2)) != 0)) { assert(isContext(frameContext(theFP))); context = longAt(theFP + FoxThisContext); - goto l296; + goto l297; } context = marryFrameSP(theFP, theSP); - l296: /* end ensureFrameIsMarried:SP: */; + l297: /* end ensureFrameIsMarried:SP: */; /* begin closureIn:numArgs:instructionPointer:numCopiedValues: */ VM_LABEL(1closureInnumArgsinstructionPointernumCopiedValues); newClosure1 = eeInstantiateSmallClassnumSlots(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassBlockClosure << ShiftForWord)), ClosureFirstCopiedValueIndex + numCopied); @@ -20435,7 +20436,6 @@ synchronousSignal(sqInt aSemaphore) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt excessSignals; - sqInt firstLink; if (isEmptyList(aSemaphore)) { @@ -20455,7 +20455,7 @@ null; return 0; } - + /* begin ensureSemaphoreForwardedThroughContext: */ return resumepreemptedYieldingIffrom(removeFirstLinkOfList(aSemaphore), GIV(preemptionYields), CSSignal); } @@ -36775,15 +36775,17 @@ sqInt header1; sqInt header2; sqInt header3; + sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - usqInt next; + sqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; + sqInt sz3; sqInt target; usqInt w; @@ -36794,7 +36796,21 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - next = ((sqInt) (objectAfter(oop))); + /* begin objectAfter: */ + if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { + error("no objects after the end of memory"); + } + if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { + sz2 = (longAt(oop)) & AllButTypeMask; + } + else { + /* begin sizeBitsOf: */ + header3 = longAt(oop); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask + : header3 & SizeMask); + } + next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -36809,7 +36825,7 @@ else { sz1 = realHeader & SizeMask; } - next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); + next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -36863,18 +36879,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(newFreeChunk)) & AllButTypeMask; + sz3 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header3 = longAt(newFreeChunk); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + header4 = longAt(newFreeChunk); + sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); + : header4 & SizeMask); } - next = ((newFreeChunk + sz2) >= GIV(freeStart) + next = ((newFreeChunk + sz3) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); + : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -38746,7 +38762,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static usqInt +static sqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; @@ -40859,12 +40875,6 @@ return (((((usqInt) classFormat) >> 11) & 192) + ((((usqInt) classFormat) >> 2) & 0x3F)) - 1; } -static void -followForwardedObjectFieldstoDepth(sqInt objOop, sqInt depth) -{ - error("shouldNotImplement"); -} - static sqInt followForwarded(sqInt objOop) { Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2014-09-18 17:12:31 UTC (rev 3081) +++ branches/Cog/nsspursrc/vm/cogit.c 2014-09-25 17:53:41 UTC (rev 3082) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + CCodeGenerator VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d from - StackToRegisterMappingCogit VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 + StackToRegisterMappingCogit VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.880 uuid: 4aeaa3e0-8c6b-44b4-a124-128870605261 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.882 uuid: f22a00ff-acaf-49b0-9f6d-44efec689c0d " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -9367,7 +9367,8 @@ voidYoungReferrersPostTenureAll(); } assert(allMethodsHaveCorrectHeader()); - assert(kosherYoungReferrers()); + assert((gcMode == GCModeBecome) + || (kosherYoungReferrers())); } @@ -10555,8 +10556,6 @@ } if (freedPIC) { unlinkSendsToFree(); - pruneYoungReferrers(); - flushICacheFromto(processor, codeBase, ((sqInt)(limitZony()))); } } @@ -10655,8 +10654,6 @@ } if (freedMethod) { unlinkSendsToFree(); - pruneYoungReferrers(); - flushICacheFromto(processor, codeBase, ((sqInt)(limitZony()))); } } @@ -12225,10 +12222,8 @@ } cogMethod = ((CogMethod *) (roundUpLength((((sqInt)cogMethod)) + ((cogMethod->blockSize))))); } - pruneYoungReferrers(); if (freedPIC) { unlinkSendsToFree(); - codeModified = 1; } if (codeModified) { @@ -14039,6 +14034,7 @@ if ((((targetMethod1->cmType)) == CMFree) || (((targetMethod1->selector)) == theSelector)) { + /* begin unlinkSendAt:targetMethod:sendTable: */ unlinkedRoutine = sendTable1[((((targetMethod1->cmNumArgs)) < (NumSendTrampolines - 1)) ? ((targetMethod1->cmNumArgs)) : (NumSendTrampolines - 1))]; rewriteInlineCacheAttagtarget(backEnd, ((sqInt)mcpc), (targetMethod1->selector), unlinkedRoutine); codeModified = 1; @@ -14090,6 +14086,7 @@ } if (((targetMethod1->cmType)) == CMFree) { + /* begin unlinkSendAt:targetMethod:sendTable: */ unlinkedRoutine = sendTable1[((((targetMethod1->cmNumArgs)) < (NumSendTrampolines - 1)) ? ((targetMethod1->cmNumArgs)) : (NumSendTrampolines - 1))]; rewriteInlineCacheAttagtarget(backEnd, ((sqInt)mcpc), (targetMethod1->selector), unlinkedRoutine); codeModified = 1; @@ -14133,8 +14130,10 @@ } } + /* begin unlinkSendAt:targetMethod:sendTable: */ unlinkedRoutine = sendTable1[((((targetMethod1->cmNumArgs)) < (NumSendTrampolines - 1)) ? ((targetMethod1->cmNumArgs)) : (NumSendTrampolines - 1))]; rewriteInlineCacheAttagtarget(backEnd, ((sqInt)mcpc), (targetMethod1->selector), unlinkedRoutine); + codeModified = 1; } else { @@ -14181,6 +14180,7 @@ } if ((((sqInt)targetMethod1)) == theCogMethod) { + /* begin unlinkSendAt:targetMethod:sendTable: */ unlinkedRoutine = sendTable1[((((targetMethod1->cmNumArgs)) < (NumSendTrampolines - 1)) ? ((targetMethod1->cmNumArgs)) : (NumSendTrampolines - 1))]; rewriteInlineCacheAttagtarget(backEnd, ((sqInt)mcpc), (targetMethod1->selector), unlinkedRoutine); codeModified = 1; @@ -14472,6 +14472,7 @@ cacheAddress = implicitReceiveCacheAt(backEnd, mcpc); unalignedLongAtput(backEnd, cacheAddress, 0); unalignedLongAtput(backEnd, cacheAddress + BytesPerOop, 0); + } static AbstractInstruction * @@ -14740,12 +14741,11 @@ } /* begin maybeFreeCountersOf: */ @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.884.mcz
by commits＠source.squeak.org 25 Sep '14

25 Sep '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.884.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.884 Author: eem Time: 25 September 2014, 10:20:20.047 am UUID: 964a6c98-a49a-441b-8030-3e4d869efe22 Ancestors: VMMaker.oscog-eem.883 Straggler now uses the revised classTableEntriesDo: =============== Diff against VMMaker.oscog-eem.883 =============== Item was changed: ----- Method: SpurMemoryManager>>printInvalidClassTableEntries (in category 'class table') ----- printInvalidClassTableEntries "Print the objects in the classTable that have bad hashes." <api> self validClassTableRootPages ifFalse: [coInterpreter print: 'class table invalid; cannot print'; cr. ^self]. self classTableEntriesDo: + [:classOrNil :index| | hash | - [:classOrNil :i :j| | hash | ((self isForwarded: classOrNil) or: [(hash := self rawHashBitsOf: classOrNil) = 0 or: [(self noCheckClassAtIndex: hash) ~= classOrNil]]) ifTrue: [coInterpreter + print: 'entry '; printHex: index; - print: 'entry '; printHex: i * self classTablePageSize + j; print: ' oop '; printHex: classOrNil; print: ' hash '; printHex: hash; print: ' => '; printHex: (self classAtIndex: hash); cr]]!

1 0

VM Maker: BytecodeSets.spur-eem.14.mcz
by commits＠source.squeak.org 25 Sep '14

25 Sep '14

Eliot Miranda uploaded a new version of BytecodeSets to project VM Maker: http://source.squeak.org/VMMaker/BytecodeSets.spur-eem.14.mcz ==================== Summary ==================== Name: BytecodeSets.spur-eem.14 Author: eem Time: 24 September 2014, 6:40:01.581 pm UUID: 2a61031e-3b83-4b95-a486-b6a3ce885c90 Ancestors: BytecodeSets.spur-eem.13 FIx EncoderForSistaV1's comment defining in-line unchecked at: primitives 2064 through 2069. =============== Diff against BytecodeSets.spur-eem.13 =============== Item was changed: BytecodeEncoder subclass: #EncoderForSistaV1 (excessive size, no diff calculated)

1 0

VM Maker: VMMaker.oscog-eem.883.mcz
by commits＠source.squeak.org 25 Sep '14

25 Sep '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.883.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.883 Author: eem Time: 24 September 2014, 6:34:42.166 pm UUID: a585d66e-f0cd-42cd-ad84-5cc861a20f9e Ancestors: VMMaker.oscog-eem.882 Spur: Change become to flush method caches for becommed classes. I'm not sure this is necessary but strangely the new code is faster than 882 for the Newspeak bootstrap. So I'm committing this to allow me to compare the two. Changes are to - add a BecameActiveClassFlag to becomeEffectsFlags - refuse to do an in-place become on active classes. - flush the caches before the post-become scan of the class table so that forwarded classes can be spotted. i.e. if a class index in a method cache is that of a forwarded class then it was becommed and the cache entry can be voided. =============== Diff against VMMaker.oscog-eem.882 =============== Item was changed: SystemOrganization addCategory: #'VMMaker-Building'! SystemOrganization addCategory: #'VMMaker-Interpreter'! SystemOrganization addCategory: #'VMMaker-InterpreterSimulation'! SystemOrganization addCategory: #'VMMaker-InterpreterSimulation-Morphic'! SystemOrganization addCategory: #'VMMaker-JIT'! SystemOrganization addCategory: #'VMMaker-JITSimulation'! SystemOrganization addCategory: #'VMMaker-Multithreading'! SystemOrganization addCategory: #'VMMaker-Plugins'! SystemOrganization addCategory: #'VMMaker-Plugins-Alien'! + SystemOrganization addCategory: #'VMMaker-Plugins-IOS'! SystemOrganization addCategory: #'VMMaker-PostProcessing'! SystemOrganization addCategory: #'VMMaker-SmartSyntaxPlugins'! SystemOrganization addCategory: #'VMMaker-SpurMemoryManager'! SystemOrganization addCategory: #'VMMaker-SpurMemoryManagerSimulation'! SystemOrganization addCategory: #'VMMaker-Support'! SystemOrganization addCategory: #'VMMaker-Tests'! SystemOrganization addCategory: #'VMMaker-Translation to C'! - SystemOrganization addCategory: #'VMMaker-Plugins-IOS'! Item was added: + ----- Method: CoInterpreter>>flushBecommedClassesInMethodZone (in category 'object memory support') ----- + flushBecommedClassesInMethodZone + <inline: true> + cogit unlinkSendsToForwardedClasses! Item was added: + ----- Method: Cogit>>cPICHasForwardedClass: (in category 'in-line cacheing') ----- + cPICHasForwardedClass: cPIC + <var: #cPIC type: #'CogMethod *'> + | pc | + pc := cPIC asInteger + firstCPICCaseOffset. + 1 to: cPIC cPICNumCases do: + [:i| | classIndex | + classIndex := backEnd inlineCacheTagAt: pc + - backEnd jumpLongConditionalByteSize + - backEnd loadLiteralByteSize. + (objectMemory isForwardedClassIndex: classIndex) ifTrue: + [^true]. + pc := pc + cPICCaseSize]. + ^false! Item was added: + ----- Method: Cogit>>isSuperSend: (in category 'in-line cacheing') ----- + isSuperSend: entryPoint + <inline: true> + ^(entryPoint bitAnd: entryPointMask) ~= checkedEntryAlignment! Item was added: + ----- Method: Cogit>>unlinkIfForwardedSend:pc:ignored: (in category 'in-line cacheing') ----- + unlinkIfForwardedSend: annotation pc: mcpc ignored: superfluity + <var: #mcpc type: #'char *'> + | entryPoint cacheAddress | + (self isSendAnnotation: annotation) ifTrue: + [entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. + entryPoint > methodZoneBase + ifTrue: "It's a linked send, but maybe a super send or linked to an OpenPIC, in which case the cache tag will be a selector...." + [(objectMemory isForwardedClassIndex: (backEnd inlineCacheTagAt: mcpc)) ifTrue: + [self targetMethodAndSendTableFor: entryPoint into: + [:targetMethod :sendTable| + self unlinkSendAt: mcpc targetMethod: targetMethod sendTable: sendTable]]] + ifFalse: + [self cppIf: NewspeakVM ifTrue: + [entryPoint = ceImplicitReceiverTrampoline ifTrue: + [self assert: NumOopsPerIRC = 2. + cacheAddress := self implicitReceiverCacheAddressAt: mcpc. + ((objectMemory isForwardedClassIndex: (backEnd unalignedLongAt: cacheAddress)) + or: [objectMemory isForwardedClassIndex: (backEnd unalignedLongAt: cacheAddress + BytesPerOop)]) ifTrue: + [self voidImplicitReceiverCacheAt: mcpc]]]]]. + ^0 "keep scanning"! Item was added: + ----- Method: Cogit>>unlinkSendsToForwardedClasses (in category 'jit - api') ----- + unlinkSendsToForwardedClasses + <api> + <option: #SpurObjectMemory> + "Unlink all sends in cog methods whose class tag is that of a forwarded class." + | cogMethod freedPIC | + <var: #cogMethod type: #'CogMethod *'> + methodZoneBase ifNil: [^self]. + cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'. + codeModified := freedPIC := false. + [cogMethod < methodZone limitZony] whileTrue: + [cogMethod cmType = CMMethod + ifTrue: + [self mapFor: cogMethod + performUntil: #unlinkIfForwardedSend:pc:ignored: + arg: 0] + ifFalse: + [(cogMethod cmType = CMClosedPIC + and: [self cPICHasForwardedClass: cogMethod]) ifTrue: + [methodZone freeMethod: cogMethod. + freedPIC := true]]. + cogMethod := methodZone methodAfter: cogMethod]. + freedPIC + ifTrue: [self unlinkSendsToFree] + ifFalse: + [codeModified ifTrue: "After possibly updating inline caches we need to flush the icache." + [processor flushICacheFrom: methodZoneBase to: methodZone limitZony asInteger]]! Item was added: + ----- Method: Spur32BitCoMemoryManager>>isForwardedClassIndex: (in category 'class table') ----- + isForwardedClassIndex: maybeClassIndex + "A lenient tester of forwarded class indices for inline cache management in the Cogit." + <api> + | classTablePage entry | + maybeClassIndex asUnsignedInteger >= self classTableRootSlots ifTrue: + [^false]. + classTablePage := self fetchPointer: maybeClassIndex >> self classTableMajorIndexShift + ofObject: hiddenRootsObj. + classTablePage = nilObj ifTrue: + [^false]. + entry := self + fetchPointer: (maybeClassIndex bitAnd: self classTableMinorIndexMask) + ofObject: classTablePage. + ^self isForwarded: entry! Item was changed: ----- Method: SpurMemoryManager class>>initializeSpurObjectRepresentationConstants (in category 'class initialization') ----- initializeSpurObjectRepresentationConstants "SpurMemoryManager initializeSpurObjectRepresentationConstants" BecamePointerObjectFlag := 1. BecameCompiledMethodFlag := 2. OldBecameNewFlag := 4. + BecameActiveClassFlag := 8 "For flushing method caches"! - "BecameClassFlag := 8" "this turns out not to be actionable" - ! 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. + "N.B. perform coInterpreter's postBecomeAction: *before* postBecomeScanClassTable: + to allow the coInterpreter to void method cache entries by spotting classIndices that + refer to forwarded objects. postBecomeScanClassTable: follows forwarders in the table." - self postBecomeScanClassTable: becomeEffectsFlags. coInterpreter postBecomeAction: becomeEffectsFlags. + self postBecomeScanClassTable: becomeEffectsFlags. becomeEffectsFlags := 0. self assert: self validClassTableHashes. self leakCheckBecome ifTrue: [self runLeakCheckerForFullGC: true]. ^PrimNoErr "success"! Item was changed: ----- Method: SpurMemoryManager>>becomeEffectFlagsFor: (in category 'become implementation') ----- becomeEffectFlagsFor: objOop "Answer the appropriate become effect flags for objOop, or 0 if none. + The effect flags determine how much work is done after the become + in following forwarding pointers, voiding method caches, etc." - The effect flags affect how much work is done after the become in - following forwarding pointers." <inline: false> ^(self isPointersNonImm: objOop) ifTrue: + [| hash | + ((hash := self rawHashBitsOf: objOop) ~= 0 + and: [(self classAtIndex: hash) = objOop]) + ifTrue: [BecamePointerObjectFlag + BecameActiveClassFlag] + ifFalse: [BecamePointerObjectFlag]] - [BecamePointerObjectFlag - "older code that identified class objects, but it isn't helpful:" - "| hash | - (hash := self rawHashBitsOf: objOop) = 0 - ifTrue: ""Can't identify an abstract class by the class table; it may not be there-in."" - [(coInterpreter objCouldBeClassObj: objOop) - ifTrue: [BecamePointerObjectFlag + BecameClassFlag] - ifFalse: [BecamePointerObjectFlag]] - ifFalse: ""if an object has a hash and it's a class it must be in the table."" - [(self classAtIndex: hash) = objOop - ifTrue: [BecamePointerObjectFlag + BecameClassFlag] - ifFalse: [BecamePointerObjectFlag]]"] ifFalse: [(self isCompiledMethod: objOop) ifTrue: [BecameCompiledMethodFlag] ifFalse: [0]]! Item was changed: ----- Method: SpurMemoryManager>>doBecome:and:copyHash: (in category 'become implementation') ----- doBecome: obj1 and: obj2 copyHash: copyHashFlag "Inner dispatch for two-way become. N.B. At least in current two-way become use copyHashFlag is false." | o1ClassIndex o2ClassIndex | + "in-lined - copyHashFlag ifFalse: - ["in-lined classIndex := (self isInClassTable: obj) ifTrue: [self rawHashBitsOf: obj] ifFalse: [0] + for speed." + o1ClassIndex := self rawHashBitsOf: obj1. + (o1ClassIndex ~= 0 and: [(self classAtIndex: o1ClassIndex) ~= obj1]) ifTrue: + [o1ClassIndex := 0]. + o2ClassIndex := self rawHashBitsOf: obj2. + (o2ClassIndex ~= 0 and: [(self classAtIndex: o2ClassIndex) ~= obj2]) ifTrue: + [o2ClassIndex := 0]. + + "Refuse to do an in-place become on classes since their being + forwarded is used in the flush method cache implementations." + ((self numSlotsOf: obj1) = (self numSlotsOf: obj2) + and: [o1ClassIndex = 0 + and: [o2ClassIndex = 0]]) ifTrue: - for speed." - o1ClassIndex := self rawHashBitsOf: obj1. - (o1ClassIndex ~= 0 and: [(self classAtIndex: o1ClassIndex) ~= obj1]) ifTrue: - [o1ClassIndex := 0]. - o2ClassIndex := self rawHashBitsOf: obj2. - (o2ClassIndex ~= 0 and: [(self classAtIndex: o2ClassIndex) ~= obj2]) ifTrue: - [o2ClassIndex := 0]]. - (self numSlotsOf: obj1) = (self numSlotsOf: obj2) ifTrue: [self inPlaceBecome: obj1 and: obj2 copyHashFlag: copyHashFlag. - self assert: (o1ClassIndex = 0 - or: [(self rawHashBitsOf: (self classAtIndex: o1ClassIndex)) = o1ClassIndex]). - self assert: (o2ClassIndex = 0 - or: [(self rawHashBitsOf: (self classAtIndex: o2ClassIndex)) = o2ClassIndex]). ^self]. self outOfPlaceBecome: obj1 and: obj2 copyHashFlag: copyHashFlag. "if copyHashFlag then nothing changes, since hashes were also swapped." copyHashFlag ifTrue: [^self]. + "if copyHash is false then the classTable entries must be updated. + We leave the following until postBecomeScanClassTable:, but must + swap the forwarders if two active classes have been becommed, + and assign hashes if not." - "if copyHash is false then the classTable entries must be updated." o1ClassIndex ~= 0 ifTrue: [o2ClassIndex ~= 0 + ifTrue: + [self classAtIndex: o1ClassIndex put: obj2. + self classAtIndex: o2ClassIndex put: obj1] + ifFalse: "o2 wasn't in the table; set its hash" - ifTrue: "both were in the table; just swap entries" - [| tmp | - tmp := self classAtIndex: o1ClassIndex. - self classAtIndex: o1ClassIndex put: obj2. - self classAtIndex: o2ClassIndex put: tmp] - ifFalse: "o2 wasn't in the table; put it there" [| newObj2 | newObj2 := self followForwarded: obj1. self assert: (self rawHashBitsOf: newObj2) = 0. + self setHashBitsOf: newObj2 to: o1ClassIndex]] - self setHashBitsOf: newObj2 to: o1ClassIndex. - self classAtIndex: o1ClassIndex put: newObj2]] ifFalse: + [o2ClassIndex ~= 0 ifTrue: "o1 wasn't in the table; set its hash" - [o2ClassIndex ~= 0 ifTrue: [| newObj1 | newObj1 := self followForwarded: obj2. self assert: (self rawHashBitsOf: newObj1) = 0. + self setHashBitsOf: newObj1 to: o2ClassIndex]]! - self setHashBitsOf: newObj1 to: o2ClassIndex. - self classAtIndex: o2ClassIndex put: newObj1]]! Item was changed: ----- Method: SpurMemoryManager>>inPlaceBecome:and:copyHashFlag: (in category 'become implementation') ----- inPlaceBecome: obj1 and: obj2 copyHashFlag: copyHashFlag "Do become in place by swapping object contents." | headerTemp temp1 temp2 o1HasYoung o2HasYoung fmt | self assert: (self numSlotsOf: obj1) = (self numSlotsOf: obj2). + self assert: ((self rawHashBitsOf: obj1) = 0 + or: [(self classOrNilAtIndex: (self rawHashBitsOf: obj1)) ~= obj1]). + self assert: ((self rawHashBitsOf: obj2) = 0 + or: [(self classOrNilAtIndex: (self rawHashBitsOf: obj2)) ~= obj2]). "swap headers, but swapping headers swaps remembered bits; these need to be unswapped." temp1 := self isRemembered: obj1. temp2 := self isRemembered: obj2. headerTemp := self long64At: obj1. self long64At: obj1 put: (self long64At: obj2). self long64At: obj2 put: headerTemp. self setIsRememberedOf: obj1 to: temp1. self setIsRememberedOf: obj2 to: temp2. "swapping headers swaps hash; if !!copyHashFlag undo hash copy" copyHashFlag ifFalse: [temp1 := self rawHashBitsOf: obj1. self setHashBitsOf: obj1 to: (self rawHashBitsOf: obj2). self setHashBitsOf: obj2 to: temp1]. o1HasYoung := o2HasYoung := false. 0 to: (self numSlotsOf: obj1) - 1 do: [:i| temp1 := self fetchPointer: i ofObject: obj1. temp2 := self fetchPointer: i ofObject: obj2. self storePointerUnchecked: i ofObject: obj1 withValue: temp2. self storePointerUnchecked: i ofObject: obj2 withValue: temp1. (self isYoung: temp2) ifTrue: [o1HasYoung := true]. (self isYoung: temp1) ifTrue: [o2HasYoung := true]]. (self isOldObject: obj1) ifTrue: [fmt := self formatOf: obj1. (o1HasYoung and: [(self isPureBitsFormat: fmt) not]) ifTrue: [self possibleRootStoreInto: obj1]]. (self isOldObject: obj2) ifTrue: [fmt := self formatOf: obj2. (o2HasYoung and: [(self isPureBitsFormat: fmt) not]) ifTrue: [self possibleRootStoreInto: obj2]]! Item was changed: ----- Method: SpurMemoryManager>>printInvalidClassTableEntries (in category 'class table') ----- printInvalidClassTableEntries "Print the objects in the classTable that have bad hashes." <api> self validClassTableRootPages ifFalse: [coInterpreter print: 'class table invalid; cannot print'; cr. ^self]. + self classTableEntriesDo: + [:classOrNil :i :j| | hash | + ((self isForwarded: classOrNil) + or: [(hash := self rawHashBitsOf: classOrNil) = 0 + or: [(self noCheckClassAtIndex: hash) ~= classOrNil]]) ifTrue: + [coInterpreter + print: 'entry '; printHex: i * self classTablePageSize + j; + print: ' oop '; printHex: classOrNil; + print: ' hash '; printHex: hash; print: ' => '; printHex: (self classAtIndex: hash); + cr]]! - 0 to: numClassTablePages - 1 do: - [:i| | page | - page := self fetchPointer: i ofObject: hiddenRootsObj. - 0 to: self classTablePageSize - 1 do: - [:j| | classOrNil hash | - classOrNil := self fetchPointer: j ofObject: page. - classOrNil ~= nilObj ifTrue: - [((self isForwarded: classOrNil) - or: [(hash := self rawHashBitsOf: classOrNil) = 0 - or: [(self noCheckClassAtIndex: hash) ~= classOrNil]]) ifTrue: - [coInterpreter - print: 'entry '; printHex: i * self classTablePageSize + j; - print: ' oop '; printHex: classOrNil; - print: ' hash '; printHex: hash; print: ' => '; printHex: (self classAtIndex: hash); - cr]]]]! Item was added: + ----- Method: SpurMemoryManager>>printInvalidClassTableHashes (in category 'class table') ----- + printInvalidClassTableHashes + "Print the entries in the classTable that have invalid hashes." + + self validClassTableRootPages ifFalse: + [^false]. + + self classTableEntriesDo: + [:entry :index| | hash | + (self isForwarded: entry) + ifTrue: + [coInterpreter printHex: entry; print: ' @ '; printHex: index; print: ' forwarder'] + ifFalse: + [hash := self rawHashBitsOf: entry. + hash = 0 + ifTrue: + [coInterpreter printHex: entry; print: ' @ '; printHex: index; print: ' no hash'] + ifFalse: + [(self noCheckClassAtIndex: hash) ~= entry ifTrue: + [coInterpreter printHex: entry; print: ' @ '; printHex: index; print: ' bad hash: '; printHex: hash]]]]! Item was added: + ----- Method: StackInterpreter>>flushBecommedClassesInMethodCache (in category 'object memory support') ----- + flushBecommedClassesInMethodCache + "Flush any entries in the cache which refer to a forwarded (becommed) class." + 0 to: MethodCacheSize - 1 by: MethodCacheEntrySize do: + [:i | | c s | + c := methodCache at: i + MethodCacheClass. + s := methodCache at: i + MethodCacheSelector. + (c ~= 0 and: [s ~= 0 + and: [objectMemory isForwarded: (objectMemory classOrNilAtIndex: c)]]) ifTrue: + [methodCache + at: i + MethodCacheClass put: 0; + at: i + MethodCacheSelector put: 0]]. + self flushAtCache! Item was added: + ----- Method: StackInterpreter>>flushBecommedClassesInMethodZone (in category 'object memory support') ----- + flushBecommedClassesInMethodZone + "This is just a stub for the CoInterpreter"! Item was changed: ----- Method: StackInterpreter>>postBecomeAction: (in category 'object memory support') ----- postBecomeAction: theBecomeEffectsFlags "Insulate the stack zone from the effects of a become. All receivers must be unfollowed for two reasons: 1. inst var access is direct with no read barrier 2. super sends (always to the receiver) have no class check and so don't trap for forwarded receivers. Methods must be unfollowed since bytecode access is direct with no read barrier. But this only needs to be done if the becomeEffectsFlags indicate that a CompiledMethod was becommed. The scheduler state must be followed, but only if the becomeEffectsFlags indicate that a pointer object was becommed." self followForwardingPointersInStackZone: theBecomeEffectsFlags. theBecomeEffectsFlags ~= 0 ifTrue: [(theBecomeEffectsFlags anyMask: BecameCompiledMethodFlag) ifTrue: [self followForwardedMethodsInMethodCache. self followForwardedMethodsInMethodZone]. "for CoInterpreter" + (theBecomeEffectsFlags anyMask: BecameActiveClassFlag) ifTrue: + [self flushBecommedClassesInMethodCache. + self flushBecommedClassesInMethodZone]. "for CoInterpreter" self followForwardingPointersInScheduler. self followForwardingPointersInSpecialObjectsArray. self followForwardingPointersInProfileState]! Item was changed: VMBasicConstants subclass: #VMSpurObjectRepresentationConstants instanceVariableNames: '' + classVariableNames: 'BecameActiveClassFlag BecameCompiledMethodFlag BecamePointerObjectFlag OldBecameNewFlag' - classVariableNames: 'BecameCompiledMethodFlag BecamePointerObjectFlag OldBecameNewFlag' poolDictionaries: '' category: 'VMMaker-Interpreter'!

1 0

VM Maker: VMMaker.oscog-eem.882.mcz
by commits＠source.squeak.org 25 Sep '14

25 Sep '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.882.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.882 Author: eem Time: 24 September 2014, 6:12:31.37 pm UUID: f22a00ff-acaf-49b0-9f6d-44efec689c0d Ancestors: VMMaker.oscog-eem.881 Spur: Fix bug in sweepToFollowForwardersForPigCompact which failed to update and answer lowest forwarder. Fixes numForwarders == 0 assert failures. Fix bug with become and class table not removing classes which become causes them to be unhashed. Fix bogus assert fail in synchronousSignal:. Refactor following code into ensureSemaphoreForwardedThroughContext: and fix the assert there-in. Use rawOverflowSlotsOf: in bytesInObject:. Make a little more progress on Spur image segment support. Provide a classTableEntriesDo: and use it to compute an arrayOfUnmarkedClasses. Cogit: Make sure voidImplicitReceiverCacheAt: sets codeModified if IRCs are inline. Make sure freeMethod: clears cmRefersToYoung Fix assert in cogitPostGCAction: that would fire erroneously in Spur become. Nuke some unneeded pruneYoungReferrers calls. Factor-out send-site unlinking into unlinkSendAt:targetMethod:sendTable: Comment CogMethodZone. Sista: Rename ceClassTrap: et al to ceSistaTrap: given that Sista may trap in more cases than just unknown classes. Renumber the primitives in StackInterpreter>> callPrimitiveBytecode. (bring them up-to-date) =============== Diff against VMMaker.oscog-eem.881 =============== Item was removed: - ----- Method: CoInterpreter>>ceClassTrap: (in category 'trampolines') ----- - ceClassTrap: anObject - <api> - <option: #SistaVM> - | context | - instructionPointer := self popStack. - context := self ensureFrameIsMarried: framePointer SP: stackPointer. - "If there is a class trap, the object is supposed to remain on - the stack, but the cogit always removes it. So restore it here." - self push: anObject. - self push: context. - self push: anObject. - self push: instructionPointer. - ^self - ceSendAbort: (objectMemory splObj: SelectorClassTrap) - to: anObject - numArgs: 1! Item was added: + ----- Method: CoInterpreter>>ceSistaTrap: (in category 'trampolines') ----- + ceSistaTrap: anObject + <api> + <option: #SistaVM> + | context | + instructionPointer := self popStack. + context := self ensureFrameIsMarried: framePointer SP: stackPointer. + "If there is a trap, the object is supposed to remain on + the stack, but the cogit always removes it. So restore it here." + self push: anObject. + self push: context. + self push: anObject. + self push: instructionPointer. + ^self + ceSendAbort: (objectMemory splObj: SelectorSistaTrap) + to: anObject + numArgs: 1! Item was changed: ----- Method: CoInterpreter>>synchronousSignal: (in category 'process primitive support') ----- synchronousSignal: aSemaphore "Signal the given semaphore from within the interpreter. Answer if the current process was preempted. Override to add tracing info." | excessSignals | <inline: false> (self isEmptyList: aSemaphore) ifTrue: ["no process is waiting on this semaphore" excessSignals := self fetchInteger: ExcessSignalsIndex ofObject: aSemaphore. self storeInteger: ExcessSignalsIndex ofObject: aSemaphore withValue: excessSignals + 1. ^false]. + objectMemory ensureSemaphoreForwardedThroughContext: aSemaphore. - objectMemory hasSpurMemoryManagerAPI ifTrue: - [| firstLink | - firstLink := objectMemory fetchPointer: FirstLinkIndex ofObject: aSemaphore. - (objectMemory isForwarded: firstLink) ifTrue: - ["0 = aSemaphore, 1 = aProcess. Hence reference to suspendedContext will /not/ be forwarded." - objectMemory followForwardedObjectFields: aSemaphore toDepth: 1]. - self assert: (objectMemory isForwarded: (objectMemory fetchPointer: SuspendedContextIndex ofObject: firstLink)) not]. ^self resume: (self removeFirstLinkOfList: aSemaphore) preemptedYieldingIf: preemptionYields from: CSSignal! Item was changed: CogClass subclass: #CogMethodZone instanceVariableNames: 'youngReferrers methodCount openPICList mzFreeStart baseAddress limitAddress methodBytesFreedSinceLastCompaction coInterpreter objectRepresentation cogit objectMemory unpairedMethodList' classVariableNames: '' poolDictionaries: 'CogMethodConstants VMBasicConstants' category: 'VMMaker-JIT'! + !CogMethodZone commentStamp: 'eem 9/24/2014 15:59' prior: 0! + I am a simple allocator/deallocator for the native code zone. I also manage the youngReferers list, which contains methods that may refer to one or more young objects, and the openPICList which is a linked list of all open PICs in the zone. + + Instance Variables + baseAddress: <Integer address> + coInterpreter: <CoInterpreter> + cogit: <Cogit> + limitAddress: <Integer address> + methodBytesFreedSinceLastCompaction: <Integer> + methodCount: <Integer> + mzFreeStart: <Integer address> + objectMemory: <NewCoObjectMemory|SpurCoMemoryManager> + objectRepresentation: <CogObjectRepresentation:> + openPICList: <CogMethod *|nil> + unpairedMethodList: <CogMethod *|nil> + youngReferrers: <Integer address> + + baseAddress + - the lowest address in the native method zone + + coInterpreter + - simulation-only + + cogit + - simulation-only + + limitAddress + - the address immediately following the native method zone + + methodBytesFreedSinceLastCompaction + - a count of the bytes in methods freed since the last compaction of the native method zone, used to answer the used bytes in the zone + + methodCount + - a count of the number of methods in the native method zone + + mzFreeStart + - the start of free space in the zone + + objectMemory + - simulation-only + + objectRepresentation + - simulation-only + + openPICList + - the head of the list of open PICs + + unpairedMethodList + - the head of the list of Cog methods with no associated CompiledMethod object (Newspeak only) + + youngReferrers + - the pointer to the start of an array of pointers to CogMethods that refer to young objects. May contain false positives. Occupies the top of the zone from youngReferrers up to limitAddress + ! - !CogMethodZone commentStamp: '<historical>' prior: 0! - I am a simple allocator/deallocator for the native code zone. I also manage the youngReferers list, which contains methods that may refer to one or more young objects, and the openPICList which is a linked list of all open PICs in the zone.! Item was changed: ----- Method: CogMethodZone>>freeMethod: (in category 'compaction') ----- freeMethod: cogMethod <var: #cogMethod type: #'CogMethod *'> <inline: false> self assert: cogMethod cmType ~= CMFree. self assert: ((cogit cogMethodDoesntLookKosher: cogMethod) = 0 or: [(cogit cogMethodDoesntLookKosher: cogMethod) = 23 and: [(cogit cCoerceSimple: cogMethod methodObject to: #'CogMethod *') cmType = CMFree]]). cogMethod cmType = CMMethod ifTrue: ["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 original method's header if it is referring to this CogMethod." (coInterpreter rawHeaderOf: cogMethod methodObject) asInteger = cogMethod asInteger ifTrue: [coInterpreter rawHeaderOf: cogMethod methodObject put: cogMethod methodHeader. self cppIf: NewspeakVM ifTrue: [(objectRepresentation canPinObjects and: [cogMethod nextMethodOrIRCs ~= 0]) ifTrue: [objectRepresentation freeIRCs: cogMethod nextMethodOrIRCs]]] ifFalse: [self assert: (cogit noAssertMethodClassAssociationOf: cogMethod methodObject) = objectMemory nilObject. self cppIf: NewspeakVM ifTrue: [self removeFromUnpairedMethodList: cogMethod]]. + cogit maybeFreeCountersOf: cogMethod]. - cogit maybeFreeCountersOf: cogMethod. - cogMethod cmRefersToYoung: false]. cogMethod cmType = CMOpenPIC ifTrue: + [self removeFromOpenPICList: cogMethod]. + cogMethod cmRefersToYoung: false. - [self removeFromOpenPICList: cogMethod. - cogMethod cmRefersToYoung: false]. cogMethod cmType: CMFree. methodBytesFreedSinceLastCompaction := methodBytesFreedSinceLastCompaction + cogMethod blockSize! Item was changed: ----- Method: CogMethodZone>>printCogYoungReferrers (in category 'printing') ----- printCogYoungReferrers <api> <returnTypeC: #void> | pointer cogMethod | <var: #cogMethod type: #'CogMethod *'> pointer := youngReferrers. [pointer < limitAddress] whileTrue: [cogMethod := coInterpreter cCoerceSimple: (objectMemory longAt: pointer) to: #'CogMethod *'. cogMethod cmRefersToYoung ifFalse: + [coInterpreter print: '*']. + cogMethod cmType = CMFree ifTrue: + [coInterpreter print: '!!']. + (cogMethod cmRefersToYoung and: [cogMethod cmType ~= CMFree]) ifFalse: + [coInterpreter print: ' ']. - [coInterpreter print: '* ']. coInterpreter printCogMethod: cogMethod. pointer := pointer + BytesPerWord]! Item was changed: ----- Method: Cogit>>cogitPostGCAction: (in category 'jit - api') ----- cogitPostGCAction: gcMode <api> (gcMode = GCModeFull and: [objectRepresentation allYoungObjectsAgeInFullGC]) ifTrue: [methodZone voidYoungReferrersPostTenureAll]. "Post-GC update every full method's objectHeader to whatever it needs to be" self assert: self allMethodsHaveCorrectHeader. + "The youngReferrers should be correct after a GC since that is the point at which it is + pruned. But at other times false positives or free methods on the list are acceptable." + self assert: (gcMode = GCModeBecome or: [methodZone kosherYoungReferrers])! - self assert: methodZone kosherYoungReferrers! 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 cmType = CMClosedPIC ifTrue: [(self followMethodReferencesInClosedPIC: cogMethod) ifTrue: [freedPIC := true. methodZone freeMethod: cogMethod]]. cogMethod := methodZone methodAfter: cogMethod]. freedPIC ifTrue: + [self unlinkSendsToFree]! - [self unlinkSendsToFree. - methodZone pruneYoungReferrers. - processor flushICacheFrom: codeBase to: methodZone limitZony asInteger]! Item was changed: ----- Method: Cogit>>freeUnmarkedMachineCode (in category 'jit - api') ----- freeUnmarkedMachineCode "Free machine-code methods whose compiled methods are unmarked and open PICs whose selectors are not marked." <api> <option: #SpurObjectMemory> | cogMethod freedMethod | <var: #cogMethod type: #'CogMethod *'> freedMethod := false. cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'. [cogMethod < methodZone limitZony] whileTrue: [(cogMethod cmType = CMMethod and: [(objectMemory isMarked: cogMethod methodObject) not]) ifTrue: [freedMethod := true. methodZone freeMethod: cogMethod]. (cogMethod cmType = CMOpenPIC and: [(objectMemory isImmediate: cogMethod selector) not and: [(objectMemory isMarked: cogMethod selector) not]]) ifTrue: [freedMethod := true. methodZone freeMethod: cogMethod]. cogMethod := methodZone methodAfter: cogMethod]. freedMethod ifTrue: + [self unlinkSendsToFree]! - [self unlinkSendsToFree. - methodZone pruneYoungReferrers. - processor flushICacheFrom: codeBase to: methodZone limitZony asInteger]! 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) = 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. hasYoungObj := false] ifFalse: [cogMethod cmRefersToYoung: false]]]. cogMethod := methodZone methodAfter: cogMethod]. - methodZone pruneYoungReferrers. freedPIC ifTrue: + [self unlinkSendsToFree]. - [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>>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]]. (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| - [:targetMethod :sendTable| | unlinkedRoutine | (cacheTagMarked not 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." + self unlinkSendAt: mcpc targetMethod: targetMethod sendTable: sendTable. - 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]. self cppIf: NewspeakVM ifTrue: [entryPoint = ceImplicitReceiverTrampoline ifTrue: [| cacheAddress class mixin | (objectRepresentation markAndTraceCacheTagLiteral: cacheTag in: cogMethod atpc: mcpc asUnsignedInteger) ifTrue: [codeModified := true]. "cacheTag is selector" self assert: NumOopsPerIRC = 2. cacheAddress := self implicitReceiverCacheAddressAt: mcpc. (class := backEnd unalignedLongAt: cacheAddress) ~= 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])]] 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>>unlinkIfFreeOrLinkedSend:pc:of: (in category 'in-line cacheing') ----- unlinkIfFreeOrLinkedSend: annotation pc: mcpc of: theSelector <var: #mcpc type: #'char *'> | entryPoint | (self isSendAnnotation: annotation) ifTrue: [entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint > methodZoneBase ifTrue: "It's a linked send." [self targetMethodAndSendTableFor: entryPoint into: + [:targetMethod :sendTable| - [:targetMethod :sendTable| | unlinkedRoutine | (targetMethod cmType = CMFree or: [targetMethod selector = theSelector]) ifTrue: + [self unlinkSendAt: mcpc targetMethod: targetMethod sendTable: sendTable]]] - [unlinkedRoutine := sendTable at: (targetMethod cmNumArgs min: NumSendTrampolines - 1). - backEnd - rewriteInlineCacheAt: mcpc asInteger - tag: targetMethod selector - target: unlinkedRoutine. - codeModified := true]]] ifFalse: [self cppIf: NewspeakVM ifTrue: [(entryPoint = ceImplicitReceiverTrampoline and: [(backEnd inlineCacheTagAt: mcpc asInteger) = theSelector]) ifTrue: [self voidImplicitReceiverCacheAt: mcpc]]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>unlinkIfLinkedSend:pc:ignored: (in category 'in-line cacheing') ----- unlinkIfLinkedSend: annotation pc: mcpc ignored: superfluity <var: #mcpc type: #'char *'> | entryPoint | (self isSendAnnotation: annotation) ifTrue: [entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint > methodZoneBase ifTrue: "It's a linked send." [self targetMethodAndSendTableFor: entryPoint into: + [:targetMethod :sendTable| + self unlinkSendAt: mcpc targetMethod: targetMethod sendTable: sendTable]] - [:targetMethod :sendTable| | unlinkedRoutine | - unlinkedRoutine := sendTable at: (targetMethod cmNumArgs min: NumSendTrampolines - 1). - backEnd - rewriteInlineCacheAt: mcpc asInteger - tag: targetMethod selector - target: unlinkedRoutine]] ifFalse: [self cppIf: NewspeakVM ifTrue: [entryPoint = ceImplicitReceiverTrampoline ifTrue: [self voidImplicitReceiverCacheAt: mcpc]]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>unlinkIfLinkedSend:pc:of: (in category 'in-line cacheing') ----- unlinkIfLinkedSend: annotation pc: mcpc of: theSelector <var: #mcpc type: #'char *'> | entryPoint | (self isSendAnnotation: annotation) ifTrue: [entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint > methodZoneBase ifTrue: "It's a linked send." [self targetMethodAndSendTableFor: entryPoint into: + [:targetMethod :sendTable| - [:targetMethod :sendTable| | unlinkedRoutine | targetMethod selector = theSelector ifTrue: + [self unlinkSendAt: mcpc targetMethod: targetMethod sendTable: sendTable]]] - [unlinkedRoutine := sendTable at: (targetMethod cmNumArgs min: NumSendTrampolines - 1). - backEnd - rewriteInlineCacheAt: mcpc asInteger - tag: targetMethod selector - target: unlinkedRoutine. - codeModified := true]]] ifFalse: [self cppIf: NewspeakVM ifTrue: [(entryPoint = ceImplicitReceiverTrampoline and: [(backEnd inlineCacheTagAt: mcpc asInteger) = theSelector]) ifTrue: [self voidImplicitReceiverCacheAt: mcpc]]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>unlinkIfLinkedSend:pc:to: (in category 'in-line cacheing') ----- unlinkIfLinkedSend: annotation pc: mcpc to: theCogMethod <var: #mcpc type: #'char *'> | entryPoint | (self isSendAnnotation: annotation) ifTrue: [entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint > methodZoneBase ifTrue: "It's a linked send." [self targetMethodAndSendTableFor: entryPoint into: + [:targetMethod :sendTable| - [:targetMethod :sendTable| | unlinkedRoutine | targetMethod asInteger = theCogMethod ifTrue: + [self unlinkSendAt: mcpc targetMethod: targetMethod sendTable: sendTable]]] - [unlinkedRoutine := sendTable at: (targetMethod cmNumArgs min: NumSendTrampolines - 1). - backEnd - rewriteInlineCacheAt: mcpc asInteger - tag: targetMethod selector - target: unlinkedRoutine. - codeModified := true]]] ifFalse: "Can't tell the target with PushReciver/SendImplicit so flush anyway." [self cppIf: NewspeakVM ifTrue: [entryPoint = ceImplicitReceiverTrampoline ifTrue: [self voidImplicitReceiverCacheAt: mcpc]]]]. ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>unlinkIfLinkedSendToFree:pc:ignored: (in category 'in-line cacheing') ----- unlinkIfLinkedSendToFree: annotation pc: mcpc ignored: superfluity <var: #mcpc type: #'char *'> | entryPoint | (self isSendAnnotation: annotation) ifTrue: [entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. entryPoint > methodZoneBase ifTrue: "It's a linked send." [self targetMethodAndSendTableFor: entryPoint into: + [:targetMethod :sendTable| - [:targetMethod :sendTable| | unlinkedRoutine | targetMethod cmType = CMFree ifTrue: + [self unlinkSendAt: mcpc targetMethod: targetMethod sendTable: sendTable]]]]. - [unlinkedRoutine := sendTable at: (targetMethod cmNumArgs min: NumSendTrampolines - 1). - backEnd - rewriteInlineCacheAt: mcpc asInteger - tag: targetMethod selector - target: unlinkedRoutine. - codeModified := true]]]]. ^0 "keep scanning"! Item was added: + ----- Method: Cogit>>unlinkSendAt:targetMethod:sendTable: (in category 'in-line cacheing') ----- + unlinkSendAt: mcpc targetMethod: targetMethod sendTable: sendTable + <inline: true> + | unlinkedRoutine | + unlinkedRoutine := sendTable at: (targetMethod cmNumArgs min: NumSendTrampolines - 1). + backEnd + rewriteInlineCacheAt: mcpc asInteger + tag: targetMethod selector + target: unlinkedRoutine. + codeModified := true! Item was changed: ----- Method: Cogit>>voidImplicitReceiverCacheAt: (in category 'newspeak support') ----- voidImplicitReceiverCacheAt: mcpc "Cached push implicit receiver implementation. If objectRepresentation doesn't support pinning then caller looks like mov selector, SendNumArgsReg call ceImplicitReceiver br continue Lclass: .word Lmixin:: .word continue: If objectRepresentation supports pinning then caller looks like mov Lclass, Arg1Reg mov selector, SendNumArgsReg call ceImplicitReceiver and Lclass: .word; Lmixin: .word is somewhere on the heap." <option: #NewspeakVM> | cacheAddress | self assert: NumOopsPerIRC = 2. cacheAddress := self implicitReceiverCacheAddressAt: mcpc. backEnd unalignedLongAt: cacheAddress put: 0; + unalignedLongAt: cacheAddress + BytesPerOop put: 0. + objectRepresentation canPinObjects ifFalse: + [codeModified := true]! - unalignedLongAt: cacheAddress + BytesPerOop put: 0! Item was changed: ----- Method: ObjectMemory class>>initializeSpecialObjectIndices (in category 'initialization') ----- initializeSpecialObjectIndices "Initialize indices into specialObjects array." NilObject := 0. FalseObject := 1. TrueObject := 2. SchedulerAssociation := 3. ClassBitmap := 4. ClassSmallInteger := 5. ClassByteString := ClassString := 6. "N.B. Actually class ByteString" ClassArray := 7. "SmalltalkDictionary := 8." "Do not delete!!" ClassFloat := 9. ClassMethodContext := 10. ClassBlockContext := 11. ClassPoint := 12. ClassLargePositiveInteger := 13. TheDisplay := 14. ClassMessage := 15. "ClassCompiledMethod := 16. unused by the VM" TheLowSpaceSemaphore := 17. ClassSemaphore := 18. ClassCharacter := 19. SelectorDoesNotUnderstand := 20. SelectorCannotReturn := 21. ProcessSignalingLowSpace := 22. "was TheInputSemaphore" SpecialSelectors := 23. CharacterTable := 24. SelectorMustBeBoolean := 25. ClassByteArray := 26. "ClassProcess := 27. unused" CompactClasses := 28. TheTimerSemaphore := 29. TheInterruptSemaphore := 30. SelectorCannotInterpret := 34. "Was MethodContextProto := 35." ClassBlockClosure := 36. "Was BlockContextProto := 37." ExternalObjectsArray := 38. ClassMutex := 39. "Was: ClassTranslatedMethod := 40." ProcessInExternalCodeTag := 40. TheFinalizationSemaphore := 41. ClassLargeNegativeInteger := 42. ClassExternalAddress := 43. ClassExternalStructure := 44. ClassExternalData := 45. ClassExternalFunction := 46. ClassExternalLibrary := 47. SelectorAboutToReturn := 48. SelectorRunWithIn := 49. SelectorAttemptToAssign := 50. "PrimErrTableIndex := 51. in VMClass class>>initializePrimitiveErrorCodes" ClassAlien := 52. SelectorInvokeCallback := 53. ClassUnsafeAlien := 54. ClassWeakFinalizer := 55. ForeignCallbackProcess := 56. SelectorUnknownBytecode := 57. SelectorCounterTripped := 58. + SelectorSistaTrap := 59 - SelectorClassTrap := 59 ! Item was added: + ----- Method: ObjectMemory>>ensureSemaphoreForwardedThroughContext: (in category 'forward compatibility') ----- + ensureSemaphoreForwardedThroughContext: aSemaphore + "Compatibility with SpurMemoryManager" + <inline: true>! Item was changed: StackToRegisterMappingCogit subclass: #SistaStackToRegisterMappingCogit + instanceVariableNames: 'picDataIndex picData numCounters counters counterIndex initialCounterValue ceTrapTrampoline' - instanceVariableNames: 'picDataIndex picData numCounters counters counterIndex initialCounterValue ceClassTrapTrampoline' classVariableNames: 'CounterBytes MaxCounterValue' poolDictionaries: 'VMSqueakClassIndices' category: 'VMMaker-JIT'! !SistaStackToRegisterMappingCogit commentStamp: 'eem 4/7/2014 12:23' prior: 0! A SistaStackToRegisterMappingCogit is a refinement of StackToRegisterMappingCogit that generates code suitable for dynamic optimization by Sista, the Speculative Inlining Smalltalk Architecture, a project by Clément Bera and Eliot Miranda. Sista is an optimizer that exists in the Smalltalk image, /not/ in the VM, and optimizes by substituting normal bytecoded methods by optimized bytecoded methods that may use special bytecodes for which the Cogit can generate faster code. These bytecodes eliminate overheads such as bounds checks or polymorphic code (indexing Array, ByteArray, String etc). But the bulk of the optimization performed is in inlining blocks and sends for the common path. The basic scheme is that SistaStackToRegisterMappingCogit generates code containing performance counters. When these counters trip, a callback into the image is performed, at which point Sista analyses some portion of the stack, looking at performance data for the methods on the stack, and optimises based on the stack and performance data. Execution then resumes in the optimized code. SistaStackToRegisterMappingCogit adds counters to conditional branches. Each branch has an executed and a taken count, implemented at the two 16-bit halves of a single 32-bit word. Each counter pair is initialized with initialCounterValue. On entry to the branch the executed count is decremented and if the count goes below zero the ceMustBeBooleanAdd[True|False] trampoline called. The trampoline distinguishes between true mustBeBoolean and counter trips because in the former the register temporarily holding the counter value will contain zero. Then the condition is tested, and if the branch is taken the taken count is decremented. The two counter values allow an optimizer to collect basic block execution paths and to know what are the "hot" paths through execution that are worth agressively optimizing. Since conditional branches are about 1/6 as frequent as sends, and since they can be used to determine the hot path through code, they are a better choice to count than, for example, method or block entry. SistaStackToRegisterMappingCogit implements picDataFor:into: that fills an Array with the state of the counters in a method and the state of each linked send in a method. This is used to implement a primitive used by the optimizer to answer the branch and send data for a method as an Array. Instance Variables counterIndex: <Integer> counterMethodCache: <CogMethod> counters: <Array of AbstractInstruction> initialCounterValue: <Integer> numCounters: <Integer> picData: <Integer Oop> picDataIndex: <Integer> prevMapAbsPCMcpc: <Integer> counterIndex - xxxxx counterMethodCache - xxxxx counters - xxxxx initialCounterValue - xxxxx numCounters - xxxxx picData - xxxxx picDataIndex - xxxxx prevMapAbsPCMcpc - xxxxx ! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>genExtTrapIfNotInstanceOfBehaviorsBytecode (in category 'bytecode generators') ----- genExtTrapIfNotInstanceOfBehaviorsBytecode "SistaV1: * 236 11101100 iiiiiiii Trap If Not Instance Of Behavior/Array Of Behavior #iiiiiiii (+ Extend A * 256, where Extend A >= 0)" | reg litIndex literal branches label numBranches | <var: #branches type: #'AbstractInstruction **'> reg := self ssStorePop: true toPreferredReg: ReceiverResultReg. reg ~= ReceiverResultReg ifTrue: [self MoveR: reg R: ReceiverResultReg]. optStatus isReceiverResultRegLive: false. litIndex := extA * 256 + byte1. extA := 0. literal := self getLiteral: litIndex. "Allow an extra branch for Spur, which may have two tag patterns for SmallInteger" numBranches := (objectMemory isArrayNonImm: literal) ifTrue: [(objectMemory numSlotsOf: literal) + 1] ifFalse: [2]. branches := self alloca: numBranches type: (self cCode: [#'AbstractInstruction *'] inSmalltalk: [backEnd class]). numBranches := (objectMemory isArrayNonImm: literal) ifTrue: [objectRepresentation branchIfInstanceOfBehaviors: literal branches: branches] ifFalse: [objectRepresentation branchIfInstanceOfBehavior: literal branches: branches]. "Only flush the stack if the class trap traps. Use ssFlushNoUpdateTo: so we continue compiling as if the stack had not been flushed. Control does not return after the ceClassTrapTrampoline call." self ssFlushNoUpdateTo: simStackPtr. + self CallRT: ceTrapTrampoline. - self CallRT: ceClassTrapTrampoline. label := self Label. 0 to: numBranches - 1 do: [:i| (branches at: i) jmpTarget: label]. ^0! Item was changed: ----- Method: SistaStackToRegisterMappingCogit>>generateSistaRuntime (in category 'initialization') ----- generateSistaRuntime + "Trap sends Sista trap message to context with top of stack, so we don't need any arguments..." + ceTrapTrampoline := self genTrampolineFor: #ceSistaTrap: + called: 'ceSistaTrapTrampoline' - "Class trap sends class trap message to context with top of stack, so we on't need any arguments..." - ceClassTrapTrampoline := self genTrampolineFor: #ceClassTrap: - called: 'ceClassTrapTrampoline' arg: ReceiverResultReg! Item was changed: ----- Method: Spur32BitMemoryManager>>bytesInObject: (in category 'object enumeration') ----- bytesInObject: objOop "Answer the total number of bytes in an object including header and possible overflow size header." <returnTypeC: #usqInt> | headerNumSlots numSlots | headerNumSlots := self rawNumSlotsOf: objOop. numSlots := headerNumSlots = self numSlotsMask + ifTrue: [self rawOverflowSlotsOf: objOop] - ifTrue: [self longAt: objOop - self baseHeaderSize] ifFalse: [headerNumSlots = 0 ifTrue: [1] ifFalse: [headerNumSlots]]. ^numSlots + (numSlots bitAnd: 1) << self shiftForWord + (headerNumSlots = self numSlotsMask ifTrue: [self baseHeaderSize + self baseHeaderSize] ifFalse: [self baseHeaderSize])! Item was changed: ----- Method: Spur64BitMemoryManager>>bytesInObject: (in category 'object enumeration') ----- bytesInObject: objOop "Answer the total number of bytes in an object including header and possible overflow size header." <returnTypeC: #usqInt> | header headerNumSlots numSlots | <var: 'header' type: #usqLong> self flag: #endianness. header := self longAt: objOop. headerNumSlots := header >> self numSlotsFullShift. numSlots := headerNumSlots = self numSlotsMask + ifTrue: [self rawOverflowSlotsOf: objOop] - ifTrue: [header bitAnd: 16rFFFFFFFFFFFFFF] ifFalse: [headerNumSlots = 0 ifTrue: [1] ifFalse: [headerNumSlots]]. ^numSlots << self shiftForWord + (headerNumSlots = self numSlotsMask ifTrue: [self baseHeaderSize + self baseHeaderSize] ifFalse: [self baseHeaderSize])! Item was changed: CogClass subclass: #SpurMemoryManager (excessive size, no diff calculated) Item was changed: ----- Method: SpurMemoryManager class>>initializeSpecialObjectIndices (in category 'class initialization') ----- initializeSpecialObjectIndices "Initialize indices into specialObjects array." NilObject := 0. FalseObject := 1. TrueObject := 2. SchedulerAssociation := 3. ClassBitmap := 4. ClassSmallInteger := 5. ClassByteString := ClassString := 6. "N.B. Actually class ByteString" ClassArray := 7. "SmalltalkDictionary := 8." "Do not delete!!" ClassFloat := 9. ClassMethodContext := 10. "ClassBlockContext := 11. unused by the VM" ClassPoint := 12. ClassLargePositiveInteger := 13. TheDisplay := 14. ClassMessage := 15. "ClassCompiledMethod := 16. unused by the VM" TheLowSpaceSemaphore := 17. ClassSemaphore := 18. ClassCharacter := 19. SelectorDoesNotUnderstand := 20. SelectorCannotReturn := 21. ProcessSignalingLowSpace := 22. "was TheInputSemaphore" SpecialSelectors := 23. CharacterTable := nil. "Must be unused by the VM" SelectorMustBeBoolean := 25. ClassByteArray := 26. "ClassProcess := 27. unused" CompactClasses := 28. TheTimerSemaphore := 29. TheInterruptSemaphore := 30. SelectorCannotInterpret := 34. "Was MethodContextProto := 35." ClassBlockClosure := 36. "Was BlockContextProto := 37." ExternalObjectsArray := 38. ClassMutex := 39. "Was: ClassTranslatedMethod := 40." ProcessInExternalCodeTag := 40. TheFinalizationSemaphore := 41. ClassLargeNegativeInteger := 42. ClassExternalAddress := 43. ClassExternalStructure := 44. ClassExternalData := 45. ClassExternalFunction := 46. ClassExternalLibrary := 47. SelectorAboutToReturn := 48. SelectorRunWithIn := 49. SelectorAttemptToAssign := 50. "PrimErrTableIndex := 51. in VMClass class>>initializePrimitiveErrorCodes" ClassAlien := 52. SelectorInvokeCallback := 53. ClassUnsafeAlien := 54. ClassWeakFinalizer := 55. ForeignCallbackProcess := 56. SelectorUnknownBytecode := 57. SelectorCounterTripped := 58. + SelectorSistaTrap := 59! - SelectorClassTrap := 59! Item was added: + ----- Method: SpurMemoryManager>>arrayOfUnmarkedClasses (in category 'image segment in/out') ----- + arrayOfUnmarkedClasses + | nClasses classes i | + nClasses := 0. + self classTableEntriesDo: + [:class :ignored| + (self isMarked: class) ifFalse: + [nClasses := nClasses + 1]]. + nClasses = 0 ifTrue: + [^nilObj]. + classes := self allocateSlots: nClasses format: self arrayFormat classIndex: ClassArrayCompactIndex. + classes ifNil: + [^self integerObjectOf: PrimErrNoMemory]. + i := 0. + self classTableEntriesDo: + [:class :ignored| + (self isMarked: class) ifFalse: + [self storePointer: i ofObject: classes withValue: class. + i := i + 1]]. + self assert: nClasses = i. + ^classes! Item was added: + ----- Method: SpurMemoryManager>>classTableEntriesDo: (in category 'class table') ----- + classTableEntriesDo: binaryBlock + "Evaluate binaryBlock with all non-nil entries in the classTable and their index." + <inline: true> + 0 to: numClassTablePages - 1 do: + [:i| | page | + page := self fetchPointer: i ofObject: hiddenRootsObj. + 0 to: self classTablePageSize - 1 do: + [:j| | classOrNil | + classOrNil := self fetchPointer: j ofObject: page. + classOrNil ~= nilObj ifTrue: + [binaryBlock + value: classOrNil + value: i << self classTableMajorIndexShift + j]]]! Item was added: + ----- Method: SpurMemoryManager>>ensureSemaphoreForwardedThroughContext: (in category 'interpreter access') ----- + ensureSemaphoreForwardedThroughContext: aSemaphore + "Make sure that the aSemaphore is forwarded through to the suspendedContext of the first link." + <inline: true> + (self isForwarded: (self fetchPointer: FirstLinkIndex ofObject: aSemaphore)) ifTrue: + ["0 = aSemaphore, 1 = aProcess. Hence references to suspendedContext will /not/ be forwarded." + self followForwardedObjectFields: aSemaphore toDepth: 1]. + self deny: (self isForwarded: (self + fetchPointer: SuspendedContextIndex + ofObject: (self fetchPointer: FirstLinkIndex ofObject: aSemaphore)))! Item was changed: ----- Method: SpurMemoryManager>>postBecomeScanClassTable: (in category 'become implementation') ----- postBecomeScanClassTable: effectsFlags + "Scan the class table post-become (iff an active class object was becommed) to ensure no + forwarding pointers, and no unhashed classes exist in the class table. + - "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 ifTrue: + [(self isForwarded: classOrNil) ifTrue: + [classOrNil := self followForwarded: classOrNil. + self storePointer: j ofObject: page withValue: classOrNil]. + (self rawHashBitsOf: classOrNil) = 0 ifTrue: + [self storePointerUnchecked: j ofObject: page withValue: nilObj. + "If the removed class is before the classTableIndex, set the + classTableIndex to point to the empty slot so as to reuse it asap." + (i << self classTableMajorIndexShift + j) < classTableIndex ifTrue: + [classTableIndex := i << self classTableMajorIndexShift + j]]]]]! - (classOrNil ~= nilObj - and: [self isForwarded: classOrNil]) ifTrue: - [classOrNil := self followForwarded: classOrNil. - self storePointer: j ofObject: page withValue: classOrNil]]]! Item was changed: ----- Method: SpurMemoryManager>>printForwarders (in category 'debug printing') ----- printForwarders <api> self allHeapEntitiesDo: [:objOop| + (self isUnambiguouslyForwarder: objOop) ifTrue: - ((self isForwarded: objOop) and: [(self isFreeObject: objOop) not]) ifTrue: [coInterpreter printHex: objOop; cr]]! Item was changed: ----- Method: SpurMemoryManager>>storeImageSegmentInto:outPointers:roots: (in category 'image segment in/out') ----- storeImageSegmentInto: segmentWordArray outPointers: outPointerArray roots: arrayOfRoots "This primitive is called from Squeak as... <imageSegment> storeSegmentFor: arrayOfRoots into: aWordArray outPointers: anArray." "This primitive will store a binary image segment (in the same format as the Squeak image file) of the receiver and every object in its proper tree of subParts (ie, that is not refered to from anywhere else outside the tree). All pointers from within the tree to objects outside the tree will be copied into the array of outpointers. In their place in the image segment will be an oop equal to the offset in the outPointer array (the first would be 4). but with the high bit set." "The primitive expects the array and wordArray to be more than adequately long. In this case it returns normally, and truncates the two arrays to exactly the right size. To simplify truncation, both incoming arrays are required to have large headers (i.e. be 256 words long or larger). If either array is too small, the primitive will fail, but in no other case. During operation of the primitive, it is necessary to convert from both internal and external oops to their mapped values. To make this fast, the original objects in question are forwarded to the mapped values. Tables are kept of both kinds of oops. Note that markObjects eliminates forwarding pointers, so there will be no forwarding pointers in the object graph once objects have been marked. To be specific, there are two similar tables, the outPointer array, and one in the upper eight of the segmentWordArray. Each grows oops from the bottom up. + In case of either success or failure, the headers must be restored. In the event of primitive failure, the table of outPointers must also be nilled out (since the garbage in the high half will not have been discarded)." - In case of either success or failure, the headers must be restored. In the event of primitive failure, the table of outPointers must also be nilled out (since the garbage in the high half will not have been discarded." + | endSeg firstIn firstOut lastIn lastOut limitSeg newSegLimit unmarkedClasses | - | endSeg firstIn firstOut lastIn lastOut limitSeg newSegLimit | true ifTrue: [^PrimErrUnsupported] ifFalse: [ ((self hasOverflowHeader: outPointerArray) "Must have 128-bit header" and: [self hasOverflowHeader: segmentWordArray]) ifFalse: "Must have 128-bit header" [^PrimErrGenericFailure]. firstOut := outPointerArray + self baseHeaderSize. lastOut := firstOut - self bytesPerOop. limitSeg := segmentWordArray + self baseHeaderSize. endSeg := segmentWordArray + (self addressAfter: segmentWordArray). - "Write a version number for byte order and version check" - limitSeg >= endSeg ifTrue: [^PrimErrGenericFailure]. - self longAt: limitSeg put: self imageSegmentVersion. - limitSeg := limitSeg + self bytesPerOop. - "Allocate top 1/8 of segment for table of internal oops" firstIn := endSeg - ((self numSlotsOf: segmentWordArray) // 8). "Take 1/8 of seg" lastIn := firstIn - self bytesPerOop. self assert: self allObjectsUnmarked. self markObjectsIn: arrayOfRoots. self markObjects. self unmarkObjectsIn: arrayOfRoots. + "All external objects, and only they, are now marked." + unmarkedClasses := self arrayOfUnmarkedClasses. + (self isImmediate: unmarkedClasses) ifTrue: + [^PrimErrGenericFailure]. + + "Write a version number for byte order and version check, followed by the number of classes." + limitSeg >= endSeg ifTrue: [^PrimErrGenericFailure]. + self long32At: limitSeg put: self imageSegmentVersion. + self long32At: limitSeg + 4 put: (self numSlotsOf: unmarkedClasses). + limitSeg := limitSeg + 8. + + "If there are any classes then copy them into the segment, and forward their oop." + (self numSlotsOf: unmarkedClasses) > 0 ifTrue: + [((lastIn := lastIn + self bytesPerOop) >= endSeg + or: [0 = (newSegLimit := self copyObj: arrayOfRoots toSegment: segmentWordArray addr: limitSeg stopAt: firstIn saveOopAt: lastIn)]) ifTrue: + [lastIn := lastIn - self bytesPerWord. + self restoreObjectsFrom: firstIn to: lastIn from: segmentWordArray + self baseHeaderSize to: limitSeg. + self fillObj: outPointerArray numSlots: (self numSlotsOf: outPointerArray) with: nilObj. + ^PrimErrGenericFailure]. + limitSeg := newSegLimit]. + + "Copy the array of roots into the segment, and forward its oop." - "All external objects, and only they, are now marked. - Copy the array of roots into the segment, and forward its oop." ((lastIn := lastIn + self bytesPerOop) >= endSeg or: [0 = (newSegLimit := self copyObj: arrayOfRoots toSegment: segmentWordArray addr: limitSeg stopAt: firstIn saveOopAt: lastIn)]) ifTrue: [lastIn := lastIn - self bytesPerWord. self restoreObjectsFrom: firstIn to: lastIn from: segmentWordArray + self baseHeaderSize to: limitSeg. self fillObj: outPointerArray numSlots: (self numSlotsOf: outPointerArray) with: nilObj. ^PrimErrGenericFailure]. limitSeg := newSegLimit. "Now traverse arrayOfRoots, copying unmarked objects into the segment" "Now the primitive can not fail; traverse the objects in the segment, unforwarding the originals and mapping external oops." self flag: 'you are here']! Item was changed: ----- Method: SpurMemoryManager>>sweepToFollowForwardersForPigCompact (in category 'compaction') ----- sweepToFollowForwardersForPigCompact "Sweep, following forwarders in all live objects. Answer the lowest forwarder in oldSpace." | lowestForwarder | <var: #lowestForwarder type: #usqInt> self assert: (freeStart = scavenger eden start and: [scavenger futureSurvivorStart = scavenger futureSpace start]). self allPastSpaceObjectsDo: [:o| (self isForwarded: o) ifFalse: [0 to: (self numPointerSlotsOf: o) - 1 do: [:i| | f | f := self fetchPointer: i ofObject: o. (self isOopForwarded: f) ifTrue: [f := self followForwarded: f. self storePointerUnchecked: i ofObject: o withValue: f]]]]. lowestForwarder := 0. self allOldSpaceObjectsDo: [:o| (self isForwarded: o) ifTrue: [lowestForwarder = 0 ifTrue: + [lowestForwarder := o]] - [lowestForwarder := 0]] ifFalse: [0 to: (self numPointerSlotsOf: o) - 1 do: [:i| | f | f := self fetchPointer: i ofObject: o. (self isOopForwarded: f) ifTrue: [f := self followForwarded: f. self storePointer: i ofObject: o withValue: f]]]]. ^lowestForwarder! Item was changed: ----- Method: SpurMemoryManager>>validClassTableHashes (in category 'class table') ----- validClassTableHashes "Check the hashes of classes in the table. The tricky thing here is that classes may be duplicated + in the table. So each entry must be in the table at its hash, even if it is elsewhere in the table." - in the table. So each entry ,ust be in the table at its hash, even if it is elsewhere in the table." self validClassTableRootPages ifFalse: [^false]. + self classTableEntriesDo: + [:classOrNil :ignored| | hash | + (self isForwarded: classOrNil) ifTrue: + [^0]. + hash := self rawHashBitsOf: classOrNil. + hash = 0 ifTrue: + [^false]. + (self noCheckClassAtIndex: hash) ~= classOrNil ifTrue: + [^false]]. - 0 to: numClassTablePages - 1 do: - [:i| | page | - page := self fetchPointer: i ofObject: hiddenRootsObj. - 0 to: self classTablePageSize - 1 do: - [:j| | classOrNil hash | - classOrNil := self fetchPointer: j ofObject: page. - classOrNil ~= nilObj ifTrue: - [(self isForwarded: classOrNil) ifTrue: - [^0]. - hash := self rawHashBitsOf: classOrNil. - hash = 0 ifTrue: - [^false]. - (self noCheckClassAtIndex: hash) ~= classOrNil ifTrue: - [^false]]]]. ^true! Item was added: + ----- Method: StackInterpreter>>binaryInlinePrimitive: (in category 'miscellaneous bytecodes') ----- + binaryInlinePrimitive: primIndex + "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution." + <option: #SistaVM> + | result result64 | + primIndex caseOf: { + "2000 unchecked SmallInteger #+. Both arguments are SmallIntegers and the result fits in a SmallInteger (* depends on word size)" + [0] -> [result := objectMemory integerObjectOf: ((objectMemory integerValueOf: (self internalStackValue: 1)) + + (objectMemory integerValueOf: self internalStackTop)). + self internalPop: 1; internalStackTopPut: result]. + "2001 unchecked SmallInteger #-. Both arguments are SmallIntegers and the result fits in a SmallInteger (* depends on word size)" + [1] -> [result := objectMemory integerObjectOf: ((objectMemory integerValueOf: (self internalStackValue: 1)) + - (objectMemory integerValueOf: self internalStackTop)). + self internalPop: 1; internalStackTopPut: result]. + "2002 unchecked SmallInteger #*. Both arguments are SmallIntegers and the result fits in a SmallInteger (* depends on word size)" + [2] -> [result := objectMemory integerObjectOf: ((objectMemory integerValueOf: (self internalStackValue: 1)) + * (objectMemory integerValueOf: self internalStackTop)). + self internalPop: 1; internalStackTopPut: result]. + "2003 unchecked SmallInteger #/. Both arguments are SmallIntegers and the result fits in a SmallInteger (* depends on word size)" + [3] -> [result := objectMemory integerObjectOf: ((objectMemory integerValueOf: (self internalStackValue: 1)) + / (objectMemory integerValueOf: self internalStackTop)). + self internalPop: 1; internalStackTopPut: result]. + "2004 unchecked SmallInteger #//. Both arguments are SmallIntegers and the result fits in a SmallInteger (* depends on word size)" + [4] -> [result := objectMemory integerObjectOf: ((objectMemory integerValueOf: (self internalStackValue: 1)) + // (objectMemory integerValueOf: self internalStackTop)). + self internalPop: 1; internalStackTopPut: result]. + "2005 unchecked SmallInteger #\\. Both arguments are SmallIntegers and the result fits in a SmallInteger (* depends on word size)" + [5] -> [result := objectMemory integerObjectOf: ((objectMemory integerValueOf: (self internalStackValue: 1)) + \\ (objectMemory integerValueOf: self internalStackTop)). + self internalPop: 1; internalStackTopPut: result]. + "2006 unchecked SmallInteger #quo:. Both arguments are SmallIntegers and the result fits in a SmallInteger (* depends on word size)" + [6] -> [| rcvr arg | + rcvr := objectMemory integerValueOf: (self internalStackValue: 1). + arg := objectMemory integerValueOf: self internalStackTop. + result := self quot: rcvr ient: arg. + self internalPop: 1; internalStackTopPut: (objectMemory integerObjectOf: result)]. + + "2016 unchecked SmallInteger #bitAnd:. Both arguments are SmallIntegers and the result fits in a SmallInteger (* depends on word size)" + [16] -> [result := objectMemory integerObjectOf: ((objectMemory integerValueOf: (self internalStackValue: 1)) + bitAnd: (objectMemory integerValueOf: self internalStackTop)). + self internalPop: 1; internalStackTopPut: result]. + "2017 unchecked SmallInteger #bitOr:. Both arguments are SmallIntegers and the result fits in a SmallInteger (* depends on word size)" + [17] -> [result := objectMemory integerObjectOf: ((objectMemory integerValueOf: (self internalStackValue: 1)) + bitOr: (objectMemory integerValueOf: self internalStackTop)). + self internalPop: 1; internalStackTopPut: result]. + "2018 unchecked SmallInteger #bitXor:. Both arguments are SmallIntegers and the result fits in a SmallInteger (* depends on word size)" + [18] -> [result := objectMemory integerObjectOf: ((objectMemory integerValueOf: (self internalStackValue: 1)) + bitXor: (objectMemory integerValueOf: self internalStackTop)). + self internalPop: 1; internalStackTopPut: result]. + "2019 unchecked SmallInteger #bitShift:. Both arguments are SmallIntegers and the result fits in a SmallInteger (* depends on word size)" + [19] -> [result := objectMemory integerObjectOf: ((objectMemory integerValueOf: (self internalStackValue: 1)) + bitShift: (objectMemory integerValueOf: self internalStackTop)). + self internalPop: 1; internalStackTopPut: result]. + + "2032 unchecked SmallInteger #>. Both arguments are SmallIntegers" + [32] -> [result := objectMemory booleanObjectOf: ((self internalStackValue: 1) > self internalStackTop). + self internalPop: 1; internalStackTopPut: result]. + "2033 unchecked SmallInteger #<. Both arguments are SmallIntegers" + [33] -> [result := objectMemory booleanObjectOf: ((self internalStackValue: 1) < self internalStackTop). + self internalPop: 1; internalStackTopPut: result]. + "2034 unchecked SmallInteger #>=. Both arguments are SmallIntegers" + [34] -> [result := objectMemory booleanObjectOf: ((self internalStackValue: 1) >= self internalStackTop). + self internalPop: 1; internalStackTopPut: result]. + "2035 unchecked SmallInteger #<=. Both arguments are SmallIntegers" + [35] -> [result := objectMemory booleanObjectOf: ((self internalStackValue: 1) <= self internalStackTop). + self internalPop: 1; internalStackTopPut: result]. + "2036 unchecked SmallInteger #=. Both arguments are SmallIntegers" + [36] -> [result := objectMemory booleanObjectOf: ((self internalStackValue: 1) = self internalStackTop). + self internalPop: 1; internalStackTopPut: result]. + "2037 unchecked SmallInteger #~=. Both arguments are SmallIntegers" + [37] -> [result := objectMemory booleanObjectOf: ((self internalStackValue: 1) ~= self internalStackTop). + self internalPop: 1; internalStackTopPut: result]. + + "2064 unchecked Pointer Object>>at:. The receiver is guaranteed to be a pointer object. The 0-relative (1-relative?) index is an in-range SmallInteger" + [64] -> [result := objectMemory + fetchPointer: (objectMemory integerValueOf: self internalStackTop) + ofObject: (self internalStackValue: 1). + self internalPop: 1; internalStackTopPut: result]. + "2065 unchecked Byte Object>>at:. The receiver is guaranteed to be a non-pointer object. The 0-relative (1-relative?) index is an in-range SmallInteger. The result is a SmallInteger." + [65] -> [result := objectMemory + fetchByte: (objectMemory integerValueOf: self internalStackTop) + ofObject: (self internalStackValue: 1). + self internalPop: 1; internalStackTopPut: (objectMemory integerObjectOf: result)]. + "2066 unchecked 16-bit Word Object>>at:. The receiver is guaranteed to be a non-pointer object. The 0-relative (1-relative?) index is an in-range SmallInteger. The result is a SmallInteger." + [66] -> [result := objectMemory + fetchShort16: (objectMemory integerValueOf: self internalStackTop) + ofObject: (self internalStackValue: 1). + self internalPop: 1; internalStackTopPut: (objectMemory integerObjectOf: result)]. + "2067 unchecked 32 bit Word Object>>at:. The receiver is guaranteed to be a non-pointer object. The 0-relative (1-relative?) index is an in-range SmallInteger. The result is a SmallInteger or a LargePositiveInteger." + [67] -> [result := objectMemory + fetchLong32: (objectMemory integerValueOf: self internalStackTop) + ofObject: (self internalStackValue: 1). + self internalPop: 1; internalStackTopPut: (self signed64BitValueOf: result)]. + "2068 unchecked 64 bit Word Object>>at:. The receiver is guaranteed to be a non-pointer object. The 0-relative (1-relative?) index is an in-range SmallInteger. The result is a SmallInteger or a LargePositiveInteger." + [68] -> [result64 := objectMemory + fetchLong64: (objectMemory integerValueOf: self internalStackTop) + ofObject: (self internalStackValue: 1). + self internalPop: 1; internalStackTopPut: (self signed64BitValueOf: result)] } + otherwise: + [localIP := localIP - 3. + self respondToUnknownBytecode]! Item was changed: ----- Method: StackInterpreter>>callPrimitiveBytecode (in category 'miscellaneous bytecodes') ----- callPrimitiveBytecode "V4: 249 11111001 i i i i i i i i jjjjjjjj Call Primitive #iiiiiiii + (jjjjjjjj * 256) SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution." self cppIf: SistaVM ifTrue: + [| byte1 byte2 prim | - [| byte1 byte2 | byte1 := self fetchByte. byte2 := self fetchByte. self fetchNextBytecode. + byte2 < 128 ifTrue: + [localIP := localIP - 3. + ^self respondToUnknownBytecode]. + prim := byte2 - 128 << 8 + byte1. + prim < 1000 ifTrue: + [^self nullaryInlinePrimitive: prim]. + + prim < 2000 ifTrue: + [^self unaryInlinePrimitive: prim - 1000]. + + prim < 3000 ifTrue: + [^self binaryInlinePrimitive: prim - 2000]. + + prim < 4000 ifTrue: + [^self trinaryInlinePrimitive: prim - 3000]. + + localIP := localIP - 3. + ^self respondToUnknownBytecode] - byte2 > 127 - ifTrue: - [self inlinePrimitiveBytecode: (byte2 bitAnd: 16r7F) << 8 + byte1] - ifFalse: - [self error: 'non-inlined callPrimitiveBytecode should not be evaluated. method activation should step beyond this bytecode.']] ifFalse: [self error: 'callPrimitiveBytecode should not be evaluated. method activation should step beyond this bytecode.'] "We could make it a noop and not skip it in {foo}ActivateMethod, as in: localIP := localIP + 3. self fetchNextBytecode But for now, having {foo}ActivateMethod skip it makes it available for invoking embedded primitives."! Item was changed: ----- Method: StackInterpreter>>extTrapIfNotInstanceOfBehaviorsBytecode (in category 'sista bytecodes') ----- extTrapIfNotInstanceOfBehaviorsBytecode "SistaV1: * 236 11101100 iiiiiiii Trap If Not Instance Of Behavior/Array Of Behavior #iiiiiiii (+ Extend A * 256, where Extend A >= 0)" | tos tosClassTag literal | tos := self internalStackTop. tosClassTag := objectMemory fetchClassTagOf: tos. literal := self literal: extA << 8 + self fetchByte. extA := 0. (objectMemory isArrayNonImm: literal) ifTrue: [| i | i := (objectMemory numSlotsOf: literal) asInteger. [(i := i -1) < 0 or: [tosClassTag = (objectMemory rawClassTagForClass: (objectMemory fetchPointer: i ofObject: literal))]] whileTrue. i < 0 ifTrue: + [^self respondToSistaTrap]] - [^self respondToClassTrap]] ifFalse: [tosClassTag ~= (objectMemory rawClassTagForClass: literal) ifTrue: + [^self respondToSistaTrap]]. - [^self respondToClassTrap]]. self internalPopStack. self fetchNextBytecode! Item was added: + ----- Method: StackInterpreter>>nullaryInlinePrimitive: (in category 'miscellaneous bytecodes') ----- + nullaryInlinePrimitive: primIndex + "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution." + <option: #SistaVM> + localIP := localIP - 3. + self respondToUnknownBytecode! Item was removed: - ----- Method: StackInterpreter>>respondToClassTrap (in category 'sista bytecodes') ----- - respondToClassTrap - | ourContext tos | - <sharedCodeInCase: #extTrapIfNotInstanceOfBehaviorsBytecode> - messageSelector := objectMemory splObj: SelectorClassTrap. - tos := self internalPopStack. - ourContext := self ensureFrameIsMarried: localFP SP: localSP. - messageSelector = objectMemory nilObject ifTrue: - [self error: 'class trap']. - self internalPush: ourContext. - self internalPush: tos. - argumentCount := 1. - self normalSend! Item was added: + ----- Method: StackInterpreter>>respondToSistaTrap (in category 'sista bytecodes') ----- + respondToSistaTrap + | ourContext tos | + <sharedCodeInCase: #extTrapIfNotInstanceOfBehaviorsBytecode> + messageSelector := objectMemory splObj: SelectorSistaTrap. + tos := self internalPopStack. + ourContext := self ensureFrameIsMarried: localFP SP: localSP. + messageSelector = objectMemory nilObject ifTrue: + [self error: 'Sista trap but no trap selector installed']. + self internalPush: ourContext. + self internalPush: tos. + argumentCount := 1. + self normalSend! Item was changed: ----- Method: StackInterpreter>>synchronousSignal: (in category 'process primitive support') ----- synchronousSignal: aSemaphore "Signal the given semaphore from within the interpreter. Answer if the current process was preempted." | excessSignals | <inline: false> (self isEmptyList: aSemaphore) ifTrue: ["no process is waiting on this semaphore" excessSignals := self fetchInteger: ExcessSignalsIndex ofObject: aSemaphore. self storeInteger: ExcessSignalsIndex ofObject: aSemaphore withValue: excessSignals + 1. ^false]. + objectMemory ensureSemaphoreForwardedThroughContext: aSemaphore. - objectMemory hasSpurMemoryManagerAPI ifTrue: - [| firstLink | - firstLink := objectMemory fetchPointer: FirstLinkIndex ofObject: aSemaphore. - (objectMemory isForwarded: firstLink) ifTrue: - ["0 = aSemaphore, 1 = aProcess. Hence reference to suspendedContext will /not/ be forwarded." - objectMemory followForwardedObjectFields: aSemaphore toDepth: 1]. - self assert: (objectMemory isForwarded: (objectMemory fetchPointer: SuspendedContextIndex ofObject: firstLink)) not]. ^self resume: (self removeFirstLinkOfList: aSemaphore) preemptedYieldingIf: preemptionYields! Item was added: + ----- Method: StackInterpreter>>trinaryInlinePrimitive: (in category 'miscellaneous bytecodes') ----- + trinaryInlinePrimitive: primIndex + "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution." + <option: #SistaVM> + | result | + primIndex caseOf: { + + "3000 unchecked Pointer Object>>at:put:. The receiver is guaranteed to be a pointer object. The 0-relative (1-relative?) index is an in-range SmallInteger" + [0] -> [result := self internalStackTop. + objectMemory + storePointer: (objectMemory integerValueOf: (self internalStackValue: 1)) + ofObject: (self internalStackValue: 2) + withValue: result. + self internalPop: 2; internalStackTopPut: result]. + "3001 unchecked Byte Object>>at:put:. The receiver is guaranteed to be a non-pointer object. The 0-relative (1-relative?) index is an in-range SmallInteger. The argument is a SmallInteger. The primitive stores the least significant 8 bits." + [1] -> [result := self internalStackTop. + objectMemory + storeByte: (objectMemory integerValueOf: (self internalStackValue: 1)) + ofObject: (self internalStackValue: 2) + withValue: (objectMemory integerValueOf: result). + self internalPop: 2; internalStackTopPut: result]. + "3002 unchecked Word Object>>at:put:. The receiver is guaranteed to be a non-pointer object. The 0-relative (1-relative?) index is an in-range SmallInteger. The argument is a SmallInteger. The primitive stores the least significant 16 bits." + [2] -> [result := self internalStackTop. + objectMemory + storeShort16: (objectMemory integerValueOf: (self internalStackValue: 1)) + ofObject: (self internalStackValue: 2) + withValue: (objectMemory integerValueOf: result). + self internalPop: 2; internalStackTopPut: result]. + "3003 unchecked DoubleWord Object>>at:put:. The receiver is guaranteed to be a non-pointer object. The 0-relative (1-relative?) index is an in-range SmallInteger. The argument is a SmallInteger. The primitive stores the least significant 32 bits." + [3] -> [result := self internalStackTop. + objectMemory + storeLong32: (objectMemory integerValueOf: (self internalStackValue: 1)) + ofObject: (self internalStackValue: 2) + withValue: (objectMemory integerValueOf: result). + self internalPop: 2; internalStackTopPut: result]. + "3004 unchecked QuadWord Object>>at:put:. The receiver is guaranteed to be a non-pointer object. The 0-relative (1-relative?) index is an in-range SmallInteger. The argument is a SmallInteger. The primitive stores the least significant 64 bits." + [4] -> [result := self internalStackTop. + objectMemory + storeLong64: (objectMemory integerValueOf: (self internalStackValue: 1)) + ofObject: (self internalStackValue: 2) + withValue: (objectMemory integerValueOf: result). + self internalPop: 2; internalStackTopPut: result] } + otherwise: + [localIP := localIP - 3. + self respondToUnknownBytecode]! Item was added: + ----- Method: StackInterpreter>>unaryInlinePrimitive: (in category 'miscellaneous bytecodes') ----- + unaryInlinePrimitive: primIndex + "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution." + <option: #SistaVM> + | result | + primIndex caseOf: { + "1000 unchecked class" + [0] -> [result := objectMemory fetchClassOf: self internalStackTop. + self internalStackTopPut: result]. + "1001 unchecked pointer numSlots" + [1] -> [result := objectMemory numSlotsOf: self internalStackTop. + self internalStackTopPut: (objectMemory integerObjectOf: result)]. + "1002 unchecked pointer basicSize" + [2] -> [result := (objectMemory numSlotsOf: self internalStackTop) + - (objectMemory fixedFieldsOfClass: (objectMemory fetchClassOfNonImm: self internalStackTop)). + self internalStackTopPut: (objectMemory integerObjectOf: result)]. + "1003 unchecked byte8Type format numBytes (includes CompiledMethod)" + [3] -> [result := objectMemory numBytesOf: self internalStackTop. + self internalStackTopPut: (objectMemory integerObjectOf: result)]. + "1004 unchecked short16Type format numShorts" + [4] -> [result := objectMemory num16BitUnitsOf: self internalStackTop. + self internalStackTopPut: (objectMemory integerObjectOf: result)]. + "1005 unchecked word32Type format numWords" + [5] -> [result := objectMemory num32BitUnitsOf: self internalStackTop. + self internalStackTopPut: (objectMemory integerObjectOf: result)]. + "1006 unchecked doubleWord64Type format numDoubleWords" + [6] -> [result := objectMemory num64BitUnitsOf: self internalStackTop. + self internalStackTopPut: (objectMemory integerObjectOf: result)] } + otherwise: + [localIP := localIP - 3. + self respondToUnknownBytecode]! Item was changed: ----- Method: StackToRegisterMappingCogit>>genBinaryConstOpVarInlinePrimitive: (in category 'inline primitive generators') ----- genBinaryConstOpVarInlinePrimitive: prim "Const op var version of binary inline primitives." "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. + See EncoderForSistaV1's class comment and StackInterpreter>>#binaryInlinePrimitive:" - See EncoderForSistaV1's class comment and StackInterpreter>>#inlinePrimitiveBytecode:" | ra val untaggedVal | (ra := backEnd availableRegisterOrNilFor: self liveRegisters) ifNil: [self ssAllocateRequiredReg: (ra := optStatus isReceiverResultRegLive ifTrue: [Arg0Reg] ifFalse: [ReceiverResultReg])]. ra = ReceiverResultReg ifTrue: [optStatus isReceiverResultRegLive: false]. self ssTop popToReg: ra. self ssPop: 1. val := self ssTop constant. self ssPop: 1. untaggedVal := val - objectMemory smallIntegerTag. prim caseOf: { "0 through 6, +, -, *, /, //, \\, quo:, SmallInteger op SmallInteger => SmallInteger, no overflow" [0] -> [self AddCq: untaggedVal R: ra]. [1] -> [self SubCq: untaggedVal R: ra]. [2] -> [objectRepresentation genRemoveSmallIntegerTagsInScratchReg: ra. self MoveCq: (objectMemory integerValueOf: val) R: TempReg. self MulR: TempReg R: ra. objectRepresentation genAddSmallIntegerTagsTo: ra]. + "2016 through 2019, bitAnd:, bitOr:, bitXor, bitShift:, SmallInteger op SmallInteger => SmallInteger, no overflow" - "16 through 19, bitAnd:, bitOr:, bitXor, bitShift:, SmallInteger op SmallInteger => SmallInteger, no overflow" + "2032 through 2037, >, <, >=, <=. =, ~=, SmallInteger op SmallInteger => Boolean (flags?? then in jump bytecodes if ssTop is a flags value, just generate the instruction!!!!)" - "32 through 37, >, <, >=, <=. =, ~=, SmallInteger op SmallInteger => Boolean (flags?? then in jump bytecodes if ssTop is a flags value, just generate the instruction!!!!)" + "2064 through 2068, Pointer Object>>at:, Byte Object>>at:, Short16 Word Object>>at: LongWord32 Object>>at: Quad64Word Object>>at:. obj op 0-rel SmallInteger => oop" - "64 through 68, Pointer Object>>at:, Byte Object>>at:, Short16 Word Object>>at: LongWord32 Object>>at: Quad64Word Object>>at:. obj op 0-rel SmallInteger => oop" - "80 through 84, Pointer Object>>at:put:, Byte Object>>at:put:, Short16 Word Object>>at:put: LongWord32 Object>>at:put: Quad64Word Object>>at:put:. obj op 0-rel SmallInteger => oop" - } otherwise: [^EncounteredUnknownBytecode]. self ssPushRegister: ra. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genBinaryVarOpConstInlinePrimitive: (in category 'inline primitive generators') ----- genBinaryVarOpConstInlinePrimitive: prim "Var op const version of inline binary inline primitives." "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. + See EncoderForSistaV1's class comment and StackInterpreter>>#binaryInlinePrimitive:" - See EncoderForSistaV1's class comment and StackInterpreter>>#inlinePrimitiveBytecode:" | rr val untaggedVal | (rr := backEnd availableRegisterOrNilFor: self liveRegisters) ifNil: [self ssAllocateRequiredReg: (rr := optStatus isReceiverResultRegLive ifTrue: [Arg0Reg] ifFalse: [ReceiverResultReg])]. rr = ReceiverResultReg ifTrue: [optStatus isReceiverResultRegLive: false]. val := self ssTop constant. self ssPop: 1. self ssTop popToReg: rr. self ssPop: 1. untaggedVal := val - objectMemory smallIntegerTag. prim caseOf: { "0 through 6, +, -, *, /, //, \\, quo:, SmallInteger op SmallInteger => SmallInteger, no overflow" [0] -> [self AddCq: untaggedVal R: rr]. [1] -> [self SubCq: untaggedVal R: rr]. [2] -> [self flag: 'could use MulCq:R'. objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: rr. self MoveCq: (objectMemory integerValueOf: val) R: TempReg. self MulR: TempReg R: rr. objectRepresentation genAddSmallIntegerTagsTo: rr]. + "2016 through 2019, bitAnd:, bitOr:, bitXor, bitShift:, SmallInteger op SmallInteger => SmallInteger, no overflow" - "16 through 19, bitAnd:, bitOr:, bitXor, bitShift:, SmallInteger op SmallInteger => SmallInteger, no overflow" + "2032 through 2037, >, <, >=, <=. =, ~=, SmallInteger op SmallInteger => Boolean (flags?? then in jump bytecodes if ssTop is a flags value, just generate the instruction!!!!)" - "32 through 37, >, <, >=, <=. =, ~=, SmallInteger op SmallInteger => Boolean (flags?? then in jump bytecodes if ssTop is a flags value, just generate the instruction!!!!)" + "2064 through 2068, Pointer Object>>at:, Byte Object>>at:, Short16 Word Object>>at: LongWord32 Object>>at: Quad64Word Object>>at:. obj op 0-rel SmallInteger => oop" - "64 through 68, Pointer Object>>at:, Byte Object>>at:, Short16 Word Object>>at: LongWord32 Object>>at: Quad64Word Object>>at:. obj op 0-rel SmallInteger => oop" - "80 through 84, Pointer Object>>at:put:, Byte Object>>at:put:, Short16 Word Object>>at:put: LongWord32 Object>>at:put: Quad64Word Object>>at:put:. obj op 0-rel SmallInteger => oop" - } otherwise: [^EncounteredUnknownBytecode]. self ssPushRegister: rr. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genBinaryVarOpVarInlinePrimitive: (in category 'inline primitive generators') ----- genBinaryVarOpVarInlinePrimitive: prim "Var op var version of binary inline primitives." "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. + See EncoderForSistaV1's class comment and StackInterpreter>>#binaryInlinePrimitive:" - See EncoderForSistaV1's class comment and StackInterpreter>>#inlinePrimitiveBytecode:" | ra rr | (rr := backEnd availableRegisterOrNilFor: self liveRegisters) ifNil: [self ssAllocateRequiredReg: (rr := optStatus isReceiverResultRegLive ifTrue: [Arg0Reg] ifFalse: [ReceiverResultReg])]. (ra := backEnd availableRegisterOrNilFor: (self liveRegisters bitOr: (self registerMaskFor: rr))) ifNil: [self ssAllocateRequiredReg: (ra := Arg1Reg)]. (rr = ReceiverResultReg or: [ra = ReceiverResultReg]) ifTrue: [optStatus isReceiverResultRegLive: false]. self ssTop popToReg: ra. self ssPop: 1. self ssTop popToReg: rr. self ssPop: 1. prim caseOf: { "0 through 6, +, -, *, /, //, \\, quo:, SmallInteger op SmallInteger => SmallInteger, no overflow" [0] -> [objectRepresentation genRemoveSmallIntegerTagsInScratchReg: ra. self AddR: ra R: rr]. [1] -> [self SubR: ra R: rr. objectRepresentation genAddSmallIntegerTagsTo: rr]. [2] -> [objectRepresentation genRemoveSmallIntegerTagsInScratchReg: rr. objectRepresentation genShiftAwaySmallIntegerTagsInScratchReg: ra. self MulR: ra R: rr. objectRepresentation genAddSmallIntegerTagsTo: rr]. + "2016 through 2019, bitAnd:, bitOr:, bitXor, bitShift:, SmallInteger op SmallInteger => SmallInteger, no overflow" - "16 through 19, bitAnd:, bitOr:, bitXor, bitShift:, SmallInteger op SmallInteger => SmallInteger, no overflow" + "2032 through 2037, >, <, >=, <=. =, ~=, SmallInteger op SmallInteger => Boolean (flags?? then in jump bytecodes if ssTop is a flags value, just generate the instruction!!!!)" - "32 through 37, >, <, >=, <=. =, ~=, SmallInteger op SmallInteger => Boolean (flags?? then in jump bytecodes if ssTop is a flags value, just generate the instruction!!!!)" + "2064 through 2068, Pointer Object>>at:, Byte Object>>at:, Short16 Word Object>>at: LongWord32 Object>>at: Quad64Word Object>>at:. obj op 0-rel SmallInteger => oop" - "64 through 68, Pointer Object>>at:, Byte Object>>at:, Short16 Word Object>>at: LongWord32 Object>>at: Quad64Word Object>>at:. obj op 0-rel SmallInteger => oop" - "80 through 84, Pointer Object>>at:put:, Byte Object>>at:put:, Short16 Word Object>>at:put: LongWord32 Object>>at:put: Quad64Word Object>>at:put:. obj op 0-rel SmallInteger => oop" - } otherwise: [^EncounteredUnknownBytecode]. self ssPushRegister: rr. ^0! Item was changed: ----- Method: StackToRegisterMappingCogit>>genNullaryInlinePrimitive: (in category 'inline primitive generators') ----- genNullaryInlinePrimitive: prim "Nullary inline primitives." "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. + See EncoderForSistaV1's class comment and StackInterpreter>>#nullaryInlinePrimitive:" - See EncoderForSistaV1's class comment and StackInterpreter>>#inlinePrimitiveBytecode:" ^EncounteredUnknownBytecode! Item was changed: ----- Method: StackToRegisterMappingCogit>>genTrinaryInlinePrimitive: (in category 'inline primitive generators') ----- genTrinaryInlinePrimitive: prim "Unary inline primitives." "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. + See EncoderForSistaV1's class comment and StackInterpreter>>#trinaryInlinePrimitive:" - See EncoderForSistaV1's class comment and StackInterpreter>>#inlinePrimitiveBytecode:" "not yet implemented" ^EncounteredUnknownBytecode! Item was changed: ----- Method: StackToRegisterMappingCogit>>genUnaryInlinePrimitive: (in category 'inline primitive generators') ----- genUnaryInlinePrimitive: prim "Unary inline primitives." "SistaV1: 248 11111000 iiiiiiii mjjjjjjj Call Primitive #iiiiiiii + (jjjjjjj * 256) m=1 means inlined primitive, no hard return after execution. + See EncoderForSistaV1's class comment and StackInterpreter>>#unaryInlinePrimitive:" - See EncoderForSistaV1's class comment and StackInterpreter>>#inlinePrimitiveBytecode:" | rcvrReg resultReg | self ssTop type = SSRegister ifTrue: [rcvrReg := self ssTop register] ifFalse: [(rcvrReg := backEnd availableRegisterOrNilFor: self liveRegisters) ifNil: [self ssAllocateRequiredReg: (rcvrReg := optStatus isReceiverResultRegLive ifTrue: [Arg0Reg] ifFalse: [ReceiverResultReg])]]. self ssTop popToReg: rcvrReg. self ssPop: 1. (resultReg := backEnd availableRegisterOrNilFor: self liveRegisters) ifNil: [self ssFlushUpThroughRegister: rcvrReg]. prim caseOf: { [1] -> "01 unchecked pointer numSlots" [resultReg ifNil: [resultReg := rcvrReg]. objectRepresentation genGetNumSlotsOf: rcvrReg into: resultReg; genConvertIntegerToSmallIntegerInScratchReg: resultReg. self ssPushRegister: resultReg]. } otherwise: [^EncounteredUnknownBytecode]. ^0! Item was changed: SharedPool subclass: #VMObjectIndices instanceVariableNames: '' + classVariableNames: 'ActiveProcessIndex CharacterTable CharacterValueIndex ClassAlien ClassArray ClassBitmap ClassBlockClosure ClassBlockContext ClassByteArray ClassByteString ClassCharacter ClassExternalAddress ClassExternalData ClassExternalFunction ClassExternalLibrary ClassExternalStructure ClassFloat ClassLargeNegativeInteger ClassLargePositiveInteger ClassMessage ClassMethodContext ClassMutex ClassPoint ClassSemaphore ClassSmallInteger ClassString ClassUnsafeAlien ClassWeakFinalizer ClosureCopiedValuesIndex ClosureFirstCopiedValueIndex ClosureIndex ClosureNumArgsIndex ClosureOuterContextIndex ClosureStartPCIndex CompactClasses ConstMinusOne ConstOne ConstTwo ConstZero ExcessSignalsIndex ExternalObjectsArray FalseObject FirstLinkIndex ForeignCallbackProcess HeaderIndex InstanceSpecificationIndex InstructionPointerIndex KeyIndex LastLinkIndex LiteralStart MessageArgumentsIndex MessageLookupClassIndex MessageSelectorIndex MethodArrayIndex MethodDictionaryIndex MethodIndex MyListIndex NextLinkIndex NilObject PrimErrTableIndex PriorityIndex ProcessInExternalCodeTag ProcessListsIndex ProcessSignalingLowSpace ReceiverIndex SchedulerAssociation SelectorAboutToReturn SelectorAttemptToAssign SelectorCannotInterpret SelectorCannotReturn SelectorCounterTripped SelectorDoesNotUnderstand SelectorInvokeCallback SelectorMustBeBoolean SelectorRunWithIn SelectorSistaTrap SelectorStart SelectorUnknownBytecode SenderIndex SpecialSelectors StackPointerIndex StreamArrayIndex StreamIndexIndex StreamReadLimitIndex StreamWriteLimitIndex SuperclassIndex SuspendedContextIndex TheDisplay TheFinalizationSemaphore TheInputSemaphore TheInterruptSemaphore TheLowSpaceSemaphore TheTimerSemaphore TrueObject ValueIndex XIndex YIndex' - classVariableNames: 'ActiveProcessIndex CharacterTable CharacterValueIndex ClassAlien ClassArray ClassBitmap ClassBlockClosure ClassBlockContext ClassByteArray ClassByteString ClassCharacter ClassExternalAddress ClassExternalData ClassExternalFunction ClassExternalLibrary ClassExternalStructure ClassFloat ClassLargeNegativeInteger ClassLargePositiveInteger ClassMessage ClassMethodContext ClassMutex ClassPoint ClassSemaphore ClassSmallInteger ClassString ClassUnsafeAlien ClassWeakFinalizer ClosureCopiedValuesIndex ClosureFirstCopiedValueIndex ClosureIndex ClosureNumArgsIndex ClosureOuterContextIndex ClosureStartPCIndex CompactClasses ConstMinusOne ConstOne ConstTwo ConstZero ExcessSignalsIndex ExternalObjectsArray FalseObject FirstLinkIndex ForeignCallbackProcess HeaderIndex InstanceSpecificationIndex InstructionPointerIndex KeyIndex LastLinkIndex LiteralStart MessageArgumentsIndex MessageLookupClassIndex MessageSelectorIndex MethodArrayIndex MethodDictionaryIndex MethodIndex MyListIndex NextLinkIndex NilObject PrimErrTableIndex PriorityIndex ProcessInExternalCodeTag ProcessListsIndex ProcessSignalingLowSpace ReceiverIndex SchedulerAssociation SelectorAboutToReturn SelectorAttemptToAssign SelectorCannotInterpret SelectorCannotReturn SelectorClassTrap SelectorCounterTripped SelectorDoesNotUnderstand SelectorInvokeCallback SelectorMustBeBoolean SelectorRunWithIn SelectorStart SelectorUnknownBytecode SenderIndex SpecialSelectors StackPointerIndex StreamArrayIndex StreamIndexIndex StreamReadLimitIndex StreamWriteLimitIndex SuperclassIndex SuspendedContextIndex TheDisplay TheFinalizationSemaphore TheInputSemaphore TheInterruptSemaphore TheLowSpaceSemaphore TheTimerSemaphore TrueObject ValueIndex XIndex YIndex' poolDictionaries: '' category: 'VMMaker-Interpreter'! !VMObjectIndices commentStamp: '<historical>' prior: 0! I am a shared pool for the constants that define object layout and well-known objects shared between the object memories (e.g. ObjectMemory, NewObjectMemory), the interpreters (e.g. StackInterpreter, CoInterpreter) and the object representations (e.g. ObjectRepresentationForSqueakV3). self classPool declare: #Foo from: StackInterpreter classPool (ObjectMemory classPool keys select: [:k| (k beginsWith: 'Class') and: [(k endsWith: 'Index') not]]) do: [:k| self classPool declare: k from: ObjectMemory classPool]!

1 0

New Cog VMs available
by Eliot Miranda 24 Sep '14

24 Sep '14

...at http://www.mirandabanda.org/files/Cog/VM/VM.r3072. CogVM binaries as per VMMaker.oscog-eem.876/r3072 Fix bad regression in FilePlugin>>primitiveFileSetPosition introduces around r2797 that breaks > 1Gb file access. Change manifest files on Windows to make app HIGHDPIAWARE. Create a manifest for the consolevm and include it in the archive. Fix bug with become where duplicate entries in the input array would crash the system (thanks Igor). Make nameOfClass: more robust, in both the real and simulated VMs. Regenerate sources after refactoring Slang code to ask classes what methods they want to include based on their initializationOptions inst var instead of the centralized VMMaker. Generate Spur Newspeak VMs with the new CompiledMethod header format. This will break the Newspeak Spur bootstrap until NOF generation and/or loading is fixed. -- best, Eliot

2 5

re: deployment components (was "The Dilemma: Building a Futuristic GUI for Ephestos")
by Torsten Bergmann 24 Sep '14

24 Sep '14

Craig Latta wrote: >Right, there's no need for anyone to use UUIDs when referring to >classes in Smalltalk expressions. Yes, exactly this. We still use regular names for the classes - but for the tools they have a distinguishable ID. Best is to use a UUID for the ID as it is unique from the beginning. So if you create a class "Foo" and I create one both are unqique by ID - even when using the same name. The "rest" is implemeting tooling support. When you write "Foo" in a workspace then the workspace either already has a naming context to resolve the name (see [1] or could provide you with a selection if there is more than one. Internally you could bind to the right class by using the ID. I hate prefixing the classes as we now do, I want to name the classes "Instruction" not "IRInstruction" in Opal or "AJInstruction" in AsmJIT, especially since "IR" and "AJ" do not really tell you anything. Smalltalk names should be understandable. Additionally we should have meaningfull (and also unique) names also for namespaces. Also the current three/two letter prefixing of classes that is used in Squeak or Pharo only scales well for small communities... When there are things I like in Java then it is the fact to use reverse domains for namespaces. It is easy, understandable and I could also easily check if there is a web location. This way a namespace "org.apache.maven" gives you something meaningful, I can even visit http://maven.apache.org/. Allows the community to easily scale with thousands of classes without having clashes. Think of "org.pharo.asmjit.Instruction" vs "org.pharo.opal.Instruction" So you additionally need better and meaningful namespaces THAT SCALE AND ARE EASY TO UNDERSTAND combined with real packages (as objects, as Pharo already has). Then we also need ABIA (Around, beginner, inner, after messages), multiple method categories, selector namespaces, possibility for visibility (like private methods, see [2]), unified annotations for classes/methods/variables and a few other ingredients from my personal wishlist and it may shape a different new future... The interesting part is not to add all kind of stuff to Smalltalk - the interesting part is what is the most minimalistic system to allow for something extensible and still flexible (even within the meta-system) so that one can bootstrap things on top. Bye T. [1] http://vimeo.com/75391990 [2] http://smalltalkhub.com/#!/~CamilleTeruel/PrivateMethods

4 5

Re: [Pharo-dev] Implementing lazy loading for expandable collections
by Eliot Miranda 24 Sep '14

24 Sep '14

On Mon, Sep 22, 2014 at 5:10 AM, Max Leske <maxleske(a)gmail.com> wrote: > > On 19.09.2014, at 21:45, Eliot Miranda <eliot.miranda(a)gmail.com> wrote: > > > > On Fri, Sep 19, 2014 at 2:35 AM, Max Leske <maxleske(a)gmail.com> wrote: > >> I’ve written an implementation of lazily initialized expandable >> collections (for OrderedCollection and subclasses only for now), inspired >> by Alexandre’s talk at ESUG ( >> http://www.youtube.com/watch?v=x0YJ2dsZdKg&list=UUO-vBhaKVZf0al-ISMMPvRw). >> The implementation is pretty much straight forward but there are a couple >> of culprits I want to point out in case anybody else wants to do this: >> >> - my implementation requires an extra instance variable in >> OrderedCollection to store the requested size. This extra instance variable >> will break Monticello (and possibly other tools) because Monticello uses >> OrderedCollections to load code and the particular way it uses them makes >> it impossible to change the number of instance variables on >> OrderedCollection. Also, all .mcz files written after the change will not >> be loadable by images without the new instance variable (same reason). >> - the above means that you have to modify the code in the image manually >> and save a new “base image" >> - read only messages should obviously not initialize the array. The >> ‘firstIndex’ and ‘lastIndex’ variables are quite handy for that. I >> initialize those variables to 1 and 0 respectively which makes most things >> work already (e.g. #size, #isEmpty etc.). >> - when trying to implement the same for HashedCollection I couldn’t. The >> image didn’t just stop working, there was no output at all on the console, >> not even when using a debug VM. The problem seems to be MethodDictionary, >> at least that’s the only subclass of Dictionary for which adding an >> instance variable doesn’t work. >> > > Yes, alas the shape of MethodDIctionary is baked into the VM's method > lookup code. It would be straight-forward to fix it, but it is still work > and one would have to wait for people to update their VMs. > > > When you say “fix”, do you mean a hard coded change of the number of > fields in MethodDictionary or do you mean a change that would allow one to > change the number of fields in the future? In the former case someone wiser > than me will have to make a decision, in the latter I would promote that > change (if it doesn’t affect performance of course). > The latter. It does make accessing method dictionaries on lookup slightly slower but lookups are rare in both the interpreter and the JIT. Max > > I’ll share some memory monitoring as soon as I have something significant >> (only just rolled it out). >> >> >> Big thanks to Alex for his talk and the cool work he and his students did! >> >> Cheers, >> Max > > -- > best, > Eliot > > -- best, Eliot

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev September 2014