Vm-dev July 2014

vm-dev@lists.squeakfoundation.org

22 participants
157 discussions

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

20 Jul '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.827.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.827 Author: eem Time: 19 July 2014, 12:02:03.653 pm UUID: 22325940-3a8c-40fc-9331-a9c37c875bbd Ancestors: VMMaker.oscog-eem.826 Spur: Move the rememberedSet into a pinned object in oldSpace. Allow it to grow on demand, starting at 1k entries, doubling on each grow. Allow the number of compaction passes to vary, 2 on GC, 3 on GC for snapshot. Add vm parameter 53 to answer the number of segments. Slang: Add support for deny:, and implement it in VMClass. =============== Diff against VMMaker.oscog-eem.826 =============== Item was added: + ----- Method: CCodeGenerator>>generateDeny:on:indent: (in category 'C translation') ----- + generateDeny: denyMsgNode on: aStream indent: level + "Generate the C code for a deny: expr onto the given stream." + + aStream nextPutAll: 'assert(!!('. + self emitCExpression: denyMsgNode args first on: aStream. + aStream nextPutAll: '))'! Item was changed: ----- Method: CCodeGenerator>>initializeCTranslationDictionary (in category 'C translation') ----- initializeCTranslationDictionary "Initialize the dictionary mapping message names to actions for C code generation." | pairs | translationDict := Dictionary new: 200. pairs := #( #& #generateAnd:on:indent: #| #generateOr:on:indent: #and: #generateSequentialAnd:on:indent: #or: #generateSequentialOr:on:indent: #not #generateNot:on:indent: #+ #generatePlus:on:indent: #- #generateMinus:on:indent: #negated #generateNegated:on:indent: #* #generateTimes:on:indent: #/ #generateDivide:on:indent: #// #generateDivide:on:indent: #\\ #generateModulo:on:indent: #<< #generateShiftLeft:on:indent: #>> #generateShiftRight:on:indent: #min: #generateMin:on:indent: #max: #generateMax:on:indent: #between:and: #generateBetweenAnd:on:indent: #bitAnd: #generateBitAnd:on:indent: #bitOr: #generateBitOr:on:indent: #bitXor: #generateBitXor:on:indent: #bitShift: #generateBitShift:on:indent: #signedBitShift: #generateSignedBitShift:on:indent: #bitInvert32 #generateBitInvert32:on:indent: #bitClear: #generateBitClear:on:indent: #truncateTo: #generateTruncateTo:on:indent: #rounded #generateRounded:on:indent: #< #generateLessThan:on:indent: #<= #generateLessThanOrEqual:on:indent: #= #generateEqual:on:indent: #> #generateGreaterThan:on:indent: #>= #generateGreaterThanOrEqual:on:indent: #~= #generateNotEqual:on:indent: #== #generateEqual:on:indent: #~~ #generateNotEqual:on:indent: #isNil #generateIsNil:on:indent: #notNil #generateNotNil:on:indent: #whileTrue: #generateWhileTrue:on:indent: #whileFalse: #generateWhileFalse:on:indent: #whileTrue #generateDoWhileTrue:on:indent: #whileFalse #generateDoWhileFalse:on:indent: #to:do: #generateToDo:on:indent: #to:by:do: #generateToByDo:on:indent: #repeat #generateRepeat:on:indent: #ifTrue: #generateIfTrue:on:indent: #ifFalse: #generateIfFalse:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalse:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrue:on:indent: #ifNotNil: #generateIfNotNil:on:indent: #ifNil: #generateIfNil:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNil:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNil:on:indent: #at: #generateAt:on:indent: #at:put: #generateAtPut:on:indent: #basicAt: #generateAt:on:indent: #basicAt:put: #generateAtPut:on:indent: #integerValueOf: #generateIntegerValueOf:on:indent: #integerObjectOf: #generateIntegerObjectOf:on:indent: #isIntegerObject: #generateIsIntegerObject:on:indent: #cCode: #generateInlineCCode:on:indent: #cCode:inSmalltalk: #generateInlineCCode:on:indent: #cPreprocessorDirective: #generateInlineCPreprocessorDirective:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElse:on:indent: #cppIf:ifTrue: #generateInlineCppIfElse:on:indent: #cCoerce:to: #generateCCoercion:on:indent: #cCoerceSimple:to: #generateCCoercion:on:indent: #addressOf: #generateAddressOf:on:indent: #addressOf:put: #generateAddressOf:on:indent: #signedIntFromLong #generateSignedIntFromLong:on:indent: #signedIntToLong #generateSignedIntToLong:on:indent: #signedIntFromShort #generateSignedIntFromShort:on:indent: #signedIntToShort #generateSignedIntToShort:on:indent: #preIncrement #generatePreIncrement:on:indent: #preDecrement #generatePreDecrement:on:indent: #inline: #generateInlineDirective:on:indent: #asFloat #generateAsFloat:on:indent: #asInteger #generateAsInteger:on:indent: #asUnsignedInteger #generateAsUnsignedInteger:on:indent: #asLong #generateAsLong:on:indent: #asUnsignedLong #generateAsUnsignedLong:on:indent: #asVoidPointer #generateAsVoidPointer:on:indent: #asSymbol #generateAsSymbol:on:indent: #flag: #generateFlag:on:indent: #anyMask: #generateBitAnd:on:indent: #noMask: #generateNoMask:on:indent: #raisedTo: #generateRaisedTo:on:indent: #touch: #generateTouch:on:indent: #bytesPerWord #generateBytesPerWord:on:indent: #baseHeaderSize #generateBaseHeaderSize:on:indent: #sharedCodeNamed:inCase: #generateSharedCodeDirective:on:indent: #perform: #generatePerform:on:indent: #perform:with: #generatePerform:on:indent: #perform:with:with: #generatePerform:on:indent: #perform:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with: #generatePerform:on:indent: #perform:with:with:with:with:with: #generatePerform:on:indent: #value #generateValue:on:indent: #value: #generateValue:on:indent: #value:value: #generateValue:on:indent: #value:value:value: #generateValue:on:indent: + #deny: #generateDeny:on:indent: + #shouldNotImplement #generateSmalltalkMetaError:on:indent: #shouldBeImplemented #generateSmalltalkMetaError:on:indent: #subclassResponsibility #generateSmalltalkMetaError:on:indent: ). 1 to: pairs size by: 2 do: [:i | translationDict at: (pairs at: i) put: (pairs at: i + 1)]. pairs := #( #ifTrue: #generateIfTrueAsArgument:on:indent: #ifFalse: #generateIfFalseAsArgument:on:indent: #ifTrue:ifFalse: #generateIfTrueIfFalseAsArgument:on:indent: #ifFalse:ifTrue: #generateIfFalseIfTrueAsArgument:on:indent: #ifNotNil: #generateIfNotNilAsArgument:on:indent: #ifNil: #generateIfNilAsArgument:on:indent: #ifNotNil:ifNil: #generateIfNotNilIfNilAsArgument:on:indent: #ifNil:ifNotNil: #generateIfNilIfNotNilAsArgument:on:indent: #cCode: #generateInlineCCodeAsArgument:on:indent: #cCode:inSmalltalk: #generateInlineCCodeAsArgument:on:indent: #cppIf:ifTrue:ifFalse: #generateInlineCppIfElseAsArgument:on:indent: #cppIf:ifTrue: #generateInlineCppIfElseAsArgument:on:indent: #value #generateValueAsArgument:on:indent: #value: #generateValueAsArgument:on:indent: #value:value: #generateValueAsArgument:on:indent: ). asArgumentTranslationDict := Dictionary new: 8. 1 to: pairs size by: 2 do: [:i | asArgumentTranslationDict at: (pairs at: i) put: (pairs at: i + 1)]. ! Item was changed: ----- Method: CCodeGenerator>>isAssertSelector: (in category 'inlining') ----- isAssertSelector: selector + ^#(assert: asserta: assert:l: asserta:l: deny:) includes: selector! - ^#(assert: asserta: assert:l: asserta:l:) includes: selector! Item was changed: CogClass subclass: #SpurGenerationScavenger + instanceVariableNames: 'coInterpreter manager eden futureSpace pastSpace futureSurvivorStart rememberedSet rememberedSetSize previousRememberedSetSize rememberedSetRedZone rememberedSetLimit weakList ephemeronList tenureCriterion tenureThreshold tenuringClassIndex tenuringProportion numRememberedEphemerons statTenures' + classVariableNames: '' - instanceVariableNames: 'coInterpreter manager eden futureSpace pastSpace futureSurvivorStart rememberedSet rememberedSetSize previousRememberedSetSize weakList ephemeronList tenureCriterion tenureThreshold tenuringClassIndex tenuringProportion numRememberedEphemerons statTenures' - classVariableNames: 'RememberedSetLimit RememberedSetRedZone' poolDictionaries: 'SpurMemoryManagementConstants' category: 'VMMaker-SpurMemoryManager'! !SpurGenerationScavenger commentStamp: 'eem 9/30/2013 11:05' prior: 0! SpurGenerationScavenger is an implementation of David Ungar's Generation Scavenging garbage collection algorithm. See Generation Scavenging, A Non-disruptive, High-Performance Storage Reclamation Algorithm David Ungar Proceeding SDE 1 Proceedings of the first ACM SIGSOFT/SIGPLAN software engineering symposium on Practical software development environments Pages 157 - 167 ACM New York, NY, USA ©1984 Also relevant are An adaptive tenuring policy for generation scavengers David Ungar & Frank Jackson ACM Transactions on Programming Languages and Systems (TOPLAS) TOPLAS Homepage archive Volume 14 Issue 1, Jan. 1992 Pages 1 - 27 ACM New York, NY, USA ©1992 and Ephemerons: a new finalization mechanism Barry Hayes Proceedings of the 12th ACM SIGPLAN conference on Object-oriented programming, systems, languages, and applications Pages 176-183 ACM New York, NY, USA ©1997 See text below the variable definitions and explanation below for a full explanation of weak and ephemeron processing. Instance Variables coInterpreter: <StackInterpreterSimulator|CogVMSimulator> eden: <SpurNewSpaceSpace> ephemeronList: <Integer|nil> futureSpace: <SpurNewSpaceSpace> futureSurvivorStart: <Integer address> manager: <SpurMemoryManager|Spur32BitMMLESimulator et al> numRememberedEphemerons: <Integer> pastSpace: <SpurNewSpaceSpace> previousRememberedSetSize: <Integer> rememberedSet: <CArrayAccessor on: Array> rememberedSetSize: <Integer> tenuringProportion: <Float> tenuringThreshold: <Integer address> weakList: <Integer|nil> coInterpreter - the interpreter/vm, in this context, the mutator manager - the Spur memory manager eden - the space containing newly created objects futureSpace - the space to which surviving objects are copied during a scavenge futureSurvivorStart - the allocation pointer into futureSpace pastSpace - the space surviving objects live in until the next scavenge rememberedSet - the root old space objects that refer to objects in new space; a scavenge starts form these roots and the interpreter's stack rememberedSetSize - the size of the remembered set, also the first unused index in the rememberedSet previousRememberedSetSize: - the size of the remembered set before scavenging objects in future space. numRememberedEphemerons - the number of unscavenged ephemerons at the front of the rememberedSet. ephemeronList - the head of the list of corpses of unscavenged ephemerons reached in the current phase weakList - the head of the list of corpses of weak arrays reached during the scavenge. tenuringProportion - the amount of pastSpace below which the system will not tenure unless futureSpace fills up, and above which it will eagerly tenure tenuringThreshold - the pointer into pastSpace below which objects will be tenured Weakness and Ephemerality in the Scavenger. Weak arrays should not hold onto their referents (except from their strong fileds, their named inst vars). Ephemerons are objects that implement instance-based finalization; attaching an ephemeron to an object keeps that object alive and causes the ephemeron to "fire" when the object is only reachable from the ephemeron (or other ephemerons & weak arrays). They are a special kind of Associations that detect when their keys are about to die, i.e. when an ephemeron's key is not reachable from the roots except from weak arrays and other ephemerons with about-to-die keys. Note that if an ephemeron's key is not about to die then references from the rest of the ephemeron can indeed prevent ephemeron keys from dying. The scavenger is concerned with collecting objects in new space, therefore it ony deals with weak arrays and ephemerons that are either in the remembered set or in new space. By deferring scanning these objects until other reachable objects have been scavenged, the scavenger can detect dead or dying references. Weak Array Processing In the case of weak arrays this is simple. The scavenger refuses to scavenge the referents of weak arrays in scavengeReferentsOf: until the entire scavenge is over. It then scans the weak arrays in the remembered set and in future space and nils all fields in them that are referring to unforwarded objects in eden and past space, because these objects have not survived the scavenge. The root weak arrays remaining to be scavenged are in the remembered table. Surviving weak arrays in future space are collected on a list. The list is threaded through the corpses of weak arrays in eden and/or past space. weakList holds the slot offset of the first weak array found in eden and/or past space. The next offset is stored in the weak array corpse's identityHash and format fields (22 bits & 5 bits of allocationUnits, for a max new space size of 2^28 bytes, 256Mb). The list is threaded throguh corpses, but the surviving arrays are pointed to by the corpses' forwarding pointers. Ephemeron Processing The case of ephemerons is a little more complicated because an ephemeron's key should survive. The scavenger is cyclical. It scavenges the remembered set, which may copy and forward surviving objects in past and/or eden spaces to future space. It then scavenges those promoted objects in future space until no more are promoted, which may in turn remember more objects. The cycles continue until no more objects get promoted to future space and no more objects get remembered. At this point all surviving objecta are in futureSpace. So if the scavenger does not scan ephemerons in the remembered set or in future space until the scavenger finishes cycling, it can detect ephemerons whose keys are about to die because these will be unforwarded objects in eden and/or past space. Ephemerons encountered in the remembered set are either processed like ordinary objects if their keys have been promoted to futureSpace, or are moved to the front of the rememberedSet (because, dear reader, it is a sequence) if their keys have not been promoted. Ephemerons encountered in scavengeReferentsOf: are either scanned like normal objects if their keys have been promoted, or added to the ephemeronList, organized identically to the weakList, if their keys are yet to be promoted. Since references from other ephemerons with surviving keys to ephemeron keys can and should prevent the ephemerons whose keys they are from firing the scavenger does not fire ephemerons unless all unscavenged ephemerons have unscavenged keys. So the unscavenged ephemerons (the will be at the beginning of the remembered set and on the ephemeronList) are scanned and any that have promoted keys are scavenged. But if no unscavenged ephemerons have surviving keys then all the unscavenged ephemerons are fired and then scavenged. This in turn may remember more objects and promote more objects to future space, and encounter more unscavenged ephemerons. So the scavenger continues until no more objects are remembered, no more objects are promoted to future space and no more unscavenged ephemerons exist.! Item was changed: ----- Method: SpurGenerationScavenger class>>declareCVarsIn: (in category 'translation') ----- declareCVarsIn: aCCodeGenerator #(eden futureSpace pastSpace) do: [:var| aCCodeGenerator var: var type: #SpurNewSpaceSpace]. + aCCodeGenerator var: #rememberedSet type: #'sqInt *'! - aCCodeGenerator - var: #rememberedSet - declareC: 'sqInt rememberedSet[RememberedSetLimit + 1 /* ', (RememberedSetLimit + 1) printString, ' */]'! 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! Item was added: + ----- Method: SpurGenerationScavenger>>growRememberedSet (in category 'store check') ----- + growRememberedSet + | obj numSlots newObj base | + <inline: false> "Don't ruin locality in remember:" + <var: #base type: #'sqInt *'> + obj := manager rememberedSetObj. + numSlots := manager numSlotsOf: obj. + self assert: numSlots >= 1024. + newObj := manager allocatePinnedSlots: numSlots * 2. + manager rememberedSetObj: newObj. + base := manager firstIndexableField: newObj. + 0 to: rememberedSetSize - 1 do: + [:i| base at: i put: (rememberedSet at: i)]. + "if growing in the middle of a GC, need to preserve marked status." + (manager isMarked: obj) ifTrue: + [manager + setIsMarkedOf: newObj to: true; + setIsMarkedOf: obj to: false]. + manager freeObject: obj. + rememberedSet := base. + rememberedSetLimit := numSlots * 2. + rememberedSetRedZone := rememberedSetLimit * 3 + 3 // 4! Item was changed: ----- Method: SpurGenerationScavenger>>initialize (in category 'initialization') ----- initialize pastSpace := SpurNewSpaceSpace new. futureSpace := SpurNewSpaceSpace new. eden := SpurNewSpaceSpace new. - rememberedSet := CArrayAccessor on: (Array new: RememberedSetLimit). rememberedSetSize := 0. tenureThreshold := 0. statTenures := 0! Item was added: + ----- Method: SpurGenerationScavenger>>initializeRememberedSet (in category 'initialization') ----- + initializeRememberedSet + | obj | + obj := manager rememberedSetObj. + obj = manager nilObject ifTrue: + [obj := manager allocatePinnedSlots: 1024. + manager rememberedSetObj: obj]. + rememberedSet := manager firstIndexableField: obj. + rememberedSetSize := 0. + rememberedSetLimit := manager numSlotsOf: obj. + rememberedSetRedZone := rememberedSetLimit * 3 + 3 // 4! Item was changed: ----- Method: SpurGenerationScavenger>>remember: (in category 'store check') ----- remember: objOop "Add the argument to the remembered set and set its isRemembered bit to true. Answer the argument for the benefit of the Cogit." <api> <inline: false> self assert: (manager isNonImmediate: objOop). + self deny: (manager isYoungObject: objOop). + self deny: (manager isRemembered: objOop). + self deny: (self isInRememberedSet: objOop). - self assert: (manager isYoungObject: objOop) not. - self assert: (manager isRemembered: objOop) not. - self assert: (manager isInRememberedSet: objOop) not. manager setIsRememberedOf: objOop to: true. + rememberedSetSize >= rememberedSetLimit ifTrue: + [self growRememberedSet]. + rememberedSet at: rememberedSetSize put: objOop. + (rememberedSetSize := rememberedSetSize + 1) >= rememberedSetRedZone ifTrue: + [manager scheduleScavenge]. - rememberedSetSize < RememberedSetLimit - ifTrue: - [rememberedSet at: rememberedSetSize put: objOop. - (rememberedSetSize := rememberedSetSize + 1) >= RememberedSetRedZone ifTrue: - [manager scheduleScavenge]] - ifFalse: - [self error: 'remembered set overflow' "for now"]. ^objOop! Item was changed: CogClass subclass: #SpurMemoryManager (excessive size, no diff calculated) Item was changed: ----- Method: SpurMemoryManager class>>initialize (in category 'class initialization') ----- initialize "SpurMemoryManager initialize" BitsPerByte := 8. + "Pig compact can be repeated to compact better. Experience shows that 3 times + compacts very well, desirable for snapshots. But this is overkill for normal GCs." + CompactionPassesForGC := 2. + CompactionPassesForSnapshot := 3. + "An obj stack is a stack of objects stored in a hidden root slot, such as the markStack or the ephemeronQueue. It is a linked list of segments, with the hot end at the head of the list. It is a word object. The stack pointer is in ObjStackTopx and 0 means empty. The list goes through ObjStackNextx. We don't want to shrink objStacks, since they're used in GC and its good to keep their memory around. So unused pages created by popping emptying pages are kept on the ObjStackFreex list. ObjStackNextx must be the last field for swizzleObjStackAt:." ObjStackPageSlots := 4092. "+ double header = 16k bytes per page in 32-bits" ObjStackTopx := 0. ObjStackMyx := 1. ObjStackFreex := 2. ObjStackNextx := 3. ObjStackFixedSlots := 4. ObjStackLimit := ObjStackPageSlots - ObjStackFixedSlots. + "The hiddenHootsObject contains the classTable pages and up to 8 additional objects. + Currently we use four; the three objStacks, the mark stack, the weaklings and the + ephemeron queue, and the rememberedSet." - "There are currently three obj stacks, the mark stack, the weaklings and the ephemeron queue." MarkStackRootIndex := self basicNew classTableRootSlots. WeaklingStackRootIndex := MarkStackRootIndex + 1. EphemeronQueueRootIndex := MarkStackRootIndex + 2. + RememberedSetRootIndex := MarkStackRootIndex + 3. MarkObjectsForEnumerationPrimitives := false. "The remap buffer support is for compatibility; Spur doesn't GC during allocation. Eventually this should die." RemapBufferSize := 25. "Extra roots are for plugin support." ExtraRootsSize := 2048 "max. # of external roots"! Item was changed: ----- Method: SpurMemoryManager>>allocatePinnedSlots: (in category 'sista support') ----- allocatePinnedSlots: nSlots <api> - <option: #NewspeakVM> - <option: #SistaStackToRegisterMappingCogit> | obj | obj := self allocateSlotsForPinningInOldSpace: nSlots bytes: (self objectBytesForSlots: nSlots) format: self wordIndexableFormat classIndex: self wordSizeClassIndexPun. obj ifNotNil: [self fillObj: obj numSlots: nSlots with: 0]. ^obj! Item was changed: ----- Method: SpurMemoryManager>>compact (in category 'compaction') ----- compact "We'd like to use exact fit followed by best or first fit, but it doesn't work well enough in practice. So use pig compact. Fill large free objects starting from low memory with objects taken from the end of memory." <inline: #never> "for profiling" statCompactPassCount := statCompactPassCount + 1. self assert: (firstFreeChunk = 0 or: [self isFreeObject: firstFreeChunk]). + 1 to: numCompactionPasses do: - 1 to: 3 do: [:i| self pigCompact. self eliminateAndFreeForwardersForPigCompact]. "The free lists are zeroed in freeUnmarkedObjectsAndSortAndCoalesceFreeSpaceForPigCompact. They should still be zero here" self assert: self freeListHeadsEmpty. self rebuildFreeListsForPigCompact! Item was changed: ----- Method: SpurMemoryManager>>garbageCollectForSnapshot (in category 'snapshot') ----- garbageCollectForSnapshot self flushNewSpace. "There is no place to put newSpace in the snapshot file." + self flag: 'If we wanted to shrink the rememberedSet prior to snapshot this is the place to do it.'. + numCompactionPasses := CompactionPassesForSnapshot. self fullGC. + numCompactionPasses := CompactionPassesForGC. segmentManager prepareForSnapshot. self checkFreeSpace! Item was changed: ----- Method: SpurMemoryManager>>initializeObjectMemory: (in category 'initialization') ----- initializeObjectMemory: bytesToShift "Initialize object memory variables at startup time. Assume endOfMemory at al are initialised by the image-reading code via setHeapBase:memoryLimit:endOfMemory:. endOfMemory is assumed to point to the end of the last object in the image. Assume: image reader also initializes the following variables: specialObjectsOop lastHash" <inline: false> | freeListObj | "Catch mis-initializations leading to bad translations to C" self assert: BaseHeaderSize = self baseHeaderSize. self assert: (self maxSlotsForAlloc * BytesPerWord) asInteger > 0. self bootstrapping ifFalse: [self initSegmentBridgeWithBytes: self bridgeSize at: endOfMemory - self bridgeSize]. segmentManager adjustSegmentSwizzlesBy: bytesToShift. "image may be at a different address; adjust oops for new location" self adjustAllOopsBy: bytesToShift. specialObjectsOop := segmentManager swizzleObj: specialObjectsOop. "heavily used special objects" nilObj := self splObj: NilObject. falseObj := self splObj: FalseObject. trueObj := self splObj: TrueObject. "In Cog we insist that nil, true & false are next to each other (Cogit generates tighter conditional branch code as a result). In addition, Spur places the free lists and class table root page immediately following them." self assert: nilObj = oldSpaceStart. self assert: falseObj = (self objectAfter: nilObj). self assert: trueObj = (self objectAfter: falseObj). freeListObj := self objectAfter: trueObj. self reInitializeClassTablePostLoad: (self objectAfter: freeListObj). markStack := self swizzleObjStackAt: MarkStackRootIndex. weaklingStack := self swizzleObjStackAt: WeaklingStackRootIndex. ephemeronQueue := self swizzleObjStackAt: EphemeronQueueRootIndex. self assert: self validObjStacks. self assert: (self isEmptyObjStack: markStack). self assert: (self isEmptyObjStack: weaklingStack). self initializeFreeSpacePostLoad: freeListObj. segmentManager collapseSegmentsPostSwizzle. self computeFreeSpacePostSwizzle. self bootstrapping ifFalse: + [self initializeNewSpaceVariables. + scavenger initializeRememberedSet]. - [self initializeNewSpaceVariables]. self initializeOldSpaceFirstFree: freeOldSpaceStart. "initializes endOfMemory, freeStart" segmentManager checkSegments. + numCompactionPasses := CompactionPassesForGC. + "These defaults should depend on machine size; e.g. too small on a powerful laptop, too big on a Pi." growHeadroom := 16*1024*1024. "headroom when growing" shrinkThreshold := 32*1024*1024. "free space before shrinking" self setHeapSizeAtPreviousGC. heapGrowthToSizeGCRatio := 0.333333. "By default GC after scavenge if heap has grown by a third since the last GC"! Item was changed: ----- Method: SpurMemoryManager>>markAndTraceHiddenRoots (in category 'gc - global') ----- markAndTraceHiddenRoots "The hidden roots hold both the class table pages and the obj stacks, and hence need special treatment. The obj stacks must be marked specially; their pages must be marked, but only the contents of the ephemeronQueue should be marked. If a class table page is weak we can mark and trace the hiddenRoots, which will not trace through class table pages because they are weak. But if class table pages are strong, we must mark the pages and *not* trace them so that only classes reachable from the true roots will be marked, and unreachable classes will be left unmarked." self markAndTraceObjStack: markStack andContents: false. self markAndTraceObjStack: weaklingStack andContents: false. self markAndTraceObjStack: ephemeronQueue andContents: true. + self setIsMarkedOf: self rememberedSetObj to: true. self setIsMarkedOf: self freeListsObj to: true. (self isWeakNonImm: classTableFirstPage) ifTrue: [^self markAndTrace: hiddenRootsObj]. self setIsMarkedOf: hiddenRootsObj to: true. self markAndTrace: classTableFirstPage. 1 to: numClassTablePages - 1 do: [:i| self setIsMarkedOf: (self fetchPointer: i ofObject: hiddenRootsObj) to: true]! Item was added: + ----- Method: SpurMemoryManager>>numSegments (in category 'segments') ----- + numSegments + <doNotGenerate> + ^segmentManager numSegments! Item was added: + ----- Method: SpurMemoryManager>>rememberedSetObj (in category 'scavenger') ----- + rememberedSetObj + ^self fetchPointer: RememberedSetRootIndex ofObject: hiddenRootsObj! Item was added: + ----- Method: SpurMemoryManager>>rememberedSetObj: (in category 'scavenger') ----- + rememberedSetObj: anObj + self assert: (self isOldObject: anObj). + self storePointerUnchecked: RememberedSetRootIndex ofObject: hiddenRootsObj withValue: anObj! Item was changed: ----- Method: StackInterpreterPrimitives>>primitiveVMParameter (in category 'system control primitives') ----- (excessive size, no diff calculated) Item was added: + ----- Method: VMClass>>deny: (in category 'simulation support') ----- + deny: aBooleanOrBlock + <doNotGenerate> + self assert: aBooleanOrBlock value not!

