Vm-dev May 2014

vm-dev@lists.squeakfoundation.org

32 participants
151 discussions

VM Maker: VMMaker.oscog-eem.708.mcz
by commits＠source.squeak.org 09 May '14

09 May '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.708.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.708 Author: eem Time: 9 May 2014, 11:14:10.069 am UUID: 6258685a-cf1e-40dc-923a-e4027e4cf169 Ancestors: VMMaker.oscog-eem.707 Rename checkValidObjectReference: et al to checkValidOopReference: et al (since that's what they check) and add checkValidObjectReference: to check just that. Fix a translation-time return type clash in doubleExtendedDoAnythingBytecode =============== Diff against VMMaker.oscog-eem.707 =============== Item was added: + ----- Method: CogObjectRepresentation>>checkValidObjectReference: (in category 'garbage collection') ----- + checkValidObjectReference: anOop + ^(objectMemory isImmediate: anOop) not + and: [(self heapMapAtWord: (self pointerForOop: anOop)) ~= 0]! Item was removed: - ----- Method: CogObjectRepresentationForSpur>>checkValidObjectReference: (in category 'debug support') ----- - checkValidObjectReference: anOop - ^(objectMemory isImmediate: anOop) - or: [(objectMemory heapMapAtWord: (self pointerForOop: anOop)) ~= 0]! Item was added: + ----- Method: CogObjectRepresentationForSpur>>checkValidOopReference: (in category 'debug support') ----- + checkValidOopReference: anOop + ^(objectMemory isImmediate: anOop) + or: [(objectMemory heapMapAtWord: (self pointerForOop: anOop)) ~= 0]! Item was removed: - ----- Method: CogObjectRepresentationForSqueakV3>>checkValidObjectReference: (in category 'garbage collection') ----- - checkValidObjectReference: anOop - ^(objectMemory isIntegerObject: anOop) - or: [(self heapMapAtWord: (self pointerForOop: anOop)) ~= 0]! Item was added: + ----- Method: CogObjectRepresentationForSqueakV3>>checkValidOopReference: (in category 'garbage collection') ----- + checkValidOopReference: anOop + ^(objectMemory isIntegerObject: anOop) + or: [(self heapMapAtWord: (self pointerForOop: anOop)) ~= 0]! Item was changed: ----- Method: Cogit>>allMachineCodeObjectReferencesValid (in category 'garbage collection') ----- allMachineCodeObjectReferencesValid "Check that all methods have valid selectors, and that all linked sends are to valid targets and have valid cache tags" | ok cogMethod | <var: #cogMethod type: #'CogMethod *'> ok := true. cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'. [cogMethod < methodZone limitZony] whileTrue: [cogMethod cmType ~= CMFree ifTrue: + [(self asserta: (objectRepresentation checkValidOopReference: cogMethod selector)) ifFalse: - [(self asserta: (objectRepresentation checkValidObjectReference: cogMethod selector)) ifFalse: [ok := false]. (self asserta: (self cogMethodDoesntLookKosher: cogMethod) = 0) ifFalse: [ok := false]]. (cogMethod cmType = CMMethod or: [cogMethod cmType = CMOpenPIC]) ifTrue: [(self asserta: ((self mapFor: cogMethod + performUntil: #checkIfValidOopRefAndTarget:pc:cogMethod: - performUntil: #checkIfValidObjectRefAndTarget:pc:cogMethod: arg: cogMethod asInteger) = 0)) ifFalse: [ok := false]]. cogMethod cmType = CMClosedPIC ifTrue: [(self asserta: (self noTargetsFreeInClosedPIC: cogMethod)) ifFalse: [ok := false]]. cogMethod := methodZone methodAfter: cogMethod]. ^ok! Item was removed: - ----- Method: Cogit>>checkIfValidObjectRef:pc:cogMethod: (in category 'garbage collection') ----- - checkIfValidObjectRef: annotation pc: mcpc cogMethod: cogMethod - <var: #mcpc type: #'char *'> - annotation = IsObjectReference ifTrue: - [| literal | - literal := backEnd literalBeforeFollowingAddress: mcpc asInteger. - (objectRepresentation checkValidObjectReference: literal) ifFalse: - [coInterpreter print: 'object ref leak in CM '; printHex: cogMethod asInteger; print: ' @ '; printHex: mcpc asInteger; cr. - ^1]]. - (self isSendAnnotation: annotation) ifTrue: - [| entryPoint selectorOrCacheTag offset | - entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. - entryPoint <= methodZoneBase - ifTrue: - [offset := entryPoint] - ifFalse: - [self - offsetAndSendTableFor: entryPoint - annotation: annotation - into: [:off :table| offset := off]]. - selectorOrCacheTag := backEnd inlineCacheTagAt: mcpc asInteger. - (entryPoint > methodZoneBase - and: [offset ~= cmNoCheckEntryOffset - and: [(self cCoerceSimple: entryPoint - offset to: #'CogMethod *') cmType ~= CMOpenPIC]]) - ifTrue: "linked non-super send, cacheTag is a cacheTag" - [(objectRepresentation checkValidInlineCacheTag: selectorOrCacheTag) ifFalse: - [coInterpreter print: 'cache tag leak in CM '; printHex: cogMethod asInteger; print: ' @ '; printHex: mcpc asInteger; cr. - ^1]] - ifFalse: "unlinked send or super send; cacheTag is a selector" - [(objectRepresentation checkValidObjectReference: selectorOrCacheTag) ifFalse: - [coInterpreter print: 'selector leak in CM '; printHex: cogMethod asInteger; print: ' @ '; printHex: mcpc asInteger; cr. - ^1]]]. - ^0 "keep scanning"! Item was removed: - ----- Method: Cogit>>checkIfValidObjectRefAndTarget:pc:cogMethod: (in category 'garbage collection') ----- - checkIfValidObjectRefAndTarget: annotation pc: mcpc cogMethod: cogMethod - <var: #mcpc type: #'char *'> - | literal entryPoint | - annotation = IsObjectReference ifTrue: - [literal := backEnd literalBeforeFollowingAddress: mcpc asInteger. - (self asserta: (objectRepresentation checkValidObjectReference: literal)) ifFalse: - [^1]. - ((objectRepresentation couldBeObject: literal) - and: [objectMemory isReallyYoungObject: literal]) ifTrue: - [(self asserta: (self cCoerceSimple: cogMethod to: #'CogMethod *') cmRefersToYoung) ifFalse: - [^2]]]. - (self isSendAnnotation: annotation) ifTrue: - [(self asserta: (self cCoerceSimple: cogMethod to: #'CogMethod *') cmType = CMMethod) ifFalse: - [^3]. - self offsetCacheTagAndCouldBeObjectAt: mcpc annotation: annotation into: - [:offset :cacheTag :tagCouldBeObject| - tagCouldBeObject - ifTrue: - [(objectRepresentation couldBeObject: cacheTag) - ifTrue: - [(self asserta: (objectRepresentation checkValidObjectReference: cacheTag)) ifFalse: - [^4]] - ifFalse: - [(self asserta: (objectRepresentation checkValidInlineCacheTag: cacheTag)) ifFalse: - [^5]]. - ((objectRepresentation couldBeObject: cacheTag) - and: [objectMemory isReallyYoungObject: cacheTag]) ifTrue: - [(self asserta: (self cCoerceSimple: cogMethod to: #'CogMethod *') cmRefersToYoung) ifFalse: - [^6]]] - ifFalse: - [(self asserta: (objectRepresentation checkValidInlineCacheTag: cacheTag)) ifFalse: - [^7]]]. - entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. - entryPoint > methodZoneBase ifTrue: - ["It's a linked send; find which kind." - self targetMethodAndSendTableFor: entryPoint into: - [:targetMethod :sendTable| - (self asserta: (targetMethod cmType = CMMethod - or: [targetMethod cmType = CMClosedPIC - or: [targetMethod cmType = CMOpenPIC]])) ifFalse: - [^8]]]]. - ^0 "keep scanning"! Item was added: + ----- Method: Cogit>>checkIfValidOopRef:pc:cogMethod: (in category 'garbage collection') ----- + checkIfValidOopRef: annotation pc: mcpc cogMethod: cogMethod + <var: #mcpc type: #'char *'> + annotation = IsObjectReference ifTrue: + [| literal | + literal := backEnd literalBeforeFollowingAddress: mcpc asInteger. + (objectRepresentation checkValidOopReference: literal) ifFalse: + [coInterpreter print: 'object ref leak in CM '; printHex: cogMethod asInteger; print: ' @ '; printHex: mcpc asInteger; cr. + ^1]]. + (self isSendAnnotation: annotation) ifTrue: + [| entryPoint selectorOrCacheTag offset | + entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. + entryPoint <= methodZoneBase + ifTrue: + [offset := entryPoint] + ifFalse: + [self + offsetAndSendTableFor: entryPoint + annotation: annotation + into: [:off :table| offset := off]]. + selectorOrCacheTag := backEnd inlineCacheTagAt: mcpc asInteger. + (entryPoint > methodZoneBase + and: [offset ~= cmNoCheckEntryOffset + and: [(self cCoerceSimple: entryPoint - offset to: #'CogMethod *') cmType ~= CMOpenPIC]]) + ifTrue: "linked non-super send, cacheTag is a cacheTag" + [(objectRepresentation checkValidInlineCacheTag: selectorOrCacheTag) ifFalse: + [coInterpreter print: 'cache tag leak in CM '; printHex: cogMethod asInteger; print: ' @ '; printHex: mcpc asInteger; cr. + ^1]] + ifFalse: "unlinked send or super send; cacheTag is a selector" + [(objectRepresentation checkValidOopReference: selectorOrCacheTag) ifFalse: + [coInterpreter print: 'selector leak in CM '; printHex: cogMethod asInteger; print: ' @ '; printHex: mcpc asInteger; cr. + ^1]]]. + ^0 "keep scanning"! Item was added: + ----- Method: Cogit>>checkIfValidOopRefAndTarget:pc:cogMethod: (in category 'garbage collection') ----- + checkIfValidOopRefAndTarget: annotation pc: mcpc cogMethod: cogMethod + <var: #mcpc type: #'char *'> + | literal entryPoint | + annotation = IsObjectReference ifTrue: + [literal := backEnd literalBeforeFollowingAddress: mcpc asInteger. + (self asserta: (objectRepresentation checkValidOopReference: literal)) ifFalse: + [^1]. + ((objectRepresentation couldBeObject: literal) + and: [objectMemory isReallyYoungObject: literal]) ifTrue: + [(self asserta: (self cCoerceSimple: cogMethod to: #'CogMethod *') cmRefersToYoung) ifFalse: + [^2]]]. + (self isSendAnnotation: annotation) ifTrue: + [(self asserta: (self cCoerceSimple: cogMethod to: #'CogMethod *') cmType = CMMethod) ifFalse: + [^3]. + self offsetCacheTagAndCouldBeObjectAt: mcpc annotation: annotation into: + [:offset :cacheTag :tagCouldBeObject| + tagCouldBeObject + ifTrue: + [(objectRepresentation couldBeObject: cacheTag) + ifTrue: + [(self asserta: (objectRepresentation checkValidOopReference: cacheTag)) ifFalse: + [^4]] + ifFalse: + [(self asserta: (objectRepresentation checkValidInlineCacheTag: cacheTag)) ifFalse: + [^5]]. + ((objectRepresentation couldBeObject: cacheTag) + and: [objectMemory isReallyYoungObject: cacheTag]) ifTrue: + [(self asserta: (self cCoerceSimple: cogMethod to: #'CogMethod *') cmRefersToYoung) ifFalse: + [^6]]] + ifFalse: + [(self asserta: (objectRepresentation checkValidInlineCacheTag: cacheTag)) ifFalse: + [^7]]]. + entryPoint := backEnd callTargetFromReturnAddress: mcpc asInteger. + entryPoint > methodZoneBase ifTrue: + ["It's a linked send; find which kind." + self targetMethodAndSendTableFor: entryPoint into: + [:targetMethod :sendTable| + (self asserta: (targetMethod cmType = CMMethod + or: [targetMethod cmType = CMClosedPIC + or: [targetMethod cmType = CMOpenPIC]])) ifFalse: + [^8]]]]. + ^0 "keep scanning"! Item was changed: ----- Method: Cogit>>checkIntegrityOfObjectReferencesInCode: (in category 'debugging') ----- checkIntegrityOfObjectReferencesInCode: fullGCFlag <api> "Answer if all references to objects in machine-code are valid." | cogMethod ok count | <var: #cogMethod type: #'CogMethod *'> cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'. ok := true. [cogMethod < methodZone limitZony] whileTrue: [cogMethod cmType ~= CMFree ifTrue: [cogMethod cmRefersToYoung ifTrue: [(count := methodZone occurrencesInYoungReferrers: cogMethod) ~= 1 ifTrue: [coInterpreter print: 'young referrer CM '; printHex: cogMethod asInteger. count = 0 ifTrue: [coInterpreter print: ' is not in youngReferrers'; cr] ifFalse: [coInterpreter print: ' is in youngReferrers '; printNum: count; print: ' times!!'; cr]. ok := false]]. + (objectRepresentation checkValidOopReference: cogMethod selector) ifFalse: - (objectRepresentation checkValidObjectReference: cogMethod selector) ifFalse: [coInterpreter print: 'object leak in CM '; printHex: cogMethod asInteger; print: ' selector'; cr. ok := false]. cogMethod cmType = CMMethod ifTrue: [self assert: cogMethod objectHeader = objectMemory nullHeaderForMachineCodeMethod. (objectRepresentation checkValidObjectReference: cogMethod methodObject) ifFalse: [coInterpreter print: 'object leak in CM '; printHex: cogMethod asInteger; print: ' methodObject'; cr. ok := false]. + (objectMemory isOopCompiledMethod: cogMethod methodObject) ifFalse: - (objectMemory isCompiledMethod: cogMethod methodObject) ifFalse: [coInterpreter print: 'non-method in CM '; printHex: cogMethod asInteger; print: ' methodObject'; cr. ok := false]. (self mapFor: cogMethod + performUntil: #checkIfValidOopRef:pc:cogMethod: - performUntil: #checkIfValidObjectRef:pc:cogMethod: arg: cogMethod asInteger) ~= 0 ifTrue: [ok := false]. fullGCFlag ifFalse: [(((objectMemory isYoungObject: cogMethod methodObject) or: [objectMemory isYoung: cogMethod selector]) and: [cogMethod cmRefersToYoung not]) ifTrue: [coInterpreter print: 'CM '; printHex: cogMethod asInteger; print: ' refers to young but not marked as such'; cr. ok := false]]] ifFalse: [cogMethod cmType = CMClosedPIC ifTrue: [(self checkValidObjectReferencesInClosedPIC: cogMethod) ifFalse: [ok := false]] ifFalse: [cogMethod cmType = CMOpenPIC ifTrue: [(self mapFor: cogMethod + performUntil: #checkIfValidOopRef:pc:cogMethod: - performUntil: #checkIfValidObjectRef:pc:cogMethod: arg: cogMethod asInteger) ~= 0 ifTrue: [ok := false]]]]]. cogMethod := methodZone methodAfter: cogMethod]. ^ok! Item was changed: ----- Method: StackInterpreter>>doubleExtendedDoAnythingBytecode (in category 'send bytecodes') ----- doubleExtendedDoAnythingBytecode "Replaces the Blue Book double-extended send [132], in which the first byte was wasted on 8 bits of argument count. Here we use 3 bits for the operation sub-type (opType), and the remaining 5 bits for argument count where needed. The last byte give access to 256 instVars or literals. See also secondExtendedSendBytecode" | byte2 byte3 opType top | byte2 := self fetchByte. byte3 := self fetchByte. opType := byte2 >> 5. opType = 0 ifTrue: [messageSelector := self literal: byte3. argumentCount := byte2 bitAnd: 31. ^self normalSend]. opType = 1 ifTrue: [messageSelector := self literal: byte3. argumentCount := byte2 bitAnd: 31. ^self superclassSend]. self fetchNextBytecode. opType = 2 ifTrue: [^self pushMaybeContextReceiverVariable: byte3]. opType = 3 ifTrue: [^self pushLiteralConstant: byte3]. opType = 4 ifTrue: [^self pushLiteralVariable: byte3]. top := self internalStackTop. opType = 7 ifTrue: + [self storeLiteralVariable: byte3 withValue: top. + ^self]. + "opType = 5 is store; opType = 6 is storePop" - [^self storeLiteralVariable: byte3 withValue: top]. - "opType = 5 is store; opType = 6 = storePop" opType = 6 ifTrue: [self internalPop: 1]. self storeMaybeContextReceiverVariable: byte3 withValue: top!

