Vm-dev October 2014

vm-dev@lists.squeakfoundation.org

38 participants
133 discussions

VM Maker: VMMaker.oscog-eem.904.mcz
by commits＠source.squeak.org 16 Oct '14

16 Oct '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.904.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.904 Author: eem Time: 16 October 2014, 1:38:11.453 pm UUID: 6754ddfb-7fdd-46ea-9823-4e32b4454d70 Ancestors: VMMaker.oscog-eem.903 Include the AioPlugin in the Newspeak VMs; recent reports indicate it's essential to good performance in recent versions of OSProcessPlugin. A little more progress on the Spur image segment prms. =============== Diff against VMMaker.oscog-eem.903 =============== Item was added: + ----- Method: SpurMemoryManager>>markAllExceptTransitiveClosureOf: (in category 'image segment in/out') ----- + markAllExceptTransitiveClosureOf: arrayOfRoots + "Mark all objects in the system except those in arrayOfRoots and objects only reachable from arrayOfRoots. + This is how the image segment writing primitive computes the set of objects to include in a segment." + + self assert: self allObjectsUnmarked. + self markObjectsIn: arrayOfRoots. + self markObjects. + self unmarkObjectsIn: arrayOfRoots.! Item was changed: ----- Method: SpurMemoryManager>>storeImageSegmentInto:outPointers:roots: (in category 'image segment in/out') ----- storeImageSegmentInto: segmentWordArray outPointers: outPointerArray roots: arrayOfRoots "This primitive is called from Squeak as... <imageSegment> storeSegmentFor: arrayOfRoots into: aWordArray outPointers: anArray." "This primitive will store a binary image segment (in the same format as the Squeak image file) of the receiver and every object in its proper tree of subParts (ie, that is not refered to from anywhere else outside the tree). All pointers from within the tree to objects outside the tree will be copied into the array of outpointers. In their place in the image segment will be an oop equal to the offset in the outPointer array (the first would be 4). but with the high bit set." "The primitive expects the array and wordArray to be more than adequately long. In this case it returns normally, and truncates the two arrays to exactly the right size. To simplify truncation, both incoming arrays are required to have large headers (i.e. be 256 words long or larger). If either array is too small, the primitive will fail, but in no other case. During operation of the primitive, it is necessary to convert from both internal and external oops to their mapped values. To make this fast, the original objects in question are forwarded to the mapped values. Tables are kept of both kinds of oops. Note that markObjects eliminates forwarding pointers, so there will be no forwarding pointers in the object graph once objects have been marked. To be specific, there are two similar tables, the outPointer array, and one in the upper eight of the segmentWordArray. Each grows oops from the bottom up. In case of either success or failure, the headers must be restored. In the event of primitive failure, the table of outPointers must also be nilled out (since the garbage in the high half will not have been discarded)." + | endSeg firstIn firstOut lastIn lastOut limitSeg scanned newSegLimit unmarkedClasses | - | endSeg firstIn firstOut lastIn lastOut limitSeg newSegLimit unmarkedClasses | true ifTrue: [^PrimErrUnsupported] ifFalse: [ ((self hasOverflowHeader: outPointerArray) "Must have 128-bit header" and: [self hasOverflowHeader: segmentWordArray]) ifFalse: "Must have 128-bit header" [^PrimErrGenericFailure]. firstOut := outPointerArray + self baseHeaderSize. lastOut := firstOut - self bytesPerOop. limitSeg := segmentWordArray + self baseHeaderSize. endSeg := segmentWordArray + (self addressAfter: segmentWordArray). "Allocate top 1/8 of segment for table of internal oops" firstIn := endSeg - ((self numSlotsOf: segmentWordArray) // 8). "Take 1/8 of seg" lastIn := firstIn - self bytesPerOop. + "N.B. A side effect of this marking is that all forwarders are followed, + so while forwarders may exist in te heap they will *not* be reachable." + self markAllExceptTransitiveClosureOf: arrayOfRoots. - self assert: self allObjectsUnmarked. - self markObjectsIn: arrayOfRoots. - self markObjects. - self unmarkObjectsIn: arrayOfRoots. "All external objects, and only they, are now marked." unmarkedClasses := self arrayOfUnmarkedClasses. (self isImmediate: unmarkedClasses) ifTrue: [^PrimErrGenericFailure]. "Write a version number for byte order and version check, followed by the number of classes." limitSeg >= endSeg ifTrue: [^PrimErrGenericFailure]. self long32At: limitSeg put: self imageSegmentVersion. self long32At: limitSeg + 4 put: (self numSlotsOf: unmarkedClasses). + scanned := limitSeg := limitSeg + 8. - limitSeg := limitSeg + 8. "If there are any classes then copy them into the segment, and forward their oop." (self numSlotsOf: unmarkedClasses) > 0 ifTrue: [((lastIn := lastIn + self bytesPerOop) >= endSeg or: [0 = (newSegLimit := self copyObj: arrayOfRoots toSegment: segmentWordArray addr: limitSeg stopAt: firstIn saveOopAt: lastIn)]) ifTrue: [lastIn := lastIn - self bytesPerWord. self restoreObjectsFrom: firstIn to: lastIn from: segmentWordArray + self baseHeaderSize to: limitSeg. self fillObj: outPointerArray numSlots: (self numSlotsOf: outPointerArray) with: nilObj. ^PrimErrGenericFailure]. limitSeg := newSegLimit]. "Copy the array of roots into the segment, and forward its oop." ((lastIn := lastIn + self bytesPerOop) >= endSeg or: [0 = (newSegLimit := self copyObj: arrayOfRoots toSegment: segmentWordArray addr: limitSeg stopAt: firstIn saveOopAt: lastIn)]) ifTrue: [lastIn := lastIn - self bytesPerWord. self restoreObjectsFrom: firstIn to: lastIn from: segmentWordArray + self baseHeaderSize to: limitSeg. self fillObj: outPointerArray numSlots: (self numSlotsOf: outPointerArray) with: nilObj. ^PrimErrGenericFailure]. limitSeg := newSegLimit. + "Now traverse the objects copied to the segment so far, copying unmarked objects into the segment. + This is essentially the same algorithm as the breadth-first copying algorithm in scavenging." + scanned := self objectStartingAt: scanned. + [scanned < limitSeg] whileTrue: + [1 to: (self numPointerSlotsOf: scanned) do: + [:i| | oop | + oop := self fetchPointer: i ofObject: scanned. + ((self isImmediate: oop) or: [(self isForwarded: oop) or: [self isMarked: oop]]) ifFalse: + [((lastIn := lastIn + self bytesPerOop) >= endSeg + or: [0 = (newSegLimit := self copyObj: oop toSegment: segmentWordArray addr: limitSeg stopAt: firstIn saveOopAt: lastIn)]) ifTrue: + [lastIn := lastIn - self bytesPerWord. + self restoreObjectsFrom: firstIn to: lastIn from: segmentWordArray + self baseHeaderSize to: limitSeg. + self fillObj: outPointerArray numSlots: (self numSlotsOf: outPointerArray) with: nilObj. + ^PrimErrGenericFailure]. + limitSeg := newSegLimit]]. + scanned := self objectAfter: scanned]. - "Now traverse arrayOfRoots, copying unmarked objects into the segment" "Now the primitive can not fail; traverse the objects in the segment, unforwarding the originals and mapping external oops." self flag: 'you are here']! Item was changed: ----- Method: VMMaker class>>generateNewspeakCogVM (in category 'configurations') ----- generateNewspeakCogVM ^VMMaker generate: CoInterpreter and: StackToRegisterMappingCogit with: #( NewspeakVM true MULTIPLEBYTECODESETS true) to: (FileDirectory default pathFromURI: self sourceTree, '/nscogsrc') platformDir: (FileDirectory default pathFromURI: self sourceTree, '/platforms') + including:#( AioPlugin AsynchFilePlugin BMPReadWriterPlugin BalloonEnginePlugin BitBltSimulation DeflatePlugin DSAPlugin DropPlugin - including:#( AsynchFilePlugin BMPReadWriterPlugin BalloonEnginePlugin BitBltSimulation DeflatePlugin DSAPlugin DropPlugin FileCopyPlugin FilePlugin FloatArrayPlugin FloatMathPlugin ImmX11Plugin JPEGReadWriter2Plugin JPEGReaderPlugin LargeIntegersPlugin Matrix2x3Plugin MiscPrimitivePlugin NewsqueakIA32ABIPlugin RePlugin SecurityPlugin SocketPlugin SoundPlugin SqueakSSLPlugin SurfacePlugin UUIDPlugin UnixOSProcessPlugin VMProfileLinuxSupportPlugin VMProfileMacSupportPlugin Win32OSProcessPlugin)!

1 0

VM Maker: Cog-eem.211.mcz
by commits＠source.squeak.org 16 Oct '14

16 Oct '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.211.mcz ==================== Summary ==================== Name: Cog-eem.211 Author: eem Time: 16 October 2014, 1:25:24.459 pm UUID: 4296b46e-4123-4261-98f0-c9fe23be3528 Ancestors: Cog-eem.210 Provide uploadNewerSpurConfigurationsInTrunk to create update.spur versions of trunk updates. Refactor a common sequence into a packages method. Fix a warning for the catefory of setValue:. =============== Diff against Cog-eem.210 =============== Item was changed: ----- Method: SpurBootstrap class>>categoryForClass:meta:selector: (in category 'method prototype categorization') ----- categoryForClass: className meta: isMeta selector: selector ^(isMeta ifTrue: [{ className. #class. selector }] ifFalse: [{ className. selector }]) caseOf: { [#(Behavior allInstancesOrNil)] -> [#enumerating]. [#(Behavior byteSizeOfInstance)] -> [#'accessing instances and variables']. [#(Behavior byteSizeOfInstanceOfSize:)] -> [#'accessing instances and variables']. [#(Behavior elementSize)] -> [#'accessing instances and variables']. [#(Behavior handleFailingBasicNew)] -> [#private]. [#(Behavior handleFailingBasicNew:)] -> [#private]. [#(Behavior handleFailingFailingBasicNew)] -> [#private]. [#(Behavior handleFailingFailingBasicNew:)] -> [#private]. [#(Behavior identityHash)] -> [#comparing]. [#(Behavior isEphemeronClass)] -> [#testing]. [#(Behavior isImmediateClass)] -> [#testing]. [#(Character identityHash)] -> [#comparing]. + [#(Character setValue:)] -> [#accessing]. [#(Class immediateSubclass:instanceVariableNames:classVariableNames:poolDictionaries:category:)] -> [#'subclass creation']. [#(ClassBuilder superclass:immediateSubclass:instanceVariableNames:classVariableNames:poolDictionaries:category:)] -> [#public]. [#(CompiledMethod bytecodeSetName)] -> [#accessing]. [#(CompiledMethod class handleFailingFailingNewMethod:header:)] -> [#private]. [#(CompiledMethod class handleFailingNewMethod:header:)] -> [#private]. [#(CompiledMethod class headerFlagForEncoder:)] -> [#'method encoding']. [#(CompiledMethod class installPrimaryBytecodeSet:)] -> [#'class initialization']. [#(CompiledMethod class installSecondaryBytecodeSet:)] -> [#'class initialization']. [#(Context class allInstances)] -> [#enumerating]. [#(Context class allInstancesDo:)] -> [#enumerating]. [#(Context failPrimitiveWith:)] -> [#'system simulation']. [#(Context isPrimFailToken:)] -> [#private]. [#(Context send:to:with:lookupIn:)] -> [#controlling]. [#(ContextPart isPrimFailToken:)] -> [#private]. [#(ContextPart send:to:with:lookupIn:)] -> [#controlling]. [#(EncoderForV3 computeMethodHeaderForNumArgs:numTemps:numLits:primitive:)] -> [#'method encoding']. [#(EncoderForV3PlusClosures genCallPrimitive:)] -> [#'bytecode generation']. [#(EncoderForV3PlusClosures class callPrimitiveCode)] -> [#'bytecode decoding']. [#(MethodContext failPrimitiveWith:)] -> [#'system simulation']. [#(MethodContext class allInstances)] -> [#enumerating]. [#(MethodContext class allInstancesDo:)] -> [#enumerating]. [#(SmallInteger asCharacter)] -> [#converting]. [#(SmalltalkImage growMemoryByAtLeast:)] -> [#'memory space']. [#(SmalltalkImage maxIdentityHash)] -> [#'system attributes']. [#(SystemDictionary growMemoryByAtLeast:)] -> [#'memory space']. [#(SystemDictionary maxIdentityHash)] -> [#'system attributes']. [#(SystemDictionary setGCParameters)] -> [#'snapshot and quit']. [#(SystemNavigation allObjects)] -> [#query]. [#(SystemNavigation allObjectsOrNil)] -> [#query]. } otherwise: [Transcript nextPutAll: className. isMeta ifTrue: [Transcript nextPutAll: ' class']. Transcript nextPutAll: '>>'; store: selector; nextPutAll: ' is unclassified'; cr; flush. ^Categorizer default]! Item was added: + ----- Method: SpurBootstrapMonticelloPackagePatcher>>findOldestConfigurationFor:inVersionNames:repository: (in category 'configurations') ----- + findOldestConfigurationFor: packageVersions inVersionNames: configurationVersionNames repository: repo + | oldest | + oldest := configurationVersionNames first. + configurationVersionNames do: + [:cfgver| | config | + config := repo versionNamed: cfgver. + (packageVersions noneSatisfy: + [:pkgver| | configVersion | + configVersion := config dependencies detect: + [:dep| + pkgver packageName = dep package name]. + configVersion versionInfo versionNumber >= pkgver versionNumber]) ifTrue: + [^oldest]. + oldest := cfgver]. + self error: 'couldn''t find configuration newer than supplied versions'! Item was added: + ----- Method: SpurBootstrapMonticelloPackagePatcher>>packages (in category 'private-accessing') ----- + packages + "Answer the packages Spur modifies." + ^self packagesAndPatches keys! Item was changed: ----- Method: SpurBootstrapMonticelloPackagePatcher>>patchAndUploadAllInTrunk (in category 'patching') ----- patchAndUploadAllInTrunk "Look for all versions in the default repository that have patched versions there-in. Download and patch them and upload the patched versions (overwriting the older ones)." "(SpurBootstrapMonticelloPackagePatcher new from: 'spurpackages' to: 'trunkpackages') patchAndUploadAllInTrunk" | seed trunk sourceRepo cacheRepo | seed := 'Are you really sure you want to do this?\It should happen only once!!' withCRs. 3 timesRepeat: [(UIManager confirm: seed) ifFalse: [^self]. seed := seed copyReplaceAll: 'really ' with: 'really, really ']. sourceDir assureExistence; deleteLocalFiles. destDir assureExistence; deleteLocalFiles. sourceRepo := MCDirectoryRepository directory: sourceDir. cacheRepo := MCCacheRepository default. (trunk := self trunk) cacheAllFileNamesDuring: [| latestBranches latestUnbranched | + latestBranches := self packages collect: - latestBranches := self packagesAndPatches keys collect: [:package| (trunk versionNamesForPackageNamed: package name, '.spur') detectMin: [:vn | vn asMCVersionName versionNumber]]. latestUnbranched := latestBranches collect: [:verName| (trunk versionNamed: (verName copyReplaceAll: '.spur' with: '') asMCVersionName) info ancestors first versionName]. ((trunk possiblyNewerVersionsOfAnyOf: latestUnbranched) reject: [:unpatched| unpatched includesSubString: '.spur']) do: [:unpatched| "it is claimed that whether a repository contains a .mcz or a .mcd is irrelevant. At least for the cache repositoriy that's not true." sourceRepo storeVersion: (self cachedNonDiffyVersionNamed: unpatched from: trunk)]. self patchAsNeeded. self uploadFrom: (MCDirectoryRepository directory: destDir) to: trunk]! Item was changed: ----- Method: SpurBootstrapMonticelloPackagePatcher>>patchAndUploadNewer (in category 'patching') ----- patchAndUploadNewer "Look for unbranched versions on the default repository that are newer than the image''s versions. Download and patch them and upload the patched versions." "(SpurBootstrapMonticelloPackagePatcher new from: 'spurpackages' to: 'trunkpackages') patchAndUploadNewer" | repo sourceRepo | sourceDir deleteLocalFiles. destDir deleteLocalFiles. repo := self repositoryForUrl: MCMcmUpdater defaultUpdateURL. sourceRepo := MCDirectoryRepository directory: sourceDir. repo cacheAllFileNamesDuring: + [self packages do: - [self packagesAndPatches keys do: [:package| | workingCopy | workingCopy := MCWorkingCopy allManagers detect: [:pkg| pkg packageName = package packageName]. (workingCopy possiblyNewerVersionsIn: repo) do: [:newerVersion| newerVersion packageAndBranchName = package packageName ifTrue: "Don't patch already patched packages!!!!" [(sourceRepo includesVersionNamed: newerVersion) ifFalse: [sourceRepo storeVersion: (repo versionNamed: newerVersion)]]]]. self patchAsNeeded. self uploadFrom: (MCDirectoryRepository directory: destDir) to: repo]! Item was changed: ----- Method: SpurBootstrapMonticelloPackagePatcher>>patchAndUploadUnpatchedInTrunk (in category 'patching') ----- patchAndUploadUnpatchedInTrunk "Look for unbranched versions in the default repository that are newer than the latest patched versions there-in. Download and patch them and upload the patched versions." "(SpurBootstrapMonticelloPackagePatcher new from: 'spurpackages' to: 'trunkpackages') patchAndUploadUnpatchedInTrunk" | trunk sourceRepo cacheRepo | sourceDir assureExistence; deleteLocalFiles. destDir assureExistence; deleteLocalFiles. sourceRepo := MCDirectoryRepository directory: sourceDir. cacheRepo := MCCacheRepository default. (trunk := self trunk) cacheAllFileNamesDuring: [| latestBranches latestUnbranched | + latestBranches := self packages collect: - latestBranches := self packagesAndPatches keys collect: [:package| (trunk versionNamesForPackageNamed: package name, '.spur') detectMax: [:vn | vn asMCVersionName versionNumber]]. latestUnbranched := latestBranches collect: [:verName| (verName copyReplaceAll: '.spur' with: '') asMCVersionName]. ((trunk possiblyNewerVersionsOfAnyOf: latestUnbranched) reject: [:unpatched| unpatched includesSubString: '.spur']) do: [:unpatched| "it is claimed that whether a repository contains a .mcz or a .mcd is irrelevant. At least for the cache repositoriy that's not true." sourceRepo storeVersion: (self cachedNonDiffyVersionNamed: unpatched from: trunk)]. self patchAsNeeded. self uploadFrom: (MCDirectoryRepository directory: destDir) to: trunk]! Item was added: + ----- Method: SpurBootstrapMonticelloPackagePatcher>>spurConfigurationOf:forRepository: (in category 'configurations') ----- + spurConfigurationOf: anMCConfiguration forRepository: repo + "Answer a copy of anMCConfiguration containing the matching Spur dependencies. + If no replacements could be made (because no Spur versions exist) then answer nil." + | found clone | + found := false. + clone := Array streamContents: + [:s| + s nextPut: #name; nextPut: (anMCConfiguration name copyReplaceAll: 'update-' with: 'update.spur-'); + "no location accessor!!!!" + nextPut: #repository; nextPut: {anMCConfiguration repositories first locationWithTrailingSlash allButLast}. + anMCConfiguration dependencies do: + [:dep| | info pkg ver spurVersionName | + info := dep versionInfo. + ((pkg := self packages + detect: [:package| package name = dep package name] + ifNone: []) notNil + and: [spurVersionName := (info name + copyReplaceAll: pkg name + with: pkg name, '.spur'), '.mcz'. + (ver := MCCacheRepository default versionNamed: spurVersionName asMCVersionName) ifNil: + [ver := repo versionNamed: spurVersionName asMCVersionName]. + ver notNil]) + ifTrue: [found := true. info := ver info]. + (ver isNil and: [spurVersionName notNil]) ifTrue: + [Transcript nextPutAll: 'failed to get ', spurVersionName, ' in ', anMCConfiguration name; cr; flush]. + s nextPut: #dependency; nextPut: (MCConfiguration dependencyToArray: (MCVersionDependency package: dep package info: info))]]. + ^found ifTrue: + [MCConfiguration fromArray: clone]! Item was added: + ----- Method: SpurBootstrapMonticelloPackagePatcher>>uploadNewerSpurConfigurationsInTrunk (in category 'configurations') ----- + uploadNewerSpurConfigurationsInTrunk + "Make sure that update.spur configurations exist for all relevant update.* configurations." + "SpurBootstrapMonticelloPackagePatcher new uploadNewerSpurConfigurationsInTrunk" + | trunk | + trunk := self trunk. + trunk cacheAllFileNamesDuring: + [| configurations spurConfigurations oldestUpdate | + spurConfigurations := (trunk versionNamesForPackageNamed: 'update.spur') sort: [:a :b| a versionNumber > b versionNumber]. + configurations := ((trunk versionNamesForPackageNamed: 'update') select: [:n| n beginsWith: 'update-']) sort: [:a :b| a versionNumber > b versionNumber]. + oldestUpdate := spurConfigurations isEmpty + ifTrue: + [| earliestBranches earliestUnbranched | + earliestBranches := self packages collect: + [:package| + (trunk versionNamesForPackageNamed: package name, '.spur') detectMin: + [:vn | vn asMCVersionName versionNumber]]. + earliestUnbranched := earliestBranches collect: + [:verName| (verName copyReplaceAll: '.spur' with: '') asMCVersionName]. + self + findOldestConfigurationFor: earliestUnbranched + inVersionNames: configurations + repository: trunk] + ifFalse: + [spurConfigurations first copyReplaceAll: '.spur' with: '']. + Transcript nextPutAll: 'Oldest: ', oldestUpdate; cr; flush. + (configurations copyFrom: 1 to: (configurations indexOf: oldestUpdate) - 1) reverseDo: + [:configName| + "((configName beginsWith: 'update-eem.29') and: ['34' includes: (configName at: 14)]) ifTrue: + [self halt]." + (self spurConfigurationOf: (trunk versionNamed: configName) forRepository: trunk) ifNotNil: + [:edition| trunk storeVersion: edition]]]!

1 0

Re: [Vm-dev] VM Maker: Cog-eem.210.mcz
by Esteban Lorenzano 15 Oct '14

15 Oct '14

cool, thanks! :) (will continue tomorrow with this) On Wed, Oct 15, 2014 at 8:43 PM, <commits(a)source.squeak.org> wrote: > > Eliot Miranda uploaded a new version of Cog to project VM Maker: > http://source.squeak.org/VMMaker/Cog-eem.210.mcz > > ==================== Summary ==================== > > Name: Cog-eem.210 > Author: eem > Time: 15 October 2014, 11:42:52.194 am > UUID: 8ffc4e21-a5b2-4526-abec-324772d765d7 > Ancestors: Cog-eem.209 > > Fix bootstrap given addition of remapBuffer assert > check in slowPrmitiveResponse in VMMaker.oscog-eem.897. > > =============== Diff against Cog-eem.209 =============== > > Item was changed: > ----- Method: SimulatorHarness>>withExecutableInterpreter:do: (in > category 'bootstrap methods') ----- > withExecutableInterpreter: sim do: aBlock > "With the oldInterpreter ready to execute code, evaluate aBlock, > then return the interpreter (and the heap) to the ``just > snapshotted'' state." > + | savedpc savedfp initialContext finalContext | > - | savedpc initialContext finalContext | > sim > initStackPages; > loadInitialContext; > internalizeIPandSP. > - initialContext := sim frameContext: sim localFP. > savedpc := sim localIP. > + savedfp := sim localFP. > - sim objectMemory hasSpurMemoryManagerAPI ifFalse: > - [sim objectMemory pushRemappableOop: initialContext]. > "sim printHeadFrame." > aBlock value. > "sim printHeadFrame." > sim > internalPush: sim localIP; > externalizeIPandSP. > "now undo the execution state" > + self assert: sim localFP = savedfp. > + initialContext := sim frameContext: savedfp. > finalContext := sim > voidVMStateForSnapshotFlushingExternalPrimitivesIf: false. > - sim objectMemory hasSpurMemoryManagerAPI ifFalse: > - [initialContext := sim objectMemory popRemappableOop]. > self assert: initialContext = finalContext. > self assert: sim localIP = savedpc. > sim objectMemory > storePointer: SuspendedContextIndex > ofObject: sim activeProcess > withValue: finalContext! > > Item was changed: > ----- Method: SpurBootstrap>>allocateClassTable (in category 'bootstrap > image') ----- > allocateClassTable > "Allocate the root of the classTable plus enough pages to > accomodate all classes in > the classToIndex map. Don't fill in the entries yet; the classes > have yet to be cloned." > | tableRoot page maxSize numPages | > tableRoot := newHeap > allocateSlots: newHeap > classTableRootSlots + newHeap hiddenRootSlots > format: newHeap arrayFormat > classIndex: newHeap > arrayClassIndexPun. > self assert: (newHeap numSlotsOf: tableRoot) = (newHeap > classTableRootSlots + newHeap hiddenRootSlots). > self assert: (newHeap formatOf: tableRoot) = newHeap arrayFormat. > self assert: (newHeap classIndexOf: tableRoot) = newHeap > arrayClassIndexPun. > newHeap nilFieldsOf: tableRoot. > "first page is strong" > page := newHeap > allocateSlots: newHeap > classTablePageSize > format: newHeap arrayFormat > classIndex: newHeap > arrayClassIndexPun. > self assert: (newHeap numSlotsOf: page) = newHeap > classTablePageSize. > self assert: (newHeap formatOf: tableRoot) = newHeap arrayFormat. > self assert: (newHeap classIndexOf: tableRoot) = newHeap > arrayClassIndexPun. > self assert: (newHeap objectAfter: tableRoot limit: newHeap > freeStart) = page. > lastClassTablePage := page. > newHeap nilFieldsOf: page. > newHeap storePointer: 0 ofObject: tableRoot withValue: page. > + newHeap setHiddenRootsObj: tableRoot. > - newHeap hiddenRootsObj: tableRoot. > maxSize := classToIndex inject: 0 into: [:a :b| a max: b]. > numPages := (maxSize + newHeap classTableMinorIndexMask / newHeap > classTablePageSize) truncated. > 2 to: numPages do: > [:i| > page := newHeap > allocateSlots: newHeap > classTablePageSize > format: newHeap arrayFormat > classIndex: newHeap > arrayClassIndexPun. > self assert: (newHeap numSlotsOf: page) = newHeap > classTablePageSize. > self assert: (newHeap formatOf: page) = newHeap > arrayFormat. > self assert: (newHeap classIndexOf: page) = newHeap > arrayClassIndexPun. > newHeap fillObj: page numSlots: newHeap classTablePageSize > with: newHeap nilObject. > newHeap storePointer: i - 1 ofObject: tableRoot withValue: > page. > self assert: (newHeap objectAfter: (newHeap fetchPointer: > i - 2 ofObject: tableRoot) limit: newHeap freeStart) = page. > lastClassTablePage := page]. > "and once again to recompute numClassTablePages post building the > class table." > newHeap instVarNamed: 'numClassTablePages' put: nil. > + newHeap setHiddenRootsObj: tableRoot! > - newHeap hiddenRootsObj: tableRoot! > >

1 0

VM Maker: Cog-eem.210.mcz
by commits＠source.squeak.org 15 Oct '14

15 Oct '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.210.mcz ==================== Summary ==================== Name: Cog-eem.210 Author: eem Time: 15 October 2014, 11:42:52.194 am UUID: 8ffc4e21-a5b2-4526-abec-324772d765d7 Ancestors: Cog-eem.209 Fix bootstrap given addition of remapBuffer assert check in slowPrmitiveResponse in VMMaker.oscog-eem.897. =============== Diff against Cog-eem.209 =============== Item was changed: ----- Method: SimulatorHarness>>withExecutableInterpreter:do: (in category 'bootstrap methods') ----- withExecutableInterpreter: sim do: aBlock "With the oldInterpreter ready to execute code, evaluate aBlock, then return the interpreter (and the heap) to the ``just snapshotted'' state." + | savedpc savedfp initialContext finalContext | - | savedpc initialContext finalContext | sim initStackPages; loadInitialContext; internalizeIPandSP. - initialContext := sim frameContext: sim localFP. savedpc := sim localIP. + savedfp := sim localFP. - sim objectMemory hasSpurMemoryManagerAPI ifFalse: - [sim objectMemory pushRemappableOop: initialContext]. "sim printHeadFrame." aBlock value. "sim printHeadFrame." sim internalPush: sim localIP; externalizeIPandSP. "now undo the execution state" + self assert: sim localFP = savedfp. + initialContext := sim frameContext: savedfp. finalContext := sim voidVMStateForSnapshotFlushingExternalPrimitivesIf: false. - sim objectMemory hasSpurMemoryManagerAPI ifFalse: - [initialContext := sim objectMemory popRemappableOop]. self assert: initialContext = finalContext. self assert: sim localIP = savedpc. sim objectMemory storePointer: SuspendedContextIndex ofObject: sim activeProcess withValue: finalContext! Item was changed: ----- Method: SpurBootstrap>>allocateClassTable (in category 'bootstrap image') ----- allocateClassTable "Allocate the root of the classTable plus enough pages to accomodate all classes in the classToIndex map. Don't fill in the entries yet; the classes have yet to be cloned." | tableRoot page maxSize numPages | tableRoot := newHeap allocateSlots: newHeap classTableRootSlots + newHeap hiddenRootSlots format: newHeap arrayFormat classIndex: newHeap arrayClassIndexPun. self assert: (newHeap numSlotsOf: tableRoot) = (newHeap classTableRootSlots + newHeap hiddenRootSlots). self assert: (newHeap formatOf: tableRoot) = newHeap arrayFormat. self assert: (newHeap classIndexOf: tableRoot) = newHeap arrayClassIndexPun. newHeap nilFieldsOf: tableRoot. "first page is strong" page := newHeap allocateSlots: newHeap classTablePageSize format: newHeap arrayFormat classIndex: newHeap arrayClassIndexPun. self assert: (newHeap numSlotsOf: page) = newHeap classTablePageSize. self assert: (newHeap formatOf: tableRoot) = newHeap arrayFormat. self assert: (newHeap classIndexOf: tableRoot) = newHeap arrayClassIndexPun. self assert: (newHeap objectAfter: tableRoot limit: newHeap freeStart) = page. lastClassTablePage := page. newHeap nilFieldsOf: page. newHeap storePointer: 0 ofObject: tableRoot withValue: page. + newHeap setHiddenRootsObj: tableRoot. - newHeap hiddenRootsObj: tableRoot. maxSize := classToIndex inject: 0 into: [:a :b| a max: b]. numPages := (maxSize + newHeap classTableMinorIndexMask / newHeap classTablePageSize) truncated. 2 to: numPages do: [:i| page := newHeap allocateSlots: newHeap classTablePageSize format: newHeap arrayFormat classIndex: newHeap arrayClassIndexPun. self assert: (newHeap numSlotsOf: page) = newHeap classTablePageSize. self assert: (newHeap formatOf: page) = newHeap arrayFormat. self assert: (newHeap classIndexOf: page) = newHeap arrayClassIndexPun. newHeap fillObj: page numSlots: newHeap classTablePageSize with: newHeap nilObject. newHeap storePointer: i - 1 ofObject: tableRoot withValue: page. self assert: (newHeap objectAfter: (newHeap fetchPointer: i - 2 ofObject: tableRoot) limit: newHeap freeStart) = page. lastClassTablePage := page]. "and once again to recompute numClassTablePages post building the class table." newHeap instVarNamed: 'numClassTablePages' put: nil. + newHeap setHiddenRootsObj: tableRoot! - newHeap hiddenRootsObj: tableRoot!

1 0

VM Maker: VMMakerJS-bf.12.mcz
by commits＠source.squeak.org 15 Oct '14

15 Oct '14

Bert Freudenberg uploaded a new version of VMMakerJS to project VM Maker: http://source.squeak.org/VMMaker/VMMakerJS-bf.12.mcz ==================== Summary ==================== Name: VMMakerJS-bf.12 Author: bf Time: 14 October 2014, 3:49:18.236 pm UUID: a24182f0-6780-4782-a772-87ccf9030a78 Ancestors: VMMakerJS-bf.11 Fix inst vars in non-inlined prim methods (specifically, ADPCMCodecPlugin). =============== Diff against VMMakerJS-bf.11 =============== Item was changed: ----- Method: JSCodeGenerator class>>beActiveDuring: (in category 'preferences') ----- beActiveDuring: aBlock | wasActive | wasActive := self isActive. + self isActive: true. aBlock ensure: [self isActive: wasActive].! Item was changed: ----- Method: JSCodeGenerator>>addMethodsForPrimitives: (in category 'public') ----- addMethodsForPrimitives: classAndSelectorList + | sel aClass source verbose meth primInstVars sharedInstVars assignedInstVars | - | sel aClass source verbose meth | classAndSelectorList do:[:classAndSelector | aClass := Smalltalk at: (classAndSelector at: 1) ifAbsent:[nil]. aClass ifNotNil:[ self addAllClassVarsFor: aClass. "TPR - should pool vars also be added here?" "find the method in either the class or the metaclass" sel := classAndSelector at: 2. (aClass includesSelector: sel) ifTrue: [source := aClass sourceCodeAt: sel ifAbsent:[nil]] ifFalse: [source := aClass class sourceCodeAt: sel ifAbsent:[nil]]. ]. source ifNil:[ Transcript cr; show: 'WARNING: Compiled primitive ', classAndSelector first, '>>', classAndSelector last, ' not present'. ] ifNotNil:[ "compile the method source and convert to a suitable translation method " meth := (Compiler new parse: source in: aClass notifying: nil) asTranslationMethodOfClass: self translationMethodClass. (aClass includesSelector: sel) ifTrue: [meth definingClass: aClass] ifFalse: [meth definingClass: aClass class]. meth primitive > 0 ifTrue:[meth preparePrimitiveName]. "for old-style array accessing: meth covertToZeroBasedArrayReferences." meth replaceSizeMessages. self addMethod: meth. ]. ]. "method preparation" verbose := false. self prepareMethods. verbose ifTrue: [self printUnboundCallWarnings. self printUnboundVariableReferenceWarnings. Transcript cr]. "code generation" + "self doInlining: false" - self doInlining: false. + primInstVars := Set new. "inst vars used in primitives" + sharedInstVars := Set new. "inst vars used in non-primitives" + assignedInstVars := Set new. "inst vars modified in non-primitives" methods do:[:m| + m primitive > 0 ifTrue: [ + primInstVars addAll: m freeVariableReferences. + ] ifFalse: [ + sharedInstVars addAll: m freeVariableReferences. + assignedInstVars addAll: m variablesAssignedTo. + ]. + ]. + methods do:[:m| "if this method is supposed to be a primitive (rather than a helper routine), add assorted prolog and epilog items" + m primitive > 0 ifTrue: [ + m preparePrimitivePrologueShared: sharedInstVars assigned: assignedInstVars ]. - m primitive > 0 ifTrue: [m preparePrimitivePrologue]. "check for one-based array access" m oneBasedArrays ifNotNil: [self oneBasedArrays: true]. + ]. + "Add declarations for inst vars used in both prims and non-prims as global" + ((primInstVars intersection: sharedInstVars) difference: variables) do: [:var | + methods do:[:m| + m declarations at: var ifPresent: [:decl | + variableDeclarations at: var + ifPresent: [:existing | + decl = existing ifFalse: [self error: 'decls do not match']] + ifAbsent: [variableDeclarations at: var put: decl]]]. + variables add: var]. + "Add non-shared inst vars as local" + methods do:[:m| + m locals addAll: (m freeVariableReferences difference: sharedInstVars)]. + ! - ].! Item was changed: ----- Method: JSMethod>>freeVariableReferences (in category 'utilities') ----- freeVariableReferences "Answer a collection of variables referenced this method, excluding locals, arguments, and pseudovariables." | refs | refs := Set new. parseTree nodesDo: [ :node | node isVariable ifTrue: [ refs add: node name asString ]. ]. args do: [ :var | refs remove: var asString ifAbsent: [] ]. locals do: [ :var | refs remove: var asString ifAbsent: [] ]. + #('self' 'nil' 'true' 'false' 'null') do: [ :var | refs remove: var ifAbsent: [] ]. - #('self' 'nil' 'true' 'false') do: [ :var | refs remove: var ifAbsent: [] ]. ^ refs asSortedCollection! Item was removed: - ----- Method: JSMethod>>preparePrimitivePrologue (in category 'primitive compilation') ----- - preparePrimitivePrologue - "Add a prolog and postlog to a primitive method. The prolog copies any instance variables referenced by this primitive method into local variables. The postlog copies values of assigned-to variables back into the instance. The names of the new locals are added to the local variables list. - - The declarations dictionary defines the types of any non-integer variables (locals, arguments, or instance variables). In particular, it may specify the types: - - int * -- an array of 32-bit values (e.g., a BitMap) - short * -- an array of 16-bit values (e.g., a SoundBuffer) - char * -- an array of unsigned bytes (e.g., a String) - double -- a double precision floating point number (e.g., 3.14159) - - Undeclared variables are taken to be integers and will be converted from Smalltalk to C ints." - - "Current restrictions: - o method must not contain message sends - o method must not allocate objects - o method must not manipulate raw oops - o method cannot access class variables - o method can only return an integer" - - | prolog postlog instVarsUsed varsAssignedTo instVarList primArgCount varName endsWithReturn aClass | - selector == #setInterpreter: ifTrue:[self halt]. - aClass := definingClass. - prolog := OrderedCollection new. - postlog := OrderedCollection new. - instVarsUsed := self freeVariableReferences asSet. - varsAssignedTo := self variablesAssignedTo asSet. - instVarList := aClass allInstVarNames. - primArgCount := args size. - - "add receiver fetch and arg conversions to prolog" - prolog addAll: self fetchRcvrExpr. - 1 to: args size do: [:argIndex | - varName := args at: argIndex. - prolog addAll: - (self argConversionExprFor: varName stackIndex: args size - argIndex)]. - - "add success check to postlog" - postlog addAll: self checkSuccessExpr. - - "add instance variable fetches to prolog and instance variable stores to postlog" - 1 to: instVarList size do: [:varIndex | - varName := instVarList at: varIndex. - (instVarsUsed includes: varName) ifTrue: [ - locals add: varName. - prolog addAll: (self instVarGetExprFor: varName offset: varIndex - 1). - (varsAssignedTo includes: varName) ifTrue: [ - postlog addAll: (self instVarPutExprFor: varName offset: varIndex - 1)]]]. - prolog addAll: self checkSuccessExpr. - - locals addAllFirst: args. - locals addFirst: 'rcvr'. - args := args class new. - locals asSet size = locals size - ifFalse: [self error: 'local name conflicts with instance variable name']. - endsWithReturn := self endsWithReturn. - self fixUpReturns: primArgCount postlog: postlog. - - endsWithReturn - ifTrue: [parseTree setStatements: prolog, parseTree statements] - ifFalse: [ - postlog addAll: (self popArgsExpr: primArgCount). - parseTree setStatements: prolog, parseTree statements, postlog]. - ! Item was added: + ----- Method: JSMethod>>preparePrimitivePrologueShared:assigned: (in category 'primitive compilation') ----- + preparePrimitivePrologueShared: sharedInstVars assigned: assignedInstVars + "Add a prolog and postlog to a primitive method. The prolog copies any instance variables referenced by this primitive method into local variables. The postlog copies values of assigned-to variables back into the instance. The names of the new locals are added to the local variables list. + + The declarations dictionary defines the types of any non-integer variables (locals, arguments, or instance variables). In particular, it may specify the types: + + int * -- an array of 32-bit values (e.g., a BitMap) + short * -- an array of 16-bit values (e.g., a SoundBuffer) + char * -- an array of unsigned bytes (e.g., a String) + double -- a double precision floating point number (e.g., 3.14159) + + Undeclared variables are taken to be integers and will be converted from Smalltalk to C ints." + + "Current restrictions: + o method must not contain message sends + o method must not allocate objects + o method must not manipulate raw oops + o method cannot access class variables + o method can only return an integer" + + | prolog postlog instVarsUsed varsAssignedTo instVarList primArgCount varName endsWithReturn aClass | + selector == #setInterpreter: ifTrue:[self halt]. + aClass := definingClass. + prolog := OrderedCollection new. + postlog := OrderedCollection new. + instVarsUsed := self freeVariableReferences asSet union: sharedInstVars. + varsAssignedTo := self variablesAssignedTo asSet union: assignedInstVars. + instVarList := aClass allInstVarNames. + primArgCount := args size. + + "add receiver fetch and arg conversions to prolog" + prolog addAll: self fetchRcvrExpr. + 1 to: args size do: [:argIndex | + varName := args at: argIndex. + prolog addAll: + (self argConversionExprFor: varName stackIndex: args size - argIndex)]. + + "add success check to postlog" + postlog addAll: self checkSuccessExpr. + + "add instance variable fetches to prolog and instance variable stores to postlog" + 1 to: instVarList size do: [:varIndex | + varName := instVarList at: varIndex. + (instVarsUsed includes: varName) ifTrue: [ + "locals add: varName. -- since we do not inline, we cannot declare these local since they migth be used by inlined methods" + prolog addAll: (self instVarGetExprFor: varName offset: varIndex - 1). + (varsAssignedTo includes: varName) ifTrue: [ + postlog addAll: (self instVarPutExprFor: varName offset: varIndex - 1)]]]. + prolog addAll: self checkSuccessExpr. + + locals addAllFirst: args. + locals addFirst: 'rcvr'. + args := args class new. + locals asSet size = locals size + ifFalse: [self error: 'local name conflicts with instance variable name']. + endsWithReturn := self endsWithReturn. + self fixUpReturns: primArgCount postlog: postlog. + + endsWithReturn + ifTrue: [parseTree setStatements: prolog, parseTree statements] + ifFalse: [ + postlog addAll: (self popArgsExpr: primArgCount). + parseTree setStatements: prolog, parseTree statements, postlog]. + !

1 0

[commit][3105] CogVM source as per VMMaker.oscog-eem.903
by commits＠squeakvm.org 14 Oct '14

14 Oct '14

Revision: 3105 Author: eliot Date: 2014-10-14 12:54:42 -0700 (Tue, 14 Oct 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.903 Rewrite implicit receiver lookup logic to follow and fix up forwarding pointers. Fixes occasional failures to locate correct implicit receiver which manifest as MNUs. And follow in enclosingObjectAt:withObject:withMixin: Rename hiddenRootsObj: to setHiddenRootsObj: for clang. Modified Paths: -------------- branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-10-13 23:35:34 UTC (rev 3104) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-10-14 19:54:42 UTC (rev 3105) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.900 uuid: 3d11cf21-4f5f-406a-85ae-ccbc786612a0 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.902 uuid: e97518bb-4f81-470b-9557-6beed90a223c from - CoInterpreter VMMaker.oscog-eem.900 uuid: 3d11cf21-4f5f-406a-85ae-ccbc786612a0 + CoInterpreter VMMaker.oscog-eem.902 uuid: e97518bb-4f81-470b-9557-6beed90a223c */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.900 uuid: 3d11cf21-4f5f-406a-85ae-ccbc786612a0 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.902 uuid: e97518bb-4f81-470b-9557-6beed90a223c " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -861,7 +861,7 @@ static void addFreeSubTree(sqInt freeTree) NoDbgRegParms; sqInt addGCRoot(sqInt *varLoc); sqInt addressCouldBeObj(sqInt address); -static sqInt addressCouldBeOop(sqInt address) NoDbgRegParms; +sqInt addressCouldBeOop(sqInt address); static sqInt addToFreeTreebytes(sqInt freeChunk, sqInt chunkBytes) NoDbgRegParms; static sqInt allInstancesOf(sqInt aClass) NoDbgRegParms; static sqInt allObjects(void); @@ -969,6 +969,7 @@ static sqInt followForwardedInObjStackatIndex(sqInt objStack, sqInt objStackRootIndex) NoDbgRegParms; sqInt followForwardedObjectFieldstoDepth(sqInt objOop, sqInt depth); sqInt followForwarded(sqInt objOop); +static sqInt followObjFieldofObject(sqInt fieldIndex, sqInt anObject) NoDbgRegParms; sqInt formatMask(void); sqInt formatOfClass(sqInt classPointer); static sqInt formatOf(sqInt objOop) NoDbgRegParms; @@ -1083,6 +1084,7 @@ static sqInt noCheckClassAtIndex(sqInt classIndex) NoDbgRegParms; static sqInt noCheckPushonObjStack(sqInt objOop, sqInt objStack) NoDbgRegParms; static sqInt noFixupFollowFieldofObject(sqInt fieldIndex, sqInt anObject) NoDbgRegParms; +static sqInt noInlineFollowForwarded(sqInt objOop) NoDbgRegParms; sqInt nonIndexablePointerFormat(void); static sqInt noUnscannedEphemerons(void); sqInt numBytesOf(sqInt objOop); @@ -1243,6 +1245,7 @@ sqInt fetchIntegerofObject(sqInt fieldIndex, sqInt objectPointer); static sqInt fetchStackPointerOf(sqInt aContext) NoDbgRegParms; static sqInt findApplicationOfTargetMixinstartingAtBehavior(sqInt targetMixin, sqInt aBehavior) NoDbgRegParms; +static sqInt findApplicationOfTargetMixinstartingAtNonMetaClass(sqInt targetMixin, sqInt aClass) NoDbgRegParms; static sqInt findClassContainingMethodstartingAt(sqInt meth, sqInt classObj) NoDbgRegParms; sqInt findClassOfMethodforReceiver(sqInt meth, sqInt rcvr); static char * findFrameAboveinPage(char *theFP, StackPage *thePage) NoDbgRegParms; @@ -1506,8 +1509,8 @@ _iss usqInt freeStart; _iss sqInt argumentCount; _iss usqInt instructionPointer; +_iss sqInt messageSelector; _iss usqInt newMethod; -_iss sqInt messageSelector; _iss usqInt newSpaceLimit; _iss StackPage * pages; _iss sqInt hiddenRootsObj; @@ -1537,10 +1540,10 @@ _iss StackPage * mostRecentlyUsedPage; _iss sqInt numStackPages; _iss SpurNewSpaceSpace pastSpace; -_iss sqInt classTableFirstPage; _iss sqInt markStack; _iss sqInt numClassTablePages; _iss sqInt profileProcess; +_iss sqInt classTableFirstPage; _iss usqInt oldSpaceStart; _iss SpurNewSpaceSpace futureSpace; _iss sqInt longRunningPrimitiveCheckSemaphore; @@ -2322,7 +2325,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.900"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.902"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -15044,13 +15047,14 @@ /* frameless method; nothing to activate... */ - - /* dont use and: so as to get Slang to inline cogit numRegArgs > 0 */ + if ((numRegArgs()) > 0) { - if (((cogMethod->cmNumArgs)) <= (numRegArgs())) { - callRegisterArgCogMethodatreceiver(cogMethod, noCheckEntryOffset(), rcvr); + /* dont use and: so as to get Slang to inline cogit numRegArgs > 0 */ + + if (((cogMethod->cmNumArgs)) <= (numRegArgs())) { + callRegisterArgCogMethodatreceiver(cogMethod, noCheckEntryOffset(), rcvr); + } } - /* begin push: */ object = (((sqInt)cogMethod)) + (noCheckEntryOffset()); longAtput((sp = GIV(stackPointer) - BytesPerWord), object); @@ -18031,13 +18035,14 @@ assertCStackWellAligned(); assert(isMachineCodeFrame(GIV(framePointer))); assertValidExecutionPointersimbarline(longAt(GIV(stackPointer)), GIV(framePointer), GIV(stackPointer), 0, __LINE__); - - /* dont use and: so as to get Slang to inline cogit numRegArgs > 0 */ + if ((numRegArgs()) > 0) { - if (((cogMethod->cmNumArgs)) <= (numRegArgs())) { - callRegisterArgCogMethodatreceiver(cogMethod, entryOffset(), rcvr); + /* dont use and: so as to get Slang to inline cogit numRegArgs > 0 */ + + if (((cogMethod->cmNumArgs)) <= (numRegArgs())) { + callRegisterArgCogMethodatreceiver(cogMethod, entryOffset(), rcvr); + } } - /* begin push: */ object = (((sqInt)cogMethod)) + (entryOffset()); longAtput((sp = GIV(stackPointer) - BytesPerWord), object); @@ -18074,31 +18079,32 @@ object = (((sqInt)cogMethod)) + (entryOffset()); longAtput((sp1 = GIV(stackPointer) - BytesPerWord), object); GIV(stackPointer) = sp1; - - /* dont use and: so as to get Slang to inline cogit numRegArgs > 0 */ + if ((numRegArgs()) > 0) { - if (((cogMethod->cmNumArgs)) <= (numRegArgs())) { - /* begin push: */ - longAtput((sp = GIV(stackPointer) - BytesPerWord), cacheTag); - GIV(stackPointer) = sp; - - switch ((cogMethod->cmNumArgs)) { - case 0: - ceCall0ArgsPIC(); - break; - case 1: - ceCall1ArgsPIC(); - break; - case 2: - ceCall2ArgsPIC(); - break; - default: - null; + /* dont use and: so as to get Slang to inline cogit numRegArgs > 0 */ + if (((cogMethod->cmNumArgs)) <= (numRegArgs())) { + /* begin push: */ + longAtput((sp = GIV(stackPointer) - BytesPerWord), cacheTag); + GIV(stackPointer) = sp; + + switch ((cogMethod->cmNumArgs)) { + case 0: + ceCall0ArgsPIC(); + break; + case 1: + ceCall1ArgsPIC(); + break; + case 2: + ceCall2ArgsPIC(); + break; + default: + null; + + } + error("not reached"); } - error("not reached"); } - /* begin push: */ longAtput((sp2 = GIV(stackPointer) - BytesPerWord), rcvr); GIV(stackPointer) = sp2; @@ -18128,13 +18134,14 @@ assertCStackWellAligned(); assert(isMachineCodeFrame(GIV(framePointer))); assertValidExecutionPointersimbarline(longAt(GIV(stackPointer)), GIV(framePointer), GIV(stackPointer), 0, __LINE__); - - /* dont use and: so as to get Slang to inline cogit numRegArgs > 0 */ + if ((numRegArgs()) > 0) { - if (((cogMethod->cmNumArgs)) <= (numRegArgs())) { - callRegisterArgCogMethodatreceiver(cogMethod, noCheckEntryOffset(), rcvr); + /* dont use and: so as to get Slang to inline cogit numRegArgs > 0 */ + + if (((cogMethod->cmNumArgs)) <= (numRegArgs())) { + callRegisterArgCogMethodatreceiver(cogMethod, noCheckEntryOffset(), rcvr); + } } - /* begin push: */ object = (((sqInt)cogMethod)) + (noCheckEntryOffset()); longAtput((sp = GIV(stackPointer) - BytesPerWord), object); @@ -19024,9 +19031,7 @@ sqInt implicitReceiverFormixinimplementing(sqInt rcvr, sqInt mixin, sqInt selector) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt aClass; - sqInt classIndex; - sqInt classTablePage; + sqInt anObject; sqInt dictionary; sqInt dictionary1; sqInt found; @@ -19043,9 +19048,9 @@ sqInt mask1; sqInt methodArray; sqInt methodArray1; + sqInt mixin1; sqInt mixinApplication; sqInt mixinApplication1; - sqInt mixinOrMixinApplication; sqInt nextSelector; sqInt nextSelector1; usqInt numSlots; @@ -19056,13 +19061,16 @@ sqInt objOop12; sqInt objOop2; sqInt objOop21; + sqInt objOop22; sqInt objOop3; sqInt objOop31; + sqInt objOop32; sqInt objOop4; - sqInt objOop41; sqInt objOop5; sqInt objOop6; - sqInt tagBits; + sqInt objOop7; + sqInt objOop8; + sqInt objOop9; sqInt targetMixin; sqInt theMixin; sqInt theMixin1; @@ -19073,21 +19081,23 @@ /* begin sendBreakpoint:receiver: */ sendBreakpointreceiver(firstFixedFieldOfMaybeImmediate(selector), lengthOfMaybeImmediate(selector), null); } - - /* messageSelector is an implicit parameter of lookupMethodInDictionary: */ - - GIV(messageSelector) = selector; + assert(!((isOopForwarded(rcvr)))); + assert(!((isForwarded(mixin)))); + GIV(messageSelector) = (((selector & 3) == 0) + && (((longAt(selector)) & 0x3FFFFF) == 8) + ? noInlineFollowForwarded(selector) + : selector); mixinApplication = findApplicationOfTargetMixinstartingAtBehavior(mixin, fetchClassOf(rcvr)); if (mixinApplication == GIV(nilObj)) { return rcvr; } /* begin followObjField:ofObject: */ - objOop = longAt((mixinApplication + (BaseHeaderSize)) + (MethodDictionaryIndex << 2)); - assert(isNonImmediate(objOop)); - if (((longAt(objOop)) & (0x3FFFFF - 8)) == 0) { - objOop = fixFollowedFieldofObjectwithInitialValue(MethodDictionaryIndex, mixinApplication, objOop); + objOop7 = longAt((mixinApplication + (BaseHeaderSize)) + (MethodDictionaryIndex << 2)); + assert(isNonImmediate(objOop7)); + if (((longAt(objOop7)) & (0x3FFFFF - 8)) == 0) { + objOop7 = fixFollowedFieldofObjectwithInitialValue(MethodDictionaryIndex, mixinApplication, objOop7); } - dictionary = objOop; + dictionary = objOop7; /* begin lookupMethodInDictionary: */ /* begin numSlotsOf: */ flag("endianness"); @@ -19113,12 +19123,12 @@ } if (nextSelector1 == GIV(messageSelector)) { /* begin followObjField:ofObject: */ - objOop6 = longAt((dictionary + (BaseHeaderSize)) + (MethodArrayIndex << 2)); - assert(isNonImmediate(objOop6)); - if (((longAt(objOop6)) & (0x3FFFFF - 8)) == 0) { - objOop6 = fixFollowedFieldofObjectwithInitialValue(MethodArrayIndex, dictionary, objOop6); + objOop9 = longAt((dictionary + (BaseHeaderSize)) + (MethodArrayIndex << 2)); + assert(isNonImmediate(objOop9)); + if (((longAt(objOop9)) & (0x3FFFFF - 8)) == 0) { + objOop9 = fixFollowedFieldofObjectwithInitialValue(MethodArrayIndex, dictionary, objOop9); } - methodArray1 = objOop6; + methodArray1 = objOop9; /* begin followField:ofObject: */ objOop12 = longAt((methodArray1 + (BaseHeaderSize)) + (index1 << 2)); if (((objOop12 & 3) == 0) @@ -19127,12 +19137,12 @@ } GIV(newMethod) = ((sqInt) objOop12); found = 1; - goto l4; + goto l3; } index1 += 1; } found = 0; - goto l4; + goto l3; } /* It is assumed that there are some nils in this dictionary, and search will @@ -19144,14 +19154,13 @@ ? (GIV(messageSelector) >> 1) : ((usqInt) (((usqInt)GIV(messageSelector)))) >> 2) : (/* begin hashBitsOf: */ - (objOop41 = GIV(messageSelector)), - (hash1 = (longAt(objOop41 + 4)) & 0x3FFFFF), + (hash1 = (longAt(GIV(messageSelector) + 4)) & 0x3FFFFF), (hash1 == 0 ? ((hash1 = (newObjectHash()) & 0x3FFFFF), /* begin setHashBitsOf:to: */ flag("endianness"), assert(((hash1 >= 0) && (hash1 <= (identityHashHalfWordMask())))), - longAtput(objOop41 + 4, ((((longAt(objOop41 + 4)) | 0x3FFFFF) - 0x3FFFFF)) + hash1)) + longAtput(GIV(messageSelector) + 4, ((((longAt(GIV(messageSelector) + 4)) | 0x3FFFFF) - 0x3FFFFF)) + hash1)) : 0), hash1)))); wrapAround1 = 0; @@ -19159,7 +19168,7 @@ nextSelector1 = longAt((dictionary + (BaseHeaderSize)) + (index1 << 2)); if (nextSelector1 == GIV(nilObj)) { found = 0; - goto l4; + goto l3; } if (((nextSelector1 & 3) == 0) && (((longAt(nextSelector1)) & 0x3FFFFF) == 8)) { @@ -19167,39 +19176,61 @@ } if (nextSelector1 == GIV(messageSelector)) { /* begin followObjField:ofObject: */ - objOop21 = longAt((dictionary + (BaseHeaderSize)) + (MethodArrayIndex << 2)); - assert(isNonImmediate(objOop21)); - if (((longAt(objOop21)) & (0x3FFFFF - 8)) == 0) { - objOop21 = fixFollowedFieldofObjectwithInitialValue(MethodArrayIndex, dictionary, objOop21); + objOop22 = longAt((dictionary + (BaseHeaderSize)) + (MethodArrayIndex << 2)); + assert(isNonImmediate(objOop22)); + if (((longAt(objOop22)) & (0x3FFFFF - 8)) == 0) { + objOop22 = fixFollowedFieldofObjectwithInitialValue(MethodArrayIndex, dictionary, objOop22); } - methodArray1 = objOop21; + methodArray1 = objOop22; /* begin followField:ofObject: */ - objOop31 = longAt((methodArray1 + (BaseHeaderSize)) + ((index1 - SelectorStart) << 2)); - if (((objOop31 & 3) == 0) - && (((longAt(objOop31)) & 0x3FFFFF) == 8)) { - objOop31 = fixFollowedFieldofObjectwithInitialValue(index1 - SelectorStart, methodArray1, objOop31); + objOop32 = longAt((methodArray1 + (BaseHeaderSize)) + ((index1 - SelectorStart) << 2)); + if (((objOop32 & 3) == 0) + && (((longAt(objOop32)) & 0x3FFFFF) == 8)) { + objOop32 = fixFollowedFieldofObjectwithInitialValue(index1 - SelectorStart, methodArray1, objOop32); } - GIV(newMethod) = ((sqInt) objOop31); + GIV(newMethod) = ((sqInt) objOop32); found = 1; - goto l4; + goto l3; } index1 += 1; if (index1 == length1) { if (wrapAround1) { found = 0; - goto l4; + goto l3; } wrapAround1 = 1; index1 = SelectorStart; } } found = 0; -l4: /* end lookupMethodInDictionary: */; +l3: /* end lookupMethodInDictionary: */; if (!found) { - theMixin = longAt((mixinApplication + (BaseHeaderSize)) + (MixinIndex << 2)); + /* begin followObjField:ofObject: */ + objOop4 = longAt((mixinApplication + (BaseHeaderSize)) + (MixinIndex << 2)); + assert(isNonImmediate(objOop4)); + if (((longAt(objOop4)) & (0x3FFFFF - 8)) == 0) { + objOop4 = fixFollowedFieldofObjectwithInitialValue(MixinIndex, mixinApplication, objOop4); + } + theMixin = objOop4; /* begin nextImplicitReceiverFor:withMixin: */ - implicitReceiver = longAt((mixinApplication + (BaseHeaderSize)) + (EnclosingObjectIndex << 2)); - targetMixin = longAt((theMixin + (BaseHeaderSize)) + (EnclosingMixinIndex << 2)); + /* begin followObjField:ofObject: */ + objOop5 = longAt((mixinApplication + (BaseHeaderSize)) + (EnclosingObjectIndex << 2)); + assert(isNonImmediate(objOop5)); + if (((longAt(objOop5)) & (0x3FFFFF - 8)) == 0) { + objOop5 = fixFollowedFieldofObjectwithInitialValue(EnclosingObjectIndex, mixinApplication, objOop5); + } + anObject = objOop5; + /* begin followObjField:ofObject: */ + objOop6 = longAt((theMixin + (BaseHeaderSize)) + (EnclosingMixinIndex << 2)); + assert(isNonImmediate(objOop6)); + if (((longAt(objOop6)) & (0x3FFFFF - 8)) == 0) { + objOop6 = fixFollowedFieldofObjectwithInitialValue(EnclosingMixinIndex, theMixin, objOop6); + } + mixin1 = objOop6; + assert(!((isOopForwarded(anObject)))); + assert(!((isForwarded(mixin1)))); + implicitReceiver = anObject; + targetMixin = mixin1; while (1) { if (targetMixin == GIV(nilObj)) { @@ -19208,53 +19239,18 @@ implicitReceiverOrNil = GIV(nilObj); goto l1; } - /* begin findApplicationOfTargetMixin:startingAtNonMetaClass: */ - /* begin fetchClassOf: */ - if (((tagBits = implicitReceiver & 3)) != 0) { - aClass = longAt((GIV(classTableFirstPage) + (BaseHeaderSize)) + (tagBits << 2)); - goto l2; - } - /* begin fetchClassOfNonImm: */ - classIndex = (longAt(implicitReceiver)) & 0x3FFFFF; - if (classIndex <= 0x1F) { - if (classIndex == 0x1F) { - aClass = implicitReceiver; - goto l2; - } - if (classIndex == 8) { - aClass = GIV(nilObj); - goto l2; - } - } - assert(classIndex >= (arrayClassIndexPun())); - /* begin classOrNilAtIndex: */ - assert((classIndex <= (tagMask())) - || (classIndex >= (arrayClassIndexPun()))); - classTablePage = longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + ((((usqInt) classIndex) >> 10) << 2)); - if (classTablePage == GIV(nilObj)) { - aClass = GIV(nilObj); - goto l2; - } - aClass = longAt((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2)); - l2: /* end fetchClassOf: */; - mixinOrMixinApplication = aClass; - while (!((mixinOrMixinApplication == GIV(nilObj)) - || ((mixinOrMixinApplication == targetMixin) - || ((longAt((mixinOrMixinApplication + (BaseHeaderSize)) + (MixinIndex << 2))) == targetMixin)))) { - mixinOrMixinApplication = longAt((mixinOrMixinApplication + (BaseHeaderSize)) + (SuperclassIndex << 2)); - } - mixinApplication1 = mixinOrMixinApplication; + mixinApplication1 = findApplicationOfTargetMixinstartingAtNonMetaClass(targetMixin, fetchClassOf(implicitReceiver)); if (mixinApplication1 == GIV(nilObj)) { implicitReceiverOrNil = GIV(nilObj); goto l1; } /* begin followObjField:ofObject: */ - objOop1 = longAt((mixinApplication1 + (BaseHeaderSize)) + (MethodDictionaryIndex << 2)); - assert(isNonImmediate(objOop1)); - if (((longAt(objOop1)) & (0x3FFFFF - 8)) == 0) { - objOop1 = fixFollowedFieldofObjectwithInitialValue(MethodDictionaryIndex, mixinApplication1, objOop1); + objOop = longAt((mixinApplication1 + (BaseHeaderSize)) + (MethodDictionaryIndex << 2)); + assert(isNonImmediate(objOop)); + if (((longAt(objOop)) & (0x3FFFFF - 8)) == 0) { + objOop = fixFollowedFieldofObjectwithInitialValue(MethodDictionaryIndex, mixinApplication1, objOop); } - dictionary1 = objOop1; + dictionary1 = objOop; /* begin lookupMethodInDictionary: */ /* begin numSlotsOf: */ flag("endianness"); @@ -19280,12 +19276,12 @@ } if (nextSelector == GIV(messageSelector)) { /* begin followObjField:ofObject: */ - objOop5 = longAt((dictionary1 + (BaseHeaderSize)) + (MethodArrayIndex << 2)); - assert(isNonImmediate(objOop5)); - if (((longAt(objOop5)) & (0x3FFFFF - 8)) == 0) { - objOop5 = fixFollowedFieldofObjectwithInitialValue(MethodArrayIndex, dictionary1, objOop5); + objOop8 = longAt((dictionary1 + (BaseHeaderSize)) + (MethodArrayIndex << 2)); + assert(isNonImmediate(objOop8)); + if (((longAt(objOop8)) & (0x3FFFFF - 8)) == 0) { + objOop8 = fixFollowedFieldofObjectwithInitialValue(MethodArrayIndex, dictionary1, objOop8); } - methodArray = objOop5; + methodArray = objOop8; /* begin followField:ofObject: */ objOop11 = longAt((methodArray + (BaseHeaderSize)) + (index << 2)); if (((objOop11 & 3) == 0) @@ -19294,12 +19290,12 @@ } GIV(newMethod) = ((sqInt) objOop11); found1 = 1; - goto l3; + goto l2; } index += 1; } found1 = 0; - goto l3; + goto l2; } /* It is assumed that there are some nils in this dictionary, and search will @@ -19311,14 +19307,13 @@ ? (GIV(messageSelector) >> 1) : ((usqInt) (((usqInt)GIV(messageSelector)))) >> 2) : (/* begin hashBitsOf: */ - (objOop4 = GIV(messageSelector)), - (hash = (longAt(objOop4 + 4)) & 0x3FFFFF), + (hash = (longAt(GIV(messageSelector) + 4)) & 0x3FFFFF), (hash == 0 ? ((hash = (newObjectHash()) & 0x3FFFFF), /* begin setHashBitsOf:to: */ flag("endianness"), assert(((hash >= 0) && (hash <= (identityHashHalfWordMask())))), - longAtput(objOop4 + 4, ((((longAt(objOop4 + 4)) | 0x3FFFFF) - 0x3FFFFF)) + hash)) + longAtput(GIV(messageSelector) + 4, ((((longAt(GIV(messageSelector) + 4)) | 0x3FFFFF) - 0x3FFFFF)) + hash)) : 0), hash)))); wrapAround = 0; @@ -19326,7 +19321,7 @@ nextSelector = longAt((dictionary1 + (BaseHeaderSize)) + (index << 2)); if (nextSelector == GIV(nilObj)) { found1 = 0; - goto l3; + goto l2; } if (((nextSelector & 3) == 0) && (((longAt(nextSelector)) & 0x3FFFFF) == 8)) { @@ -19334,42 +19329,60 @@ } if (nextSelector == GIV(messageSelector)) { /* begin followObjField:ofObject: */ - objOop2 = longAt((dictionary1 + (BaseHeaderSize)) + (MethodArrayIndex << 2)); - assert(isNonImmediate(objOop2)); - if (((longAt(objOop2)) & (0x3FFFFF - 8)) == 0) { - objOop2 = fixFollowedFieldofObjectwithInitialValue(MethodArrayIndex, dictionary1, objOop2); + objOop21 = longAt((dictionary1 + (BaseHeaderSize)) + (MethodArrayIndex << 2)); + assert(isNonImmediate(objOop21)); + if (((longAt(objOop21)) & (0x3FFFFF - 8)) == 0) { + objOop21 = fixFollowedFieldofObjectwithInitialValue(MethodArrayIndex, dictionary1, objOop21); } - methodArray = objOop2; + methodArray = objOop21; /* begin followField:ofObject: */ - objOop3 = longAt((methodArray + (BaseHeaderSize)) + ((index - SelectorStart) << 2)); - if (((objOop3 & 3) == 0) - && (((longAt(objOop3)) & 0x3FFFFF) == 8)) { - objOop3 = fixFollowedFieldofObjectwithInitialValue(index - SelectorStart, methodArray, objOop3); + objOop31 = longAt((methodArray + (BaseHeaderSize)) + ((index - SelectorStart) << 2)); + if (((objOop31 & 3) == 0) + && (((longAt(objOop31)) & 0x3FFFFF) == 8)) { + objOop31 = fixFollowedFieldofObjectwithInitialValue(index - SelectorStart, methodArray, objOop31); } - GIV(newMethod) = ((sqInt) objOop3); + GIV(newMethod) = ((sqInt) objOop31); found1 = 1; - goto l3; + goto l2; } index += 1; if (index == length) { if (wrapAround) { found1 = 0; - goto l3; + goto l2; } wrapAround = 1; index = SelectorStart; } } found1 = 0; - l3: /* end lookupMethodInDictionary: */; + l2: /* end lookupMethodInDictionary: */; if (found1) break; - implicitReceiver = longAt((mixinApplication1 + (BaseHeaderSize)) + (EnclosingObjectIndex << 2)); - theMixin1 = longAt((mixinApplication1 + (BaseHeaderSize)) + (MixinIndex << 2)); + /* begin followObjField:ofObject: */ + objOop1 = longAt((mixinApplication1 + (BaseHeaderSize)) + (EnclosingObjectIndex << 2)); + assert(isNonImmediate(objOop1)); + if (((longAt(objOop1)) & (0x3FFFFF - 8)) == 0) { + objOop1 = fixFollowedFieldofObjectwithInitialValue(EnclosingObjectIndex, mixinApplication1, objOop1); + } + implicitReceiver = objOop1; + /* begin followObjField:ofObject: */ + objOop2 = longAt((mixinApplication1 + (BaseHeaderSize)) + (MixinIndex << 2)); + assert(isNonImmediate(objOop2)); + if (((longAt(objOop2)) & (0x3FFFFF - 8)) == 0) { + objOop2 = fixFollowedFieldofObjectwithInitialValue(MixinIndex, mixinApplication1, objOop2); + } + theMixin1 = objOop2; if (theMixin1 == GIV(nilObj)) { implicitReceiverOrNil = GIV(nilObj); goto l1; } - targetMixin = longAt((theMixin1 + (BaseHeaderSize)) + (EnclosingMixinIndex << 2)); + /* begin followObjField:ofObject: */ + objOop3 = longAt((theMixin1 + (BaseHeaderSize)) + (EnclosingMixinIndex << 2)); + assert(isNonImmediate(objOop3)); + if (((longAt(objOop3)) & (0x3FFFFF - 8)) == 0) { + objOop3 = fixFollowedFieldofObjectwithInitialValue(EnclosingMixinIndex, theMixin1, objOop3); + } + targetMixin = objOop3; } implicitReceiverOrNil = implicitReceiver; l1: /* end nextImplicitReceiverFor:withMixin: */; @@ -40942,7 +40955,11 @@ && (oopisGreaterThanOrEqualToandLessThan(address, ((futureSpace()).start), futureSurvivorStart())))))); } -static sqInt + +/* Answer if address appears to be that of either an immediate or an object. + For code disassembly and assertions. */ + +sqInt addressCouldBeOop(sqInt address) { return ((address & 3) != 0) @@ -46346,6 +46363,24 @@ } +/* Make sure the obj at fieldIndex in anObject is not forwarded (follow the + forwarder there-in if so). Answer the (possibly followed) obj at + fieldIndex. */ + +static sqInt +followObjFieldofObject(sqInt fieldIndex, sqInt anObject) +{ + sqInt objOop; + + objOop = longAt((anObject + (BaseHeaderSize)) + (fieldIndex << 2)); + assert(isNonImmediate(objOop)); + if (((longAt(objOop)) & (0x3FFFFF - 8)) == 0) { + objOop = fixFollowedFieldofObjectwithInitialValue(fieldIndex, anObject, objOop); + } + return objOop; +} + + /* 0 = 0 sized objects (UndefinedObject True False et al) 1 = non-indexable objects with inst vars (Point et al) 2 = indexable objects with no inst vars (Array et al) @@ -47245,7 +47280,7 @@ assert(GIV(falseObj) == (objectAfter(GIV(nilObj)))); assert(GIV(trueObj) == (objectAfter(GIV(falseObj)))); freeListObj = objectAfter(GIV(trueObj)); - /* begin hiddenRootsObj: */ + /* begin setHiddenRootsObj: */ anOop = objectAfter(freeListObj); GIV(hiddenRootsObj) = anOop; assert(validClassTableRootPages()); @@ -47260,7 +47295,7 @@ } } GIV(classTableIndex) = 1 << 10; -l1: /* end hiddenRootsObj: */; +l1: /* end setHiddenRootsObj: */; GIV(markStack) = swizzleObjStackAt(MarkStackRootIndex); GIV(weaklingStack) = swizzleObjStackAt(WeaklingStackRootIndex); GIV(ephemeronQueue) = swizzleObjStackAt(EphemeronQueueRootIndex); @@ -49917,6 +49952,21 @@ return objOop; } +static sqInt +noInlineFollowForwarded(sqInt objOop) +{ + sqInt referent; + + /* begin followForwarded: */ + assert(isUnambiguouslyForwarder(objOop)); + referent = longAt((objOop + (BaseHeaderSize)) + (0 << 2)); + while (((referent & 3) == 0) + && (((longAt(referent)) & 0x3FFFFF) == 8)) { + referent = longAt((referent + (BaseHeaderSize)) + (0 << 2)); + } + return referent; +} + sqInt nonIndexablePointerFormat(void) { @@ -55148,14 +55198,9 @@ static sqInt enclosingObjectAtwithObjectwithMixin(sqInt n, sqInt anObject, sqInt mixin) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt aClass; - sqInt classIndex; - sqInt classTablePage; sqInt count; sqInt enclosingObject; sqInt mixinApplication; - sqInt mixinOrMixinApplication; - sqInt tagBits; sqInt targetMixin; enclosingObject = anObject; @@ -55167,42 +55212,7 @@ || (enclosingObject == GIV(nilObj))) { return GIV(nilObj); } - /* begin findApplicationOfTargetMixin:startingAtNonMetaClass: */ - /* begin fetchClassOf: */ - if (((tagBits = enclosingObject & 3)) != 0) { - aClass = longAt((GIV(classTableFirstPage) + (BaseHeaderSize)) + (tagBits << 2)); - goto l1; - } - /* begin fetchClassOfNonImm: */ - classIndex = (longAt(enclosingObject)) & 0x3FFFFF; - if (classIndex <= 0x1F) { - if (classIndex == 0x1F) { - aClass = enclosingObject; - goto l1; - } - if (classIndex == 8) { - aClass = GIV(nilObj); - goto l1; - } - } - assert(classIndex >= (arrayClassIndexPun())); - /* begin classOrNilAtIndex: */ - assert((classIndex <= (tagMask())) - || (classIndex >= (arrayClassIndexPun()))); - classTablePage = longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + ((((usqInt) classIndex) >> 10) << 2)); - if (classTablePage == GIV(nilObj)) { - aClass = GIV(nilObj); - goto l1; - } - aClass = longAt((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2)); - l1: /* end fetchClassOf: */; - mixinOrMixinApplication = aClass; - while (!((mixinOrMixinApplication == GIV(nilObj)) - || ((mixinOrMixinApplication == targetMixin) - || ((longAt((mixinOrMixinApplication + (BaseHeaderSize)) + (MixinIndex << 2))) == targetMixin)))) { - mixinOrMixinApplication = longAt((mixinOrMixinApplication + (BaseHeaderSize)) + (SuperclassIndex << 2)); - } - mixinApplication = mixinOrMixinApplication; + mixinApplication = findApplicationOfTargetMixinstartingAtNonMetaClass(targetMixin, fetchClassOf(enclosingObject)); if (mixinApplication == GIV(nilObj)) { return GIV(nilObj); } @@ -56087,7 +56097,40 @@ return mixinOrMixinApplication; } + +/* This is used to implement the innards of the pushImplicitReceiverBytecode, + used for outer sends in NS2/NS3. Find the MixinApplcation of which aClass + is a subclass that is an application of targetMixin. This is an + implementation derived from + + <ContextPart> findApplicationOfTargetMixin: targetMixin + startingAtNonMetaClass: aClass + */ + static sqInt +findApplicationOfTargetMixinstartingAtNonMetaClass(sqInt targetMixin, sqInt aClass) +{ DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt mixinOrMixinApplication; + sqInt objOop; + + assert(!((isForwarded(targetMixin)))); + assert(!((isForwarded(aClass)))); + mixinOrMixinApplication = aClass; + while (!((mixinOrMixinApplication == GIV(nilObj)) + || ((mixinOrMixinApplication == targetMixin) + || ((followObjFieldofObject(MixinIndex, mixinOrMixinApplication)) == targetMixin)))) { + /* begin followObjField:ofObject: */ + objOop = longAt((mixinOrMixinApplication + (BaseHeaderSize)) + (SuperclassIndex << 2)); + assert(isNonImmediate(objOop)); + if (((longAt(objOop)) & (0x3FFFFF - 8)) == 0) { + objOop = fixFollowedFieldofObjectwithInitialValue(SuperclassIndex, mixinOrMixinApplication, objOop); + } + mixinOrMixinApplication = objOop; + } + return mixinOrMixinApplication; +} + +static sqInt findClassContainingMethodstartingAt(sqInt meth, sqInt classObj) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt classDict; @@ -58101,7 +58144,6 @@ sqInt objOop2; sqInt objOop3; sqInt objOop4; - sqInt objOop5; sqInt wrapAround; assert(addressCouldBeClassObj(class)); @@ -58150,12 +58192,12 @@ } if (nextSelector == GIV(messageSelector)) { /* begin followObjField:ofObject: */ - objOop5 = longAt((dictionary + (BaseHeaderSize)) + (MethodArrayIndex << 2)); - assert(isNonImmediate(objOop5)); - if (((longAt(objOop5)) & (0x3FFFFF - 8)) == 0) { - objOop5 = fixFollowedFieldofObjectwithInitialValue(MethodArrayIndex, dictionary, objOop5); + objOop4 = longAt((dictionary + (BaseHeaderSize)) + (MethodArrayIndex << 2)); + assert(isNonImmediate(objOop4)); + if (((longAt(objOop4)) & (0x3FFFFF - 8)) == 0) { + objOop4 = fixFollowedFieldofObjectwithInitialValue(MethodArrayIndex, dictionary, objOop4); } - methodArray = objOop5; + methodArray = objOop4; /* begin followField:ofObject: */ objOop11 = longAt((methodArray + (BaseHeaderSize)) + (index << 2)); if (((objOop11 & 3) == 0) @@ -58181,14 +58223,13 @@ ? (GIV(messageSelector) >> 1) : ((usqInt) (((usqInt)GIV(messageSelector)))) >> 2) : (/* begin hashBitsOf: */ - (objOop4 = GIV(messageSelector)), - (hash = (longAt(objOop4 + 4)) & 0x3FFFFF), + (hash = (longAt(GIV(messageSelector) + 4)) & 0x3FFFFF), (hash == 0 ? ((hash = (newObjectHash()) & 0x3FFFFF), /* begin setHashBitsOf:to: */ flag("endianness"), assert(((hash >= 0) && (hash <= (identityHashHalfWordMask())))), - longAtput(objOop4 + 4, ((((longAt(objOop4 + 4)) | 0x3FFFFF) - 0x3FFFFF)) + hash)) + longAtput(GIV(messageSelector) + 4, ((((longAt(GIV(messageSelector) + 4)) | 0x3FFFFF) - 0x3FFFFF)) + hash)) : 0), hash)))); wrapAround = 0; @@ -58277,7 +58318,6 @@ sqInt objOop4; sqInt objOop5; sqInt objOop6; - sqInt objOop7; sqInt wrapAround1; currentClass = class; @@ -58352,14 +58392,13 @@ ? (GIV(messageSelector) >> 1) : ((usqInt) (((usqInt)GIV(messageSelector)))) >> 2) : (/* begin hashBitsOf: */ - (objOop7 = GIV(messageSelector)), - (hash = (longAt(objOop7 + 4)) & 0x3FFFFF), + (hash = (longAt(GIV(messageSelector) + 4)) & 0x3FFFFF), (hash == 0 ? ((hash = (newObjectHash()) & 0x3FFFFF), /* begin setHashBitsOf:to: */ flag("endianness"), assert(((hash >= 0) && (hash <= (identityHashHalfWordMask())))), - longAtput(objOop7 + 4, ((((longAt(objOop7 + 4)) | 0x3FFFFF) - 0x3FFFFF)) + hash)) + longAtput(GIV(messageSelector) + 4, ((((longAt(GIV(messageSelector) + 4)) | 0x3FFFFF) - 0x3FFFFF)) + hash)) : 0), hash)))); wrapAround1 = 0; Modified: branches/Cog/nsspursrc/vm/cointerp.h =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.h 2014-10-13 23:35:34 UTC (rev 3104) +++ branches/Cog/nsspursrc/vm/cointerp.h 2014-10-14 19:54:42 UTC (rev 3105) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.900 uuid: 3d11cf21-4f5f-406a-85ae-ccbc786612a0 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.902 uuid: e97518bb-4f81-470b-9557-6beed90a223c */ @@ -140,6 +140,7 @@ sqInt remember(sqInt objOop); sqInt addGCRoot(sqInt *varLoc); sqInt addressCouldBeObj(sqInt address); +sqInt addressCouldBeOop(sqInt address); sqInt allocatePinnedSlots(sqInt nSlots); sqInt arrayFormat(void); sqInt becomewith(sqInt array1, sqInt array2); Modified: branches/Cog/nsspursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-10-13 23:35:34 UTC (rev 3104) +++ branches/Cog/nsspursrc/vm/gcc3x-cointerp.c 2014-10-14 19:54:42 UTC (rev 3105) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.900 uuid: 3d11cf21-4f5f-406a-85ae-ccbc786612a0 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.902 uuid: e97518bb-4f81-470b-9557-6beed90a223c from - CoInterpreter VMMaker.oscog-eem.900 uuid: 3d11cf21-4f5f-406a-85ae-ccbc786612a0 + CoInterpreter VMMaker.oscog-eem.902 uuid: e97518bb-4f81-470b-9557-6beed90a223c */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.900 uuid: 3d11cf21-4f5f-406a-85ae-ccbc786612a0 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.902 uuid: e97518bb-4f81-470b-9557-6beed90a223c " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -864,7 +864,7 @@ static void addFreeSubTree(sqInt freeTree) NoDbgRegParms; sqInt addGCRoot(sqInt *varLoc); sqInt addressCouldBeObj(sqInt address); -static sqInt addressCouldBeOop(sqInt address) NoDbgRegParms; +sqInt addressCouldBeOop(sqInt address); static sqInt addToFreeTreebytes(sqInt freeChunk, sqInt chunkBytes) NoDbgRegParms; static sqInt allInstancesOf(sqInt aClass) NoDbgRegParms; static sqInt allObjects(void); @@ -972,6 +972,7 @@ static sqInt followForwardedInObjStackatIndex(sqInt objStack, sqInt objStackRootIndex) NoDbgRegParms; sqInt followForwardedObjectFieldstoDepth(sqInt objOop, sqInt depth); sqInt followForwarded(sqInt objOop); +static sqInt followObjFieldofObject(sqInt fieldIndex, sqInt anObject) NoDbgRegParms; sqInt formatMask(void); sqInt formatOfClass(sqInt classPointer); static sqInt formatOf(sqInt objOop) NoDbgRegParms; @@ -1086,6 +1087,7 @@ static sqInt noCheckClassAtIndex(sqInt classIndex) NoDbgRegParms; static sqInt noCheckPushonObjStack(sqInt objOop, sqInt objStack) NoDbgRegParms; static sqInt noFixupFollowFieldofObject(sqInt fieldIndex, sqInt anObject) NoDbgRegParms; +static sqInt noInlineFollowForwarded(sqInt objOop) NoDbgRegParms; sqInt nonIndexablePointerFormat(void); static sqInt noUnscannedEphemerons(void); sqInt numBytesOf(sqInt objOop); @@ -1246,6 +1248,7 @@ sqInt fetchIntegerofObject(sqInt fieldIndex, sqInt objectPointer); static sqInt fetchStackPointerOf(sqInt aContext) NoDbgRegParms; static sqInt findApplicationOfTargetMixinstartingAtBehavior(sqInt targetMixin, sqInt aBehavior) NoDbgRegParms; +static sqInt findApplicationOfTargetMixinstartingAtNonMetaClass(sqInt targetMixin, sqInt aClass) NoDbgRegParms; static sqInt findClassContainingMethodstartingAt(sqInt meth, sqInt classObj) NoDbgRegParms; sqInt findClassOfMethodforReceiver(sqInt meth, sqInt rcvr); static char * findFrameAboveinPage(char *theFP, StackPage *thePage) NoDbgRegParms; @@ -1509,8 +1512,8 @@ _iss usqInt freeStart; _iss sqInt argumentCount; _iss usqInt instructionPointer; +_iss sqInt messageSelector; _iss usqInt newMethod; -_iss sqInt messageSelector; _iss usqInt newSpaceLimit; _iss StackPage * pages; _iss sqInt hiddenRootsObj; @@ -1540,10 +1543,10 @@ _iss StackPage * mostRecentlyUsedPage; _iss sqInt numStackPages; _iss SpurNewSpaceSpace pastSpace; -_iss sqInt classTableFirstPage; _iss sqInt markStack; _iss sqInt numClassTablePages; _iss sqInt profileProcess; +_iss sqInt classTableFirstPage; _iss usqInt oldSpaceStart; _iss SpurNewSpaceSpace futureSpace; _iss sqInt longRunningPrimitiveCheckSemaphore; @@ -2325,7 +2328,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.900"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreterPrimitives_VMMaker.oscog-eem.902"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 40 */; volatile int sendTrace; @@ -15053,13 +15056,14 @@ /* frameless method; nothing to activate... */ - - /* dont use and: so as to get Slang to inline cogit numRegArgs > 0 */ + if ((numRegArgs()) > 0) { - if (((cogMethod->cmNumArgs)) <= (numRegArgs())) { - callRegisterArgCogMethodatreceiver(cogMethod, noCheckEntryOffset(), rcvr); + /* dont use and: so as to get Slang to inline cogit numRegArgs > 0 */ + + if (((cogMethod->cmNumArgs)) <= (numRegArgs())) { + callRegisterArgCogMethodatreceiver(cogMethod, noCheckEntryOffset(), rcvr); + } } - /* begin push: */ object = (((sqInt)cogMethod)) + (noCheckEntryOffset()); longAtput((sp = GIV(stackPointer) - BytesPerWord), object); @@ -18040,13 +18044,14 @@ assertCStackWellAligned(); assert(isMachineCodeFrame(GIV(framePointer))); assertValidExecutionPointersimbarline(longAt(GIV(stackPointer)), GIV(framePointer), GIV(stackPointer), 0, __LINE__); - - /* dont use and: so as to get Slang to inline cogit numRegArgs > 0 */ + if ((numRegArgs()) > 0) { - if (((cogMethod->cmNumArgs)) <= (numRegArgs())) { - callRegisterArgCogMethodatreceiver(cogMethod, entryOffset(), rcvr); + /* dont use and: so as to get Slang to inline cogit numRegArgs > 0 */ + + if (((cogMethod->cmNumArgs)) <= (numRegArgs())) { + callRegisterArgCogMethodatreceiver(cogMethod, entryOffset(), rcvr); + } } - /* begin push: */ object = (((sqInt)cogMethod)) + (entryOffset()); longAtput((sp = GIV(stackPointer) - BytesPerWord), object); @@ -18083,31 +18088,32 @@ object = (((sqInt)cogMethod)) + (entryOffset()); longAtput((sp1 = GIV(stackPointer) - BytesPerWord), object); GIV(stackPointer) = sp1; - - /* dont use and: so as to get Slang to inline cogit numRegArgs > 0 */ + if ((numRegArgs()) > 0) { - if (((cogMethod->cmNumArgs)) <= (numRegArgs())) { - /* begin push: */ - longAtput((sp = GIV(stackPointer) - BytesPerWord), cacheTag); - GIV(stackPointer) = sp; - - switch ((cogMethod->cmNumArgs)) { - case 0: - ceCall0ArgsPIC(); - break; - case 1: - ceCall1ArgsPIC(); - break; - case 2: - ceCall2ArgsPIC(); - break; - default: - null; + /* dont use and: so as to get Slang to inline cogit numRegArgs > 0 */ + if (((cogMethod->cmNumArgs)) <= (numRegArgs())) { + /* begin push: */ + longAtput((sp = GIV(stackPointer) - BytesPerWord), cacheTag); + GIV(stackPointer) = sp; + + switch ((cogMethod->cmNumArgs)) { + case 0: + ceCall0ArgsPIC(); + break; + case 1: + ceCall1ArgsPIC(); + break; + case 2: + ceCall2ArgsPIC(); + break; + default: + null; + + } + error("not reached"); } - error("not reached"); } - /* begin push: */ longAtput((sp2 = GIV(stackPointer) - BytesPerWord), rcvr); GIV(stackPointer) = sp2; @@ -18137,13 +18143,14 @@ assertCStackWellAligned(); assert(isMachineCodeFrame(GIV(framePointer))); assertValidExecutionPointersimbarline(longAt(GIV(stackPointer)), GIV(framePointer), GIV(stackPointer), 0, __LINE__); - - /* dont use and: so as to get Slang to inline cogit numRegArgs > 0 */ + if ((numRegArgs()) > 0) { - if (((cogMethod->cmNumArgs)) <= (numRegArgs())) { - callRegisterArgCogMethodatreceiver(cogMethod, noCheckEntryOffset(), rcvr); + /* dont use and: so as to get Slang to inline cogit numRegArgs > 0 */ + + if (((cogMethod->cmNumArgs)) <= (numRegArgs())) { + callRegisterArgCogMethodatreceiver(cogMethod, noCheckEntryOffset(), rcvr); + } } - /* begin push: */ object = (((sqInt)cogMethod)) + (noCheckEntryOffset()); longAtput((sp = GIV(stackPointer) - BytesPerWord), object); @@ -19033,9 +19040,7 @@ sqInt implicitReceiverFormixinimplementing(sqInt rcvr, sqInt mixin, sqInt selector) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt aClass; - sqInt classIndex; - sqInt classTablePage; + sqInt anObject; sqInt dictionary; sqInt dictionary1; sqInt found; @@ -19052,9 +19057,9 @@ sqInt mask1; sqInt methodArray; sqInt methodArray1; + sqInt mixin1; sqInt mixinApplication; sqInt mixinApplication1; - sqInt mixinOrMixinApplication; sqInt nextSelector; sqInt nextSelector1; usqInt numSlots; @@ -19065,13 +19070,16 @@ sqInt objOop12; sqInt objOop2; sqInt objOop21; + sqInt objOop22; sqInt objOop3; sqInt objOop31; + sqInt objOop32; sqInt objOop4; - sqInt objOop41; sqInt objOop5; sqInt objOop6; - sqInt tagBits; + sqInt objOop7; + sqInt objOop8; + sqInt objOop9; sqInt targetMixin; sqInt theMixin; sqInt theMixin1; @@ -19082,21 +19090,23 @@ /* begin sendBreakpoint:receiver: */ sendBreakpointreceiver(firstFixedFieldOfMaybeImmediate(selector), lengthOfMaybeImmediate(selector), null); } - - /* messageSelector is an implicit parameter of lookupMethodInDictionary: */ - - GIV(messageSelector) = selector; + assert(!((isOopForwarded(rcvr)))); + assert(!((isForwarded(mixin)))); + GIV(messageSelector) = (((selector & 3) == 0) + && (((longAt(selector)) & 0x3FFFFF) == 8) + ? noInlineFollowForwarded(selector) + : selector); mixinApplication = findApplicationOfTargetMixinstartingAtBehavior(mixin, fetchClassOf(rcvr)); if (mixinApplication == GIV(nilObj)) { return rcvr; } /* begin followObjField:ofObject: */ - objOop = longAt((mixinApplication + (BaseHeaderSize)) + (MethodDictionaryIndex << 2)); - assert(isNonImmediate(objOop)); - if (((longAt(objOop)) & (0x3FFFFF - 8)) == 0) { - objOop = fixFollowedFieldofObjectwithInitialValue(MethodDictionaryIndex, mixinApplication, objOop); + objOop7 = longAt((mixinApplication + (BaseHeaderSize)) + (MethodDictionaryIndex << 2)); + assert(isNonImmediate(objOop7)); + if (((longAt(objOop7)) & (0x3FFFFF - 8)) == 0) { + objOop7 = fixFollowedFieldofObjectwithInitialValue(MethodDictionaryIndex, mixinApplication, objOop7); } - dictionary = objOop; + dictionary = objOop7; /* begin lookupMethodInDictionary: */ /* begin numSlotsOf: */ flag("endianness"); @@ -19122,12 +19132,12 @@ } if (nextSelector1 == GIV(messageSelector)) { /* begin followObjField:ofObject: */ - objOop6 = longAt((dictionary + (BaseHeaderSize)) + (MethodArrayIndex << 2)); - assert(isNonImmediate(objOop6)); - if (((longAt(objOop6)) & (0x3FFFFF - 8)) == 0) { - objOop6 = fixFollowedFieldofObjectwithInitialValue(MethodArrayIndex, dictionary, objOop6); + objOop9 = longAt((dictionary + (BaseHeaderSize)) + (MethodArrayIndex << 2)); + assert(isNonImmediate(objOop9)); + if (((longAt(objOop9)) & (0x3FFFFF - 8)) == 0) { + objOop9 = fixFollowedFieldofObjectwithInitialValue(MethodArrayIndex, dictionary, objOop9); } - methodArray1 = objOop6; + methodArray1 = objOop9; /* begin followField:ofObject: */ objOop12 = longAt((methodArray1 + (BaseHeaderSize)) + (index1 << 2)); if (((objOop12 & 3) == 0) @@ -19136,12 +19146,12 @@ } GIV(newMethod) = ((sqInt) objOop12); found = 1; - goto l4; + goto l3; } index1 += 1; } found = 0; - goto l4; + goto l3; } /* It is assumed that there are some nils in this dictionary, and search will @@ -19153,14 +19163,13 @@ ? (GIV(messageSelector) >> 1) : ((usqInt) (((usqInt)GIV(messageSelector)))) >> 2) : (/* begin hashBitsOf: */ - (objOop41 = GIV(messageSelector)), - (hash1 = (longAt(objOop41 + 4)) & 0x3FFFFF), + (hash1 = (longAt(GIV(messageSelector) + 4)) & 0x3FFFFF), (hash1 == 0 ? ((hash1 = (newObjectHash()) & 0x3FFFFF), /* begin setHashBitsOf:to: */ flag("endianness"), assert(((hash1 >= 0) && (hash1 <= (identityHashHalfWordMask())))), - longAtput(objOop41 + 4, ((((longAt(objOop41 + 4)) | 0x3FFFFF) - 0x3FFFFF)) + hash1)) + longAtput(GIV(messageSelector) + 4, ((((longAt(GIV(messageSelector) + 4)) | 0x3FFFFF) - 0x3FFFFF)) + hash1)) : 0), hash1)))); wrapAround1 = 0; @@ -19168,7 +19177,7 @@ nextSelector1 = longAt((dictionary + (BaseHeaderSize)) + (index1 << 2)); if (nextSelector1 == GIV(nilObj)) { found = 0; - goto l4; + goto l3; } if (((nextSelector1 & 3) == 0) && (((longAt(nextSelector1)) & 0x3FFFFF) == 8)) { @@ -19176,39 +19185,61 @@ } if (nextSelector1 == GIV(messageSelector)) { /* begin followObjField:ofObject: */ - objOop21 = longAt((dictionary + (BaseHeaderSize)) + (MethodArrayIndex << 2)); - assert(isNonImmediate(objOop21)); - if (((longAt(objOop21)) & (0x3FFFFF - 8)) == 0) { - objOop21 = fixFollowedFieldofObjectwithInitialValue(MethodArrayIndex, dictionary, objOop21); + objOop22 = longAt((dictionary + (BaseHeaderSize)) + (MethodArrayIndex << 2)); + assert(isNonImmediate(objOop22)); + if (((longAt(objOop22)) & (0x3FFFFF - 8)) == 0) { + objOop22 = fixFollowedFieldofObjectwithInitialValue(MethodArrayIndex, dictionary, objOop22); } - methodArray1 = objOop21; + methodArray1 = objOop22; /* begin followField:ofObject: */ - objOop31 = longAt((methodArray1 + (BaseHeaderSize)) + ((index1 - SelectorStart) << 2)); - if (((objOop31 & 3) == 0) - && (((longAt(objOop31)) & 0x3FFFFF) == 8)) { - objOop31 = fixFollowedFieldofObjectwithInitialValue(index1 - SelectorStart, methodArray1, objOop31); + objOop32 = longAt((methodArray1 + (BaseHeaderSize)) + ((index1 - SelectorStart) << 2)); + if (((objOop32 & 3) == 0) + && (((longAt(objOop32)) & 0x3FFFFF) == 8)) { + objOop32 = fixFollowedFieldofObjectwithInitialValue(index1 - SelectorStart, methodArray1, objOop32); } - GIV(newMethod) = ((sqInt) objOop31); + GIV(newMethod) = ((sqInt) objOop32); found = 1; - goto l4; + goto l3; } index1 += 1; if (index1 == length1) { if (wrapAround1) { found = 0; - goto l4; + goto l3; } wrapAround1 = 1; index1 = SelectorStart; } } found = 0; -l4: /* end lookupMethodInDictionary: */; +l3: /* end lookupMethodInDictionary: */; if (!found) { - theMixin = longAt((mixinApplication + (BaseHeaderSize)) + (MixinIndex << 2)); + /* begin followObjField:ofObject: */ + objOop4 = longAt((mixinApplication + (BaseHeaderSize)) + (MixinIndex << 2)); + assert(isNonImmediate(objOop4)); + if (((longAt(objOop4)) & (0x3FFFFF - 8)) == 0) { + objOop4 = fixFollowedFieldofObjectwithInitialValue(MixinIndex, mixinApplication, objOop4); + } + theMixin = objOop4; /* begin nextImplicitReceiverFor:withMixin: */ - implicitReceiver = longAt((mixinApplication + (BaseHeaderSize)) + (EnclosingObjectIndex << 2)); - targetMixin = longAt((theMixin + (BaseHeaderSize)) + (EnclosingMixinIndex << 2)); + /* begin followObjField:ofObject: */ + objOop5 = longAt((mixinApplication + (BaseHeaderSize)) + (EnclosingObjectIndex << 2)); + assert(isNonImmediate(objOop5)); + if (((longAt(objOop5)) & (0x3FFFFF - 8)) == 0) { + objOop5 = fixFollowedFieldofObjectwithInitialValue(EnclosingObjectIndex, mixinApplication, objOop5); + } + anObject = objOop5; + /* begin followObjField:ofObject: */ + objOop6 = longAt((theMixin + (BaseHeaderSize)) + (EnclosingMixinIndex << 2)); + assert(isNonImmediate(objOop6)); + if (((longAt(objOop6)) & (0x3FFFFF - 8)) == 0) { + objOop6 = fixFollowedFieldofObjectwithInitialValue(EnclosingMixinIndex, theMixin, objOop6); + } + mixin1 = objOop6; + assert(!((isOopForwarded(anObject)))); + assert(!((isForwarded(mixin1)))); + implicitReceiver = anObject; + targetMixin = mixin1; while (1) { if (targetMixin == GIV(nilObj)) { @@ -19217,53 +19248,18 @@ implicitReceiverOrNil = GIV(nilObj); goto l1; } - /* begin findApplicationOfTargetMixin:startingAtNonMetaClass: */ - /* begin fetchClassOf: */ - if (((tagBits = implicitReceiver & 3)) != 0) { - aClass = longAt((GIV(classTableFirstPage) + (BaseHeaderSize)) + (tagBits << 2)); - goto l2; - } - /* begin fetchClassOfNonImm: */ - classIndex = (longAt(implicitReceiver)) & 0x3FFFFF; - if (classIndex <= 0x1F) { - if (classIndex == 0x1F) { - aClass = implicitReceiver; - goto l2; - } - if (classIndex == 8) { - aClass = GIV(nilObj); - goto l2; - } - } - assert(classIndex >= (arrayClassIndexPun())); - /* begin classOrNilAtIndex: */ - assert((classIndex <= (tagMask())) - || (classIndex >= (arrayClassIndexPun()))); - classTablePage = longAt((GIV(hiddenRootsObj) + (BaseHeaderSize)) + ((((usqInt) classIndex) >> 10) << 2)); - if (classTablePage == GIV(nilObj)) { - aClass = GIV(nilObj); - goto l2; - } - aClass = longAt((classTablePage + (BaseHeaderSize)) + ((classIndex & ((1 << 10) - 1)) << 2)); - l2: /* end fetchClassOf: */; - mixinOrMixinApplication = aClass; - while (!((mixinOrMixinApplication == GIV(nilObj)) - || ((mixinOrMixinApplication == targetMixin) - || ((longAt((mixinOrMixinApplication + (BaseHeaderSize)) + (MixinIndex << 2))) == targetMixin)))) { - mixinOrMixinApplication = longAt((mixinOrMixinApplication + (BaseHeaderSize)) + (SuperclassIndex << 2)); - } - mixinApplication1 = mixinOrMixinApplication; + mixinApplication1 = findApplicationOfTargetMixinstartingAtNonMetaClass(targetMixin, fetchClassOf(implicitReceiver)); if (mixinApplication1 == GIV(nilObj)) { implicitReceiverOrNil = GIV(nilObj); goto l1; } /* begin followObjField:ofObject: */ - objOop1 = longAt((mixinApplication1 + (BaseHeaderSize)) + (MethodDictionaryIndex << 2)); - assert(isNonImmediate(objOop1)); - if (((longAt(objOop1)) & (0x3FFFFF - 8)) == 0) { - objOop1 = fixFollowedFieldofObjectwithInitialValue(MethodDictionaryIndex, mixinApplication1, objOop1); + objOop = longAt((mixinApplication1 + (BaseHeaderSize)) + (MethodDictionaryIndex << 2)); + assert(isNonImmediate(objOop)); + if (((longAt(objOop)) & (0x3FFFFF - 8)) == 0) { + objOop = fixFollowedFieldofObjectwithInitialValue(MethodDictionaryIndex, mixinApplication1, objOop); } - dictionary1 = objOop1; + dictionary1 = objOop; /* begin lookupMethodInDictionary: */ /* begin numSlotsOf: */ flag("endianness"); @@ -19289,12 +19285,12 @@ } if (nextSelector == GIV(messageSelector)) { /* begin followObjField:ofObject: */ - objOop5 = longAt((dictionary1 + (BaseHeaderSize)) + (MethodArrayIndex << 2)); - assert(isNonImmediate(objOop5)); - if (((longAt(objOop5)) & (0x3FFFFF - 8)) == 0) { - objOop5 = fixFollowedFieldofObjectwithInitialValue(MethodArrayIndex, dictionary1, objOop5); + objOop8 = longAt((dictionary1 + (BaseHeaderSize)) + (MethodArrayIndex << 2)); + assert(isNonImmediate(objOop8)); + if (((longAt(objOop8)) & (0x3FFFFF - 8)) == 0) { @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.903.mcz
by commits＠source.squeak.org 14 Oct '14

14 Oct '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.903.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.903 Author: eem Time: 14 October 2014, 12:48:31.324 pm UUID: 9ce090a8-4af5-4298-8b32-3b5a832a1c06 Ancestors: VMMaker.oscog-eem.902 And follow in enclosingObjectAt:withObject:withMixin: =============== Diff against VMMaker.oscog-eem.902 =============== Item was changed: ----- Method: StackInterpreter>>enclosingObjectAt:withObject:withMixin: (in category 'newspeak bytecode support') ----- enclosingObjectAt: n withObject: anObject withMixin: mixin "This is used to implement the innards of the pushEnclosingObjectBytecode, used for explicit outer sends in NS2/NS3. " | enclosingObject mixinApplication targetMixin count | enclosingObject := anObject. targetMixin := mixin. count := 0. [count < n] whileTrue: [count := count + 1. + (targetMixin = objectMemory nilObject + or: [enclosingObject = objectMemory nilObject]) ifTrue: - (targetMixin = objectMemory nilObject or:[enclosingObject = objectMemory nilObject]) ifTrue: [^objectMemory nilObject]. mixinApplication := self findApplicationOfTargetMixin: targetMixin startingAtNonMetaClass: (objectMemory fetchClassOf: enclosingObject). mixinApplication = objectMemory nilObject ifTrue: [^objectMemory nilObject]. "should never happen!!" + enclosingObject := objectMemory followObjField: EnclosingObjectIndex ofObject: mixinApplication. + targetMixin := objectMemory followObjField: EnclosingMixinIndex ofObject: targetMixin]. - enclosingObject := objectMemory fetchPointer: EnclosingObjectIndex ofObject: mixinApplication. - targetMixin := objectMemory fetchPointer: EnclosingMixinIndex ofObject: targetMixin]. ^enclosingObject!

1 0

VM Maker: VMMaker.oscog-eem.902.mcz
by commits＠source.squeak.org 14 Oct '14

14 Oct '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.902.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.902 Author: eem Time: 14 October 2014, 12:26:26.07 pm UUID: e97518bb-4f81-470b-9557-6beed90a223c Ancestors: VMMaker.oscog-eem.901 Rewrite implicit receiver lookup logic to follow and fix up forwarding pointers. Fixes occasional failures to locate correct implicit receiver which manifest as MNUs. Fix SimpleStackBasedCogit by marking Spur's addressCouldBeOop: <api> =============== Diff against VMMaker.oscog-eem.901 =============== Item was changed: ----- Method: NewspeakInterpreter>>nextImplicitReceiverFor:withMixin: (in category 'stack bytecodes') ----- nextImplicitReceiverFor: anObject withMixin: mixin "This is used to implement the innards of the pushImplicitReceiverBytecode, used for implicit receiver sends in NS2/NS3. Find the nearest lexically-enclosing implementation of selector by searching up the static chain of anObject, starting at mixin's application. This is an iterative implementation derived from <ContextPart> nextImplicitReceiverFor: obj <Object> withMixin: mixin <Mixin> implementing: selector <Symbol> ^<Object>" | implicitReceiver mixinApplication theMixin targetMixin dictionary found | implicitReceiver := anObject. targetMixin := mixin. [(targetMixin == nilObj "or: [implicitReceiver == nilObj]") ifTrue: [^nilObj]. mixinApplication := self findApplicationOfTargetMixin: targetMixin startingAtNonMetaClass: (self fetchClassOf: implicitReceiver). mixinApplication == nilObj ifTrue: [^nilObj]. + dictionary := self followObjField: MessageDictionaryIndex ofObject: mixinApplication. - dictionary := self fetchPointer: MessageDictionaryIndex ofObject: mixinApplication. found := self lookupMethodInDictionary: dictionary. found] whileFalse: + [implicitReceiver := self followObjField: EnclosingObjectIndex ofObject: mixinApplication. + theMixin := self followObjField: MixinIndex ofObject: mixinApplication. - [implicitReceiver := self fetchPointer: EnclosingObjectIndex ofObject: mixinApplication. - theMixin := self fetchPointer: MixinIndex ofObject: mixinApplication. theMixin == nilObj ifTrue:[^nilObj]. + targetMixin := self followObjField: EnclosingMixinIndex ofObject: theMixin]. - targetMixin := self fetchPointer: EnclosingMixinIndex ofObject: theMixin]. ^implicitReceiver! Item was added: + ----- Method: ObjectMemory>>followMaybeForwarded: (in category 'spur compatibility') ----- + followMaybeForwarded: objOop + <inline: true> + ^objOop! Item was changed: ----- Method: SpurMemoryManager>>addressCouldBeOop: (in category 'debug support') ----- + addressCouldBeOop: address + <api> + "Answer if address appears to be that of either an immediate or an object. + For code disassembly and assertions." - addressCouldBeOop: address ^(self isImmediate: address) or: [self addressCouldBeObj: address]! Item was changed: + ----- Method: SpurMemoryManager>>followMaybeForwarded: (in category 'forwarding') ----- - ----- Method: SpurMemoryManager>>followMaybeForwarded: (in category 'become implementation') ----- followMaybeForwarded: objOop + <inline: true> + ^(self isOopForwarded: objOop) + ifTrue: [self noInlineFollowForwarded: objOop] - ^(self isForwarded: objOop) - ifTrue: [self followForwarded: objOop] ifFalse: [objOop]! Item was added: + ----- Method: SpurMemoryManager>>noInlineFollowForwarded: (in category 'forwarding') ----- + noInlineFollowForwarded: objOop + <inline: false> + ^self followForwarded: objOop! Item was changed: ----- Method: StackInterpreter>>findApplicationOfTargetMixin:startingAtNonMetaClass: (in category 'newspeak bytecode support') ----- findApplicationOfTargetMixin: targetMixin startingAtNonMetaClass: aClass "This is used to implement the innards of the pushImplicitReceiverBytecode, used for outer sends in NS2/NS3. Find the MixinApplcation of which aClass is a subclass that is an application of targetMixin. This is an implementation derived from <ContextPart> findApplicationOfTargetMixin: targetMixin startingAtNonMetaClass: aClass " | mixinOrMixinApplication | + self deny: (objectMemory isForwarded: targetMixin). + self deny: (objectMemory isForwarded: aClass). mixinOrMixinApplication := aClass. [mixinOrMixinApplication = objectMemory nilObject or: [mixinOrMixinApplication = targetMixin + or: [(objectMemory followObjField: MixinIndex ofObject: mixinOrMixinApplication) = targetMixin]]] whileFalse: + [mixinOrMixinApplication := objectMemory followObjField: SuperclassIndex ofObject: mixinOrMixinApplication]. - or: [(objectMemory fetchPointer: MixinIndex ofObject: mixinOrMixinApplication) = targetMixin]]] whileFalse: - [mixinOrMixinApplication := objectMemory fetchPointer: SuperclassIndex ofObject: mixinOrMixinApplication]. ^mixinOrMixinApplication! Item was changed: ----- Method: StackInterpreter>>implicitReceiverFor:mixin:implementing: (in category 'newspeak bytecode support') ----- implicitReceiverFor: rcvr mixin: mixin implementing: selector "This is used to implement the innards of the pushImplicitReceiverBytecode, used for implicit receiver sends in NS2/NS3. Find the nearest lexically-enclosing implementation of selector by searching up the static chain of anObject, starting at mixin's application. This is an iterative implementation derived from <ContextPart> implicitReceiverFor: obj <Object> withMixin: mixin <Mixin> implementing: selector <Symbol> ^<Object>" <api> <option: #NewspeakVM> | mixinApplication dictionary found | + self deny: (objectMemory isOopForwarded: rcvr). + self deny: (objectMemory isForwarded: mixin). + "messageSelector is an implicit parameter of lookupMethodInDictionary:" + messageSelector := objectMemory followMaybeForwarded: selector. - messageSelector := selector. "messageSelector is an implicit parameter of lookupMethodInDictionary:" mixinApplication := self findApplicationOfTargetMixin: mixin startingAtBehavior: (objectMemory fetchClassOf: rcvr). mixinApplication = objectMemory nilObject ifTrue: [^rcvr]. dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: mixinApplication. found := self lookupMethodInDictionary: dictionary. found ifFalse: [| implicitReceiverOrNil theMixin | + theMixin := objectMemory followObjField: MixinIndex ofObject: mixinApplication. - theMixin := objectMemory fetchPointer: MixinIndex ofObject: mixinApplication. implicitReceiverOrNil := self nextImplicitReceiverFor: (objectMemory + followObjField: EnclosingObjectIndex - fetchPointer: EnclosingObjectIndex ofObject: mixinApplication) withMixin: (objectMemory + followObjField: EnclosingMixinIndex - fetchPointer: EnclosingMixinIndex ofObject: theMixin). implicitReceiverOrNil ~= objectMemory nilObject ifTrue: [^implicitReceiverOrNil]]. ^rcvr! Item was changed: ----- Method: StackInterpreter>>nextImplicitReceiverFor:withMixin: (in category 'newspeak bytecode support') ----- nextImplicitReceiverFor: anObject withMixin: mixin "This is used to implement the innards of the pushImplicitReceiverBytecode, used for implicit receiver sends in NS2/NS3. Find the nearest lexically-enclosing implementation of selector by searching up the static chain of anObject, starting at mixin's application. This is an iterative implementation derived from <ContextPart> nextImplicitReceiverFor: obj <Object> withMixin: mixin <Mixin> implementing: selector <Symbol> ^<Object>" | implicitReceiver mixinApplication theMixin targetMixin dictionary found | + self deny: (objectMemory isOopForwarded: anObject). + self deny: (objectMemory isForwarded: mixin). implicitReceiver := anObject. targetMixin := mixin. [(targetMixin = objectMemory nilObject "or: [implicitReceiver = objectMemory nilObject]") ifTrue: [^objectMemory nilObject]. mixinApplication := self findApplicationOfTargetMixin: targetMixin startingAtNonMetaClass: (objectMemory fetchClassOf: implicitReceiver). mixinApplication = objectMemory nilObject ifTrue: [^objectMemory nilObject]. dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: mixinApplication. found := self lookupMethodInDictionary: dictionary. found] whileFalse: + [implicitReceiver := objectMemory followObjField: EnclosingObjectIndex ofObject: mixinApplication. + theMixin := objectMemory followObjField: MixinIndex ofObject: mixinApplication. - [implicitReceiver := objectMemory fetchPointer: EnclosingObjectIndex ofObject: mixinApplication. - theMixin := objectMemory fetchPointer: MixinIndex ofObject: mixinApplication. theMixin = objectMemory nilObject ifTrue: [^objectMemory nilObject]. + targetMixin := objectMemory followObjField: EnclosingMixinIndex ofObject: theMixin]. - targetMixin := objectMemory fetchPointer: EnclosingMixinIndex ofObject: theMixin]. ^implicitReceiver!

1 0

VM Maker: VMMaker.oscog-eem.901.mcz
by commits＠source.squeak.org 14 Oct '14

14 Oct '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.901.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.901 Author: eem Time: 14 October 2014, 8:30:46.154 am UUID: 08ffab52-343a-41c4-a367-493bbc4d3eaa Ancestors: VMMaker.oscog-eem.900 Rename hiddenRootsObj: to setHiddenRootsObj: for clang. =============== Diff against VMMaker.oscog-eem.900 =============== Item was removed: - ----- Method: SpurMemoryManager>>hiddenRootsObj: (in category 'class table') ----- - hiddenRootsObj: anOop - hiddenRootsObj := anOop. - self cCode: [self assert: self validClassTableRootPages] - inSmalltalk: [numClassTablePages ifNotNil: - [self assert: self validClassTableRootPages]].. - classTableFirstPage := self fetchPointer: 0 ofObject: hiddenRootsObj. - self assert: (self numSlotsOf: classTableFirstPage) - 1 = self classTableMinorIndexMask. - "Set classTableIndex to the start of the last used page (excepting first page). - Set numClassTablePages to the number of used pages." - numClassTablePages := self classTableRootSlots. - 2 to: numClassTablePages - 1 do: - [:i| - (self fetchPointer: i ofObject: hiddenRootsObj) = nilObj ifTrue: - [numClassTablePages := i. - classTableIndex := (numClassTablePages - 1 max: 1) << self classTableMajorIndexShift. - ^self]]. - "no unused pages; set it to the start of the second page." - classTableIndex := 1 << self classTableMajorIndexShift! Item was changed: ----- Method: SpurMemoryManager>>initializeObjectMemory: (in category 'initialization') ----- initializeObjectMemory: bytesToShift "Initialize object memory variables at startup time. Assume endOfMemory at al are initialised by the image-reading code via setHeapBase:memoryLimit:endOfMemory:. endOfMemory is assumed to point to the end of the last object in the image. Assume: image reader also initializes the following variables: specialObjectsOop lastHash" <inline: false> | freeListObj | "Catch mis-initializations leading to bad translations to C" self assert: BaseHeaderSize = self baseHeaderSize. self assert: (self maxSlotsForAlloc * BytesPerWord) asInteger > 0. self bootstrapping ifFalse: [self initSegmentBridgeWithBytes: self bridgeSize at: endOfMemory - self bridgeSize]. segmentManager adjustSegmentSwizzlesBy: bytesToShift. "image may be at a different address; adjust oops for new location" self adjustAllOopsBy: bytesToShift. specialObjectsOop := segmentManager swizzleObj: specialObjectsOop. "heavily used special objects" nilObj := self splObj: NilObject. falseObj := self splObj: FalseObject. trueObj := self splObj: TrueObject. "In Cog we insist that nil, true & false are next to each other (Cogit generates tighter conditional branch code as a result). In addition, Spur places the free lists and class table root page immediately following them." self assert: nilObj = oldSpaceStart. self assert: falseObj = (self objectAfter: nilObj). self assert: trueObj = (self objectAfter: falseObj). freeListObj := self objectAfter: trueObj. + self setHiddenRootsObj: (self objectAfter: freeListObj). - self hiddenRootsObj: (self objectAfter: freeListObj). markStack := self swizzleObjStackAt: MarkStackRootIndex. weaklingStack := self swizzleObjStackAt: WeaklingStackRootIndex. ephemeronQueue := self swizzleObjStackAt: EphemeronQueueRootIndex. self assert: self validObjStacks. self assert: (self isEmptyObjStack: markStack). self assert: (self isEmptyObjStack: weaklingStack). self initializeFreeSpacePostLoad: freeListObj. segmentManager collapseSegmentsPostSwizzle. self computeFreeSpacePostSwizzle. self initializeOldSpaceFirstFree: freeOldSpaceStart. "initializes endOfMemory, freeStart, free space" "self bootstrapping ifFalse: ["self initializeNewSpaceVariables. scavenger initializeRememberedSet"]". segmentManager checkSegments. numCompactionPasses := CompactionPassesForGC. "These defaults should depend on machine size; e.g. too small on a powerful laptop, too big on a Pi." growHeadroom := 16*1024*1024. "headroom when growing" shrinkThreshold := 32*1024*1024. "free space before shrinking" self setHeapSizeAtPreviousGC. heapGrowthToSizeGCRatio := 0.333333. "By default GC after scavenge if heap has grown by a third since the last GC"! Item was added: + ----- Method: SpurMemoryManager>>setHiddenRootsObj: (in category 'class table') ----- + setHiddenRootsObj: anOop + hiddenRootsObj := anOop. + self cCode: [self assert: self validClassTableRootPages] + inSmalltalk: [numClassTablePages ifNotNil: + [self assert: self validClassTableRootPages]].. + classTableFirstPage := self fetchPointer: 0 ofObject: hiddenRootsObj. + self assert: (self numSlotsOf: classTableFirstPage) - 1 = self classTableMinorIndexMask. + "Set classTableIndex to the start of the last used page (excepting first page). + Set numClassTablePages to the number of used pages." + numClassTablePages := self classTableRootSlots. + 2 to: numClassTablePages - 1 do: + [:i| + (self fetchPointer: i ofObject: hiddenRootsObj) = nilObj ifTrue: + [numClassTablePages := i. + classTableIndex := (numClassTablePages - 1 max: 1) << self classTableMajorIndexShift. + ^self]]. + "no unused pages; set it to the start of the second page." + classTableIndex := 1 << self classTableMajorIndexShift!

1 0

Re: [squeak-dev] Cog VM on older architecture ?
by Eliot Miranda 14 Oct '14

14 Oct '14

Hi Stéphane, On Oct 14, 2014, at 12:25 AM, Stéphane Rollandin <lecteur(a)zogotounga.net> wrote: > Hello, > > I got hold of an old laptop on Pentium II. I installed Windows XP in it and tried to run Squeak to see how it goes, but my attempts with various Cog VM all failed (with a message from the system, not a VM crash). The interpreter VM worked fine (but it's slooow). I'd love to see the message, but I'm guessing it is that the Pentium II doesn't have SSE2 instructions. The solution would be fir you to build your own Cog VM not using the -sse2 flag. The JIT tests for the availability of SSE2 instructions and if available generates machine code floating point primitives. But the C compiler can't choose dynamically. So your hand rolled VM will have poorer floating point performance but otherwise should be good. > Is it expected ? Yes. Pentium II has MMX, not SSE2. > Stef

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev October 2014