1 0

svn scripts for Cog/image
by gettimothy 19 Jul '14

19 Jul '14

Hi all, The Cog/image repo has some out-of-date files. If interested, updated scrpts are attached. cordially, tty

1 0

VM Maker: CMakeVMMakerSqueak-tty.92.mcz
by commits＠source.squeak.org 19 Jul '14

19 Jul '14

Timothy M uploaded a new version of CMakeVMMakerSqueak to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMakerSqueak-tty.92.mcz ==================== Summary ==================== Name: CMakeVMMakerSqueak-tty.92 Author: tty Time: 19 July 2014, 10:45:30.582 am UUID: 2420db3f-152b-46fe-a1de-6d14aca4d8d9 Ancestors: CMakeVMMakerSqueak-tty.91 Stage where templated vm plugins/modules output compiles and runs Squeak4.6 on my machine for buildType:#build. plugins_vm (aka modules aka VMPlugins) inject their configuration to CMake template classes and render themselves correctly. Fixed error where I was not setting CMAKE_C_FLAGS_RELEASE. Experiment in splitting out add_definitions for -D options and compiler flags is successful; this mimics the 'mvm' file in the gnu build system and will make porting existing builds more straightforward--hopefully copy-n-paste Removed explicit setting of CMAKE_EXE_LINKER_FLAGS as documentation seems to prefere set_target_libraries() cmake command and that appears to be what Ian/Igor have done. Next up: Port internal/external plugins to templating system. implement configure options like --without-gl or --without-newspeak --with-kitchensink-minus-potatopeeler re-write tests to reflect changes. build out methods for remaining build types on Linux64x86w32BitConfig configuration update/write documentation for consistent methodology. =============== Diff against CMakeVMMakerSqueak-tty.91 =============== Item was changed: ----- Method: CMakeAddDefinitions>>definitions: (in category 'accessing') ----- definitions: anObject definitions := anObject. + self content:' add_definitions(',self definitions,')'. - self content:' add_definitions(',self definitions,')' ! Item was changed: ----- Method: CMakePluginVm>>template (in category 'accessing') ----- template |temp sourcesString cflags| cflags:= String streamContents: [:stream | config compilerFlags asStringOn: stream delimiter: ' ' ]. cflags := '"' , cflags , '"'. sourcesString := String streamContents: [:stream | sources asStringOn: stream delimiter: ' ' ]. temp := OrderedCollection new. temp addLast: ((CMakeHeader new) configurationName: config class name ); + addLast: ((CMakeProject new)variable: module ); - " addLast: ((CMakeProject new)variable: module ); Ian does not have this. Igor does." addLast: ((CMakeMinimumRequired new) version: '3.0.0'); addLast: ((CMakeInclude new) file: ((config buildDir fullName), FileDirectory slash, 'directories.cmake')) ; + addLast:((CMakeAddDefinitions new) definitions: config compilerDefinitions asOrderedCollection); addLast:((CMakeAddDefinitions new) definitions: config compilerFlags asOrderedCollection); addLast:((CMakeAddDefinitions new) definitions: definitions); + " addLast:((CMakeSet new) variable:'sources' quotedValue: sourcesString);" + addLast:((CMakeSet new) variable:'sources' value: sourcesString); - addLast:((CMakeSet new) variable:'sources' quotedValue: sourcesString); addLast:((CMakeAddLibrary new) library: module type: 'SHARED' + sources: (OrderedCollection with: '${sources}')); - sources: sources); addLast: ((CMakeIncludeDirectories new) dirs: includedirectories); addLast:((CMakeSet new) variable: 'LIBRARY_OUTPUT_PATH' quotedValue: (config outputDir fullName)); + " addLast:((CMakeListAppend new) list: 'LINKLIBS' elements: (config externalLibs));" - addLast:((CMakeListAppend new) list: 'LINKLIBS' elements: (config externalLibs)); addLast:((CMakeTargetLinkLibraries new) target: module items: (OrderedCollection with: '${LINKLIBS}')); addLast:((CMakeSetTargetProperties new) target: module propertiesandvalues: (OrderedCollection with: 'PREFIX "" ' with: 'SUFFIX "" ' with: 'LINK_FLAGS ' , cflags)) . ^temp! Item was changed: ----- Method: CMakeVMGeneratorForSqueak>>generateByTemplate (in category 'code generation') ----- generateByTemplate "attempt to move way from string based writing to template based. Think Seaside renderOn composition" | extPlugins intPlugins | self flag: 'tty'. "refactor so that the cascade reflects CMake terminilogy" output := String new writeStream. config templates: OrderedCollection new. config setGlobalOptions: self; cmakePrefixPath; cmakeIncludePath; cmakeLibraryPath; cmakeIncludeModules; cmakeCFlags; cmakeAddDefinitions; - cmakeSharedLinkerFlags; setGlobalOptionsAfterDetermineSystem: self; setDirectories: self; cmakeIncludeDirectories: self; preferredIncludes; standardIncludes; extraVMSettings: self; setCoreSources: self; setPlatformSources: self; setCrossSources: self; setExtraSources; cmakeSetSourceFilesProperties; cmakeListAppend:'LINKLIBS' elements: (config externalLibs); cmakeAddExecutableNameOptionSource: self; setExecutableOutputPath; addVMPlugins: self. config templates do: [:each | self puts: each content]. - extPlugins := self generatePluginConfigs: config internalPlugins internal: true. intPlugins := self generatePluginConfigs: config externalPlugins internal: false. self processThirdpartyLibraries. self processPlugins: intPlugins, extPlugins. - - " config setExtraTargetProperties: self." self cmd: 'target_link_libraries' params: self moduleName , ' ${LINKLIBS}'. config postBuildActions: self.. self saveFile. self generateBuildScript! Item was changed: ----- Method: CPlatformConfigForSqueak>>buildScript (in category 'squeak compatability') ----- buildScript "see standardVM/platforms/unix/cmake/configure" ^ '#!!/usr/bin/env bash + export CC=gcc + export CXX=g++ cmake . make' " cmake '${unix}'' -DVM_HOST=''${host}'' -DVM_VERSION=''${VM_VERSION}'' -DPLATFORM_SOURCE_VERSION=''${PLATFORM_SOURCE_VERSION}'' -DSRC=''${src}'' -DOPT--CMAKE_C_FLAGS=''${cflags}'' ${args} "! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cmakeSharedLinkerFlags (in category 'cmake buildType redirects') ----- - cmakeSharedLinkerFlags - "Route this message send to the message appropriate for my buildType " - |d | - d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. - d - at: #build put: [self cmakeSharedLinkerFlagsBuild]; - at: #buildAssert put: [self cmakeSharedLinkerFlagsBuildAssert]; - at: #buildAssertITimerHeartbeat put: [self cmakeSharedLinkerFlagsBuildAssertITimerHeartbeat]; - at:#buildDebug put: [self cmakeSharedLinkerFlagsBuildDebug]; - at: #buildDebugITimerHeartbeat put: [self cmakeSharedLinkerFlagsBuildDebugITimerHeartbeat ]; - at: #buildITimerHeartbeat put: [self cmakeSharedLinkerFlagsBuildITimerHeartbeat]; - at: #buildMultiThreaded put: [self cmakeSharedLinkerFlagsBuildMultiThreaded]; - at: #buildMultiThreadedAssert put: [self cmakeSharedLinkerFlagsBuildMultiThreadedAssert]; - at: #buildMultiThreadedDebug put: [self cmakeSharedLinkerFlagsBuildMultiThreadedDebug ]; - at: #buildNone put:[self cmakeSharedLinkerFlagsNoBuildType]. - ^(d at: buildType) value! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cmakeSharedLinkerFlagsBuild (in category 'cmake buildType redirects') ----- - cmakeSharedLinkerFlagsBuild - " - cmake --help-variable CMAKE_SHARED_LINKER_FLAGS - CMAKE_SHARED_LINKER_FLAGS - ------------------------- - - Linker flags to be used to create shared libraries. - - We want a command like this: - - set(CMAKE_SHARED_LINKER_FLAGS ''-Wl -z now'') - - using the template system, it looks like this: - - |flags| - flags := { - '-Wl' - . '-z' - . 'now' - } asOrderedCollection . - templates - addLast:((CMakeSet new) - variable:'CMAKE_SHARED_LINKER_FLAGS' - quotedValue:'${CMAKE_SHARED_LINKER_FLAGS} ', (String streamContents: [:stream | flags asStringOn: stream delimiter: ' ' ])). - - ." - self subclassResponsibility.! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cmakeSharedLinkerFlagsBuildAssert (in category 'cmake buildType redirects') ----- - cmakeSharedLinkerFlagsBuildAssert - "convenience method for customizing CMAKE_SHARED_LINKER_FLAGS for different buildType " - ^self cmakeSharedLinkerFlagsBuild! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cmakeSharedLinkerFlagsBuildAssertITimerHeartbeat (in category 'cmake buildType redirects') ----- - cmakeSharedLinkerFlagsBuildAssertITimerHeartbeat - "convenience method for customizing CMAKE_SHARED_LINKER_FLAGS for different buildType " - ^self cmakeSharedLinkerFlagsBuild! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cmakeSharedLinkerFlagsBuildDebug (in category 'cmake buildType redirects') ----- - cmakeSharedLinkerFlagsBuildDebug - "convenience method for customizing CMAKE_SHARED_LINKER_FLAGS for different buildType " - ^self cmakeSharedLinkerFlagsBuild! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cmakeSharedLinkerFlagsBuildDebugITimerHeartbeat (in category 'cmake buildType redirects') ----- - cmakeSharedLinkerFlagsBuildDebugITimerHeartbeat - "convenience method for customizing CMAKE_SHARED_LINKER_FLAGS for different buildType " - ^self cmakeSharedLinkerFlagsBuild! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cmakeSharedLinkerFlagsBuildITimerHeartbeat (in category 'cmake buildType redirects') ----- - cmakeSharedLinkerFlagsBuildITimerHeartbeat - "convenience method for customizing CMAKE_SHARED_LINKER_FLAGS for different buildType " - ^self cmakeSharedLinkerFlagsBuild! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cmakeSharedLinkerFlagsBuildMultiThreaded (in category 'cmake buildType redirects') ----- - cmakeSharedLinkerFlagsBuildMultiThreaded - "convenience method for customizing CMAKE_SHARED_LINKER_FLAGS for different buildType " - ^self cmakeSharedLinkerFlagsBuild! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cmakeSharedLinkerFlagsBuildMultiThreadedAssert (in category 'cmake buildType redirects') ----- - cmakeSharedLinkerFlagsBuildMultiThreadedAssert - "convenience method for customizing CMAKE_SHARED_LINKER_FLAGS for different buildType " - ^self cmakeSharedLinkerFlagsBuild! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cmakeSharedLinkerFlagsBuildMultiThreadedDebug (in category 'cmake buildType redirects') ----- - cmakeSharedLinkerFlagsBuildMultiThreadedDebug - "convenience method for customizing CMAKE_SHARED_LINKER_FLAGS for different buildType " - ^self cmakeSharedLinkerFlagsBuild! Item was removed: - ----- Method: CPlatformConfigForSqueak>>cmakeSharedLinkerFlagsNoBuildType (in category 'cmake buildType redirects') ----- - cmakeSharedLinkerFlagsNoBuildType - "SHOULD NOT GET HERE" - self shouldNotImplement. - ! Item was changed: ----- Method: Linux64x86w32BitConfig>>customizeCMakeVMDisplayX11 (in category 'plugins') ----- customizeCMakeVMDisplayX11 |module| module := vmplugins detect: [:vmd | #CMakeVMDisplayX11 = ((vmd class name) asSymbol)] ifNone:[nil]. "error handling?" module + sources: #( '${targetPlatform}/vm-display-X11/sqUnixX11' '${targetPlatform}/vm-display-X11/sqUnixMozilla' ); - sources: #( '${targetPlatform}/vm-display-X11/sqUnixX11' '${targetPlatform}/vm-display-X11/sqUnixMozilla' ); compilerdefinitions:(OrderedCollection with: '-fPIC' with: '-DPIC'); compilerflags: (self compilerFlags); externallibraries: (self externalLibraries); linkerflags: (self linkerFlags); includedirectories:(OrderedCollection with:'${crossDir}/plugins/FilePlugin' with: '${targetPlatform}/plugins/B3DAcceleratorPlugin' with: '${crossDir}/plugins/B3DAcceleratorPlugin'). ! Item was changed: ----- Method: Linux64x86w32BitSqueakCogV3Config>>cmakeAddDefinitionsBuild (in category 'cmake buildType redirects') ----- cmakeAddDefinitionsBuild + |c d o| - "from oscogvm/build.linux32x86/squeak.cog.v3/build/mvm" (enabledebugmessages) ifTrue:[ templates addLast:((CMakeMessage new) message: (self class name) , 'cmakeAddDefinitionsBuild') ] . + c := self compilerFlags asOrderedCollection. + d := self compilerDefinitions asOrderedCollection. + o:= OrderedCollection new. + o addAllLast: c; addAllLast: d. templates + addLast:((CMakeAddDefinitions new) definitions: (self compilerDefinitions asOrderedCollection)). "see my self flag below" - addLast:((CMakeAddDefinitions new) definitions: (self compilerDefinitions asOrderedCollection)). ! Item was changed: ----- Method: Linux64x86w32BitSqueakCogV3Config>>cmakeCFlagsBuild (in category 'cmake buildType redirects') ----- cmakeCFlagsBuild |cflags| self flag:'tty'. "#build should have -O2" cflags:= String streamContents: [:stream | (self compilerFlags) asStringOn: stream delimiter: ' ' ]. cflags:='"', cflags, '"'. (enabledebugmessages) ifTrue:[ templates addLast:((CMakeMessage new) message: (self class name) , 'cmakeCFlagsBuild') ] . templates - addLast:((CMakeSet new) variable:'CMAKE_CXX_FLAGS' value: '${CMAKE_CXX_FLAGS} ', cflags ); addLast:((CMakeSet new) variable:'CMAKE_C_FLAGS' value: '${CMAKE_C_FLAGS} ', cflags ); + addLast:((CMakeSet new) variable:'CMAKE_C_FLAGS_RELEASE' value: '${CMAKE_CXX_FLAGS_RELEASE} ', cflags ); + addLast:((CMakeSet new) variable:'CMAKE_C_FLAGS_DEBUG' value: '${CMAKE_CXX_FLAGS_DEBUG} ',cflags); + addLast:((CMakeSet new) variable:'CMAKE_CXX_FLAGS' value: '${CMAKE_CXX_FLAGS} ', cflags ); addLast:((CMakeSet new) variable:'CMAKE_CXX_FLAGS_RELEASE' value: '${CMAKE_CXX_FLAGS_RELEASE} ', cflags ); addLast:((CMakeSet new) variable:'CMAKE_CXX_FLAGS_DEBUG' value: '${CMAKE_CXX_FLAGS_DEBUG} ', cflags ). (enabledebugmessages) "take a peek at em" ifTrue:[ templates addLast:((CMakeMessage new) message: 'CMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}'); addLast:((CMakeMessage new) message: 'CMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG}'); addLast:((CMakeMessage new) message: 'CMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE}'); addLast:((CMakeMessage new) message: 'CMAKE_C_FLAGS=${CMAKE_C_FLAGS}'); addLast:((CMakeMessage new) message: 'CMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG}'); addLast:((CMakeMessage new) message: 'CMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE}') ] . ! Item was removed: - ----- Method: Linux64x86w32BitSqueakCogV3Config>>cmakeSharedLinkerFlagsBuild (in category 'cmake buildType redirects') ----- - cmakeSharedLinkerFlagsBuild - - (enabledebugmessages) - ifTrue:[ templates - addLast:((CMakeMessage new) message: (self class name) , 'cmakeSharedLinkerFlagsBuild') - ] . - templates - addLast:((CMakeSet new) - variable:'CMAKE_SHARED_LINKER_FLAGS' - quotedValue:'${CMAKE_SHARED_LINKER_FLAGS} ', (String streamContents: [:stream | (self linkerFlags ) asStringOn: stream delimiter: ' ' ])). - - (enabledebugmessages) - ifTrue:[ templates - addLast:((CMakeMessage new) message: 'CMAKE_C_LINKER_PREFERENCE = ${CMAKE_C_LINKER_PREFERENCE}'); - addLast:((CMakeMessage new) message: 'CMAKE_C_LINKER_PREFERENCE_PROPAGATES = ${CMAKE_C_LINKER_PREFERENCE_PROPAGATES}'); - addLast:((CMakeMessage new) message: 'CMAKE_CXX_LINKER_PREFERENCE = ${CMAKE_CXX_LINKER_PREFERENCE}'); - addLast:((CMakeMessage new) message: 'CMAKE_CXX_LINKER_PREFERENCE_PROPAGATES = ${CMAKE_CXX_LINKER_PREFERENCE_PROPAGATES}'); - addLast:((CMakeMessage new) message: 'CMAKE_EXE_LINKER_FLAGS = ${CMAKE_EXE_LINKER_FLAGS}'); - addLast:((CMakeMessage new) message: 'CMAKE_EXE_LINKER_FLAGS_DEBUG = ${CMAKE_EXE_LINKER_FLAGS_DEBUG}'); - addLast:((CMakeMessage new) message: 'CMAKE_EXE_LINKER_FLAGS_RELEASE = ${CMAKE_EXE_LINKER_FLAGS_RELEASE}'); - addLast:((CMakeMessage new) message: 'CMAKE_MODULE_LINKER_FLAGS = ${CMAKE_MODULE_LINKER_FLAGS}'); - addLast:((CMakeMessage new) message: 'CMAKE_MODULE_LINKER_FLAGS_DEBUG = ${CMAKE_MODULE_LINKER_FLAGS_DEBUG}'); - addLast:((CMakeMessage new) message: 'CMAKE_MODULE_LINKER_FLAGS_ RELEASE= ${CMAKE_MODULE_LINKER_FLAGS_RELEASE}'); - addLast:((CMakeMessage new) message: 'CMAKE_SHARED_LINKER_FLAGS = ${CMAKE_SHARED_LINKER_FLAGS}'); - addLast:((CMakeMessage new) message: 'CMAKE_SHARED_LINKER_FLAGS_DEBUG = ${CMAKE_SHARED_LINKER_FLAGS_DEBUG}'); - addLast:((CMakeMessage new) message: 'CMAKE_SHARED_LINKER_FLAGS_RELEASE = ${CMAKE_SHARED_LINKER_FLAGS_RELEASE}'); - addLast:((CMakeMessage new) message: 'CMAKE_STATIC_LINKER_FLAGS = ${CMAKE_STATIC_LINKER_FLAGS}'); - addLast:((CMakeMessage new) message: 'CMAKE_STATIC_LINKER_FLAGS_DEBUG= ${CMAKE_STATIC_LINKER_FLAGS_DEBUG}'); - addLast:((CMakeMessage new) message: ' CMAKE_STATIC_LINKER_FLAGS_RELEASE= ${CMAKE_STATIC_LINKER_FLAGS_RELEASE}') - - ] . - ! Item was changed: ----- Method: Linux64x86w32BitSqueakCogV3Config>>compilerDefinitions (in category 'compiling') ----- compilerDefinitions ^#( + '-DNDEBUG' - '-DNDEBUG' '-DDEBUGVM=0' ' -DLSB_FIRST=1' '-D_GNU_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DUSE_GLOBAL_STRUCT=0' + '-DCOGMTVM=0') - '-DCOGMTVM=0') ! Item was changed: ----- Method: Linux64x86w32BitSqueakCogV3Config>>compilerFlags (in category 'compiling') ----- compilerFlags ^#("'-Wall'" + '-w' '-m32' '-msse2' '-g3' "extra debugging info" '-O1' '-fno-caller-saves' + '-fno-tree-pre') - '-fno-tree-pre') ! Item was changed: ----- Method: Linux64x86w32BitSqueakCogV3Config>>externalLibraries (in category 'compiling') ----- externalLibraries ^#( + '-L/usr/lib' + '-L/usr/lib/X11' 'uuid' "" 'ssl' "" 'crypto' "" 'm' "C math library" 'dl' "dynamic linking library" 'pthread' "POSIX threads library" 'SM' "session management library for X11" 'ICE' "ICE is the Inter Client Exchange protocol, part of X11" 'GL' "libGL implements the GLX interface as well as the main OpenGL API entrypoints" 'X11' 'nsl' "network services library" ) ! Item was changed: ----- Method: Linux64x86w32BitSqueakCogV3Config>>linkerFlags (in category 'compiling') ----- linkerFlags ^#( '-Wl' '-z' 'now' + ) - ) ! Item was changed: ----- Method: SqueakUnixConfig>>setGlobalOptionsAfterDetermineSystemBuild: (in category 'cmake buildType redirects') ----- setGlobalOptionsAfterDetermineSystemBuild: aMaker " SystemNavigation default browseMethodsWhoseNamesContain: 'setGlobalOptionsAfterDetermineSystemBuild'" (enabledebugmessages) ifTrue:[ templates addLast: ((CMakeMessage new) message: (self class name), ' setGlobalOptionsAfterDetermineSystemBuild: aMaker') ]. + "templates addLast:((CMakeSet new) variable:'CMAKE_C_COMPILER' value: 'gcc')" - templates addLast:((CMakeSet new) variable:'CMAKE_C_COMPILER' value: 'gcc') !