1 0

Lazy become for Copy On Write
by btc＠openinworld.com 09 May '14

09 May '14

hi Eliot, On you blog post [1] I wrote "Just had a random neuron fire so wondering… Would your lazy #become: benefit a copy-on-write system, where one VM could run multiple images sharing objects. Use case might be a cloud provider where many clients might base off the same Squeak 4.5 or Pharo 3.0 image. I am thinking that when writing to an object, the original could be copied twice and replaced with a conditional-forwarder such that which copy is forwarded to depends on the image accessing the conditional-forwarder." I've no practical experience with this and didn't have anything formulated to expound on at the time. It was just an intuitive hunch that has however kept lurking at the back of my mind while I was distracted with other things. Today I made a sketch of the idea (drawn with Inkscape) which I have attached. There is one BASE IMAGE and two client images IMAGE 1 and IMAGE 2. Objects a1, b1, a2, b2 all have a reference to object zB in the base image. When object a2 in IMAGE 2 writes to zB in the base image (1.) z2 is copied from zB so it can be updated (2.). The indirect table, which was empty, has entry-1 created pointing at z2 (3.), and zB is set to lazy become to entry-1 (3.). Now when object a2 or b2 access zB (4.), the lazy become is followed to through the indirect table and on to z2 (5.), to which a2 is then updated to point (6.). When object a1 in IMAGE 1 references zB (7.), the lazy become points to the indirect-table, but where for IMAGE 1 there are no entries, so one is created pointing back to zB since that still valid for IMAGE 1. Whether zB might be copied into IMAGE 1 as z1 would be an optimisation tradeoff of space versus levels-of-indirection. cheers -ben [1] http://www.mirandabanda.org/cogblog/2013/09/13/lazy-become-and-a-partial-re…

2 2

SqueakVMMaker CPlatformConfig->CMakePlatformConfig
by gettimothy 08 May '14

08 May '14

Hi Folks, Unless there are objections, I am going to break a one-to-one correspondence in class naming between the PharoVMMaker and SqueakVMMaker classes whenever a name difference will promote clarity. Examples are (pharo name-> squeak name): CPlatformConfig -> CMakePlatformConfig PharoSVMBuilder ->SqueakStackVMBuilder .... etc. cordially, tty

1 0

CMMaker.oscog to fork or not to fork, that! is the question
by gettimothy 08 May '14

08 May '14

Hi Eliot and David and Tim. Tomorrow I start the actual Smalltalk coding of the CMake stuff for Squeak. (My shell script that I thought would take 1 day took 5. sigh) While I am leaning towards a fork of the CMMakeVMaker work on Pharo, I will defer to you folks on that decision. Below are notes I had made a week ago about why I was leaning that way. -----begin notes I made a week or so ago---- For development purposes I am leaning towards creating a CMakeVMMaker.oscog clone of the existing CMakeVMMaker and incrementally adding platform/interpreter configurations starting with the Stack Interpreter. Much of the work will be cut-n-paste modifications of the existing work in CMakeVMMaker done by the pharo team as that is the guts of the pharo system. The Pharo environment (very clean, btw) has three layers to it (from top down they are). 1. PharoVMMaker 2. CMakeVMMaker 3. Source Tree and scripts from github. What is very interesting about pharo is that given 3) a git checkout, you can download, run and configure a new pharo image using a shell script provided with the git source. Launching the resulting generator.image you are presented a workspace with scripts invoking 1) PharoVMMaker which is a "wrapper" or "interface" to 2) CMakeVMMaker. This generates the sources and CMake files and from there you go to the build directory and build I like this approach and will be emulating it, but I do not think it is integrate the Squeak infrastructure into the existing package; here is why. 1. Squeak source tree from svn is a superset of the tree from git with a slight difference in naming for the default build. Where Squeak has unixbuild, nssprucogbuild, etc, pharo just has build. This "probably" has implications for the CMMake script generation that will not suffice for supporting the standard interpreter nor for the other flavors Eliot is developing. 2. If I attempt to merge the two approaches (git and svn, pharo build tree and squeak build tree) it will clutter the very clean work-flow pharo has. 3. As I develop this, I would like the squeak community to test-drive what I do. It is not appropriate for me to muddy the existing CMakeVMMaker with dev work 4. Assuming I can actually do this thing, I do not think a merge of the two projects would be too difficult ---end notes I made a week or so ago--- Please let me know your decision. cordially, tty :

4 6

VM Maker: VMMaker.oscog-eem.707.mcz
by commits＠source.squeak.org 07 May '14

07 May '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.707.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.707 Author: eem Time: 7 May 2014, 10:28:39.678 am UUID: 47db026e-b2fc-49b3-9937-d35b926a9522 Ancestors: VMMaker.oscog-eem.706 Fix the assert fail on pigCompact. Since pastSpace is not voided, pastSpace must be swept to follow forwarders. Refactor mapMachineCode to mapMachineCode: theGCMode and hence call mapMachineCode: GCModeFull in eliminateAndFreeForwardersFor[Fit|Pig]Compact. =============== Diff against VMMaker.oscog-eem.706 =============== Item was added: + ----- Method: CoInterpreter>>getGCMode (in category 'object memory support') ----- + getGCMode + ^gcMode! Item was removed: - ----- Method: CoInterpreter>>mapMachineCode (in category 'object memory support') ----- - mapMachineCode - "Update all references to objects in machine code." - cogit mapObjectReferencesInMachineCode: gcMode! Item was added: + ----- Method: CoInterpreter>>mapMachineCode: (in category 'object memory support') ----- + mapMachineCode: theGCMode + <inline: true> + "Update all references to objects in machine code." + cogit mapObjectReferencesInMachineCode: theGCMode! Item was changed: ----- Method: SpurGenerationScavenger>>futureSurvivorStart (in category 'accessing') ----- futureSurvivorStart + <cmacro: '() GIV(futureSurvivorStart)'> ^futureSurvivorStart! Item was added: + ----- Method: SpurMemoryManager>>allPastSpaceEntitiesDo: (in category 'object enumeration') ----- + allPastSpaceEntitiesDo: aBlock + "Enumerate all past space objects, including free objects." + <inline: true> + | prevObj prevPrevObj objOop | + prevPrevObj := prevObj := nil. + objOop := self objectStartingAt: scavenger pastSpace start. + [self oop: objOop isLessThan: pastSpaceStart] whileTrue: + [aBlock value: objOop. + prevPrevObj := prevObj. + prevObj := objOop. + objOop := self objectAfter: objOop limit: pastSpaceStart]. + self touch: prevPrevObj. + self touch: prevObj! Item was added: + ----- Method: SpurMemoryManager>>allPastSpaceObjectsDo: (in category 'object enumeration') ----- + allPastSpaceObjectsDo: aBlock + "Enumerate all past space objects, excluding free objects." + <inline: true> + self allPastSpaceEntitiesDo: + [:objOop| + self assert: (self isEnumerableObjectNoAssert: objOop). + aBlock value: objOop]! Item was changed: ----- Method: SpurMemoryManager>>eliminateAndFreeForwardersForFitCompact (in category 'gc - global') ----- eliminateAndFreeForwardersForFitCompact "As the final phase of global garbage collect, sweep the heap to follow forwarders, then free forwarders, coalescing with free space as we go." | lowestFree | <inline: false> self flag: 'this might be unnecessary. if we were to track firstFreeChunk we might be able to repeat the freeUnmarkedObjectsAndSortAndCoalesceFreeSpace; compact cycle until firstFreeChunk reaches a fixed point'. self assert: (self isForwarded: nilObj) not. self assert: (self isForwarded: falseObj) not. self assert: (self isForwarded: trueObj) not. self assert: (self isForwarded: self freeListsObj) not. self assert: (self isForwarded: hiddenRootsObj) not. self assert: (self isForwarded: classTableFirstPage) not. self followSpecialObjectsOop. "N.B. we don't have to explicitly do mapInterpreterOops since the scavenge below will do it, except that scavenging maps only young references in machine code." self followForwardedObjStacks. scavenger followRememberedForwardersAndForgetFreeObjects. self doScavenge: DontTenureButDoUnmark. + coInterpreter mapMachineCode: GCModeFull. - coInterpreter mapMachineCode. self checkFreeSpace. lowestFree := self sweepToFollowForwardersForFitCompact. self checkFreeSpace. lowestFree = 0 ifTrue: "yeah, right..." [^self]. self sweepToCoallesceFreeSpaceAndRebuildFreeListsForFitCompactFrom: lowestFree. self checkFreeSpace! Item was changed: ----- Method: SpurMemoryManager>>eliminateAndFreeForwardersForPigCompact (in category 'gc - global') ----- eliminateAndFreeForwardersForPigCompact "As the final phase of global garbage collect, sweep the heap to follow forwarders, then free forwarders, coalescing with free space as we go." <inline: false> | lowestForwarder | self assert: (self isForwarded: nilObj) not. self assert: (self isForwarded: falseObj) not. self assert: (self isForwarded: trueObj) not. self assert: (self isForwarded: self freeListsObj) not. self assert: (self isForwarded: hiddenRootsObj) not. self assert: (self isForwarded: classTableFirstPage) not. self followSpecialObjectsOop. "N.B. we don't have to explicitly do mapInterpreterOops since the scavenge below will do it, except that scavenging maps only young references in machine code." self followForwardedObjStacks. scavenger followRememberedForwardersAndForgetFreeObjectsForPigCompact. "Because of the flushEden before markObjects the scavenge /should not/ tenure. In fact it must not because the free list has not been rebuilt, so there is no space, and any attempt to tenure will allocate a new segment." totalFreeOldSpace := 0. self doScavenge: DontTenureButDoUnmark. self assert: totalFreeOldSpace = 0. + coInterpreter mapMachineCode: GCModeFull. - coInterpreter mapMachineCode. lowestForwarder := self sweepToFollowForwardersForPigCompact. self sweepToCoallesceFreeSpaceAndRebuildFreeListsForPigCompactFrom: lowestForwarder. self checkFreeSpace. self assert: self numberOfForwarders = 0! Item was changed: ----- Method: SpurMemoryManager>>sweepToFollowForwardersForPigCompact (in category 'compaction') ----- sweepToFollowForwardersForPigCompact "Sweep, following forwarders in all live objects. + Answer the lowest forwarder in oldSpace." - Answer the lowest forwarder." | lowestForwarder | + self assert: (freeStart = scavenger eden start + and: [scavenger futureSurvivorStart = scavenger futureSpace start]). + self allPastSpaceObjectsDo: + [:o| + (self isForwarded: o) ifFalse: + [0 to: (self numPointerSlotsOf: o) - 1 do: + [:i| | f | + f := self fetchPointer: i ofObject: o. + (self isOopForwarded: f) ifTrue: + [f := self followForwarded: f. + self storePointerUnchecked: i ofObject: o withValue: f]]]]. lowestForwarder := 0. self allOldSpaceObjectsDo: [:o| (self isForwarded: o) ifTrue: [lowestForwarder = 0 ifTrue: [lowestForwarder := 0]] ifFalse: [0 to: (self numPointerSlotsOf: o) - 1 do: [:i| | f | f := self fetchPointer: i ofObject: o. (self isOopForwarded: f) ifTrue: [f := self followForwarded: f. self storePointer: i ofObject: o withValue: f]]]]. ^lowestForwarder! Item was added: + ----- Method: StackInterpreter>>getGCMode (in category 'object memory support') ----- + getGCMode + "This is a no-op in the StackVM" + ^0! Item was changed: ----- Method: StackInterpreter>>mapInterpreterOops (in category 'object memory support') ----- mapInterpreterOops "Map all oops in the interpreter's state to their new values during garbage collection or a become: operation." "Assume: All traced variables contain valid oops." <inline: false> self mapStackPages. + self mapMachineCode: self getGCMode. - self mapMachineCode. self mapTraceLogs. self mapVMRegisters. self mapProfileState. self remapCallbackState. (tempOop ~= 0 and: [objectMemory shouldRemapOop: tempOop]) ifTrue: [tempOop := objectMemory remapObj: tempOop]! Item was removed: - ----- Method: StackInterpreter>>mapMachineCode (in category 'object memory support') ----- - mapMachineCode - "This is a no-op in the StackVM"! Item was added: + ----- Method: StackInterpreter>>mapMachineCode: (in category 'object memory support') ----- + mapMachineCode: theGCMode + <inline: true> + "This is a no-op in the StackVM"!

1 0

[commit][2917] CogVM source as per VMMaker.oscog-eem.706
by commits＠squeakvm.org 07 May '14

07 May '14

