Vm-dev January 2014

vm-dev@lists.squeakfoundation.org

28 participants
97 discussions

Re: [Pharo-dev] Pharo on a Raspbian
by Eliot Miranda 20 Jan '14

20 Jan '14

Hi Jean-Baptiste, On Mon, Jan 20, 2014 at 7:25 AM, Jean Baptiste Arnaud < jbaptiste.arnaud(a)gmail.com> wrote: > > On 18 Jan 2014, at 09:09, Stéphane Ducasse <stephane.ducasse(a)inria.fr> > wrote: > > One of the problem we are thinking about now is the FFI on ARM (alien or > not alien)…. > > +1, we need to think the, best solution is to have NativeBoost on ARM. > We need an agreement between, time to develop and usage. > Maybe first I should fix Alien or FFI. Then one day, port Nativeboost on > ARM. > Did you see the thread on vm-dev about the ARM FFI? When I wrote the FFI-replacement ThreadedFFIPlugin (which is the standard FFI plugin in Cog) I added stubs for ARM and PowerPC. I hope that Doug McPherson is going to be able to fully implement these stubs. If you're interested perhaps you could collaborate? I'm confident that the effort involved in getting this going is a week or two at most. Days for someone who well understands alloca and the ARM ABI. On 17 January 2014 22:59, Sven Van Caekenberghe <sven(a)stfx.eu> wrote: > Who is JB ? > > > > Jean Baptiste Arnaud. The invaluable asset in any team :) > The hacker who without any help configuring & compiling VM on raspberry. > > > Oh, for real, I'm flattered. > > > Good to know. > > Thanks Jean-Baptiste ! > > > > > > Best Regards > Jean Baptiste Arnaud > jbaptiste.arnaud(a)gmail.com > > > > > > > > -- best, Eliot

1 0

VM Maker: VMMaker.oscog-eem.586.mcz
by commits＠source.squeak.org 20 Jan '14