1 0

VM Maker: CMakeVMMakerSqueak-tty.91.mcz
by commits＠source.squeak.org 19 Jul '14

19 Jul '14

Timothy M uploaded a new version of CMakeVMMakerSqueak to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMakerSqueak-tty.91.mcz ==================== Summary ==================== Name: CMakeVMMakerSqueak-tty.91 Author: tty Time: 18 July 2014, 12:41:55.549 pm UUID: 5afe9a2c-10ef-4c92-8341-8c657913ba31 Ancestors: CMakeVMMakerSqueak-tty.90 stage save while upgrading vmmaker.oscog =============== Diff against CMakeVMMakerSqueak-tty.90 =============== Item was added: + CMakeTemplate subclass: #CMakePluginVm + instanceVariableNames: 'config definitions module sources includedirectories' + classVariableNames: '' + poolDictionaries: '' + category: 'CMakeVMMakerSqueak-CMakeCompositeTemplates'! + + !CMakePluginVm commentStamp: 'tty 7/17/2014 11:50' prior: 0! + A CMakeVMDriver is a composite template that simplifies outputing vm drivers like vm-display-X11 to a CMakeLists.txt file. + I replace the output of pharo's CMakeVMMaker + + CogFamilyUnixConfig addDriver: name sources: aSources generator: cmakeGen externalLibs: extLibs which was invoked like so: + + aMaker message: 'addVMDrivers: aMaker'. + self + addDriver: 'vm-display-null' + sources: #( + '${targetPlatform}/vm-display-null/sqUnixDisplayNull' ) + generator: aMaker + externalLibs: #(); + ! Item was added: + ----- Method: CMakePluginVm>>config (in category 'accessing') ----- + config + + ^ config! Item was added: + ----- Method: CMakePluginVm>>config:definitions:module:sources:includedirectories: (in category 'accessing') ----- + config: anObject definitions: dOrderedCollection module: mString sources: sOrderedCollection includedirectories: iOrderedCollection + config:= anObject. + definitions:= dOrderedCollection. + module := mString. + sources :=sOrderedCollection. + includedirectories := iOrderedCollection. + ^self template + + ! Item was added: + ----- Method: CMakePluginVm>>definitions (in category 'accessing') ----- + definitions + ^ definitions! Item was added: + ----- Method: CMakePluginVm>>includedirectories (in category 'accessing') ----- + includedirectories + + ^ includedirectories! Item was added: + ----- Method: CMakePluginVm>>module (in category 'accessing') ----- + module + + ^ module! Item was added: + ----- Method: CMakePluginVm>>sources (in category 'accessing') ----- + sources + + ^ sources! Item was added: + ----- Method: CMakePluginVm>>template (in category 'accessing') ----- + template + |temp sourcesString cflags| + cflags:= String streamContents: [:stream | config compilerFlags asStringOn: stream delimiter: ' ' ]. + cflags := '"' , cflags , '"'. + sourcesString := String streamContents: [:stream | sources asStringOn: stream delimiter: ' ' ]. + temp := OrderedCollection new. + temp + addLast: ((CMakeHeader new) configurationName: config class name ); + " addLast: ((CMakeProject new)variable: module ); Ian does not have this. Igor does." + addLast: ((CMakeMinimumRequired new) version: '3.0.0'); + addLast: ((CMakeInclude new) file: ((config buildDir fullName), FileDirectory slash, 'directories.cmake')) ; + addLast:((CMakeAddDefinitions new) definitions: config compilerFlags asOrderedCollection); + addLast:((CMakeAddDefinitions new) definitions: definitions); + addLast:((CMakeSet new) variable:'sources' quotedValue: sourcesString); + addLast:((CMakeAddLibrary new) + library: module + type: 'SHARED' + sources: sources); + addLast: ((CMakeIncludeDirectories new) dirs: includedirectories); + addLast:((CMakeSet new) variable: 'LIBRARY_OUTPUT_PATH' quotedValue: (config outputDir fullName)); + addLast:((CMakeListAppend new) list: 'LINKLIBS' elements: (config externalLibs)); + addLast:((CMakeTargetLinkLibraries new) target: module items: (OrderedCollection with: '${LINKLIBS}')); + addLast:((CMakeSetTargetProperties new) + target: module + propertiesandvalues: (OrderedCollection with: 'PREFIX "" ' with: 'SUFFIX "" ' with: 'LINK_FLAGS ' , cflags)) . + ^temp! Item was changed: ----- Method: CMakeVMDisplayCustom>>initialize (in category 'initialize-release') ----- initialize super initialize. + module :='vm-display-custom'! - driver:='vm-display-custom'! Item was changed: ----- Method: CMakeVMDisplayFbdev>>initialize (in category 'initialize-release') ----- initialize super initialize. + module :='vm-display-fbdev'! - driver:='vm-display-fbdev'! Item was changed: ----- Method: CMakeVMDisplayNull>>initialize (in category 'initialize-release') ----- initialize super initialize. + module :='vm-display-null'! - driver:='vm-display-null'! Item was changed: ----- Method: CMakeVMDisplayQuartz>>initialize (in category 'initialize-release') ----- initialize super initialize. + module :='vm-display-Quartz'! - driver:='vm-display-Quartz'! Item was changed: ----- Method: CMakeVMDisplayX11>>initialize (in category 'initialize-release') ----- initialize super initialize. + module :='vm-display-X11'! - driver:='vm-display-X11'! Item was removed: - CMakeTemplate subclass: #CMakeVMDriver - instanceVariableNames: 'config definitions driver sources includedirectories' - classVariableNames: '' - poolDictionaries: '' - category: 'CMakeVMMakerSqueak-CMakeCompositeTemplates'! - - !CMakeVMDriver commentStamp: 'tty 7/17/2014 11:50' prior: 0! - A CMakeVMDriver is a composite template that simplifies outputing vm drivers like vm-display-X11 to a CMakeLists.txt file. - I replace the output of pharo's CMakeVMMaker - - CogFamilyUnixConfig addDriver: name sources: aSources generator: cmakeGen externalLibs: extLibs which was invoked like so: - - aMaker message: 'addVMDrivers: aMaker'. - self - addDriver: 'vm-display-null' - sources: #( - '${targetPlatform}/vm-display-null/sqUnixDisplayNull' ) - generator: aMaker - externalLibs: #(); - ! Item was removed: - ----- Method: CMakeVMDriver>>config (in category 'accessing') ----- - config - - ^ config! Item was removed: - ----- Method: CMakeVMDriver>>config:definitions:driver:sources:includedirectories: (in category 'accessing') ----- - config: anObject definitions: dOrderedCollection driver: dString sources: sOrderedCollection includedirectories: iOrderedCollection - config:= anObject. - definitions:= dOrderedCollection. - driver:=dString. - sources :=sOrderedCollection. - includedirectories := iOrderedCollection. - ^self template - - ! Item was removed: - ----- Method: CMakeVMDriver>>definitions (in category 'accessing') ----- - definitions - ^ definitions! Item was removed: - ----- Method: CMakeVMDriver>>driver (in category 'accessing') ----- - driver - - ^ driver! Item was removed: - ----- Method: CMakeVMDriver>>includedirectories (in category 'accessing') ----- - includedirectories - - ^ includedirectories! Item was removed: - ----- Method: CMakeVMDriver>>sources (in category 'accessing') ----- - sources - - ^ sources! Item was removed: - ----- Method: CMakeVMDriver>>template (in category 'accessing') ----- - template - |temp sourcesString| - sourcesString := String streamContents: [:stream | sources asStringOn: stream delimiter: ' ' ]. - temp := OrderedCollection new. - temp - addLast: ((CMakeHeader new) configurationName: config class name ); - addLast: ((CMakeProject new)variable: config executableName ); - addLast: ((CMakeInclude new) file: ((config buildDirName), FileDirectory slash, 'directories.cmake')); "??" - addLast:((CMakeAddDefinitions new) definitions: config compilerFlags asOrderedCollection); - addLast:((CMakeAddDefinitions new) definitions: definitions); - addLast:((CMakeSet new) variable:'sources' quotedValue: sourcesString); - addLast:((CMakeAddLibrary new) - library: driver - type: 'SHARED' - sources: sources); - addLast: ((CMakeIncludeDirectories new) dirs: includedirectories); - addLast:((CMakeSet new) variable: 'LIBRARY_OUTPUT_PATH' quotedValue: (config outputDir fullName)); - addLast:((CMakeListAppend new) list: 'LINKLIBS' elements: (config externalLibs)); - addLast:((CMakeTargetLinkLibraries new) target: driver items: (OrderedCollection with: '${LINKLIBS}')); - addLast:((CMakeSetTargetProperties new) - target: driver - propertiesandvalues: (OrderedCollection with: 'PREFIX "" ' with: 'SUFFIX "" ' with: 'LINK_FLAGS ' , (config compilerFlags))). - ^temp! Item was changed: ----- Method: CMakeVMGeneratorForSqueak>>generateByTemplate (in category 'code generation') ----- generateByTemplate "attempt to move way from string based writing to template based. Think Seaside renderOn composition" | extPlugins intPlugins | self flag: 'tty'. "refactor so that the cascade reflects CMake terminilogy" output := String new writeStream. config templates: OrderedCollection new. config setGlobalOptions: self; cmakePrefixPath; cmakeIncludePath; cmakeLibraryPath; cmakeIncludeModules; cmakeCFlags; cmakeAddDefinitions; cmakeSharedLinkerFlags; setGlobalOptionsAfterDetermineSystem: self; setDirectories: self; cmakeIncludeDirectories: self; preferredIncludes; standardIncludes; extraVMSettings: self; setCoreSources: self; setPlatformSources: self; setCrossSources: self; setExtraSources; cmakeSetSourceFilesProperties; cmakeListAppend:'LINKLIBS' elements: (config externalLibs); cmakeAddExecutableNameOptionSource: self; setExecutableOutputPath; addVMPlugins: self. - - " - self addVMDrivers: aMaker. - " config templates do: [:each | self puts: each content]. extPlugins := self generatePluginConfigs: config internalPlugins internal: true. intPlugins := self generatePluginConfigs: config externalPlugins internal: false. self processThirdpartyLibraries. self processPlugins: intPlugins, extPlugins. " config setExtraTargetProperties: self." self cmd: 'target_link_libraries' params: self moduleName , ' ${LINKLIBS}'. config postBuildActions: self.. self saveFile. self generateBuildScript! Item was changed: Object subclass: #CMakeVMPlugin + instanceVariableNames: 'module sources compilerdefinitions compilerflags externallibraries linkerflags includedirectories' - instanceVariableNames: 'driver sources compilerdefinitions compilerflags externallibraries linkerflags includedirectories' classVariableNames: '' poolDictionaries: '' category: 'CMakeVMMakerSqueak-VMPlugins'! !CMakeVMPlugin commentStamp: 'tty 7/17/2014 19:53' prior: 0! A CMakeVMPlugin is a data bucket for things like: 'vm-display-Quartz' 'vm-display-X11' 'vm-display-custom' 'vm-display-fbdev' 'vm-display-null' 'vm-sound-ALSA' 'vm-sound-MacOSX' 'vm-sound-NAS' 'vm-sound-OSS' 'vm-sound-Sun' 'vm-sound-custom' 'vm-sound-null' ! Item was removed: - ----- Method: CMakeVMPlugin>>driver (in category 'accessing') ----- - driver - - ^ driver! Item was removed: - ----- Method: CMakeVMPlugin>>driver: (in category 'accessing') ----- - driver: anObject - - driver := anObject! Item was removed: - ----- Method: CMakeVMPlugin>>driver:sources:compilerdefinitions:compilerflags:externallibraries:linkerflags:includedirectories: (in category 'accessing') ----- - driver:dString sources:sCollection compilerdefinitions: cdCollection compilerflags: cfCollection externallibraries:elCollection linkerflags: lfCollection includedirectories: idCollection - driver:= dString. - sources:= sCollection. - compilerdefinitions:= cdCollection. - compilerflags:= cfCollection. - externallibraries := elCollection. - linkerflags:= lfCollection. - includedirectories := idCollection.! Item was added: + ----- Method: CMakeVMPlugin>>module (in category 'accessing') ----- + module + ^module! Item was added: + ----- Method: CMakeVMPlugin>>module: (in category 'accessing') ----- + module: anObject + + module := anObject! Item was added: + ----- Method: CMakeVMPlugin>>module:sources:compilerdefinitions:compilerflags:externallibraries:linkerflags:includedirectories: (in category 'accessing') ----- + module:mString sources:sCollection compilerdefinitions: cdCollection compilerflags: cfCollection externallibraries:elCollection linkerflags: lfCollection includedirectories: idCollection + module:= mString. + sources:= sCollection. + compilerdefinitions:= cdCollection. + compilerflags:= cfCollection. + externallibraries := elCollection. + linkerflags:= lfCollection. + includedirectories := idCollection.! Item was changed: ----- Method: CMakeVMSoundALSA>>initialize (in category 'initialize-release') ----- initialize super initialize. + module :='vm-sound-ALSA'! - driver:='vm-sound-ALSA'! Item was changed: ----- Method: CMakeVMSoundCustom>>initialize (in category 'initialize-release') ----- initialize super initialize. + module :='vm-sound-custom'! - driver:='vm-sound-custom'! Item was changed: ----- Method: CMakeVMSoundMacOSX>>initialize (in category 'initialize-release') ----- initialize super initialize. + module :='vm-sound-MacOSX'! - driver:='vm-sound-MacOSX'! Item was changed: ----- Method: CMakeVMSoundNAS>>initialize (in category 'initialize-release') ----- initialize super initialize. + module :='vm-sound-NAS'! - driver:='vm-sound-NAS'! Item was changed: ----- Method: CMakeVMSoundNull>>initialize (in category 'initialize-release') ----- initialize super initialize. + module :='vm-sound-null'! - driver:='vm-sound-null'! Item was changed: ----- Method: CMakeVMSoundOSS>>initialize (in category 'initialize-release') ----- initialize super initialize. + module :='vm-sound-OSS'! - driver:='vm-sound-OSS'! Item was changed: ----- Method: CMakeVMSoundSun>>initialize (in category 'initialize-release') ----- initialize super initialize. + module :='vm-sound-Sun'! - driver:='vm-sound-Sun'! Item was changed: CPlatformConfig subclass: #CPlatformConfigForSqueak + instanceVariableNames: 'buildType generateBuild generateBuildAssert generateBuildAssertITimerHeartbeat generateBuildDebug generateBuildDebugITimerHeartbeat generateBuildDebugMultiThreaded generateBuildIHeartbeatTimer generateBuildMultiThreaded generateBuildMultiThreadedAssert generateBuildMultiThreadedDebug templates enabledebugmessages vmplugins' - instanceVariableNames: 'buildType generateBuild generateBuildAssert generateBuildAssertITimerHeartbeat generateBuildDebug generateBuildDebugITimerHeartbeat generateBuildDebugMultiThreaded generateBuildIHeartbeatTimer generateBuildMultiThreaded generateBuildMultiThreadedAssert generateBuildMultiThreadedDebug templates enabledebugmessages vmdrivers' classVariableNames: '' poolDictionaries: '' category: 'CMakeVMMakerSqueak'! CPlatformConfigForSqueak class instanceVariableNames: 'isAbstractBaseClass'! !CPlatformConfigForSqueak commentStamp: 'tty 6/23/2014 17:02' prior: 0! A CPlatformConfigForSqueak acts as a compatability layer for Squeak and an Abstract Base Class for extended functionality required for the Squeak CMakeVMMaker use-case. I make (very) heavy use of a specific design pattern for configuring myself and remaining compatible with pharo's CMakeVMMaker. The entry point for that pattern is my method 'configureForBuildType: aSymbol' . Each method send in there detects my buildType and routes the send to the approriate method for that buildType. Subclasses of me 'must' configure themselves for each build type per that pattern. However this can be very easy by just returning the base configuration. Tests are written to verify that this support infrastructure is in place. I have two important variables. excludeFromBuild and isAbstractBaseClass. excludeFromBuild is used to exclude a configuration from being built by a Builder. is used to exclude a configuration from Testing. isAbstractBaseClass is a class instance variable used by configurations that exclude themselves from being built by a Builder BUT need to be included in Testing. excludeFromBuild | isAbstractBaseClass | should build | should test T T NO YES T F NO NO F T YES YES F F YES YES The use-case is as follows. An abstract base class contains a lot of functionality that must be implemented and tested for the system to work, but it is not meant to be compiled. concrete classes of that AbstractBase class can exclude themselves from being built by builders and by doing so are not tested. However, once a concrete configuration is enabled to be built, it must pass all tests. Linux32x86Config is an example of an AbstractBase class that must pass all testing, but is not buildable. Its subclass Linux32x86SqueakCogV3Config needs testing, but a developer can toggle 'exclude from build' to hide it from Builders or make it available to them. Tests make the decision on what configurations to test. Here are some examples. (o excludeFromBuild not) & (configuration isAbstractBaseClass not) this is a concrete [Lang][VM][MemoryManager][etc] configuration that will be built. No platform classes considered (o excludeFromBuild) & (configuration isAbstractBaseClass not) This is a concrete [Lang][VM][MemoryManager][etc] configuration that will be NOT built. (o excludeFromBuild not) | (configuration isAbstractBaseClass) concrete implementation may depend on its [OS][VMWordSize][Processor] AbstractBaseClass for platform level methods. example: Linux32x86Config ccBuild has the '-m32' compiler flag that is common to all builds on that platform (o excludeFromBuild not) & (configuration isAbstractBaseClass) Not allowed. [OS][VMWordSize][Processor] AbstractBaseClasses should not be built. This is a useful test in its own right. (o excludeFromBuild) & (configuration isAbstractBaseClass) These are the AbstractBaseClasses. An AbstractBaseClass should always be excluded from a build tty.! CPlatformConfigForSqueak class instanceVariableNames: 'isAbstractBaseClass'! Item was changed: ----- Method: CPlatformConfigForSqueak>>cmakeIncludeDirectories: (in category 'cmake') ----- cmakeIncludeDirectories: aMaker (enabledebugmessages) ifTrue:[ templates addLast: ((CMakeMessage new) message: (self class name), ' includeDirs: aMaker' ) ]. templates addLast: ((CMakeIncludeDirectories new) dirs: (OrderedCollection with: (aMaker includeDirs))). ! Item was changed: ----- Method: CPlatformConfigForSqueak>>fixLineEndsOf: (in category 'squeak compatability') ----- fixLineEndsOf: string + self flag:'tty'. "does FileStream handle this cleanly?" ^ string copyReplaceAll: String cr with: String crlf! Item was changed: ----- Method: CPlatformConfigForSqueak>>initialize (in category 'initialize-release') ----- initialize enabledebugmessages := false. self initializeVMDrivers. + self customizeVMPlugins! - self customizeVMDrivers.! Item was changed: ----- Method: CPlatformConfigForSqueak>>initializeVMDrivers (in category 'initialize-release') ----- initializeVMDrivers + vmplugins := OrderedCollection new. + vmplugins - vmdrivers := OrderedCollection new. - vmdrivers addLast:(CMakeVMDisplayCustom new); addLast:(CMakeVMDisplayFbdev new); addLast:(CMakeVMDisplayNull new); addLast:(CMakeVMDisplayQuartz new); addLast:(CMakeVMDisplayX11 new); addLast:(CMakeVMSoundALSA new); addLast:(CMakeVMSoundCustom new); addLast:(CMakeVMSoundMacOSX new); addLast:(CMakeVMSoundNAS new); addLast:(CMakeVMSoundNull new); addLast:(CMakeVMSoundOSS new); addLast:(CMakeVMSoundSun new). ! Item was removed: - ----- Method: CPlatformConfigForSqueak>>setExtraTargetProperties: (in category 'cmake buildType redirects') ----- - setExtraTargetProperties: aMaker - "Route this message send to the message appropriate for my buildType " - |d | - d:= SqueakCMakeVMMakerAbstractBuilder default buildTypeAndDirectoryInfo copy. - d - at: #build put: [self setExtraTargetPropertiesBuild: aMaker]; - at: #buildAssert put: [self setExtraTargetPropertiesBuildAssert: aMaker]; - at: #buildAssertITimerHeartbeat put: [self setExtraTargetPropertiesBuildAssertITimerHeartbeat: aMaker]; - at:#buildDebug put: [self setExtraTargetPropertiesBuildDebug: aMaker]; - at: #buildDebugITimerHeartbeat put: [self setExtraTargetPropertiesBuildDebugITimerHeartbeat: aMaker ]; - at: #buildITimerHeartbeat put: [self setExtraTargetPropertiesBuildITimerHeartbeat: aMaker]; - at: #buildMultiThreaded put: [self setExtraTargetPropertiesBuildMultiThreaded: aMaker ]; - at: #buildMultiThreadedAssert put: [self setExtraTargetPropertiesBuildMultiThreadedAssert: aMaker]; - at: #buildMultiThreadedDebug put: [self setExtraTargetPropertiesBuildMultiThreadedDebug: aMaker ]; - at: #buildNone put:[self setExtraTargetPropertiesNoBuildType: aMaker]. - ^(d at: buildType) value - - ! Item was removed: - ----- Method: CPlatformConfigForSqueak>>setExtraTargetPropertiesBuild: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuild: aMaker - "convenience method for this buildType. - - SystemNavigation default browseMethodsWhoseNamesContain: 'setExtraTargetProperties' - - do nothing is an option" - self subclassResponsibility - ! Item was removed: - ----- Method: CPlatformConfigForSqueak>>setExtraTargetPropertiesBuildAssert: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildAssert: aMaker - "convenience method for this buildType. - - SystemNavigation default browseMethodsWhoseNamesContain: 'setExtraTargetProperties' - - do nothing is an option" - self subclassResponsibility - ! Item was removed: - ----- Method: CPlatformConfigForSqueak>>setExtraTargetPropertiesBuildAssertITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildAssertITimerHeartbeat: aMaker - "convenience method for this buildType. - - SystemNavigation default browseMethodsWhoseNamesContain: 'setExtraTargetProperties' - - do nothing is an option" - self subclassResponsibility - ! Item was removed: - ----- Method: CPlatformConfigForSqueak>>setExtraTargetPropertiesBuildDebug: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildDebug: aMaker - "convenience method for this buildType. - - SystemNavigation default browseMethodsWhoseNamesContain: 'setExtraTargetProperties' - - do nothing is an option" - self subclassResponsibility - ! Item was removed: - ----- Method: CPlatformConfigForSqueak>>setExtraTargetPropertiesBuildDebugITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildDebugITimerHeartbeat: aMaker - "convenience method for this buildType. - - SystemNavigation default browseMethodsWhoseNamesContain: 'setExtraTargetProperties' - - do nothing is an option" - self subclassResponsibility - ! Item was removed: - ----- Method: CPlatformConfigForSqueak>>setExtraTargetPropertiesBuildITimerHeartbeat: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildITimerHeartbeat: aMaker - "convenience method for this buildType. - - SystemNavigation default browseMethodsWhoseNamesContain: 'setExtraTargetProperties' - - do nothing is an option" - self subclassResponsibility - ! Item was removed: - ----- Method: CPlatformConfigForSqueak>>setExtraTargetPropertiesBuildMultiThreaded: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildMultiThreaded: aMaker - "convenience method for this buildType. - - SystemNavigation default browseMethodsWhoseNamesContain: 'setExtraTargetProperties' - - do nothing is an option" - self subclassResponsibility - ! Item was removed: - ----- Method: CPlatformConfigForSqueak>>setExtraTargetPropertiesBuildMultiThreadedAssert: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildMultiThreadedAssert: aMaker - "convenience method for this buildType. - - SystemNavigation default browseMethodsWhoseNamesContain: 'setExtraTargetProperties' - - do nothing is an option" - self subclassResponsibility - ! Item was removed: - ----- Method: CPlatformConfigForSqueak>>setExtraTargetPropertiesBuildMultiThreadedDebug: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuildMultiThreadedDebug: aMaker - "convenience method for this buildType. - - SystemNavigation default browseMethodsWhoseNamesContain: 'setExtraTargetProperties' - - do nothing is an option" - self subclassResponsibility - ! Item was removed: - ----- Method: CPlatformConfigForSqueak>>setExtraTargetPropertiesNoBuildType: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesNoBuildType: aMaker - "SHOULD NOT GET HERE" - self shouldNotImplement. - ! Item was changed: ----- Method: CPlatformConfigForSqueak>>write:toFile: (in category 'squeak compatability') ----- write: aContents toFile: aFileName "write a file to current output directory (buildDir). use line end convention appropriate for config platform" - | bldDir | bldDir := self buildDir. bldDir isString ifTrue: [ bldDir := FileDirectory directoryEntryFor: bldDir ]. bldDir assureExistence. bldDir forceNewFileNamed: aFileName do: [:s | s + nextPutAll: (self fixLineEndsOf: aContents)] - nextPutAll: (self fixLineEndsOf: aContents)] ! Item was removed: - ----- Method: Linux32ARMv6Config>>setExtraTargetPropertiesBuild: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuild: aMaker - self flag:'tty'. "I am nervous about this method up here in this class, but pharo has it in CogUnixConfig, so using as is for now" - - aMaker setTargetProperties: 'LINK_FLAGS "-m32"'. - - aMaker puts: 'set_source_files_properties( ${srcVMDir}/cogit.c PROPERTIES - COMPILE_FLAGS "-O1 -fno-omit-frame-pointer -momit-leaf-frame-pointer -mno-rtd -mno-accumulate-outgoing-args")'. - - - aMaker - cmd: 'set_source_files_properties' - params: ' ${targetPlatform}/vm/sqUnixHeartbeat.c PROPERTIES - COMPILE_FLAGS "-O1 -fno-omit-frame-pointer -mno-rtd -mno-accumulate-outgoing-args"'. - aMaker - cmd:'set_target_properties' - params: '${_name} PROPERTIES LINK_FLAGS "-undefined gl"'. - - - aMaker addExternalLibraries: - #( - 'uuid' "" - 'ssl' "" - 'crypto' "" - 'm' - 'dl' - 'pthread' - ). - - - aMaker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName. - self addVMPlugins: aMaker.! Item was removed: - ----- Method: Linux32x86Config>>setExtraTargetPropertiesBuild: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuild: aMaker - self flag:'tty'. "I am nervous about this method up here in this class, but pharo has it in CogUnixConfig, so using as is for now" - - aMaker setTargetProperties: 'LINK_FLAGS "-m32"'. - - aMaker puts: 'set_source_files_properties( ${srcVMDir}/cogit.c PROPERTIES - COMPILE_FLAGS "-O1 -fno-omit-frame-pointer -momit-leaf-frame-pointer -mno-rtd -mno-accumulate-outgoing-args")'. - - - aMaker - cmd: 'set_source_files_properties' - params: ' ${targetPlatform}/vm/sqUnixHeartbeat.c PROPERTIES - COMPILE_FLAGS "-O1 -fno-omit-frame-pointer -mno-rtd -mno-accumulate-outgoing-args"'. - aMaker - cmd:'set_target_properties' - params: '${_name} PROPERTIES LINK_FLAGS "-undefined gl"'. - - - aMaker addExternalLibraries: - #( - 'uuid' "" - 'ssl' "" - 'crypto' "" - 'm' - 'dl' - 'pthread' - ). - - - aMaker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName. - self addVMPlugins: aMaker.! Item was changed: ----- Method: Linux64x86w32BitConfig>>addVMPluginsBuild: (in category 'cmake buildType redirects') ----- addVMPluginsBuild: aMaker |temp o| self flag:'tty'. "I am writing sub-directory CMakeLists.txt here. Should I also write the config.cmake files?" enabledebugmessages ifTrue: [templates "this message will go to the top level CMakeLists.txt file" + addLast: (CMakeMessage new message: self class name , 'addVMPluginsBuild: aMaker')]. + vmplugins do:[ :vmp | + o := String new writeStream. "each VMPlugin gets its own CMakeLists.txt file in its own directory" - addLast: (CMakeMessage new message: self class name , 'addVMDriversBuild:')]. - vmdrivers do:[ :vmd | - o := String new writeStream. "each VMDriver gets its own CMakeLists.txt file." temp := OrderedCollection new. temp + addAllLast:((CMakePluginVm new) "this is the CMakeCompositTemplate" - addAllLast:((CMakeVMDriver new) "<--confusing name. This is a CompositTemplate, not the CMakeVMDriverWrapper class" config: self + definitions: (vmp compilerdefinitions) + module: (vmp module) + sources: (vmp sources) + includedirectories: (vmp includedirectories)). - definitions: (vmd compilerdefinitions) - driver: (vmd driver) - sources: (vmd sources) - includedirectories: (vmd includedirectories)). temp do: [:each | o nextPutAll: (each content); cr]. + ((self buildDir) directoryExists: (vmp module)) + ifFalse:[ (self buildDir) createDirectory: (vmp module)]. + self write: (o contents) toFile: vmp module , FileDirectory slash , aMaker outputFileName. - "need a check exists here" - (self buildDir) createDirectory: (vmd driver). - " (FileDirectory default) createDirectory: (self buildDir) , FileDirectory slash , vmd driver." - self write: (o contents) toFile: vmd driver , FileDirectory slash , aMaker outputFileName. templates "this will go to the top level CMakeLists.txt file" + addLast: ((CMakeAddSubDirectory new) sourcedir: (vmp module)) - addLast: ((CMakeAddSubDirectory new) sourcedir: (vmd driver)) ]. ! Item was changed: ----- Method: Linux64x86w32BitConfig>>customizeCMakeVMDisplayNull (in category 'plugins') ----- customizeCMakeVMDisplayNull + |module| + module := vmplugins detect: [:vmd | #CMakeVMDisplayNull = ((vmd class name) asSymbol)] ifNone:[nil]. "error handling?" + module - |vmdriver| - vmdriver := vmdrivers detect: [:vmd | #CMakeVMDisplayNull = ((vmd class name) asSymbol)] ifNone:[nil]. "error handling?" - vmdriver sources: #('${targetPlatform}/vm-display-null/sqUnixDisplayNull') ; compilerdefinitions:(OrderedCollection with: '-fPIC' with: '-DPIC'); compilerflags: (self compilerFlags); externallibraries: #(); linkerflags: (self linkerFlags); includedirectories:(OrderedCollection with:'${crossDir}/plugins/FilePlugin' with: '${targetPlatform}/plugins/B3DAcceleratorPlugin' with: '${crossDir}/plugins/B3DAcceleratorPlugin'). self flag:'tty'. "I don't think includedirectories is correct. revisit" ! Item was changed: ----- Method: Linux64x86w32BitConfig>>customizeCMakeVMDisplayX11 (in category 'plugins') ----- customizeCMakeVMDisplayX11 + |module| + module := vmplugins detect: [:vmd | #CMakeVMDisplayX11 = ((vmd class name) asSymbol)] ifNone:[nil]. "error handling?" + module - |vmdriver| - vmdriver := vmdrivers detect: [:vmd | #CMakeVMDisplayX11 = ((vmd class name) asSymbol)] ifNone:[nil]. "error handling?" - vmdriver sources: #( '${targetPlatform}/vm-display-X11/sqUnixX11' '${targetPlatform}/vm-display-X11/sqUnixMozilla' ); compilerdefinitions:(OrderedCollection with: '-fPIC' with: '-DPIC'); compilerflags: (self compilerFlags); externallibraries: (self externalLibraries); linkerflags: (self linkerFlags); includedirectories:(OrderedCollection with:'${crossDir}/plugins/FilePlugin' with: '${targetPlatform}/plugins/B3DAcceleratorPlugin' with: '${crossDir}/plugins/B3DAcceleratorPlugin'). ! Item was changed: ----- Method: Linux64x86w32BitConfig>>customizeCMakeVMSoundALSA (in category 'plugins') ----- customizeCMakeVMSoundALSA + |module| + module := vmplugins detect: [:vmd | #CMakeVMSoundALSA = ((vmd class name) asSymbol)] ifNone:[nil]. "error handling?" + module - |vmdriver| - vmdriver := vmdrivers detect: [:vmd | #CMakeVMSoundALSA = ((vmd class name) asSymbol)] ifNone:[nil]. "error handling?" - vmdriver sources: #( '${targetPlatform}/vm-sound-ALSA/sqUnixSoundALSA' ); compilerdefinitions:(OrderedCollection with: '-fPIC' with: '-DPIC'); compilerflags: (self compilerFlags); externallibraries: (self externalLibraries); linkerflags: (self linkerFlags); includedirectories: #(). ! Item was changed: ----- Method: Linux64x86w32BitConfig>>customizeCMakeVMSoundNull (in category 'plugins') ----- customizeCMakeVMSoundNull + |module| + module := vmplugins detect: [:vmd | #CMakeVMSoundNull = ((vmd class name) asSymbol)] ifNone:[nil]. "error handling?" + module - |vmdriver| - vmdriver := vmdrivers detect: [:vmd | #CMakeVMSoundNull = ((vmd class name) asSymbol)] ifNone:[nil]. "error handling?" - vmdriver sources: #( '${targetPlatform}/vm-sound-null/sqUnixSoundNull' ); compilerdefinitions:(OrderedCollection with: '-fPIC' with: '-DPIC'); compilerflags: (self compilerFlags); externallibraries: (self externalLibraries); linkerflags: (self linkerFlags); includedirectories:#() ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>customizeVMDrivers (in category 'plugins') ----- - customizeVMDrivers - |subset iwantonly| - "trim the vmdrivers ordered collection of CMakeVMDriver subclasses to only those I want. then customize them for use" - iwantonly := #(#CMakeVMDisplayNull #CMakeVMDisplayX11 #CMakeVMSoundALSA #CMakeVMSoundNull ). - subset := vmdrivers select: [:vmd | 0 < (iwantonly occurrencesOf: (vmd class name) asSymbol)]. - vmdrivers := subset. - self - customizeCMakeVMDisplayNull; - customizeCMakeVMDisplayX11; - customizeCMakeVMSoundALSA; - customizeCMakeVMSoundNull. - - - - ! Item was added: + ----- Method: Linux64x86w32BitConfig>>customizeVMPlugins (in category 'plugins') ----- + customizeVMPlugins + |mysubset iwantonly| + "trim the vmdrivers ordered collection of CMakeVMDriver subclasses to only those I want. then customize them for use on this OS/platform" + iwantonly := #(#CMakeVMDisplayNull #CMakeVMDisplayX11 #CMakeVMSoundALSA #CMakeVMSoundNull ). + mysubset := vmplugins select: [:vmd | 0 < (iwantonly occurrencesOf: (vmd class name) asSymbol)]. + vmplugins := mysubset. + self + customizeCMakeVMDisplayNull; + customizeCMakeVMDisplayX11; + customizeCMakeVMSoundALSA; + customizeCMakeVMSoundNull. + + + + ! Item was removed: - ----- Method: Linux64x86w32BitConfig>>setExtraTargetPropertiesBuild: (in category 'cmake buildType redirects') ----- - setExtraTargetPropertiesBuild: aMaker - - - aMaker addExternalLibraries: (self externalLibs). - - aMaker set: 'EXECUTABLE_OUTPUT_PATH' toString: self outputDir fullName. - self addVMPlugins: aMaker.! Item was changed: ----- Method: Linux64x86w32BitSqueakCogV3Config>>cmakeSetSourceFilesPropertiesBuild (in category 'cmake buildType redirects') ----- cmakeSetSourceFilesPropertiesBuild |cflags| + cflags:=String streamContents: [:stream | (self compilerFlags) asStringOn: stream + delimiter: ' ' ]. + cflags := '"' , cflags , '"'. - cflags:=String streamContents: [:stream | (self compilerFlags) asStringOn: stream delimiter: ' ' ]. (enabledebugmessages) ifTrue:[ templates addLast:((CMakeMessage new) message: (self class name) , 'cmakeSetSourceFilesPropertiesBuild') ] . templates addLast:((CMakeSetSourceFilesProperties new) files: (OrderedCollection with: '${srcVMDir}/cogit.c') propertiesandvalues:{'COMPILE_FLAGS' . cflags}); addLast:((CMakeSetSourceFilesProperties new) files: (OrderedCollection with: '${targetPlatform}/vm/sqUnixHeartbeat.c') propertiesandvalues:{'COMPILE_FLAGS' . cflags}).! Item was changed: ----- Method: Linux64x86w32BitSqueakCogV3Config>>compilerDefinitions (in category 'compiling') ----- compilerDefinitions ^#( '-DNDEBUG' '-DDEBUGVM=0' + ' -DLSB_FIRST=1' '-D_GNU_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DUSE_GLOBAL_STRUCT=0' '-DCOGMTVM=0') + ! - ! Item was changed: ----- Method: Linux64x86w32BitSqueakCogV3Config>>compilerFlags (in category 'compiling') ----- compilerFlags + ^#("'-Wall'" + '-m32' + '-msse2' + '-g3' "extra debugging info" + '-O1' + '-fno-caller-saves' + '-fno-tree-pre') + ! - ^#('-Wall' - '-m32' - '-msse2' - '-g' - '-O1') - ! Item was changed: ----- Method: Linux64x86w32BitSqueakCogV3Config>>linkerFlags (in category 'compiling') ----- linkerFlags ^#( '-Wl' '-z' 'now' + ) + ! - )! Item was changed: ----- Method: SqueakUnixConfig>>setDirectories: (in category 'cmake') ----- setDirectories: aMaker |temp o| "We could put these inline, but other components include the directories.cmake file. So, we continue that convention" o := String new writeStream. temp := OrderedCollection new. temp addLast: ((CMakeSet new) variable: 'topDir' quotedValue: (self topDir fullName)); addLast: ((CMakeSet new) variable: 'buildDir' quotedValue: (self buildDir ifNil: ['${topDir}/build'] ifNotNil: [self buildDir fullName])); addLast: ((CMakeSet new) variable: 'thirdpartyDir' quotedValue: '${buildDir}/thirdParty'); addLast: ((CMakeSet new) variable: 'platformsDir' quotedValue: (self platformsDir)); addLast: ((CMakeSet new) variable: 'srcDir' quotedValue: (self srcDir pathName)); addLast: ((CMakeSet new) variable: 'srcPluginsDir' quotedValue: (pluginsDir ifNil: [ '${srcDir}/plugins' ])); addLast: ((CMakeSet new) variable: 'srcVMDir' quotedValue: '${srcDir}/vm'); addLast: ((CMakeSet new) variable: 'platformName' quotedValue: (self platformName)); addLast: ((CMakeSet new) variable: 'targetPlatform' quotedValue: '${platformsDir}/${platformName}'); addLast: ((CMakeSet new) variable: 'crossDir' quotedValue: '${platformsDir}/Cross'); addLast: ((CMakeSet new) variable: 'platformVMDir' quotedValue: '${targetPlatform}/vm}'); addLast: ((CMakeSet new) variable: 'outputDir' quotedValue: (self outputDir fullName)); addLast: ((CMakeSet new) variable: 'externalModulesDir' quotedValue: (self externalModulesDir)). temp do: [:each | o nextPutAll: (each content); cr]. self write: (o contents) toFile: 'directories.cmake'. (enabledebugmessages) ifTrue:[ templates addLast:((CMakeMessage new) message: (self class name), ' setDirectories: aMaker' ) ]. templates addLast: ((CMakeInclude new) file: 'directories.cmake'). !