Revision: 2917 Author: eliot Date: 2014-05-06 21:38:16 -0700 (Tue, 06 May 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.706 ARM FFI: Fix bug in passing structure argument in the case where a struct would normally be split between registers and stack, but because of prior coprocessor register candidiate args having been pushed on the stack, the structure should not be split but pushed entirely on the stack. Spur: Fix the coallescing sweep in pig compact to start from the lowest of the first forwarder or the first free chunk. Do a tenuring scavenge to void eden in freeUnmarkedObjectsAndSortAndCoalesce- FreeSpaceForPigCompact to avoid any tenuring due to futureSpace overflow in the unmarking scavenge in eliminateAndFreeForwardersForPigCompact. Do this by adding the MarkOnTenure tenuring criterion. Change the use of shouldBeTenured: to allow it to be inlined into copyAndForward:. Add an assert to freeChunkWithBytes:at: to catch accidental freeing of non-oldSpace. Refactor SpurSegmentManager>>postSnapshot to not fall foul of this new assert. Add a check to totalFreeListBytes to catch double freeing (double freeing was caused by tenuring in the eAFFFPC scavenge growing memory to make room for tenuring, given free lists are not rebuilt at this point, and later in eAFFFPC this memory being freed again). Don't inline doScavenge: or scavengingGCTenuringIf:. Refactor eliminateAndFreeForwardersForFitCompact to extract the large loops. Add printForwarders for debugging. With these changes the StackInterpreter runs the Newspeak bootstrap to completion, albeit with one presumably bogus assert fail to do with a DependentsArray referring to forwarder contents. Cogit: Fix a double free bug in unlinkSendsOf:isMNUSelector:. Harmless cuz the result is only a bogus count of how many methods freed. Beef up the cog method integrity check to verify a its methodObject is a CompiledMethod. Plugins: Regenerate some that contain formatting changes due to VMMaker.oscog-eem.702/701. Modified Paths: -------------- branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c branches/Cog/nscogsrc/plugins/SqueakSSL/SqueakSSL.c branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Cog/nscogsrc/vm/cogit.c branches/Cog/nscogsrc/vm/cogit.h branches/Cog/nscogsrc/vm/cogmethod.h branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/cointerp.h branches/Cog/nscogsrc/vm/gcc3x-cointerp.c branches/Cog/nscogsrc/vm/interp.h branches/Cog/nscogsrc/vm/vmCallback.h branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cogmethod.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspursrc/vm/interp.h branches/Cog/nsspursrc/vm/vmCallback.h branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/nsspurstacksrc/vm/interp.h branches/Cog/nsspurstacksrc/vm/vmCallback.h branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cogmethod.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/sistasrc/vm/interp.h branches/Cog/sistasrc/vm/vmCallback.h branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cogmethod.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/interp.h branches/Cog/spursistasrc/vm/vmCallback.h branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cogmethod.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/interp.h branches/Cog/spursrc/vm/vmCallback.h branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/spurstacksrc/vm/interp.h branches/Cog/spurstacksrc/vm/vmCallback.h branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c branches/Cog/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cogmethod.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/src/vm/interp.h branches/Cog/src/vm/vmCallback.h branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c branches/Cog/stacksrc/vm/interp.h branches/Cog/stacksrc/vm/vmCallback.h Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c 2014-05-06 22:13:38 UTC (rev 2916) +++ branches/Cog/nscogsrc/plugins/B2DPlugin/B2DPlugin.c 2014-05-07 04:38:16 UTC (rev 2917) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.597 uuid: c9a71dd4-c394-4a8f-aa4d-a6d4dc3ff220 + VMPluginCodeGenerator VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 from - BalloonEnginePlugin VMMaker.oscog-eem.597 uuid: c9a71dd4-c394-4a8f-aa4d-a6d4dc3ff220 + BalloonEnginePlugin VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 */ -static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.597 uuid: c9a71dd4-c394-4a8f-aa4d-a6d4dc3ff220 " __DATE__ ; +static char __buildInfo[] = "BalloonEnginePlugin VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 " __DATE__ ; @@ -839,9 +839,9 @@ static void * loadBBFn; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "B2DPlugin VMMaker.oscog-eem.597 (i)" + "B2DPlugin VMMaker.oscog-eem.706 (i)" #else - "B2DPlugin VMMaker.oscog-eem.597 (e)" + "B2DPlugin VMMaker.oscog-eem.706 (e)" #endif ; static int* objBuffer; @@ -3762,7 +3762,7 @@ x1 = rightX; while (((((rampIndex = ((sqInt) ds >> 16))) < 0) - || (rampIndex >= rampSize)) + || (rampIndex >= rampSize)) && (x < x1)) { x += 1; ds += dsX; @@ -3802,7 +3802,7 @@ /* Fast version w/o anti-aliasing */ while (((((rampIndex = ((sqInt) ds >> 16))) < rampSize) - && (rampIndex >= 0)) + && (rampIndex >= 0)) && (x < x1)) { spanBuffer[x] = (ramp[rampIndex]); x += 1; @@ -5492,7 +5492,7 @@ return (fill == 0) || (((fill & 0xFF000000UL) != 0) || (((fill >= 0) - && (fill < objUsed)) + && (fill < objUsed)) && (((fill & 0xFF000000UL) != 0) || ((((objBuffer[fill + GEObjectType]) & GEPrimitiveTypeMask) & GEPrimitiveFillMask) != 0)))); } @@ -6048,7 +6048,7 @@ y2 = (point3Get())[1]; if (((x0 == y0) - && (x1 == y1)) + && (x1 == y1)) || ((x1 == x2) && (y1 == y2))) { loadWideLinefromtolineFillleftFillrightFill(lineWidth, point1Get(), point3Get(), lineFill, fillIndex, 0); @@ -6377,7 +6377,7 @@ y2 = (((int *) points))[index + 5]; } if (((x0 == x1) - && (y0 == y1)) + && (y0 == y1)) || ((x1 == x2) && (y1 == y2))) { @@ -6755,7 +6755,7 @@ y2 = (((int *) points))[index + 5]; } if (((x0 == x1) - && (y0 == y1)) + && (y0 == y1)) || ((x1 == x2) && (y1 == y2))) { @@ -7851,7 +7851,7 @@ y2 = (((int *) points))[index + 5]; } if (((x0 == x1) - && (y0 == y1)) + && (y0 == y1)) || ((x1 == x2) && (y1 == y2))) { @@ -8905,7 +8905,7 @@ return primitiveFailFor(GEFEngineStopped); } if (((lineFill == 0) - || (lineWidth == 0)) + || (lineWidth == 0)) && (fillIndex == 0)) { return pop(5); } @@ -9568,7 +9568,7 @@ return primitiveFailFor(GEFEngineStopped); } if (((lineFill == 0) - || (lineWidth == 0)) + || (lineWidth == 0)) && (fillIndex == 0)) { return pop(5); } Modified: branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c 2014-05-06 22:13:38 UTC (rev 2916) +++ branches/Cog/nscogsrc/plugins/FilePlugin/FilePlugin.c 2014-05-07 04:38:16 UTC (rev 2917) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.620 uuid: 0c6991e0-acb5-4250-84d8-cdeebfac41e9 + VMPluginCodeGenerator VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 from - FilePlugin VMMaker.oscog-eem.620 uuid: 0c6991e0-acb5-4250-84d8-cdeebfac41e9 + FilePlugin VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 */ -static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.620 uuid: 0c6991e0-acb5-4250-84d8-cdeebfac41e9 " __DATE__ ; +static char __buildInfo[] = "FilePlugin VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 " __DATE__ ; @@ -180,9 +180,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "FilePlugin VMMaker.oscog-eem.620 (i)" + "FilePlugin VMMaker.oscog-eem.706 (i)" #else - "FilePlugin VMMaker.oscog-eem.620 (e)" + "FilePlugin VMMaker.oscog-eem.706 (e)" #endif ; static void * sCCPfn; @@ -888,7 +888,7 @@ } bytesRead = sqFileReadIntoAt(file, count * elementSize, ((char *) (firstIndexableField(array))), (startIndex - 1) * elementSize); if (!(((primitiveFailureCode()) == PrimErrObjectMayMove) - && (((retryCount += 1)) <= 2))) break; + && (((retryCount += 1)) <= 2))) break; tenuringIncrementalGC(); primitiveFailFor(PrimNoErr); } Modified: branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2014-05-06 22:13:38 UTC (rev 2916) +++ branches/Cog/nscogsrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c 2014-05-07 04:38:16 UTC (rev 2917) @@ -1,17 +1,17 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.580 uuid: 751b08d4-d92e-440a-b3f6-cb2c76f52514 + VMPluginCodeGenerator VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 from - MiscPrimitivePlugin VMMaker.oscog-eem.580 uuid: 751b08d4-d92e-440a-b3f6-cb2c76f52514 - Bitmap * Graphics-ar.142 uuid: 9a11fdac-93ce-8344-877f-55d10866f795 - ByteArray * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0 - ByteString * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0 - SampledSound * Sound-ar.30 uuid: c0c6133c-73b7-7b47-9858-99b64868d35c + MiscPrimitivePlugin VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 + Bitmap Graphics-nice.289 uuid: e809bcbf-53e1-420b-846a-9e86e0dd1f06 + ByteArray * Collections-dtl.568 uuid: a7bc6178-b9ac-4b87-bf97-478cc4927158 + ByteString * Collections-dtl.568 uuid: a7bc6178-b9ac-4b87-bf97-478cc4927158 + SampledSound Sound-nice.38 uuid: b626daf0-be23-4fb8-b2d5-04b9cd370539 */ -static char __buildInfo[] = "MiscPrimitivePlugin VMMaker.oscog-eem.580 uuid: 751b08d4-d92e-440a-b3f6-cb2c76f52514\n\ -Bitmap * Graphics-ar.142 uuid: 9a11fdac-93ce-8344-877f-55d10866f795\n\ -ByteArray * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0\n\ -ByteString * Collections-eem.375 uuid: c9da6558-3bd7-4f0f-b0e5-bc21208275f0\n\ -SampledSound * Sound-ar.30 uuid: c0c6133c-73b7-7b47-9858-99b64868d35c " __DATE__ ; +static char __buildInfo[] = "MiscPrimitivePlugin VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701\n\ +Bitmap Graphics-nice.289 uuid: e809bcbf-53e1-420b-846a-9e86e0dd1f06\n\ +ByteArray * Collections-dtl.568 uuid: a7bc6178-b9ac-4b87-bf97-478cc4927158\n\ +ByteString * Collections-dtl.568 uuid: a7bc6178-b9ac-4b87-bf97-478cc4927158\n\ +SampledSound Sound-nice.38 uuid: b626daf0-be23-4fb8-b2d5-04b9cd370539 " __DATE__ ; @@ -94,9 +94,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "MiscPrimitivePlugin VMMaker.oscog-eem.580 (i)" + "MiscPrimitivePlugin VMMaker.oscog-eem.706 (i)" #else - "MiscPrimitivePlugin VMMaker.oscog-eem.580 (e)" + "MiscPrimitivePlugin VMMaker.oscog-eem.706 (e)" #endif ; Modified: branches/Cog/nscogsrc/plugins/SqueakSSL/SqueakSSL.c =================================================================== --- branches/Cog/nscogsrc/plugins/SqueakSSL/SqueakSSL.c 2014-05-06 22:13:38 UTC (rev 2916) +++ branches/Cog/nscogsrc/plugins/SqueakSSL/SqueakSSL.c 2014-05-07 04:38:16 UTC (rev 2917) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa + VMPluginCodeGenerator VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 from - SqueakSSLPlugin VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa + SqueakSSLPlugin VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 */ -static char __buildInfo[] = "SqueakSSLPlugin VMMaker.oscog-eem.584 uuid: f8e3994b-6462-4df0-bc8e-c71034adf6aa " __DATE__ ; +static char __buildInfo[] = "SqueakSSLPlugin VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 " __DATE__ ; @@ -101,9 +101,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "SqueakSSL VMMaker.oscog-eem.584 (i)" + "SqueakSSL VMMaker.oscog-eem.706 (i)" #else - "SqueakSSL VMMaker.oscog-eem.584 (e)" + "SqueakSSL VMMaker.oscog-eem.706 (e)" #endif ; @@ -180,7 +180,7 @@ return null; } if (!(((start > 0) - && (srcLen >= 0)) + && (srcLen >= 0)) && ((isBytes(srcOop)) && ((isBytes(dstOop)) && ((byteSizeOf(srcOop)) >= ((start + srcLen) - 1)))))) { @@ -234,7 +234,7 @@ return null; } if (!(((start > 0) - && (srcLen >= 0)) + && (srcLen >= 0)) && ((isBytes(srcOop)) && ((isBytes(dstOop)) && ((byteSizeOf(srcOop)) >= ((start + srcLen) - 1)))))) { @@ -304,7 +304,7 @@ return null; } if (!(((start > 0) - && (srcLen >= 0)) + && (srcLen >= 0)) && ((isBytes(srcOop)) && ((isBytes(dstOop)) && ((byteSizeOf(srcOop)) >= ((start + srcLen) - 1)))))) { @@ -378,7 +378,7 @@ return null; } if (!(((start > 0) - && (srcLen >= 0)) + && (srcLen >= 0)) && ((isBytes(srcOop)) && ((isBytes(dstOop)) && ((byteSizeOf(srcOop)) >= ((start + srcLen) - 1)))))) { Modified: branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2014-05-06 22:13:38 UTC (rev 2916) +++ branches/Cog/nscogsrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c 2014-05-07 04:38:16 UTC (rev 2917) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.598 uuid: b85d7330-2ddc-4d90-8592-4e37234f4ac2 + VMPluginCodeGenerator VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 from - UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.46 uuid: 5ede26ca-4333-4d0a-8d3c-856b68975986 + UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.48 uuid: 65e92aef-c30a-4a73-8966-e3d7da6ec7b6 */ -static char __buildInfo[] = "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.46 uuid: 5ede26ca-4333-4d0a-8d3c-856b68975986 " __DATE__ ; +static char __buildInfo[] = "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.48 uuid: 65e92aef-c30a-4a73-8966-e3d7da6ec7b6 " __DATE__ ; /* D T Lewis - UnixOSProcessPlugin.c translated from class UnixOSProcessPlugin of OSProcessPlugin version 4.3.3 Cog */ @@ -318,9 +318,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.46 (i)" + "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.48 (i)" #else - "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.46 (e)" + "UnixOSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.48 (e)" #endif ; static void *originalSigHandlers[NSIG]; @@ -446,8 +446,8 @@ /* begin fileDescriptorFrom: */ if (!((((isBytes(anSQFileDataStructure)) - && ((byteSizeOf(anSQFileDataStructure)) == (sizeof(SQFile)))) - && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(anSQFileDataStructure))))) + && ((byteSizeOf(anSQFileDataStructure)) == (sizeof(SQFile)))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(anSQFileDataStructure))))) && (isNonNullSQFile(anSQFileDataStructure)))) { filenoToDup = -1; goto l1; @@ -481,8 +481,8 @@ /* begin fileDescriptorFrom: */ if (!((((isBytes(anSQFileDataStructure)) - && ((byteSizeOf(anSQFileDataStructure)) == (sizeof(SQFile)))) - && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(anSQFileDataStructure))))) + && ((byteSizeOf(anSQFileDataStructure)) == (sizeof(SQFile)))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(anSQFileDataStructure))))) && (isNonNullSQFile(anSQFileDataStructure)))) { filenoToDup = -1; goto l1; @@ -517,8 +517,8 @@ /* begin fileDescriptorFrom: */ if (!((((isBytes(anSQFileDataStructure)) - && ((byteSizeOf(anSQFileDataStructure)) == (sizeof(SQFile)))) - && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(anSQFileDataStructure))))) + && ((byteSizeOf(anSQFileDataStructure)) == (sizeof(SQFile)))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(anSQFileDataStructure))))) && (isNonNullSQFile(anSQFileDataStructure)))) { filenoToDup = -1; goto l1; @@ -545,8 +545,8 @@ fileDescriptorFrom(sqInt aSQFileByteArray) { if (!((((isBytes(aSQFileByteArray)) - && ((byteSizeOf(aSQFileByteArray)) == (sizeof(SQFile)))) - && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(aSQFileByteArray))))) + && ((byteSizeOf(aSQFileByteArray)) == (sizeof(SQFile)))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(aSQFileByteArray))))) && (isNonNullSQFile(aSQFileByteArray)))) { return -1; } @@ -1106,8 +1106,8 @@ isSQFileObject(sqInt objectPointer) { return (((isBytes(objectPointer)) - && ((byteSizeOf(objectPointer)) == (sizeof(SQFile)))) - && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(objectPointer))))) + && ((byteSizeOf(objectPointer)) == (sizeof(SQFile)))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(objectPointer))))) && (isNonNullSQFile(objectPointer)); } @@ -1123,7 +1123,7 @@ isSQSocketObject(sqInt objectPointer) { return ((isBytes(objectPointer)) - && ((byteSizeOf(objectPointer)) == (socketRecordSize()))) + && ((byteSizeOf(objectPointer)) == (socketRecordSize()))) && (!(isNullSQSocket(objectPointer))); } @@ -2017,7 +2017,7 @@ cwd = getcwd(buffer, bufferSize); if (!((cwd == 0) - && (bufferSize < maxSize))) break; + && (bufferSize < maxSize))) break; bufferSize += incrementBy; } if (cwd == 0) { @@ -2143,7 +2143,9 @@ EXPORT(sqInt) primitiveGetSession(void) { + sqInt bytes; void *charArray1; + sqInt i; unsigned char *sessionByteArrayPointer; sqInt sessionIDSize; sqInt sessionOop; @@ -2311,8 +2313,8 @@ sqFileOop = stackValue(0); if (!((((isBytes(sqFileOop)) - && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) - && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) + && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) && (isNonNullSQFile(sqFileOop)))) { return primitiveFail(); } @@ -2408,8 +2410,8 @@ start = stackIntegerValue(2); sqFileOop = stackValue(3); if (!((((isBytes(sqFileOop)) - && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) - && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) + && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) && (isNonNullSQFile(sqFileOop)))) { return primitiveFail(); } @@ -3382,8 +3384,8 @@ sqFileOop = stackValue(0); if (!((((isBytes(sqFileOop)) - && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) - && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) + && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) && (isNonNullSQFile(sqFileOop)))) { return primitiveFail(); } @@ -3414,8 +3416,8 @@ sqFileOop = stackValue(1); if (!((((isBytes(sqFileOop)) - && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) - && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) + && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) && (isNonNullSQFile(sqFileOop)))) { return primitiveFail(); } @@ -3439,15 +3441,15 @@ sqFileOop = stackValue(0); if (!((((isBytes(sqFileOop)) - && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) - && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) + && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) && (isNonNullSQFile(sqFileOop)))) { return primitiveFail(); } /* begin fileDescriptorFrom: */ if (!((((isBytes(sqFileOop)) - && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) - && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) + && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) && (isNonNullSQFile(sqFileOop)))) { descriptor = -1; goto l1; @@ -3484,8 +3486,8 @@ sqFileOop = stackValue(1); if (!((((isBytes(sqFileOop)) - && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) - && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) + && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) && (isNonNullSQFile(sqFileOop)))) { return primitiveFail(); } @@ -3494,8 +3496,8 @@ if (thisSession == (sqFile->sessionID)) { /* begin fileDescriptorFrom: */ if (!((((isBytes(sqFileOop)) - && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) - && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) + && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) && (isNonNullSQFile(sqFileOop)))) { descriptor = -1; goto l1; @@ -3530,15 +3532,15 @@ sqFileOop = stackValue(0); if (!((((isBytes(sqFileOop)) - && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) - && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) + && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) && (isNonNullSQFile(sqFileOop)))) { return primitiveFail(); } /* begin fileDescriptorFrom: */ if (!((((isBytes(sqFileOop)) - && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) - && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) + && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) && (isNonNullSQFile(sqFileOop)))) { descriptor = -1; goto l1; @@ -3575,8 +3577,8 @@ sqFileOop = stackValue(1); if (!((((isBytes(sqFileOop)) - && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) - && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) + && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) && (isNonNullSQFile(sqFileOop)))) { return primitiveFail(); } @@ -3585,8 +3587,8 @@ if (thisSession == (sqFile->sessionID)) { /* begin fileDescriptorFrom: */ if (!((((isBytes(sqFileOop)) - && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) - && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) + && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) && (isNonNullSQFile(sqFileOop)))) { descriptor = -1; goto l1; @@ -3625,8 +3627,8 @@ sqFileOop = stackValue(0); if (!((((isBytes(sqFileOop)) - && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) - && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) + && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) && (isNonNullSQFile(sqFileOop)))) { return primitiveFail(); } @@ -3661,8 +3663,8 @@ sqFileOop = stackValue(1); if (!((((isBytes(sqFileOop)) - && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) - && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) + && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) && (isNonNullSQFile(sqFileOop)))) { return primitiveFail(); } @@ -3697,8 +3699,8 @@ sqFileOop = stackValue(0); if (!((((isBytes(sqFileOop)) - && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) - && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) + && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) && (isNonNullSQFile(sqFileOop)))) { return primitiveFail(); } @@ -3761,8 +3763,8 @@ start = stackIntegerValue(2); sqFileOop = stackValue(3); if (!((((isBytes(sqFileOop)) - && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) - && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) + && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) && (isNonNullSQFile(sqFileOop)))) { return primitiveFail(); } @@ -3834,8 +3836,8 @@ sqFileOop = stackValue(0); if (!((((isBytes(sqFileOop)) - && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) - && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) + && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) && (isNonNullSQFile(sqFileOop)))) { return primitiveFail(); } @@ -3876,8 +3878,8 @@ start = stackIntegerValue(1); sqFileOop = stackValue(2); if (!((((isBytes(sqFileOop)) - && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) - && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) + && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) && (isNonNullSQFile(sqFileOop)))) { return primitiveFail(); } @@ -4040,7 +4042,7 @@ } hasSocketAccess = ((int (*) (void)) sHSAfn)(); if ((canWriteImage - && (hasFileAccess)) + && (hasFileAccess)) && (hasSocketAccess)) { return 0; } Modified: branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c 2014-05-06 22:13:38 UTC (rev 2916) +++ branches/Cog/nscogsrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c 2014-05-07 04:38:16 UTC (rev 2917) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.580 uuid: 751b08d4-d92e-440a-b3f6-cb2c76f52514 + VMPluginCodeGenerator VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 from - Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.45 uuid: 7e7b595f-3783-417f-b514-4f5323e0a3c1 + Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.48 uuid: 65e92aef-c30a-4a73-8966-e3d7da6ec7b6 */ -static char __buildInfo[] = "Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.45 uuid: 7e7b595f-3783-417f-b514-4f5323e0a3c1 " __DATE__ ; +static char __buildInfo[] = "Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.48 uuid: 65e92aef-c30a-4a73-8966-e3d7da6ec7b6 " __DATE__ ; /* D T Lewis - Win32OSProcessPlugin.c translated from class Win32OSProcessPlugin of OSProcessPlugin version 4.3.3 Cog */ @@ -225,9 +225,9 @@ struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.45 (i)" + "Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.48 (i)" #else - "Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.45 (e)" + "Win32OSProcessPlugin VMConstruction-Plugins-OSProcessPlugin.oscog-eem.48 (e)" #endif ; static int osprocessSandboxSecurity; @@ -597,8 +597,8 @@ isSQFileObject(sqInt objectPointer) { return (((isBytes(objectPointer)) - && ((byteSizeOf(objectPointer)) == (sizeof(SQFile)))) - && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(objectPointer))))) + && ((byteSizeOf(objectPointer)) == (sizeof(SQFile)))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(objectPointer))))) && (isNonNullSQFile(objectPointer)); } @@ -614,7 +614,7 @@ isSQSocketObject(sqInt objectPointer) { return ((isBytes(objectPointer)) - && ((byteSizeOf(objectPointer)) == (socketRecordSize()))) + && ((byteSizeOf(objectPointer)) == (socketRecordSize()))) && (!(isNullSQSocket(objectPointer))); } @@ -1237,7 +1237,9 @@ EXPORT(sqInt) primitiveGetSession(void) { + sqInt bytes; void *charArray1; + sqInt i; unsigned char *sessionByteArrayPointer; sqInt sessionIDSize; sqInt sessionOop; @@ -1661,8 +1663,8 @@ sqFileOop = stackValue(0); if (!((((isBytes(sqFileOop)) - && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) - && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) + && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) && (isNonNullSQFile(sqFileOop)))) { return primitiveFail(); } @@ -1688,8 +1690,8 @@ sqFileOop = stackValue(0); if (!((((isBytes(sqFileOop)) - && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) - && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) + && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) && (isNonNullSQFile(sqFileOop)))) { return primitiveFail(); } @@ -1715,8 +1717,8 @@ sqFileOop = stackValue(0); if (!((((isBytes(sqFileOop)) - && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) - && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) + && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) && (isNonNullSQFile(sqFileOop)))) { return primitiveFail(); } @@ -1967,7 +1969,7 @@ } hasSocketAccess = ((int (*) (void)) sHSAfn)(); if ((canWriteImage - && (hasFileAccess)) + && (hasFileAccess)) && (hasSocketAccess)) { return 0; } Modified: branches/Cog/nscogsrc/vm/cogit.c =================================================================== --- branches/Cog/nscogsrc/vm/cogit.c 2014-05-06 22:13:38 UTC (rev 2916) +++ branches/Cog/nscogsrc/vm/cogit.c 2014-05-07 04:38:16 UTC (rev 2917) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGenerator VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 from - StackToRegisterMappingCogit VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + StackToRegisterMappingCogit VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -3347,6 +3347,13 @@ cr(); ok = 0; } + if (!(isCompiledMethod((cogMethod->methodObject)))) { + print("non-method in CM "); + printHex(((sqInt)cogMethod)); + print(" methodObject"); + cr(); + ok = 0; + } if ((mapForperformUntilarg(cogMethod, checkIfValidObjectRefpccogMethod, ((sqInt)cogMethod))) != 0) { ok = 0; } @@ -21676,16 +21683,18 @@ mustScanAndUnlink = 0; if (isMNUSelector) { while (cogMethod < (limitZony())) { - if ((cogMethod->cpicHasMNUCase)) { - assert(((cogMethod->cmType)) == CMClosedPIC); - freeMethod(cogMethod); - mustScanAndUnlink = 1; - } - else { - if (((cogMethod->selector)) == selector) { + if (((cogMethod->cmType)) != CMFree) { + if ((cogMethod->cpicHasMNUCase)) { + assert(((cogMethod->cmType)) == CMClosedPIC); + freeMethod(cogMethod); mustScanAndUnlink = 1; - if (((cogMethod->cmType)) == CMClosedPIC) { - freeMethod(cogMethod); + } + else { + if (((cogMethod->selector)) == selector) { + mustScanAndUnlink = 1; + if (((cogMethod->cmType)) == CMClosedPIC) { + freeMethod(cogMethod); + } } } } @@ -21694,7 +21703,8 @@ } else { while (cogMethod < (limitZony())) { - if (((cogMethod->selector)) == selector) { + if ((((cogMethod->cmType)) != CMFree) + && (((cogMethod->selector)) == selector)) { mustScanAndUnlink = 1; if (((cogMethod->cmType)) == CMClosedPIC) { freeMethod(cogMethod); Modified: branches/Cog/nscogsrc/vm/cogit.h =================================================================== --- branches/Cog/nscogsrc/vm/cogit.h 2014-05-06 22:13:38 UTC (rev 2916) +++ branches/Cog/nscogsrc/vm/cogit.h 2014-05-07 04:38:16 UTC (rev 2917) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGenerator VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 */ Modified: branches/Cog/nscogsrc/vm/cogmethod.h =================================================================== --- branches/Cog/nscogsrc/vm/cogmethod.h 2014-05-06 22:13:38 UTC (rev 2916) +++ branches/Cog/nscogsrc/vm/cogmethod.h 2014-05-07 04:38:16 UTC (rev 2917) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGenerator VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 */ typedef struct { Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-05-06 22:13:38 UTC (rev 2916) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-05-07 04:38:16 UTC (rev 2917) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 from - CoInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CoInterpreter VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2045,7 +2045,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.702"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.706"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -5684,6 +5684,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((rcvr + BaseHeaderSize) + (byte3 << ShiftForWord))); } + null; goto l4; } if (opType == 3) { @@ -5693,6 +5694,7 @@ assert(GIV(method) == (iframeMethod(localFP))); object = longAt((GIV(method) + BaseHeaderSize) + ((byte3 + LiteralStart) << ShiftForWord)); longAtPointerput((localSP -= BytesPerOop), object); + null; goto l4; } if (opType == 4) { @@ -5706,6 +5708,7 @@ object2 = longAt((oop + BaseHeaderSize) + (ValueIndex << ShiftForWord)); longAtPointerput((localSP -= BytesPerOop), object2); + null; goto l4; } top = longAtPointer(localSP); @@ -46607,6 +46610,7 @@ assert((callerContextOrNil == (nilObject())) || (isContext(callerContextOrNil))); ctxt = callerContextOrNil; + } else { print("widowed caller frame "); @@ -51587,6 +51591,7 @@ static sqInt shortReversePrintFrameAndCallers(char *aFramePointer) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt caller; sqInt callerContextOrNil; char *callerFP; sqInt index; @@ -51616,7 +51621,9 @@ assert(addressCouldBeObj(callerContextOrNil)); assert((callerContextOrNil == (nilObject())) || (isContext(callerContextOrNil))); - return callerContextOrNil; + caller = callerContextOrNil; + + return caller; } Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-05-06 22:13:38 UTC (rev 2916) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-05-07 04:38:16 UTC (rev 2917) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-05-06 22:13:38 UTC (rev 2916) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-05-07 04:38:16 UTC (rev 2917) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 from - CoInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CoInterpreter VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -2048,7 +2048,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.702"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.706"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -5693,6 +5693,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((rcvr + BaseHeaderSize) + (byte3 << ShiftForWord))); } + null; goto l4; } if (opType == 3) { @@ -5702,6 +5703,7 @@ assert(GIV(method) == (iframeMethod(localFP))); object = longAt((GIV(method) + BaseHeaderSize) + ((byte3 + LiteralStart) << ShiftForWord)); longAtPointerput((localSP -= BytesPerOop), object); + null; goto l4; } if (opType == 4) { @@ -5715,6 +5717,7 @@ object2 = longAt((oop + BaseHeaderSize) + (ValueIndex << ShiftForWord)); longAtPointerput((localSP -= BytesPerOop), object2); + null; goto l4; } top = longAtPointer(localSP); @@ -46616,6 +46619,7 @@ assert((callerContextOrNil == (nilObject())) || (isContext(callerContextOrNil))); ctxt = callerContextOrNil; + } else { print("widowed caller frame "); @@ -51596,6 +51600,7 @@ static sqInt shortReversePrintFrameAndCallers(char *aFramePointer) { DECL_MAYBE_SQ_GLOBAL_STRUCT + sqInt caller; sqInt callerContextOrNil; char *callerFP; sqInt index; @@ -51625,7 +51630,9 @@ assert(addressCouldBeObj(callerContextOrNil)); assert((callerContextOrNil == (nilObject())) || (isContext(callerContextOrNil))); - return callerContextOrNil; + caller = callerContextOrNil; + + return caller; } Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2014-05-06 22:13:38 UTC (rev 2916) +++ branches/Cog/nscogsrc/vm/interp.h 2014-05-07 04:38:16 UTC (rev 2917) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2014-05-06 22:13:38 UTC (rev 2916) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2014-05-07 04:38:16 UTC (rev 2917) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/nsspursrc/vm/cogit.c =================================================================== --- branches/Cog/nsspursrc/vm/cogit.c 2014-05-06 22:13:38 UTC (rev 2916) +++ branches/Cog/nsspursrc/vm/cogit.c 2014-05-07 04:38:16 UTC (rev 2917) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGenerator VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 from - StackToRegisterMappingCogit VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + StackToRegisterMappingCogit VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 */ -static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 " __DATE__ ; +static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 " __DATE__ ; char *__cogitBuildInfo = __buildInfo; @@ -3346,6 +3346,13 @@ cr(); ok = 0; } + if (!(isCompiledMethod((cogMethod->methodObject)))) { + print("non-method in CM "); + printHex(((sqInt)cogMethod)); + print(" methodObject"); + cr(); + ok = 0; + } if ((mapForperformUntilarg(cogMethod, checkIfValidObjectRefpccogMethod, ((sqInt)cogMethod))) != 0) { ok = 0; } @@ -22313,16 +22320,18 @@ mustScanAndUnlink = 0; if (isMNUSelector) { while (cogMethod < (limitZony())) { - if ((cogMethod->cpicHasMNUCase)) { - assert(((cogMethod->cmType)) == CMClosedPIC); - freeMethod(cogMethod); - mustScanAndUnlink = 1; - } - else { - if (((cogMethod->selector)) == selector) { + if (((cogMethod->cmType)) != CMFree) { + if ((cogMethod->cpicHasMNUCase)) { + assert(((cogMethod->cmType)) == CMClosedPIC); + freeMethod(cogMethod); mustScanAndUnlink = 1; - if (((cogMethod->cmType)) == CMClosedPIC) { - freeMethod(cogMethod); + } + else { + if (((cogMethod->selector)) == selector) { + mustScanAndUnlink = 1; + if (((cogMethod->cmType)) == CMClosedPIC) { + freeMethod(cogMethod); + } } } } @@ -22331,7 +22340,8 @@ } else { while (cogMethod < (limitZony())) { - if (((cogMethod->selector)) == selector) { + if ((((cogMethod->cmType)) != CMFree) + && (((cogMethod->selector)) == selector)) { mustScanAndUnlink = 1; if (((cogMethod->cmType)) == CMClosedPIC) { freeMethod(cogMethod); Modified: branches/Cog/nsspursrc/vm/cogit.h =================================================================== --- branches/Cog/nsspursrc/vm/cogit.h 2014-05-06 22:13:38 UTC (rev 2916) +++ branches/Cog/nsspursrc/vm/cogit.h 2014-05-07 04:38:16 UTC (rev 2917) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGenerator VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 */ Modified: branches/Cog/nsspursrc/vm/cogmethod.h =================================================================== --- branches/Cog/nsspursrc/vm/cogmethod.h 2014-05-06 22:13:38 UTC (rev 2916) +++ branches/Cog/nsspursrc/vm/cogmethod.h 2014-05-07 04:38:16 UTC (rev 2917) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGenerator VMMaker.oscog-eem.702 uuid: 2f753471-9a18-4f13-aaef-58ffb0702465 + CCodeGenerator VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 */ typedef struct { Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-05-06 22:13:38 UTC (rev 2916) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-05-07 04:38:16 UTC (rev 2917) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 from - CoInterpreter VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e + CoInterpreter VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.704 uuid: 5a1a2624-b349-4d95-aeb3-097087219b4e " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.706 uuid: 6eba60e7-a131-4353-870a-b34e8230b701 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -197,7 +197,7 @@ #define CSWait 10 #define CSYield 11 #define CtxtTempFrameStart 6 -#define DontTenureButDoUnmark 3 +#define DontTenureButDoUnmark 4 #define DumpStackOnLowSpace 0 #define EnclosingMixinIndex 3 #define EnclosingObjectIndex 4 @@ -233,6 +233,7 @@ #define LargeContextSlots 62 #define LastLinkIndex 1 #define LiteralStart 1 +#define MarkOnTenure 5 #define MarkStackRootIndex 0x1000 #define MaxExternalPrimitiveTableSize 4096 #define MaxJumpBuf 32 @@ -549,6 +550,7 @@ static void divorceFramesIn(StackPage *aStackPage); static sqInt doPrimitiveDivby(sqInt rcvr, sqInt arg); static sqInt doPrimitiveModby(sqInt rcvr, sqInt arg); +static void doScavenge(sqInt tenuringCriterion); sqInt doSignalSemaphoreWithIndex(sqInt index); static void dummyReferToProxy(void); EXPORT(sqInt) dumpImage(sqInt fileName); @@ -906,7 +908,6 @@ static sqInt nilUnmarkedWeaklingSlotsIn(sqInt aWeakling); sqInt noAssertHeaderOf(sqInt methodPointer); static sqInt noCheckPushonObjStack(sqInt objOop, sqInt objStack); -static sqInt noForwardersBelowFirstFreeChunk(void); static sqInt noInlineTemporaryin(sqInt offset, char *theFP); static sqInt noInlineTemporaryinput(sqInt offset, char *theFP, sqInt valueOop); static sqInt noMarkedContextsOnPage(StackPage *thePage); @@ -953,6 +954,7 @@ unsigned long positiveMachineIntegerValueOf(sqInt oop); static void postBecomeOrCompactScanClassTable(sqInt effectsFlags); static void postGCAction(sqInt gcModeArg); +static void postSnapshot(void); static void prepareForSnapshot(void); sqInt primErrTable(void); usqInt primFailCodeAddress(void); @@ -1206,6 +1208,7 @@ static sqInt printContextCallStackOf(sqInt aContext); void printContext(sqInt aContext); void printExternalHeadFrame(void); +void printForwarders(void); static sqInt printFrameAndCallersSPshort(char *theFP, char *theSP, sqInt printShort); static void printFrameFlagsForFP(char *theFP); static void printFrameMethodFor(char *theFP); @@ -1328,7 +1331,6 @@ void shortPrintObjectsFromto(sqInt startAddress, sqInt endAddress); static void shortPrintOop(sqInt oop); static sqInt shortReversePrintFrameAndCallers(char *aFramePointer); -static sqInt shouldBeTenured(sqInt survivor); sqInt shouldRemapObj(sqInt objOop); sqInt shouldRemapOop(sqInt oop); sqInt showDisplayBitsLeftTopRightBottom(sqInt aForm, sqInt l, sqInt t, sqInt r, sqInt b); @@ -1451,35 +1453,35 @@ _iss char * stackBasePlus1; _iss sqInt hiddenRootsObj; _iss usqInt endOfMemory; +_iss sqInt totalFreeOldSpace; _iss SpurCircularBuffer highestObjects; -_iss sqInt totalFreeOldSpace; -_iss SpurSegmentInfo * segments; _iss sqInt trueObj; _iss sqInt remapBufferCount; +_iss SpurSegmentInfo * segments; _iss sqInt needGCFlag; _iss sqInt falseObj; _iss sqInt traceLogIndex; _iss sqInt bytesPerPage; _iss sqInt firstFreeChunk; _iss sqInt * freeLists; +_iss sqInt numSegments; _iss usqInt pastSpaceStart; -_iss sqInt numSegments; _iss usqInt freeListsMask; _iss char * stackLimit; _iss usqInt scavengeThreshold; -_iss SpurNewSpaceSpace pastSpace; -_iss SpurNewSpaceSpace futureSpace; _iss sqInt rememberedSetSize; _iss unsigned char primTraceLogIndex; _iss SpurContiguousObjStack unscannedEphemerons; _iss usqInt newSpaceStart; _iss StackPage * mostRecentlyUsedPage; -_iss sqInt futureSurvivorStart; +_iss SpurNewSpaceSpace pastSpace; _iss sqInt numStackPages; _iss sqInt classTableFirstPage; _iss sqInt markStack; _iss usqInt oldSpaceStart; _iss sqInt weaklingStack; +_iss SpurNewSpaceSpace futureSpace; +_iss sqInt futureSurvivorStart; _iss sqInt jmpDepth; _iss sqLong nextProfileTick; _iss sqInt numRememberedEphemerons; @@ -1488,11 +1490,11 @@ _iss sqInt longRunningPrimitiveCheckSemaphore; _iss sqInt tempOop; _iss char * objStackInvalidBecause; -_iss sqInt tenureThreshold; _iss SpurNewSpaceSpace eden; _iss sqInt profileSemaphore; _iss sqInt ephemeronList; _iss sqInt profileProcess; +_iss sqInt tenureThreshold; _iss sqInt extraRootCount; _iss sqInt invalidObjStackPage; _iss sqInt lastSubdividedFreeChunk; @@ -1508,6 +1510,7 @@ _iss sqInt lastMethodCacheProbeWrite; _iss sqInt lkupClass; _iss sqInt backwardJumpCount; +_iss sqInt gcMode; _iss sqInt metaclassNumSlots; _iss usqLong nextWakeupUsecs; _iss sqInt preemptionYields; @@ -1517,7 +1520,6 @@ _iss usqLong longRunningPrimitiveStopUsecs; _iss sqInt numSegInfos; _iss usqLong statCheckForEvents; -_iss sqInt gcMode; _iss sqInt lastCoggableInterpretedBlockMethod; _iss sqInt lastUncoggableInterpretedBlockMethod; _iss usqInt lowSpaceThreshold; @@ -1525,9 +1527,7 @@ _iss sqInt cogCodeSize; _iss sqInt externalPrimitiveTableFirstFreeIndex; _iss sqInt flagInterpretedMethods; -_iss usqInt memory; _iss sqInt pendingFinalizationSignals; -_iss sqInt scavengeInProgress; _iss usqLong statIOProcessEvents; _iss sqInt weakList; _iss sqInt firstSegmentSize; @@ -1544,13 +1544,13 @@ _iss sqInt lastHash; _iss sqInt longRunningPrimitiveCheckSequenceNumber; _iss sqInt marking; +_iss usqInt memory; _iss sqInt methodDictLinearSearchLimit; _iss usqLong nextPollUsecs; _iss usqLong statForceInterruptCheck; _iss usqLong statProcessSwitch; _iss usqLong statStackOverflow; _iss usqLong statStackPageDivorce; -_iss sqInt tenuringProportion; _iss sqInt extraFramesToMoveOnOverflow; _iss sqInt globalSessionID; _iss sqInt interruptKeycode; @@ -1569,12 +1569,14 @@ _iss sqInt longRunningPrimitiveSignalUndelivered; _iss StackPage * overflowedPage; _iss sqInt savedWindowSize; +_iss sqInt scavengeInProgress; _iss sqInt signalLowSpace; _iss sqInt statCodeCompactionCount; _iss usqLong statCodeCompactionUsecs; _iss sqInt statMarkCount; _iss sqInt statPendingFinalizationSignals; _iss sqInt statRootTableCount; +_iss sqInt tenuringProportion; _iss sqInt classByteArrayCompactIndex; _iss sqInt gcSemaphoreIndex; _iss sqInt imageHeaderFlags; @@ -2218,7 +2220,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.704"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.706"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -6571,6 +6573,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((rcvr1 + (BaseHeaderSize)) + (byte3 << 2))); } + null; goto l5; } if (opType == 3) { @@ -6580,6 +6583,7 @@ assert(GIV(method) == (iframeMethod(localFP))); object = longAt((GIV(method) + (BaseHeaderSize)) + ((byte3 + LiteralStart) << 2)); longAtPointerput((localSP -= BytesPerOop), object); + null; goto l5; } if (opType == 4) { @@ -6607,6 +6611,7 @@ /* begin internalPush: */ longAtPointerput((localSP -= BytesPerOop), longAt((litVar1 + (BaseHeaderSize)) + (ValueIndex << 2))); + null; goto l5; } top = longAtPointer(localSP); @@ -15515,7 +15520,6 @@ static SpurSegmentInfo * addSegmentOfSize(sqInt ammount) { DECL_MAYBE_SQ_GLOBAL_STRUCT - sqInt address; sqInt allocatedSize; sqInt i; sqInt idx; @@ -15555,11 +15559,6 @@ bridgeFromto(newSeg, (!(newSegIndex == (GIV(numSegments) - 1)) ? (&(GIV(segments)[newSegIndex + 1])) : 0)); - /* begin addFreeChunkWithBytes:at: */ - address = (newSeg->segStart); - freeChunkWithBytesat(allocatedSize - (2 * (BaseHeaderSize)), address); - GIV(totalFreeOldSpace) += allocatedSize - (2 * (BaseHeaderSize)); - assert((addressAfter(objectStartingAt((newSeg->segStart)))) == ((segLimit(newSeg)) - (bridgeSize()))); for (i = 0; i < GIV(numSegments); i += 1) { assert(isInSegments(((GIV(segments)[i]).segStart))); assert(isInSegments((segLimit(&GIV(segments)[i])) - (wordSize()))); @@ -22613,7 +22612,8 @@ if (!(((longAt(free)) & 0x3FFFFF) == 0)) { free = (longAt((prevFree + (BaseHeaderSize)) + (0 << 2))) ^ prevPrevFree; } - if (((longAt(nextFree)) & 0x3FFFFF) == 0) { + if ((nextFree == 0) + || (((longAt(nextFree)) & 0x3FFFFF) == 0)) { prevPrevFree = prevFree; prevFree = free; free = nextFree; @@ -22777,16 +22777,40 @@ sqInt nTenures; sqInt startOfSurvivor; sqInt startOfSurvivor1; + sqInt tenure; assert((isInEden(survivor)) || (isInPastSpace(survivor))); bytesInObj = bytesInObject(survivor); format = (((usqInt) (longAt(survivor))) >> 24) & 0x1F; - if ((shouldBeTenured(survivor)) + + /* Allow Slang to inline. */ + + + switch (GIV(tenureCriterion)) { + case TenureByAge: + tenure = survivor < GIV(tenureThreshold); + + break; + case TenureByClass: + tenure = ((longAt(survivor)) & 0x3FFFFF) == GIV(tenuringClassIndex); + + break; + case DontTenureButDoUnmark: + setIsMarkedOfto(survivor, 0); + tenure = 0; + + break; + default: + tenure = 0; + + } + if (tenure || ((GIV(futureSurvivorStart) + bytesInObj) > ((GIV(futureSpace).limit)))) { /* begin copyToOldSpace:bytes:format: */ assert((format == (formatOf(survivor))) - && ((!(isMarked(survivor))) + && (((!(isMarked(survivor))) + || (GIV(tenureCriterion) == MarkOnTenure)) && ((!(isPinned(survivor))) && (!(isRemembered(survivor)))))); nTenures = GIV(statTenures); @@ -22813,6 +22837,9 @@ flag("endianness"); @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.706.mcz
by commits＠source.squeak.org 07 May '14

07 May '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.706.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.706 Author: eem Time: 6 May 2014, 9:11:20.717 pm UUID: 6eba60e7-a131-4353-870a-b34e8230b701 Ancestors: VMMaker.oscog-djm.705 Spur: Fix the coallescing sweep in pig compact to start from the lowest of the first forwarder or the first free chunk. Do a tenuring scavenge to void eden in freeUnmarked- ObjectsAndSortAndCoalesceFreeSpaceForPigCompact to avoid any tenuring due to futureSpace overflow in the unmarking scavenge in eliminateAndFreeForwarders- ForPigCompact. Do this by adding the MarkOnTenure tenuring criterion. Change the use of shouldBeTenured: to allow it to be inlined into copyAndForward:. Add an assert to freeChunkWithBytes:at: to catch accidental freeing of non-oldSpace. Refactor SpurSegmentManager>>postSnapshot to not fall foul of this new assert. Add a check to totalFreeListBytes to catch double freeing (double freeing was caused by tenuring in the eAFFFPC scavenge growing memory to make room for tenuring, given free lists are not rebuilt at this point, and later in eAFFFPC this memory being freed again). Don't inline doScavenge: or scavengingGCTenuringIf:. Refactor eliminateAndFreeForwardersForFitCompact to extract the large loops. Add printForwarders for debugging. With these changes the StackInterpreter runs the Newspeak bootstrap to completion, albeit with one presumably bogus assert fail to do with a DependentsArray referring to forwarder contents (this to be fixed tomorrow). Cogit: Fix a double free bug in unlinkSendsOf:isMNUSelector:. Harmless cuz the result is only a bogus count of how many methods freed. Beef up the cog method integrity check to verify a its methodObject is a CompiledMethod. Simulator: Fix breakpointing on plugin and plugin function load when breakSelector is nil. =============== Diff against VMMaker.oscog-djm.705 =============== 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]). + (breakSelector notNil + and: [(self str: functionString n: breakSelector cmp: functionString size) = 0]) ifTrue: - (self str: functionString n: breakSelector cmp: functionString size) = 0 ifTrue: [self halt: functionString]. 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]. accessorDepthPtr at: 0 put: (pluginAndName at: 4). ^index]]. firstTime ifTrue: [transcript cr; show: 'Failed ... primitive not in plugin']. ^0! Item was changed: ----- Method: CogVMSimulator>>loadNewPlugin: (in category 'plugin support') ----- loadNewPlugin: pluginString + (breakSelector notNil + and: [(self str: pluginString n: breakSelector cmp: pluginString size) = 0]) ifTrue: - (self str: pluginString n: breakSelector cmp: pluginString size) = 0 ifTrue: [self halt: pluginString]. ^(self tryLoadNewPlugin: pluginString pluginEntries: mappedPluginEntries) ifNotNil: [:entry| pluginList := pluginList copyWith: entry. entry]! Item was changed: ----- Method: Cogit>>checkIntegrityOfObjectReferencesInCode: (in category 'debugging') ----- checkIntegrityOfObjectReferencesInCode: fullGCFlag <api> "Answer if all references to objects in machine-code are valid." | cogMethod ok count | <var: #cogMethod type: #'CogMethod *'> cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'. ok := true. [cogMethod < methodZone limitZony] whileTrue: [cogMethod cmType ~= CMFree ifTrue: [cogMethod cmRefersToYoung ifTrue: [(count := methodZone occurrencesInYoungReferrers: cogMethod) ~= 1 ifTrue: [coInterpreter print: 'young referrer CM '; printHex: cogMethod asInteger. count = 0 ifTrue: [coInterpreter print: ' is not in youngReferrers'; cr] ifFalse: [coInterpreter print: ' is in youngReferrers '; printNum: count; print: ' times!!'; cr]. ok := false]]. (objectRepresentation checkValidObjectReference: cogMethod selector) ifFalse: [coInterpreter print: 'object leak in CM '; printHex: cogMethod asInteger; print: ' selector'; cr. ok := false]. cogMethod cmType = CMMethod ifTrue: [self assert: cogMethod objectHeader = objectMemory nullHeaderForMachineCodeMethod. (objectRepresentation checkValidObjectReference: cogMethod methodObject) ifFalse: [coInterpreter print: 'object leak in CM '; printHex: cogMethod asInteger; print: ' methodObject'; cr. ok := false]. + (objectMemory isCompiledMethod: cogMethod methodObject) ifFalse: + [coInterpreter print: 'non-method in CM '; printHex: cogMethod asInteger; print: ' methodObject'; cr. + ok := false]. (self mapFor: cogMethod performUntil: #checkIfValidObjectRef:pc:cogMethod: arg: cogMethod asInteger) ~= 0 ifTrue: [ok := false]. fullGCFlag ifFalse: [(((objectMemory isYoungObject: cogMethod methodObject) or: [objectMemory isYoung: cogMethod selector]) and: [cogMethod cmRefersToYoung not]) ifTrue: [coInterpreter print: 'CM '; printHex: cogMethod asInteger; print: ' refers to young but not marked as such'; cr. ok := false]]] ifFalse: [cogMethod cmType = CMClosedPIC ifTrue: [(self checkValidObjectReferencesInClosedPIC: cogMethod) ifFalse: [ok := false]] ifFalse: [cogMethod cmType = CMOpenPIC ifTrue: [(self mapFor: cogMethod performUntil: #checkIfValidObjectRef:pc:cogMethod: arg: cogMethod asInteger) ~= 0 ifTrue: [ok := false]]]]]. cogMethod := methodZone methodAfter: cogMethod]. ^ok! Item was changed: ----- Method: Cogit>>unlinkSendsOf:isMNUSelector: (in category 'jit - api') ----- unlinkSendsOf: selector isMNUSelector: isMNUSelector <api> "Unlink all sends in cog methods. Free all Closed PICs with the selector, or with an MNU case if isMNUSelector. First check if any method actually has the selector; if not there can't be any linked send to it. This routine (including descendents) is performance critical. It contributes perhaps 30% of entire execution time in Compiler recompileAll." | cogMethod mustScanAndUnlink | <var: #cogMethod type: #'CogMethod *'> methodZoneBase isNil ifTrue: [^self]. cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'. mustScanAndUnlink := false. isMNUSelector ifTrue: [[cogMethod < methodZone limitZony] whileTrue: + [cogMethod cmType ~= CMFree ifTrue: + [cogMethod cpicHasMNUCase + ifTrue: + [self assert: cogMethod cmType = CMClosedPIC. + methodZone freeMethod: cogMethod. + mustScanAndUnlink := true] + ifFalse: + [cogMethod selector = selector ifTrue: + [mustScanAndUnlink := true. + cogMethod cmType = CMClosedPIC ifTrue: + [methodZone freeMethod: cogMethod]]]]. - [cogMethod cpicHasMNUCase - ifTrue: - [self assert: cogMethod cmType = CMClosedPIC. - methodZone freeMethod: cogMethod. - mustScanAndUnlink := true] - ifFalse: - [cogMethod selector = selector ifTrue: - [mustScanAndUnlink := true. - cogMethod cmType = CMClosedPIC ifTrue: - [methodZone freeMethod: cogMethod]]]. cogMethod := methodZone methodAfter: cogMethod]] ifFalse: [[cogMethod < methodZone limitZony] whileTrue: + [(cogMethod cmType ~= CMFree + and: [cogMethod selector = selector]) ifTrue: - [cogMethod selector = selector ifTrue: [mustScanAndUnlink := true. cogMethod cmType = CMClosedPIC ifTrue: [methodZone freeMethod: cogMethod]]. cogMethod := methodZone methodAfter: cogMethod]]. mustScanAndUnlink ifFalse: [^self]. codeModified := false. cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'. [cogMethod < methodZone limitZony] whileTrue: [cogMethod cmType = CMMethod ifTrue: [self mapFor: cogMethod performUntil: #unlinkIfFreeOrLinkedSend:pc:of: arg: selector]. cogMethod := methodZone methodAfter: cogMethod]. codeModified ifTrue: "After possibly updating inline caches we need to flush the icache." [processor flushICacheFrom: methodZoneBase to: methodZone limitZony asInteger]! Item was changed: ----- Method: SpurGenerationScavenger class>>initialize (in category 'class initialization') ----- initialize "SpurGenerationScavenger initialize" RememberedSetLimit := 64 * 1024. "temporary; must move to heap" RememberedSetRedZone := RememberedSetLimit - (RememberedSetLimit // 2). TenureByAge := 1. TenureByClass := 2. + DontTenure := 3. + DontTenureButDoUnmark := 4. + MarkOnTenure := 5! - DontTenureButDoUnmark := 3! Item was changed: ----- Method: SpurGenerationScavenger>>copyAndForward: (in category 'scavenger') ----- copyAndForward: survivor "copyAndForward: survivor copies a survivor object either to futureSurvivorSpace or, if it is to be promoted, to oldSpace. It leaves a forwarding pointer behind. If the object is weak then corpse is threaded onto the weakList for later treatment." <inline: false> + | bytesInObj format tenure newLocation | - | bytesInObj format newLocation | self assert: ((manager isInEden: survivor) "cog methods should be excluded." or: [manager isInPastSpace: survivor]). bytesInObj := manager bytesInObject: survivor. format := manager formatOf: survivor. + tenure := self shouldBeTenured: survivor. "Allow Slang to inline." + (tenure or: [futureSurvivorStart + bytesInObj > futureSpace limit]) - ((self shouldBeTenured: survivor) - or: [futureSurvivorStart + bytesInObj > futureSpace limit]) ifTrue: [newLocation := self copyToOldSpace: survivor bytes: bytesInObj format: format] ifFalse: [newLocation := self copyToFutureSpace: survivor bytes: bytesInObj]. manager forwardSurvivor: survivor to: newLocation. "if weak or ephemeron add to the relevant list for subsequent scanning." (manager isWeakFormat: format) ifTrue: [self addToWeakList: survivor]. ((manager isEphemeronFormat: format) and: [(self isScavengeSurvivor: (manager keyOfEphemeron: newLocation)) not]) ifTrue: [self addToEphemeronList: survivor]. ^newLocation! Item was changed: ----- Method: SpurGenerationScavenger>>copyToOldSpace:bytes:format: (in category 'scavenger') ----- copyToOldSpace: survivor bytes: bytesInObject format: formatOfSurvivor "Copy survivor to oldSpace. Answer the new oop of the object." <inline: true> | nTenures startOfSurvivor newStart newOop | self assert: (formatOfSurvivor = (manager formatOf: survivor) + and: [((manager isMarked: survivor) not or: [tenureCriterion = MarkOnTenure]) - and: [(manager isMarked: survivor) not and: [(manager isPinned: survivor) not and: [(manager isRemembered: survivor) not]]]). nTenures := statTenures. startOfSurvivor := manager startOfObject: survivor. newStart := manager allocateOldSpaceChunkOfBytes: bytesInObject. newStart ifNil: [manager growOldSpaceByAtLeast: 0. "grow by growHeadroom" newStart := manager allocateOldSpaceChunkOfBytes: bytesInObject. newStart ifNil: [self error: 'out of memory']]. manager checkFreeSpace. manager mem: newStart asVoidPointer cp: startOfSurvivor asVoidPointer y: bytesInObject. newOop := newStart + (survivor - startOfSurvivor). (manager isAnyPointerFormat: formatOfSurvivor) ifTrue: [self remember: newOop. manager setIsRememberedOf: newOop to: true]. + tenureCriterion = MarkOnTenure ifTrue: + [manager setIsMarkedOf: newOop to: true]. statTenures := nTenures + 1. ^newOop! Item was changed: ----- Method: SpurGenerationScavenger>>shouldBeTenured: (in category 'scavenger') ----- shouldBeTenured: survivor "Answer if an object should be tenured. The default policy tenuring policy is to use the tenuringThreshold to decide. If the survivors (measured in bytes) are above some fraction of the survivor space then objects below the threshold (older objects, since allocation grows upwards and hence new objects are later than old) are scavenged. Otherwise, the threshold is set to 0 and no objects are tenured. e.g. see An adaptive tenuring policy for generation scavengers, David Ungar & Frank Jackson. ACM TOPLAS, Volume 14 Issue 1, Jan. 1992, pp 1 - 27. The other policies are for special purposes." - <inline: false> "Slang limitations given this used in (... or: []) ifTrue:" ^tenureCriterion caseOf: { [TenureByAge] -> [survivor < tenureThreshold]. [TenureByClass] -> [(manager classIndexOf: survivor) = tenuringClassIndex]. [DontTenureButDoUnmark] -> [manager setIsMarkedOf: survivor to: false. false] } otherwise: [false]! Item was changed: SharedPool subclass: #SpurMemoryManagementConstants instanceVariableNames: '' + classVariableNames: 'DontTenure DontTenureButDoUnmark MarkOnTenure TenureByAge TenureByClass' - classVariableNames: 'DontTenureButDoUnmark TenureByAge TenureByClass' poolDictionaries: '' category: 'VMMaker-SpurMemoryManager'! Item was changed: ----- Method: SpurMemoryManager>>doScavenge: (in category 'gc - scavenging') ----- doScavenge: tenuringCriterion "The inner shell for scavenge, abstrascted out so globalGarbageCollect can use it." + <inline: false> - scavengeInProgress := true. pastSpaceStart := scavenger scavenge: tenuringCriterion. self assert: (self oop: pastSpaceStart isGreaterThanOrEqualTo: scavenger pastSpace start andLessThanOrEqualTo: scavenger pastSpace limit). freeStart := scavenger eden start. self initSpaceForAllocationCheck: (self addressOf: scavenger eden). scavengeInProgress := false! Item was changed: ----- Method: SpurMemoryManager>>eliminateAndFreeForwardersForFitCompact (in category 'gc - global') ----- eliminateAndFreeForwardersForFitCompact "As the final phase of global garbage collect, sweep the heap to follow forwarders, then free forwarders, coalescing with free space as we go." + | lowestFree | - | lowestFree firstFree lastFree | <inline: false> self flag: 'this might be unnecessary. if we were to track firstFreeChunk we might be able to repeat the freeUnmarkedObjectsAndSortAndCoalesceFreeSpace; compact cycle until firstFreeChunk reaches a fixed point'. self assert: (self isForwarded: nilObj) not. self assert: (self isForwarded: falseObj) not. self assert: (self isForwarded: trueObj) not. self assert: (self isForwarded: self freeListsObj) not. self assert: (self isForwarded: hiddenRootsObj) not. self assert: (self isForwarded: classTableFirstPage) not. self followSpecialObjectsOop. + "N.B. we don't have to explicitly do mapInterpreterOops since the scavenge below + will do it, except that scavenging maps only young references in machine code." - "N.B. we don't have to explicitly do mapInterpreterOops - since the scavenge below will do it." self followForwardedObjStacks. scavenger followRememberedForwardersAndForgetFreeObjects. self doScavenge: DontTenureButDoUnmark. + coInterpreter mapMachineCode. self checkFreeSpace. + lowestFree := self sweepToFollowForwardersForFitCompact. - lowestFree := 0. - "sweep, following forwarders in all live objects, and finding the first forwarder." - self allOldSpaceEntitiesDo: - [:o| - ((self isFreeObject: o) or: [self isForwarded: o]) - ifTrue: - [lowestFree = 0 ifTrue: - [lowestFree := o]] - ifFalse: - [0 to: (self numPointerSlotsOf: o) - 1 do: - [:i| | f | - f := self fetchPointer: i ofObject: o. - (self isOopForwarded: f) ifTrue: - [f := self followForwarded: f. - self storePointer: i ofObject: o withValue: f]]]]. self checkFreeSpace. lowestFree = 0 ifTrue: "yeah, right..." [^self]. + self sweepToCoallesceFreeSpaceAndRebuildFreeListsForFitCompactFrom: lowestFree. - firstFree := lastFree := 0. - "Sweep from lowest forwarder, coalescing runs of forwarders and free objects." - self allOldSpaceEntitiesFrom: lowestFree do: - [:o| - (self isFreeObject: o) - ifTrue: "two cases, isolated, in which case leave alone, or adjacent, - in which case, remove from free set prior to coalesce." - [| next | - next := self objectAfter: o limit: endOfMemory. - self assert: (next = endOfMemory or: [(self isFreeObject: next) not]). "free chunks have already been coalesced" - (firstFree ~= 0 - or: [next ~= endOfMemory and: [self isForwarded: next]]) ifTrue: - [firstFree = 0 ifTrue: - [firstFree := o]. - lastFree := o. - self detachFreeObject: o. - self checkFreeSpace]] - ifFalse: - [(self isForwarded: o) - ifTrue: - [firstFree = 0 ifTrue: - [firstFree := o]. - lastFree := o] - ifFalse: - [firstFree ~= 0 ifTrue: - [| start bytes | - start := self startOfObject: firstFree. - bytes := (self addressAfter: lastFree) - start. - self addFreeChunkWithBytes: bytes at: start. - self checkFreeSpace]. - firstFree := 0]]]. - firstFree ~= 0 ifTrue: - [| start bytes | - start := self startOfObject: firstFree. - bytes := (self addressAfter: lastFree) - start. - self addFreeChunkWithBytes: bytes at: start]. self checkFreeSpace! Item was changed: ----- Method: SpurMemoryManager>>eliminateAndFreeForwardersForPigCompact (in category 'gc - global') ----- eliminateAndFreeForwardersForPigCompact "As the final phase of global garbage collect, sweep the heap to follow forwarders, then free forwarders, coalescing with free space as we go." <inline: false> + | lowestForwarder | self assert: (self isForwarded: nilObj) not. self assert: (self isForwarded: falseObj) not. self assert: (self isForwarded: trueObj) not. self assert: (self isForwarded: self freeListsObj) not. self assert: (self isForwarded: hiddenRootsObj) not. self assert: (self isForwarded: classTableFirstPage) not. self followSpecialObjectsOop. + "N.B. we don't have to explicitly do mapInterpreterOops since the scavenge below + will do it, except that scavenging maps only young references in machine code." - "N.B. we don't have to explicitly do mapInterpreterOops - since the scavenge below will do it." self followForwardedObjStacks. scavenger followRememberedForwardersAndForgetFreeObjectsForPigCompact. + "Because of the flushEden before markObjects the scavenge /should not/ + tenure. In fact it must not because the free list has not been rebuilt, so + there is no space, and any attempt to tenure will allocate a new segment." + totalFreeOldSpace := 0. self doScavenge: DontTenureButDoUnmark. + self assert: totalFreeOldSpace = 0. + coInterpreter mapMachineCode. + lowestForwarder := self sweepToFollowForwardersForPigCompact. + self sweepToCoallesceFreeSpaceAndRebuildFreeListsForPigCompactFrom: lowestForwarder. - self sweepToFollowForwardersForPigCompact. - self sweepToCoallesceFreeSpaceAndRebuildFreeListsForPigCompact. self checkFreeSpace. self assert: self numberOfForwarders = 0! Item was added: + ----- Method: SpurMemoryManager>>flushEden (in category 'gc - scavenging') ----- + flushEden + "Fush everything in eden. Do so by doing a non-tenuring scavenge." + self scavengingGCTenuringIf: DontTenure. + self assert: pastSpaceStart = scavenger pastSpace start. + self assert: freeStart = scavenger eden start! Item was changed: ----- Method: SpurMemoryManager>>flushNewSpace (in category 'gc - scavenging') ----- flushNewSpace + "Fush everything in new space. Do so by setting the tenure + threshold above everything in newSpace, i.e. newSpaceLimit." | savedTenuringThreshold | savedTenuringThreshold := scavenger getRawTenuringThreshold. scavenger setRawTenuringThreshold: newSpaceLimit. self scavengingGCTenuringIf: TenureByAge. scavenger setRawTenuringThreshold: savedTenuringThreshold. self assert: scavenger rememberedSetSize = 0. self assert: pastSpaceStart = scavenger pastSpace start. self assert: freeStart = scavenger eden start! Item was changed: ----- Method: SpurMemoryManager>>freeChunkWithBytes:at: (in category 'free space') ----- freeChunkWithBytes: bytes at: address <inline: false> | freeChunk | self assert: (lastSubdividedFreeChunk := address) ~= 0. + self assert: (self isInOldSpace: address). freeChunk := self initFreeChunkWithBytes: bytes at: address. self assert: (self isInMemory: (self addressAfter: freeChunk)). self addToFreeList: freeChunk bytes: bytes. self assert: freeChunk = (self objectStartingAt: address). ^freeChunk! Item was changed: ----- Method: SpurMemoryManager>>freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact (in category 'gc - global') ----- freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact "Sweep all of old space, freeing unmarked objects, coalescing free chunks, and sorting free space. Doubly-link the free chunks in address order through the freeChunkNextIndex field using the xor trick to use only one field, see e.g. The Art of Computer Programming, Vol 1, D.E. Knuth, 3rd Ed, Sec 2.2.4 `Circular Lists', exercise. 18 http://en.wikipedia.org/wiki/XOR_linked_list. Record the lowest free object in firstFreeChunk and the highest in lastFreeChunk. Let the segmentManager mark which segments contain pinned objects via notePinned:." | prevPrevFree prevFree | <inline: false> self checkFreeSpace. + "Using pigCompact we scavenge to unmark objects before the free list has been + rebuilt, and that scavenge must not tenure. So get tenuring out of the way now." scavenger forgetUnmarkedRememberedObjects. + self self doScavenge: MarkOnTenure. segmentManager prepareForGlobalSweep."for notePinned:" "throw away the list heads, including the tree." self resetFreeListHeads. firstFreeChunk := prevPrevFree := prevFree := 0. self allOldSpaceEntitiesForCoalescingDo: [:o| self assert: (firstFreeChunk = 0 or: [self isFreeObject: firstFreeChunk]). (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]] ifFalse: "unmarked; two cases, an unreachable object or a free chunk." [| here | self assert: (self isRemembered: o) not. "scavenger should have cleared this above" here := self coallesceFreeChunk: o. self setObjectFree: here. self inSortedFreeListLink: prevFree to: here given: prevPrevFree. prevPrevFree := prevFree. prevFree := here]]. prevFree ~= firstFreeChunk ifTrue: [self storePointer: self freeChunkNextIndex ofFreeChunk: prevFree withValue: prevPrevFree]. lastFreeChunk := prevFree. self cCode: [] inSmalltalk: [self checkTraversableSortedFreeList]! Item was changed: ----- Method: SpurMemoryManager>>growOldSpaceByAtLeast: (in category 'growing/shrinking memory') ----- growOldSpaceByAtLeast: minAmmount "Attempt to grow memory by at least minAmmount. Answer the size of the new segment, or nil if the attempt failed." | ammount | <var: #segInfo type: #'SpurSegmentInfo *'> "statGrowMemory counts attempts, not successes." statGrowMemory := statGrowMemory + 1. "we need to include overhead for a new object header plus the segment bridge." ammount := minAmmount + (self baseHeaderSize * 2 + self bridgeSize). "round up to the nearest power of two." ammount := 1 << (ammount - 1) highBit. "and grow by at least growHeadroom." ammount := ammount max: growHeadroom. ^(segmentManager addSegmentOfSize: ammount) ifNotNil: [:segInfo| self assimilateNewSegment: segInfo. + "and add the new free chunk to the free list; done here + instead of in assimilateNewSegment: for the assert" + self addFreeChunkWithBytes: segInfo segSize - self bridgeSize at: segInfo segStart. + self assert: (self addressAfter: (self objectStartingAt: segInfo segStart)) + = (segInfo segLimit - self bridgeSize). self checkFreeSpace. segInfo segSize]! Item was added: + ----- Method: SpurMemoryManager>>printForwarders (in category 'debug printing') ----- + printForwarders + <api> + self allHeapEntitiesDo: + [:objOop| + (self isForwarded: objOop) ifTrue: + [coInterpreter printHex: objOop; cr]]! Item was changed: ----- Method: SpurMemoryManager>>scavengingGCTenuringIf: (in category 'gc - scavenging') ----- scavengingGCTenuringIf: tenuringCriterion "Run the scavenger." + <inline: false> - self assert: remapBufferCount = 0. (self asserta: scavenger eden limit - freeStart > coInterpreter interpreterAllocationReserveBytes) ifFalse: [coInterpreter tab; printNum: scavenger eden limit - freeStart; space; printNum: coInterpreter interpreterAllocationReserveBytes; space; printNum: coInterpreter interpreterAllocationReserveBytes - (scavenger eden limit - freeStart); cr]. self checkMemoryMap. self checkFreeSpace. self runLeakCheckerForFullGC: false. coInterpreter preGCAction: GCModeScavenge; "would prefer this to be in mapInterpreterOops, but compatibility with ObjectMemory dictates it goes here." flushMethodCacheFrom: newSpaceStart to: newSpaceLimit. needGCFlag := false. gcStartUsecs := coInterpreter ioUTCMicrosecondsNow. self doScavenge: tenuringCriterion. statScavenges := statScavenges + 1. statGCEndUsecs := coInterpreter ioUTCMicrosecondsNow. statSGCDeltaUsecs := statGCEndUsecs - gcStartUsecs. statScavengeGCUsecs := statScavengeGCUsecs + statSGCDeltaUsecs. statRootTableCount := scavenger rememberedSetSize. coInterpreter postGCAction: GCModeScavenge. self runLeakCheckerForFullGC: false. self checkFreeSpace! Item was changed: ----- Method: SpurMemoryManager>>sortedFreeListPairwiseReverseDo: (in category 'compaction') ----- sortedFreeListPairwiseReverseDo: aBinaryBlock "Evaluate aBinaryBlock with adjacent entries in the free list, from high address to low address. The second argument is in fact the start of the next free chunk, not the free chunk itself. Use endOfMemory - bridgeSize as the second argument in the first evaluation." | free nextFree prevFree prevPrevFree | free := lastFreeChunk. prevPrevFree := prevFree := 0. [free ~= 0] whileTrue: [nextFree := self nextInSortedFreeListLink: free given: prevFree. self assert: (free = 0 or: [self isFreeObject: free]). self assert: (prevFree = 0 or: [prevFree > free]). aBinaryBlock value: free value: (prevFree = 0 ifTrue: [endOfMemory - self bridgeSize] ifFalse: [self startOfObject: prevFree]). self assert: (prevFree = 0 or: [self isFreeObject: prevFree]). self assert: (prevPrevFree = 0 or: [self isFreeObject: prevPrevFree]). (self isFreeObject: free) ifFalse: [free := self nextInSortedFreeListLink: prevFree given: prevPrevFree]. + (nextFree = 0 or: [self isFreeObject: nextFree]) - (self isFreeObject: nextFree) ifTrue: [prevPrevFree := prevFree. prevFree := free. free := nextFree] ifFalse: [free := lastFreeChunk. prevPrevFree := prevFree := 0. [free > nextFree] whileTrue: [nextFree := self nextInSortedFreeListLink: free given: prevFree. self assert: (self isFreeObject: nextFree). prevPrevFree := prevFree. prevFree := free. free := nextFree]]]! Item was added: + ----- Method: SpurMemoryManager>>sweepToCoallesceFreeSpaceAndRebuildFreeListsForFitCompactFrom: (in category 'compaction') ----- + sweepToCoallesceFreeSpaceAndRebuildFreeListsForFitCompactFrom: lowestFree + | firstFree lastFree | + firstFree := lastFree := 0. + "Sweep from lowest forwarder, coalescing runs of forwarders and free objects." + self allOldSpaceEntitiesFrom: lowestFree do: + [:o| + (self isFreeObject: o) + ifTrue: "two cases, isolated, in which case leave alone, or adjacent, + in which case, remove from free set prior to coalesce." + [| next | + next := self objectAfter: o limit: endOfMemory. + self assert: (next = endOfMemory or: [(self isFreeObject: next) not]). "free chunks have already been coalesced" + (firstFree ~= 0 + or: [next ~= endOfMemory and: [self isForwarded: next]]) ifTrue: + [firstFree = 0 ifTrue: + [firstFree := o]. + lastFree := o. + self detachFreeObject: o. + self checkFreeSpace]] + ifFalse: + [(self isForwarded: o) + ifTrue: + [firstFree = 0 ifTrue: + [firstFree := o]. + lastFree := o] + ifFalse: + [firstFree ~= 0 ifTrue: + [| start bytes | + start := self startOfObject: firstFree. + bytes := (self addressAfter: lastFree) - start. + self addFreeChunkWithBytes: bytes at: start. + self checkFreeSpace]. + firstFree := 0]]]. + firstFree ~= 0 ifTrue: + [| start bytes | + start := self startOfObject: firstFree. + bytes := (self addressAfter: lastFree) - start. + self addFreeChunkWithBytes: bytes at: start].! Item was removed: - ----- Method: SpurMemoryManager>>sweepToCoallesceFreeSpaceAndRebuildFreeListsForPigCompact (in category 'gc - global') ----- - sweepToCoallesceFreeSpaceAndRebuildFreeListsForPigCompact - "Coallesce free chunks and forwarders and rebuild the free list." - | firstFree firstFreeStart lastFree | - self assert: (self noForwardersBelowFirstFreeChunk). - firstFree := totalFreeOldSpace := 0. - self allOldSpaceEntitiesFrom: firstFreeChunk do: - [:o| - ((self isFreeObject: o) or: [self isForwarded: o]) - ifTrue: - [firstFree = 0 ifTrue: - [firstFree := o. - firstFreeStart := self startOfObject: o]. - lastFree := o] - ifFalse: - [firstFree ~= 0 ifTrue: - [| bytes | - bytes := (self addressAfter: lastFree) - firstFreeStart. - self addFreeChunkWithBytes: bytes at: firstFreeStart]. - firstFree := 0]]. - firstFree ~= 0 ifTrue: - [| bytes | - bytes := (self addressAfter: lastFree) - firstFreeStart. - self addFreeChunkWithBytes: bytes at: firstFreeStart]. - firstFreeChunk := lastFreeChunk := 0! Item was added: + ----- Method: SpurMemoryManager>>sweepToCoallesceFreeSpaceAndRebuildFreeListsForPigCompactFrom: (in category 'compaction') ----- + sweepToCoallesceFreeSpaceAndRebuildFreeListsForPigCompactFrom: lowestForwarder + "Coallesce free chunks and forwarders and rebuild the free list." + | lowest firstFree firstFreeStart lastFree | + lowest := (lowestForwarder = 0 ifTrue: [endOfMemory] ifFalse: [lowestForwarder]) + min: (firstFreeChunk = 0 ifTrue: [endOfMemory] ifFalse: [firstFreeChunk]). + firstFree := totalFreeOldSpace := 0. + self allOldSpaceEntitiesFrom: lowest do: + [:o| + ((self isFreeObject: o) or: [self isForwarded: o]) + ifTrue: + [firstFree = 0 ifTrue: + [firstFree := o. + firstFreeStart := self startOfObject: o]. + lastFree := o] + ifFalse: + [firstFree ~= 0 ifTrue: + [| bytes | + bytes := (self addressAfter: lastFree) - firstFreeStart. + self addFreeChunkWithBytes: bytes at: firstFreeStart]. + firstFree := 0]]. + firstFree ~= 0 ifTrue: + [| bytes | + bytes := (self addressAfter: lastFree) - firstFreeStart. + self addFreeChunkWithBytes: bytes at: firstFreeStart]. + firstFreeChunk := lastFreeChunk := 0! Item was changed: + ----- Method: SpurMemoryManager>>sweepToFollowForwarders (in category 'compaction') ----- - ----- Method: SpurMemoryManager>>sweepToFollowForwarders (in category 'gc - global') ----- sweepToFollowForwarders "sweep, following forwarders in all live objects, and answering the first forwarder or free object." | lowestFree | lowestFree := 0. self allOldSpaceEntitiesDo: [:o| ((self isFreeObject: o) or: [self isForwarded: o]) ifTrue: [lowestFree = 0 ifTrue: [lowestFree := o]] ifFalse: [0 to: (self numPointerSlotsOf: o) - 1 do: [:i| | f | f := self fetchPointer: i ofObject: o. (self isOopForwarded: f) ifTrue: [f := self followForwarded: f. self storePointer: i ofObject: o withValue: f]]]]. ^lowestFree ! Item was added: + ----- Method: SpurMemoryManager>>sweepToFollowForwardersForFitCompact (in category 'compaction') ----- + sweepToFollowForwardersForFitCompact + "sweep, following forwarders in all live objects, and finding the first forwarder." + | lowestFree | + lowestFree := 0. + self allOldSpaceEntitiesDo: + [:o| + ((self isFreeObject: o) or: [self isForwarded: o]) + ifTrue: + [lowestFree = 0 ifTrue: + [lowestFree := o]] + ifFalse: + [0 to: (self numPointerSlotsOf: o) - 1 do: + [:i| | f | + f := self fetchPointer: i ofObject: o. + (self isOopForwarded: f) ifTrue: + [f := self followForwarded: f. + self storePointer: i ofObject: o withValue: f]]]]. + ^lowestFree! Item was changed: + ----- Method: SpurMemoryManager>>sweepToFollowForwardersForPigCompact (in category 'compaction') ----- - ----- Method: SpurMemoryManager>>sweepToFollowForwardersForPigCompact (in category 'gc - global') ----- sweepToFollowForwardersForPigCompact + "Sweep, following forwarders in all live objects. + Answer the lowest forwarder." + | lowestForwarder | + lowestForwarder := 0. - "sweep, following forwarders in all live objects." self allOldSpaceObjectsDo: [:o| + (self isForwarded: o) + ifTrue: + [lowestForwarder = 0 ifTrue: + [lowestForwarder := 0]] + ifFalse: + [0 to: (self numPointerSlotsOf: o) - 1 do: + [:i| | f | + f := self fetchPointer: i ofObject: o. + (self isOopForwarded: f) ifTrue: + [f := self followForwarded: f. + self storePointer: i ofObject: o withValue: f]]]]. + ^lowestForwarder! - (self isForwarded: o) ifFalse: - [0 to: (self numPointerSlotsOf: o) - 1 do: - [:i| | f | - f := self fetchPointer: i ofObject: o. - (self isOopForwarded: f) ifTrue: - [f := self followForwarded: f. - self storePointer: i ofObject: o withValue: f]]]]! Item was changed: ----- Method: SpurMemoryManager>>totalFreeListBytes (in category 'free space') ----- totalFreeListBytes "This method both computes the actual number of free bytes by traversing all free objects on the free lists/tree, and checks that the tree is valid. It is used mainly by checkFreeSpace." + | totalFreeBytes bytesInChunk listNode nextNode | - | totalFreeBytes bytesInChunk listNode | totalFreeBytes := 0. 1 to: self numFreeLists - 1 do: [:i| bytesInChunk := i * self allocationUnit. listNode := freeLists at: i. [listNode ~= 0] whileTrue: [totalFreeBytes := totalFreeBytes + bytesInChunk. self assert: (self isValidFreeObject: listNode). self assert: bytesInChunk = (self bytesInObject: listNode). + nextNode := self fetchPointer: self freeChunkNextIndex ofFreeChunk: listNode. + self assert: nextNode ~= listNode. + listNode := nextNode]]. - listNode := self fetchPointer: self freeChunkNextIndex ofFreeChunk: listNode]]. self freeTreeNodesDo: [:treeNode| bytesInChunk := self bytesInObject: treeNode. self assert: bytesInChunk / self allocationUnit >= self numFreeLists. listNode := treeNode. [listNode ~= 0] whileTrue: ["self printFreeChunk: listNode" self assert: (self isValidFreeObject: listNode). self assert: (listNode = treeNode or: [(self fetchPointer: self freeChunkParentIndex ofFreeChunk: listNode) = 0]). totalFreeBytes := totalFreeBytes + bytesInChunk. self assert: bytesInChunk = (self bytesInObject: listNode). + nextNode := self fetchPointer: self freeChunkNextIndex ofFreeChunk: listNode. + self assert: nextNode ~= listNode. + listNode := nextNode]. - listNode := self fetchPointer: self freeChunkNextIndex ofFreeChunk: listNode]. treeNode]. ^totalFreeBytes! Item was changed: ----- Method: SpurSegmentManager>>addSegmentOfSize: (in category 'growing/shrinking memory') ----- addSegmentOfSize: ammount <returnTypeC: #'SpurSegmentInfo *'> <inline: false> | allocatedSize | <var: #newSeg type: #'SpurSegmentInfo *'> <var: #segAddress type: #'void *'> self cCode: [] inSmalltalk: [segments ifNil: [^nil]]. "bootstrap" (manager "sent to the manager so that the simulator can increase memory to simulate a new segment" sqAllocateMemorySegmentOfSize: ammount Above: (segments at: 0) segLimit asVoidPointer AllocatedSizeInto: (self cCode: [self addressOf: allocatedSize] inSmalltalk: [[:sz| allocatedSize := sz]])) ifNotNil: [:segAddress| | newSegIndex newSeg | newSegIndex := self insertSegmentFor: segAddress asUnsignedLong. newSeg := self addressOf: (segments at: newSegIndex). newSeg segStart: segAddress asUnsignedLong; segSize: allocatedSize. self bridgeFrom: (self addressOf: (segments at: newSegIndex - 1)) to: newSeg. self bridgeFrom: newSeg to: (newSegIndex = (numSegments - 1) ifFalse: [self addressOf: (segments at: newSegIndex + 1)]). - "and add the new free chunk to the free list; done here - instead of in assimilateNewSegment: for the assert" - manager addFreeChunkWithBytes: allocatedSize - manager bridgeSize at: newSeg segStart. - self assert: (manager addressAfter: (manager objectStartingAt: newSeg segStart)) - = (newSeg segLimit - manager bridgeSize). "test isInMemory:" 0 to: numSegments - 1 do: [:i| self assert: (self isInSegments: (segments at: i) segStart). self assert: (self isInSegments: (segments at: i) segLimit - manager wordSize). self assert: ((self isInSegments: (segments at: i) segLimit) not or: [i < (numSegments - 1) and: [(segments at: i) segLimit = (segments at: i + 1) segStart]]). self assert: ((self isInSegments: (segments at: i) segStart - manager wordSize) not or: [i > 0 and: [(segments at: i - 1) segLimit = (segments at: i) segStart]])]. ^newSeg]. ^nil! Item was changed: ----- Method: SpurSegmentManager>>postSnapshot (in category 'snapshot') ----- postSnapshot + "Restore all shortened segments to their proper size, re-freeing the trailing space." + <inline: false> + | seg | + <var: #seg type: #'SpurSegmentInfo *'> + "Set endOfMemory first, to avoid assert fails in freeChunkWithBytes:at:." + seg := self addressOf: (segments at: numSegments - 1). + seg lastFreeObject + ifNil: [self assert: manager endOfMemory = (seg segLimit - manager bridgeSize)] + ifNotNil: [manager setEndOfMemory: seg savedSegSize + seg segStart - manager bridgeSize]. + - "Restore all shortened segments to their proper size, - re-freeing the trailing space." numSegments - 1 to: 0 by: -1 do: [:i| + seg := self addressOf: (segments at: i). + seg lastFreeObject ifNotNil: - (segments at: i) lastFreeObject ifNotNil: [:freeChunk| | address | + address := seg segLimit - manager bridgeSize. + seg segSize: seg savedSegSize. + self bridgeFrom: seg - address := (segments at: i) segLimit - manager bridgeSize. - (segments at: i) segSize: (segments at: i) savedSegSize. - self bridgeFrom: (self addressOf: (segments at: i)) to: (i < (numSegments - 1) ifTrue: [self addressOf: (segments at: i + 1)]). manager + addFreeChunkWithBytes: seg segLimit - address - manager bridgeSize + at: address]]! - addFreeChunkWithBytes: (segments at: i) segLimit - address - manager bridgeSize - at: address]]. - - "perhaps this should read - manager setEndOfMemory: 0; assimilateNewSegment: (segments at: numSegments - 1)" - manager setEndOfMemory: (segments at: numSegments - 1) segLimit - manager bridgeSize!

