Vm-dev February 2017

vm-dev@lists.squeakfoundation.org

24 participants
79 discussions

[OpenSmalltalk/opensmalltalk-vm] 210748: CogVM source as per VMMaker.oscogSPC-eem.2134
by GitHub 18 Feb '17

18 Feb '17

Branch: refs/heads/SpurPlanningCompactor Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 210748bbc1afdc39b1b395269b53b86f40727980 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/210748bbc1afdc39b1… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-02-17 (Fri, 17 Feb 2017) Changed paths: M nsspur64src/vm/cogit.h M nsspur64src/vm/cogitX64.c M nsspur64src/vm/cogmethod.h M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspursrc/vm/cogit.h M nsspursrc/vm/cogitARMv5.c M nsspursrc/vm/cogitIA32.c M nsspursrc/vm/cogitMIPSEL.c M nsspursrc/vm/cogmethod.h M nsspursrc/vm/cointerp.c M nsspursrc/vm/cointerp.h M nsspursrc/vm/gcc3x-cointerp.c M nsspurstack64src/vm/gcc3x-interp.c M nsspurstack64src/vm/interp.c M nsspurstacksrc/vm/gcc3x-interp.c M nsspurstacksrc/vm/interp.c M spur64src/vm/cogit.h M spur64src/vm/cogitX64.c M spur64src/vm/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/gcc3x-cointerp.c M spursista64src/vm/cogit.h M spursista64src/vm/cogitX64.c M spursista64src/vm/cointerp.c M spursista64src/vm/cointerp.h M spursista64src/vm/gcc3x-cointerp.c M spursistasrc/vm/cogit.h M spursistasrc/vm/cogitARMv5.c M spursistasrc/vm/cogitIA32.c M spursistasrc/vm/cogitMIPSEL.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.c M spursrc/vm/cogit.h M spursrc/vm/cogitARMv5.c M spursrc/vm/cogitIA32.c M spursrc/vm/cogitMIPSEL.c M spursrc/vm/cointerp.c M spursrc/vm/cointerp.h M spursrc/vm/gcc3x-cointerp.c M spurstack64src/vm/gcc3x-interp.c M spurstack64src/vm/interp.c M spurstacksrc/vm/gcc3x-interp.c M spurstacksrc/vm/interp.c M src/vm/cogit.h M src/vm/cogitARMv5.c M src/vm/cogitIA32.c M src/vm/cogitMIPSEL.c M src/vm/cointerp.c M src/vm/cointerp.h M src/vm/cointerpmt.c M src/vm/cointerpmt.h M src/vm/gcc3x-cointerp.c M src/vm/gcc3x-cointerpmt.c M stacksrc/vm/gcc3x-interp.c M stacksrc/vm/interp.c Log Message: ----------- CogVM source as per VMMaker.oscogSPC-eem.2134 StackInterpreter: Fix serious and ancient bug with stack checking and event checking. The event check piggy backs off the stack check, but the old code would not handle a stack overflow if there was an overflow and an event check at one and the same time, allowing frames to grow down the stack page in cases where there are lots of events (such as profiling). SpurPlanningCompactor: Fix bad slip in unmarkObjectsFromFirstFreeObject; it forgot to free the last object in the sequence. Cogit: Fix checking the lists of cog methods (openPICList and unpairedMethodList) when compacting the method zone. Fix a bug with freeing a method that might have either a nextMethod or an IRC; Must not free CogMethods. Fix a couple of C compilation warnings. With these changes the Cadence Glue External Tests run to completion without assert fails on 64-bit linux.

1 0

VM Maker: VMMaker.oscogSPC-eem.2134.mcz
by commits＠source.squeak.org 18 Feb '17

18 Feb '17

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscogSPC-eem.2134.mcz ==================== Summary ==================== Name: VMMaker.oscogSPC-eem.2134 Author: eem Time: 17 February 2017, 6:10:51.775611 pm UUID: 06cfcc06-3413-4d67-8701-d97ac0a7dce2 Ancestors: VMMaker.oscogSPC-eem.2133 StackInterpreter: Fix serious and ancient bug with stack checking and event checking. The event check piggy backs off the stack check, but the old code would not handle a stack overflow if there was an overflow and an event check at one and the same time, allowing frames to grow down the stack page in cases where there are lots of events (such as profiling). SpurPlanningCompactor: Fix bad slip in unmarkObjectsFromFirstFreeObject; it forgot to free the last object in the sequence. With these two changes the Cadence Glue External Tests run to completion wthout assert fails on 64-bit linux. =============== Diff against VMMaker.oscogSPC-eem.2133 =============== Item was removed: - ----- Method: SpurPlanningCompactor>>findNextMarkedPinnedAfter: (in category 'private') ----- - findNextMarkedPinnedAfter: unpinnedObj - <inline: true> - | nextObj | - self deny: ((manager isPinned: unpinnedObj) and: [manager isMarked: unpinnedObj]). - nextObj := unpinnedObj. - [nextObj := manager oldSpaceObjectAfter: nextObj. - (self oop: nextObj isGreaterThanOrEqualTo: manager endOfMemory) ifTrue: - [^nil]. - (manager isPinned: nextObj) and: [manager isMarked: nextObj]] whileFalse. - ^nextObj! Item was removed: - ----- Method: SpurPlanningCompactor>>freeAllUnpinnedObjectsFromObject:toFinger: (in category 'private') ----- - freeAllUnpinnedObjectsFromObject: nextObj toFinger: initialToFinger - "Free all space from toFinger up, preserving only marked pinned objects, clearning their marked bits." - | toFinger nextPinnedObj | - <var: 'toFinger' type: #usqInt> - <var: 'nextPinnedObj' type: #usqInt> - toFinger := initialToFinger. - nextPinnedObj := nextObj. - [[nextPinnedObj >= manager endOfMemory - or: [(manager isMarked: nextPinnedObj) - and: [manager isPinned: nextPinnedObj]]] whileFalse: - [nextPinnedObj := manager objectAfter: nextPinnedObj limit: manager endOfMemory]. - nextPinnedObj < manager endOfMemory] whileTrue: - [toFinger < (manager startOfObject: nextPinnedObj) ifTrue: - [manager addFreeChunkWithBytes: (manager startOfObject: nextPinnedObj) - toFinger at: toFinger]. - self unmarkPinned: nextPinnedObj. - toFinger := manager addressAfter: nextPinnedObj. - nextPinnedObj := manager oldSpaceObjectAfter: nextPinnedObj]. - toFinger < manager endOfMemory ifTrue: - [manager addFreeChunkWithBytes: manager endOfMemory - toFinger at: toFinger]! Item was removed: - ----- Method: SpurPlanningCompactor>>unmarkAndScanForFirstUnpinnedObjectFrom: (in category 'compaction') ----- - unmarkAndScanForFirstUnpinnedObjectFrom: initialObject - "Scan from initialObject, unmarking any marked pinned objects, and answering the first mobile or freeable object found, or nil if none." - manager allOldSpaceEntitiesFrom: initialObject do: - [:o| - ((manager isMarked: o) and: [manager isPinned: o]) ifFalse: - [^o]. - self unmarkPinned: o]. - ^nil! Item was removed: - ----- Method: SpurPlanningCompactor>>unmarkObjectsAfterLastMobileObject (in category 'compaction') ----- - unmarkObjectsAfterLastMobileObject - "Sweep the final immobile heap, freeing and coalescing unmarked and free objects, - and unmarking all marked objects up to the end of memory." - | startOfFree freeBytes | - freeBytes := 0. - manager allOldSpaceEntitiesFrom: objectAfterLastMobileObject do: - [:o| - self check: o. - (manager isMarked: o) - ifFalse: - [startOfFree ifNil: [startOfFree := manager startOfObject: o]. - freeBytes := freeBytes + (manager bytesInObject: o)] - ifTrue: - [startOfFree ifNotNil: - [manager addFreeChunkWithBytes: freeBytes at: startOfFree. - startOfFree := nil. - freeBytes := 0]. - (manager isPinned: o) - ifTrue: [self unmarkPinned: o] - ifFalse: [manager setIsMarkedOf: o to: false]]]! Item was changed: ----- Method: SpurPlanningCompactor>>unmarkObjectsFromFirstFreeObject (in category 'compaction') ----- unmarkObjectsFromFirstFreeObject "Sweep the final immobile heap, freeing and coalescing unmarked and free objects, and unmarking all marked objects up to the end of memory." | startOfFree freeBytes | freeBytes := 0. manager allOldSpaceEntitiesFrom: firstFreeObject do: [:o| self check: o. (manager isMarked: o) ifFalse: [startOfFree ifNil: [startOfFree := manager startOfObject: o]. freeBytes := freeBytes + (manager bytesInObject: o)] ifTrue: [startOfFree ifNotNil: [manager addFreeChunkWithBytes: freeBytes at: startOfFree. startOfFree := nil. freeBytes := 0]. (manager isPinned: o) ifTrue: [self unmarkPinned: o] + ifFalse: [manager setIsMarkedOf: o to: false]]]. + startOfFree ifNotNil: + [manager addFreeChunkWithBytes: freeBytes at: startOfFree].! - ifFalse: [manager setIsMarkedOf: o to: false]]]! Item was removed: - ----- Method: SpurPlanningCompactor>>unmarkPinnedObjectsAndFindFirstUnpinnedOrFreeEntityFollowing: (in category 'private') ----- - unmarkPinnedObjectsAndFindFirstUnpinnedOrFreeEntityFollowing: pinnedObj - <inline: true> - | nextObj | - self assert: ((manager isPinned: pinnedObj) and: [manager isMarked: pinnedObj]). - nextObj := pinnedObj. - [self unmarkPinned: nextObj. - nextObj := manager oldSpaceObjectAfter: nextObj. - (self oop: nextObj isGreaterThanOrEqualTo: manager endOfMemory) ifTrue: - [^manager endOfMemory]. - (manager isPinned: nextObj) and: [manager isMarked: nextObj]] whileTrue. - ^nextObj! Item was changed: ----- Method: SpurSegmentManager>>shrinkObjectMemory: (in category 'growing/shrinking memory') ----- shrinkObjectMemory: delta "Answer if any shrinkage was achieved." <inline: false> <var: #delta type: #usqInt> | shrinkage emptySeg | <var: #shrinkage type: #usqInt> <var: #emptySeg type: #'SpurSegmentInfo *'> + manager checkFreeSpace: GCModeFreeSpace. shrinkage := delta. [emptySeg := self findEmptySegNearestInSizeTo: shrinkage. + (emptySeg isNil + or: [emptySeg segSize > shrinkage]) ifTrue: + [manager checkFreeSpace: GCModeFreeSpace. + ^shrinkage < delta]. + shrinkage := shrinkage - emptySeg segSize. + manager detachFreeObject: (manager objectStartingAt: emptySeg segStart). + self removeSegment: emptySeg] repeat! - emptySeg notNil] whileTrue: - [emptySeg segSize > shrinkage ifTrue: - [^shrinkage < delta]. - shrinkage := shrinkage - emptySeg segSize. - manager detachFreeObject: (manager objectStartingAt: emptySeg segStart). - self removeSegment: emptySeg]. - ^shrinkage < delta! Item was changed: ----- Method: StackInterpreter>>checkForStackOverflow (in category 'message sending') ----- checkForStackOverflow + "Check for stack overflow, moving frames to another stack if so. Since event checking + piggy-backs off the stackLimit by setting it to all ones, the check for overflow must be + against the real stack limit to find out if overflow has actually occurred." - "Check for stack overflow, moving frames to another stack if so." <inline: true> + self externalWriteBackHeadFramePointers. - "After checkForInterrupts another event check may have been forced, setting both - stackLimit and stackPage stackLimit to all ones. So here we must check against - the real stackLimit, not the effective stackLimit." stackPointer < stackPage realStackLimit ifTrue: [self handleStackOverflow]! Item was changed: ----- Method: StackInterpreter>>handleStackOverflowOrEventAllowContextSwitch: (in category 'message sending') ----- handleStackOverflowOrEventAllowContextSwitch: mayContextSwitch "The stackPointer is below the stackLimit. This is either because of a stack overflow or the setting of stackLimit to indicate a possible interrupt. + Check for stackOverflow and interrupts anddeal with each appropriately. - Check for interrupts and stackOverflow and deal with each appropriately. Answer if a context switch occurred." - | switched | <inline: false> + self checkForStackOverflow. "If the stackLimit differs from the realStackLimit then the stackLimit has been set to indicate an event or interrupt that needs servicing." + stackLimit = stackPage realStackLimit ifTrue: + [^false]. + ^self checkForEventsMayContextSwitch: mayContextSwitch! - stackLimit = stackPage realStackLimit - ifTrue: - [self externalWriteBackHeadFramePointers. - switched := false] - ifFalse: [switched := self checkForEventsMayContextSwitch: mayContextSwitch]. - - self checkForStackOverflow. - ^switched! Item was changed: ----- Method: StackInterpreter>>sendInvokeCallback:Stack:Registers:Jmpbuf: (in category 'callback support') ----- sendInvokeCallback: thunkPtr Stack: stackPtr Registers: regsPtr Jmpbuf: jmpBufPtr "Send the 4 argument callback message invokeCallback:stack:registers:jmpbuf: to Alien class with the supplied args. The arguments are raw C addresses and are converted to integer objects on the way." <export: true> | classTag | classTag := self fetchClassTagOfNonImm: (self splObj: ClassAlien). messageSelector := self splObj: SelectorInvokeCallback. argumentCount := 4. (self lookupInMethodCacheSel: messageSelector classTag: classTag) ifFalse: [(self lookupOrdinaryNoMNUEtcInClass: (objectMemory classForClassTag: classTag)) ~= 0 ifTrue: [^false]]. ((self argumentCountOf: newMethod) = 4 and: [primitiveFunctionPointer = 0]) ifFalse: [^false]. self push: (self splObj: ClassAlien). "receiver" self push: (self positiveMachineIntegerFor: thunkPtr). self push: (self positiveMachineIntegerFor: stackPtr). self push: (self positiveMachineIntegerFor: regsPtr). self push: (self positiveMachineIntegerFor: jmpBufPtr). self ifAppropriateCompileToNativeCode: newMethod selector: messageSelector. self justActivateNewMethod. (self isMachineCodeFrame: framePointer) ifFalse: [self maybeFlagMethodAsInterpreted: newMethod]. - self externalWriteBackHeadFramePointers. self checkForStackOverflow. self enterSmalltalkExecutiveFromCallback. "not reached" ^true! Item was changed: ----- Method: StackInterpreter>>sendInvokeCallbackContext: (in category 'callback support') ----- sendInvokeCallbackContext: vmCallbackContext "Send the calllback message to Alien class with the supplied arg(s). Use either the 1 arg invokeCallbackContext: or the 4 arg invokeCallback:stack:registers:jmpbuf: message, depending on what selector is installed in the specialObjectsArray. Note that if invoking the legacy invokeCallback:stack:registers:jmpbuf: we pass the vmCallbackContext as the jmpbuf argument (see reestablishContextPriorToCallback:). The arguments are raw C addresses and are converted to integer objects on the way." <export: true> <var: #vmCallbackContext type: #'VMCallbackContext *'> | classTag | classTag := self fetchClassTagOfNonImm: (self splObj: ClassAlien). messageSelector := self splObj: SelectorInvokeCallback. (self lookupInMethodCacheSel: messageSelector classTag: classTag) ifFalse: [(self lookupOrdinaryNoMNUEtcInClass: (objectMemory classForClassTag: classTag)) ~= 0 ifTrue: [^false]]. primitiveFunctionPointer ~= 0 ifTrue: [^false]. self saveCStackStateForCallbackContext: vmCallbackContext. self push: (self splObj: ClassAlien). "receiver" (self argumentCountOf: newMethod) = 4 ifTrue: [self push: (self positiveMachineIntegerFor: vmCallbackContext thunkp asUnsignedInteger). self push: (self positiveMachineIntegerFor: vmCallbackContext stackp asUnsignedInteger). self push: (self positiveMachineIntegerFor: vmCallbackContext intregargsp asUnsignedInteger)]. self push: (self positiveMachineIntegerFor: vmCallbackContext asUnsignedInteger). self ifAppropriateCompileToNativeCode: newMethod selector: messageSelector. self justActivateNewMethod. (self isMachineCodeFrame: framePointer) ifFalse: [self maybeFlagMethodAsInterpreted: newMethod]. - self externalWriteBackHeadFramePointers. self checkForStackOverflow. self enterSmalltalkExecutiveFromCallback. "not reached" ^true!