1 0

New Cog VMs available
by Eliot Miranda 19 Jul '14

19 Jul '14

... at http://www.mirandabanda.org/files/Cog/VM/VM.r3048. CogVM source as per VMMaker.oscog-eem.826/r3048 Fix the ZipPlugin (InflatePlugin&DeflatePlugin) to no longer depend on specific instance sizes for ReadStream and WriteStream which allows some leniency in redefining these classes. Fixes occasionaly Monticello commit bugs with large packages after loading Collections-eem.567. Fix compilation warnings in stringForCString: Add a -warnpid flag that causes warning to print the pid; useful in debugging multi-image tests (i.e. magma). Reimplement the backward count in interpreted methods, storing the count in IFrameFlags, hence eliminating the requirement that the jump happens consecutively N times in a single method with no backward jumps in any other method. The Chameneos benchmark has this pattern and so two methods don't get jitted. This eliminates lastBackwardJumpMethod & backwardJumpCount. Spur: Fix bad bug in remapObj: that confused the test for old vs new and hence tried to copyAndForward old objects. Fix bug in processWeaklings that could remember a weak object twice. Mark the methods used by SpurMemoryManager>>globalGarbageCollect as inline: #never for profiling. Spur Newspeak: Initialize numIRCs before checking for quick prims. -- best, Eliot

1 0

[commit][3049] The Newspeak Cog interpreter wasn't regenerated.
by commits＠squeakvm.org 19 Jul '14

19 Jul '14

Revision: 3049 Author: eliot Date: 2014-07-18 18:03:15 -0700 (Fri, 18 Jul 2014) Log Message: ----------- The Newspeak Cog interpreter wasn't regenerated. Needs to be for warnpid. Modified Paths: -------------- branches/Cog/nscogsrc/vm/cointerp.c branches/Cog/nscogsrc/vm/gcc3x-cointerp.c Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-07-19 00:42:28 UTC (rev 3048) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-07-19 01:03:15 UTC (rev 3049) @@ -52655,7 +52655,7 @@ index = longAt(GIV(stackPointer)); if (!((index & 1))) { - GIV(primFailCode) = PrimErrBadArgument; + (GIV(primFailCode) = PrimErrBadArgument); return; } index = (index >> 1); @@ -52820,7 +52820,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } /* begin subscript:with:format: */ @@ -52845,7 +52845,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } value = ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory()) Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-07-19 00:42:28 UTC (rev 3048) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-07-19 01:03:15 UTC (rev 3049) @@ -52664,7 +52664,7 @@ index = longAt(GIV(stackPointer)); if (!((index & 1))) { - GIV(primFailCode) = PrimErrBadArgument; + (GIV(primFailCode) = PrimErrBadArgument); return; } index = (index >> 1); @@ -52829,7 +52829,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } /* begin subscript:with:format: */ @@ -52854,7 +52854,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - GIV(primFailCode) = PrimErrBadIndex; + (GIV(primFailCode) = PrimErrBadIndex); return; } value = ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory())

1 0

[commit][3048] CogVM source as per VMMaker.oscog-eem.826
by commits＠squeakvm.org 19 Jul '14

19 Jul '14