1 0

[commit][2916] Add extrsa test functions used in FFI-Tests-djm. 7 which test mixtures of floats
by commits＠squeakvm.org 07 May '14

07 May '14

Revision: 2916 Author: eliot Date: 2014-05-06 15:13:38 -0700 (Tue, 06 May 2014) Log Message: ----------- Add extrsa test functions used in FFI-Tests-djm.7 which test mixtures of floats and ints in argument lists and in structs. Modified Paths: -------------- trunk/platforms/Cross/plugins/SqueakFFIPrims/sqFFITestFuncs.c Modified: trunk/platforms/Cross/plugins/SqueakFFIPrims/sqFFITestFuncs.c =================================================================== --- trunk/platforms/Cross/plugins/SqueakFFIPrims/sqFFITestFuncs.c 2014-05-05 00:52:47 UTC (rev 2915) +++ trunk/platforms/Cross/plugins/SqueakFFIPrims/sqFFITestFuncs.c 2014-05-06 22:13:38 UTC (rev 2916) @@ -22,6 +22,11 @@ int w; } ffiTestPoint4; +typedef struct ffiSmallStruct1 { + unsigned char x; + unsigned char y; +} ffiSmallStruct1; + #pragma export on EXPORT(char) ffiTestChars(char c1, char c2, char c3, char c4); EXPORT(short) ffiTestShorts(short c1, short c2, short c3, short c4); @@ -31,18 +36,26 @@ EXPORT(float) ffiTestFloats7(float f1, float f2, float f3, float f4, float f5, float f6, float f7); EXPORT(float) ffiTestFloats13(float f1, float f2, float f3, float f4, float f5, float f6, float f7, float f8, float f9, float f10, float f11, float f12, float f13); EXPORT(float) ffiTestFloats14(float f1, float f2, float f3, float f4, float f5, float f6, float f7, float f8, float f9, float f10, float f11, float f12, float f13, float f14); +EXPORT(double) ffiTestDoubles9(double f1, double f2, double f3, double f4, double f5, double f6, double f7, double f8, double f9); EXPORT(double) ffiTestDoubles14(double f1, double f2, double f3, double f4, double f5, double f6, double f7, double f8, double f9, double f10, double f11, double f12, double f13, double f14); +EXPORT(double) ffiTestMixedFloatsAndDouble(float f1, double d1, float f2, float f3); +EXPORT(double) ffiTestMixedDoublesIntAndStruct(double f1, double f2, double f3, double f4, double f5, double f6, double f7, double f8, double f9, int i1, ffiTestPoint4 pt); EXPORT(double) ffiTestDoubles(double d1, double d2); EXPORT(char *) ffiPrintString(char *string); EXPORT(ffiTestPoint2) ffiTestStruct64(ffiTestPoint2 pt1, ffiTestPoint2 pt2); EXPORT(ffiTestPoint4) ffiTestStructBig(ffiTestPoint4 pt1, ffiTestPoint4 pt2); EXPORT(ffiTestPoint4*) ffiTestPointers(ffiTestPoint4 *pt1, ffiTestPoint4 *pt2); +EXPORT(ffiSmallStruct1) ffiTestSmallStructReturn(void); +EXPORT(int) ffiTestMixedIntAndStruct(int i1, ffiTestPoint2 pt1, ffiTestPoint2 pt2); +EXPORT(int) ffiTestMixedIntAndStruct2(int i1, ffiTestPoint4 pt2); +EXPORT(int) ffiTestMixedIntAndStruct3(int i1, ffiSmallStruct1 pt2); EXPORT(LONGLONG) ffiTestLongLong(LONGLONG i1, LONGLONG i2); EXPORT(LONGLONG) ffiTestLongLong8(char c1, char c2, char c3, char c4, char c5, char c6, char c7, char c8, LONGLONG i1, LONGLONG i2); EXPORT(LONGLONG) ffiTestLongLong8a1(char c1, char c2, char c3, char c4, char c5, char c6, char c7, char c8, char c9, LONGLONG i1, LONGLONG i2); EXPORT(LONGLONG) ffiTestLongLong8a2(char c1, char c2, char c3, char c4, char c5, char c6, char c7, char c8, char c9, char c10, LONGLONG i1, LONGLONG i2); EXPORT(LONGLONG) ffiTestLongLonga1(char c1, LONGLONG i1, LONGLONG i2); EXPORT(LONGLONG) ffiTestLongLonga2(char c1, char c2, LONGLONG i1, LONGLONG i2); +EXPORT(LONGLONG) ffiTestLongLonga3(char c1, LONGLONG i1, char c2); #pragma export off @@ -91,11 +104,22 @@ return (float) (f1 + f2 + f3 + f4 + f5 + f6 + f7 + f8 + f9 + f10 + f11 + f12 + f13 + f14); } +EXPORT(double) ffiTestDoubles9(double f1, double f2, double f3, double f4, double f5, double f6, double f7, double f8, double f9) { + printf("The 9 doubles are %f %f %f %f %f %f %f %f %f\n", f1, f2, f3, f4, f5, f6, f7, f8, f9); + return (double) (f1 + f2 + f3 + f4 + f5 + f6 + f7 + f8 + f9); +} + EXPORT(double) ffiTestDoubles14(double f1, double f2, double f3, double f4, double f5, double f6, double f7, double f8, double f9, double f10, double f11, double f12, double f13, double f14) { printf("The 14 double are %f %f %f %f %f %f %f %f %f %f %f %f %f\n", f1, f2, f3, f4, f5, f6, f7, f8, f9, f10, f11, f12, f13); return (double) (f1 + f2 + f3 + f4 + f5 + f6 + f7 + f8 + f9 + f10 + f11 + f12 + f13 + f14); } +EXPORT(double) ffiTestMixedFloatsAndDouble(float f1, double d1, float f2, float f3) +{ + printf("The four floats are %f %f %f %f\n", f1, d1, f2, f3); + return f1 + d1 + f2 + f3; +} + /* test passing and returning doubles */ EXPORT(double) ffiTestDoubles(double d1, double d2) { printf("The two floats are %f and %f\n", (float)d1, (float)d2); @@ -147,6 +171,48 @@ return result; } +/* test returning small structure (uses registers on some platforms) */ +EXPORT(ffiSmallStruct1) ffiTestSmallStructReturn(void) { + ffiSmallStruct1 result; + result.x = 3; + result.y = 4; + return result; +} + +EXPORT(int) ffiTestMixedIntAndStruct(int i1, ffiTestPoint2 pt1, ffiTestPoint2 pt2) { + int result; + printf("int1 = %d\n", i1); + printf("pt1.x = %d\npt1.y = %d\n", pt1.x, pt1.y); + printf("pt2.x = %d\npt2.y = %d\n", pt2.x, pt2.y); + result = i1 + pt1.x + pt1.y + pt2.x + pt2.y; + return result; +} + +EXPORT(int) ffiTestMixedIntAndStruct2(int i1, ffiTestPoint4 pt2) { + int result; + printf("int1 = %d\n", i1); + printf("pt2.x = %d\npt2.y = %d\npt2.z = %d\npt2.w = %d\n", + pt2.x, pt2.y, pt2.z, pt2.w); + result = i1 + pt2.x + pt2.y + pt2.z + pt2.w; + return result; +} + +EXPORT(int) ffiTestMixedIntAndStruct3(int i1, ffiSmallStruct1 pt2) { + int result; + printf("int1 = %d\n", i1); + printf("pt2.x = %d\npt2.y = %d\n", pt2.x, pt2.y); + result = i1 + pt2.x + pt2.y; + return result; +} + +EXPORT(double) ffiTestMixedDoublesIntAndStruct(double f1, double f2, double f3, double f4, double f5, double f6, double f7, double f8, double f9, int i1, ffiTestPoint4 pt) { + printf("The 9 doubles are %f %f %f %f %f %f %f %f %f\n", f1, f2, f3, f4, f5, f6, f7, f8, f9); + printf("int1 = %d\n", i1); + printf("pt.x = %d\npt.y = %d\npt.z = %d\npt.w = %d\n", + pt.x, pt.y, pt.z, pt.w); + return (double) (f1 + f2 + f3 + f4 + f5 + f6 + f7 + f8 + f9 + i1 + pt.x + pt.y + pt.z + pt.w); +} + /* test passing and returning longlongs */ EXPORT(LONGLONG) ffiTestLongLong(LONGLONG i1, LONGLONG i2) { return i1 + i2; @@ -160,6 +226,10 @@ return c1 + c2 + i1 + i2; } +EXPORT(LONGLONG) ffiTestLongLonga3(char c1, LONGLONG i1, char c2) { + return c1 + i1 + c2; +} + EXPORT(LONGLONG) ffiTestLongLong8(char c1, char c2, char c3, char c4, char c5, char c6, char c7, char c8, LONGLONG i1, LONGLONG i2) { return c1+c2+c3+c4+c5+c6+c7+c8+i1 + i2; }