1 0

VM Maker: VMMaker.oscogSPC-eem.2133.mcz
by commits＠source.squeak.org 18 Feb '17

18 Feb '17

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscogSPC-eem.2133.mcz ==================== Summary ==================== Name: VMMaker.oscogSPC-eem.2133 Author: eem Time: 17 February 2017, 4:13:50.823694 pm UUID: 00a2a293-2a06-4bd9-9f74-101613c9c718 Ancestors: VMMaker.oscogSPC-eem.2132 Cogit: Fix checking the lists of cog methods (openPICList and unpairedMethodList) when compacting. Fix a bug with freeing a method that might have either a newxtMethod or an IRC. Must not free CogMethods. Fix a couple of C compilation warnings. =============== Diff against VMMaker.oscogSPC-eem.2132 =============== Item was changed: ----- Method: CogBlockMethod class>>instVarNamesAndTypesForTranslationDo: (in category 'translation') ----- instVarNamesAndTypesForTranslationDo: aBinaryBlock "enumerate aBinaryBlock with the names and C type strings for the inst vars to include in a CogMethod or CogBlockMethod struct." self allInstVarNames do: [:ivn| "Notionally objectHeader is in a union with homeOffset and startpc but we don't have any convenient support for unions. So hack, hack, hack, hack." ((self == CogBlockMethod ifTrue: [#('objectHeader')] ifFalse: [#('homeOffset' 'startpc' 'padToWord')]) includes: ivn) ifFalse: [aBinaryBlock value: ivn value: (ivn caseOf: { ['objectHeader'] -> [self objectMemoryClass baseHeaderSize = 8 ifTrue: [#sqLong] ifFalse: [#sqInt]]. ['cmNumArgs'] -> [#(unsigned ' : 8')]. "SqueakV3 needs only 5 bits" ['cmType'] -> [#(unsigned ' : 3')]. ['cmRefersToYoung'] -> [#(unsigned #Boolean ' : 1')]. ['cpicHasMNUCaseOrCMIsFullBlock'] -> [#(unsigned #Boolean ' : 1')]. ['cmUsageCount'] -> [#(unsigned ' : 3')]. "See CMMaxUsageCount in initialize" ['cmUsesPenultimateLit'] -> [#(unsigned #Boolean ' : 1')]. ['cbUsesInstVars'] -> [#(unsigned #Boolean ' : 1')]. ['cmUnusedFlags'] -> [#(unsigned ' : 2')]. + ['stackCheckOffset'] -> [#(unsigned ' : 12')]. "See MaxStackCheckOffset in initialize. a.k.a. cPICNumCases" - ['stackCheckOffset'] -> [#(unsigned ' : 12')]. "See MaxStackCheckOffset in initialize. a.k.a. cPICNumCases" ['blockSize'] -> [#'unsigned short']. "See MaxMethodSize in initialize" ['blockEntryOffset'] -> [#'unsigned short']. ['homeOffset'] -> [#'unsigned short']. ['startpc'] -> [#'unsigned short']. ['padToWord'] -> [#(#BaseHeaderSize 8 'unsigned int')]. + ['nextMethodOrIRCs'] -> [#usqInt]. "See NewspeakCogMethod" - ['nextMethod'] -> ['struct _CogMethod *']. "See NewspeakCogMethod" ['counters'] -> [#usqInt]} "See SistaCogMethod" otherwise: [#sqInt])]]! Item was changed: CogClass subclass: #CogMethodZone + instanceVariableNames: 'youngReferrers unpairedMethodList methodCount openPICList mzFreeStart baseAddress limitAddress methodBytesFreedSinceLastCompaction compactionInProgress coInterpreter objectRepresentation cogit objectMemory' - 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 ! Item was changed: ----- Method: CogMethodZone>>compactCompiledCode (in category 'compaction') ----- compactCompiledCode | objectHeaderValue source dest bytes | <var: #source type: #'CogMethod *'> <var: #dest type: #'CogMethod *'> + compactionInProgress := true. objectHeaderValue := objectMemory nullHeaderForMachineCodeMethod. source := coInterpreter cCoerceSimple: baseAddress to: #'CogMethod *'. openPICList := nil. methodCount := 0. NewspeakVM ifTrue: [unpairedMethodList := nil]. [source < self limitZony and: [source cmType ~= CMFree]] whileTrue: [self assert: (cogit cogMethodDoesntLookKosher: source) = 0. source objectHeader: objectHeaderValue. source cmUsageCount > 0 ifTrue: [source cmUsageCount: source cmUsageCount // 2]. NewspeakVM ifTrue: [(source cmType = CMMethod and: [(coInterpreter rawHeaderOf: source methodObject) asInteger ~= source asInteger]) ifTrue: [source nextMethodOrIRCs: unpairedMethodList. unpairedMethodList := source asUnsignedInteger]]. SistaVM ifTrue: [self clearSavedPICUsageCount: source]. source cmType = CMOpenPIC ifTrue: [source nextOpenPIC: openPICList asUnsignedInteger. openPICList := source]. methodCount := methodCount + 1. source := self methodAfter: source]. source >= self limitZony ifTrue: [^self halt: 'no free methods; cannot compact.']. dest := source. [source < self limitZony] whileTrue: [self assert: (cogit maybeFreeCogMethodDoesntLookKosher: source) = 0. bytes := source blockSize. source cmType ~= CMFree ifTrue: [methodCount := methodCount + 1. objectMemory mem: dest mo: source ve: bytes. dest objectHeader: objectHeaderValue. dest cmType = CMMethod ifTrue: ["For non-Newspeak there should be a one-to-one mapping between bytecoded and cog methods. For Newspeak not necessarily, but only for anonymous accessors." "Only update the original method's header if it is referring to this CogMethod." (coInterpreter rawHeaderOf: dest methodObject) asInteger = source asInteger ifTrue: [coInterpreter rawHeaderOf: dest methodObject put: dest asInteger] ifFalse: [self assert: (cogit noAssertMethodClassAssociationOf: dest methodObject) = objectMemory nilObject. NewspeakVM ifTrue: [dest nextMethodOrIRCs: unpairedMethodList. unpairedMethodList := dest asUnsignedInteger]]] ifFalse: [SistaVM ifTrue: [self clearSavedPICUsageCount: dest]. dest cmType = CMOpenPIC ifTrue: [dest nextOpenPIC: openPICList asUnsignedInteger. openPICList := dest]]. dest cmUsageCount > 0 ifTrue: [dest cmUsageCount: dest cmUsageCount // 2]. dest := coInterpreter cCoerceSimple: dest asUnsignedInteger + bytes to: #'CogMethod *']. source := coInterpreter cCoerceSimple: source asUnsignedInteger + bytes to: #'CogMethod *']. mzFreeStart := dest asUnsignedInteger. + methodBytesFreedSinceLastCompaction := 0. + compactionInProgress := false! - methodBytesFreedSinceLastCompaction := 0! Item was added: + ----- Method: CogMethodZone>>compactionInProgress (in category 'accessing') ----- + compactionInProgress + ^compactionInProgress! Item was changed: ----- Method: CogMethodZone>>freeMethod: (in category 'compaction') ----- freeMethod: cogMethod <api> <var: #cogMethod type: #'CogMethod *'> <inline: false> self assert: cogMethod cmType ~= CMFree. + self assert: (cogit cogMethodDoesntLookKosher: cogMethod) = 0. - 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. NewspeakVM ifTrue: + [(objectRepresentation canPinObjects and: [cogMethod nextMethodOrIRCs > self zoneEnd]) ifTrue: - [(objectRepresentation canPinObjects and: [cogMethod nextMethodOrIRCs ~= 0]) ifTrue: [objectRepresentation freeIRCs: cogMethod nextMethodOrIRCs]]] ifFalse: [self cCode: [self assert: (cogit noAssertMethodClassAssociationOf: cogMethod methodObject) = objectMemory nilObject] inSmalltalk: [self assert: ((cogit noAssertMethodClassAssociationOf: cogMethod methodObject) = objectMemory nilObject or: [coInterpreter isKindOf: CurrentImageCoInterpreterFacade])]. NewspeakVM ifTrue: [self removeFromUnpairedMethodList: cogMethod]]. cogit maybeFreeCountersOf: cogMethod]. cogMethod cmType = CMOpenPIC ifTrue: [self removeFromOpenPICList: cogMethod]. cogMethod cmRefersToYoung: false. cogMethod cmType: CMFree. methodBytesFreedSinceLastCompaction := methodBytesFreedSinceLastCompaction + cogMethod blockSize! Item was changed: ----- Method: CogMethodZone>>initialize (in category 'initialization') ----- initialize "Make youngReferrers arithmetic for addressIsInCodeZone:" + youngReferrers := methodCount := methodBytesFreedSinceLastCompaction := 0. + compactionInProgress := false! - youngReferrers := 0! Item was changed: ----- Method: Cogit>>addressIsInFixups: (in category 'testing') ----- addressIsInFixups: address <var: #address type: #'BytecodeFixup *'> + ^self cCode: '(BytecodeFixup *)address >= fixups && (BytecodeFixup *)address < (fixups + numAbstractOpcodes)' - ^self cCode: '(AbstractInstruction *)address >= fixups && (AbstractInstruction *)address < (fixups + numAbstractOpcodes)' inSmalltalk: [fixups notNil and: [(fixups object identityIndexOf: address) between: 1 and: numAbstractOpcodes]]! Item was changed: ----- Method: Cogit>>allMachineCodeObjectReferencesValid (in category 'garbage collection') ----- allMachineCodeObjectReferencesValid "Check that all methods have valid selectors, and that all linked sends are to valid targets and have valid cache tags" | ok cogMethod | <var: #cogMethod type: #'CogMethod *'> ok := true. cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'. [cogMethod < methodZone limitZony] whileTrue: [cogMethod cmType ~= CMFree ifTrue: [(self asserta: (objectRepresentation checkValidOopReference: cogMethod selector)) ifFalse: [ok := false]. (self asserta: (self cogMethodDoesntLookKosher: cogMethod) = 0) ifFalse: [ok := false]]. (cogMethod cmType = CMMethod or: [cogMethod cmType = CMOpenPIC]) ifTrue: [(self asserta: ((self mapFor: cogMethod performUntil: #checkIfValidOopRefAndTarget:pc:cogMethod: arg: cogMethod asInteger) = 0)) ifFalse: [ok := false]]. (cogMethod cmType = CMMethod and: [(NewspeakVM or: [SistaVM]) and: [objectRepresentation canPinObjects]]) ifTrue: [(SistaVM and: [cogMethod counters ~= 0]) ifTrue: [(self asserta: (objectRepresentation checkValidDerivedObjectReference: cogMethod counters)) ifFalse: [ok := false]]. (NewspeakVM and: [cogMethod nextMethodOrIRCs ~= 0]) ifTrue: + [(cogMethod nextMethodOrIRCs > methodZone zoneEnd) ifTrue: + [(self asserta: (objectRepresentation checkValidDerivedObjectReference: cogMethod nextMethodOrIRCs)) ifFalse: + [ok := false]]]]. - [(self asserta: (objectRepresentation checkValidDerivedObjectReference: cogMethod nextMethodOrIRCs)) ifFalse: - [ok := false]]]. cogMethod cmType = CMClosedPIC ifTrue: [(self asserta: (self noTargetsFreeInClosedPIC: cogMethod)) ifFalse: [ok := false]]. cogMethod := methodZone methodAfter: cogMethod]. ^ok! Item was changed: ----- Method: Cogit>>cogMethodDoesntLookKosher: (in category 'debugging') ----- cogMethodDoesntLookKosher: cogMethod "Check that the header fields onf a non-free method are consistent with the type. Answer 0 if it is ok, otherwise answer a code for the error." <api> <inline: false> <var: #cogMethod type: #'CogMethod *'> ((cogMethod blockSize bitAnd: objectMemory wordSize - 1) ~= 0 or: [cogMethod blockSize < (self sizeof: CogMethod) or: [cogMethod blockSize >= 32768]]) ifTrue: [^1]. cogMethod cmType = CMFree ifTrue: [^2]. cogMethod cmType = CMMethod ifTrue: [(objectMemory isIntegerObject: cogMethod methodHeader) ifFalse: [^11]. (objectRepresentation couldBeObject: cogMethod methodObject) ifFalse: [^12]. (cogMethod stackCheckOffset > 0 and: [cogMethod stackCheckOffset < cmNoCheckEntryOffset]) ifTrue: [^13]. (SistaVM and: [objectRepresentation canPinObjects and: [cogMethod counters ~= 0]]) ifTrue: [(objectRepresentation couldBeDerivedObject: cogMethod counters) ifFalse: [^14]]. (NewspeakVM and: [objectRepresentation canPinObjects and: [cogMethod nextMethodOrIRCs ~= 0]]) ifTrue: + [(cogMethod nextMethodOrIRCs < methodZone zoneEnd) + ifTrue: "check the nextMethod (unpairedMethodList) unless we're compacting." + [(methodZone compactionInProgress + or: [cogMethod nextMethodOrIRCs = (methodZone methodFor: cogMethod nextMethodOrIRCs) asUnsignedInteger]) ifFalse: + [^15]] + ifFalse: + [(objectRepresentation couldBeDerivedObject: cogMethod nextMethodOrIRCs) ifFalse: + [^16]]]. - [(objectRepresentation couldBeDerivedObject: cogMethod nextMethodOrIRCs) ifFalse: - [^15]]. ^0]. cogMethod cmType = CMOpenPIC ifTrue: [cogMethod blockSize ~= openPICSize ifTrue: [^21]. cogMethod methodHeader ~= 0 ifTrue: [^22]. - "Check the nextOpenPIC link unless we're compacting" cogMethod objectHeader >= 0 ifTrue: + [(cogMethod methodObject = 0 + or: [methodZone compactionInProgress + or: [cogMethod methodObject = (methodZone methodFor: cogMethod methodObject) asUnsignedInteger]]) ifFalse: - [(cogMethod methodObject ~= 0 - and: [cogMethod methodObject < methodZoneBase - or: [cogMethod methodObject > (methodZone freeStart - openPICSize) - or: [(cogMethod methodObject bitAnd: objectMemory wordSize - 1) ~= 0 - or: [(self cCoerceSimple: cogMethod methodObject - to: #'CogMethod *') cmType ~= CMOpenPIC]]]]) ifTrue: [^23]]. cogMethod stackCheckOffset ~= 0 ifTrue: [^24]. ^0]. cogMethod cmType = CMClosedPIC ifTrue: [cogMethod blockSize ~= closedPICSize ifTrue: [^31]. (cogMethod cPICNumCases between: 1 and: MaxCPICCases) ifFalse: [^32]. cogMethod methodHeader ~= 0 ifTrue: [^33]. cogMethod methodObject ~= 0 ifTrue: [^34]. ^0]. ^9! Item was changed: ----- Method: Cogit>>warnMultiple:selectors: (in category 'debug printing') ----- warnMultiple: cogMethod selectors: aSelectorOop <inline: true> <var: 'cogMethod' type: #'CogMethod *'> self cCode: [self fp: #stderr r: 'Warning, attempt to use method with selector %.*s and selector %.*s\n' i: (self cCoerceSimple: (objectMemory numBytesOf: cogMethod selector) to: #int) n: (self cCoerceSimple: (objectMemory firstIndexableField: cogMethod selector) to: #'char *') + t: (self cCoerceSimple: (objectMemory numBytesOf: aSelectorOop) to: #int) - t: (objectMemory numBytesOf: aSelectorOop) f: (self cCoerceSimple: (objectMemory firstIndexableField: aSelectorOop) to: #'char *')] inSmalltalk: [self warn: 'Warning, attempt to use method with selector ', (coInterpreter stringOf: cogMethod selector), ' and selector ', (coInterpreter stringOf: aSelectorOop)]! Item was changed: CogMethod subclass: #NewspeakCogMethod instanceVariableNames: 'nextMethodOrIRCs' classVariableNames: '' poolDictionaries: '' category: 'VMMaker-JIT'! + + !NewspeakCogMethod commentStamp: 'eem 2/17/2017 16:12' prior: 0! + A NewspeakCogMethod is a specialization of CogMethod for Newspeak. It adds support for the unpairdMethodsList and for implicit receiver caches. Since the unpairedMethodList only holds methods that are inst var accessors, these cannot have implicit receiver caches. Therefore we use the same variable for either the next link in the unpairedMethodList or the reference to the method's implciit receiver caches, which keeps the header size down. + + Instance Variables + nextMethodOrIRCs: <0 or CogMethod * or oop> + + nextMethodOrIRCs + - either 0 or the next link in the unpairedMethodList or the first field of a method's implciit receiver caches + !

1 0

[OpenSmalltalk/opensmalltalk-vm] 00336b: CogVM source as per VMMaker.oscogSPC-eem.2132
by GitHub 17 Feb '17

17 Feb '17

Branch: refs/heads/SpurPlanningCompactor Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 00336ba196e0ef183f3fc034117d46d7e2c1e5f6 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/00336ba196e0ef183f… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-02-17 (Fri, 17 Feb 2017) Changed paths: M nsspur64src/vm/cogit.h M nsspur64src/vm/cogitX64.c M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspursrc/vm/cogit.h M nsspursrc/vm/cogitARMv5.c M nsspursrc/vm/cogitIA32.c M nsspursrc/vm/cogitMIPSEL.c M nsspursrc/vm/cointerp.c M nsspursrc/vm/cointerp.h M nsspursrc/vm/gcc3x-cointerp.c M nsspurstack64src/vm/gcc3x-interp.c M nsspurstack64src/vm/interp.c M nsspurstacksrc/vm/gcc3x-interp.c M nsspurstacksrc/vm/interp.c M spur64src/vm/cogit.h M spur64src/vm/cogitX64.c M spur64src/vm/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/gcc3x-cointerp.c M spursista64src/vm/cogit.h M spursista64src/vm/cogitX64.c M spursista64src/vm/cointerp.c M spursista64src/vm/cointerp.h M spursista64src/vm/gcc3x-cointerp.c M spursistasrc/vm/cogit.h M spursistasrc/vm/cogitARMv5.c M spursistasrc/vm/cogitIA32.c M spursistasrc/vm/cogitMIPSEL.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.c M spursrc/vm/cogit.h M spursrc/vm/cogitARMv5.c M spursrc/vm/cogitIA32.c M spursrc/vm/cogitMIPSEL.c M spursrc/vm/cointerp.c M spursrc/vm/cointerp.h M spursrc/vm/gcc3x-cointerp.c M spurstack64src/vm/gcc3x-interp.c M spurstack64src/vm/interp.c M spurstacksrc/vm/gcc3x-interp.c M spurstacksrc/vm/interp.c M src/vm/cogit.h M src/vm/cogitARMv5.c M src/vm/cogitIA32.c M src/vm/cogitMIPSEL.c M src/vm/cointerp.c M src/vm/cointerp.h M src/vm/cointerpmt.c M src/vm/cointerpmt.h M src/vm/gcc3x-cointerp.c M src/vm/gcc3x-cointerpmt.c M stacksrc/vm/gcc3x-interp.c M stacksrc/vm/interp.c Log Message: ----------- CogVM source as per VMMaker.oscogSPC-eem.2132 Temporary branch for the SpurPlanningCompactor. SpurPlanningCompactor: Fix the single-pass unmarking pass. It needs to begin at firstFreeObject, not lastMobileObject!! Spur: Provide isUnmarked: for debugging with printOopsSuchThat:. Remember the first unmarked object found by allObjectsUnmarked in the bogon variable, and keep hold on to it via printBogons so it is not deleted by the C optimizer. Fix assert fails in Spur due to failing perform primitives not restoring the function pointer and argumentCount correctly. Cogit: Have printCogMethods print totals of the number of methods & PICs in the code zone. Fix a slip in printCogMethodsWithPrimitive:.

1 0

VM Maker: VMMaker.oscogSPC-eem.2132.mcz
by commits＠source.squeak.org 17 Feb '17

17 Feb '17

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscogSPC-eem.2132.mcz ==================== Summary ==================== Name: VMMaker.oscogSPC-eem.2132 Author: eem Time: 17 February 2017, 12:10:50.5886 pm UUID: c4446c56-57ae-474b-b3ed-c97ca117f957 Ancestors: VMMaker.oscogSPC-eem.2131 SpurPlanningCompactor: Fix the single-pass unmarking pass. It needs to begin at firstFreeObject, not lastMobileObject!! Spur: provide isUnmarked: for debugging with printOopsSuchThat:. remember the first unmarked object found by allObjectsUnmarked in the bogon variable, and keep hold on to it via printBogons so it is not deleted by the C optimizer. =============== Diff against VMMaker.oscogSPC-eem.2131 =============== Item was changed: CogClass subclass: #SpurMemoryManager (excessive size, no diff calculated) Item was changed: ----- Method: SpurMemoryManager>>allObjectsUnmarked (in category 'gc - global') ----- allObjectsUnmarked self allObjectsDo: + [:o| (self isMarked: o) ifTrue: [bogon := o. ^false]]. - [:o| (self isMarked: o) ifTrue: [^false]]. ^true! Item was added: + ----- Method: SpurMemoryManager>>isUnmarked: (in category 'header access') ----- + isUnmarked: objOop + "For debugging using printOopsSuchThat:" + <api> + ^(self isMarked: objOop) not! Item was added: + ----- Method: SpurMemoryManager>>printBogons (in category 'debug printing') ----- + printBogons + <api> + compactor printTheBogons: bogon! Item was added: + ----- Method: SpurPigCompactor>>printTheBogons: (in category 'debug support') ----- + printTheBogons: aBogon + <inline: true> + coInterpreter + print: 'bogon '; printHexnp: aBogon; cr! Item was changed: ----- Method: SpurPlanningCompactor>>copyAndUnmark: (in category 'compaction') ----- copyAndUnmark: firstPass "Sweep the heap, unmarking all objects and moving mobile objects to their correct positions, restoring their savedFirstFields." <inline: #never> | finalPass | self logPhase: 'copying and unmarking...'. firstPass ifTrue: [self unmarkInitialImmobileObjects]. finalPass := self copyAndUnmarkMobileObjects. (self thereAreObjectsToMove and: [finalPass not and: [biasForGC]]) ifTrue: "only ever one pass if biasForGC is true." + [self unmarkObjectsFromFirstFreeObject]! - [self unmarkObjectsAfterLastMobileObject]! Item was added: + ----- Method: SpurPlanningCompactor>>printTheBogons: (in category 'debug support') ----- + printTheBogons: aBogon + <inline: true> + coInterpreter + print: 'bogon '; printHexnp: aBogon; cr; + print: 'anomaly '; printHexnp: anomaly; cr! Item was added: + ----- Method: SpurPlanningCompactor>>unmarkObjectsFromFirstFreeObject (in category 'compaction') ----- + unmarkObjectsFromFirstFreeObject + "Sweep the final immobile heap, freeing and coalescing unmarked and free objects, + and unmarking all marked objects up to the end of memory." + | startOfFree freeBytes | + freeBytes := 0. + manager allOldSpaceEntitiesFrom: firstFreeObject do: + [:o| + self check: o. + (manager isMarked: o) + ifFalse: + [startOfFree ifNil: [startOfFree := manager startOfObject: o]. + freeBytes := freeBytes + (manager bytesInObject: o)] + ifTrue: + [startOfFree ifNotNil: + [manager addFreeChunkWithBytes: freeBytes at: startOfFree. + startOfFree := nil. + freeBytes := 0]. + (manager isPinned: o) + ifTrue: [self unmarkPinned: o] + ifFalse: [manager setIsMarkedOf: o to: false]]]!

1 0

VM Maker: VMMaker.oscogSPC-eem.2131.mcz
by commits＠source.squeak.org 17 Feb '17

17 Feb '17

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscogSPC-eem.2131.mcz ==================== Summary ==================== Name: VMMaker.oscogSPC-eem.2131 Author: eem Time: 17 February 2017, 9:44:55.365762 am UUID: 8f61c300-0034-45a8-85d9-7b0bd4ee199d Ancestors: VMMaker.oscogSPC-eem.2130 Fix assert fails in Spur due to failing perform primitives not restoring the function pointer and argumentCount correctly. =============== Diff against VMMaker.oscogSPC-eem.2130 =============== Item was changed: ----- Method: StackInterpreter>>primitiveObject:perform:withArguments:lookedUpIn: (in category 'control primitives') ----- primitiveObject: actualReceiver perform: selector withArguments: argumentArray lookedUpIn: lookupClassOrNil "Common routine used by perform:withArgs:, perform:withArgs:inSuperclass:, object:perform:withArgs:inClass: et al. Answer nil on success. NOTE: The case of doesNotUnderstand: is not a failure to perform. The only failures are arg types and consistency of argumentCount. Since we're in the stack VM we can assume there is space to push the arguments provided they are within limits (max argument count is 15). We can therefore deal with the arbitrary amount of state to remove from the stack (lookup class, selector, mirror receiver) and arbitrary argument orders by deferring popping anything until we know whether the send has succeeded. So on failure we merely have to remove the actual receiver and arguments pushed, and on success we have to slide the actual receiver and arguments down to replace the original ones." <inline: true> | arraySize performArgCount delta | (objectMemory isArray: argumentArray) ifFalse: [^self primitiveFailFor: PrimErrBadArgument]. "Check if number of arguments is reasonable; MaxNumArgs isn't available so just use LargeContextSize" arraySize := objectMemory numSlotsOf: argumentArray. arraySize > (LargeContextSlots - CtxtTempFrameStart) ifTrue: [^self primitiveFailFor: PrimErrBadNumArgs]. performArgCount := argumentCount. "Push newMethod to save it in case of failure, then push the actual receiver and the args in the array." self push: newMethod. self push: actualReceiver. "Copy the arguments to the stack, in case of MNU, and lookup" 1 to: arraySize do: [:index| self push: (objectMemory fetchPointer: index - 1 ofObject: argumentArray)]. argumentCount := arraySize. messageSelector := selector. self sendBreakpoint: messageSelector receiver: actualReceiver. self printSends ifTrue: [self printActivationNameForSelector: messageSelector startClass: (lookupClassOrNil isNil ifTrue: [objectMemory fetchClassOf: actualReceiver] ifFalse: [lookupClassOrNil]); cr]. self findNewMethodInClassTag: (lookupClassOrNil isNil ifTrue: [objectMemory fetchClassTagOf: actualReceiver] ifFalse: [objectMemory classTagForClass: lookupClassOrNil]). "Only test CompiledMethods for argument count - any other objects playacting as CMs will have to take their chances" ((objectMemory isOopCompiledMethod: newMethod) and: [(self argumentCountOf: newMethod) ~= argumentCount]) ifTrue: ["Restore the state by popping the array entries, the actual receiver and the saved newMethod, leaving the selector and array, and fail. N.B. If an MNU has happened then argumentCount will match newMethod, so this code will not be reached." "These asserts check that an MNU has not occurred if the argumentCount doesn't match the newMethod." self assert: (self stackTop = (arraySize = 0 ifTrue: [actualReceiver] ifFalse: [(objectMemory fetchPointer: arraySize - 1 ofObject: argumentArray)])). self assert: argumentCount = arraySize. self pop: arraySize + 1. newMethod := self popStack. + "Must reset primitiveFunctionPointer for checkForAndFollowForwardedPrimitiveState" + objectMemory hasSpurMemoryManagerAPI ifTrue: + [argumentCount := performArgCount. + primitiveFunctionPointer := lookupClassOrNil + ifNil: [#primitivePerformWithArgs] + ifNotNil: [#primitivePerformInSuperclass]]. ^self primitiveFailFor: PrimErrBadNumArgs]. "Cannot fail this primitive from here-on. Slide the actual receiver and arguments down to replace the perform arguments and saved newMethod and then execute the new method. Use argumentCount not arraySize because an MNU may have changed it." delta := objectMemory wordSize * (performArgCount + 2). "+2 = receiver + saved newMethod" argumentCount * objectMemory wordSize to: 0 by: objectMemory wordSize negated do: [:offset| stackPages longAt: stackPointer + offset + delta put: (stackPages longAt: stackPointer + offset)]. self pop: performArgCount + 2. self executeNewMethod. self initPrimCall. "Recursive xeq affects primErrorCode" ^nil! Item was changed: ----- Method: StackInterpreterPrimitives>>primitivePerform (in category 'control primitives') ----- primitivePerform <returnTypeC: #void> | newReceiver lookupClassTag performMethod | performMethod := newMethod. messageSelector := self stackValue: argumentCount - 1. newReceiver := self stackValue: argumentCount. "NOTE: the following lookup may fail and be converted to #doesNotUnderstand:, so we must adjust argumentCount and slide args now, so that will work." "Slide arguments down over selector" argumentCount := argumentCount - 1. argumentCount to: 1 by: -1 do: [:i| stackPages longAt: stackPointer + (i * objectMemory wordSize) put: (stackPages longAt: stackPointer + ((i - 1) * objectMemory wordSize))]. self pop: 1. lookupClassTag := objectMemory fetchClassTagOf: newReceiver. self sendBreakpoint: messageSelector receiver: newReceiver. self printSends ifTrue: [self printActivationNameForSelector: messageSelector startClass: (objectMemory classForClassTag: lookupClassTag); cr]. self findNewMethodInClassTag: lookupClassTag. "Only test CompiledMethods for argument count - other objects will have to take their chances" ((objectMemory isOopCompiledMethod: newMethod) and: [(self argumentCountOf: newMethod) = argumentCount]) ifFalse: ["Slide the args back up (sigh) and re-insert the selector." self unPop: 1. 1 to: argumentCount by: 1 do: [:i | stackPages longAt: stackPointer + ((i - 1) * objectMemory wordSize) put: (stackPages longAt: stackPointer + (i * objectMemory wordSize))]. stackPages longAt: stackPointer + (argumentCount * objectMemory wordSize) put: messageSelector. argumentCount := argumentCount + 1. newMethod := performMethod. + "Must reset primitiveFunctionPointer for checkForAndFollowForwardedPrimitiveState" + objectMemory hasSpurMemoryManagerAPI ifTrue: + [primitiveFunctionPointer := #primitivePerform]. + ^self primitiveFailFor: PrimErrBadNumArgs]. - ^self primitiveFail]. self executeNewMethod. "Recursive xeq affects primErrorCode" self initPrimCall!

1 0

VM Maker: VMMaker.oscog-eem.2129.mcz
by commits＠source.squeak.org 16 Feb '17

16 Feb '17

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2129.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.2129 Author: eem Time: 14 February 2017, 3:23:53.789991 pm UUID: f39cb56a-835d-4d70-b824-3d86c8bd25d2 Ancestors: VMMaker.oscogSPC-eem.2129, VMMaker.oscog-rsf.2128 Merge with VMMaker.oscogSPC-eem.2129 =============== Diff against VMMaker.oscogSPC-eem.2129 =============== Item was changed: ----- Method: SpurMemoryManager class>>compactorClass (in category 'accessing class hierarchy') ----- compactorClass "Answer the compaction algorithm to use." + ^Smalltalk classNamed: (initializationOptions at: #compactorClass ifAbsent: [#SpurPigCompactor])! - ^Smalltalk classNamed: (initializationOptions at: #compactorClass ifAbsent: [#SpurPlanningCompactor])!

3 4

VM Maker: VMMaker.oscogSPC-eem.2130.mcz
by commits＠source.squeak.org 16 Feb '17

16 Feb '17

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscogSPC-eem.2130.mcz ==================== Summary ==================== Name: VMMaker.oscogSPC-eem.2130 Author: eem Time: 15 February 2017, 6:39:48.551135 pm UUID: 646641b5-87bf-4dcd-85da-fdcff6123193 Ancestors: VMMaker.oscogSPC-eem.2129 Cogit: Add support for SwapR:R:Scratch:, map it to XCHGRR on x64 & x86 and use it in the nascent parallel move code in RegisterAllocatingCogit. Fix a bug in x64's XCHGRR. Add generation tests for x64's XCHGRR. Have printCogMethods print totals of the number of methods & PICs in the code zone. Fix a slip in printCogMethodsWithPrimitive:. RegisterAllocatingCogit: Use ensureFixupAt: not ensureNonMergeFixupAt: for the targets of branches. I was confused. This gets the system much farther. Nuke the check for no code being generated in ensureFixupAt:. We're beyond that. Deal with merging with a constant assigned to a register. =============== Diff against VMMaker.oscogSPC-eem.2129 =============== Item was added: + ----- Method: CogAbstractInstruction>>genSwapR:R:Scratch: (in category 'abstract instructions') ----- + genSwapR: regA R: regB Scratch: regTmp + "Generic register swap code. Subclasses for processors that have a true exchange operation will override to use it." + | first | + <var: 'first' type: #'AbstractInstruction *'> + first := + cogit MoveR: regA R: regTmp. + cogit MoveR: regB R: regA. + cogit MoveR: TempReg R: regB. + ^first! Item was added: + ----- Method: CogIA32Compiler>>genSwapR:R:Scratch: (in category 'abstract instructions') ----- + genSwapR: regA R: regB Scratch: regTmp + ^cogit gen: XCHGRR operand: regA operand: regB! Item was changed: ----- Method: CogMethodZone>>printCogMethods (in category 'printing') ----- printCogMethods <api> <returnTypeC: #void> + | cogMethod nm nc no nf nu | - | cogMethod | <var: #cogMethod type: #'CogMethod *'> + nm := nc := no := nf := nu := 0. cogMethod := coInterpreter cCoerceSimple: baseAddress to: #'CogMethod *'. [cogMethod < self limitZony] whileTrue: [coInterpreter printCogMethod: cogMethod. + cogMethod cmType + caseOf: { + [CMFree] -> [nf := nf + 1]. + [CMMethod] -> [nm := nm + 1]. + [CMClosedPIC] -> [nc := nc + 1]. + [CMOpenPIC] -> [no:= no+ 1] } + otherwise: [nu := nu + 1]. + cogMethod := self methodAfter: cogMethod]. + coInterpreter print: 'CMMethod '; printNum: nm; print: ' CMClosedPIC '; printNum: nc; print: ' CMOpenPIC '; printNum: no; print: ' CMFree '; printNum: nf. + nu > 0 ifTrue: + [coInterpreter print: ' UNKNOWN '; printNum: nu]. + coInterpreter print: ' total '; printNum: nm+nc+no+nf+nu; cr! - cogMethod := self methodAfter: cogMethod]! Item was changed: ----- Method: CogMethodZone>>printCogMethodsWithPrimitive: (in category 'printing') ----- printCogMethodsWithPrimitive: primIdx <api> | cogMethod | <var: #cogMethod type: #'CogMethod *'> cogMethod := coInterpreter cCoerceSimple: baseAddress to: #'CogMethod *'. [cogMethod < self limitZony] whileTrue: + [(cogMethod cmType = CMMethod - [(cogMethod cmType ~= CMFree and: [primIdx = (coInterpreter primitiveIndexOfMethod: cogMethod methodObject header: cogMethod methodHeader)]) ifTrue: [coInterpreter printCogMethod: cogMethod]. cogMethod := self methodAfter: cogMethod]! Item was changed: ----- Method: CogRegisterAllocatingSimStackEntry>>isMergedWithTargetEntry: (in category 'comparing') ----- isMergedWithTargetEntry: targetEntry "The receiver is a simStackEntry at a jump to the corresponding simStackEntry at the jump's target. Answer if no merge is required for the jump." <var: 'ssEntry' type: #'CogSimStackEntry *'> spilled ~= targetEntry spilled ifTrue: "push or pop required" [^false]. (liveRegister = NoReg and: [targetEntry liveRegister ~= NoReg]) ifTrue: "register load required" [^false]. (liveRegister ~= NoReg and: [liveRegister = targetEntry liveRegister and: [type = targetEntry type and: [type = SSConstant or: [type = SSRegister and: [register = targetEntry register]]]]]) ifTrue: [^true]. ((type = SSBaseOffset or: [type == SSSpill]) and: [(targetEntry type = SSBaseOffset or: [targetEntry type == SSSpill]) and: [offset = targetEntry offset and: [register = targetEntry register]]]) ifTrue: [^true]. + "self: const =1 (16r1) (live: Extra4Reg) {172} vs reg ReceiverResultReg {127}" + "self: reg ReceiverResultReg {95} vs reg Extra5Reg {85}" + ((type = SSConstant and: [targetEntry type = SSRegister and: [liveRegister ~= targetEntry registerOrNone]]) + or: [type = SSRegister and: [targetEntry type = SSRegister and: [register ~= targetEntry registerOrNone]]]) ifFalse: + [self halt: 'comment the incompatible pair please']. - self halt: 'comment the incompatible pair please'. ^false! Item was changed: ----- Method: CogRegisterAllocatingSimStackEntry>>reconcileForwardsWith: (in category 'compile abstract instructions') ----- reconcileForwardsWith: targetEntry "Make the state of the receiver, a stack entry at the end of a basic block, the same as the corresponding simStackEntry at the target of a preceding jump to the beginning of the next basic block. Make sure targetEntry reflects the state of the merged simStack; it will be installed as the current entry by restoreSimStackAtMergePoint: in mergeWithFixupIfRequired:. Answer if the liveRegister for the targetEntry (if any) should be deassigned; this is because if merging a non-temp with a temp that has a live register we can assign to the register, but must unassign the register from the temp, otherwise the temp will acquire the merged value without an assignment." <var: #targetEntry type: #'SimStackEntry *'> | targetReg | (targetReg := targetEntry registerOrNone) = NoReg ifTrue: [| reg | self assert: targetEntry spilled. (self isSameEntryAs: targetEntry) ifTrue: [self assert: spilled. ^false]. (reg := self registerOrNone) = NoReg ifTrue: [reg := TempReg]. self storeToReg: reg. spilled ifTrue: [cogit MoveR: reg Mw: targetEntry offset r: targetEntry register] ifFalse: [cogit PushR: reg]. ^false]. liveRegister ~= NoReg ifTrue: [liveRegister ~= targetReg ifTrue: [cogit MoveR: liveRegister R: targetReg]. (spilled and: [targetEntry spilled not]) ifTrue: [cogit AddCq: objectRepresentation wordSize R: SPReg]. ^false]. spilled ifTrue: [targetEntry spilled ifFalse: [cogit PopR: targetReg. "KISS; generate the least number of instructions..." ^false]] ifFalse: [targetEntry spilled ifTrue: [cogit SubCq: objectRepresentation wordSize R: SPReg]]. type caseOf: { [SSBaseOffset] -> [cogit MoveMw: offset r: register R: targetReg]. [SSSpill] -> [cogit MoveMw: offset r: register R: targetReg]. [SSConstant] -> [cogit genMoveConstant: constant R: targetReg]. [SSRegister] -> [register ~= targetReg ifTrue: [cogit MoveR: register R: targetReg]] }. (targetEntry type = SSConstant and: [type ~= SSConstant or: [constant ~= targetEntry constant]]) ifTrue: [targetEntry register: targetReg; type: SSRegister]. + "If merging a constant with a constant assigned to a register, then the register must be deassigned from any temps." + ^targetEntry type = SSConstant "If merging a non-temp with a temp that has a live register we can assign to the register, but must unassign the register from the temp, otherwise the temp will acquire the merged value without an assignment." + or: [targetEntry type = SSBaseOffset + and: [targetEntry register = FPReg + and: [(self isSameEntryAs: targetEntry) not]]]! - ^targetEntry type = SSBaseOffset - and: [targetEntry register = FPReg - and: [(self isSameEntryAs: targetEntry) not]]! Item was changed: ----- Method: CogX64Compiler>>concretizeXCHGRR (in category 'generate machine code') ----- concretizeXCHGRR | r1 r2 | r1 := operands at: 0. r2 := operands at: 1. r2 = RAX ifTrue: [r2 := r1. r1 := RAX]. r1 = RAX ifTrue: [machineCode at: 0 put: (self rexR: 0 x: 0 b: r2); at: 1 put: 16r90 + (r2 \\ 8). ^machineCodeSize := 2]. machineCode at: 0 put: (self rexR: r1 x: 0 b: r2); + at: 1 put: 16r87; + at: 2 put: (self mod: ModReg RM: r2 RO: r1). - at: 1 put: 87; - at: 2 put: (self mod: r2 RM: 0 RO: r1). ^machineCodeSize := 3! Item was added: + ----- Method: CogX64Compiler>>genSwapR:R:Scratch: (in category 'abstract instructions') ----- + genSwapR: regA R: regB Scratch: regTmp + ^cogit gen: XCHGRR operand: regA operand: regB! Item was added: + ----- Method: CogX64CompilerTests>>testXCHGRR (in category 'tests') ----- + testXCHGRR + "CogX64CompilerTests new testXCHGRR" + | xchgrr | + xchgrr := (self concreteCompilerClass bindingOf: #XCHGRR) value. + self concreteCompilerClass registersWithNamesDo: + [:sreg :sregname| + self concreteCompilerClass registersWithNamesDo: + [:dreg :dregname| | inst len | + inst := self gen: xchgrr operand: sreg operand: dreg. + len := inst concretizeAt: 0. + self processor + disassembleInstructionAt: 0 + In: inst machineCode object + into: [:str :sz| | plainJane herIntended | + "Convert e.g. '00000000: movl %eax, 0x2(%eax) : 89 40 02' to 'movl %eax, 0x2(%eax)'" + plainJane := self strip: str. + herIntended := dreg = 0 + ifTrue: [sreg = 0 ifTrue: ['nop '] ifFalse: ['xchgq ', dregname, ', ', sregname]] + ifFalse: ['xchgq ', sregname, ', ', dregname]. + self assert: herIntended equals: plainJane. + self assert: len = sz]]]! Item was added: + ----- Method: Cogit>>SwapR:R:Scratch: (in category 'abstract instructions') ----- + SwapR: regA R: regB Scratch: regTmp + <returnTypeC: #'AbstractInstruction *'> + ^backEnd genSwapR: regA R: regB Scratch: regTmp! Item was changed: ----- Method: RegisterAllocatingCogit>>deassignRegisterForTempVar:in: (in category 'bytecode generator support') ----- deassignRegisterForTempVar: targetEntry in: mergeSimStack "If merging a non-temp with a temp that has a live register we can assign to the register, but must unassign the register from the temp, otherwise the temp will acquire the merged value without an assignment. The targetEntry must also be transmogrified into an SSRegister entry." <var: #targetEntry type: #'SimStackEntry *'> <var: #duplicateEntry type: #'SimStackEntry *'> <var: #mergeSimStack type: #'SimStackEntry *'> <inline: true> | reg | reg := targetEntry liveRegister. + self assert: ((targetEntry type = SSConstant and: [reg ~= NoReg]) + or: [targetEntry type = SSBaseOffset and: [targetEntry register = FPReg]]). + targetEntry type = SSConstant + ifTrue: + [simStackPtr to: 0 by: -1 do: + [:j| | duplicateEntry | + duplicateEntry := self simStack: mergeSimStack at: j. + (duplicateEntry registerOrNone = reg + and: [duplicateEntry type = SSBaseOffset or: [duplicateEntry type = SSSpill]]) ifTrue: + [duplicateEntry liveRegister: NoReg]]] + ifFalse: + [simStackPtr to: 0 by: -1 do: + [:j| | duplicateEntry | + duplicateEntry := self simStack: mergeSimStack at: j. + (targetEntry isSameEntryAs: duplicateEntry) ifTrue: + [duplicateEntry liveRegister: NoReg]]]. - self assert: (targetEntry type = SSBaseOffset and: [targetEntry register = FPReg]). - simStackPtr to: 0 by: -1 do: - [:j| | duplicateEntry | - duplicateEntry := self simStack: mergeSimStack at: j. - (targetEntry isSameEntryAs: duplicateEntry) ifTrue: - [duplicateEntry liveRegister: NoReg]]. targetEntry type: SSRegister; register: reg! Item was changed: ----- Method: RegisterAllocatingCogit>>ensureFixupAt: (in category 'bytecode generator support') ----- ensureFixupAt: targetPC "Make sure there's a flagged fixup at the target pc in fixups. Initially a fixup's target is just a flag. Later on it is replaced with a proper instruction. Override to enerate stack merging code if required." + | fixup | - | fixup startOpcodeIndex | <var: #fixup type: #'BytecodeFixup *'> fixup := self fixupAt: targetPC. fixup needsFixup ifTrue: [fixup mergeSimStack ifNil: [self setMergeSimStackOf: fixup] + ifNotNil: [self mergeCurrentSimStackWith: fixup]] - ifNotNil: - [startOpcodeIndex := opcodeIndex. - self mergeCurrentSimStackWith: fixup. - self deny: (startOpcodeIndex = opcodeIndex and: [thisContext sender method sendsSelector: #mergeRequiredForJumpTo:])]] ifFalse: [self assert: fixup mergeSimStack isNil. self moveVolatileSimStackEntriesToRegisters. self setMergeSimStackOf: fixup]. ^super ensureFixupAt: targetPC! Item was changed: ----- Method: RegisterAllocatingCogit>>flushLiveRegistersForSuspensionPoint (in category 'bytecode generator support') ----- flushLiveRegistersForSuspensionPoint "Flush any live registers for a C call at a suspension/resumption point, i.e.flush all registers. Answer if any registers were flushed." <inline: true> | flushed | flushed := false. self assert: simSelf type = SSBaseOffset. simSelf liveRegister ~= NoReg ifTrue: [simSelf liveRegister: NoReg. flushed := true]. 0 to: simStackPtr do: [:i| + self assert: (i < methodOrBlockNumTemps + ifTrue: [(self simStackAt: i) type = SSBaseOffset] + ifFalse: [(self simStackAt: i) spilled]). - self assert: (self simStackAt: i) type = (i < methodOrBlockNumTemps - ifTrue: [SSBaseOffset] - ifFalse: [SSSpill]). (self simStackAt: i) liveRegister ~= NoReg ifTrue: [(self simStackAt: i) liveRegister: NoReg. flushed := true]]. ^flushed! Item was changed: ----- Method: RegisterAllocatingCogit>>genForwardersInlinedIdenticalOrNotIf: (in category 'bytecode generators') ----- genForwardersInlinedIdenticalOrNotIf: orNot | nextPC branchDescriptor unforwardRcvr argReg targetPC unforwardArg rcvrReg postBranchPC retry fixup comparison needMergeToTarget needMergeToContinue | <var: #branchDescriptor type: #'BytecodeDescriptor *'> <var: #toContinueLabel type: #'AbstractInstruction *'> <var: #toTargetLabel type: #'AbstractInstruction *'> <var: #comparison type: #'AbstractInstruction *'> <var: #retry type: #'AbstractInstruction *'> self extractMaybeBranchDescriptorInto: [ :descr :next :postBranch :target | branchDescriptor := descr. nextPC := next. postBranchPC := postBranch. targetPC := target ]. "If an operand is an annotable constant, it may be forwarded, so we need to store it into a register so the forwarder check can jump back to the comparison after unforwarding the constant. However, if one of the operand is an unnanotable constant, does not allocate a register for it (machine code will use operations on constants) and does not generate forwarder checks." unforwardRcvr := (objectRepresentation isUnannotatableConstant: (self ssValue: 1)) not. unforwardArg := (objectRepresentation isUnannotatableConstant: self ssTop) not. self allocateEqualsEqualsRegistersArgNeedsReg: unforwardArg rcvrNeedsReg: unforwardRcvr into: [ :rcvr :arg | rcvrReg:= rcvr. argReg := arg ]. "If not followed by a branch, resolve to true or false." (branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]) ifFalse: [^self genIdenticalNoBranchArgIsConstant: unforwardArg not rcvrIsConstant: unforwardRcvr not argReg: argReg rcvrReg: rcvrReg orNotIf: orNot]. self assert: (unforwardArg or: [unforwardRcvr]). retry := self Label. self genCmpArgIsConstant: unforwardArg not rcvrIsConstant: unforwardRcvr not argReg: argReg rcvrReg: rcvrReg. self ssPop: 2. (self fixupAt: nextPC) notAFixup "The next instruction is dead. we can skip it." ifTrue: [deadCode := true] ifFalse: [self deny: deadCode]. "push dummy value below" "self printSimStack; printSimStack: (self fixupAt: postBranchPC) mergeSimStack" "If there are merges to be performed on the forward branches we have to execute the merge code only along the path requiring that merge, and exactly once." needMergeToTarget := self mergeRequiredForJumpTo: targetPC. needMergeToContinue := self mergeRequiredForJumpTo: postBranchPC. orNot == branchDescriptor isBranchTrue ifFalse: "a == b ifTrue: ... or a ~~ b ifFalse: ... jump on equal to target pc" [fixup := needMergeToContinue ifTrue: [0] "jumps will fall-through to to-continue merge code" + ifFalse: [self ensureFixupAt: postBranchPC]. - ifFalse: [self ensureNonMergeFixupAt: postBranchPC]. comparison := self JumpZero: (needMergeToTarget ifTrue: [0] "comparison will be fixed up to to-target merge code" + ifFalse: [self ensureFixupAt: targetPC])] - ifFalse: [self ensureNonMergeFixupAt: targetPC])] ifTrue: "a == b ifFalse: ... or a ~~ b ifTrue: ... jump on equal to post-branch pc" [fixup := needMergeToTarget ifTrue: [0] "jumps will fall-through to to-target merge code" + ifFalse: [self ensureFixupAt: targetPC]. - ifFalse: [(self ensureNonMergeFixupAt: targetPC)]. comparison := self JumpZero: (needMergeToContinue ifTrue: [0] "comparison will be fixed up to to-continue merge code" + ifFalse: [self ensureFixupAt: postBranchPC])]. - ifFalse: [self ensureNonMergeFixupAt: postBranchPC])]. "The forwarders check(s) need(s) to jump back to the comparison (retry) if a forwarder is found, else jump forward either to the next forwarder check or to the postBranch or branch target (fixup). But if there is merge code along a path, the jump must be to the merge code." (unforwardArg and: [unforwardRcvr]) ifTrue: [objectRepresentation genEnsureOopInRegNotForwarded: argReg scratchReg: TempReg jumpBackTo: retry]. objectRepresentation genEnsureOopInRegNotForwarded: (unforwardRcvr ifTrue: [rcvrReg] ifFalse: [argReg]) scratchReg: TempReg ifForwarder: retry ifNotForwarder: fixup. "If fixup is zero then the ifNotForwarder path falls through to a Label which is interpreted as either to-continue or to-target, depending on orNot == branchDescriptor isBranchTrue." orNot == branchDescriptor isBranchTrue ifFalse: "a == b ifTrue: ... or a ~~ b ifFalse: ... jump on equal to target pc" [needMergeToContinue ifTrue: "fall-through to to-continue merge code" [self Jump: (self ensureFixupAt: postBranchPC)]. needMergeToTarget ifTrue: "fixup comparison to to-target merge code" [comparison jmpTarget: self Label. self Jump: (self ensureFixupAt: targetPC)]] ifTrue: "a == b ifFalse: ... or a ~~ b ifTrue: ... jump on equal to post-branch pc" [needMergeToTarget ifTrue: "fall-through to to-target merge code" [self Jump: (self ensureFixupAt: targetPC)]. needMergeToContinue ifTrue: "fixup comparison to to-continue merge code" [comparison jmpTarget: self Label. self Jump: (self ensureFixupAt: postBranchPC)]]. deadCode ifFalse: "duplicate the merge fixup's top of stack so as to avoid a false confict." [self ssPushDesc: ((self fixupAt: nextPC) mergeSimStack at: simStackPtr + 1)]. ^0! Item was changed: ----- Method: RegisterAllocatingCogit>>genJumpIf:to: (in category 'bytecode generator support') ----- genJumpIf: boolean to: targetBytecodePC <inline: false> | eventualTarget desc reg fixup ok mbb noMustBeBoolean | <var: #fixup type: #'BytecodeFixup *'> <var: #ok type: #'AbstractInstruction *'> <var: #desc type: #'CogSimStackEntry *'> <var: #mbb type: #'AbstractInstruction *'> eventualTarget := self eventualTargetOf: targetBytecodePC. desc := self ssTop. self ssPop: 1. noMustBeBoolean := self extASpecifiesNoMustBeBoolean. extA := 0. (desc type == SSConstant and: [desc constant = objectMemory trueObject or: [desc constant = objectMemory falseObject]]) ifTrue: ["Must annotate the bytecode for correct pc mapping." desc constant = boolean ifTrue: [deadCode := true. "Can't fall through." fixup := self ensureFixupAt: eventualTarget. self annotateBytecode: (self Jump: fixup)] ifFalse: [self annotateBytecode: (self prevInstIsPCAnnotated ifTrue: [self Nop] ifFalse: [self Label])]. ^0]. "try and use the top entry's register if any, but only if it can be destroyed." reg := (desc type ~= SSRegister or: [(self anyReferencesToRegister: desc register inAllButTopNItems: 0) or: [(desc register = ReceiverResultReg and: [optStatus isReceiverResultRegLive])]]) ifTrue: [TempReg] ifFalse: [desc register]. desc popToReg: reg. "Cunning trick by LPD. If true and false are contiguous subtract the smaller. Correct result is either 0 or the distance between them. If result is not 0 or their distance send mustBeBoolean." self assert: (objectMemory objectAfter: objectMemory falseObject) = objectMemory trueObject. "Merge required; must not generate merge code along untaken branch, so flip the order." (self mergeRequiredForJumpTo: eventualTarget) ifTrue: [self genSubConstant: (boolean = objectMemory trueObject ifTrue: [objectMemory falseObject] ifFalse: [objectMemory trueObject]) R: reg. ok := self JumpZero: 0. self CmpCq: (boolean = objectMemory trueObject ifTrue: [objectMemory trueObject - objectMemory falseObject] ifFalse: [objectMemory falseObject - objectMemory trueObject]) R: reg. noMustBeBoolean ifTrue: [self JumpZero: (self ensureFixupAt: eventualTarget). "generates merge code" ok jmpTarget: (self annotateBytecode: self lastOpcode). ^0]. mbb := self JumpNonZero: 0. self Jump: (self ensureFixupAt: eventualTarget). "generates merge code" mbb jmpTarget: self Label] ifFalse: [self genSubConstant: boolean R: reg. + self JumpZero: (self ensureFixupAt: eventualTarget). - self JumpZero: (self ensureNonMergeFixupAt: eventualTarget). noMustBeBoolean ifTrue: [self annotateBytecode: self lastOpcode. ^0]. self CmpCq: (boolean = objectMemory falseObject ifTrue: [objectMemory trueObject - objectMemory falseObject] ifFalse: [objectMemory falseObject - objectMemory trueObject]) R: reg. ok := self JumpZero: 0]. reg ~= TempReg ifTrue: [self MoveR: reg R: TempReg]. self copySimStackToScratch: simSpillBase. self ssFlushTo: simStackPtr. self genCallMustBeBooleanFor: boolean. "NOTREACHED" ok jmpTarget: (self annotateBytecode: self Label). self restoreSimStackFromScratch. ^0! Item was changed: ----- Method: RegisterAllocatingCogit>>genSpecialSelectorComparison (in category 'bytecode generators') ----- genSpecialSelectorComparison | nextPC postBranchPC targetPC primDescriptor branchDescriptor rcvrIsInt argIsInt argInt jumpNotSmallInts inlineCAB index rcvrReg argReg branchToTarget needMergeToContinue needMergeToTarget | <var: #primDescriptor type: #'BytecodeDescriptor *'> <var: #branchDescriptor type: #'BytecodeDescriptor *'> <var: #jumpNotSmallInts type: #'AbstractInstruction *'> primDescriptor := self generatorAt: byte0. argIsInt := self ssTop type = SSConstant and: [objectMemory isIntegerObject: (argInt := self ssTop constant)]. rcvrIsInt := (self ssValue: 1) type = SSConstant and: [objectMemory isIntegerObject: (self ssValue: 1) constant]. (argIsInt and: [rcvrIsInt]) ifTrue: [^self genStaticallyResolvedSpecialSelectorComparison]. self extractMaybeBranchDescriptorInto: [ :descr :next :postBranch :target | branchDescriptor := descr. nextPC := next. postBranchPC := postBranch. targetPC := target ]. "Only interested in inlining if followed by a conditional branch." inlineCAB := branchDescriptor isBranchTrue or: [branchDescriptor isBranchFalse]. "Further, only interested in inlining = and ~= if there's a SmallInteger constant involved. The relational operators successfully statically predict SmallIntegers; the equality operators do not." (inlineCAB and: [primDescriptor opcode = JumpZero or: [primDescriptor opcode = JumpNonZero]]) ifTrue: [inlineCAB := argIsInt or: [rcvrIsInt]]. inlineCAB ifFalse: [^self genSpecialSelectorSend]. "In-line the comparison and the jump, but if the types are not SmallInteger then we will need to do a send and fall through to the following conditional branch. Since we're allocating values in registers we would like to keep those registers live on the inlined path and reload registers along the non-inlined send path. The merge logic at the branch destinations handles this." argIsInt ifTrue: [rcvrReg := self allocateRegForStackEntryAt: 1. (self ssValue: 1) popToReg: rcvrReg] ifFalse: [self allocateRegForStackTopTwoEntriesInto: [:rTop :rNext| argReg := rTop. rcvrReg := rNext]. rcvrReg = Arg0Reg ifTrue: [rcvrReg := argReg. argReg := Arg0Reg]. self ssTop popToReg: argReg. (self ssValue: 1) popToReg: rcvrReg. rcvrIsInt ifFalse: [self MoveR: argReg R: TempReg]]. self ssPop: 2. jumpNotSmallInts := (argIsInt or: [rcvrIsInt]) ifFalse: "Neither known to be ints; and them together for the test..." [objectRepresentation genJumpNotSmallIntegersIn: rcvrReg andScratch: TempReg scratch: ClassReg] ifTrue: "One known; in-place single-bit test for the other" [objectRepresentation genJumpNotSmallInteger: (rcvrIsInt ifTrue: [argReg] ifFalse: [rcvrReg])]. argIsInt ifTrue: [self CmpCq: argInt R: rcvrReg] ifFalse: [self CmpR: argReg R: rcvrReg]. "self printSimStack; printSimStack: (self fixupAt: postBranchPC) mergeSimStack; printSimStack: (self fixupAt: targetPC) mergeSimStack" "If there are merges to be performed on the forward branches we have to execute the merge code only along the path requiring that merge, and exactly once." needMergeToTarget := self mergeRequiredForJumpTo: targetPC. needMergeToContinue := self mergeRequiredForJumpTo: postBranchPC. "Cmp is weird/backwards so invert the comparison." (needMergeToTarget and: [needMergeToContinue]) ifTrue: [branchToTarget := self genConditionalBranch: (branchDescriptor isBranchTrue ifTrue: [primDescriptor opcode] ifFalse: [self inverseBranchFor: primDescriptor opcode]) operand: 0. self Jump: (self ensureFixupAt: postBranchPC). branchToTarget jmpTarget: self Label. self Jump: (self ensureFixupAt: targetPC)]. (needMergeToTarget and: [needMergeToContinue not]) ifTrue: [self genConditionalBranch: (branchDescriptor isBranchFalse ifTrue: [primDescriptor opcode] ifFalse: [self inverseBranchFor: primDescriptor opcode]) + operand: (self ensureFixupAt: postBranchPC) asUnsignedInteger. - operand: (self ensureNonMergeFixupAt: postBranchPC) asUnsignedInteger. self Jump: (self ensureFixupAt: targetPC)]. (needMergeToTarget not and: [needMergeToContinue]) ifTrue: [self genConditionalBranch: (branchDescriptor isBranchTrue ifTrue: [primDescriptor opcode] ifFalse: [self inverseBranchFor: primDescriptor opcode]) + operand: (self ensureFixupAt: targetPC) asUnsignedInteger. - operand: (self ensureNonMergeFixupAt: targetPC) asUnsignedInteger. self Jump: (self ensureFixupAt: postBranchPC)]. (needMergeToTarget or: [needMergeToContinue]) ifFalse: [self genConditionalBranch: (branchDescriptor isBranchTrue ifTrue: [primDescriptor opcode] ifFalse: [self inverseBranchFor: primDescriptor opcode]) + operand: (self ensureFixupAt: targetPC) asUnsignedInteger. + self Jump: (self ensureFixupAt: postBranchPC)]. - operand: (self ensureNonMergeFixupAt: targetPC) asUnsignedInteger. - self Jump: (self ensureNonMergeFixupAt: postBranchPC)]. jumpNotSmallInts jmpTarget: self Label. self ssFlushTo: simStackPtr. self deny: rcvrReg = Arg0Reg. argIsInt ifTrue: [self MoveCq: argInt R: Arg0Reg] ifFalse: [argReg ~= Arg0Reg ifTrue: [self MoveR: argReg R: Arg0Reg]]. rcvrReg ~= ReceiverResultReg ifTrue: [self MoveR: rcvrReg R: ReceiverResultReg]. index := byte0 - self firstSpecialSelectorBytecodeOffset. ^self genMarshalledSend: index negated - 1 numArgs: 1 sendTable: ordinarySendTrampolines! Item was changed: ----- Method: RegisterAllocatingCogit>>swapCurrentRegistersInMask:accordingToRegisterOrderIn: (in category 'bytecode generator support') ----- swapCurrentRegistersInMask: conflictingRegsMask accordingToRegisterOrderIn: mergeSimStack <var: #mergeSimStack type: #'SimStackEntry *'> "Swap liveRegisters in simStack entries according to their order in mergeSimStack so as to avoid overwriting live registers when merging simStack into mergeSimStack. Consider the following two simStacks target: 0: | rA | __ | rB | rC | rD | <- sp current: 0: | __ | __ | rD | rA | rC | <- sp If we were to assign in a naive order, 0 through sp rA would be overwritten before its value in current[3] is written to rC, and rC would be overwritten before its value in current[4] is written to rD. But if we swap the registers in current so that they respect the reverse ordering in target we can assign directly: swap current[3] & current[4] 0: | __ | __ | rD | rC | rA | <- sp now do the assignment in the order target[0] := current[0], target[1] := current[1], ... target[4] := current[4], i.e. rA := current[0]; rB := rD; (rC := rC); (rD := rD). See https://hal.inria.fr/inria-00435844/file/article-hal.pdf Florent Bouchez, Quentin Colombet, Alain Darte, Christophe Guillon, Fabrice Rastello. Parallel Copy Motion. SCOPES, ACM, 2010, pp.0. <inria-00435844> So find any conflicts, and if there are any, swap registers in the simStack to resolve them." "self printSimStack; printSimStack: mergeSimStack" "Some processors have a SwapRR but not all. Write one-size-fits-all code that moves things through TempReg." | order n visitedMask ssEntry regA regB | <var: 'order' declareC: 'sqInt order[8*BytesPerWord]'> <var: 'ssEntry' type: #'SimStackEntry *'> self cCode: [self me: order ms: 0 et: (self sizeof: order)] inSmalltalk: [order := CArrayAccessor on: (Array new: 8*BytesPerWord withAll: 0)]. n := 0. visitedMask := conflictingRegsMask. 0 to: methodOrBlockNumTemps - 1 do: [:i| ssEntry := self simStack: mergeSimStack at: i. (ssEntry registerMaskOrNone anyMask: visitedMask) ifTrue: [order at: ssEntry registerOrNone put: (n := n + 1). visitedMask := visitedMask - ssEntry registerMaskOrNone]]. + self assert: n >= 1. + n <= 2 ifTrue: "simple case; here to show me what I have to do in addition to the sort" - self assert: n > 1. - n = 2 ifTrue: "simple case; here to show me what I have to do in addition to the sort" [regA := conflictingRegsMask highBit - 1. regB := (conflictingRegsMask - (1 << regA)) highBit - 1. + self SwapR: regA R: regB Scratch: TempReg. + 0 to: simStackPtr do: - self MoveR: regA R: TempReg. - self MoveR: regB R: regA. - self MoveR: TempReg R: regB. - 0 to: simStackPtr do: [:i| + ssEntry := self simStack: simStack at: i. + (ssEntry registerMaskOrNone anyMask: conflictingRegsMask) ifTrue: - ssEntry := self simStackAt: i. - (ssEntry registerMaskOrNone anyMask: conflictingRegsMask) ifTrue: [| reg | reg := ssEntry registerOrNone = regA ifTrue: [regB] ifFalse: [regA]. ssEntry type = SSRegister ifTrue: [ssEntry register: reg]. ssEntry liveRegister: reg]]. ^self]. self halt!

1 0

[OpenSmalltalk/opensmalltalk-vm] 1675e3: CogVM source as per VMMaker.oscog-eem.2126
by GitHub 15 Feb '17

15 Feb '17

Branch: refs/heads/Cog Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: 1675e3586bbef2ff198e683ea7839ac1b41fa491 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/1675e3586bbef2ff19… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-02-09 (Thu, 09 Feb 2017) Changed paths: M nsspur64src/vm/cogit.h M nsspur64src/vm/cogitX64.c M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspursrc/vm/cogit.h M nsspursrc/vm/cogitARMv5.c M nsspursrc/vm/cogitIA32.c M nsspursrc/vm/cogitMIPSEL.c M nsspursrc/vm/cointerp.c M nsspursrc/vm/cointerp.h M nsspursrc/vm/gcc3x-cointerp.c M nsspurstack64src/vm/gcc3x-interp.c M nsspurstack64src/vm/interp.c M nsspurstacksrc/vm/gcc3x-interp.c M nsspurstacksrc/vm/interp.c M spur64src/vm/cogit.h M spur64src/vm/cogitX64.c M spur64src/vm/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/gcc3x-cointerp.c M spursista64src/vm/cogit.h M spursista64src/vm/cogitX64.c M spursista64src/vm/cointerp.c M spursista64src/vm/cointerp.h M spursista64src/vm/gcc3x-cointerp.c M spursistasrc/vm/cogit.h M spursistasrc/vm/cogitARMv5.c M spursistasrc/vm/cogitIA32.c M spursistasrc/vm/cogitMIPSEL.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.c M spursrc/vm/cogit.h M spursrc/vm/cogitARMv5.c M spursrc/vm/cogitIA32.c M spursrc/vm/cogitMIPSEL.c M spursrc/vm/cointerp.c M spursrc/vm/cointerp.h M spursrc/vm/gcc3x-cointerp.c M spurstack64src/vm/gcc3x-interp.c M spurstack64src/vm/interp.c M spurstacksrc/vm/gcc3x-interp.c M spurstacksrc/vm/interp.c M src/vm/cogit.h M src/vm/cogitARMv5.c M src/vm/cogitIA32.c M src/vm/cogitMIPSEL.c M src/vm/cointerp.c M src/vm/cointerp.h M src/vm/cointerpmt.c M src/vm/cointerpmt.h M src/vm/gcc3x-cointerp.c M src/vm/gcc3x-cointerpmt.c M stacksrc/vm/gcc3x-interp.c M stacksrc/vm/interp.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.2126 StackInterpreter: Fixed a bug where the CogVMFeatureFlags were converted twice to SmallInteger (in getCogVMFeatureFlags and in primitiveVMParameter), shifting 1 time too many the flags. Hence MULTIPLEBYTECODESETS flag was always true in the image while SUPPORTSWRITEBARRIER was true only if the VM supported multiple bytecode set. SpurMemoryManager: add a VM parameter to collect the time spent in compaction (a subset of the time spent in fullGC). Make printOopsFrom:to: skip free space instead of printing an empty object every 16 bytes. Add printOopsSuchThat: for debugging. Have printEntity: print header flags for puns also. Cogit: Refactor fixupAt: & initializeFixupAt: to take bytecode PCs not indexes. Add fixupAtIndex: as the method that takes an index. Refactor sends of ensure[NonMerge]FixupAt:, moving the ever-present "- initialPC" into ensure[NonMerge]FixupAt:. Fixed a bug in read-only object where the attemptToAssign:withIndex: call-back would be called with a 1-based index by the interpreter and 0-based index by the JIT. Everybody now calls it with 1-based index. Rename offsetCacheTagAndCouldBeObjectAt:annotation:into: to the more accurate entryCacheTagAndCouldBeObjectAt:annotation:into: and extract entryPointTagIsSelector: for use below. Fix the check for valid selectors for 64-bits (unlinked cacheTags are literal/specialSelector indices) in checkIfValidOopRefAndTarget:pc:cogMethod:. Add leak checking of CogMethod counters and implicit reveiver caches. SistaCogit: Fix coging optimized methods with lots of literals. Decode a method header when doing longPrintOop:. Fix the ssFlushTo: call in genExtJumpIfNotInstanceOfBehaviorsBytecode Use Spur's single-bit tests for immediates in the CogObjectRepresetationFor??BitSpur's branchIf:has[Not]ImmediateTag:target: Fix conditional branches following inline primitive comparisons given the branch following logic. The unconditional branch following can only be elided if jumping to the bytecode following the conditional branch, which may no longer be the case with branch following. To this end refactor nextDescriptorAndExtensionsInto: into nextDescriptorExtensionsAndNextPCInto:. Changed the machine code compilation of BranchIfInstanceOf if there is one Behavior and the behavior is UndefinedObject, True or False to compile to a direct comparison to the unique instances instead of class index check. I am not sure it makes sense to add these cases when there are multiple behaviors. Added a new trampoline to create new hashes. Unfortunately I did not succeed in using the trampoline in the existing primitives, so I made the trampoline Sista only and it's used in the inlined primitive. Newspeak/Slang: Fix printDecodeMethodHeaderOop: for the Newspeak VM. Add type inferrence for TBraceNode, including casting the default value to a pointer type in var := expr caseOf: { ... }. Slang: Don't localize globals that are used in only one funciton if they are only written to. Such variables are typically for debugging (observation). Commit: 92e1340dae91e40aebc0e03b017b7c4702019729 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/92e1340dae91e40aeb… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-02-14 (Tue, 14 Feb 2017) Changed paths: M nsspur64src/vm/cogit.h M nsspur64src/vm/cogitX64.c M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspursrc/vm/cogit.h M nsspursrc/vm/cogitARMv5.c M nsspursrc/vm/cogitIA32.c M nsspursrc/vm/cogitMIPSEL.c M nsspursrc/vm/cointerp.c M nsspursrc/vm/cointerp.h M nsspursrc/vm/gcc3x-cointerp.c M nsspurstack64src/vm/gcc3x-interp.c M nsspurstack64src/vm/interp.c M nsspurstacksrc/vm/gcc3x-interp.c M nsspurstacksrc/vm/interp.c M spur64src/vm/cogit.h M spur64src/vm/cogitX64.c M spur64src/vm/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/gcc3x-cointerp.c M spursista64src/vm/cogit.h M spursista64src/vm/cogitX64.c M spursista64src/vm/cointerp.c M spursista64src/vm/cointerp.h M spursista64src/vm/gcc3x-cointerp.c M spursistasrc/vm/cogit.h M spursistasrc/vm/cogitARMv5.c M spursistasrc/vm/cogitIA32.c M spursistasrc/vm/cogitMIPSEL.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.c M spursrc/vm/cogit.h M spursrc/vm/cogitARMv5.c M spursrc/vm/cogitIA32.c M spursrc/vm/cogitMIPSEL.c M spursrc/vm/cointerp.c M spursrc/vm/cointerp.h M spursrc/vm/gcc3x-cointerp.c M spurstack64src/vm/gcc3x-interp.c M spurstack64src/vm/interp.c M spurstacksrc/vm/gcc3x-interp.c M spurstacksrc/vm/interp.c M src/vm/cogit.h M src/vm/cogitARMv5.c M src/vm/cogitIA32.c M src/vm/cogitMIPSEL.c M src/vm/cointerp.c M src/vm/cointerp.h M src/vm/cointerpmt.c M src/vm/cointerpmt.h M src/vm/gcc3x-cointerp.c M src/vm/gcc3x-cointerpmt.c M stacksrc/vm/gcc3x-interp.c M stacksrc/vm/interp.c Log Message: ----------- CogVM source as per VMMaker.oscog-eem.2129 InterpreterPrimitives: Fix slip in primitiveSmallFloatSquareRoot Simplify the boxed and immediate unary float primitives to do less stack manipulations and/or primFailCode testing. 64-bit Cogit: Fix a regression in CogX64Compiler>>concretizeConvertRRd and a bug in CogX64Compiler>>concretizeConvertRdR. Fix a bug in genPrimitiveSmallFloatSquareRoot. The primitive must fail for negative arguments. Cogit: Fix some C compilation warnings due to mismatched pointer types. (Slang) Get methods that return AbstractInstructions to be inlinable. StackToRegisterMappingCogit: Simplify genForwardersInlinedIdenticalOrNotIf: to avoid an extra call of genEnsureOopInRegNotForwarded:... Generate slightly better code in genSpecialSelectorComparison Squash jump L1; nop; L1 to nop; nop (again as part of jump following). Don't bother to inline genEnsureOopInRegNotForwarded:scratchReg:ifForwarder: ifNotForwarder:, but do inline genEnsureOopInRegNotForwarded:scratchReg: jumpBackTo: which is simply a call of the other. Commit: 7037091c011bbb601c7f718ce111332af5c86f6c https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/7037091c011bbb601c… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-02-14 (Tue, 14 Feb 2017) Changed paths: M .travis.yml A build.linux32x86/pharo.cog.spur.lowcode/build.assert.itimerheartbeat/mvm A build.linux32x86/pharo.cog.spur.lowcode/build.assert/mvm A build.linux32x86/pharo.cog.spur.lowcode/build.debug.itimerheartbeat/mvm A build.linux32x86/pharo.cog.spur.lowcode/build.debug/mvm A build.linux32x86/pharo.cog.spur.lowcode/build.itimerheartbeat/mvm A build.linux32x86/pharo.cog.spur.lowcode/build/mvm A build.linux32x86/pharo.cog.spur.lowcode/makeallclean A build.linux32x86/pharo.cog.spur.lowcode/makealldirty A build.linux32x86/pharo.cog.spur.lowcode/plugins.ext A build.linux32x86/pharo.cog.spur.lowcode/plugins.int A build.linux32x86/pharo.stack.spur.lowcode/build.assert.itimerheartbeat/mvm A build.linux32x86/pharo.stack.spur.lowcode/build.assert/mvm A build.linux32x86/pharo.stack.spur.lowcode/build.debug.itimerheartbeat/mvm A build.linux32x86/pharo.stack.spur.lowcode/build.debug/mvm A build.linux32x86/pharo.stack.spur.lowcode/build.itimerheartbeat/mvm A build.linux32x86/pharo.stack.spur.lowcode/build/mvm A build.linux32x86/pharo.stack.spur.lowcode/makeallclean A build.linux32x86/pharo.stack.spur.lowcode/makealldirty A build.linux32x86/pharo.stack.spur.lowcode/plugins.ext A build.linux32x86/pharo.stack.spur.lowcode/plugins.int A build.macos32x86/pharo.cog.spur.lowcode/Makefile A build.macos32x86/pharo.cog.spur.lowcode/mvm A build.macos32x86/pharo.cog.spur.lowcode/plugins.ext A build.macos32x86/pharo.cog.spur.lowcode/plugins.int A build.macos32x86/pharo.stack.spur.lowcode/Makefile A build.macos32x86/pharo.stack.spur.lowcode/mvm A build.macos32x86/pharo.stack.spur.lowcode/plugins.ext A build.macos32x86/pharo.stack.spur.lowcode/plugins.int M build.macos32x86/pharo.stack.spur/Makefile A build.macos64x64/pharo.cog.spur.lowcode/Makefile A build.macos64x64/pharo.cog.spur.lowcode/mvm A build.macos64x64/pharo.cog.spur.lowcode/plugins.ext A build.macos64x64/pharo.cog.spur.lowcode/plugins.int A build.macos64x64/pharo.stack.spur.lowcode/Makefile A build.macos64x64/pharo.stack.spur.lowcode/mvm A build.macos64x64/pharo.stack.spur.lowcode/plugins.ext A build.macos64x64/pharo.stack.spur.lowcode/plugins.int A build.macos64x64/pharo.stack.spur/Makefile A build.macos64x64/pharo.stack.spur/mvm A build.macos64x64/pharo.stack.spur/plugins.ext A build.macos64x64/pharo.stack.spur/plugins.int A build.win32x86/pharo.cog.spur.lowcode/Makefile A build.win32x86/pharo.cog.spur.lowcode/Pharo.def.in A build.win32x86/pharo.cog.spur.lowcode/Pharo.exe.manifest A build.win32x86/pharo.cog.spur.lowcode/Pharo.ico A build.win32x86/pharo.cog.spur.lowcode/Pharo.rc A build.win32x86/pharo.cog.spur.lowcode/mvm A build.win32x86/pharo.cog.spur.lowcode/plugins.ext A build.win32x86/pharo.cog.spur.lowcode/plugins.int A build.win32x86/squeak.cog.spur.lowcode/Croquet.def.in A build.win32x86/squeak.cog.spur.lowcode/Croquet.exe.manifest A build.win32x86/squeak.cog.spur.lowcode/Croquet.ico A build.win32x86/squeak.cog.spur.lowcode/Croquet.rc A build.win32x86/squeak.cog.spur.lowcode/GreenCogSqueak.ico A build.win32x86/squeak.cog.spur.lowcode/Makefile A build.win32x86/squeak.cog.spur.lowcode/Squeak.def.in A build.win32x86/squeak.cog.spur.lowcode/Squeak.exe.manifest A build.win32x86/squeak.cog.spur.lowcode/Squeak.rc A build.win32x86/squeak.cog.spur.lowcode/mvm A build.win32x86/squeak.cog.spur.lowcode/plugins.ext A build.win32x86/squeak.cog.spur.lowcode/plugins.int A build.win32x86/squeak.cog.spur.lowcode/squeak.ico M platforms/Cross/plugins/IA32ABI/x64ia32abicc.c M platforms/Cross/vm/sqLowcodeFFI-i386.h M platforms/Cross/vm/sqLowcodeFFI-x86_64.h M platforms/Cross/vm/sqMemoryAccess.h M platforms/iOS/vm/Common/Classes/sqSqueakMainApplication+attributes.m M platforms/unix/vm/sqConfig.h M specs/lowcode.xml A spurlowcode64src/examplePlugins.ext A spurlowcode64src/examplePlugins.int A spurlowcode64src/vm/cogit.c A spurlowcode64src/vm/cogit.h A spurlowcode64src/vm/cogitX64.c A spurlowcode64src/vm/cogmethod.h A spurlowcode64src/vm/cointerp.c A spurlowcode64src/vm/cointerp.h A spurlowcode64src/vm/exampleSqNamedPrims.h A spurlowcode64src/vm/gcc3x-cointerp.c A spurlowcode64src/vm/interp.h A spurlowcode64src/vm/vmCallback.h A spurlowcodesrc/examplePlugins.ext A spurlowcodesrc/examplePlugins.int A spurlowcodesrc/vm/cogit.c A spurlowcodesrc/vm/cogit.h A spurlowcodesrc/vm/cogitARMv5.c A spurlowcodesrc/vm/cogitIA32.c A spurlowcodesrc/vm/cogitMIPSEL.c A spurlowcodesrc/vm/cogmethod.h A spurlowcodesrc/vm/cointerp.c A spurlowcodesrc/vm/cointerp.h A spurlowcodesrc/vm/exampleSqNamedPrims.h A spurlowcodesrc/vm/gcc3x-cointerp.c A spurlowcodesrc/vm/interp.h A spurlowcodesrc/vm/vmCallback.h A spurlowcodestack64src/examplePlugins.ext A spurlowcodestack64src/examplePlugins.int A spurlowcodestack64src/vm/exampleSqNamedPrims.h A spurlowcodestack64src/vm/gcc3x-interp.c A spurlowcodestack64src/vm/interp.c A spurlowcodestack64src/vm/interp.h A spurlowcodestack64src/vm/vmCallback.h A spurlowcodestacksrc/examplePlugins.ext A spurlowcodestacksrc/examplePlugins.int A spurlowcodestacksrc/vm/exampleSqNamedPrims.h A spurlowcodestacksrc/vm/gcc3x-interp.c A spurlowcodestacksrc/vm/interp.c A spurlowcodestacksrc/vm/interp.h A spurlowcodestacksrc/vm/vmCallback.h Log Message: ----------- Merge branch 'Cog' of http://www.github.com/opensmalltalk/vm into Cog Compare: https://github.com/OpenSmalltalk/opensmalltalk-vm/compare/e7268a6b24e6...70…

1 0

[OpenSmalltalk/opensmalltalk-vm] b0faf3: CogVM source as per VMMaker.oscogSPC-eem.2129.
by GitHub 14 Feb '17

14 Feb '17

Branch: refs/heads/SpurPlanningCompactor Home: https://github.com/OpenSmalltalk/opensmalltalk-vm Commit: b0faf3e68f179bcdc115ac74b82a799c957e6e33 https://github.com/OpenSmalltalk/opensmalltalk-vm/commit/b0faf3e68f179bcdc1… Author: Eliot Miranda <eliot.miranda(a)gmail.com> Date: 2017-02-14 (Tue, 14 Feb 2017) Changed paths: M nsspur64src/vm/cogit.h M nsspur64src/vm/cogitX64.c M nsspur64src/vm/cointerp.c M nsspur64src/vm/cointerp.h M nsspur64src/vm/gcc3x-cointerp.c M nsspursrc/vm/cogit.h M nsspursrc/vm/cogitARMv5.c M nsspursrc/vm/cogitIA32.c M nsspursrc/vm/cogitMIPSEL.c M nsspursrc/vm/cointerp.c M nsspursrc/vm/cointerp.h M nsspursrc/vm/gcc3x-cointerp.c M nsspurstack64src/vm/gcc3x-interp.c M nsspurstack64src/vm/interp.c M nsspurstacksrc/vm/gcc3x-interp.c M nsspurstacksrc/vm/interp.c M spur64src/vm/cogit.h M spur64src/vm/cogitX64.c M spur64src/vm/cointerp.c M spur64src/vm/cointerp.h M spur64src/vm/gcc3x-cointerp.c M spursista64src/vm/cogit.h M spursista64src/vm/cogitX64.c M spursista64src/vm/cointerp.c M spursista64src/vm/cointerp.h M spursista64src/vm/gcc3x-cointerp.c M spursistasrc/vm/cogit.h M spursistasrc/vm/cogitARMv5.c M spursistasrc/vm/cogitIA32.c M spursistasrc/vm/cogitMIPSEL.c M spursistasrc/vm/cointerp.c M spursistasrc/vm/cointerp.h M spursistasrc/vm/gcc3x-cointerp.c M spursrc/vm/cogit.h M spursrc/vm/cogitARMv5.c M spursrc/vm/cogitIA32.c M spursrc/vm/cogitMIPSEL.c M spursrc/vm/cointerp.c M spursrc/vm/cointerp.h M spursrc/vm/gcc3x-cointerp.c M spurstack64src/vm/gcc3x-interp.c M spurstack64src/vm/interp.c M spurstacksrc/vm/gcc3x-interp.c M spurstacksrc/vm/interp.c M src/vm/cogit.h M src/vm/cogitARMv5.c M src/vm/cogitIA32.c M src/vm/cogitMIPSEL.c M src/vm/cointerp.c M src/vm/cointerp.h M src/vm/cointerpmt.c M src/vm/cointerpmt.h M src/vm/gcc3x-cointerp.c M src/vm/gcc3x-cointerpmt.c M stacksrc/vm/gcc3x-interp.c M stacksrc/vm/interp.c Log Message: ----------- CogVM source as per VMMaker.oscogSPC-eem.2129. InterpreterPrimitives: Simplify the boxed and immediate unary float primitives to do less stack manipulations and/or primFailCode testing. primitiveSmallFloatSquareRoot must fail for negative arguments. 64-bit Cogit: Fix a regression in CogX64Compiler>>concretizeConvertRRd and a bug in CogX64Compiler>>concretizeConvertRdR. Fix a bug in genPrimitiveSmallFloatSquareRoot. The primitive must fail for negative arguments. Cogit: Fix some C compilation warnings due to mismatched pointer types. (Slang) Get methods that return AbstractInstrucitons to be inlinable. SimpleStackBasedCogit: Avoid assuming bytecode sizes in closure creation. StackToRegisterMappingCogit: Simplify genForwardersInlinedIdenticalOrNotIf: to avoid an extra call of genEnsureOopInRegNotForwarded:... Generate slightly better code in genSpecialSelectorComparison Squash jump L1; nop; L1 to nop; nop (again as part of jump following). Don't bother to inline genEnsureOopInRegNotForwarded:scratchReg:ifForwarder: ifNotForwarder:, but do inline genEnsureOopInRegNotForwarded:scratchReg: jumpBackTo: which is simply a call of the other. Cogit: Refactor fixupAt: & initializeFixupAt: to take bytecode PCs not indexes. Add fixupAtIndex: as the method that takes an index. Refactor sends of ensure[NonMerge]FixupAt:, moving the ever-present "- initialPC" into ensure[NonMerge]FixupAt:.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev February 2017