Revision: 3048 Author: eliot Date: 2014-07-18 17:42:28 -0700 (Fri, 18 Jul 2014) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.826 Fix the ZipPlugin (InflatePlugin&DeflatePlugin) to no longer depend on specific instance sizes for ReadStream and WriteStream which allows some leniency in redefining these classes. Fixes occasionaly Monticello commit bugs with large packages after loading Collections-eem.567. Fix compilation warnings in stringForCString: Add a -warnpid flag that causes warning to print the pid; useful in debugging multi-image tests (i.e. magma). Spur: Fix bad bug in remapObj: that confused the test for old vs new and hence tried to copyAndForward old objects. Fix bug in processWeaklings that could remember a weak object twice. Misc: Nuke the sistasrc/plugins directory that was a symbolic link to src/plugins. We deal with this in the makefiles these days. Modified Paths: -------------- branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.xcodeproj/project.pbxproj branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.c 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/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/platforms/Mac OS/vm/sqMacUnixCommandLineInterface.c branches/Cog/platforms/unix/vm/sqUnixMain.c branches/Cog/platforms/win32/vm/sqWin32Intel.c branches/Cog/platforms/win32/vm/sqWin32Window.c 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/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/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/ZipPlugin/ZipPlugin.c 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 Removed Paths: ------------- branches/Cog/sistasrc/plugins Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.xcodeproj/project.pbxproj 2014-07-17 00:21:34 UTC (rev 3047) +++ branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.xcodeproj/project.pbxproj 2014-07-19 00:42:28 UTC (rev 3048) @@ -1455,6 +1455,8 @@ ARCHS = i386; COPY_PHASE_STRIP = NO; DEBUGGING_SYMBOLS = YES; + GCC_DYNAMIC_NO_PIC = YES; + GCC_DYNAMIC_NO_PIC = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 1; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -1482,7 +1484,7 @@ ICC_PREDEFINE_GCC = gcc; INFOPLIST_FILE = CoreVM.plist; MACOSX_DEPLOYMENT_TARGET = 10.5; - OTHER_LDFLAGS = ""; + OTHER_LDFLAGS = "-Wl,-no_pie,-sectalign,__TEXT,__text,2000"; OTHER_REZFLAGS = ""; PRODUCT_NAME = "Newspeak Virtual Machine"; SECTORDER_FLAGS = ""; @@ -1497,6 +1499,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = i386; + GCC_DYNAMIC_NO_PIC = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=0", "USE_GLOBAL_STRUCT=0", @@ -1513,6 +1516,7 @@ ICC_FP_MODEL = src; ICC_OPTLEVEL = size; ICC_OPT_INLINE = dir; + OTHER_LDFLAGS = "-Wl,-no_pie,-sectalign,__TEXT,__text,2000"; SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; }; name = Assert; @@ -1561,7 +1565,7 @@ ICC_PREDEFINE_GCC = gcc; INFOPLIST_FILE = CoreVM.plist; MACOSX_DEPLOYMENT_TARGET = 10.5; - OTHER_LDFLAGS = ""; + OTHER_LDFLAGS = "-Wl,-no_pie,-sectalign,__TEXT,__text,2000"; OTHER_REZFLAGS = ""; PER_ARCH_CFLAGS_i386 = ""; PRODUCT_NAME = "Newspeak Virtual Machine"; @@ -1576,6 +1580,7 @@ buildSettings = { ARCHS = i386; COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = YES; GCC_AUTO_VECTORIZATION = NO; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_SSE3_EXTENSIONS = YES; @@ -1613,7 +1618,7 @@ ICC_PREDEFINE_GCC = gcc; INFOPLIST_FILE = CoreVM.plist; MACOSX_DEPLOYMENT_TARGET = 10.5; - OTHER_LDFLAGS = ""; + OTHER_LDFLAGS = "-Wl,-sectalign,__TEXT,__text,2000"; OTHER_REZFLAGS = ""; PER_ARCH_CFLAGS_i386 = "-O3 -falign-functions=16 -fno-gcse -mtune=prescott -march=pentium4 -mfpmath=sse -finline-functions -Wall -DUSE_INLINE_MEMORY_ACCESSORS"; PRODUCT_NAME = "Newspeak Virtual Machine"; @@ -1630,6 +1635,7 @@ ARCHS = i386; COPY_PHASE_STRIP = NO; DEBUGGING_SYMBOLS = YES; + GCC_DYNAMIC_NO_PIC = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_OPTIMIZATION_LEVEL = 2; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -1658,7 +1664,7 @@ ICC_PREDEFINE_GCC = gcc; INFOPLIST_FILE = CoreVM.plist; MACOSX_DEPLOYMENT_TARGET = 10.5; - OTHER_LDFLAGS = ""; + OTHER_LDFLAGS = "-Wl,-sectalign,__TEXT,__text,2000"; OTHER_REZFLAGS = ""; PRODUCT_NAME = "Newspeak Virtual Machine"; SECTORDER_FLAGS = ""; @@ -1673,6 +1679,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = i386; + GCC_DYNAMIC_NO_PIC = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "DEBUGVM=1", "USE_GLOBAL_STRUCT=0", @@ -1688,6 +1695,7 @@ $SRCROOT, ); ICC_FP_MODEL = src; + OTHER_LDFLAGS = "-Wl,-no_pie,-sectalign,__TEXT,__text,2000"; SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; }; name = Development; @@ -1696,6 +1704,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = i386; + GCC_DYNAMIC_NO_PIC = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "NDEBUG=1", "DEBUGVM=0", @@ -1717,6 +1726,7 @@ ICC_OPT_IPO_FOR_SINGLE_FILE_COMPILATION = YES; ICC_OPT_USE_ARCH_IA32 = archT; ICC_PREDEFINE_GCC = gcc; + OTHER_LDFLAGS = "-Wl,-sectalign,__TEXT,__text,2000"; SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; }; name = Deployment; @@ -1725,6 +1735,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = i386; + GCC_DYNAMIC_NO_PIC = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "NDEBUG=1", "USE_GLOBAL_STRUCT=0", @@ -1740,6 +1751,7 @@ ); ICC_FP_MODEL = src; ICC_OPTLEVEL = speed; + OTHER_LDFLAGS = "-Wl,-sectalign,__TEXT,__text,2000"; SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; }; name = DeploymentSymbols; Modified: branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.xcodeproj/project.pbxproj 2014-07-17 00:21:34 UTC (rev 3047) +++ branches/Cog/build.macos32x86/squeak.cog.spur/CoreVM.xcodeproj/project.pbxproj 2014-07-19 00:42:28 UTC (rev 3048) @@ -7,14 +7,10 @@ objects = { /* Begin PBXBuildFile section */ - 73BC1BBB0F576864003412C5 /* cogit.c in Sources */ = {isa = PBXBuildFile; fileRef = 73BC1BB60F576864003412C5 /* cogit.c */; settings = {COMPILER_FLAGS = "-fno-inline"; }; }; - 73BC1BBC0F576864003412C5 /* cogit.h in Headers */ = {isa = PBXBuildFile; fileRef = 73BC1BB70F576864003412C5 /* cogit.h */; }; - 73BC1BBD0F576864003412C5 /* cogmethod.h in Headers */ = {isa = PBXBuildFile; fileRef = 73BC1BB80F576864003412C5 /* cogmethod.h */; }; - 73BC1BBE0F576864003412C5 /* gcc3x-cointerp.c in Sources */ = {isa = PBXBuildFile; fileRef = 73BC1BB90F576864003412C5 /* gcc3x-cointerp.c */; }; - 73BC1BBF0F576864003412C5 /* cointerp.h in Headers */ = {isa = PBXBuildFile; fileRef = 73BC1BBA0F576864003412C5 /* cointerp.h */; }; 733AC8DB0FEAAC4F007C6206 /* version.c in Sources */ = {isa = PBXBuildFile; fileRef = 733AC8DA0FEAAC4F007C6206 /* version.c */; }; 733B2C37106AB74B004652BE /* sqExternalSemaphores.c in Sources */ = {isa = PBXBuildFile; fileRef = 733B2C36106AB74B004652BE /* sqExternalSemaphores.c */; }; 7351A09B100963670035A878 /* sqUnixThreads.c in Sources */ = {isa = PBXBuildFile; fileRef = 7351A09A100963670035A878 /* sqUnixThreads.c */; }; + 735B4CA30E8069B7008FA2CA /* VMProfileMacSupportPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 735B4CA20E8069B7008FA2CA /* VMProfileMacSupportPlugin.c */; }; 737888E713D0DE6500C5E1AD /* sqMemoryFence.h in Headers */ = {isa = PBXBuildFile; fileRef = 737888E513D0DE6500C5E1AD /* sqMemoryFence.h */; }; 737888E813D0DE6500C5E1AD /* sqSCCSVersion.h in Headers */ = {isa = PBXBuildFile; fileRef = 737888E613D0DE6500C5E1AD /* sqSCCSVersion.h */; }; 738FB1EA0EE4CF94004BEE42 /* ia32abicc.c in Sources */ = {isa = PBXBuildFile; fileRef = 738FB1E90EE4CF94004BEE42 /* ia32abicc.c */; }; @@ -24,6 +20,11 @@ 739C6EDA112DCBD10049B7D3 /* sqAssert.h in Headers */ = {isa = PBXBuildFile; fileRef = 739C6ED8112DCBD10049B7D3 /* sqAssert.h */; }; 73B54C530E55EFED00FE780C /* sqUnixVMProfile.c in Sources */ = {isa = PBXBuildFile; fileRef = 73B54C520E55EFED00FE780C /* sqUnixVMProfile.c */; }; 73B96E490E47D7A10079C51B /* sqUnixHeartbeat.c in Sources */ = {isa = PBXBuildFile; fileRef = 73B96E480E47D7A10079C51B /* sqUnixHeartbeat.c */; }; + 73BC1BBB0F576864003412C5 /* cogit.c in Sources */ = {isa = PBXBuildFile; fileRef = 73BC1BB60F576864003412C5 /* cogit.c */; settings = {COMPILER_FLAGS = "-fno-inline"; }; }; + 73BC1BBC0F576864003412C5 /* cogit.h in Headers */ = {isa = PBXBuildFile; fileRef = 73BC1BB70F576864003412C5 /* cogit.h */; }; + 73BC1BBD0F576864003412C5 /* cogmethod.h in Headers */ = {isa = PBXBuildFile; fileRef = 73BC1BB80F576864003412C5 /* cogmethod.h */; }; + 73BC1BBE0F576864003412C5 /* gcc3x-cointerp.c in Sources */ = {isa = PBXBuildFile; fileRef = 73BC1BB90F576864003412C5 /* gcc3x-cointerp.c */; }; + 73BC1BBF0F576864003412C5 /* cointerp.h in Headers */ = {isa = PBXBuildFile; fileRef = 73BC1BBA0F576864003412C5 /* cointerp.h */; }; 73BC1BC70F57699F003412C5 /* sqCogStackAlignment.h in Headers */ = {isa = PBXBuildFile; fileRef = 73BC1BC60F57699F003412C5 /* sqCogStackAlignment.h */; }; 73DFFAC018D380C200C3C543 /* AioPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 73DFFABF18D380C200C3C543 /* AioPlugin.c */; }; 94002C4409EB18EF003C4BF2 /* sqMemoryAccess.h in Headers */ = {isa = PBXBuildFile; fileRef = 94002C4209EB18EF003C4BF2 /* sqMemoryAccess.h */; }; @@ -240,7 +241,6 @@ A27729590CE7A8D300ABAFCA /* SoundPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = A277292E0CE7A8D300ABAFCA /* SoundPlugin.c */; }; A277295A0CE7A8D300ABAFCA /* StarSqueakPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = A27729300CE7A8D300ABAFCA /* StarSqueakPlugin.c */; }; A277295B0CE7A8D300ABAFCA /* UUIDPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = A27729330CE7A8D300ABAFCA /* UUIDPlugin.c */; }; - 735B4CA30E8069B7008FA2CA /* VMProfileMacSupportPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 735B4CA20E8069B7008FA2CA /* VMProfileMacSupportPlugin.c */; }; A277295D0CE7A8D300ABAFCA /* ZipPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = A27729370CE7A8D300ABAFCA /* ZipPlugin.c */; }; A27729770CE7A9AE00ABAFCA /* sqMacHostWindow.c in Sources */ = {isa = PBXBuildFile; fileRef = A27729750CE7A9AE00ABAFCA /* sqMacHostWindow.c */; }; A27729780CE7A9AE00ABAFCA /* sqMacHostWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = A27729760CE7A9AE00ABAFCA /* sqMacHostWindow.h */; }; @@ -274,6 +274,7 @@ 733AC8DA0FEAAC4F007C6206 /* version.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = version.c; sourceTree = "<group>"; }; 733B2C36106AB74B004652BE /* sqExternalSemaphores.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = sqExternalSemaphores.c; sourceTree = "<group>"; }; 7351A09A100963670035A878 /* sqUnixThreads.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sqUnixThreads.c; path = vm/sqUnixThreads.c; sourceTree = "<group>"; }; + 735B4CA20E8069B7008FA2CA /* VMProfileMacSupportPlugin.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = VMProfileMacSupportPlugin.c; path = VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c; sourceTree = "<group>"; }; 737888E513D0DE6500C5E1AD /* sqMemoryFence.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqMemoryFence.h; sourceTree = "<group>"; }; 737888E613D0DE6500C5E1AD /* sqSCCSVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqSCCSVersion.h; sourceTree = "<group>"; }; 738FB1E90EE4CF94004BEE42 /* ia32abicc.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = ia32abicc.c; path = IA32ABI/ia32abicc.c; sourceTree = "<group>"; }; @@ -383,7 +384,6 @@ A277292E0CE7A8D300ABAFCA /* SoundPlugin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SoundPlugin.c; path = SoundPlugin/SoundPlugin.c; sourceTree = "<group>"; }; A27729300CE7A8D300ABAFCA /* StarSqueakPlugin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = StarSqueakPlugin.c; path = StarSqueakPlugin/StarSqueakPlugin.c; sourceTree = "<group>"; }; A27729330CE7A8D300ABAFCA /* UUIDPlugin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = UUIDPlugin.c; path = UUIDPlugin/UUIDPlugin.c; sourceTree = "<group>"; }; - 735B4CA20E8069B7008FA2CA /* VMProfileMacSupportPlugin.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = VMProfileMacSupportPlugin.c; path = VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c; sourceTree = "<group>"; }; A27729370CE7A8D300ABAFCA /* ZipPlugin.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ZipPlugin.c; path = ZipPlugin/ZipPlugin.c; sourceTree = "<group>"; }; A27729750CE7A9AE00ABAFCA /* sqMacHostWindow.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sqMacHostWindow.c; sourceTree = "<group>"; }; A27729760CE7A9AE00ABAFCA /* sqMacHostWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sqMacHostWindow.h; sourceTree = "<group>"; }; @@ -1366,6 +1366,8 @@ 941A3BFA09AA144000C9D25A /* Frameworks */, 941A3C0409AA144000C9D25A /* Rez */, ); + buildRules = ( + ); name = Squeak; productInstallPath = "$(USER_APPS_DIR)"; productName = "Squeak VM OPT"; @@ -1634,7 +1636,7 @@ ICC_PREDEFINE_GCC = gcc; INFOPLIST_FILE = CoreVM.plist; MACOSX_DEPLOYMENT_TARGET = 10.5; - OTHER_LDFLAGS = ""; + OTHER_LDFLAGS = "-Wl,-no_pie,-sectalign,__TEXT,__text,2000"; OTHER_REZFLAGS = ""; PRODUCT_NAME = Squeak; SECTORDER_FLAGS = ""; @@ -1649,6 +1651,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = i386; + GCC_DYNAMIC_NO_PIC = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "COGMTVM=0", "DEBUGVM=0", @@ -1664,6 +1667,7 @@ ICC_FP_MODEL = src; ICC_OPTLEVEL = size; ICC_OPT_INLINE = dir; + OTHER_LDFLAGS = "-Wl,-no_pie,-sectalign,__TEXT,__text,2000"; SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; }; name = Assert; @@ -1711,7 +1715,7 @@ ICC_PREDEFINE_GCC = gcc; INFOPLIST_FILE = CoreVM.plist; MACOSX_DEPLOYMENT_TARGET = 10.5; - OTHER_LDFLAGS = ""; + OTHER_LDFLAGS = "-Wl,-no_pie,-sectalign,__TEXT,__text,2000"; OTHER_REZFLAGS = ""; PER_ARCH_CFLAGS_i386 = ""; PRODUCT_NAME = Squeak; @@ -1730,7 +1734,6 @@ GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_SSE3_EXTENSIONS = YES; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_MODEL_TUNING = ""; GCC_OPTIMIZATION_LEVEL = 3; GCC_PREPROCESSOR_DEFINITIONS = ( "NDEBUG=1", @@ -1764,7 +1767,7 @@ ICC_PREDEFINE_GCC = gcc; INFOPLIST_FILE = CoreVM.plist; MACOSX_DEPLOYMENT_TARGET = 10.5; - OTHER_LDFLAGS = ""; + OTHER_LDFLAGS = "-Wl,-sectalign,__TEXT,__text,2000"; OTHER_REZFLAGS = ""; PER_ARCH_CFLAGS_i386 = "-O3 -falign-functions=16 -fno-gcse -mtune=prescott -march=pentium4 -mfpmath=sse -finline-functions -Wall -DUSE_INLINE_MEMORY_ACCESSORS"; PRODUCT_NAME = Squeak; @@ -1809,7 +1812,7 @@ ICC_PREDEFINE_GCC = gcc; INFOPLIST_FILE = CoreVM.plist; MACOSX_DEPLOYMENT_TARGET = 10.5; - OTHER_LDFLAGS = ""; + OTHER_LDFLAGS = "-Wl,-sectalign,__TEXT,__text,2000"; OTHER_REZFLAGS = ""; PRODUCT_NAME = Squeak; SECTORDER_FLAGS = ""; @@ -1824,6 +1827,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = i386; + GCC_DYNAMIC_NO_PIC = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "COGMTVM=0", "DEBUGVM=1", @@ -1838,6 +1842,7 @@ $SRCROOT, ); ICC_FP_MODEL = src; + OTHER_LDFLAGS = "-Wl,-no_pie,-sectalign,__TEXT,__text,2000"; SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; }; name = Development; @@ -1846,6 +1851,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = i386; + GCC_DYNAMIC_NO_PIC = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "NDEBUG=1", "COGMTVM=0", @@ -1867,6 +1873,7 @@ ICC_OPT_IPO_FOR_SINGLE_FILE_COMPILATION = YES; ICC_OPT_USE_ARCH_IA32 = archT; ICC_PREDEFINE_GCC = gcc; + OTHER_LDFLAGS = "-Wl,-sectalign,__TEXT,__text,2000"; SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; }; name = Deployment; @@ -1875,6 +1882,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = i386; + GCC_DYNAMIC_NO_PIC = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "NDEBUG=1", "COGMTVM=0", @@ -1889,6 +1897,7 @@ ); ICC_FP_MODEL = src; ICC_OPTLEVEL = speed; + OTHER_LDFLAGS = "-Wl,-sectalign,__TEXT,__text,2000"; SDKROOT = /Developer/SDKs/MacOSX10.5.sdk; }; name = DeploymentSymbols; Modified: branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.c 2014-07-17 00:21:34 UTC (rev 3047) +++ branches/Cog/nscogsrc/plugins/ZipPlugin/ZipPlugin.c 2014-07-19 00:42:28 UTC (rev 3048) @@ -1,9 +1,9 @@ /* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 + VMPluginCodeGenerator VMMaker.oscog-eem.826 uuid: baaa71a3-d71b-4656-be88-ecc3e7b6afe5 from - DeflatePlugin VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 + DeflatePlugin VMMaker.oscog-eem.826 uuid: baaa71a3-d71b-4656-be88-ecc3e7b6afe5 */ -static char __buildInfo[] = "DeflatePlugin VMMaker.oscog-eem.787 uuid: 4b38ebc1-339f-4523-a9fc-047923108211 " __DATE__ ; +static char __buildInfo[] = "DeflatePlugin VMMaker.oscog-eem.826 uuid: baaa71a3-d71b-4656-be88-ecc3e7b6afe5 " __DATE__ ; @@ -54,6 +54,8 @@ /*** Function Prototypes ***/ static sqInt comparewithmin(sqInt here, sqInt matchPos, sqInt minLength); static sqInt deflateBlockchainLengthgoodMatch(sqInt lastIndex, sqInt chainLength, sqInt goodMatch); +static sqInt determineSizeOfReadStream(sqInt rcvr); +static sqInt determineSizeOfWriteStream(sqInt rcvr); static sqInt encodeLiteral(sqInt lit); static sqInt encodeMatchdistance(sqInt length, sqInt dist); static sqInt findMatchlastLengthlastMatchchainLengthgoodMatch(sqInt here, sqInt lastLength, sqInt lastMatch, sqInt maxChainLength, sqInt goodMatch); @@ -86,19 +88,21 @@ #if !defined(SQUEAK_BUILTIN_PLUGIN) static sqInt (*byteSizeOf)(sqInt oop); static sqInt (*failed)(void); +static sqInt (*fetchClassOf)(sqInt oop); static sqInt (*fetchIntegerofObject)(sqInt fieldIndex, sqInt objectPointer); static sqInt (*fetchPointerofObject)(sqInt index, sqInt oop); static void * (*firstIndexableField)(sqInt oop); +static sqInt (*instanceSizeOf)(sqInt classObj); static sqInt (*isBytes)(sqInt oop); static sqInt (*isPointers)(sqInt oop); static sqInt (*isWords)(sqInt oop); static sqInt (*methodArgumentCount)(void); +static sqInt (*nilObject)(void); static sqInt (*pop)(sqInt nItems); static sqInt (*popthenPush)(sqInt nItems, sqInt oop); static sqInt (*positive32BitIntegerFor)(sqInt integerValue); static usqInt (*positive32BitValueOf)(sqInt oop); static sqInt (*primitiveFail)(void); -static sqInt (*push)(sqInt object); static sqInt (*pushBool)(sqInt trueOrFalse); static sqInt (*pushInteger)(sqInt integerValue); static sqInt (*slotSizeOf)(sqInt oop); @@ -106,22 +110,25 @@ static sqInt (*stackObjectValue)(sqInt offset); static sqInt (*stackValue)(sqInt offset); static sqInt (*storeIntegerofObjectwithValue)(sqInt index, sqInt oop, sqInt integer); +static sqInt (*superclassOf)(sqInt classPointer); #else /* !defined(SQUEAK_BUILTIN_PLUGIN) */ extern sqInt byteSizeOf(sqInt oop); extern sqInt failed(void); +extern sqInt fetchClassOf(sqInt oop); extern sqInt fetchIntegerofObject(sqInt fieldIndex, sqInt objectPointer); extern sqInt fetchPointerofObject(sqInt index, sqInt oop); extern void * firstIndexableField(sqInt oop); +extern sqInt instanceSizeOf(sqInt classObj); extern sqInt isBytes(sqInt oop); extern sqInt isPointers(sqInt oop); extern sqInt isWords(sqInt oop); extern sqInt methodArgumentCount(void); +extern sqInt nilObject(void); extern sqInt pop(sqInt nItems); extern sqInt popthenPush(sqInt nItems, sqInt oop); extern sqInt positive32BitIntegerFor(sqInt integerValue); extern usqInt positive32BitValueOf(sqInt oop); extern sqInt primitiveFail(void); -extern sqInt push(sqInt object); extern sqInt pushBool(sqInt trueOrFalse); extern sqInt pushInteger(sqInt integerValue); extern sqInt slotSizeOf(sqInt oop); @@ -129,16 +136,19 @@ extern sqInt stackObjectValue(sqInt offset); extern sqInt stackValue(sqInt offset); extern sqInt storeIntegerofObjectwithValue(sqInt index, sqInt oop, sqInt integer); +extern sqInt superclassOf(sqInt classPointer); extern #endif struct VirtualMachine* interpreterProxy; static const char *moduleName = #ifdef SQUEAK_BUILTIN_PLUGIN - "ZipPlugin VMMaker.oscog-eem.787 (i)" + "ZipPlugin VMMaker.oscog-eem.826 (i)" #else - "ZipPlugin VMMaker.oscog-eem.787 (e)" + "ZipPlugin VMMaker.oscog-eem.826 (e)" #endif ; +static sqInt readStreamInstSize; +static sqInt writeStreamInstSize; static unsigned int zipBaseDistance[] = { /*0*/ 0, 1, 2, 3, 4, 6, 8, 12, 16, 24, 32, 48, 64, 96, 128, 192, 256, 384, 512, 768, /*20*/ 1024, 1536, 2048, 3072, 4096, 6144, 8192, 12288, 16384, 24576 @@ -442,6 +452,48 @@ } +/* Determine the inst size of the class above DeflateStream by + looking for the first class whose inst size is less than 13. */ + +static sqInt +determineSizeOfReadStream(sqInt rcvr) +{ + sqInt class; + + class = fetchClassOf(rcvr); + while ((class != (nilObject())) + && ((instanceSizeOf(class)) >= 13)) { + class = superclassOf(class); + } + if (class == (nilObject())) { + return 0; + } + readStreamInstSize = instanceSizeOf(class); + return 1; +} + + +/* Determine the inst size of the class above DeflateStream or + ZipEncoder by looking for the first class whose inst size is less than 7. */ + +static sqInt +determineSizeOfWriteStream(sqInt rcvr) +{ + sqInt class; + + class = fetchClassOf(rcvr); + while ((class != (nilObject())) + && ((instanceSizeOf(class)) >= 7)) { + class = superclassOf(class); + } + if (class == (nilObject())) { + return 0; + } + writeStreamInstSize = instanceSizeOf(class); + return 1; +} + + /* Encode the given literal */ static sqInt @@ -657,6 +709,15 @@ if (!(isBytes(oop))) { return 0; } + if (writeStreamInstSize == 0) { + if (!(determineSizeOfWriteStream(rcvr))) { + return 0; + } + if ((slotSizeOf(rcvr)) < (writeStreamInstSize + 5)) { + writeStreamInstSize = 0; + return 0; + } + } zipCollection = firstIndexableField(oop); zipCollectionSize = byteSizeOf(oop); zipPosition = fetchIntegerofObject(1, rcvr); @@ -664,49 +725,49 @@ /* zipWriteLimit := interpreterProxy fetchInteger: 3 ofObject: rcvr. */ zipReadLimit = fetchIntegerofObject(2, rcvr); - oop = fetchPointerofObject(4, rcvr); + oop = fetchPointerofObject(writeStreamInstSize + 0, rcvr); if (!((isWords(oop)) && ((slotSizeOf(oop)) == DeflateHashTableSize))) { return 0; } zipHashHead = firstIndexableField(oop); - oop = fetchPointerofObject(5, rcvr); + oop = fetchPointerofObject(writeStreamInstSize + 1, rcvr); if (!((isWords(oop)) && ((slotSizeOf(oop)) == DeflateWindowSize))) { return 0; } zipHashTail = firstIndexableField(oop); - zipHashValue = fetchIntegerofObject(6, rcvr); + zipHashValue = fetchIntegerofObject(writeStreamInstSize + 2, rcvr); - /* zipBlockStart := interpreterProxy fetchInteger: 8 ofObject: rcvr. */ + /* zipBlockStart := interpreterProxy fetchInteger: writeStreamInstSize + 4 ofObject: rcvr. */ - zipBlockPos = fetchIntegerofObject(7, rcvr); - oop = fetchPointerofObject(9, rcvr); + zipBlockPos = fetchIntegerofObject(writeStreamInstSize + 3, rcvr); + oop = fetchPointerofObject(writeStreamInstSize + 5, rcvr); if (!(isBytes(oop))) { return 0; } zipLiteralSize = slotSizeOf(oop); zipLiterals = firstIndexableField(oop); - oop = fetchPointerofObject(10, rcvr); + oop = fetchPointerofObject(writeStreamInstSize + 6, rcvr); if (!((isWords(oop)) && ((slotSizeOf(oop)) >= zipLiteralSize))) { return 0; } zipDistances = firstIndexableField(oop); - oop = fetchPointerofObject(11, rcvr); + oop = fetchPointerofObject(writeStreamInstSize + 7, rcvr); if (!((isWords(oop)) && ((slotSizeOf(oop)) == DeflateMaxLiteralCodes))) { return 0; } zipLiteralFreq = firstIndexableField(oop); - oop = fetchPointerofObject(12, rcvr); + oop = fetchPointerofObject(writeStreamInstSize + 8, rcvr); if (!((isWords(oop)) && ((slotSizeOf(oop)) == DeflateMaxDistanceCodes))) { return 0; } zipDistanceFreq = firstIndexableField(oop); - zipLiteralCount = fetchIntegerofObject(13, rcvr); - zipMatchCount = fetchIntegerofObject(14, rcvr); + zipLiteralCount = fetchIntegerofObject(writeStreamInstSize + 9, rcvr); + zipMatchCount = fetchIntegerofObject(writeStreamInstSize + 10, rcvr); return !(failed()); } @@ -715,8 +776,17 @@ { sqInt oop; + if (writeStreamInstSize == 0) { + if (!(determineSizeOfWriteStream(rcvr))) { + return 0; + } + if ((slotSizeOf(rcvr)) < (writeStreamInstSize + 3)) { + writeStreamInstSize = 0; + return 0; + } + } if (!((isPointers(rcvr)) - && ((slotSizeOf(rcvr)) >= 6))) { + && ((slotSizeOf(rcvr)) >= (writeStreamInstSize + 3)))) { return 0; } oop = fetchPointerofObject(0, rcvr); @@ -730,8 +800,8 @@ /* zipWriteLimit := interpreterProxy fetchInteger: 3 ofObject: rcvr. */ zipReadLimit = fetchIntegerofObject(2, rcvr); - zipBitBuf = fetchIntegerofObject(4, rcvr); - zipBitPos = fetchIntegerofObject(5, rcvr); + zipBitBuf = fetchIntegerofObject(writeStreamInstSize + 1, rcvr); + zipBitPos = fetchIntegerofObject(writeStreamInstSize + 2, rcvr); return !(failed()); } @@ -797,10 +867,10 @@ /* Store back modified values */ - storeIntegerofObjectwithValue(6, rcvr, zipHashValue); - storeIntegerofObjectwithValue(7, rcvr, zipBlockPos); - storeIntegerofObjectwithValue(13, rcvr, zipLiteralCount); - storeIntegerofObjectwithValue(14, rcvr, zipMatchCount); + storeIntegerofObjectwithValue(writeStreamInstSize + 2, rcvr, zipHashValue); + storeIntegerofObjectwithValue(writeStreamInstSize + 3, rcvr, zipBlockPos); + storeIntegerofObjectwithValue(writeStreamInstSize + 9, rcvr, zipLiteralCount); + storeIntegerofObjectwithValue(writeStreamInstSize + 10, rcvr, zipMatchCount); } if (!(failed())) { pop(4); @@ -880,15 +950,24 @@ if (!(isPointers(rcvr))) { return primitiveFail(); } - if ((slotSizeOf(rcvr)) < 9) { + if (readStreamInstSize == 0) { + if (!(determineSizeOfReadStream(rcvr))) { + return primitiveFail(); + } + if ((slotSizeOf(rcvr)) < (readStreamInstSize + 8)) { + readStreamInstSize = 0; + return primitiveFail(); + } + } + if ((slotSizeOf(rcvr)) < (readStreamInstSize + 8)) { return primitiveFail(); } zipReadLimit = fetchIntegerofObject(2, rcvr); - zipState = fetchIntegerofObject(3, rcvr); - zipBitBuf = fetchIntegerofObject(4, rcvr); - zipBitPos = fetchIntegerofObject(5, rcvr); - zipSourcePos = fetchIntegerofObject(7, rcvr); - zipSourceLimit = fetchIntegerofObject(8, rcvr); + zipState = fetchIntegerofObject(readStreamInstSize + 0, rcvr); + zipBitBuf = fetchIntegerofObject(readStreamInstSize + 1, rcvr); + zipBitPos = fetchIntegerofObject(readStreamInstSize + 2, rcvr); + zipSourcePos = fetchIntegerofObject(readStreamInstSize + 4, rcvr); + zipSourceLimit = fetchIntegerofObject(readStreamInstSize + 5, rcvr); if (failed()) { return null; } @@ -907,7 +986,7 @@ /* source */ zipCollectionSize = byteSizeOf(oop); - oop = fetchPointerofObject(6, rcvr); + oop = fetchPointerofObject(readStreamInstSize + 3, rcvr); if (!(isBytes(oop))) { return primitiveFail(); } @@ -921,10 +1000,10 @@ /* store modified values back */ storeIntegerofObjectwithValue(2, rcvr, zipReadLimit + 1); - storeIntegerofObjectwithValue(3, rcvr, zipState); - storeIntegerofObjectwithValue(4, rcvr, zipBitBuf); - storeIntegerofObjectwithValue(5, rcvr, zipBitPos); - storeIntegerofObjectwithValue(7, rcvr, zipSourcePos + 1); + storeIntegerofObjectwithValue(readStreamInstSize + 0, rcvr, zipState); + storeIntegerofObjectwithValue(readStreamInstSize + 1, rcvr, zipBitBuf); + storeIntegerofObjectwithValue(readStreamInstSize + 2, rcvr, zipBitPos); + storeIntegerofObjectwithValue(readStreamInstSize + 4, rcvr, zipSourcePos + 1); pop(2); } } @@ -976,8 +1055,7 @@ s2 = (s2 + s1) % 65521; } adler32 = (((usqInt) s2 << 16)) + s1; - pop(5); - push(positive32BitIntegerFor(adler32)); + popthenPush(5, positive32BitIntegerFor(adler32)); } @@ -1292,8 +1370,8 @@ l7: /* end sendBlock:with:with:with: */; if (!(failed())) { storeIntegerofObjectwithValue(1, rcvr, zipPosition); - storeIntegerofObjectwithValue(4, rcvr, zipBitBuf); - storeIntegerofObjectwithValue(5, rcvr, zipBitPos); + storeIntegerofObjectwithValue(readStreamInstSize + 1, rcvr, zipBitBuf); + storeIntegerofObjectwithValue(readStreamInstSize + 2, rcvr, zipBitPos); } if (!(failed())) { pop(5); @@ -1538,19 +1616,21 @@ #if !defined(SQUEAK_BUILTIN_PLUGIN) byteSizeOf = interpreterProxy->byteSizeOf; failed = interpreterProxy->failed; + fetchClassOf = interpreterProxy->fetchClassOf; fetchIntegerofObject = interpreterProxy->fetchIntegerofObject; fetchPointerofObject = interpreterProxy->fetchPointerofObject; firstIndexableField = interpreterProxy->firstIndexableField; + instanceSizeOf = interpreterProxy->instanceSizeOf; isBytes = interpreterProxy->isBytes; isPointers = interpreterProxy->isPointers; isWords = interpreterProxy->isWords; methodArgumentCount = interpreterProxy->methodArgumentCount; + nilObject = interpreterProxy->nilObject; pop = interpreterProxy->pop; popthenPush = interpreterProxy->popthenPush; positive32BitIntegerFor = interpreterProxy->positive32BitIntegerFor; positive32BitValueOf = interpreterProxy->positive32BitValueOf; primitiveFail = interpreterProxy->primitiveFail; - push = interpreterProxy->push; pushBool = interpreterProxy->pushBool; pushInteger = interpreterProxy->pushInteger; slotSizeOf = interpreterProxy->slotSizeOf; @@ -1558,6 +1638,7 @@ stackObjectValue = interpreterProxy->stackObjectValue; stackValue = interpreterProxy->stackValue; storeIntegerofObjectwithValue = interpreterProxy->storeIntegerofObjectwithValue; + superclassOf = interpreterProxy->superclassOf; #endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */ } return ok; Modified: branches/Cog/nscogsrc/vm/cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.c 2014-07-17 00:21:34 UTC (rev 3047) +++ branches/Cog/nscogsrc/vm/cointerp.c 2014-07-19 00:42:28 UTC (rev 3048) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.826 uuid: baaa71a3-d71b-4656-be88-ecc3e7b6afe5 from - CoInterpreter VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad + CoInterpreter VMMaker.oscog-eem.826 uuid: baaa71a3-d71b-4656-be88-ecc3e7b6afe5 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.826 uuid: baaa71a3-d71b-4656-be88-ecc3e7b6afe5 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -35,25 +35,30 @@ /* StackInterpreter class>>preambleCCode */ /* Disable Intel compiler inlining of warning which is used for breakpoints */ #pragma auto_inline off +sqInt warnpid; void warning(char *s) { /* Print an error message but don't exit. */ - printf("\n%s\n", s); + if (warnpid) + printf("\n%s pid %ld\n", s, warnpid); + else + printf("\n%s\n", s); } void warningat(char *s, int l) { /* ditto with line number. */ -#if 0 - printf("\n%s %d\n", s, l); -#else /* use alloca to call warning so one does not have to remember to set two breakpoints... */ + /* use alloca to call warning so one does not have to remember to set two breakpoints... */ char *sl = alloca(strlen(s) + 16); sprintf(sl, "%s %d", s, l); warning(sl); -#endif } #pragma auto_inline on void -invalidCompactClassError(char *s) { /* Print a compact class index error message and exit. */ +invalidCompactClassError(char *s) { /* Print a (compact) class index error message and exit. */ +#if SPURVM + printf("\nClass %s does not have the required class index\n", s); +#else printf("\nClass %s does not have the required compact class index\n", s); +#endif exit(-1); } @@ -2074,7 +2079,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.823"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.826"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -42932,7 +42937,7 @@ len = strlen(aCString); newString = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord)), len); if (!(newString == null)) { - strncpy(newString + (BaseHeaderSize), aCString, len); + strncpy(((char *) (newString + (BaseHeaderSize))), aCString, len); } return newString; } @@ -52650,7 +52655,7 @@ index = longAt(GIV(stackPointer)); if (!((index & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); + GIV(primFailCode) = PrimErrBadArgument; return; } index = (index >> 1); @@ -52751,11 +52756,11 @@ GIV(primFailCode) = reasonCode; value = 0; l8: /* end stObject:at: */; - (!GIV(primFailCode) - ? (/* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value), - (GIV(stackPointer) = sp)) - : 0); + if (!GIV(primFailCode)) { + /* begin pop:thenPush: */ + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp; + } return; } /* begin externalWriteBackHeadFramePointers */ @@ -52815,7 +52820,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } /* begin subscript:with:format: */ @@ -52840,7 +52845,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } value = ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory()) @@ -53021,11 +53026,11 @@ } value; l7: /* end stObject:at:put: */; - (!GIV(primFailCode) - ? (/* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value), - (GIV(stackPointer) = sp)) - : 0); + if (!GIV(primFailCode)) { + /* begin pop:thenPush: */ + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp; + } return; } /* begin externalWriteBackHeadFramePointers */ @@ -54338,7 +54343,7 @@ assert(pageListIsWellFormed()); if (GIV(fullGCLock) > 0) { - (GIV(primFailCode) = PrimErrInappropriate); + GIV(primFailCode) = PrimErrInappropriate; return; } incrementalGC(); Modified: branches/Cog/nscogsrc/vm/cointerp.h =================================================================== --- branches/Cog/nscogsrc/vm/cointerp.h 2014-07-17 00:21:34 UTC (rev 3047) +++ branches/Cog/nscogsrc/vm/cointerp.h 2014-07-19 00:42:28 UTC (rev 3048) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.826 uuid: baaa71a3-d71b-4656-be88-ecc3e7b6afe5 */ Modified: branches/Cog/nscogsrc/vm/gcc3x-cointerp.c =================================================================== --- branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-07-17 00:21:34 UTC (rev 3047) +++ branches/Cog/nscogsrc/vm/gcc3x-cointerp.c 2014-07-19 00:42:28 UTC (rev 3048) @@ -2,11 +2,11 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.826 uuid: baaa71a3-d71b-4656-be88-ecc3e7b6afe5 from - CoInterpreter VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad + CoInterpreter VMMaker.oscog-eem.826 uuid: baaa71a3-d71b-4656-be88-ecc3e7b6afe5 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.826 uuid: baaa71a3-d71b-4656-be88-ecc3e7b6afe5 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -38,25 +38,30 @@ /* StackInterpreter class>>preambleCCode */ /* Disable Intel compiler inlining of warning which is used for breakpoints */ #pragma auto_inline off +sqInt warnpid; void warning(char *s) { /* Print an error message but don't exit. */ - printf("\n%s\n", s); + if (warnpid) + printf("\n%s pid %ld\n", s, warnpid); + else + printf("\n%s\n", s); } void warningat(char *s, int l) { /* ditto with line number. */ -#if 0 - printf("\n%s %d\n", s, l); -#else /* use alloca to call warning so one does not have to remember to set two breakpoints... */ + /* use alloca to call warning so one does not have to remember to set two breakpoints... */ char *sl = alloca(strlen(s) + 16); sprintf(sl, "%s %d", s, l); warning(sl); -#endif } #pragma auto_inline on void -invalidCompactClassError(char *s) { /* Print a compact class index error message and exit. */ +invalidCompactClassError(char *s) { /* Print a (compact) class index error message and exit. */ +#if SPURVM + printf("\nClass %s does not have the required class index\n", s); +#else printf("\nClass %s does not have the required compact class index\n", s); +#endif exit(-1); } @@ -2077,7 +2082,7 @@ /* 574 */ (void (*)(void))0, /* 575 */ (void (*)(void))0, 0 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.823"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.826"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -42941,7 +42946,7 @@ len = strlen(aCString); newString = instantiateClassindexableSize(longAt((GIV(specialObjectsOop) + BaseHeaderSize) + (ClassByteString << ShiftForWord)), len); if (!(newString == null)) { - strncpy(newString + (BaseHeaderSize), aCString, len); + strncpy(((char *) (newString + (BaseHeaderSize))), aCString, len); } return newString; } @@ -52659,7 +52664,7 @@ index = longAt(GIV(stackPointer)); if (!((index & 1))) { - (GIV(primFailCode) = PrimErrBadArgument); + GIV(primFailCode) = PrimErrBadArgument; return; } index = (index >> 1); @@ -52760,11 +52765,11 @@ GIV(primFailCode) = reasonCode; value = 0; l8: /* end stObject:at: */; - (!GIV(primFailCode) - ? (/* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value), - (GIV(stackPointer) = sp)) - : 0); + if (!GIV(primFailCode)) { + /* begin pop:thenPush: */ + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp; + } return; } /* begin externalWriteBackHeadFramePointers */ @@ -52824,7 +52829,7 @@ stSize = (sp1 >> 1); l2: /* end fetchStackPointerOf: */; if (!(((index >= 1) && (index <= stSize)))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } /* begin subscript:with:format: */ @@ -52849,7 +52854,7 @@ assert((senderOop & 1)); spouseFP = pointerForOop(senderOop - 1); if (!(((index >= 1) && (index <= (stackPointerIndexForFrame(spouseFP)))))) { - (GIV(primFailCode) = PrimErrBadIndex); + GIV(primFailCode) = PrimErrBadIndex; return; } value = ((((usqInt)(longAt(spouseFP + FoxMethod)))) < (startOfMemory()) @@ -53030,11 +53035,11 @@ } value; l7: /* end stObject:at:put: */; - (!GIV(primFailCode) - ? (/* begin pop:thenPush: */ - longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value), - (GIV(stackPointer) = sp)) - : 0); + if (!GIV(primFailCode)) { + /* begin pop:thenPush: */ + longAtput((sp = GIV(stackPointer) + (((GIV(argumentCount) + 1) - 1) * BytesPerWord)), value); + GIV(stackPointer) = sp; + } return; } /* begin externalWriteBackHeadFramePointers */ @@ -54347,7 +54352,7 @@ assert(pageListIsWellFormed()); if (GIV(fullGCLock) > 0) { - (GIV(primFailCode) = PrimErrInappropriate); + GIV(primFailCode) = PrimErrInappropriate; return; } incrementalGC(); Modified: branches/Cog/nscogsrc/vm/interp.h =================================================================== --- branches/Cog/nscogsrc/vm/interp.h 2014-07-17 00:21:34 UTC (rev 3047) +++ branches/Cog/nscogsrc/vm/interp.h 2014-07-19 00:42:28 UTC (rev 3048) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.826 uuid: baaa71a3-d71b-4656-be88-ecc3e7b6afe5 */ #define VM_PROXY_MAJOR 1 Modified: branches/Cog/nscogsrc/vm/vmCallback.h =================================================================== --- branches/Cog/nscogsrc/vm/vmCallback.h 2014-07-17 00:21:34 UTC (rev 3047) +++ branches/Cog/nscogsrc/vm/vmCallback.h 2014-07-19 00:42:28 UTC (rev 3048) @@ -1,5 +1,5 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.823 uuid: 2d337398-d2dd-4715-9476-9a463c29efad + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.826 uuid: baaa71a3-d71b-4656-be88-ecc3e7b6afe5 */ #define VM_CALLBACK_INC 1 Modified: branches/Cog/nsspursrc/vm/cointerp.c =================================================================== --- branches/Cog/nsspursrc/vm/cointerp.c 2014-07-17 00:21:34 UTC (rev 3047) +++ branches/Cog/nsspursrc/vm/cointerp.c 2014-07-19 00:42:28 UTC (rev 3048) @@ -1,9 +1,9 @@ /* Automatically generated by - CCodeGeneratorGlobalStructure VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 + CCodeGeneratorGlobalStructure VMMaker.oscog-eem.826 uuid: baaa71a3-d71b-4656-be88-ecc3e7b6afe5 from - CoInterpreter VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 + CoInterpreter VMMaker.oscog-eem.826 uuid: baaa71a3-d71b-4656-be88-ecc3e7b6afe5 */ -static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.824 uuid: 2f058f16-c0e9-4231-b14a-fe2dadb19735 " __DATE__ ; +static char __buildInfo[] = "CoInterpreter VMMaker.oscog-eem.826 uuid: baaa71a3-d71b-4656-be88-ecc3e7b6afe5 " __DATE__ ; char *__interpBuildInfo = __buildInfo; @@ -35,25 +35,30 @@ /* StackInterpreter class>>preambleCCode */ /* Disable Intel compiler inlining of warning which is used for breakpoints */ #pragma auto_inline off +sqInt warnpid; void warning(char *s) { /* Print an error message but don't exit. */ - printf("\n%s\n", s); + if (warnpid) + printf("\n%s pid %ld\n", s, warnpid); + else + printf("\n%s\n", s); } void warningat(char *s, int l) { /* ditto with line number. */ -#if 0 - printf("\n%s %d\n", s, l); -#else /* use alloca to call warning so one does not have to remember to set two breakpoints... */ + /* use alloca to call warning so one does not have to remember to set two breakpoints... */ char *sl = alloca(strlen(s) + 16); sprintf(sl, "%s %d", s, l); warning(sl); -#endif } #pragma auto_inline on void -invalidCompactClassError(char *s) { /* Print a compact class index error message and exit. */ +invalidCompactClassError(char *s) { /* Print a (compact) class index error message and exit. */ +#if SPURVM + printf("\nClass %s does not have the required class index\n", s); +#else printf("\nClass %s does not have the required compact class index\n", s); +#endif exit(-1); } @@ -2303,7 +2308,7 @@ /*540*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /*560*/ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, 0, 0, 0,-1,-1 }; -const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.824"; +const char *interpreterVersion = "Newspeak Virtual Machine CoInterpreter_VMMaker.oscog-eem.826"; sqInt minBackwardJumpCountForCompile = MinBackwardJumpCountForCompile /* 10 */; volatile int sendTrace; @@ -23858,6 +23863,7 @@ /* begin allOldSpaceObjectsDo: */ /* begin allOldSpaceObjectsFrom:do: */ /* begin allOldSpaceEntitiesFrom:do: */ + assert(isOldObject(GIV(nilObj))); prevPrevObj1 = (prevObj1 = null); objOop11 = GIV(nilObj); while (1) { @@ -25551,6 +25557,7 @@ /* begin allOldSpaceObjectsDo: */ /* begin allOldSpaceObjectsFrom:do: */ /* begin allOldSpaceEntitiesFrom:do: */ + assert(isOldObject(GIV(nilObj))); prevPrevObj1 = (prevObj1 = null); objOop11 = GIV(nilObj); while (1) { @@ -31073,6 +31080,7 @@ /* begin allOldSpaceObjectsDo: */ /* begin allOldSpaceObjectsFrom:do: */ /* begin allOldSpaceEntitiesFrom:do: */ + assert(isOldObject(GIV(nilObj))); prevPrevObj1 = (prevObj1 = null); objOop11 = GIV(nilObj); while (1) { @@ -37906,6 +37914,7 @@ /* begin allOldSpaceObjectsDo: */ /* begin allOldSpaceObjectsFrom:do: */ /* begin allOldSpaceEntitiesFrom:do: */ + assert(isOldObject(GIV(nilObj))); prevPrevObj1 = (prevObj1 = null); objOop11 = GIV(nilObj); while (1) { @@ -38624,6 +38633,7 @@ /* begin allOldSpaceObjectsDo: */ /* begin allOldSpaceObjectsFrom:do: */ /* begin allOldSpaceEntitiesFrom:do: */ + assert(isOldObject(GIV(nilObj))); prevPrevObj1 = (prevObj1 = null); objOop11 = GIV(nilObj); while (1) { @@ -40230,7 +40240,8 @@ } weakObj = referent; if ((processWeakSurvivor(weakObj)) - && (isOldObject(weakObj))) { + && ((isOldObject(weakObj)) + && (!(((((usqInt) (longAt(weakObj))) >> 29) & 1) != 0)))) { remember(weakObj); } /* begin nextCorpseOrNil: */ @@ -40316,6 +40327,7 @@ assert(isNonImmediate(objOop)); assert(!(isYoungObject(objOop))); assert(!(isRemembered(objOop))); + assert(!(isInRememberedSet(objOop))); /* begin setIsRememberedOf:to: */ flag("endianness"); longAtput(objOop, (longAt(objOop)) | (1 << 29)); @@ -41080,6 +41092,7 @@ /* begin allHeapEntitiesDo: */ /* begin allOldSpaceEntitiesDo: */ /* begin allOldSpaceEntitiesFrom:do: */ + assert(isOldObject(GIV(nilObj))); prevPrevObj1 = (prevObj1 = null); objOop1 = GIV(nilObj); while (1) { @@ -41349,6 +41362,7 @@ /* begin allHeapEntitiesDo: */ /* begin allOldSpaceEntitiesDo: */ /* begin allOldSpaceEntitiesFrom:do: */ + assert(isOldObject(GIV(nilObj))); prevPrevObj1 = (prevObj1 = null); objOop1 = GIV(nilObj); while (1) { @@ -41559,6 +41573,7 @@ /* begin allOldSpaceObjectsDo: */ /* begin allOldSpaceObjectsFrom:do: */ /* begin allOldSpaceEntitiesFrom:do: */ + assert(isOldObject(GIV(nilObj))); prevPrevObj1 = (prevObj1 = null); objOop11 = GIV(nilObj); while (1) { @@ -41591,6 +41606,7 @@ /* begin allOldSpaceEntitiesDo: */ /* begin allOldSpaceEntitiesFrom:do: */ + assert(isOldObject(GIV(nilObj))); prevPrevObj = (prevObj = null); objOop = GIV(nilObj); while (1) { @@ -43366,6 +43382,7 @@ /* begin allOldSpaceEntitiesDo: */ /* begin allOldSpaceEntitiesFrom:do: */ + assert(isOldObject(GIV(nilObj))); prevPrevObj1 = (prevObj1 = null); objOop1 = GIV(nilObj); while (1) { @@ -43755,6 +43772,7 @@ freeChunk = GIV(firstFreeChunk); /* begin allOldSpaceEntitiesDo: */ /* begin allOldSpaceEntitiesFrom:do: */ + assert(isOldObject(GIV(nilObj))); prevPrevObj = (prevObj = null); objOop1 = GIV(nilObj); while (1) { @@ -44397,6 +44415,7 @@ /* begin allOldSpaceObjectsDo: */ /* begin allOldSpaceObjectsFrom:do: */ /* begin allOldSpaceEntitiesFrom:do: */ + assert(isOldObject(GIV(nilObj))); prevPrevObj1 = (prevObj1 = null); objOop11 = GIV(nilObj); while (1) { @@ -44812,6 +44831,7 @@ /* begin allOldSpaceObjectsDo: */ /* begin allOldSpaceObjectsFrom:do: */ /* begin allOldSpaceEntitiesFrom:do: */ + assert(isOldObject(GIV(nilObj))); prevPrevObj11 = (prevObj11 = null); objOop11 = GIV(nilObj); while (1) { @@ -44877,6 +44897,7 @@ : GIV(firstFreeChunk)))); firstOfFreeRun = (prevPrevFree = (prevFree = 0)); /* begin allOldSpaceEntitiesFrom:do: */ + assert(isOldObject(lowest)); prevPrevObj1 = (prevObj1 = null); objOop3 = lowest; while (1) { @@ -45612,6 +45633,7 @@ /* begin allOldSpaceObjectsDo: */ /* begin allOldSpaceObjectsFrom:do: */ /* begin allOldSpaceEntitiesFrom:do: */ + assert(isOldObject(GIV(nilObj))); prevPrevObj1 = (prevObj1 = null); objOop11 = GIV(nilObj); while (1) { @@ -45736,6 +45758,7 @@ /* begin allOldSpaceObjectsDo: */ /* begin allOldSpaceObjectsFrom:do: */ /* begin allOldSpaceEntitiesFrom:do: */ + assert(isOldObject(GIV(nilObj))); prevPrevObj1 = (prevObj1 = null); objOop11 = GIV(nilObj); while (1) { @@ -46925,6 +46948,7 @@ /* begin allOldSpaceObjectsDo: */ /* begin allOldSpaceObjectsFrom:do: */ /* begin allOldSpaceEntitiesFrom:do: */ + assert(isOldObject(GIV(nilObj))); prevPrevObj1 = (prevObj1 = null); objOop11 = GIV(nilObj); while (1) { @@ -48115,6 +48139,7 @@ /* begin allHeapEntitiesDo: */ /* begin allOldSpaceEntitiesDo: */ /* begin allOldSpaceEntitiesFrom:do: */ + assert(isOldObject(GIV(nilObj))); prevPrevObj = (prevObj = null); objOop = GIV(nilObj); while (1) { @@ -48321,6 +48346,7 @@ /* begin allOldSpaceObjectsDo: */ /* begin allOldSpaceObjectsFrom:do: */ /* begin allOldSpaceEntitiesFrom:do: */ + assert(isOldObject(GIV(nilObj))); prevPrevObj1 = (prevObj1 = null); objOop11 = GIV(nilObj); while (1) { @@ -49648,6 +49674,7 @@ /* begin allHeapEntitiesDo: */ /* begin allOldSpaceEntitiesDo: */ /* begin allOldSpaceEntitiesFrom:do: */ + assert(isOldObject(GIV(nilObj))); prevPrevObj = (prevObj = null); objOop = GIV(nilObj); while (1) { @@ -50043,6 +50070,7 @@ } /* begin allOldSpaceEntitiesDo: */ /* begin allOldSpaceEntitiesFrom:do: */ + assert(isOldObject(GIV(nilObj))); prevPrevObj1 = (prevObj1 = null); objOop2 = GIV(nilObj); while (1) { @@ -50410,6 +50438,7 @@ /* begin allHeapEntitiesDo: */ /* begin allOldSpaceEntitiesDo: */ /* begin allOldSpaceEntitiesFrom:do: */ + assert(isOldObject(GIV(nilObj))); prevPrevObj = (prevObj = null); objOop1 = GIV(nilObj); while (1) { @@ -50558,6 +50587,7 @@ /* begin allOldSpaceEntitiesDo: */ /* begin allOldSpaceEntitiesFrom:do: */ + assert(isOldObject(GIV(nilObj))); prevPrevObj1 = (prevObj1 = null); objOop1 = GIV(nilObj); while (1) { @@ -50698,6 +50728,7 @@ /* begin allHeapEntitiesDo: */ /* begin allOldSpaceEntitiesDo: */ /* begin allOldSpaceEntitiesFrom:do: */ + assert(isOldObject(GIV(nilObj))); prevPrevObj = (prevObj = null); objOop = GIV(nilObj); while (1) { @@ -50863,6 +50894,7 @@ /* begin allOldSpaceObjectsDo: */ /* begin allOldSpaceObjectsFrom:do: */ /* begin allOldSpaceEntitiesFrom:do: */ + assert(isOldObject(GIV(nilObj))); prevPrevObj1 = (prevObj1 = null); objOop11 = GIV(nilObj); while (1) { @@ -51251,6 +51283,7 @@ /* begin allOldSpaceObjectsDo: */ /* begin allOldSpaceObjectsFrom:do: */ /* begin allOldSpaceEntitiesFrom:do: */ + assert(isOldObject(GIV(nilObj))); prevPrevObj1 = (prevObj1 = null); objOop11 = GIV(nilObj); while (1) { @@ -51472,15 +51505,15 @@ else { resolvedObj = objOop; } - if (!(GIV(scavengeInProgress) - && (((resolvedObj & 3) == 0) - && (isReallyYoungObject(resolvedObj))))) { + if (GIV(scavengeInProgress) + && (((resolvedObj & 3) == 0) + && (isReallyYoungObject(resolvedObj)))) { /* a becommed or compacted object whose target is in old space, or a CogMethod. */ - return resolvedObj; + return copyAndForward(resolvedObj); } - return copyAndForward(resolvedObj); + return resolvedObj; } @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.826.mcz
by commits＠source.squeak.org 19 Jul '14