1 0

VM Maker: VMMaker.oscog-djm.705.mcz
by commits＠source.squeak.org 06 May '14

06 May '14

Douglas McPherson uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-djm.705.mcz ==================== Summary ==================== Name: VMMaker.oscog-djm.705 Author: djm Time: 6 May 2014, 1:02:05.123 pm UUID: 32b4b7b5-41ce-48aa-a789-93efbbd31f5f Ancestors: VMMaker.oscog-eem.704 ARM FFI: Fix bug in passing structure argument in the case where a struct would normally be split between registers and stack, but because of prior coprocessor register candidiate args having been pushed on the stack, the structure should not be split but pushed entirely on the stack. =============== Diff against VMMaker.oscog-eem.704 =============== Item was changed: ----- Method: ThreadedARMFFIPlugin>>ffiPushStructure:ofSize:typeSpec:ofLength:in: (in category 'marshalling') ----- ffiPushStructure: pointer ofSize: structSize typeSpec: argSpec ofLength: argSpecSize in: calloutState <var: #pointer type: #'void *'> <var: #argSpec type: #'sqInt *'> <var: #calloutState type: #'CalloutState *'> <inline: true> | availableRegisterSpace stackPartSize roundedSize | availableRegisterSpace := (NumIntRegArgs - calloutState integerRegisterIndex) * 4. stackPartSize := structSize. availableRegisterSpace > 0 ifTrue: [structSize <= availableRegisterSpace ifTrue: ["all in registers" stackPartSize := 0. self mem: (self cCoerceSimple: (self addressOf: (calloutState integerRegisters at: calloutState integerRegisterIndex)) to: 'void *') cp: pointer y: structSize. calloutState integerRegisterIndex: calloutState integerRegisterIndex + (structSize + 3 bitShift: -2) ] ifFalse: + ["If no previous co-processor candidate arg has already been pushed on the stack, then split the struct between registers and stack. + Otherwise push entire struct on stack." + calloutState currentArg = calloutState argVector + ifTrue: + [stackPartSize := structSize - availableRegisterSpace. + self + mem: (self cCoerceSimple: (self addressOf: (calloutState integerRegisters at: calloutState integerRegisterIndex)) to: 'void *') + cp: pointer + y: availableRegisterSpace] + ifFalse: + [availableRegisterSpace := 0]. + calloutState integerRegisterIndex: NumIntRegArgs]]. - ["some in registers rest on stack" - stackPartSize := structSize - availableRegisterSpace. - self - mem: (self cCoerceSimple: (self addressOf: (calloutState integerRegisters at: calloutState integerRegisterIndex)) to: 'void *') - cp: pointer - y: availableRegisterSpace. - calloutState integerRegisterIndex: NumIntRegArgs]]. stackPartSize > 0 ifTrue: [roundedSize := stackPartSize + 3 bitClear: 3. calloutState currentArg + roundedSize > calloutState limit ifTrue: [^FFIErrorCallFrameTooBig]. self mem: calloutState currentArg cp: (self addressOf: ((self cCoerceSimple: pointer to: 'char *') at: availableRegisterSpace)) y: stackPartSize. calloutState currentArg: calloutState currentArg + roundedSize]. ^0!

1 0

Has anybody done a successful Standard Interpreter build in Squeak 4.6?
by gettimothy 06 May '14

06 May '14

Howdy all. I am finishing up a "cmakify.sh" script that builds on the existing Cog/image/build*.sh scripts from http://www.squeakvm.org/svn/squeak/branches/Cog It works fine except the VMMakerTool for the old VMMaker (not VMMaker.oscog) running on 4.6 barfs whereas it works perfectly on 4.5. I am thinking it is not worth pursuing as 4.6 isn't being developed yet, but if by chance somebody has done a by-hand build of the old Standard Intepreter using the old VMMaker (Not VMMaker.oscog) on 4.6 I will investigate. thx. tty.

2 2

← Newer
1
...
9
10
11
12
13
14
15
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev May 2014