20 Jan '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.586.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.586 Author: eem Time: 20 January 2014, 2:05:39.966 pm UUID: 2c68c161-bd12-4db4-b213-3643a7f7506a Ancestors: VMMaker.oscog-eem.585 Spur (in simulating Newspeak bootstrap): Fix GC of classes, piggy-backing on classTableBitmap. So rename expungeDuplicateClasses to expungeDuplicateAndUnmarkedClasses:. Add some asserts to check that entries in the classTable are classes. Revise class table become management. Don't include methods in "unforwarded zone". Hence add followObjField:ofObject: & fix bug in fixFollowedField:ofObject:withInitialValue:. Add a read barrier to fetching newMethod from a method dictionary. Add a read barrier to fetching a method dictionary from a class. Fix assert in addNewMethodToCache: to spot forwarded newMethod. Make primitiveFileDelete simulate. Copy Conterpreter's systemAttributes support to StackInterpreterSimulator (so it can simulate the Newspeak bootstrap). Don't inline any of the methods into fullGC. Nuke unused ObjectMemory>>enterIntoClassTable:. =============== Diff against VMMaker.oscog-eem.585 =============== Item was changed: ----- Method: CogVMSimulator>>ioLoadFunction:From:AccessorDepthInto: (in category 'plugin support') ----- ioLoadFunction: functionString From: pluginString AccessorDepthInto: accessorDepthPtr "Load and return the requested function from a module. Assign the accessor depth through accessorDepthPtr. N.B. The actual code lives in platforms/Cross/vm/sqNamedPrims.h" | firstTime plugin fnSymbol | firstTime := false. fnSymbol := functionString asSymbol. transcript cr; show: '(', byteCount printString, ') Looking for ', functionString, ' in ', (pluginString isEmpty ifTrue:['vm'] ifFalse:[pluginString]). functionString = breakSelector ifTrue: [self halt: breakSelector]. plugin := pluginList detect: [:any| any key = pluginString asString] ifNone: [firstTime := true. self loadNewPlugin: pluginString]. plugin ifNil: [firstTime ifTrue: [transcript cr; show: 'Failed ... primitive not in plugin']. ^0]. plugin := plugin value. mappedPluginEntries doWithIndex: [:pluginAndName :index| ((pluginAndName at: 1) == plugin and:[(pluginAndName at: 2) == fnSymbol]) ifTrue: + [firstTime ifTrue: [transcript show: ' ... okay'; cr]. - [firstTime ifTrue: [transcript cr; show: ' ... okay']. accessorDepthPtr at: 0 put: (pluginAndName at: 4). ^index]]. firstTime ifTrue: [transcript cr; show: 'Failed ... primitive not in plugin']. ^0! Item was changed: ----- Method: FilePlugin>>primitiveFileDelete (in category 'file primitives') ----- primitiveFileDelete | namePointer nameIndex nameSize okToDelete | <var: 'nameIndex' type: 'char *'> <export: true> namePointer := interpreterProxy stackValue: 0. (interpreterProxy isBytes: namePointer) ifFalse: [^ interpreterProxy primitiveFail]. nameIndex := interpreterProxy firstIndexableField: namePointer. nameSize := interpreterProxy byteSizeOf: namePointer. "If the security plugin can be loaded, use it to check for permission. If not, assume it's ok" sCDFfn ~= 0 + ifTrue: [okToDelete := self cCode: ' ((sqInt (*)(char *, sqInt))sCDFfn)(nameIndex, nameSize)' inSmalltalk: [true]. - ifTrue: [okToDelete := self cCode: ' ((sqInt (*)(char *, sqInt))sCDFfn)(nameIndex, nameSize)'. okToDelete ifFalse: [^ interpreterProxy primitiveFail]]. self sqFileDeleteName: nameIndex Size: nameSize. interpreterProxy failed ifFalse: [interpreterProxy pop: 1]! Item was removed: - ----- Method: ObjectMemory>>enterIntoClassTable: (in category 'forward compatibility') ----- - enterIntoClassTable: aBehavior - "The old ObjectMemory should never be called upon to enter anything into the class table. - Alas 0 is a valid identityhash in the Squeak V3 objrep so primitiveBehaviorHash may - ask to enter into the table a class with a 0 id hash. SImply ignore the request." - ^0! Item was changed: ----- Method: Spur32BitMMLESimulator>>isIntegerObject: (in category 'object testing') ----- isIntegerObject: oop "This list records the valid senders of isIntegerObject: as we replace uses of isIntegerObject: by isImmediate: where appropriate." | sel | sel := thisContext sender method selector. (#( DoIt DoItIn: on:do: "from the debugger" makeBaseFrameFor: quickFetchInteger:ofObject: frameOfMarriedContext: objCouldBeClassObj: isMarriedOrWidowedContext: shortPrint: bytecodePrimAt bytecodePrimAtPut commonAt: commonAtPut: loadFloatOrIntFrom: positive32BitValueOf: primitiveExternalCall checkedIntegerValueOf: bytecodePrimAtPut commonAtPut: primitiveVMParameter checkIsStillMarriedContext:currentFP: displayBitsOf:Left:Top:Right:Bottom: fetchStackPointerOf: primitiveContextAt primitiveContextAtPut subscript:with:storing:format: printContext: compare31or32Bits:equal: signed64BitValueOf: primDigitMultiply:negative: digitLength: isNegativeIntegerValueOf: magnitude64BitValueOf: primitiveMakePoint primitiveAsCharacter primitiveInputSemaphore baseFrameReturn primitiveExternalCall primDigitCompare: isLiveContext: numPointerSlotsOf: fileValueOf: loadBitBltDestForm fetchIntOrFloat:ofObject:ifNil: fetchIntOrFloat:ofObject: loadBitBltSourceForm loadPoint:from: primDigitAdd: primDigitSubtract: positive64BitValueOf: digitBitLogic:with:opIndex: signed32BitValueOf: isNormalized: primDigitDiv:negative: bytesOrInt:growTo: primitiveNewMethod isCogMethodReference: functionForPrimitiveExternalCall: genSpecialSelectorArithmetic genSpecialSelectorComparison ensureContextHasBytecodePC: instVar:ofContext: ceBaseFrameReturn: inlineCacheTagForInstance: primitiveObjectAtPut commonVariable:at:put:cacheIndex: primDigitBitShiftMagnitude: externalInstVar:ofContext: primitiveGrowMemoryByAtLeast primitiveFileSetPosition + bereaveAllMarriedContextsForSnapshotFlushingExternalPrimitivesIf: + shortPrintOop:) includes: sel) ifFalse: - bereaveAllMarriedContextsForSnapshotFlushingExternalPrimitivesIf:) includes: sel) ifFalse: [self halt]. ^super isIntegerObject: oop! Item was changed: ----- Method: SpurMemoryManager>>classAtIndex:put: (in category 'class table') ----- classAtIndex: classIndex put: objOop "for become & GC of classes" | classTablePage | self assert: (classIndex <= self tagMask or: [classIndex >= self arrayClassIndexPun]). + self assert: (objOop = nilObj + or: [(self rawHashBitsOf: objOop) = classIndex + and: [coInterpreter objCouldBeClassObj: objOop]]). - self assert: (objOop = nilObj or: [(self rawHashBitsOf: objOop) = classIndex]). classTablePage := self fetchPointer: classIndex >> self classTableMajorIndexShift ofObject: hiddenRootsObj. classTablePage = nilObj ifTrue: [self error: 'attempt to add class to empty page']. ^self storePointer: (classIndex bitAnd: self classTableMinorIndexMask) ofObject: classTablePage withValue: objOop! Item was changed: ----- Method: SpurMemoryManager>>classForClassTag: (in category 'interpreter access') ----- classForClassTag: classIndex + self assert: classIndex ~= self isForwardedObjectClassIndexPun. ^self classAtIndex: classIndex! Item was changed: ----- Method: SpurMemoryManager>>compact (in category 'compaction') ----- compact "We'd like to use exact fit followed by best fit, but best-fit is complex to implement and potentially expensive. So just use exactFit followed, if necessary, by first-fit." + <inline: false> self exactFitCompact. highestObjects usedSize > 0 ifTrue: [self firstFitCompact]! Item was changed: ----- Method: SpurMemoryManager>>doBecome:and:copyHash: (in category 'become implementation') ----- doBecome: obj1 and: obj2 copyHash: copyHashFlag "Inner dispatch for two-way become" | o1ClassIndex o2ClassIndex | copyHashFlag ifFalse: ["in-lined + classIndex := (self isInClassTable: obj) ifTrue: [self rawHashBitsOf: obj] ifFalse: [0] - clasIndex := (self isInClassTable: obj) ifTrue: [self rawHashBitsOf: obj] ifFalse: [0] for speed." o1ClassIndex := self rawHashBitsOf: obj1. (o1ClassIndex ~= 0 and: [(self classAtIndex: o1ClassIndex) ~= obj1]) ifTrue: [o1ClassIndex := 0]. o2ClassIndex := self rawHashBitsOf: obj2. (o2ClassIndex ~= 0 and: [(self classAtIndex: o2ClassIndex) ~= obj2]) ifTrue: [o2ClassIndex := 0]]. (self numSlotsOf: obj1) = (self numSlotsOf: obj2) ifTrue: [self inPlaceBecome: obj1 and: obj2 copyHashFlag: copyHashFlag] ifFalse: [self outOfPlaceBecome: obj1 and: obj2 copyHashFlag: copyHashFlag]. "if copyHashFlag then nothing changes, since hashes were also swapped." copyHashFlag ifTrue: [^self]. "if copyHash is false then the classTable entries must be updated." o1ClassIndex ~= 0 ifTrue: [o2ClassIndex ~= 0 ifTrue: "both were in the table; just swap entries" [| tmp | tmp := self classAtIndex: o1ClassIndex. self classAtIndex: o1ClassIndex put: obj2. self classAtIndex: o2ClassIndex put: tmp] ifFalse: "o2 wasn't in the table; put it there" [| newObj2 | newObj2 := self followForwarded: obj2. self assert: (self rawHashBitsOf: newObj2) = 0. self setHashBitsOf: newObj2 to: o1ClassIndex. self classAtIndex: o1ClassIndex put: newObj2]] ifFalse: [o2ClassIndex ~= 0 ifTrue: [| newObj1 | newObj1 := self followForwarded: obj1. self assert: (self rawHashBitsOf: newObj1) = 0. self setHashBitsOf: newObj1 to: o2ClassIndex. self classAtIndex: o2ClassIndex put: newObj1]]! Item was added: + ----- Method: SpurMemoryManager>>expungeDuplicateAndUnmarkedClasses: (in category 'class table') ----- + expungeDuplicateAndUnmarkedClasses: expungeUnmarked + "Bits have been set in the classTableBitmap corresponding to + used classes. Any class in the class table that does not have a + bit set has no instances with that class index. However, becomeForward: + can create duplicate entries, and these duplicate entries + a) won't have a bit set on load (because there are no forwarders on load), + b) wont match their identityHash. + So expunge duplicates by eliminating unmarked entries that don't occur at + their identityHash. + Further, any class in the table that is unmarked will also not have a bit set so + eliminate unmarked classes using the bitmap too." + 1 to: numClassTablePages - 1 do: "Avoid expunging the puns by not scanning the 0th page." + [:i| | classTablePage | + "optimize scan by only scanning bitmap in regions that have pages." + classTablePage := self fetchPointer: i ofObject: hiddenRootsObj. + classTablePage ~= nilObj ifTrue: + [i << self classTableMajorIndexShift + to: i << self classTableMajorIndexShift + self classTableMinorIndexMask + by: 8 + do: [:majorBitIndex| | byteIndex byte classIndex classOrNil | + "optimize scan by scanning a byte of indices (8 indices) at a time" + byteIndex := majorBitIndex / BitsPerByte. + byte := classTableBitmap at: byteIndex. + byte ~= 255 ifTrue: + [0 to: 7 do: + [:minorBitIndex| + (byte noMask: 1 << minorBitIndex) ifTrue: + [classIndex := majorBitIndex + minorBitIndex. + classOrNil := self fetchPointer: (classIndex bitAnd: self classTableMinorIndexMask) + ofObject: classTablePage. + self assert: (self classAtIndex: classIndex) = classOrNil. + self assert: (classOrNil = nilObj or: [coInterpreter addressCouldBeClassObj: classOrNil]). + "only remove a class if it is at a duplicate entry or it is unmarked and we're expunging unmarked classes." + (classOrNil ~= nilObj + and: [(expungeUnmarked and: [(self isMarked: classOrNil) not]) + or: [(self rawHashBitsOf: classOrNil) ~= classIndex]]) ifTrue: + [self storePointerUnchecked: (classIndex bitAnd: self classTableMinorIndexMask) + ofObject: classTablePage + withValue: nilObj. + "but if it is marked, it should still be in the table at its correct index." + self assert: ((expungeUnmarked and: [(self isMarked: classOrNil) not]) + or: [(self classAtIndex: (self rawHashBitsOf: classOrNil)) = classOrNil]). + "If the removed class is before the classTableIndex, set the + classTableIndex to point to the empty slot so as to reuse it asap." + classIndex < classTableIndex ifTrue: + [classTableIndex := classIndex]]]]]]]]! Item was removed: - ----- Method: SpurMemoryManager>>expungeDuplicateClasses (in category 'class table') ----- - expungeDuplicateClasses - "Bits have been set in the classTableBitmap corresponding to - used classes. Any class in the class table that does not have a - bit set has no instances with that class index. However, becomeForward: - can create duplicate entries, and these duplicate entries - a) won't have a bit set on load (because there are no forwarders on load), - b) wont match their identityHash. - So expunge duplicates by eliminating unmarked entries that don't occur at - their identityHash." - 1 to: numClassTablePages - 1 do: - [:i| | classTablePage | - "optimize scan by only scanning bitmap in regions that have pages." - classTablePage := self fetchPointer: i ofObject: hiddenRootsObj. - classTablePage ~= nilObj ifTrue: - [i << self classTableMajorIndexShift - to: i << self classTableMajorIndexShift + self classTableMinorIndexMask - by: 8 - do: [:majorBitIndex| | byteIndex byte classIndex classOrNil | - "optimize scan by scanning a byte of indices (8 indices) at a time" - byteIndex := majorBitIndex / BitsPerByte. - byte := classTableBitmap at: byteIndex. - byte ~= 255 ifTrue: - [0 to: 7 do: - [:minorBitIndex| - (byte noMask: 1 << minorBitIndex) ifTrue: - [classIndex := majorBitIndex + minorBitIndex. - classOrNil := self fetchPointer: (classIndex bitAnd: self classTableMinorIndexMask) - ofObject: classTablePage. - self assert: (self classAtIndex: classIndex) = classOrNil. - "only remove a class if it is at a duplicate entry" - (classOrNil ~= nilObj - and: [(self rawHashBitsOf: classOrNil) ~= classIndex]) ifTrue: - [self storePointerUnchecked: (classIndex bitAnd: self classTableMinorIndexMask) - ofObject: classTablePage - withValue: nilObj. - "but it should still be in the table at its correct index." - self assert: ((self classAtIndex: (self rawHashBitsOf: classOrNil)) = classOrNil)]]]]]]]! Item was changed: ----- Method: SpurMemoryManager>>fixFollowedField:ofObject:withInitialValue: (in category 'forwarding') ----- fixFollowedField: fieldIndex ofObject: anObject withInitialValue: initialValue "Private helper for followField:ofObject: to avoid code duplication for rare case." <inline: false> | objOop | self assert: (self isOopForwarded: initialValue). + objOop := self followForwarded: initialValue. - objOop := self followForwarded: objOop. self storePointer: fieldIndex ofObject: anObject withValue: objOop. ^objOop! Item was added: + ----- Method: SpurMemoryManager>>followObjField:ofObject: (in category 'forwarding') ----- + followObjField: fieldIndex ofObject: anObject + "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." + | objOop | + objOop := self fetchPointer: fieldIndex ofObject: anObject. + self assert: (self isNonImmediate: objOop). + (self isForwarded: objOop) ifTrue: + [objOop := self fixFollowedField: fieldIndex ofObject: anObject withInitialValue: objOop]. + ^objOop! Item was changed: ----- Method: SpurMemoryManager>>freeUnmarkedObjectsAndSortAndCoalesceFreeSpace (in category 'gc - global') ----- freeUnmarkedObjectsAndSortAndCoalesceFreeSpace "Sweep all of old space, freeing unmarked objects, coalescing free chunks, and sorting free space. Small free chunks are sorted in address order on each small list head. Large free chunks are sorted on the sortedFreeChunks list. Record as many of the highest objects as there is room for in highestObjects, a circular buffer, for the use of exactFitCompact. Use unused eden space for highestObjects. If highestObjects does not wrap, store 0 at highestObjects last. Record the lowest free object in firstFreeChunk. Let the segmentManager mark which segments contain pinned objects via notePinned:." | lastLargeFree lastHighest highestObjectsWraps sortedFreeChunks | + <inline: false> <var: #lastHighest type: #usqInt> self checkFreeSpace. scavenger forgetUnmarkedRememberedObjects. segmentManager prepareForGlobalSweep."for notePinned:" "for sorting free space throw away the list heads, rebuilding them for small free chunks below." self resetFreeListHeads. highestObjects initializeStart: freeStart limit: scavenger eden limit. lastHighest := highestObjects start - self wordSize. "a.k.a. freeStart - wordSize" highestObjectsWraps := 0. self assert: highestObjects limit - highestObjects start // self wordSize >= 1024. firstFreeChunk := sortedFreeChunks := lastLargeFree := 0. "Note that if we were truly striving for performance we could split the scan into two phases, one up to the first free object and one after, which would remove the need to test firstFreeChunk when filling highestObjects." self allOldSpaceEntitiesForCoalescingDo: [:o| (self isMarked: o) ifTrue: "forwarders should have been followed in markAndTrace:" [self assert: (self isForwarded: o) not. self setIsMarkedOf: o to: false. "this will unmark bridges. undo the damage in notePinned:" (self isPinned: o) ifTrue: [segmentManager notePinned: o]. firstFreeChunk ~= 0 ifTrue: [false "conceptually...: " ifTrue: [highestObjects addLast: o] ifFalse: "but we inline so we can use the local lastHighest" [(lastHighest := lastHighest + self wordSize) >= highestObjects limit ifTrue: [highestObjectsWraps := highestObjectsWraps + 1. lastHighest := highestObjects start]. self longAt: lastHighest put: o]]] ifFalse: "unmarked; two cases, an unreachable object or a free chunk." [| here limit next | self assert: (self isRemembered: o) not. "scavenger should have cleared this above" here := o. limit := endOfMemory - self bridgeSize. next := self objectAfter: here limit: limit. [next = limit or: [self isMarked: next]] whileFalse: "coalescing; rare case" [self assert: (self isRemembered: o) not. statCoalesces := statCoalesces + 1. here := self coalesce: here and: next. next := self objectAfter: here limit: limit]. firstFreeChunk = 0 ifTrue: [firstFreeChunk := here]. (self isLargeFreeObject: here) ifTrue: [self setFree: here. lastLargeFree = 0 ifTrue: [sortedFreeChunks := lastLargeFree := here] ifFalse: [self storePointer: self freeChunkNextAddressIndex ofFreeChunk: lastLargeFree withValue: here]. lastLargeFree := here] ifFalse: [self freeSmallObject: here]]]. highestObjects last: lastHighest. highestObjectsWraps ~= 0 ifTrue: [highestObjects first: (lastHighest + self wordSize >= highestObjects limit ifTrue: [highestObjects start] ifFalse: [lastHighest + self wordSize])]. lastLargeFree ~= 0 ifTrue: [self storePointer: self freeChunkNextAddressIndex ofFreeChunk: lastLargeFree withValue: 0]. totalFreeOldSpace := self reverseSmallListHeads. totalFreeOldSpace := totalFreeOldSpace + (self rebuildFreeTreeFrom: sortedFreeChunks). self checkFreeSpace. self touch: highestObjectsWraps! Item was changed: ----- Method: SpurMemoryManager>>markObjects (in category 'gc - global') ----- markObjects + <inline: false> "Mark all accessible objects." "If the incremental collector is running mark bits may be set; stop it and clear them if necessary." self ensureAllMarkBitsAreZero. self ensureAdequateClassTableBitmap. self initializeUnscannedEphemerons. self initializeMarkStack. self initializeWeaklingStack. self markAccessibleObjects. + self expungeDuplicateAndUnmarkedClasses: true! - self expungeDuplicateClasses! Item was changed: ----- Method: SpurMemoryManager>>postBecomeOrCompactScanClassTable: (in category 'become implementation') ----- postBecomeOrCompactScanClassTable: effectsFlags "Scan the class table post-become (iff a pointer object or compiled method was becommed), or post-compact. Note that one-way become can cause duplications in the class table. When can these be eliminated? We use the classTableBitmap to mark classTable entries (not the classes themselves, since marking a class doesn't help in knowing if its index is used). On image load, and during incrememtal scan-mark and full GC, classIndices are marked. We can somehow avoid following classes from the classTable until after this mark phase." self assert: self validClassTableRootPages. + (effectsFlags anyMask: BecamePointerObjectFlag"+BecameCompiledMethodFlag") ifFalse: [^self]. - (effectsFlags anyMask: BecamePointerObjectFlag+BecameCompiledMethodFlag) ifFalse: [^self]. 0 to: numClassTablePages - 1 do: [:i| | page | page := self fetchPointer: i ofObject: hiddenRootsObj. self assert: (self isForwarded: page) not. 0 to: (self numSlotsOf: page) - 1 do: [:j| | classOrNil | classOrNil := self fetchPointer: j ofObject: page. classOrNil ~= nilObj ifTrue: [(self isForwarded: classOrNil) ifTrue: [classOrNil := self followForwarded: classOrNil. self storePointer: j ofObject: page withValue: classOrNil]. self scanClassPostBecome: classOrNil effects: effectsFlags]]]! Item was changed: ----- Method: SpurMemoryManager>>reInitializeClassTablePostLoad: (in category 'class table') ----- reInitializeClassTablePostLoad: hiddenRoots self hiddenRootsObj: hiddenRoots. + self expungeDuplicateAndUnmarkedClasses: false! - self expungeDuplicateClasses! Item was changed: ----- Method: SpurMemoryManager>>scanClassPostBecome:effects: (in category 'become implementation') ----- scanClassPostBecome: startClassObj effects: becomeEffects "Scan a class in the class table post-become. Make sure the superclass chain contains no forwarding pointers, and that the method dictionaries + are not forwarded either. N.B. we don't follow methods or their + methodClassAssociations since we can't guarantee that forwarders + to compiled methods are not stored in method dictionaries via at:put: + and so have to cope with forwarding pointers to compiled methods + in method dictionaries anyway. Instead the [Co]Interpreter must + follow forwarders when fetching from method dictionaries and follow + forwarders on become in the method cache and method zone." - are not forwarded either, and that methoidClassAssociations in methods - are not followed either." + | classObj obj | + "Algorithm depends on this to terminate loop at root of superclass chain." - | classObj obj obj2 | - "Algorithm depend on this to terminate loop at root of superclass chain." self assert: (self rawHashBitsOf: nilObj) ~= 0. + self assert: (becomeEffects anyMask: BecamePointerObjectFlag). "otherwise why bother?" - self assert: (becomeEffects anyMask: BecamePointerObjectFlag+BecameCompiledMethodFlag). "otherwise why bother?" classObj := startClassObj. + [obj := self followObjField: MethodDictionaryIndex ofObject: classObj. + "Solving the becommed method stored into a method dictionary object issue is + easy; just have a read barrier on fetching the method. But solving the read barrier + for selectors is more difficult (because selectors are currently not read, just their + oops. For now punt on the issue and simply follow all selectors on become" + self flag: 'need to fix the selector and methodDictionary issue'. + true + ifTrue: [self followForwardedObjectFields: obj toDepth: 0] + ifFalse: [self followObjField: MethodArrayIndex ofObject: obj]. + obj := self followObjField: SuperclassIndex ofObject: classObj. + "If the superclass has an identityHash then either it is nil, or is in the class table. + Tail recurse." + (self rawHashBitsOf: obj) = 0] whileTrue: - [obj := self fetchPointer: MethodDictionaryIndex ofObject: classObj. - self assert: (self isNonImmediate: obj). - (self isForwarded: obj) ifTrue: - [obj := self followForwarded: obj. - self storePointer: MethodDictionaryIndex ofObject: classObj withValue: obj]. - obj2 := self fetchPointer: MethodArrayIndex ofObject: obj. - self assert: (self isNonImmediate: obj2). - (self isForwarded: obj2) ifTrue: - [obj2 := self followForwarded: obj2. - self storePointer: MethodArrayIndex ofObject: obj withValue: obj2]. - "Only need to follow pointers in MethodArray if we've became any compiled methods..." - (becomeEffects anyMask: BecameCompiledMethodFlag) ifTrue: - [self followForwardedObjectFields: obj2 toDepth: 0]. - "But the methodClassAssociations there-in need to be followed if we've done any pointer becomes." - (becomeEffects anyMask: BecamePointerObjectFlag) ifTrue: - [0 to: (self numSlotsOf: obj2) - 1 do: - [:i| - obj := self fetchPointer: i ofObject: obj2. - (self isOopCompiledMethod: obj2) ifTrue: - [coInterpreter followNecessaryForwardingInMethod: obj2]]]. - - obj := self fetchPointer: SuperclassIndex ofObject: classObj. - self assert: (self isNonImmediate: obj). - (self isForwarded: obj) ifTrue: - [obj := self followForwarded: obj. - self storePointer: SuperclassIndex ofObject: classObj withValue: obj]. - - "If the superclass has an identityHash then either it is nil, or is in the class table. - Tail recurse." - (self rawHashBitsOf: obj) = 0] whileTrue: ["effectively self scanClassPostBecome: obj" classObj := obj]! Item was changed: ----- Method: StackInterpreter>>addNewMethodToCache: (in category 'method lookup cache') ----- addNewMethodToCache: classObj "Add the given entry to the method cache. The policy is as follows: Look for an empty entry anywhere in the reprobe chain. If found, install the new entry there. If not found, then install the new entry at the first probe position and delete the entries in the rest of the reprobe chain. This has two useful purposes: If there is active contention over the first slot, the second or third will likely be free for reentry after ejection. Also, flushing is good when reprobe chains are getting full." | probe hash primitiveIndex | <inline: false> hash := messageSelector bitXor: (objectMemory classTagForClass: classObj). "drop low-order zeros from addresses (if classObj not classTag)" (objectMemory isOopCompiledMethod: newMethod) ifTrue: [primitiveIndex := self primitiveIndexOf: newMethod. primitiveFunctionPointer := self functionPointerFor: primitiveIndex inClass: classObj] ifFalse: + [self assert: ((objectMemory isNonImmediate: newMethod) + and: [objectMemory isForwarded: newMethod]) not. + primitiveFunctionPointer := #primitiveInvokeObjectAsMethod]. - [primitiveFunctionPointer := #primitiveInvokeObjectAsMethod]. 0 to: CacheProbeMax-1 do: [:p | probe := (hash >> p) bitAnd: MethodCacheMask. (methodCache at: probe + MethodCacheSelector) = 0 ifTrue: ["Found an empty entry -- use it" methodCache at: probe + MethodCacheSelector put: messageSelector. methodCache at: probe + MethodCacheClass put: (objectMemory classTagForClass: classObj). methodCache at: probe + MethodCacheMethod put: newMethod. methodCache at: probe + MethodCachePrimFunction put: (self cCoerce: primitiveFunctionPointer to: #long). lastMethodCacheProbeWrite := probe. "this for primitiveExternalMethod" ^self]]. "OK, we failed to find an entry -- install at the first slot..." probe := hash bitAnd: MethodCacheMask. "first probe" methodCache at: probe + MethodCacheSelector put: messageSelector. methodCache at: probe + MethodCacheClass put: (objectMemory classTagForClass: classObj). methodCache at: probe + MethodCacheMethod put: newMethod. methodCache at: probe + MethodCachePrimFunction put: (self cCoerce: primitiveFunctionPointer to: #long). lastMethodCacheProbeWrite := probe. "this for primitiveExternalMethod" "...and zap the following entries" 1 to: CacheProbeMax-1 do: [:p | probe := (hash >> p) bitAnd: MethodCacheMask. methodCache at: probe + MethodCacheSelector put: 0]! 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 | 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. - dictionary := objectMemory fetchPointer: MethodDictionaryIndex ofObject: mixinApplication. found := self lookupMethodInDictionary: dictionary. found ifFalse: [| implicitReceiverOrNil theMixin | theMixin := objectMemory fetchPointer: MixinIndex ofObject: mixinApplication. implicitReceiverOrNil := self nextImplicitReceiverFor: (objectMemory fetchPointer: EnclosingObjectIndex ofObject: mixinApplication) withMixin: (objectMemory fetchPointer: EnclosingMixinIndex ofObject: theMixin). implicitReceiverOrNil ~= objectMemory nilObject ifTrue: [^implicitReceiverOrNil]]. ^rcvr! Item was changed: ----- Method: StackInterpreter>>lookupMethodInClass: (in category 'message sending') ----- lookupMethodInClass: class | currentClass dictionary found | <inline: false> self assert: (self addressCouldBeClassObj: class). currentClass := class. [currentClass ~= objectMemory nilObject] whileTrue: + [dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: currentClass. - [dictionary := objectMemory fetchPointer: MethodDictionaryIndex ofObject: currentClass. dictionary = objectMemory nilObject ifTrue: ["MethodDict pointer is nil (hopefully due a swapped out stub) -- raise exception #cannotInterpret:." self createActualMessageTo: class. messageSelector := objectMemory splObj: SelectorCannotInterpret. self sendBreakpoint: messageSelector receiver: nil. ^self lookupMethodInClass: (self superclassOf: currentClass)]. found := self lookupMethodInDictionary: dictionary. found ifTrue: [^currentClass]. currentClass := self superclassOf: currentClass]. "Could not find #doesNotUnderstand: -- unrecoverable error." messageSelector = (objectMemory splObj: SelectorDoesNotUnderstand) ifTrue: [self error: 'Recursive not understood error encountered']. "Cound not find a normal message -- raise exception #doesNotUnderstand:" self createActualMessageTo: class. messageSelector := objectMemory splObj: SelectorDoesNotUnderstand. self sendBreak: messageSelector + BaseHeaderSize point: (objectMemory lengthOf: messageSelector) receiver: nil. ^self lookupMethodInClass: class! Item was changed: ----- Method: StackInterpreter>>lookupMethodInDictionary: (in category 'message sending') ----- lookupMethodInDictionary: dictionary "This method lookup tolerates integers as Dictionary keys to support execution of images in which Symbols have been compacted out." | length index mask wrapAround nextSelector methodArray | <inline: true> <asmLabel: false> length := objectMemory fetchWordLengthOf: dictionary. mask := length - SelectorStart - 1. "Use linear search on small dictionaries; its cheaper. Also the limit can be set to force linear search of all dictionaries, which supports the booting of images that need rehashing (e.g. because a tracer has generated an image with different hashes but hasn't rehashed it yet.)" mask <= methodDictLinearSearchLimit ifTrue: [index := 0. [index <= mask] whileTrue: [nextSelector := objectMemory fetchPointer: index + SelectorStart ofObject: dictionary. nextSelector = messageSelector ifTrue: [methodArray := objectMemory fetchPointer: MethodArrayIndex ofObject: dictionary. + newMethod := objectMemory followField: index ofObject: methodArray. - newMethod := objectMemory fetchPointer: index ofObject: methodArray. ^true]. index := index + 1]. ^false]. index := SelectorStart + (mask bitAnd: ((objectMemory isImmediate: messageSelector) ifTrue: [objectMemory integerValueOf: messageSelector] ifFalse: [objectMemory hashBitsOf: messageSelector])). "It is assumed that there are some nils in this dictionary, and search will stop when one is encountered. However, if there are no nils, then wrapAround will be detected the second time the loop gets to the end of the table." wrapAround := false. [true] whileTrue: [nextSelector := objectMemory fetchPointer: index ofObject: dictionary. + nextSelector = objectMemory nilObject ifTrue: [^false]. - nextSelector = objectMemory nilObject ifTrue: [^ false]. nextSelector = messageSelector ifTrue: [methodArray := objectMemory fetchPointer: MethodArrayIndex ofObject: dictionary. + newMethod := objectMemory followField: index - SelectorStart ofObject: methodArray. - newMethod := objectMemory fetchPointer: index - SelectorStart ofObject: methodArray. ^true]. index := index + 1. index = length ifTrue: [wrapAround ifTrue: [^false]. wrapAround := true. index := SelectorStart]]. ^false "for Slang"! Item was changed: ----- Method: StackInterpreter>>lookupMethodNoMNUEtcInClass: (in category 'callback support') ----- lookupMethodNoMNUEtcInClass: class "Lookup messageSelector in class. Answer 0 on success. Answer the splObj: index for the error selector to use on failure rather than performing MNU processing etc." | currentClass dictionary | <inline: true> currentClass := class. [currentClass ~= objectMemory nilObject] whileTrue: + [dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: currentClass. - [dictionary := objectMemory fetchPointer: MethodDictionaryIndex ofObject: currentClass. dictionary = objectMemory nilObject ifTrue: [lkupClass := self superclassOf: currentClass. ^SelectorCannotInterpret]. (self lookupMethodInDictionary: dictionary) ifTrue: [self addNewMethodToCache: class. ^0]. currentClass := self superclassOf: currentClass]. lkupClass := class. ^SelectorDoesNotUnderstand! 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 | 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. - dictionary := objectMemory fetchPointer: MethodDictionaryIndex ofObject: mixinApplication. found := self lookupMethodInDictionary: dictionary. found] whileFalse: [implicitReceiver := objectMemory fetchPointer: EnclosingObjectIndex ofObject: mixinApplication. theMixin := objectMemory fetchPointer: MixinIndex ofObject: mixinApplication. theMixin = objectMemory nilObject ifTrue: [^objectMemory nilObject]. targetMixin := objectMemory fetchPointer: EnclosingMixinIndex ofObject: theMixin]. ^implicitReceiver! Item was changed: StackInterpreterPrimitives subclass: #StackInterpreterSimulator + instanceVariableNames: 'bootstrapping byteCount breakCount sendCount printSends printReturns traceOn myBitBlt displayForm filesOpen imageName pluginList mappedPluginEntries quitBlock transcript displayView printFrameAtEachStep printBytecodeAtEachStep systemAttributes startMicroseconds externalSemaphoreSignalRequests externalSemaphoreSignalResponses extSemTabSize atEachStepBlock disableBooleanCheat' - instanceVariableNames: 'bootstrapping byteCount breakCount sendCount printSends printReturns traceOn myBitBlt displayForm filesOpen imageName pluginList mappedPluginEntries quitBlock transcript displayView printFrameAtEachStep printBytecodeAtEachStep startMicroseconds externalSemaphoreSignalRequests externalSemaphoreSignalResponses extSemTabSize atEachStepBlock disableBooleanCheat' classVariableNames: '' poolDictionaries: '' category: 'VMMaker-InterpreterSimulation'! !StackInterpreterSimulator commentStamp: 'eem 9/3/2013 11:05' prior: 0! This class defines basic memory access and primitive simulation so that the StackInterpreter can run simulated in the Squeak environment. It also defines a number of handy object viewing methods to facilitate pawing around in the object memory. To see the thing actually run, you could (after backing up this image and changes), execute (StackInterpreterSimulator new openOn: Smalltalk imageName) test ((StackInterpreterSimulator newWithOptions: #(NewspeakVM true MULTIPLEBYTECODESETS true)) openOn: 'ns101.image') test and be patient both to wait for things to happen, and to accept various things that may go wrong depending on how large or unusual your image may be. We usually do this with a small and simple benchmark image. Here's an example of what Eliot uses to launch the simulator in a window. The bottom-right window has a menu packed with useful stuff: | vm | vm := StackInterpreterSimulator newWithOptions: #(). vm openOn: '/Users/eliot/Squeak/Squeak4.4/trunk44.image'. vm setBreakSelector: #&. vm openAsMorph; run! Item was changed: ----- Method: StackInterpreterSimulator>>createActualMessageTo: (in category 'debugging traps') ----- createActualMessageTo: class + "false + ifTrue: + [(self stringOf: messageSelector) = 'run:with:in:' ifTrue: + [self halt]] + ifFalse: + [self halt: (self stringOf: messageSelector)]." - "self halt: (self stringOf: messageSelector)." ^super createActualMessageTo: class! Item was changed: ----- Method: StackInterpreterSimulator>>initialize (in category 'initialization') ----- initialize "Initialize the StackInterpreterSimulator when running the interpreter inside Smalltalk. The primary responsibility of this method is to allocate Smalltalk Arrays for variables that will be declared as statically-allocated global arrays in the translated code." bootstrapping := false. objectMemory ifNil: [objectMemory := self class objectMemoryClass simulatorClass new]. objectMemory coInterpreter: self. "Note: we must initialize ConstMinusOne differently for simulation, due to the fact that the simulator works only with +ve 32-bit values" ConstMinusOne := objectMemory integerObjectOf: -1. methodCache := Array new: MethodCacheSize. atCache := Array new: AtCacheTotalSize. self flushMethodCache. gcSemaphoreIndex := 0. externalSemaphoreSignalRequests := externalSemaphoreSignalResponses := #(). externalPrimitiveTable := CArrayAccessor on: (Array new: MaxExternalPrimitiveTableSize). externalPrimitiveTableFirstFreeIndex := 0. primitiveTable := self class primitiveTable copy. primitiveAccessorDepthTable := objectMemory hasSpurMemoryManagerAPI ifTrue: [self class primitiveAccessorDepthTable]. pluginList := {'' -> self }. mappedPluginEntries := OrderedCollection new. desiredNumStackPages := desiredEdenBytes := 0. "This is initialized on loading the image, but convenient for testing stack page values..." numStackPages := self defaultNumStackPages. startMicroseconds := Time totalSeconds * 1000000. "initialize InterpreterSimulator variables used for debugging" byteCount := 0. sendCount := 0. quitBlock := [^ self]. traceOn := true. printSends := printReturns := printFrameAtEachStep := printBytecodeAtEachStep := false. myBitBlt := BitBltSimulator new setInterpreter: self. transcript := Transcript. displayForm := 'Display has not yet been installed' asDisplayText form. suppressHeartbeatFlag := false. + systemAttributes := Dictionary new. extSemTabSize := 256. disableBooleanCheat := false! Item was changed: ----- Method: StackInterpreterSimulator>>ioLoadFunction:From:AccessorDepthInto: (in category 'plugin support') ----- ioLoadFunction: functionString From: pluginString AccessorDepthInto: accessorDepthPtr "Load and return the requested function from a module. Assign the accessor depth through accessorDepthPtr. N.B. The actual code lives in platforms/Cross/vm/sqNamedPrims.h" | firstTime plugin fnSymbol | firstTime := false. fnSymbol := functionString asSymbol. transcript cr; show: '(', byteCount printString, ') Looking for ', functionString, ' in ', (pluginString isEmpty ifTrue:['vm'] ifFalse:[pluginString]). functionString = breakSelector ifTrue: [self halt: breakSelector]. plugin := pluginList detect: [:any| any key = pluginString asString] ifNone: [firstTime := true. self loadNewPlugin: pluginString]. plugin ifNil: [firstTime ifTrue: [transcript cr; show: 'Failed ... primitive not in plugin']. ^0]. plugin := plugin value. mappedPluginEntries doWithIndex: [:pluginAndName :index| ((pluginAndName at: 1) == plugin and:[(pluginAndName at: 2) == fnSymbol]) ifTrue: + [firstTime ifTrue: [transcript show: ' ... okay'; cr]. - [firstTime ifTrue: [transcript cr; show: ' ... okay']. accessorDepthPtr at: 0 put: (pluginAndName at: 4). ^index]]. firstTime ifTrue: [transcript cr; show: 'Failed ... primitive not in plugin']. ^0! Item was added: + ----- Method: StackInterpreterSimulator>>preBecomeAction (in category 'object memory support') ----- + preBecomeAction + "((objectMemory instVarNamed: 'becomeEffectsFlags') anyMask: BecameCompiledMethodFlag) ifTrue: + [self halt]." + super preBecomeAction! Item was changed: ----- Method: StackInterpreterSimulator>>primitiveExecuteMethodArgsArray (in category 'control primitives') ----- primitiveExecuteMethodArgsArray + "self halt: thisContext selector." + (objectMemory isOopCompiledMethod: self stackTop) ifFalse: + [self halt]. - self halt: thisContext selector. ^super primitiveExecuteMethodArgsArray! Item was changed: ----- Method: StackInterpreterSimulator>>primitiveGetAttribute (in category 'other primitives') ----- primitiveGetAttribute "Fetch the system attribute with the given integer ID. The result is a string, which will be empty if the attribute is not defined." + | index s attribute | + index := self stackIntegerValue: 0. - | attr s attribute | - attr := self stackIntegerValue: 0. self successful ifTrue: [ + attribute := systemAttributes at: index ifAbsent: [Smalltalk getSystemAttribute: index]. - attribute := Smalltalk getSystemAttribute: attr. attribute ifNil: [ ^self primitiveFail ]. s := objectMemory instantiateClass: (objectMemory splObj: ClassByteString) indexableSize: attribute size. 1 to: attribute size do: [ :i | objectMemory storeByte: i-1 ofObject: s withValue: (attribute at: i) asciiValue]. self pop: 2. "rcvr, attr" self push: s]! Item was added: + ----- Method: StackInterpreterSimulator>>systemAttributes (in category 'simulation only') ----- + systemAttributes + ^systemAttributes!

1 0

PhD Position on Dynamic Reflective Language Integration with FPGAs for Robotic Applications
by jannik laval 20 Jan '14

20 Jan '14

The position is available now. Interested candidates may apply as soon as possible. *Title:* Ph.D. Student Position on Dynamic Reflective Language Integration with FPGAs for Robotic Applications *Location:* Mines de Douai and ENSTA Brest (France) *Advisor and contacts:* Noury Bouraqadi (noury.bouraqadi(a)mines-douai.fr) Luc Fabresse (luc.fabresse(a)mines-douai.fr) Loïc Lagadec (loic.lagadec(a)ensta-bretagne.fr) Jannik Laval (jannik.laval(a)mines-douai.fr) *Profile:* the candidate must must hold a recent Master of Science degree in Computer Science or Software Engineering and must have solid skills in dynamic reflective language (Smalltalk). *Description of the work:* The goal of this PhD is to study Smalltalk integration with FPGAs for robotic applications. This integration will enable us get the best from both worlds. Developers are provided with a high-level dynamic reflective language (Smalltalk) for building and debugging their applications. Still, we can have high performances by projecting part of the programs into FPGAs. These reconfigurable hardware chips can achieve performance faster than C programs, while consuming much less energy. The work to do can decompose into the following tasks: -Build reference robotic applications fully in Pharo Smalltalk using actual robots (see http://car.mines-douai.fr/robots/) -Analyze these applications to identify critical parts to project on FPGAs to significantly increase performances (speed, energy) -Do the actual projection to FPGA and evaluate performances of the transformed applications -Generalize the approach and define a methodology for turning Smalltalk code into FPGA -Propose a solution to automate the methodology The Ph.D student will receive a grant which net amount is approximately 1420 euros per month for 3 years (36 months). He will be co-supervised by Loïc Lagadec from the ENSTA-Bretagne (Lab-STICC, Brest) and Jannik Laval, Luc Fabresse and Noury Bouraqadi from Ecole des Mines de Douai (CAR, http://car.mines-douai.fr/). The first 18th month will be spent in Douai (Lille area), while the last half of the PhD will be spent in Brest. However, during the full 3 years, there will be a strong interaction with co-supervisers from both labs. *Bibliography:* -A Robust Layered Control System For A Mobile Robot. R. Brooks. IEEE Journal of Robotics and Automation. Vol. 2. Num 1. March, 1985. -RCS: A Cognitive Architecture for Intelligent MultiAgent Systems. J.S. Albus and A. J. Barbera. Proceedings of the 5th IFAC/EURON Symposium on Intelligent Autonomous Vehicles (IAV 2004). Lisbon, Portugal, 2004. -Handbook of Robotics. Bruno Siciliano and Oussama Khatib editors. Springer. 2008. -Multi-Level Simulation of Heterogeneous Reconfigurable Platforms. D. Picard and L. Lagadec. International Journal of Reconfigurable Computing. 2012. -High-level synthesis for FPGAs: From Prototyping to Deployment. Jason cong and stephen neuendorffer and juanjo noguera and kees vissers and zhiru zhang. IEEE Transactions on Computer-aided design of integrated circuits and systems. Vol. 30. Num 4. April, 2011. -The MOLEN Polymorphic Processor. S. Vassiliadis and S. Wong and G. Gaydadjiev and K. Bertels and G. Kuzmanov and E. Moscu Panainte. IEEE Transactions on Computers. 2004. -- ~~Jannik Laval~~ École des Mines de Douai Enseignant-chercheur http://www.jannik-laval.eu http://car.mines-douai.fr/

1 0

Squeak Oversight Board Election 2014
by Ron Teitelbaum 20 Jan '14

20 Jan '14

Hi All, It's that time again. Every year we elect the SOB (Squeak Oversight Board) consisting of seven members from our community. The current board is: http://www.squeak.org/Foundation/Board Everything about the election, including schedule and more, can be tracked here: http://wiki.squeak.org/squeak/6195 Now until Monday 10th of February 3PM (20.00 UTC): Nominations of SOB members and campaigning! Candidates should nominate themselves and start their campaign on the squeak-dev mailing list. Or if you nominate someone else, make sure that person really wants to run. :) I will not put anyone on the candidate list until that person makes it known on squeak-dev that he/she intends to run. During this period, the candidates should ideally present themselves on squeak-dev, unless they have already done so, and the community can ask questions. I encourage you to reach out to potential candidates, people that are active in the community and represent your views, and ask them to run. Some people will not run without encouragement. *** Monday 10th of February 2014 3PM (20.00 UTC): Candidate list is finalized. *** Monday 10th of February 2014 4PM (21.00 UTC): Online election starts. *** Tuesday 18th of February 2014 6PM (23.00 UTC): Online election ends. ***Results will be announced immediately when the election ends. The voting period is one week long and ballots are sent out via email. And how do you end up on the voter list? See below. :) IMPORTANT: New voters will NOT be added once the election is started. You MUST try to get on the voter list before the 10th of February 2014 or you will NOT be able to vote. If your Email has changed make sure it is changed on the list of voters before the election starts. -------------------------- If you were invited to vote last year you are already on the voter list, no worries! If you are a new Squeaker and wish to vote do ONE of the following: * Get a "known" Squeaker to vouch for you. If a known Squeaker sends an email to voters (at) squeak.org giving me name and email for you, then I will add you. * Send an email to voters at squeak.org yourself (and CC to squeak-dev if you like) with information/arguments showing me that you are indeed serious about voting and that you are indeed a Squeaker. When the voting period starts all voters will receive an email with instructions and a link to the voting website. If there are any further questions, just reply *in this thread* and I will closely track it - or send email to voters (at) squeak.org which points to me. ...so let's get on with it! All the best, Ron Teitelbaum

1 0

Warning, warning.. new danger!
by Igor Stasenko 17 Jan '14

17 Jan '14

From: http://sourceforge.net/p/fbc/bugs/659/ "The GCC devs decided to unilaterally change the Linux x86 ABI [1] [2] [3] [4]. I'm not sure when this happened, but I think it first became a common problem with GCC 4.1. Previously the Linux x86 ABI was the "SysV i386 ABI", which stated that the stack is aligned to a 4-byte boundary on function entry. GCC now assumes by default that the stack is aligned to a 16-byte boundary. This is an very controversial issue with the GCC devs saying they have changed the ABI, and many other people considering the SysV ABI to be the real ABI and GCC to be buggy. GCC Bugzilla is full of flamewars. GCC devs have said "GCC chose to change the *unwritten* standard for the ABI in use for IA32 GNU/Linux" and "The ABI is undocumented; that is reality" [3]" basically, it affects everything which dealing with generated code. like JIT/FFI. Now it explains why NB started crashing on never versions of ubuntu, while worked well before. -- Best regards, Igor Stasenko.

3 3

Re: [Vm-dev] [Foo]InterpreterSimulator not responding to events...
by Eliot Miranda 16 Jan '14

16 Jan '14

Hi All, more whitewash... On Thu, Jan 16, 2014 at 9:41 AM, Eliot Miranda <eliot.miranda(a)gmail.com>wrote: > > > > On Thu, Jan 16, 2014 at 9:36 AM, Eliot Miranda <eliot.miranda(a)gmail.com>wrote: > >> Hi Tty, >> >> >> On Thu, Jan 16, 2014 at 8:10 AM, gettimothy <gettimothy(a)zoho.com> wrote: >> >>> >>> I am hosting (? correct term) the StackInterpreterSimulator on >>> Squeak4.5-13352.image running Cog. >>> >>> I instruct the simulator to use a copy of that image that I have renamed >>> to Squeak4.5.image. >>> >>> >>> | vm | >>> Transcript clear. >>> vm := StackInterpreterSimulator newWithOptions: #(). >>> vm openOn: >>> 'home/tty/usr/src/smalltalk/buildCogDevelopmentImageCog.app/Contents/Resources/Squeak4.5.image'. >>> vm >>> openAsMorph; >>> toggleTranscript; >>> halt; >>> run >>> >>> >>> The simulation runs, but the simulated World does not respond to mouse >>> clicks (the control panel of the Simulator works just fine). >>> >> >> Right. I've not looked at this. It never worked for me and I think its >> to do with the "new" event mechanism bssed around the interruptPending inst >> var. So for now I use an image that has a read-eval-print-loop in it. >> Much better would be for the input scheme to work. But I've not had time >> or occasion to look at the Interpreter and update StackInterpreterSimulator >> appropriately so it responds to input. >> > > Hmmm, looking at Interpreter in the VMMaker.oscog package I see that > nothing in the simulator does set interruptPending. David, does the trunk > VMMaker package's InterpreterSimulator respond to input? > I see that in the various FooSimulator>>openAsMorph methods the basic morph used to display the simulated Smalltalk image is an ImageMorph on the Smalltalk image's displayForm. Looking at the event handling it looks like this bottoms out at methods like Morph>>mouseDown: evt "Handle a mouse down event. The default response is to let my eventHandler, if any, handle it." evt yellowButtonPressed ifTrue: ["First check for option (menu) click" ^ self yellowButtonActivity: evt shiftPressed]. self eventHandler ifNotNil: [self eventHandler mouseDown: evt fromMorph: self] So it could be straight-forward to plum-in a suitably-written event handler (e.g. an object that wraps the FooSimulator so that it can be reused in each of the simulators, instead of using the simulator as the eventHandler itself). Any volunteers? I would like to rule out a missing option in the newWithOptions: #() line >>> >>> Specifically the "type of VM options in VMBasicConstants: >>> >>> #COGMTVM >>> #COGVM >>> #NewspeakVM >>> #STACKVM >>> #VMBIGENDIAN >>> >>> 1. To my way of thinking, since I am running a >>> StackInterpreterSimulator, passing the option #STACKVM makes no sense. >>> 2. Also--if I remember correctly--when first running Cog on a StackVM >>> (?) image, it prompts the user that running Cog will make the image >>> unusable for the StackInterpreter. >>> 3. Therefore telling the StackIntepreterSimulator to expect a COGVM >>> image makes no sense either. >>> 4. Equally perplexing is the fact that the simulation does run -- it is >>> just stuck in idle--which tells me I am incorrect about 2. above. >>> >>> >>> I will be poking around in the guts of things in the mean time. >>> >>> >>> thx >>> >>> tty >>> >>> >>> >>> >>> >>> >> >> >> -- >> best, >> Eliot >> > > > > -- > best, > Eliot > -- best, Eliot

2 3

[commit][2847] CogVM source as per VMMaker.oscog-eem.585
by commits＠squeakvm.org 16 Jan '14

16 Jan '14

Revision: 2847 Author: eliot Date: 2014-01-16 10:49:26 -0800 (Thu, 16 Jan 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.585 Fix become on compiled methods in Spur. followForwardedMethods must use isForwarded:/followForwarded: not shouldRemapObj: because the latter will confuse methods in newSpace for forwarded methods. Rename the interpreter followForwardedMethods' to followForwardedMethodsInMethodZone. Add CogMethodZone>>printCogYoungReferrers. Better svn:ignore pattern for . to ignore spur linux installs. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/spurstacksrc/vm/vmCallback.h branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c branches/Cog/stacksrc/vm/interp.h branches/Cog/stacksrc/vm/vmCallback.h Property Changed: ---------------- branches/Cog/ branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Property changes on: branches/Cog ___________________________________________________________________ Modified: svn:ignore - ChangeHistory MVALOG README.* *.app *.dmg *.msi *.tgz *.zip cogastlinux cogastlinuxpt cogdbglinux cogdbglinuxpt coglinux coglinuxpt cogmtlinux cogwin cogmtwin nsvmlinux nsvmlinuxpt nsvmlinuxast nsvmlinuxastpt nsvmlinuxdbg nsvmlinuxdbgpt nsvmwin + ChangeHistory MVALOG README.* *.app *.dmg *.msi *.tgz *.zip cog*linux* cog*win* nsvm*linux* nsvm*win* Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2014-01-14 02:14:07 UTC (rev 2846) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-01-16 18:49:26 UTC (rev 2847) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272 + CCodeGenerator VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff from - StackToRegisterMappingCogit VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272 + StackToRegisterMappingCogit VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -979,6 +979,7 @@ void printCogMethodsWithMethod(sqInt methodOop); void printCogMethodsWithPrimitive(sqInt primIdx); void printCogMethodsWithSelector(sqInt selectorOop); +void printCogYoungReferrers(void); void printTrampolineTable(void); static sqInt processorHasDivQuoRem(sqInt ignoredPrimIndex); static sqInt processorHasDoublePrecisionFloatingPointSupport(sqInt ignoredPrimIndex); @@ -4270,8 +4271,9 @@ /* Compile the abstract instructions for a full closed PIC used to initialize - closedPICSize - */ + closedPICSize. The loads into SendNumArgsReg are those for optional method + objects which may be + used in MNU cases. */ static sqInt compileClosedPICPrototype(void) @@ -15417,11 +15419,7 @@ ssPop(2); resultReg = availableRegisterOrNil(); if (!(resultReg)) { - if (((numRegArgs()) > 1) - && ((!needsFrame) - && (methodOrBlockNumArgs == 2))) { - halt(); - } + ; ssAllocateRequiredReg((resultReg = Arg1Reg)); } ssPush(2); @@ -16999,10 +16997,7 @@ if ((methodOrBlockNumArgs <= (numRegArgs())) && (methodOrBlockNumArgs > 0)) { regsSet = regsSet | (registerMaskFor(Arg0Reg)); - if (((numRegArgs()) > 1) - && (methodOrBlockNumArgs > 1)) { - regsSet = regsSet | (registerMaskFor(Arg1Reg)); - } + } } for (i = (((simSpillBase < 0) ? 0 : simSpillBase)); i <= simStackPtr; i += 1) { @@ -18066,19 +18061,10 @@ } else { if (numArgs > 0) { - if (((numRegArgs()) > 1) - && (numArgs > 1)) { - ssAllocateRequiredRegupThrough(Arg0Reg, simStackPtr - 2); - ssAllocateRequiredRegupThrough(Arg1Reg, simStackPtr - 1); - } - else { - ssAllocateRequiredRegupThrough(Arg0Reg, simStackPtr - 1); - } + ssAllocateRequiredRegupThrough(Arg0Reg, simStackPtr - 1); + } - if (((numRegArgs()) > 1) - && (numArgs > 1)) { - popToReg(simStackAt(simStackPtr), Arg1Reg); - } + if (numArgs > 0) { popToReg(simStackAt((simStackPtr - numArgs) + 1), Arg0Reg); } @@ -18130,19 +18116,10 @@ Also check for any arg registers in use by other args. */ if (numArgs > 0) { - if (((numRegArgs()) > 1) - && (numArgs > 1)) { - ssAllocateRequiredRegupThrough(Arg0Reg, simStackPtr - 2); - ssAllocateRequiredRegupThrough(Arg1Reg, simStackPtr - 1); - } - else { - ssAllocateRequiredRegupThrough(Arg0Reg, simStackPtr - 1); - } + ssAllocateRequiredRegupThrough(Arg0Reg, simStackPtr - 1); + } - if (((numRegArgs()) > 1) - && (numArgs > 1)) { - popToReg(simStackAt(simStackPtr), Arg1Reg); - } + if (numArgs > 0) { popToReg(simStackAt((simStackPtr - numArgs) + 1), Arg0Reg); } @@ -18972,6 +18949,23 @@ } void +printCogYoungReferrers(void) +{ + CogMethod *cogMethod; + sqInt pointer; + + pointer = youngReferrers; + while (pointer < limitAddress) { + cogMethod = ((CogMethod *) (longAt(pointer))); + if (!((cogMethod->cmRefersToYoung))) { + print("* "); + } + printCogMethod(cogMethod); + pointer += BytesPerWord; + } +} + +void printTrampolineTable(void) { sqInt i; @@ -21078,7 +21072,7 @@ } -/* Update a potential object reference form a closed PIC. +/* Update a potential object reference from a closed PIC. This may be an object reference, an inline cache tag or null. Answer if the updated literal is young. */ Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-01-14 02:14:07 UTC (rev 2846) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-01-16 18:49:26 UTC (rev 2847) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272 + CCodeGenerator VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff */ @@ -60,6 +60,7 @@ void printCogMethodsWithMethod(sqInt methodOop); void printCogMethodsWithPrimitive(sqInt primIdx); void printCogMethodsWithSelector(sqInt selectorOop); +void printCogYoungReferrers(void); void printTrampolineTable(void); void recordCallOffsetInof(CogMethod *cogMethod, void *callLabelArg); sqInt recordPrimTraceFunc(void); Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2014-01-14 02:14:07 UTC (rev 2846) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2014-01-16 18:49:26 UTC (rev 2847) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272 + CCodeGenerator VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff */ typedef struct { Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Mon Jan 13 18:13:36 PST 2014 + Thu Jan 16 10:48:19 PST 2014 Modified: branches/Cog/spursrc/vm/cogit.c =================================================================== --- branches/Cog/spursrc/vm/cogit.c 2014-01-14 02:14:07 UTC (rev 2846) +++ branches/Cog/spursrc/vm/cogit.c 2014-01-16 18:49:26 UTC (rev 2847) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272 + CCodeGenerator * VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa from - StackToRegisterMappingCogit VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272 + StackToRegisterMappingCogit * VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit * VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -550,6 +550,8 @@ CogBlockMethod * findMethodForStartBcpcinHomeMethod(sqInt startbcpc, CogMethod *cogMethod); void followForwardedLiteralsIn(CogMethod *cogMethod); void followForwardedMethods(void); +static sqInt followMaybeObjRefAt(sqInt mcpc); +static sqInt followMethodReferencesInClosedPIC(CogMethod *cPIC); static sqInt frameOffsetOfTemporary(sqInt index); static void freeMethod(CogMethod *cogMethod); static void freeOlderMethodsForCompaction(void); @@ -937,6 +939,7 @@ void printCogMethodsWithMethod(sqInt methodOop); void printCogMethodsWithPrimitive(sqInt primIdx); void printCogMethodsWithSelector(sqInt selectorOop); +void printCogYoungReferrers(void); void printTrampolineTable(void); static sqInt processorHasDivQuoRem(sqInt ignoredPrimIndex); static sqInt processorHasDoublePrecisionFloatingPointSupport(sqInt ignoredPrimIndex); @@ -3823,8 +3826,9 @@ /* Compile the abstract instructions for a full closed PIC used to initialize - closedPICSize - */ + closedPICSize. The loads into SendNumArgsReg are those for optional method + objects which may be + used in MNU cases. */ static sqInt compileClosedPICPrototype(void) @@ -9708,8 +9712,8 @@ cogMethod = ((CogMethod *) methodZoneBase); while (cogMethod < (limitZony())) { if (((cogMethod->cmType)) == CMMethod) { - if (shouldRemapOop((cogMethod->methodObject))) { - (cogMethod->methodObject = remapObj((cogMethod->methodObject))); + if (isForwarded((cogMethod->methodObject))) { + (cogMethod->methodObject = followForwarded((cogMethod->methodObject))); if ((!((cogMethod->cmRefersToYoung))) && (isYoungObject((cogMethod->methodObject)))) { addToYoungReferrers(cogMethod); @@ -9717,7 +9721,7 @@ } } if (((cogMethod->cmType)) == CMClosedPIC) { - if (mapObjectReferencesInClosedPIC(cogMethod)) { + if (followMethodReferencesInClosedPIC(cogMethod)) { freedPIC = 1; freeMethod(cogMethod); } @@ -9730,7 +9734,55 @@ } } + +/* Follow a potential object reference from a closed PIC. + This may be a method reference or null. + Answer if the followed literal is young. */ + static sqInt +followMaybeObjRefAt(sqInt mcpc) +{ + sqInt object; + sqInt subject; + + object = literalBeforeFollowingAddress(backEnd, mcpc); + if (!(couldBeObject(object))) { + return 0; + } + if (!(isForwarded(object))) { + return isYoungObject(object); + } + subject = followForwarded(object); + storeLiteralbeforeFollowingAddress(backEnd, subject, mcpc); + codeModified = 1; + return isYoungObject(subject); +} + + +/* Remap all object references in the closed PIC. Answer if any references + are young. + Set codeModified if any modifications are made. */ + +static sqInt +followMethodReferencesInClosedPIC(CogMethod *cPIC) +{ + sqInt i; + sqInt pc; + sqInt refersToYoung; + + pc = (((sqInt)cPIC)) + firstCPICCaseOffset; + refersToYoung = followMaybeObjRefAt(pc - (jumpLongByteSize(backEnd))); + pc += cPICCaseSize; + for (i = 2; i <= ((cPIC->cPICNumCases)); i += 1) { + if (followMaybeObjRefAt(pc - (jumpLongConditionalByteSize(backEnd)))) { + refersToYoung = 1; + } + pc += cPICCaseSize; + } + return refersToYoung; +} + +static sqInt frameOffsetOfTemporary(sqInt index) { return (index < methodOrBlockNumArgs @@ -18550,6 +18602,23 @@ } void +printCogYoungReferrers(void) +{ + CogMethod *cogMethod; + sqInt pointer; + + pointer = youngReferrers; + while (pointer < limitAddress) { + cogMethod = ((CogMethod *) (longAt(pointer))); + if (!((cogMethod->cmRefersToYoung))) { + print("* "); + } + printCogMethod(cogMethod); + pointer += BytesPerWord; + } +} + +void printTrampolineTable(void) { sqInt i; @@ -20464,7 +20533,7 @@ } -/* Update a potential object reference form a closed PIC. +/* Update a potential object reference from a closed PIC. This may be an object reference, an inline cache tag or null. Answer if the updated literal is young. */ Modified: branches/Cog/spursrc/vm/cogit.h =================================================================== --- branches/Cog/spursrc/vm/cogit.h 2014-01-14 02:14:07 UTC (rev 2846) +++ branches/Cog/spursrc/vm/cogit.h 2014-01-16 18:49:26 UTC (rev 2847) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272 + CCodeGenerator * VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa */ @@ -61,6 +61,7 @@ void printCogMethodsWithMethod(sqInt methodOop); void printCogMethodsWithPrimitive(sqInt primIdx); void printCogMethodsWithSelector(sqInt selectorOop); +void printCogYoungReferrers(void); void printTrampolineTable(void); void recordCallOffsetInof(CogMethod *cogMethod, void *callLabelArg); sqInt recordPrimTraceFunc(void); Modified: branches/Cog/spursrc/vm/cointerp.c =================================================================== --- branches/Cog/spursrc/vm/cointerp.c 2014-01-14 02:14:07 UTC (rev 2846) +++ branches/Cog/spursrc/vm/cointerp.c 2014-01-16 18:49:26 UTC (rev 2847) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa + CCodeGeneratorGlobalStructure * VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa from - CoInterpreter VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa + CoInterpreter * VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa " __DATE__ ; +static char __buildInfo[] = "CoInterpreter * VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -614,7 +614,7 @@ static void followForwardedFrameContentsstackPointer(char *theFP, char *theSP); static sqInt followForwardedInObjStackatIndex(sqInt objStack, sqInt objStackRootIndex); static sqInt followForwardedObjectFieldstoDepth(sqInt objOop, sqInt depth); -static sqInt followForwarded(sqInt objOop); +sqInt followForwarded(sqInt objOop); static void followForwardingPointersInStackZone(sqInt theBecomeEffectsFlags); static void followNecessaryForwardingInMethod(sqInt methodObj); sqInt forceInterruptCheck(void); @@ -2164,7 +2164,7 @@ /* 575 */ (void (*)(void))0, 0 }; usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.584]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter * VMMaker.oscog-eem.584]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -6374,7 +6374,6 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((rcvr1 + (BaseHeaderSize)) + (byte3 << 2))); } - null; goto l4; } if (opType == 3) { @@ -6384,7 +6383,6 @@ assert(GIV(method) == (iframeMethod(localFP))); object = longAt((GIV(method) + (BaseHeaderSize)) + ((byte3 + LiteralStart) << 2)); longAtPointerput((localSP -= BytesPerOop), object); - null; goto l4; } if (opType == 4) { @@ -6412,7 +6410,6 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar1 + (BaseHeaderSize)) + (ValueIndex << 2))); - null; goto l4; } top = longAtPointer(localSP); @@ -12665,8 +12662,9 @@ GIV(methodCache)[i + MethodCacheMethod] = m; } } + /* begin followForwardedMethodsInMethodZone */ + followForwardedMethods(); } - followForwardedMethods(); /* begin followForwardingPointersInScheduler */ /* the GC follows pointers in the special objects array for us. */ @@ -23057,7 +23055,7 @@ - when accessing array first one has to follow a forwarding chain: &a -> &b -> c */ -static sqInt +sqInt followForwarded(sqInt objOop) { sqInt referent; Modified: branches/Cog/spursrc/vm/cointerp.h =================================================================== --- branches/Cog/spursrc/vm/cointerp.h 2014-01-14 02:14:07 UTC (rev 2846) +++ branches/Cog/spursrc/vm/cointerp.h 2014-01-16 18:49:26 UTC (rev 2847) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa + CCodeGeneratorGlobalStructure * VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa */ @@ -85,6 +85,7 @@ sqInt fixedFieldsFieldWidth(void); sqInt fixedFieldsOfClassFormatMask(void); sqInt flushExternalPrimitiveOf(sqInt methodObj); +sqInt followForwarded(sqInt objOop); sqInt formatMask(void); sqInt formatOfClass(sqInt classPointer); sqInt formatShift(void); Modified: branches/Cog/spursrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-01-14 02:14:07 UTC (rev 2846) +++ branches/Cog/spursrc/vm/gcc3x-cointerp.c 2014-01-16 18:49:26 UTC (rev 2847) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa + CCodeGeneratorGlobalStructure * VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa from - CoInterpreter VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa + CoInterpreter * VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa " __DATE__ ; +static char __buildInfo[] = "CoInterpreter * VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -617,7 +617,7 @@ static void followForwardedFrameContentsstackPointer(char *theFP, char *theSP); static sqInt followForwardedInObjStackatIndex(sqInt objStack, sqInt objStackRootIndex); static sqInt followForwardedObjectFieldstoDepth(sqInt objOop, sqInt depth); -static sqInt followForwarded(sqInt objOop); +sqInt followForwarded(sqInt objOop); static void followForwardingPointersInStackZone(sqInt theBecomeEffectsFlags); static void followNecessaryForwardingInMethod(sqInt methodObj); sqInt forceInterruptCheck(void); @@ -2167,7 +2167,7 @@ /* 575 */ (void (*)(void))0, 0 }; usqInt heapBase; -const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter VMMaker.oscog-eem.584]"; +const char *interpreterVersion = "Croquet Closure Cog VM [CoInterpreter * VMMaker.oscog-eem.584]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -6383,7 +6383,6 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((rcvr1 + (BaseHeaderSize)) + (byte3 << 2))); } - null; goto l4; } if (opType == 3) { @@ -6393,7 +6392,6 @@ assert(GIV(method) == (iframeMethod(localFP))); object = longAt((GIV(method) + (BaseHeaderSize)) + ((byte3 + LiteralStart) << 2)); longAtPointerput((localSP -= BytesPerOop), object); - null; goto l4; } if (opType == 4) { @@ -6421,7 +6419,6 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar1 + (BaseHeaderSize)) + (ValueIndex << 2))); - null; goto l4; } top = longAtPointer(localSP); @@ -12674,8 +12671,9 @@ GIV(methodCache)[i + MethodCacheMethod] = m; } } + /* begin followForwardedMethodsInMethodZone */ + followForwardedMethods(); } - followForwardedMethods(); /* begin followForwardingPointersInScheduler */ /* the GC follows pointers in the special objects array for us. */ @@ -23066,7 +23064,7 @@ - when accessing array first one has to follow a forwarding chain: &a -> &b -> c */ -static sqInt +sqInt followForwarded(sqInt objOop) { sqInt referent; Modified: branches/Cog/spurstacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-01-14 02:14:07 UTC (rev 2846) +++ branches/Cog/spurstacksrc/vm/gcc3x-interp.c 2014-01-16 18:49:26 UTC (rev 2847) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff from - StackInterpreter VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa + StackInterpreter VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -513,7 +513,7 @@ static void followForwardedFrameContentsstackPointer(char *theFP, char *theSP); static sqInt followForwardedInObjStackatIndex(sqInt objStack, sqInt objStackRootIndex); static sqInt followForwardedObjectFieldstoDepth(sqInt objOop, sqInt depth); -static sqInt followForwarded(sqInt objOop); +sqInt followForwarded(sqInt objOop); static void followForwardingPointersInStackZone(sqInt theBecomeEffectsFlags); static void followNecessaryForwardingInMethod(sqInt methodObj); sqInt forceInterruptCheck(void); @@ -1957,7 +1957,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.584]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.585]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -12871,8 +12871,8 @@ GIV(methodCache)[i + MethodCacheMethod] = m; } } + /* begin followForwardedMethodsInMethodZone */ } - /* begin followForwardedMethods */ /* begin followForwardingPointersInScheduler */ /* the GC follows pointers in the special objects array for us. */ @@ -20890,7 +20890,7 @@ - when accessing array first one has to follow a forwarding chain: &a -> &b -> c */ -static sqInt +sqInt followForwarded(sqInt objOop) { sqInt referent; Modified: branches/Cog/spurstacksrc/vm/interp.c =================================================================== --- branches/Cog/spurstacksrc/vm/interp.c 2014-01-14 02:14:07 UTC (rev 2846) +++ branches/Cog/spurstacksrc/vm/interp.c 2014-01-16 18:49:26 UTC (rev 2847) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff from - StackInterpreter VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa + StackInterpreter VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -510,7 +510,7 @@ static void followForwardedFrameContentsstackPointer(char *theFP, char *theSP); static sqInt followForwardedInObjStackatIndex(sqInt objStack, sqInt objStackRootIndex); static sqInt followForwardedObjectFieldstoDepth(sqInt objOop, sqInt depth); -static sqInt followForwarded(sqInt objOop); +sqInt followForwarded(sqInt objOop); static void followForwardingPointersInStackZone(sqInt theBecomeEffectsFlags); static void followNecessaryForwardingInMethod(sqInt methodObj); sqInt forceInterruptCheck(void); @@ -1954,7 +1954,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.584]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.585]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; @@ -12862,8 +12862,8 @@ GIV(methodCache)[i + MethodCacheMethod] = m; } } + /* begin followForwardedMethodsInMethodZone */ } - /* begin followForwardedMethods */ /* begin followForwardingPointersInScheduler */ /* the GC follows pointers in the special objects array for us. */ @@ -20881,7 +20881,7 @@ - when accessing array first one has to follow a forwarding chain: &a -> &b -> c */ -static sqInt +sqInt followForwarded(sqInt objOop) { sqInt referent; Modified: branches/Cog/spurstacksrc/vm/interp.h =================================================================== --- branches/Cog/spurstacksrc/vm/interp.h 2014-01-14 02:14:07 UTC (rev 2846) +++ branches/Cog/spurstacksrc/vm/interp.h 2014-01-16 18:49:26 UTC (rev 2847) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/spurstacksrc/vm/vmCallback.h =================================================================== --- branches/Cog/spurstacksrc/vm/vmCallback.h 2014-01-14 02:14:07 UTC (rev 2846) +++ branches/Cog/spurstacksrc/vm/vmCallback.h 2014-01-16 18:49:26 UTC (rev 2847) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/src/vm/cogit.c =================================================================== --- branches/Cog/src/vm/cogit.c 2014-01-14 02:14:07 UTC (rev 2846) +++ branches/Cog/src/vm/cogit.c 2014-01-16 18:49:26 UTC (rev 2847) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272 + CCodeGenerator VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff from - StackToRegisterMappingCogit VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272 + StackToRegisterMappingCogit VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -932,6 +932,7 @@ void printCogMethodsWithMethod(sqInt methodOop); void printCogMethodsWithPrimitive(sqInt primIdx); void printCogMethodsWithSelector(sqInt selectorOop); +void printCogYoungReferrers(void); void printTrampolineTable(void); static sqInt processorHasDivQuoRem(sqInt ignoredPrimIndex); static sqInt processorHasDoublePrecisionFloatingPointSupport(sqInt ignoredPrimIndex); @@ -3824,8 +3825,9 @@ /* Compile the abstract instructions for a full closed PIC used to initialize - closedPICSize - */ + closedPICSize. The loads into SendNumArgsReg are those for optional method + objects which may be + used in MNU cases. */ static sqInt compileClosedPICPrototype(void) @@ -14229,11 +14231,7 @@ ssPop(2); resultReg = availableRegisterOrNil(); if (!(resultReg)) { - if (((numRegArgs()) > 1) - && ((!needsFrame) - && (methodOrBlockNumArgs == 2))) { - halt(); - } + ; ssAllocateRequiredReg((resultReg = Arg1Reg)); } ssPush(2); @@ -15794,10 +15792,7 @@ if ((methodOrBlockNumArgs <= (numRegArgs())) && (methodOrBlockNumArgs > 0)) { regsSet = regsSet | (registerMaskFor(Arg0Reg)); - if (((numRegArgs()) > 1) - && (methodOrBlockNumArgs > 1)) { - regsSet = regsSet | (registerMaskFor(Arg1Reg)); - } + } } for (i = (((simSpillBase < 0) ? 0 : simSpillBase)); i <= simStackPtr; i += 1) { @@ -16699,19 +16694,10 @@ Also check for any arg registers in use by other args. */ if (numArgs > 0) { - if (((numRegArgs()) > 1) - && (numArgs > 1)) { - ssAllocateRequiredRegupThrough(Arg0Reg, simStackPtr - 2); - ssAllocateRequiredRegupThrough(Arg1Reg, simStackPtr - 1); - } - else { - ssAllocateRequiredRegupThrough(Arg0Reg, simStackPtr - 1); - } + ssAllocateRequiredRegupThrough(Arg0Reg, simStackPtr - 1); + } - if (((numRegArgs()) > 1) - && (numArgs > 1)) { - popToReg(simStackAt(simStackPtr), Arg1Reg); - } + if (numArgs > 0) { popToReg(simStackAt((simStackPtr - numArgs) + 1), Arg0Reg); } @@ -17541,6 +17527,23 @@ } void +printCogYoungReferrers(void) +{ + CogMethod *cogMethod; + sqInt pointer; + + pointer = youngReferrers; + while (pointer < limitAddress) { + cogMethod = ((CogMethod *) (longAt(pointer))); + if (!((cogMethod->cmRefersToYoung))) { + print("* "); + } + printCogMethod(cogMethod); + pointer += BytesPerWord; + } +} + +void printTrampolineTable(void) { sqInt i; @@ -19451,7 +19454,7 @@ } -/* Update a potential object reference form a closed PIC. +/* Update a potential object reference from a closed PIC. This may be an object reference, an inline cache tag or null. Answer if the updated literal is young. */ Modified: branches/Cog/src/vm/cogit.h =================================================================== --- branches/Cog/src/vm/cogit.h 2014-01-14 02:14:07 UTC (rev 2846) +++ branches/Cog/src/vm/cogit.h 2014-01-16 18:49:26 UTC (rev 2847) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272 + CCodeGenerator VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff */ @@ -60,6 +60,7 @@ void printCogMethodsWithMethod(sqInt methodOop); void printCogMethodsWithPrimitive(sqInt primIdx); void printCogMethodsWithSelector(sqInt selectorOop); +void printCogYoungReferrers(void); void printTrampolineTable(void); void recordCallOffsetInof(CogMethod *cogMethod, void *callLabelArg); sqInt recordPrimTraceFunc(void); Modified: branches/Cog/src/vm/cogmethod.h =================================================================== --- branches/Cog/src/vm/cogmethod.h 2014-01-14 02:14:07 UTC (rev 2846) +++ branches/Cog/src/vm/cogmethod.h 2014-01-16 18:49:26 UTC (rev 2847) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.569 uuid: 84f8b41f-92bf-41d2-9927-6c7e3d3e4272 + CCodeGenerator VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff */ typedef struct { Modified: branches/Cog/src/vm/cointerpmt.c =================================================================== --- branches/Cog/src/vm/cointerpmt.c 2014-01-14 02:14:07 UTC (rev 2846) +++ branches/Cog/src/vm/cointerpmt.c 2014-01-16 18:49:26 UTC (rev 2847) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.581 uuid: 926531fd-20be-42b4-9332-015b90e6734f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff from - CoInterpreterMT VMMaker.oscog-eem.581 uuid: 926531fd-20be-42b4-9332-015b90e6734f + CoInterpreterMT VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.581 uuid: 926531fd-20be-42b4-9332-015b90e6734f " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1201,7 +1201,7 @@ static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)); static sqInt roomToPushNArgs(sqInt n); static void runLeakCheckerForFullGC(sqInt fullGCFlag); -static usqInt safeObjectAfter(sqInt oop); +static sqInt safeObjectAfter(sqInt oop); static sqInt safePrintStringOf(sqInt oop); usqInt scavengeThresholdAddress(void); EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext); @@ -2117,7 +2117,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.581]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.585]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -19881,15 +19881,17 @@ sqInt header1; sqInt header2; sqInt header3; + sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - usqInt next; + sqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; + sqInt sz3; sqInt target; usqInt w; @@ -19900,7 +19902,21 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - next = ((sqInt) (objectAfter(oop))); + /* begin objectAfter: */ + if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { + error("no objects after the end of memory"); + } + if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { + sz2 = (longAt(oop)) & AllButTypeMask; + } + else { + /* begin sizeBitsOf: */ + header3 = longAt(oop); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask + : header3 & SizeMask); + } + next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -19915,7 +19931,7 @@ else { sz1 = realHeader & SizeMask; } - next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); + next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -19969,18 +19985,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(newFreeChunk)) & AllButTypeMask; + sz3 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header3 = longAt(newFreeChunk); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + header4 = longAt(newFreeChunk); + sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); + : header4 & SizeMask); } - next = ((newFreeChunk + sz2) >= GIV(freeStart) + next = ((newFreeChunk + sz3) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); + : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -46758,7 +46774,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static usqInt +static sqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/src/vm/cointerpmt.h =================================================================== --- branches/Cog/src/vm/cointerpmt.h 2014-01-14 02:14:07 UTC (rev 2846) +++ branches/Cog/src/vm/cointerpmt.h 2014-01-16 18:49:26 UTC (rev 2847) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.581 uuid: 926531fd-20be-42b4-9332-015b90e6734f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff */ Modified: branches/Cog/src/vm/gcc3x-cointerpmt.c =================================================================== --- branches/Cog/src/vm/gcc3x-cointerpmt.c 2014-01-14 02:14:07 UTC (rev 2846) +++ branches/Cog/src/vm/gcc3x-cointerpmt.c 2014-01-16 18:49:26 UTC (rev 2847) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.581 uuid: 926531fd-20be-42b4-9332-015b90e6734f + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff from - CoInterpreterMT VMMaker.oscog-eem.581 uuid: 926531fd-20be-42b4-9332-015b90e6734f + CoInterpreterMT VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff */ -static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.581 uuid: 926531fd-20be-42b4-9332-015b90e6734f " __DATE__ ; +static char __buildInfo[] = "CoInterpreterMT VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1204,7 +1204,7 @@ static void rewriteMethodCacheEntryForExternalPrimitiveToFunction(void (*localPrimAddress)(void)); static sqInt roomToPushNArgs(sqInt n); static void runLeakCheckerForFullGC(sqInt fullGCFlag); -static usqInt safeObjectAfter(sqInt oop); +static sqInt safeObjectAfter(sqInt oop); static sqInt safePrintStringOf(sqInt oop); usqInt scavengeThresholdAddress(void); EXPORT(sqInt) sendInvokeCallbackContext(VMCallbackContext *vmCallbackContext); @@ -2120,7 +2120,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.581]"; +const char *interpreterVersion = "Croquet Closure Cog MT VM [CoInterpreterMT VMMaker.oscog-eem.585]"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; sqInt willNotThreadWarnCount; @@ -19890,15 +19890,17 @@ sqInt header1; sqInt header2; sqInt header3; + sqInt header4; usqInt lastWord; sqInt newFreeChunk; sqInt newOop; - usqInt next; + sqInt next; sqInt oop; sqInt realHeader; sqInt sz; sqInt sz1; sqInt sz2; + sqInt sz3; sqInt target; usqInt w; @@ -19909,7 +19911,21 @@ /* begin objectAfterWhileForwarding: */ header2 = longAt(oop); if ((header2 & MarkBit) == 0) { - next = ((sqInt) (objectAfter(oop))); + /* begin objectAfter: */ + if (!(asserta(oopisLessThan(oop, GIV(freeStart))))) { + error("no objects after the end of memory"); + } + if (((longAt(oop)) & TypeMask) == HeaderTypeFree) { + sz2 = (longAt(oop)) & AllButTypeMask; + } + else { + /* begin sizeBitsOf: */ + header3 = longAt(oop); + sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + ? (longAt(oop - (BytesPerWord * 2))) & LongSizeMask + : header3 & SizeMask); + } + next = (oop + sz2) + (headerTypeBytes[(longAt(oop + sz2)) & TypeMask]); goto l1; } fwdBlock1 = (header2 & AllButMarkBitAndTypeMask) << 1; @@ -19924,7 +19940,7 @@ else { sz1 = realHeader & SizeMask; } - next = ((sqInt) ((oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]))); + next = (oop + sz1) + (headerTypeBytes[(longAt(oop + sz1)) & TypeMask]); l1: /* end objectAfterWhileForwarding: */; if (!(((longAt(oop)) & TypeMask) == HeaderTypeFree)) { @@ -19978,18 +19994,18 @@ } /* begin safeObjectAfter: */ if (((longAt(newFreeChunk)) & TypeMask) == HeaderTypeFree) { - sz2 = (longAt(newFreeChunk)) & AllButTypeMask; + sz3 = (longAt(newFreeChunk)) & AllButTypeMask; } else { /* begin sizeBitsOf: */ - header3 = longAt(newFreeChunk); - sz2 = ((header3 & TypeMask) == HeaderTypeSizeAndClass + header4 = longAt(newFreeChunk); + sz3 = ((header4 & TypeMask) == HeaderTypeSizeAndClass ? (longAt(newFreeChunk - (BytesPerWord * 2))) & LongSizeMask - : header3 & SizeMask); + : header4 & SizeMask); } - next = ((newFreeChunk + sz2) >= GIV(freeStart) + next = ((newFreeChunk + sz3) >= GIV(freeStart) ? GIV(freeStart) - : (newFreeChunk + sz2) + (headerTypeBytes[(longAt(newFreeChunk + sz2)) & TypeMask])); + : (newFreeChunk + sz3) + (headerTypeBytes[(longAt(newFreeChunk + sz3)) & TypeMask])); assert((next == GIV(freeStart)) || (next == (oopFromChunk(GIV(compEnd))))); if (next == GIV(freeStart)) { @@ -46767,7 +46783,7 @@ given object or free chunk in memory. Return freeStart when enumeration is complete. This is for assertion checking only. */ -static usqInt +static sqInt safeObjectAfter(sqInt oop) { DECL_MAYBE_SQ_GLOBAL_STRUCT sqInt header; Modified: branches/Cog/stacksrc/vm/gcc3x-interp.c =================================================================== --- branches/Cog/stacksrc/vm/gcc3x-interp.c 2014-01-14 02:14:07 UTC (rev 2846) +++ branches/Cog/stacksrc/vm/gcc3x-interp.c 2014-01-16 18:49:26 UTC (rev 2847) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.577 uuid: 8788f091-6817-480e-9bda-13ae360eeeb7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff from - StackInterpreter VMMaker.oscog-eem.577 uuid: 8788f091-6817-480e-9bda-13ae360eeeb7 + StackInterpreter VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.577 uuid: 8788f091-6817-480e-9bda-13ae360eeeb7 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1808,7 +1808,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.577]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.585]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; Modified: branches/Cog/stacksrc/vm/interp.c =================================================================== --- branches/Cog/stacksrc/vm/interp.c 2014-01-14 02:14:07 UTC (rev 2846) +++ branches/Cog/stacksrc/vm/interp.c 2014-01-16 18:49:26 UTC (rev 2847) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.577 uuid: 8788f091-6817-480e-9bda-13ae360eeeb7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff from - StackInterpreter VMMaker.oscog-eem.577 uuid: 8788f091-6817-480e-9bda-13ae360eeeb7 + StackInterpreter VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff */ -static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.577 uuid: 8788f091-6817-480e-9bda-13ae360eeeb7 " __DATE__ ; +static char __buildInfo[] = "StackInterpreter VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -1805,7 +1805,7 @@ 0 }; char * breakSelector; sqInt breakSelectorLength = -1; -const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.577]"; +const char *interpreterVersion = "Croquet Closure Stack VM [StackInterpreter VMMaker.oscog-eem.585]"; volatile int sendTrace; sqInt suppressHeartbeatFlag; Modified: branches/Cog/stacksrc/vm/interp.h =================================================================== --- branches/Cog/stacksrc/vm/interp.h 2014-01-14 02:14:07 UTC (rev 2846) +++ branches/Cog/stacksrc/vm/interp.h 2014-01-16 18:49:26 UTC (rev 2847) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.577 uuid: 8788f091-6817-480e-9bda-13ae360eeeb7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/stacksrc/vm/vmCallback.h =================================================================== --- branches/Cog/stacksrc/vm/vmCallback.h 2014-01-14 02:14:07 UTC (rev 2846) +++ branches/Cog/stacksrc/vm/vmCallback.h 2014-01-16 18:49:26 UTC (rev 2847) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.577 uuid: 8788f091-6817-480e-9bda-13ae360eeeb7 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.585 uuid: ffc9c619-e2b4-4432-977e-aba381f975ff */ #define VM_CALLBACK_INC 1

1 0

StackInterpreter "simulation image" and options
by gettimothy 16 Jan '14

16 Jan '14

I am hosting (? correct term) the StackInterpreterSimulator on Squeak4.5-13352.image running Cog. I instruct the simulator to use a copy of that image that I have renamed to Squeak4.5.image. | vm | Transcript clear. vm := StackInterpreterSimulator newWithOptions: #(). vm openOn: 'home/tty/usr/src/smalltalk/buildCogDevelopmentImageCog.app/Contents/Resources/Squeak4.5.image'. vm openAsMorph; toggleTranscript; halt; run The simulation runs, but the simulated World does not respond to mouse clicks (the control panel of the Simulator works just fine). I would like to rule out a missing option in the newWithOptions: #() line Specifically the "type of VM options in VMBasicConstants: #COGMTVM #COGVM #NewspeakVM #STACKVM #VMBIGENDIAN 1. To my way of thinking, since I am running a StackInterpreterSimulator, passing the option #STACKVM makes no sense. 2. Also--if I remember correctly--when first running Cog on a StackVM (?) image, it prompts the user that running Cog will make the image unusable for the StackInterpreter. 3. Therefore telling the StackIntepreterSimulator to expect a COGVM image makes no sense either. 4. Equally perplexing is the fact that the simulation does run -- it is just stuck in idle--which tells me I am incorrect about 2. above. I will be poking around in the guts of things in the mean time. thx tty

2 3

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

16 Jan '14

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.129.mcz ==================== Summary ==================== Name: Cog-eem.129 Author: eem Time: 15 January 2014, 5:59:45.417 pm UUID: ca78a842-5919-418a-ad96-0f9189dbed66 Ancestors: Cog-eem.128 Add a utility to the Spur bootstrap that will patch appropriate Monticello packages with appropriate Spur bootstrap methods. =============== Diff against Cog-eem.128 =============== Item was added: + Object subclass: #SpurBootstrapMonticelloPackagePatcher + instanceVariableNames: 'sourceDir destDir' + classVariableNames: '' + poolDictionaries: '' + category: 'Cog-Bootstrapping'! + + !SpurBootstrapMonticelloPackagePatcher commentStamp: 'eem 1/15/2014 17:59' prior: 0! + A SpurBootstrapMonticelloPackagePatcher is used to construct a new set of patched Monticello packages for Spur. The use case is some bootstrap process loads a set of Monticello packages. To repeat the bootstrap with a Spur image the bootstrap must use suitably patched Monticello packages containing the new method versions on the class side of SpurBootstrap. + + Instance Variables + destDir: <FileDirectory> + sourceDir: <FileDirectory> + + destDir + - directory to which patched packages are to be written + + sourceDir + - directory from which packages to be patched are to be read! Item was added: + ----- Method: SpurBootstrapMonticelloPackagePatcher>>filesForPackage:in: (in category 'private-accessing') ----- + filesForPackage: package in: aDirectory + ^aDirectory fileNames select: + [:fileName| + (fileName beginsWith: package name) + and: [(fileName at: package name size + 1) isLetter not]]! Item was added: + ----- Method: SpurBootstrapMonticelloPackagePatcher>>from:to: (in category 'initialization') ----- + from: sourceDirName to: destDirName + sourceDir := FileDirectory on: sourceDirName. + destDir := FileDirectory on: destDirName! Item was added: + ----- Method: SpurBootstrapMonticelloPackagePatcher>>packages (in category 'private-accessing') ----- + packages + "SpurBootstrapMonticelloPackagePatcher new packages" + | packages | + packages := Set new. + SpurBootstrap new prototypeClassNameMetaSelectorMethodDo: + [:className :isMeta :selector :method| | class | + class := Smalltalk classNamed: className. + isMeta ifTrue: + [class := class class]. + packages add: ((class includesSelector: selector) + ifTrue: [PackageOrganizer default packageOfMethod: (class >> selector) methodReference] + ifFalse: [PackageOrganizer default packageOfClass: class])]. + ^packages! Item was added: + ----- Method: SpurBootstrapMonticelloPackagePatcher>>packagesAndPatches (in category 'private-accessing') ----- + packagesAndPatches + "SpurBootstrapMonticelloPackagePatcher new packagesAndPatches" + | packagesAndPatches | + packagesAndPatches := Dictionary new. + SpurBootstrap new prototypeClassNameMetaSelectorMethodDo: + [:className :isMeta :selector :method| | class methodReference | + class := Smalltalk classNamed: className. + isMeta ifTrue: + [class := class class]. + methodReference := (class includesSelector: selector) ifTrue: + [(class >> selector) methodReference]. + (packagesAndPatches + at: (methodReference + ifNotNil: [PackageOrganizer default packageOfMethod: methodReference] + ifNil: [PackageOrganizer default packageOfClass: class]) + ifAbsentPut: [OrderedCollection new]) + add: (MCAddition of: (MCMethodDefinition + className: className + classIsMeta: isMeta + selector: selector + category: (methodReference + ifNotNil: [methodReference category] + ifNil: [Categorizer default]) + timeStamp: method timeStamp + source: (method getSourceFromFile asString allButFirst: method selector size - selector size)))]. + ^packagesAndPatches! Item was added: + ----- Method: SpurBootstrapMonticelloPackagePatcher>>patch (in category 'patching') ----- + patch + "(SpurBootstrapMonticelloPackagePatcher new + from: '/Users/eliot/Glue/repositories/nsboot/smalltalk' + to: '/Users/eliot/Glue/repositories/spurnsboot/smalltalk') + patch" + self packagesAndPatches keysAndValuesDo: + [:package :patches| + (self filesForPackage: package in: sourceDir) do: + [:packageFile| + self patchPackage: packageFile with: patches for: package]]! Item was added: + ----- Method: SpurBootstrapMonticelloPackagePatcher>>patchForPackage:withPatches:snapshot: (in category 'patching') ----- + patchForPackage: package withPatches: patches snapshot: snapshot + (package includesClass: Character) ifTrue: + [snapshot halt]. + ^MCPatch operations: patches! Item was added: + ----- Method: SpurBootstrapMonticelloPackagePatcher>>patchPackage:with:for: (in category 'patching') ----- + patchPackage: packageFileName with: patches for: package + | version newVersion | + version := self versionFor: packageFileName. + newVersion := self version: version withPatches: patches for: package. + self storeVersion: newVersion! Item was added: + ----- Method: SpurBootstrapMonticelloPackagePatcher>>storeVersion: (in category 'patching') ----- + storeVersion: newVersion + [(MCDirectoryRepository new directory: destDir) storeVersion: newVersion] + on: FileExistsException + do: [:ex| ex resume: (ex fileClass forceNewFileNamed: ex fileName)]! Item was added: + ----- Method: SpurBootstrapMonticelloPackagePatcher>>version:withPatches:for: (in category 'patching') ----- + version: version withPatches: patches for: package + | snapshot ancestry | + snapshot := MCPatcher + apply: (self patchForPackage: package withPatches: patches snapshot: version snapshot) + to: version snapshot. + ancestry := MCWorkingAncestry new addAncestor: version info. + ^MCVersion + package: version package + info: (ancestry + infoWithName: version info name + message: version info name, ' patched for Spur') + snapshot: snapshot + dependencies: {} "punt on computing dependencies; there are't any so far" + ! Item was added: + ----- Method: SpurBootstrapMonticelloPackagePatcher>>versionFor: (in category 'patching') ----- + versionFor: packageFileName + ^sourceDir + readOnlyFileNamed: packageFileName + do: [:fs| + ((MCVersionReader readerClassForFileNamed: fs fullName) + on: fs fileName: fs fullName) + version]!

1 0

Spoon newsgroup
by Craig Latta 15 Jan '14

15 Jan '14

Hi all-- I've posted links to some recent Spoon posts to the Spoon newsgroup, gmane.comp.lang.smalltalk.squeak.spoon, from my blog, thiscontext.com. I'd love to converse there. thanks! -C -- Craig Latta www.netjam.org/resume +1 510 984 8117 (Skype rings this until 31 January 2014)

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev January 2014