19 Jul '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.826.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.826 Author: eem Time: 18 July 2014, 5:25:22.251 pm UUID: baaa71a3-d71b-4656-be88-ecc3e7b6afe5 Ancestors: VMMaker.oscog-eem.825 Fix the ZipPlugin (InflatePlugin&DeflatePlugin) to no longer depend on specific instance sizes for ReadStream and WriteStream which allows some leniency in redefining these classes. =============== Diff against VMMaker.oscog-eem.825 =============== Item was changed: InflatePlugin subclass: #DeflatePlugin + instanceVariableNames: 'zipHashHead zipHashTail zipHashValue zipBlockPos zipBlockStart zipLiterals zipDistances zipLiteralFreq zipDistanceFreq zipLiteralCount zipLiteralSize zipMatchCount zipMatchLengthCodes zipDistanceCodes zipCrcTable zipExtraLengthBits zipExtraDistanceBits zipBaseLength zipBaseDistance writeStreamInstSize' - instanceVariableNames: 'zipHashHead zipHashTail zipHashValue zipBlockPos zipBlockStart zipLiterals zipDistances zipLiteralFreq zipDistanceFreq zipLiteralCount zipLiteralSize zipMatchCount zipMatchLengthCodes zipDistanceCodes zipCrcTable zipExtraLengthBits zipExtraDistanceBits zipBaseLength zipBaseDistance' classVariableNames: 'DeflateHashBits DeflateHashMask DeflateHashShift DeflateHashTableSize DeflateMaxDistance DeflateMaxDistanceCodes DeflateMaxLiteralCodes DeflateMaxMatch DeflateMinMatch DeflateWindowMask DeflateWindowSize' poolDictionaries: '' category: 'VMMaker-Plugins'! !DeflatePlugin commentStamp: 'tpr 5/5/2003 11:52' prior: 0! This adds Zip deflating support. InflatePlugin should not be translated but this subclass should since it is incorporated within that class's translation process! Item was added: + ----- Method: DeflatePlugin>>determineSizeOfWriteStream: (in category 'primitive support') ----- + determineSizeOfWriteStream: rcvr + "Determine the inst size of the class above DeflateStream or + ZipEncoder by looking for the first class whose inst size is less than 7." + | class | + class := interpreterProxy fetchClassOf: rcvr. + [class ~= interpreterProxy nilObject + and: [(interpreterProxy instanceSizeOf: class) >= 7]] whileTrue: + [class := interpreterProxy superclassOf: class]. + class = interpreterProxy nilObject ifTrue: + [^false]. + writeStreamInstSize := interpreterProxy instanceSizeOf: class. + ^true + ! Item was added: + ----- Method: DeflatePlugin>>initialize (in category 'initialize-release') ----- + initialize + writeStreamInstSize := 0! Item was changed: ----- Method: DeflatePlugin>>loadDeflateStreamFrom: (in category 'primitive support') ----- loadDeflateStreamFrom: rcvr | oop | <inline: false> ((interpreterProxy isPointers: rcvr) and: [(interpreterProxy slotSizeOf: rcvr) >= 15]) ifFalse: [^false]. oop := interpreterProxy fetchPointer: 0 ofObject: rcvr. (interpreterProxy isBytes: oop) ifFalse: [^false]. + writeStreamInstSize = 0 ifTrue: + [(self determineSizeOfWriteStream: rcvr) ifFalse: + [^false]. + "If the receiver wasn't valid then we derived writeStreamInstSize from an invalid source. discard it." + (interpreterProxy slotSizeOf: rcvr) < (writeStreamInstSize + 5) ifTrue: + [writeStreamInstSize := 0. + ^false]]. zipCollection := interpreterProxy firstIndexableField: oop. zipCollectionSize := interpreterProxy byteSizeOf: oop. zipPosition := interpreterProxy fetchInteger: 1 ofObject: rcvr. zipReadLimit := interpreterProxy fetchInteger: 2 ofObject: rcvr. "zipWriteLimit := interpreterProxy fetchInteger: 3 ofObject: rcvr." + oop := interpreterProxy fetchPointer: writeStreamInstSize + 0 ofObject: rcvr. - oop := interpreterProxy fetchPointer: 4 ofObject: rcvr. ((interpreterProxy isWords: oop) and: [(interpreterProxy slotSizeOf: oop) = DeflateHashTableSize]) ifFalse: [^false]. zipHashHead := interpreterProxy firstIndexableField: oop. + oop := interpreterProxy fetchPointer: writeStreamInstSize + 1 ofObject: rcvr. - oop := interpreterProxy fetchPointer: 5 ofObject: rcvr. ((interpreterProxy isWords: oop) and: [(interpreterProxy slotSizeOf: oop) = DeflateWindowSize]) ifFalse: [^false]. zipHashTail := interpreterProxy firstIndexableField: oop. + zipHashValue := interpreterProxy fetchInteger: writeStreamInstSize + 2 ofObject: rcvr. + zipBlockPos := interpreterProxy fetchInteger: writeStreamInstSize + 3 ofObject: rcvr. + "zipBlockStart := interpreterProxy fetchInteger: writeStreamInstSize + 4 ofObject: rcvr." + oop := interpreterProxy fetchPointer: writeStreamInstSize + 5 ofObject: rcvr. - zipHashValue := interpreterProxy fetchInteger: 6 ofObject: rcvr. - zipBlockPos := interpreterProxy fetchInteger: 7 ofObject: rcvr. - "zipBlockStart := interpreterProxy fetchInteger: 8 ofObject: rcvr." - oop := interpreterProxy fetchPointer: 9 ofObject: rcvr. (interpreterProxy isBytes: oop) ifFalse: [^false]. zipLiteralSize := interpreterProxy slotSizeOf: oop. zipLiterals := interpreterProxy firstIndexableField: oop. + oop := interpreterProxy fetchPointer: writeStreamInstSize + 6 ofObject: rcvr. - oop := interpreterProxy fetchPointer: 10 ofObject: rcvr. ((interpreterProxy isWords: oop) and: [(interpreterProxy slotSizeOf: oop) >= zipLiteralSize]) ifFalse: [^false]. zipDistances := interpreterProxy firstIndexableField: oop. + oop := interpreterProxy fetchPointer: writeStreamInstSize + 7 ofObject: rcvr. - oop := interpreterProxy fetchPointer: 11 ofObject: rcvr. ((interpreterProxy isWords: oop) and: [(interpreterProxy slotSizeOf: oop) = DeflateMaxLiteralCodes]) ifFalse: [^false]. zipLiteralFreq := interpreterProxy firstIndexableField: oop. + oop := interpreterProxy fetchPointer: writeStreamInstSize + 8 ofObject: rcvr. - oop := interpreterProxy fetchPointer: 12 ofObject: rcvr. ((interpreterProxy isWords: oop) and: [(interpreterProxy slotSizeOf: oop) = DeflateMaxDistanceCodes]) ifFalse: [^false]. zipDistanceFreq := interpreterProxy firstIndexableField: oop. + zipLiteralCount := interpreterProxy fetchInteger: writeStreamInstSize + 9 ofObject: rcvr. + zipMatchCount := interpreterProxy fetchInteger: writeStreamInstSize + 10 ofObject: rcvr. - zipLiteralCount := interpreterProxy fetchInteger: 13 ofObject: rcvr. - zipMatchCount := interpreterProxy fetchInteger: 14 ofObject: rcvr. ^interpreterProxy failed not! Item was changed: ----- Method: DeflatePlugin>>loadZipEncoderFrom: (in category 'primitive support') ----- loadZipEncoderFrom: rcvr | oop | <inline: false> + writeStreamInstSize = 0 ifTrue: + [(self determineSizeOfWriteStream: rcvr) ifFalse: + [^false]. + "If the receiver wasn't valid then we derived writeStreamInstSize from an invalid source. discard it." + (interpreterProxy slotSizeOf: rcvr) < (writeStreamInstSize + 3) ifTrue: + [writeStreamInstSize := 0. + ^false]]. ((interpreterProxy isPointers: rcvr) + and: [(interpreterProxy slotSizeOf: rcvr) >= (writeStreamInstSize + 3)]) ifFalse: - and: [(interpreterProxy slotSizeOf: rcvr) >= 6]) ifFalse: [^false]. oop := interpreterProxy fetchPointer: 0 ofObject: rcvr. (interpreterProxy isBytes: oop) ifFalse: [^interpreterProxy primitiveFail]. zipCollection := interpreterProxy firstIndexableField: oop. zipCollectionSize := interpreterProxy byteSizeOf: oop. zipPosition := interpreterProxy fetchInteger: 1 ofObject: rcvr. zipReadLimit := interpreterProxy fetchInteger: 2 ofObject: rcvr. "zipWriteLimit := interpreterProxy fetchInteger: 3 ofObject: rcvr." + zipBitBuf := interpreterProxy fetchInteger: writeStreamInstSize + 1 ofObject: rcvr. + zipBitPos := interpreterProxy fetchInteger: writeStreamInstSize + 2 ofObject: rcvr. - zipBitBuf := interpreterProxy fetchInteger: 4 ofObject: rcvr. - zipBitPos := interpreterProxy fetchInteger: 5 ofObject: rcvr. ^interpreterProxy failed not! Item was changed: ----- Method: DeflatePlugin>>primitiveDeflateBlock (in category 'primitives') ----- primitiveDeflateBlock "Primitive. Deflate the current contents of the receiver." | goodMatch chainLength lastIndex rcvr result | <export: true> <inline: false> interpreterProxy methodArgumentCount = 3 ifFalse:[^interpreterProxy primitiveFail]. goodMatch := interpreterProxy stackIntegerValue: 0. chainLength := interpreterProxy stackIntegerValue: 1. lastIndex := interpreterProxy stackIntegerValue: 2. rcvr := interpreterProxy stackObjectValue: 3. interpreterProxy failed ifTrue:[^nil]. self cCode:'' inSmalltalk:[ zipMatchLengthCodes := CArrayAccessor on: ZipWriteStream matchLengthCodes. zipDistanceCodes := CArrayAccessor on: ZipWriteStream distanceCodes]. (self loadDeflateStreamFrom: rcvr) ifFalse:[^interpreterProxy primitiveFail]. result := self deflateBlock: lastIndex chainLength: chainLength goodMatch: goodMatch. interpreterProxy failed ifFalse:[ "Store back modified values" + interpreterProxy storeInteger: writeStreamInstSize + 2 ofObject: rcvr withValue: zipHashValue. + interpreterProxy storeInteger: writeStreamInstSize + 3 ofObject: rcvr withValue: zipBlockPos. + interpreterProxy storeInteger: writeStreamInstSize + 9 ofObject: rcvr withValue: zipLiteralCount. + interpreterProxy storeInteger: writeStreamInstSize + 10 ofObject: rcvr withValue: zipMatchCount]. - interpreterProxy storeInteger: 6 ofObject: rcvr withValue: zipHashValue. - interpreterProxy storeInteger: 7 ofObject: rcvr withValue: zipBlockPos. - interpreterProxy storeInteger: 13 ofObject: rcvr withValue: zipLiteralCount. - interpreterProxy storeInteger: 14 ofObject: rcvr withValue: zipMatchCount]. interpreterProxy failed ifFalse:[ interpreterProxy pop: 4. interpreterProxy pushBool: result. ].! Item was changed: ----- Method: DeflatePlugin>>primitiveUpdateAdler32 (in category 'primitives') ----- primitiveUpdateAdler32 "Primitive. Update a 32bit CRC value." | collection stopIndex startIndex length bytePtr s1 adler32 s2 b | <export: true> <var: #adler32 type:'unsigned int '> <var: #bytePtr type:'unsigned char *'> interpreterProxy methodArgumentCount = 4 ifFalse:[^interpreterProxy primitiveFail]. collection := interpreterProxy stackObjectValue: 0. stopIndex := interpreterProxy stackIntegerValue: 1. startIndex := interpreterProxy stackIntegerValue: 2. adler32 := interpreterProxy positive32BitValueOf: (interpreterProxy stackValue: 3). interpreterProxy failed ifTrue:[^0]. ((interpreterProxy isBytes: collection) and:[stopIndex >= startIndex and:[startIndex > 0]]) ifFalse:[^interpreterProxy primitiveFail]. length := interpreterProxy byteSizeOf: collection. (stopIndex <= length) ifFalse:[^interpreterProxy primitiveFail]. bytePtr := interpreterProxy firstIndexableField: collection. startIndex := startIndex - 1. stopIndex := stopIndex - 1. s1 := adler32 bitAnd: 16rFFFF. s2 := (adler32 >> 16) bitAnd: 16rFFFF. startIndex to: stopIndex do:[:i| b := bytePtr at: i. s1 := (s1 + b) \\ 65521. s2 := (s2 + s1) \\ 65521. ]. adler32 := (s2 bitShift: 16) + s1. + interpreterProxy + pop: 5 "args + rcvr" + thenPush: (interpreterProxy positive32BitIntegerFor: adler32)! - interpreterProxy pop: 5. "args + rcvr" - interpreterProxy push: (interpreterProxy positive32BitIntegerFor: adler32).! Item was changed: ----- Method: DeflatePlugin>>primitiveZipSendBlock (in category 'primitives') ----- primitiveZipSendBlock | distTree litTree distStream litStream rcvr result | <export: true> interpreterProxy methodArgumentCount = 4 ifFalse:[^interpreterProxy primitiveFail]. distTree := interpreterProxy stackObjectValue: 0. litTree := interpreterProxy stackObjectValue: 1. distStream := interpreterProxy stackObjectValue: 2. litStream := interpreterProxy stackObjectValue: 3. rcvr := interpreterProxy stackObjectValue: 4. interpreterProxy failed ifTrue:[^nil]. (self loadZipEncoderFrom: rcvr) ifFalse:[^interpreterProxy primitiveFail]. ((interpreterProxy isPointers: distTree) and:[ (interpreterProxy slotSizeOf: distTree) >= 2]) ifFalse:[^interpreterProxy primitiveFail]. ((interpreterProxy isPointers: litTree) and:[ (interpreterProxy slotSizeOf: litTree) >= 2]) ifFalse:[^interpreterProxy primitiveFail]. ((interpreterProxy isPointers: litStream) and:[ (interpreterProxy slotSizeOf: litStream) >= 3]) ifFalse:[^interpreterProxy primitiveFail]. ((interpreterProxy isPointers: distStream) and:[ (interpreterProxy slotSizeOf: distStream) >= 3]) ifFalse:[^interpreterProxy primitiveFail]. self cCode:'' inSmalltalk:[ zipMatchLengthCodes := CArrayAccessor on: ZipWriteStream matchLengthCodes. zipDistanceCodes := CArrayAccessor on: ZipWriteStream distanceCodes. zipExtraLengthBits := CArrayAccessor on: ZipWriteStream extraLengthBits. zipExtraDistanceBits := CArrayAccessor on: ZipWriteStream extraDistanceBits. zipBaseLength := CArrayAccessor on: ZipWriteStream baseLength. zipBaseDistance := CArrayAccessor on: ZipWriteStream baseDistance]. result := self sendBlock: litStream with: distStream with: litTree with: distTree. interpreterProxy failed ifFalse:[ interpreterProxy storeInteger: 1 ofObject: rcvr withValue: zipPosition. + interpreterProxy storeInteger: readStreamInstSize + 1 ofObject: rcvr withValue: zipBitBuf. + interpreterProxy storeInteger: readStreamInstSize + 2 ofObject: rcvr withValue: zipBitPos. - interpreterProxy storeInteger: 4 ofObject: rcvr withValue: zipBitBuf. - interpreterProxy storeInteger: 5 ofObject: rcvr withValue: zipBitPos. ]. interpreterProxy failed ifFalse:[ interpreterProxy pop: 5. "rcvr + args" interpreterProxy pushInteger: result. ].! Item was changed: InterpreterPlugin subclass: #InflatePlugin + instanceVariableNames: 'zipCollection zipReadLimit zipPosition zipState zipBitBuf zipBitPos zipSource zipSourcePos zipSourceLimit zipLitTable zipDistTable zipCollectionSize zipLitTableSize zipDistTableSize readStreamInstSize' - instanceVariableNames: 'zipCollection zipReadLimit zipPosition zipState zipBitBuf zipBitPos zipSource zipSourcePos zipSourceLimit zipLitTable zipDistTable zipCollectionSize zipLitTableSize zipDistTableSize' classVariableNames: 'MaxBits StateNoMoreData' poolDictionaries: '' category: 'VMMaker-Plugins'! !InflatePlugin commentStamp: '<historical>' prior: 0! This plugin implements the one crucial function for efficiently decompressing streams.! Item was added: + ----- Method: InflatePlugin>>determineSizeOfReadStream: (in category 'primitive support') ----- + determineSizeOfReadStream: rcvr + "Determine the inst size of the class above DeflateStream by + looking for the first class whose inst size is less than 13." + | class | + class := interpreterProxy fetchClassOf: rcvr. + [class ~= interpreterProxy nilObject + and: [(interpreterProxy instanceSizeOf: class) >= 13]] whileTrue: + [class := interpreterProxy superclassOf: class]. + class = interpreterProxy nilObject ifTrue: + [^false]. + readStreamInstSize := interpreterProxy instanceSizeOf: class. + ^true! Item was added: + ----- Method: InflatePlugin>>initialize (in category 'initialize-release') ----- + initialize + readStreamInstSize := 0! Item was changed: ----- Method: InflatePlugin>>primitiveInflateDecompressBlock (in category 'primitives') ----- primitiveInflateDecompressBlock "Primitive. Inflate a single block." | oop rcvr | <export: true> interpreterProxy methodArgumentCount = 2 ifFalse: [^interpreterProxy primitiveFail]. "distance table" oop := interpreterProxy stackValue: 0. (interpreterProxy isWords: oop) ifFalse: [^interpreterProxy primitiveFail]. zipDistTable := interpreterProxy firstIndexableField: oop. zipDistTableSize := interpreterProxy slotSizeOf: oop. "literal table" oop := interpreterProxy stackValue: 1. (interpreterProxy isWords: oop) ifFalse: [^interpreterProxy primitiveFail]. zipLitTable := interpreterProxy firstIndexableField: oop. zipLitTableSize := interpreterProxy slotSizeOf: oop. "Receiver (InflateStream)" rcvr := interpreterProxy stackValue: 2. (interpreterProxy isPointers: rcvr) ifFalse: [^interpreterProxy primitiveFail]. - (interpreterProxy slotSizeOf: rcvr) < 9 - ifTrue:[^interpreterProxy primitiveFail]. - "All the integer instvars" + readStreamInstSize = 0 ifTrue: + [(self determineSizeOfReadStream: rcvr) ifFalse: + [^interpreterProxy primitiveFail]. + "If the receiver wasn't valid then we derived readStreamInstSize from an invalid source. discard it." + (interpreterProxy slotSizeOf: rcvr) < (readStreamInstSize + 8) ifTrue: + [readStreamInstSize := 0. + ^interpreterProxy primitiveFail]]. + (interpreterProxy slotSizeOf: rcvr) < (readStreamInstSize + 8) ifTrue: + [^interpreterProxy primitiveFail]. + zipReadLimit := interpreterProxy fetchInteger: 2 ofObject: rcvr. + zipState := interpreterProxy fetchInteger: readStreamInstSize + 0 ofObject: rcvr. + zipBitBuf := interpreterProxy fetchInteger: readStreamInstSize + 1 ofObject: rcvr. + zipBitPos := interpreterProxy fetchInteger: readStreamInstSize + 2 ofObject: rcvr. + zipSourcePos := interpreterProxy fetchInteger: readStreamInstSize + 4 ofObject: rcvr. + zipSourceLimit := interpreterProxy fetchInteger: readStreamInstSize + 5 ofObject: rcvr. - zipState := interpreterProxy fetchInteger: 3 ofObject: rcvr. - zipBitBuf := interpreterProxy fetchInteger: 4 ofObject: rcvr. - zipBitPos := interpreterProxy fetchInteger: 5 ofObject: rcvr. - zipSourcePos := interpreterProxy fetchInteger: 7 ofObject: rcvr. - zipSourceLimit := interpreterProxy fetchInteger: 8 ofObject: rcvr. interpreterProxy failed ifTrue:[^nil]. zipReadLimit := zipReadLimit - 1. zipSourcePos := zipSourcePos - 1. zipSourceLimit := zipSourceLimit - 1. "collection" oop := interpreterProxy fetchPointer: 0 ofObject: rcvr. (interpreterProxy isBytes: oop) ifFalse: [^interpreterProxy primitiveFail]. zipCollection := interpreterProxy firstIndexableField: oop. zipCollectionSize := interpreterProxy byteSizeOf: oop. "source" + oop := interpreterProxy fetchPointer: readStreamInstSize + 3 ofObject: rcvr. - oop := interpreterProxy fetchPointer: 6 ofObject: rcvr. (interpreterProxy isBytes: oop) ifFalse: [^interpreterProxy primitiveFail]. zipSource := interpreterProxy firstIndexableField: oop. "do the primitive" self zipDecompressBlock. interpreterProxy failed ifFalse: "store modified values back" [interpreterProxy storeInteger: 2 ofObject: rcvr withValue: zipReadLimit + 1. + interpreterProxy storeInteger: readStreamInstSize + 0 ofObject: rcvr withValue: zipState. + interpreterProxy storeInteger: readStreamInstSize + 1 ofObject: rcvr withValue: zipBitBuf. + interpreterProxy storeInteger: readStreamInstSize + 2 ofObject: rcvr withValue: zipBitPos. + interpreterProxy storeInteger: readStreamInstSize + 4 ofObject: rcvr withValue: zipSourcePos + 1. - interpreterProxy storeInteger: 3 ofObject: rcvr withValue: zipState. - interpreterProxy storeInteger: 4 ofObject: rcvr withValue: zipBitBuf. - interpreterProxy storeInteger: 5 ofObject: rcvr withValue: zipBitPos. - interpreterProxy storeInteger: 7 ofObject: rcvr withValue: zipSourcePos + 1. interpreterProxy pop: 2]!

1 0

VM Maker: VMMaker.oscog-eem.825.mcz
by commits＠source.squeak.org 19 Jul '14

19 Jul '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.825.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.825 Author: eem Time: 18 July 2014, 5:11:54.902 pm UUID: 878e9947-131b-4e62-9126-37e8f11f4b2b Ancestors: VMMaker.oscog-eem.824 Spur: Fix bad bug in remapObj: that confused the test for old vs new and hence tried to copyAndForward old objects. Fix bug in processWeaklings that could remember a weak object twice. General: Fix compilation warnings in stringForCString: Add a warnpid variable that prnts the pid in warnings, useful in debugging multi-image tests (i.e. magma). =============== Diff against VMMaker.oscog-eem.824 =============== Item was changed: ----- Method: ObjectMemory>>stringForCString: (in category 'primitive support') ----- stringForCString: aCString "Answer a new String copied from a null-terminated C string, or nil if out of memory. Caution: This may invoke the garbage collector." <api> <var: 'aCString' type: 'const char *'> <inline: false> | len newString | len := self strlen: aCString. newString := self instantiateClass: (self splObj: ClassByteString) indexableSize: len. newString ifNotNil: + [self st: (self cCoerceSimple: newString + self baseHeaderSize to: #'char *') - [self st: newString + self baseHeaderSize rn: aCString cpy: len]. "(char *)strncpy()" ^newString! Item was changed: ----- Method: SpurGenerationScavenger>>processWeaklings (in category 'weakness and ephemerality') ----- processWeaklings "Go through the remembered set and the weak list, nilling references to any objects that didn't survive the scavenge. Read the class comment for a more in-depth description of the algorithm." <inline: false> | i rootObj weakCorpse weakObj | self assert: self allWeakSurvivorsOnWeakList. i := 0. [i < rememberedSetSize] whileTrue: [rootObj := rememberedSet at: i. (manager isWeakNonImm: rootObj) ifTrue: ["If no more referents, remove by overwriting with the last element in the set." (self processWeakSurvivor: rootObj) ifFalse: [manager setIsRememberedOf: rootObj to: false. i + 1 < rememberedSetSize ifTrue: [rememberedSet at: i put: (rememberedSet at: rememberedSetSize - 1)]. rememberedSetSize := rememberedSetSize - 1] ifTrue: [i := i + 1]] ifFalse: [i := i + 1]]. weakList ifNotNil: [weakCorpse := self firstCorpse: weakList. [weakCorpse notNil] whileTrue: [self assert: (manager isForwarded: weakCorpse). weakObj := manager followForwarded: weakCorpse. "weakObj may have been tenured..." ((self processWeakSurvivor: weakObj) + and: [(manager isOldObject: weakObj) + and: [(manager isRemembered: weakObj) not]]) ifTrue: - and: [manager isOldObject: weakObj]) ifTrue: [self remember: weakObj]. weakCorpse := self nextCorpseOrNil: weakCorpse]. weakList := nil]! Item was changed: ----- Method: SpurGenerationScavenger>>remember: (in category 'store check') ----- remember: objOop "Add the argument to the remembered set and set its isRemembered bit to true. Answer the argument for the benefit of the Cogit." <api> <inline: false> self assert: (manager isNonImmediate: objOop). self assert: (manager isYoungObject: objOop) not. self assert: (manager isRemembered: objOop) not. + self assert: (manager isInRememberedSet: objOop) not. manager setIsRememberedOf: objOop to: true. rememberedSetSize < RememberedSetLimit ifTrue: [rememberedSet at: rememberedSetSize put: objOop. (rememberedSetSize := rememberedSetSize + 1) >= RememberedSetRedZone ifTrue: [manager scheduleScavenge]] ifFalse: [self error: 'remembered set overflow' "for now"]. ^objOop! Item was changed: CogClass subclass: #SpurMemoryManager (excessive size, no diff calculated) Item was changed: ----- Method: SpurMemoryManager>>allOldSpaceEntitiesFrom:do: (in category 'object enumeration') ----- allOldSpaceEntitiesFrom: initialObject do: aBlock <inline: true> | prevObj prevPrevObj objOop | + self assert: (self isOldObject: initialObject). prevPrevObj := prevObj := nil. objOop := initialObject. [self assert: objOop \\ self allocationUnit = 0. self oop: objOop isLessThan: endOfMemory] whileTrue: [self assert: (self long64At: objOop) ~= 0. aBlock value: objOop. prevPrevObj := prevObj. prevObj := objOop. objOop := self objectAfter: objOop limit: endOfMemory]. self touch: prevPrevObj. self touch: prevObj! Item was changed: ----- Method: SpurMemoryManager>>remapObj: (in category 'gc - scavenging') ----- remapObj: objOop "Scavenge or simply follow objOop. Answer the new location of objOop. The send should have been guarded by a send of shouldRemapOop:. The method is called remapObj: for compatibility with ObjectMemory." <api> <inline: false> | resolvedObj | self assert: (self shouldRemapOop: objOop). (self isForwarded: objOop) ifTrue: [resolvedObj := self followForwarded: objOop. (self isInFutureSpace: resolvedObj) ifTrue: "already scavenged" [^resolvedObj]] ifFalse: [resolvedObj := objOop]. (scavengeInProgress + and: [self isReallyYoung: resolvedObj]) ifTrue: "a becommed or compacted object whose target is in old space, or a CogMethod." + [^scavenger copyAndForward: resolvedObj]. + ^resolvedObj! - and: [self isReallyYoung: resolvedObj]) ifFalse: "a becommed or compacted object whose target is in old space, or a CogMethod." - [^resolvedObj]. - ^scavenger copyAndForward: resolvedObj! Item was changed: ----- Method: SpurMemoryManager>>stringForCString: (in category 'primitive support') ----- stringForCString: aCString "Answer a new String copied from a null-terminated C string, or nil if out of memory." <api> <var: 'aCString' type: 'const char *'> <inline: false> | len newString | len := self strlen: aCString. newString := self allocateSlots: (self numSlotsForBytes: len) format: (self byteFormatForNumBytes: len) classIndex: ClassByteStringCompactIndex. newString ifNotNil: + [self st: (self cCoerceSimple: newString + self baseHeaderSize to: #'char *') - [self st: newString + self baseHeaderSize rn: aCString cpy: len]. "(char *)strncpy()" ^newString! Item was changed: ----- Method: StackInterpreter class>>preambleCCode (in category 'translation') ----- preambleCCode ^ '/* Disable Intel compiler inlining of warning which is used for breakpoints */ #pragma auto_inline off + sqInt warnpid; void warning(char *s) { /* Print an error message but don''t exit. */ + if (warnpid) + printf("\n%s pid %ld\n", s, warnpid); + else + printf("\n%s\n", s); - printf("\n%s\n", s); } void warningat(char *s, int l) { /* ditto with line number. */ + /* use alloca to call warning so one does not have to remember to set two breakpoints... */ - #if 0 - printf("\n%s %d\n", s, l); - #else /* use alloca to call warning so one does not have to remember to set two breakpoints... */ char *sl = alloca(strlen(s) + 16); sprintf(sl, "%s %d", s, l); warning(sl); - #endif } #pragma auto_inline on void + invalidCompactClassError(char *s) { /* Print a (compact) class index error message and exit. */ + #if SPURVM + printf("\nClass %s does not have the required class index\n", s); + #else - invalidCompactClassError(char *s) { /* Print a compact class index error message and exit. */ printf("\nClass %s does not have the required compact class index\n", s); + #endif exit(-1); } /* * Define sigsetjmp and siglongjmp to be the most minimal setjmp/longjmp available on the platform. */ #if WIN32 # define sigsetjmp(jb,ssmf) setjmp(jb) # define siglongjmp(jb,v) longjmp(jb,v) #else # define sigsetjmp(jb,ssmf) _setjmp(jb) # define siglongjmp(jb,v) _longjmp(jb,v) #endif '!

1 0

VM Maker: VMMaker.oscog-eem.825.mcz
by commits＠source.squeak.org 18 Jul '14

18 Jul '14

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.825.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.825 Author: eem Time: 18 July 2014, 12:18:02.991 pm UUID: 038c31e2-d97d-4f1b-be2a-3908f6982b5f Ancestors: VMMaker.oscog-eem.824 Spur: Fix bad bug in remapObj: that confused the test for old vs new and hence tried to copyAndForward old objects. Fix bug in processWeaklings that could remember a weak object twice. General: Fix compilation warnings in stringForCString: Add a warnpid variable that prnts the pid in warnings, useful in debugging multi-image tests (i.e. magma). =============== Diff against VMMaker.oscog-eem.824 =============== Item was changed: ----- Method: ObjectMemory>>stringForCString: (in category 'primitive support') ----- stringForCString: aCString "Answer a new String copied from a null-terminated C string, or nil if out of memory. Caution: This may invoke the garbage collector." <api> <var: 'aCString' type: 'const char *'> <inline: false> | len newString | len := self strlen: aCString. newString := self instantiateClass: (self splObj: ClassByteString) indexableSize: len. newString ifNotNil: + [self st: (self cCoerceSimple: newString + self baseHeaderSize to: #'char *') - [self st: newString + self baseHeaderSize rn: aCString cpy: len]. "(char *)strncpy()" ^newString! Item was changed: ----- Method: SpurGenerationScavenger>>processWeaklings (in category 'weakness and ephemerality') ----- processWeaklings "Go through the remembered set and the weak list, nilling references to any objects that didn't survive the scavenge. Read the class comment for a more in-depth description of the algorithm." <inline: false> | i rootObj weakCorpse weakObj | self assert: self allWeakSurvivorsOnWeakList. i := 0. [i < rememberedSetSize] whileTrue: [rootObj := rememberedSet at: i. (manager isWeakNonImm: rootObj) ifTrue: ["If no more referents, remove by overwriting with the last element in the set." (self processWeakSurvivor: rootObj) ifFalse: [manager setIsRememberedOf: rootObj to: false. i + 1 < rememberedSetSize ifTrue: [rememberedSet at: i put: (rememberedSet at: rememberedSetSize - 1)]. rememberedSetSize := rememberedSetSize - 1] ifTrue: [i := i + 1]] ifFalse: [i := i + 1]]. weakList ifNotNil: [weakCorpse := self firstCorpse: weakList. [weakCorpse notNil] whileTrue: [self assert: (manager isForwarded: weakCorpse). weakObj := manager followForwarded: weakCorpse. "weakObj may have been tenured..." ((self processWeakSurvivor: weakObj) + and: [(manager isOldObject: weakObj) + and: [(manager isRemembered: weakObj) not]]) ifTrue: - and: [manager isOldObject: weakObj]) ifTrue: [self remember: weakObj]. weakCorpse := self nextCorpseOrNil: weakCorpse]. weakList := nil]! Item was changed: ----- Method: SpurGenerationScavenger>>remember: (in category 'store check') ----- remember: objOop "Add the argument to the remembered set and set its isRemembered bit to true. Answer the argument for the benefit of the Cogit." <api> <inline: false> self assert: (manager isNonImmediate: objOop). self assert: (manager isYoungObject: objOop) not. self assert: (manager isRemembered: objOop) not. + self assert: (manager isInRememberedSet: objOop) not. manager setIsRememberedOf: objOop to: true. rememberedSetSize < RememberedSetLimit ifTrue: [rememberedSet at: rememberedSetSize put: objOop. (rememberedSetSize := rememberedSetSize + 1) >= RememberedSetRedZone ifTrue: [manager scheduleScavenge]] ifFalse: [self error: 'remembered set overflow' "for now"]. ^objOop! Item was changed: CogClass subclass: #SpurMemoryManager (excessive size, no diff calculated) Item was changed: ----- Method: SpurMemoryManager>>allOldSpaceEntitiesFrom:do: (in category 'object enumeration') ----- allOldSpaceEntitiesFrom: initialObject do: aBlock <inline: true> | prevObj prevPrevObj objOop | + self assert: (self isOldObject: initialObject). prevPrevObj := prevObj := nil. objOop := initialObject. [self assert: objOop \\ self allocationUnit = 0. self oop: objOop isLessThan: endOfMemory] whileTrue: [self assert: (self long64At: objOop) ~= 0. aBlock value: objOop. prevPrevObj := prevObj. prevObj := objOop. objOop := self objectAfter: objOop limit: endOfMemory]. self touch: prevPrevObj. self touch: prevObj! Item was changed: ----- Method: SpurMemoryManager>>remapObj: (in category 'gc - scavenging') ----- remapObj: objOop "Scavenge or simply follow objOop. Answer the new location of objOop. The send should have been guarded by a send of shouldRemapOop:. The method is called remapObj: for compatibility with ObjectMemory." <api> <inline: false> | resolvedObj | self assert: (self shouldRemapOop: objOop). (self isForwarded: objOop) ifTrue: [resolvedObj := self followForwarded: objOop. (self isInFutureSpace: resolvedObj) ifTrue: "already scavenged" [^resolvedObj]] ifFalse: [resolvedObj := objOop]. (scavengeInProgress + and: [self isReallyYoung: resolvedObj]) ifTrue: "a becommed or compacted object whose target is in old space, or a CogMethod." + [^scavenger copyAndForward: resolvedObj]. + ^resolvedObj! - and: [self isReallyYoung: resolvedObj]) ifFalse: "a becommed or compacted object whose target is in old space, or a CogMethod." - [^resolvedObj]. - ^scavenger copyAndForward: resolvedObj! Item was changed: ----- Method: SpurMemoryManager>>stringForCString: (in category 'primitive support') ----- stringForCString: aCString "Answer a new String copied from a null-terminated C string, or nil if out of memory." <api> <var: 'aCString' type: 'const char *'> <inline: false> | len newString | len := self strlen: aCString. newString := self allocateSlots: (self numSlotsForBytes: len) format: (self byteFormatForNumBytes: len) classIndex: ClassByteStringCompactIndex. newString ifNotNil: + [self st: (self cCoerceSimple: newString + self baseHeaderSize to: #'char *') - [self st: newString + self baseHeaderSize rn: aCString cpy: len]. "(char *)strncpy()" ^newString! Item was changed: ----- Method: StackInterpreter class>>preambleCCode (in category 'translation') ----- preambleCCode ^ '/* Disable Intel compiler inlining of warning which is used for breakpoints */ #pragma auto_inline off + sqInt warnpid; void warning(char *s) { /* Print an error message but don''t exit. */ + if (warnpid) + printf("\n%s pid %ld\n", s, warnpid); + else + printf("\n%s\n", s); - printf("\n%s\n", s); } void warningat(char *s, int l) { /* ditto with line number. */ + /* use alloca to call warning so one does not have to remember to set two breakpoints... */ - #if 0 - printf("\n%s %d\n", s, l); - #else /* use alloca to call warning so one does not have to remember to set two breakpoints... */ char *sl = alloca(strlen(s) + 16); sprintf(sl, "%s %d", s, l); warning(sl); - #endif } #pragma auto_inline on void + invalidCompactClassError(char *s) { /* Print a (compact) class index error message and exit. */ + #if SPURVM + printf("\nClass %s does not have the required class index\n", s); + #else - invalidCompactClassError(char *s) { /* Print a compact class index error message and exit. */ printf("\nClass %s does not have the required compact class index\n", s); + #endif exit(-1); } /* * Define sigsetjmp and siglongjmp to be the most minimal setjmp/longjmp available on the platform. */ #if WIN32 # define sigsetjmp(jb,ssmf) setjmp(jb) # define siglongjmp(jb,v) longjmp(jb,v) #else # define sigsetjmp(jb,ssmf) _setjmp(jb) # define siglongjmp(jb,v) _longjmp(jb,v) #endif '!

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
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 July 2014