Vm-dev February 2015

vm-dev@lists.squeakfoundation.org

27 participants
101 discussions

VM Maker: VMMaker.oscog-eem.1081.mcz
by commits＠source.squeak.org 25 Feb '15

25 Feb '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1081.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1081 Author: eem Time: 25 February 2015, 1:15:04.185 pm UUID: 4cd33ad1-8b0f-4537-bf5f-7a4a25a1a2f9 Ancestors: VMMaker.oscog-eem.1080 General: Take advantage of endianness for simpler large integer initialization. Slang: Fix inlining of (u)sqLong expressions bound to untyped formals; since the system expects untyped formals to be of type #sqInt the expr must be cast to #sqInt. Put node:typeCompatibleWith:inliningInto:in: in CCodeGenerator, not TMethod. =============== Diff against VMMaker.oscog-eem.1080 =============== Item was added: + ----- Method: CCodeGenerator>>node:typeCompatibleWith:inliningInto:in: (in category 'inlining') ----- + node: exprNode typeCompatibleWith: argName inliningInto: inlineSelector in: aTMethod + "Answer either exprNode or, if required, a cast of exprNode to the type of argName. + The cast is required if + - argName is typed and exprNode is untyped + - argName is untyped and exprNode is an arithmetic type of size > #sqInt + - both argName and exprNode are typed but they are incompatible" + | formalType actualType | + formalType := aTMethod typeFor: argName in: self. + actualType := self typeFor: exprNode in: aTMethod. + ^((exprNode isSend or: [exprNode isVariable]) + and: [(formalType notNil and: [actualType isNil]) + or: [(formalType isNil and: [actualType notNil and: [(self isIntegralCType: actualType) and: [(self sizeOfIntegralCType: actualType) > (self sizeOfIntegralCType: #sqInt)]]]) + or: [(self variableOfType: formalType acceptsValue: exprNode ofType: actualType) not]]]) + ifTrue: [self nodeToCast: exprNode to: (formalType ifNil: [#sqInt])] + ifFalse: + [((exprNode isSend or: [exprNode isVariable]) + and: [(self + variableOfType: (self typeFor: exprNode in: aTMethod) + acceptsValue: exprNode + ofType: (aTMethod typeFor: argName in: self)) not]) ifTrue: + [logger + nextPutAll: + 'type mismatch for formal ', argName, ' and actual ', exprNode asString, + ' when inlining ', inlineSelector, ' in ', aTMethod selector, '. Use a cast.'; + cr; flush]. + exprNode]! Item was changed: ----- Method: InterpreterPrimitives>>magnitude64BitIntegerFor:neg: (in category 'primitive support') ----- magnitude64BitIntegerFor: magnitude neg: isNegative "Return a Large Integer object for the given integer magnitude and sign" + | newLargeInteger largeClass highWord sz isSmall smallVal | - | newLargeInteger largeClass intValue highWord sz isSmall smallVal | <var: 'magnitude' type: #usqLong> <var: 'highWord' type: #usqInt> isSmall := isNegative ifTrue: [magnitude <= (objectMemory maxSmallInteger + 1)] ifFalse: [magnitude <= objectMemory maxSmallInteger]. isSmall ifTrue: [smallVal := self cCoerceSimple: magnitude to: #sqInt. isNegative ifTrue: [smallVal := 0 - smallVal]. ^objectMemory integerObjectOf: smallVal]. largeClass := isNegative ifTrue: [objectMemory classLargeNegativeInteger] ifFalse: [objectMemory classLargePositiveInteger]. objectMemory wordSize = 8 ifTrue: [sz := 8] ifFalse: [(highWord := magnitude >> 32) = 0 ifTrue: [sz := 4] ifFalse: [sz := 5. (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1. (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1. (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1]]]]]. newLargeInteger := objectMemory instantiateClass: largeClass indexableSize: sz. + self cppIf: VMBIGENDIAN + ifTrue: + [sz > 4 ifTrue: + [objectMemory + storeByte: 7 ofObject: newLargeInteger withValue: (magnitude >> 56 bitAnd: 16rFF); + storeByte: 6 ofObject: newLargeInteger withValue: (magnitude >> 48 bitAnd: 16rFF); + storeByte: 5 ofObject: newLargeInteger withValue: (magnitude >> 40 bitAnd: 16rFF); + storeByte: 4 ofObject: newLargeInteger withValue: (magnitude >> 32 bitAnd: 16rFF)]. + objectMemory + storeByte: 3 ofObject: newLargeInteger withValue: (magnitude >> 24 bitAnd: 16rFF); + storeByte: 2 ofObject: newLargeInteger withValue: (magnitude >> 16 bitAnd: 16rFF); + storeByte: 1 ofObject: newLargeInteger withValue: (magnitude >> 8 bitAnd: 16rFF); + storeByte: 0 ofObject: newLargeInteger withValue: (magnitude ">> 0" bitAnd: 16rFF)] + ifFalse: + [sz > 4 ifTrue: + [objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: magnitude >> 32]. + objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: magnitude]. + - 0 to: sz-1 do: [:i | - intValue := (magnitude >> (i * 8)) bitAnd: 255. - objectMemory storeByte: i ofObject: newLargeInteger withValue: intValue]. ^newLargeInteger! Item was changed: ----- Method: InterpreterPrimitives>>primitiveConstantFill (in category 'sound primitives') ----- primitiveConstantFill "Fill the receiver, which must be an indexable bytes or words objects, with the given integer value." | fillValue rcvr rcvrIsBytes end i | <var: #end type: #usqInt> <var: #i type: #usqInt> fillValue := self positive32BitValueOf: self stackTop. rcvr := self stackValue: 1. self success: (objectMemory isWordsOrBytes: rcvr). rcvrIsBytes := objectMemory isBytes: rcvr. rcvrIsBytes ifTrue: [self success: (fillValue >= 0 and: [fillValue <= 255])]. self successful ifTrue: [end := rcvr + (objectMemory sizeBitsOf: rcvr). i := rcvr + objectMemory baseHeaderSize. + rcvrIsBytes ifTrue: + [fillValue := fillValue bitAnd: 255. + fillValue := fillValue + (fillValue << 8) + (fillValue << 16) + (fillValue << 24)]. + [i < end] whileTrue: + [objectMemory long32At: i put: fillValue. + i := i + 4]. - rcvrIsBytes - ifTrue: [[i < end] whileTrue: - [objectMemory byteAt: i put: fillValue. - i := i + 1]] - ifFalse: [[i < end] whileTrue: - [objectMemory long32At: i put: fillValue. - i := i + 4]]. self pop: 1]! Item was changed: ----- Method: StackInterpreter>>maybeInlinePositive32BitIntegerFor: (in category 'primitive support') ----- maybeInlinePositive32BitIntegerFor: integerValue "N.B. will *not* cause a GC. integerValue is interpreted as POSITIVE, e.g. as the result of Bitmap>at:." <notOption: #Spur64BitMemoryManager> | newLargeInteger | self deny: objectMemory hasSixtyFourBitImmediates. (integerValue >= 0 and: [objectMemory isIntegerValue: integerValue]) ifTrue: [^objectMemory integerObjectOf: integerValue]. newLargeInteger := objectMemory eeInstantiateSmallClassIndex: ClassLargePositiveIntegerCompactIndex format: (objectMemory byteFormatForNumBytes: 4) numSlots: 1. + self cppIf: VMBIGENDIAN + ifTrue: + [objectMemory + storeByte: 3 ofObject: newLargeInteger withValue: (integerValue >> 24 bitAnd: 16rFF); + storeByte: 2 ofObject: newLargeInteger withValue: (integerValue >> 16 bitAnd: 16rFF); + storeByte: 1 ofObject: newLargeInteger withValue: (integerValue >> 8 bitAnd: 16rFF); + storeByte: 0 ofObject: newLargeInteger withValue: (integerValue ">> 0" bitAnd: 16rFF)] + ifFalse: + [objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: integerValue]. - objectMemory - storeByte: 3 ofObject: newLargeInteger withValue: (integerValue >> 24 bitAnd: 16rFF); - storeByte: 2 ofObject: newLargeInteger withValue: (integerValue >> 16 bitAnd: 16rFF); - storeByte: 1 ofObject: newLargeInteger withValue: (integerValue >> 8 bitAnd: 16rFF); - storeByte: 0 ofObject: newLargeInteger withValue: (integerValue ">> 0" bitAnd: 16rFF). ^newLargeInteger! Item was changed: ----- Method: StackInterpreter>>noInlineSigned32BitIntegerFor: (in category 'primitive support') ----- noInlineSigned32BitIntegerFor: integerValue "Answer a full 32 bit integer object for the given integer value." <notOption: #Spur64BitMemoryManager> | newLargeInteger value largeClass | <inline: false> (objectMemory isIntegerValue: integerValue) ifTrue: [^objectMemory integerObjectOf: integerValue]. self deny: objectMemory hasSixtyFourBitImmediates. integerValue < 0 ifTrue: [largeClass := ClassLargeNegativeIntegerCompactIndex. value := 0 - integerValue] ifFalse: [largeClass := ClassLargePositiveIntegerCompactIndex. value := integerValue]. newLargeInteger := objectMemory eeInstantiateSmallClassIndex: largeClass format: (objectMemory byteFormatForNumBytes: 4) numSlots: 1. + self cppIf: VMBIGENDIAN + ifTrue: + [objectMemory + storeByte: 3 ofObject: newLargeInteger withValue: ((value >> 24) bitAnd: 16rFF); + storeByte: 2 ofObject: newLargeInteger withValue: ((value >> 16) bitAnd: 16rFF); + storeByte: 1 ofObject: newLargeInteger withValue: ((value >> 8) bitAnd: 16rFF); + storeByte: 0 ofObject: newLargeInteger withValue: (value bitAnd: 16rFF)] + ifFalse: + [objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: value]. - objectMemory storeByte: 3 ofObject: newLargeInteger withValue: ((value >> 24) bitAnd: 16rFF). - objectMemory storeByte: 2 ofObject: newLargeInteger withValue: ((value >> 16) bitAnd: 16rFF). - objectMemory storeByte: 1 ofObject: newLargeInteger withValue: ((value >> 8) bitAnd: 16rFF). - objectMemory storeByte: 0 ofObject: newLargeInteger withValue: (value bitAnd: 16rFF). ^newLargeInteger! Item was changed: ----- Method: StackInterpreter>>positive64BitIntegerFor: (in category 'primitive support') ----- positive64BitIntegerFor: integerValue <var: 'integerValue' type: #sqLong> "Answer a Large Positive Integer object for the given integer value. N.B. will *not* cause a GC." | newLargeInteger highWord sz | objectMemory hasSixtyFourBitImmediates ifTrue: [(integerValue >= 0 and: [objectMemory isIntegerValue: integerValue]) ifTrue: [^objectMemory integerObjectOf: integerValue]. sz := 8] ifFalse: [(highWord := integerValue >>> 32) = 0 ifTrue: [^self positive32BitIntegerFor: integerValue]. sz := 5. (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1. (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1. (highWord := highWord >> 8) = 0 ifFalse:[sz := sz + 1]]]]. newLargeInteger := objectMemory eeInstantiateSmallClassIndex: ClassLargePositiveIntegerCompactIndex format: (objectMemory byteFormatForNumBytes: sz) numSlots: 8 / objectMemory bytesPerOop. + self cppIf: VMBIGENDIAN + ifTrue: + [objectMemory + storeByte: 7 ofObject: newLargeInteger withValue: (integerValue >> 56 bitAnd: 16rFF); + storeByte: 6 ofObject: newLargeInteger withValue: (integerValue >> 48 bitAnd: 16rFF); + storeByte: 5 ofObject: newLargeInteger withValue: (integerValue >> 40 bitAnd: 16rFF); + storeByte: 4 ofObject: newLargeInteger withValue: (integerValue >> 32 bitAnd: 16rFF); + storeByte: 3 ofObject: newLargeInteger withValue: (integerValue >> 24 bitAnd: 16rFF); + storeByte: 2 ofObject: newLargeInteger withValue: (integerValue >> 16 bitAnd: 16rFF); + storeByte: 1 ofObject: newLargeInteger withValue: (integerValue >> 8 bitAnd: 16rFF); + storeByte: 0 ofObject: newLargeInteger withValue: (integerValue ">> 0" bitAnd: 16rFF)] + ifFalse: + [objectMemory storeLong64: 0 ofObject: newLargeInteger withValue: integerValue]. - objectMemory - storeByte: 7 ofObject: newLargeInteger withValue: (integerValue >> 56 bitAnd: 16rFF); - storeByte: 6 ofObject: newLargeInteger withValue: (integerValue >> 48 bitAnd: 16rFF); - storeByte: 5 ofObject: newLargeInteger withValue: (integerValue >> 40 bitAnd: 16rFF); - storeByte: 4 ofObject: newLargeInteger withValue: (integerValue >> 32 bitAnd: 16rFF); - storeByte: 3 ofObject: newLargeInteger withValue: (integerValue >> 24 bitAnd: 16rFF); - storeByte: 2 ofObject: newLargeInteger withValue: (integerValue >> 16 bitAnd: 16rFF); - storeByte: 1 ofObject: newLargeInteger withValue: (integerValue >> 8 bitAnd: 16rFF); - storeByte: 0 ofObject: newLargeInteger withValue: (integerValue ">> 0" bitAnd: 16rFF). ^newLargeInteger ! Item was changed: ----- Method: StackInterpreter>>signed64BitIntegerFor: (in category 'primitive support') ----- signed64BitIntegerFor: integerValue <var: 'integerValue' type: #sqLong> "Answer a Large Integer object for the given integer value. N.B. will *not* cause a GC." | newLargeInteger magnitude largeClass highWord sz | <inline: false> <var: 'magnitude' type: #sqLong> <var: 'highWord' type: #usqInt> objectMemory wordSize = 8 ifTrue: [(objectMemory isIntegerValue: integerValue) ifTrue: [^objectMemory integerObjectOf: integerValue]. sz := 8]. integerValue < 0 ifTrue:[ largeClass := ClassLargeNegativeIntegerCompactIndex. magnitude := 0 - integerValue] ifFalse:[ largeClass := ClassLargePositiveIntegerCompactIndex. magnitude := integerValue]. "Make sure to handle the most -ve value correctly. 0 - most -ve = most -ve and most -ve - 1 is +ve. Alas the simple (negative or: [integerValue - 1 < 0]) fails with contemporary gcc and icc versions with optimization and sometimes without. The shift works on all, touch wood." objectMemory wordSize = 4 ifTrue: [(magnitude <= 16r7FFFFFFF and: [integerValue >= 0 or: [0 ~= (self cCode: [integerValue << 1] inSmalltalk: [integerValue << 1 bitAnd: (1 << 64) - 1])]]) ifTrue: [^self signed32BitIntegerFor: integerValue]. (highWord := magnitude >> 32) = 0 ifTrue: [sz := 4] ifFalse: [sz := 5. (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1. (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1. (highWord := highWord >> 8) = 0 ifFalse: [sz := sz + 1]]]]]. newLargeInteger := objectMemory eeInstantiateSmallClassIndex: largeClass format: (objectMemory byteFormatForNumBytes: sz) numSlots: sz + 3 // objectMemory bytesPerOop. + self cppIf: VMBIGENDIAN + ifTrue: + [sz > 4 ifTrue: + [objectMemory + storeByte: 7 ofObject: newLargeInteger withValue: (magnitude >> 56 bitAnd: 16rFF); + storeByte: 6 ofObject: newLargeInteger withValue: (magnitude >> 48 bitAnd: 16rFF); + storeByte: 5 ofObject: newLargeInteger withValue: (magnitude >> 40 bitAnd: 16rFF); + storeByte: 4 ofObject: newLargeInteger withValue: (magnitude >> 32 bitAnd: 16rFF)]. + objectMemory + storeByte: 3 ofObject: newLargeInteger withValue: (magnitude >> 24 bitAnd: 16rFF); + storeByte: 2 ofObject: newLargeInteger withValue: (magnitude >> 16 bitAnd: 16rFF); + storeByte: 1 ofObject: newLargeInteger withValue: (magnitude >> 8 bitAnd: 16rFF); + storeByte: 0 ofObject: newLargeInteger withValue: (magnitude ">> 0" bitAnd: 16rFF)] + ifFalse: + [sz > 4 ifTrue: + [objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: magnitude >> 32]. + objectMemory storeLong32: 0 ofObject: newLargeInteger withValue: magnitude]. - sz > 4 ifTrue: - [objectMemory - storeByte: 7 ofObject: newLargeInteger withValue: (magnitude >> 56 bitAnd: 16rFF); - storeByte: 6 ofObject: newLargeInteger withValue: (magnitude >> 48 bitAnd: 16rFF); - storeByte: 5 ofObject: newLargeInteger withValue: (magnitude >> 40 bitAnd: 16rFF); - storeByte: 4 ofObject: newLargeInteger withValue: (magnitude >> 32 bitAnd: 16rFF)]. - objectMemory - storeByte: 3 ofObject: newLargeInteger withValue: (magnitude >> 24 bitAnd: 16rFF); - storeByte: 2 ofObject: newLargeInteger withValue: (magnitude >> 16 bitAnd: 16rFF); - storeByte: 1 ofObject: newLargeInteger withValue: (magnitude >> 8 bitAnd: 16rFF); - storeByte: 0 ofObject: newLargeInteger withValue: (magnitude ">> 0" bitAnd: 16rFF). ^newLargeInteger! Item was changed: ----- Method: TMethod>>argAssignmentsFor:send:in: (in category 'inlining') ----- argAssignmentsFor: meth send: aSendNode in: aCodeGen "Return a collection of assignment nodes that assign the given argument expressions to the formal parameter variables of the given method." "Optimization: If the actual parameters are either constants or local variables in the target method (the receiver), substitute them directly into the body of meth. Note that global variables cannot be subsituted because the inlined method might depend on the exact ordering of side effects to the globals." | stmtList substitutionDict argList | meth args size > (argList := aSendNode args) size ifTrue: [self assert: (meth args first beginsWith: 'self_in_'). argList := {aSendNode receiver}, aSendNode args]. stmtList := OrderedCollection new: argList size. substitutionDict := Dictionary new: 100. meth args with: argList do: [ :argName :exprNode | (self isNode: exprNode substitutableFor: argName inMethod: meth in: aCodeGen) ifTrue: [substitutionDict at: argName + put: (aCodeGen + node: exprNode - put: (self node: exprNode typeCompatibleWith: argName inliningInto: meth selector + in: self). - in: aCodeGen). locals remove: argName] ifFalse: [stmtList addLast: (TAssignmentNode new setVariable: (TVariableNode new setName: argName) + expression: (aCodeGen + node: exprNode copy - expression: (self node: exprNode copy typeCompatibleWith: argName inliningInto: meth selector + in: self))]]. - in: aCodeGen))]]. meth parseTree: (meth parseTree bindVariablesIn: substitutionDict). ^stmtList! Item was removed: - ----- Method: TMethod>>node:typeCompatibleWith:inliningInto:in: (in category 'inlining') ----- - node: exprNode typeCompatibleWith: argName inliningInto: inlineSelector in: aCodeGen - "Answer either exprNode or, iff argName is typed and exprNode is untyped, a cast of exprNode to the type of argName." - | formalType actualType | - ^((exprNode isSend or: [exprNode isVariable]) - and: [(formalType := self typeFor: argName in: aCodeGen) notNil - and: [(actualType := aCodeGen typeFor: exprNode in: self) isNil - or: [(aCodeGen variableOfType: formalType acceptsValue: exprNode ofType: actualType) not]]]) - ifTrue: [aCodeGen nodeToCast: exprNode to: formalType] - ifFalse: - [((exprNode isSend or: [exprNode isVariable]) - and: [(aCodeGen - variableOfType: (aCodeGen typeFor: exprNode in: self) - acceptsValue: exprNode - ofType: (self typeFor: argName in: aCodeGen)) not]) ifTrue: - [aCodeGen logger - nextPutAll: - 'type mismatch for formal ', argName, ' and actual ', exprNode asString, - ' when inlining ', inlineSelector, ' in ', selector, '. Use a cast.'; - cr; flush]. - exprNode]!

1 0

New Cog VMs available
by Eliot Miranda 25 Feb '15

25 Feb '15

Hi All, after a period of instability due to internal changes needed for the Spur 64-bit V I hope that these latest VMs will be more stable. ------------------------------------------------------------------------ CogVM source as per VMMaker.oscog-eem.1080/r3263 Mostly internal changes due to better inlining and type inferrence machinery in Slang. General: Fix a type declaration error uncovered by the new inlining. Simplify primitiveMakePoint. Include primitiveMethodXray Include freeMethod: in Cogit's api for method xray. Spur: Fix a typing bug in initializeOldSpaceFirstFree:. Newspeak: Move the Newspeak plugins to nsspursrc/plugins. Fix privacy violation checking for super sends. Fix some type warnings in Spur stack VMs. Slang: More improvement to type inferrence/propagation. Support ifTrue:ifFalse:. Better separate the passes in inferTypesForImplicitlyTypedVariablesAndMethods. Fix slip in nodeToCast:to:. Provide types for atan, et al. Avoid casting nil. Don't inline complex expressions that are bound to variables used in asserts. General: Add an option to control FailUnbalancedPrimitives and no longer burden the Stack VMs with the responsibility. Fix typing multiple assignments to a variable - promote the type to the largest integral type of all assignments (primitiveDecompressFromByteArray) - do /not/ promote a variable typed with integral type to a floating point type (transformColor:) On type compatibility of inlined expressions, insist on signed compatibility or accept an untyped actual. Improve the type inferrence machinery further to support pointer subtraction. Eliminate code duplication (determineTypeFor:in: now uses returnTypeForSend:, etc). Change the heuristic for inlining expressions to include a maximum usage count. Slang: Rescue translation of the non-64-bit Spur VMs by a) doing a better job of super expansions, handling expansions that are returning ifs as well as just returns correctly. b) transforming variable := expr ifTrue: [s1] ifFalse: [s2] into expr ifTrue: [variable := s1] ifFalse: [variable := s2] to allow inlining of s1 & s2. And take advantage of the better inlining in copyAndForward: General: Simplify primitiveDisplayString given isArray:. Refactor positive32BitIntegerFor: and signed32BitIntegerFor: in the realization that these reduce to essentially integerObjectOf: in 64-bit Spur. The idea is to inline if in 64-bit Spur but not if in the 32-bit VMs. Add notOption: processing to allow excluding noInlineSigned32BitIntegerFor: et al. Add hasSixtyFourBitImmediates to no longer assume that wordSize = 8 implies 64-bit immediates. Use positiveMachineIntegerFor: in place of positive32BitIntegerFor: in some plugins. Simplify two B3DAcceleratorPlugin prims given topRemappableOop and isArray: -- best, Eliot

1 1

[commit][3263] CogVM source as per VMMaker.oscog-eem.1080
by commits＠squeakvm.org 24 Feb '15

24 Feb '15

Revision: 3263 Author: eliot Date: 2015-02-24 14:04:06 -0800 (Tue, 24 Feb 2015) Log Message: ----------- CogVM source as per VMMaker.oscog-eem.1080 General: Fix a type declaration error uncvered by the new inlining. Simplify primitiveMakePoint. Include primitiveMethodXray Include freeMethod: in Cogit's api for method xray. Spur: Fix a typing bug in initializeOldSpaceFirstFree:. Newspeak: Move the Newspeak plugins to nsspursrc/plugins. Fix privacy violation checking for super sends. Fix some type warnings in Spur stack VMs. Slang: More improvement to type inferrence/propagation. Support ifTrue:ifFalse:. Better separate the passes in inferTypesForImplicitlyTypedVariablesAndMethods. Fix slip in nodeToCast:to:. Provide types for atan, et al. Avoid casting nil. Don't inline complex expressions that are bound to variables used in asserts. Modified Paths: -------------- branches/Cog/build.linux32x86/newspeak.cog.spur/build/mvm branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert/mvm branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert.itimerheartbeat/mvm branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug/mvm branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug.itimerheartbeat/mvm branches/Cog/build.linux32x86/newspeak.cog.spur/build.itimerheartbeat/mvm branches/Cog/build.linux32x86/newspeak.stack.spur/build/mvm branches/Cog/build.linux32x86/newspeak.stack.spur/build.assert/mvm branches/Cog/build.linux32x86/newspeak.stack.spur/build.debug/mvm branches/Cog/build.linux64x64/newspeak.cog.spur/build/mvm branches/Cog/build.linux64x64/newspeak.cog.spur/build.assert/mvm branches/Cog/build.linux64x64/newspeak.cog.spur/build.assert.itimerheartbeat/mvm branches/Cog/build.linux64x64/newspeak.cog.spur/build.debug/mvm branches/Cog/build.linux64x64/newspeak.cog.spur/build.debug.itimerheartbeat/mvm branches/Cog/build.linux64x64/newspeak.cog.spur/build.itimerheartbeat/mvm branches/Cog/build.linux64x64/newspeak.stack.spur/build/mvm branches/Cog/build.linux64x64/newspeak.stack.spur/build.assert/mvm branches/Cog/build.linux64x64/newspeak.stack.spur/build.debug/mvm branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/newspeak.cog.v3/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.xcodeproj/project.pbxproj branches/Cog/build.win32x86/newspeak.cog.spur/Makefile branches/Cog/build.win32x86/newspeak.cog.v3/Makefile branches/Cog/build.win32x86/newspeak.stack.spur/Makefile branches/Cog/nsspursrc/vm/cogit.c branches/Cog/nsspursrc/vm/cogit.h branches/Cog/nsspursrc/vm/cointerp.c branches/Cog/nsspursrc/vm/cointerp.h branches/Cog/nsspursrc/vm/gcc3x-cointerp.c branches/Cog/nsspurstacksrc/vm/gcc3x-interp.c branches/Cog/nsspurstacksrc/vm/interp.c branches/Cog/platforms/Cross/vm/dispdbg.h branches/Cog/scripts/svnci branches/Cog/sistasrc/vm/cogit.c branches/Cog/sistasrc/vm/cogit.h branches/Cog/sistasrc/vm/cointerp.c branches/Cog/sistasrc/vm/cointerp.h branches/Cog/sistasrc/vm/gcc3x-cointerp.c branches/Cog/spursistasrc/vm/cogit.c branches/Cog/spursistasrc/vm/cogit.h branches/Cog/spursistasrc/vm/cointerp.c branches/Cog/spursistasrc/vm/cointerp.h branches/Cog/spursistasrc/vm/gcc3x-cointerp.c branches/Cog/spursrc/vm/cogit.c branches/Cog/spursrc/vm/cogit.h branches/Cog/spursrc/vm/cointerp.c branches/Cog/spursrc/vm/cointerp.h branches/Cog/spursrc/vm/gcc3x-cointerp.c branches/Cog/spurstack64src/vm/exampleSqNamedPrims.h branches/Cog/spurstack64src/vm/gcc3x-interp.c branches/Cog/spurstack64src/vm/interp.c branches/Cog/spurstacksrc/vm/gcc3x-interp.c branches/Cog/spurstacksrc/vm/interp.c branches/Cog/src/plugins/AioPlugin/AioPlugin.c branches/Cog/src/plugins/B2DPlugin/B2DPlugin.c branches/Cog/src/plugins/LargeIntegers/LargeIntegers.c branches/Cog/src/plugins/SqueakFFIPrims/ARM32FFIPlugin.c branches/Cog/src/plugins/SqueakFFIPrims/IA32FFIPlugin.c branches/Cog/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/src/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Cog/src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c branches/Cog/src/vm/cogit.c branches/Cog/src/vm/cogit.h branches/Cog/src/vm/cointerp.c branches/Cog/src/vm/cointerp.h branches/Cog/src/vm/cointerpmt.c branches/Cog/src/vm/cointerpmt.h branches/Cog/src/vm/gcc3x-cointerp.c branches/Cog/src/vm/gcc3x-cointerpmt.c branches/Cog/stacksrc/vm/gcc3x-interp.c branches/Cog/stacksrc/vm/interp.c Added Paths: ----------- branches/Cog/nsspursrc/plugins/ branches/Cog/nsspursrc/plugins/AioPlugin/AioPlugin.c branches/Cog/nsspursrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c branches/Cog/nsspursrc/plugins/B2DPlugin/B2DPlugin.c branches/Cog/nsspursrc/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/nsspursrc/plugins/DSAPrims/DSAPrims.c branches/Cog/nsspursrc/plugins/FilePlugin/FilePlugin.c branches/Cog/nsspursrc/plugins/FloatMathPlugin/FloatMathPlugin.c branches/Cog/nsspursrc/plugins/IA32ABI/IA32ABI.c branches/Cog/nsspursrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c branches/Cog/nsspursrc/plugins/LargeIntegers/LargeIntegers.c branches/Cog/nsspursrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c branches/Cog/nsspursrc/plugins/RePlugin/RePlugin.c branches/Cog/nsspursrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/nsspursrc/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c branches/Cog/nsspursrc/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c branches/Cog/nsspursrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Cog/nsspursrc/plugins/ZipPlugin/ZipPlugin.c Removed Paths: ------------- branches/Cog/nscogsrc/plugins/ branches/Cog/nsspursrc/plugins/AioPlugin/AioPlugin.c branches/Cog/nsspursrc/plugins/AsynchFilePlugin/AsynchFilePlugin.c branches/Cog/nsspursrc/plugins/B2DPlugin/B2DPlugin.c branches/Cog/nsspursrc/plugins/BitBltPlugin/BitBltPlugin.c branches/Cog/nsspursrc/plugins/DSAPrims/DSAPrims.c branches/Cog/nsspursrc/plugins/FilePlugin/FilePlugin.c branches/Cog/nsspursrc/plugins/FloatMathPlugin/FloatMathPlugin.c branches/Cog/nsspursrc/plugins/IA32ABI/IA32ABI.c branches/Cog/nsspursrc/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c branches/Cog/nsspursrc/plugins/LargeIntegers/LargeIntegers.c branches/Cog/nsspursrc/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c branches/Cog/nsspursrc/plugins/RePlugin/RePlugin.c branches/Cog/nsspursrc/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c branches/Cog/nsspursrc/plugins/VMProfileLinuxSupportPlugin/VMProfileLinuxSupportPlugin.c branches/Cog/nsspursrc/plugins/VMProfileMacSupportPlugin/VMProfileMacSupportPlugin.c branches/Cog/nsspursrc/plugins/Win32OSProcessPlugin/Win32OSProcessPlugin.c branches/Cog/nsspursrc/plugins/ZipPlugin/ZipPlugin.c Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build/mvm =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.spur/build/mvm 2015-02-23 00:31:15 UTC (rev 3262) +++ branches/Cog/build.linux32x86/newspeak.cog.spur/build/mvm 2015-02-24 22:04:06 UTC (rev 3263) @@ -22,7 +22,7 @@ esac test -f config.h || ../../../platforms/unix/config/configure \ --with-vmversion=5.0 \ - --with-src=nsspursrc --with-plugins=nscogsrc/plugins \ + --with-src=nsspursrc --with-plugins=nsspursrc/plugins \ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m32" \ CXX="g++ -m32" \ Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert/mvm =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert/mvm 2015-02-23 00:31:15 UTC (rev 3262) +++ branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert/mvm 2015-02-24 22:04:06 UTC (rev 3263) @@ -18,7 +18,7 @@ esac test -f config.h || ../../../platforms/unix/config/configure \ --with-vmversion=5.0 \ - --with-src=nsspursrc --with-plugins=nscogsrc/plugins \ + --with-src=nsspursrc --with-plugins=nsspursrc/plugins \ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m32" \ CXX="g++ -m32" \ Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert.itimerheartbeat/mvm 2015-02-23 00:31:15 UTC (rev 3262) +++ branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert.itimerheartbeat/mvm 2015-02-24 22:04:06 UTC (rev 3263) @@ -18,7 +18,7 @@ esac test -f config.h || ../../../platforms/unix/config/configure \ --with-vmversion=5.0 \ - --with-src=nsspursrc --with-plugins=nscogsrc/plugins \ + --with-src=nsspursrc --with-plugins=nsspursrc/plugins \ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m32" \ CXX="g++ -m32" \ Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug/mvm =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug/mvm 2015-02-23 00:31:15 UTC (rev 3262) +++ branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug/mvm 2015-02-24 22:04:06 UTC (rev 3263) @@ -18,7 +18,7 @@ esac test -f config.h || ../../../platforms/unix/config/configure \ --with-vmversion=5.0 \ - --with-src=nsspursrc --with-plugins=nscogsrc/plugins \ + --with-src=nsspursrc --with-plugins=nsspursrc/plugins \ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m32" \ CXX="g++ -m32" \ Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug.itimerheartbeat/mvm 2015-02-23 00:31:15 UTC (rev 3262) +++ branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug.itimerheartbeat/mvm 2015-02-24 22:04:06 UTC (rev 3263) @@ -18,7 +18,7 @@ esac test -f config.h || ../../../platforms/unix/config/configure \ --with-vmversion=5.0 \ - --with-src=nsspursrc --with-plugins=nscogsrc/plugins \ + --with-src=nsspursrc --with-plugins=nsspursrc/plugins \ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m32" \ CXX="g++ -m32" \ Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.spur/build.itimerheartbeat/mvm 2015-02-23 00:31:15 UTC (rev 3262) +++ branches/Cog/build.linux32x86/newspeak.cog.spur/build.itimerheartbeat/mvm 2015-02-24 22:04:06 UTC (rev 3263) @@ -22,7 +22,7 @@ esac test -f config.h || ../../../platforms/unix/config/configure \ --with-vmversion=5.0 \ - --with-src=nsspursrc --with-plugins=nscogsrc/plugins \ + --with-src=nsspursrc --with-plugins=nsspursrc/plugins \ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m32" \ CXX="g++ -m32" \ Modified: branches/Cog/build.linux32x86/newspeak.stack.spur/build/mvm =================================================================== --- branches/Cog/build.linux32x86/newspeak.stack.spur/build/mvm 2015-02-23 00:31:15 UTC (rev 3262) +++ branches/Cog/build.linux32x86/newspeak.stack.spur/build/mvm 2015-02-24 22:04:06 UTC (rev 3263) @@ -22,7 +22,7 @@ esac test -f config.h || ../../../platforms/unix/config/configure \ --with-vmversion=5.0 \ - --with-src=nsspurstacksrc --with-plugins=nscogsrc/plugins --disable-cogit \ + --with-src=nsspurstacksrc --with-plugins=nsspursrc/plugins --disable-cogit \ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m32" \ CXX="g++ -m32" \ Modified: branches/Cog/build.linux32x86/newspeak.stack.spur/build.assert/mvm =================================================================== --- branches/Cog/build.linux32x86/newspeak.stack.spur/build.assert/mvm 2015-02-23 00:31:15 UTC (rev 3262) +++ branches/Cog/build.linux32x86/newspeak.stack.spur/build.assert/mvm 2015-02-24 22:04:06 UTC (rev 3263) @@ -18,7 +18,7 @@ esac test -f config.h || ../../../platforms/unix/config/configure \ --with-vmversion=5.0 \ - --with-src=nsspurstacksrc --with-plugins=nscogsrc/plugins --disable-cogit \ + --with-src=nsspurstacksrc --with-plugins=nsspursrc/plugins --disable-cogit \ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m32" \ CXX="g++ -m32" \ Modified: branches/Cog/build.linux32x86/newspeak.stack.spur/build.debug/mvm =================================================================== --- branches/Cog/build.linux32x86/newspeak.stack.spur/build.debug/mvm 2015-02-23 00:31:15 UTC (rev 3262) +++ branches/Cog/build.linux32x86/newspeak.stack.spur/build.debug/mvm 2015-02-24 22:04:06 UTC (rev 3263) @@ -18,7 +18,7 @@ esac test -f config.h || ../../../platforms/unix/config/configure \ --with-vmversion=5.0 \ - --with-src=nsspurstacksrc --with-plugins=nscogsrc/plugins --disable-cogit \ + --with-src=nsspurstacksrc --with-plugins=nsspursrc/plugins --disable-cogit \ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m32" \ CXX="g++ -m32" \ Modified: branches/Cog/build.linux64x64/newspeak.cog.spur/build/mvm =================================================================== --- branches/Cog/build.linux64x64/newspeak.cog.spur/build/mvm 2015-02-23 00:31:15 UTC (rev 3262) +++ branches/Cog/build.linux64x64/newspeak.cog.spur/build/mvm 2015-02-24 22:04:06 UTC (rev 3263) @@ -22,7 +22,7 @@ esac test -f config.h || ../../../platforms/unix/config/configure \ --with-vmversion=5.0 \ - --with-src=nsspur64src --with-plugins=nscogsrc/plugins \ + --with-src=nsspur64src --with-plugins=nsspursrc/plugins \ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m64" \ CXX="g++ -m64" \ Modified: branches/Cog/build.linux64x64/newspeak.cog.spur/build.assert/mvm =================================================================== --- branches/Cog/build.linux64x64/newspeak.cog.spur/build.assert/mvm 2015-02-23 00:31:15 UTC (rev 3262) +++ branches/Cog/build.linux64x64/newspeak.cog.spur/build.assert/mvm 2015-02-24 22:04:06 UTC (rev 3263) @@ -18,7 +18,7 @@ esac test -f config.h || ../../../platforms/unix/config/configure \ --with-vmversion=5.0 \ - --with-src=nsspur64src --with-plugins=nscogsrc/plugins \ + --with-src=nsspur64src --with-plugins=nsspursrc/plugins \ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m64" \ CXX="g++ -m64" \ Modified: branches/Cog/build.linux64x64/newspeak.cog.spur/build.assert.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux64x64/newspeak.cog.spur/build.assert.itimerheartbeat/mvm 2015-02-23 00:31:15 UTC (rev 3262) +++ branches/Cog/build.linux64x64/newspeak.cog.spur/build.assert.itimerheartbeat/mvm 2015-02-24 22:04:06 UTC (rev 3263) @@ -18,7 +18,7 @@ esac test -f config.h || ../../../platforms/unix/config/configure \ --with-vmversion=5.0 \ - --with-src=nsspur64src --with-plugins=nscogsrc/plugins \ + --with-src=nsspur64src --with-plugins=nsspursrc/plugins \ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m64" \ CXX="g++ -m64" \ Modified: branches/Cog/build.linux64x64/newspeak.cog.spur/build.debug/mvm =================================================================== --- branches/Cog/build.linux64x64/newspeak.cog.spur/build.debug/mvm 2015-02-23 00:31:15 UTC (rev 3262) +++ branches/Cog/build.linux64x64/newspeak.cog.spur/build.debug/mvm 2015-02-24 22:04:06 UTC (rev 3263) @@ -18,7 +18,7 @@ esac test -f config.h || ../../../platforms/unix/config/configure \ --with-vmversion=5.0 \ - --with-src=nsspur64src --with-plugins=nscogsrc/plugins \ + --with-src=nsspur64src --with-plugins=nsspursrc/plugins \ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m64" \ CXX="g++ -m64" \ Modified: branches/Cog/build.linux64x64/newspeak.cog.spur/build.debug.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux64x64/newspeak.cog.spur/build.debug.itimerheartbeat/mvm 2015-02-23 00:31:15 UTC (rev 3262) +++ branches/Cog/build.linux64x64/newspeak.cog.spur/build.debug.itimerheartbeat/mvm 2015-02-24 22:04:06 UTC (rev 3263) @@ -18,7 +18,7 @@ esac test -f config.h || ../../../platforms/unix/config/configure \ --with-vmversion=5.0 \ - --with-src=nsspur64src --with-plugins=nscogsrc/plugins \ + --with-src=nsspur64src --with-plugins=nsspursrc/plugins \ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m64" \ CXX="g++ -m64" \ Modified: branches/Cog/build.linux64x64/newspeak.cog.spur/build.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux64x64/newspeak.cog.spur/build.itimerheartbeat/mvm 2015-02-23 00:31:15 UTC (rev 3262) +++ branches/Cog/build.linux64x64/newspeak.cog.spur/build.itimerheartbeat/mvm 2015-02-24 22:04:06 UTC (rev 3263) @@ -22,7 +22,7 @@ esac test -f config.h || ../../../platforms/unix/config/configure \ --with-vmversion=5.0 \ - --with-src=nsspur64src --with-plugins=nscogsrc/plugins \ + --with-src=nsspur64src --with-plugins=nsspursrc/plugins \ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m64" \ CXX="g++ -m64" \ Modified: branches/Cog/build.linux64x64/newspeak.stack.spur/build/mvm =================================================================== --- branches/Cog/build.linux64x64/newspeak.stack.spur/build/mvm 2015-02-23 00:31:15 UTC (rev 3262) +++ branches/Cog/build.linux64x64/newspeak.stack.spur/build/mvm 2015-02-24 22:04:06 UTC (rev 3263) @@ -22,7 +22,7 @@ esac test -f config.h || ../../../platforms/unix/config/configure \ --with-vmversion=5.0 \ - --with-src=nsspurstack64src --with-plugins=nscogsrc/plugins --disable-cogit \ + --with-src=nsspurstack64src --with-plugins=nsspursrc/plugins --disable-cogit \ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m64" \ CXX="g++ -m64" \ Modified: branches/Cog/build.linux64x64/newspeak.stack.spur/build.assert/mvm =================================================================== --- branches/Cog/build.linux64x64/newspeak.stack.spur/build.assert/mvm 2015-02-23 00:31:15 UTC (rev 3262) +++ branches/Cog/build.linux64x64/newspeak.stack.spur/build.assert/mvm 2015-02-24 22:04:06 UTC (rev 3263) @@ -18,7 +18,7 @@ esac test -f config.h || ../../../platforms/unix/config/configure \ --with-vmversion=5.0 \ - --with-src=nsspurstack64src --with-plugins=nscogsrc/plugins --disable-cogit \ + --with-src=nsspurstack64src --with-plugins=nsspursrc/plugins --disable-cogit \ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m64" \ CXX="g++ -m64" \ Modified: branches/Cog/build.linux64x64/newspeak.stack.spur/build.debug/mvm =================================================================== --- branches/Cog/build.linux64x64/newspeak.stack.spur/build.debug/mvm 2015-02-23 00:31:15 UTC (rev 3262) +++ branches/Cog/build.linux64x64/newspeak.stack.spur/build.debug/mvm 2015-02-24 22:04:06 UTC (rev 3263) @@ -18,7 +18,7 @@ esac test -f config.h || ../../../platforms/unix/config/configure \ --with-vmversion=5.0 \ - --with-src=nsspurstack64src --with-plugins=nscogsrc/plugins --disable-cogit \ + --with-src=nsspurstack64src --with-plugins=nsspursrc/plugins --disable-cogit \ --without-vm-display-fbdev --without-npsqueak \ CC="gcc -m64" \ CXX="g++ -m64" \ Modified: branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.xcodeproj/project.pbxproj 2015-02-23 00:31:15 UTC (rev 3262) +++ branches/Cog/build.macos32x86/newspeak.cog.spur/CoreVM.xcodeproj/project.pbxproj 2015-02-24 22:04:06 UTC (rev 3263) @@ -607,7 +607,7 @@ A27729370CE7A8D300ABAFCA /* ZipPlugin.c */, ); name = plugins; - path = ../../nscogsrc/plugins; + path = ../../nsspursrc/plugins; sourceTree = "<group>"; }; 738FB1E80EE4CF4B004BEE42 /* IA32ABI */ = { Modified: branches/Cog/build.macos32x86/newspeak.cog.v3/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/newspeak.cog.v3/CoreVM.xcodeproj/project.pbxproj 2015-02-23 00:31:15 UTC (rev 3262) +++ branches/Cog/build.macos32x86/newspeak.cog.v3/CoreVM.xcodeproj/project.pbxproj 2015-02-24 22:04:06 UTC (rev 3263) @@ -609,7 +609,7 @@ A27729370CE7A8D300ABAFCA /* ZipPlugin.c */, ); name = plugins; - path = ../../nscogsrc/plugins; + path = ../../nsspursrc/plugins; sourceTree = "<group>"; }; 738FB1E80EE4CF4B004BEE42 /* IA32ABI */ = { Modified: branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.xcodeproj/project.pbxproj 2015-02-23 00:31:15 UTC (rev 3262) +++ branches/Cog/build.macos32x86/newspeak.stack.spur/CoreVM.xcodeproj/project.pbxproj 2015-02-24 22:04:06 UTC (rev 3263) @@ -597,7 +597,7 @@ A27729370CE7A8D300ABAFCA /* ZipPlugin.c */, ); name = plugins; - path = ../../nscogsrc/plugins; + path = ../../nsspursrc/plugins; sourceTree = "<group>"; }; 738FB1E80EE4CF4B004BEE42 /* IA32ABI */ = { Modified: branches/Cog/build.win32x86/newspeak.cog.spur/Makefile =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.spur/Makefile 2015-02-23 00:31:15 UTC (rev 3262) +++ branches/Cog/build.win32x86/newspeak.cog.spur/Makefile 2015-02-24 22:04:06 UTC (rev 3263) @@ -27,7 +27,7 @@ else BUILD:=builddbg endif -PLUGINSRCDIR:= ../../nscogsrc +PLUGINSRCDIR:= ../../nsspursrc VMSRCDIR:= ../../nsspursrc BLDDIR:= $(BASEDIR)/$(BUILD) OBJDIR:= $(BLDDIR)/vm Modified: branches/Cog/build.win32x86/newspeak.cog.v3/Makefile =================================================================== --- branches/Cog/build.win32x86/newspeak.cog.v3/Makefile 2015-02-23 00:31:15 UTC (rev 3262) +++ branches/Cog/build.win32x86/newspeak.cog.v3/Makefile 2015-02-24 22:04:06 UTC (rev 3263) @@ -27,7 +27,7 @@ else BUILD:=builddbg endif -PLUGINSRCDIR:= ../../nscogsrc +PLUGINSRCDIR:= ../../nsspursrc VMSRCDIR:= ../../nscogsrc BLDDIR:= $(BASEDIR)/$(BUILD) OBJDIR:= $(BLDDIR)/vm Modified: branches/Cog/build.win32x86/newspeak.stack.spur/Makefile =================================================================== --- branches/Cog/build.win32x86/newspeak.stack.spur/Makefile 2015-02-23 00:31:15 UTC (rev 3262) +++ branches/Cog/build.win32x86/newspeak.stack.spur/Makefile 2015-02-24 22:04:06 UTC (rev 3263) @@ -27,7 +27,7 @@ else BUILD:=builddbg endif -PLUGINSRCDIR:= ../../nscogsrc +PLUGINSRCDIR:= ../../nsspursrc VMSRCDIR:= ../../nsspurstacksrc BLDDIR:= $(BASEDIR)/$(BUILD) OBJDIR:= $(BLDDIR)/vm Deleted: branches/Cog/nsspursrc/plugins/AioPlugin/AioPlugin.c =================================================================== --- branches/Cog/nscogsrc/plugins/AioPlugin/AioPlugin.c 2015-01-07 00:59:06 UTC (rev 3216) +++ branches/Cog/nsspursrc/plugins/AioPlugin/AioPlugin.c 2015-02-24 22:04:06 UTC (rev 3263) @@ -1,711 +0,0 @@ -/* Automatically generated by - VMPluginCodeGenerator VMMaker.oscog-eem.983 uuid: 4cdca841-6318-4c49-95de-8c47d0d7e91d - from - UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.17 uuid: a2b39cb2-e681-4bc3-a777-f03b2e3f2de0 - */ -static char __buildInfo[] = "UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.17 uuid: a2b39cb2-e681-4bc3-a777-f03b2e3f2de0 " __DATE__ ; - - - -#include <math.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <time.h> -#include <unistd.h> -#define FILEHANDLETYPE FILE * /* the type of low level stream to be used in a struct SQFile */ - -/* Default EXPORT macro that does nothing (see comment in sq.h): */ -#define EXPORT(returnType) returnType - -/* Do not include the entire sq.h file but just those parts needed. */ -/* The virtual machine proxy definition */ -#include "sqVirtualMachine.h" -/* Configuration options */ -#include "sqConfig.h" -/* Platform specific definitions */ -#include "sqPlatformSpecific.h" - -#define true 1 -#define false 0 -#define null 0 /* using 'null' because nil is predefined in Think C */ -#ifdef SQUEAK_BUILTIN_PLUGIN -#undef EXPORT -// was #undef EXPORT(returnType) but screws NorCroft cc -#define EXPORT(returnType) static returnType -#endif - -#include "FilePlugin.h" -#include "SocketPlugin.h" -#include "config.h" -#define SESSIONIDENTIFIERTYPE int -#include "sqaio.h" -#include "sqMemoryAccess.h" - - -/*** Constants ***/ - - -/*** Function Prototypes ***/ -static void aioForwardwithDataandFlags(int fd, void *data, int flags); -static sqInt fileDescriptorFrom(sqInt aSQFileByteArray); -static FILEHANDLETYPE fileHandleFrom(sqInt sqFileStructByteArray); -static sqInt fileRecordSize(void); -static SQFile * fileValueOf(sqInt anSQFileRecord); -EXPORT(const char*) getModuleName(void); -static sqInt getThisSessionIdentifier(void); -EXPORT(sqInt) initialiseModule(void); -static sqInt isNonNullSQFile(sqInt objectPointer); -static sqInt isNullSQSocket(sqInt objectPointer); -static sqInt isSQFileObject(sqInt objectPointer); -static sqInt isSQSocketObject(sqInt objectPointer); -static sqInt isValidFileSession(sqInt objectPointer); -EXPORT(sqInt) moduleUnloaded(char *aModuleName); -EXPORT(sqInt) primitiveAioDisable(void); -EXPORT(sqInt) primitiveAioEnable(void); -EXPORT(sqInt) primitiveAioHandle(void); -EXPORT(sqInt) primitiveAioSuspend(void); -EXPORT(sqInt) primitiveModuleName(void); -EXPORT(sqInt) primitiveOSFileHandle(void); -EXPORT(sqInt) primitiveOSSocketHandle(void); -EXPORT(sqInt) primitiveVersionString(void); -static SESSIONIDENTIFIERTYPE sessionIdentifierFromSqFile(SQFile *sqFile); -EXPORT(sqInt) setInterpreter(struct VirtualMachine*anInterpreter); -EXPORT(sqInt) shutdownModule(void); -static int socketDescriptorFrom(sqInt sqSocketOop); -static sqInt socketRecordSize(void); -static SQSocket * socketValueOf(sqInt anSQSocketRecord); -static sqInt stringFromCString(const char *aCString); -static char * versionString(void); - - -/*** Variables ***/ - -#if !defined(SQUEAK_BUILTIN_PLUGIN) -static void * (*arrayValueOf)(sqInt oop); -static sqInt (*byteSizeOf)(sqInt oop); -static sqInt (*classString)(void); -static sqInt (*getThisSessionID)(void); -static sqInt (*instantiateClassindexableSize)(sqInt classPointer, sqInt size); -static sqInt (*isBytes)(sqInt oop); -static sqInt (*nilObject)(void); -static sqInt (*pop)(sqInt nItems); -static sqInt (*popthenPush)(sqInt nItems, sqInt oop); -static sqInt (*primitiveFail)(void); -static sqInt (*pushInteger)(sqInt integerValue); -static sqInt (*signalSemaphoreWithIndex)(sqInt semaIndex); -static sqInt (*stackIntegerValue)(sqInt offset); -static sqInt (*stackObjectValue)(sqInt offset); -static sqInt (*stackValue)(sqInt offset); -static sqInt (*trueObject)(void); -#else /* !defined(SQUEAK_BUILTIN_PLUGIN) */ -extern void * arrayValueOf(sqInt oop); -extern sqInt byteSizeOf(sqInt oop); -extern sqInt classString(void); -extern sqInt getThisSessionID(void); -extern sqInt instantiateClassindexableSize(sqInt classPointer, sqInt size); -extern sqInt isBytes(sqInt oop); -extern sqInt nilObject(void); -extern sqInt pop(sqInt nItems); -extern sqInt popthenPush(sqInt nItems, sqInt oop); -extern sqInt primitiveFail(void); -extern sqInt pushInteger(sqInt integerValue); -extern sqInt signalSemaphoreWithIndex(sqInt semaIndex); -extern sqInt stackIntegerValue(sqInt offset); -extern sqInt stackObjectValue(sqInt offset); -extern sqInt stackValue(sqInt offset); -extern sqInt trueObject(void); -extern -#endif -struct VirtualMachine* interpreterProxy; -static const char *moduleName = -#ifdef SQUEAK_BUILTIN_PLUGIN - "AioPlugin VMConstruction-Plugins-AioPlugin-eem.17 (i)" -#else - "AioPlugin VMConstruction-Plugins-AioPlugin-eem.17 (e)" -#endif -; - - - -/* This function is called to signal a Smalltalk Semaphore when an - asynchronous event is - detected. When translated to C, the name of this method is - aioForwardwithDataandFlags. The event handler is set up by - #primitiveAioHandle. - */ - -static void -aioForwardwithDataandFlags(int fd, void *data, int flags) -{ - int *pfd; - sqInt semaIndex; - - pfd = data; - semaIndex = *pfd; - signalSemaphoreWithIndex(semaIndex); -} - - -/* Answer the OS file descriptor, an integer value, from a SQFile data - structure byte array, or answer -1 if unable to obtain the file descriptor - (probably due - to receiving an incorrect type of object as aFileHandle). - */ -/* return type should be int, but skip the declaration to permit inlining */ - -static sqInt -fileDescriptorFrom(sqInt aSQFileByteArray) -{ - if (!((((isBytes(aSQFileByteArray)) - && ((byteSizeOf(aSQFileByteArray)) == (sizeof(SQFile)))) - && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(aSQFileByteArray))))) - && (isNonNullSQFile(aSQFileByteArray)))) { - return -1; - } - return fileno(fileHandleFrom(aSQFileByteArray)); -} - - -/* Answer a file handle from a SQFile structure. On most platforms, this - will be a (FILE *). On Win32, it is a HANDLE. */ - -static FILEHANDLETYPE -fileHandleFrom(sqInt sqFileStructByteArray) -{ - SQFile *sqFile; - - sqFile = arrayValueOf(sqFileStructByteArray); - return sqFile->file; -} - - -/* Answer the size of a SQFile data structure in bytes. */ - -static sqInt -fileRecordSize(void) -{ - return sizeof(SQFile); -} - - -/* Return a pointer to the first byte of of the SQFile data structure file - record within - anSQFileRecord, which is expected to be a ByteArray of size - self>>fileRecordSize. - */ - -static SQFile * -fileValueOf(sqInt anSQFileRecord) -{ - return arrayValueOf(anSQFileRecord); -} - - -/* Note: This is hardcoded so it can be run from Squeak. - The module name is used for validating a module *after* - it is loaded to check if it does really contain the module - we're thinking it contains. This is important! */ - -EXPORT(const char*) -getModuleName(void) -{ - return moduleName; -} - -static sqInt -getThisSessionIdentifier(void) -{ - return getThisSessionID(); -} - -EXPORT(sqInt) -initialiseModule(void) -{ - return 1; -} - - -/* Check for the common failure mode of a SQFile record with all zeros. */ - -static sqInt -isNonNullSQFile(sqInt objectPointer) -{ - unsigned idx; - unsigned char *sqFileBytes; - - sqFileBytes = arrayValueOf(objectPointer); - idx = 0; - while (idx < (sizeof(SQFile))) { - if ((sqFileBytes[idx]) != 0) { - return 1; - } - idx += 1; - } - return 0; -} - - -/* Check for the common failure mode of a SQSocket record with all zeros. */ - -static sqInt -isNullSQSocket(sqInt objectPointer) -{ - sqInt idx; - unsigned char *sqSocketBytes; - - sqSocketBytes = arrayValueOf(objectPointer); - idx = 0; - while (idx < (socketRecordSize())) { - if ((sqSocketBytes[idx]) != 0) { - return 0; - } - idx += 1; - } - return 1; -} - - -/* Answer true if objectPointer appears to be a valid SQFile ByteArray. - This check is appropriate if objectPointer has been passed as a parameter - to a primitive, and is expected to represent a valid file reference. */ - -static sqInt -isSQFileObject(sqInt objectPointer) -{ - return (((isBytes(objectPointer)) - && ((byteSizeOf(objectPointer)) == (sizeof(SQFile)))) - && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(objectPointer))))) - && (isNonNullSQFile(objectPointer)); -} - - -/* Answer true if objectPointer appears to be a valid SQSocket ByteArray. - This check - is appropriate if objectPointer has been passed as a parameter to a - primitive, and - is expected to represent a valid socket reference. - */ - -static sqInt -isSQSocketObject(sqInt objectPointer) -{ - return ((isBytes(objectPointer)) - && ((byteSizeOf(objectPointer)) == (socketRecordSize()))) - && (!(isNullSQSocket(objectPointer))); -} - - -/* Answer true if the file session matches the current interpreter session - identifier. - */ - -static sqInt -isValidFileSession(sqInt objectPointer) -{ - return (getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(objectPointer))); -} - - -/* The module with the given name was just unloaded. - Make sure we have no dangling references. */ - -EXPORT(sqInt) -moduleUnloaded(char *aModuleName) -{ -} - - -/* Definitively disable asynchronous event notification for a descriptor. The - parameter is an OS level integer file descriptor. */ - -EXPORT(sqInt) -primitiveAioDisable(void) -{ - sqInt fd; - - if ((nilObject()) == (stackValue(0))) { - return primitiveFail(); - } - fd = stackIntegerValue(0); - if (fd < 0) { - return primitiveFail(); - } - aioDisable(fd); - pop(2); - pushInteger(fd); -} - - -/* Enable asynchronous notification for a descriptor. The first parameter is - an OS - level integer file descriptor. The second parameter is the index of a - Semaphore to - be notified, and the third parameter is a flag indicating that descriptor - represents an external object and should not be closed on termination of - aio handling. Answer - the semaphore index. - */ - -EXPORT(sqInt) -primitiveAioEnable(void) -{ - static int eventSemaphoreIndices[FD_SETSIZE]; - sqInt externalObject; - sqInt fd; - sqInt flags; - sqInt semaIndex; - - if ((nilObject()) == (stackValue(2))) { - return primitiveFail(); - } - fd = stackIntegerValue(2); - if (fd < 0) { - return primitiveFail(); - } - semaIndex = stackIntegerValue(1); - eventSemaphoreIndices[semaIndex] = semaIndex; - externalObject = stackObjectValue(0); - if (externalObject == (trueObject())) { - flags = AIO_EXT; - } - else { - flags = 0; - } - aioEnable(fd, &(eventSemaphoreIndices[semaIndex]), flags); - pop(4); - pushInteger(semaIndex); -} - - -/* Handle asynchronous event notification for a descriptor. The first - parameter is - an OS level integer file descriptor. The remaining three parameters are - Boolean flags representing the types of events for which notification is - being requested: - handle exceptions, handle for read, and handle for write. - Flags are defined in the aio.h source as: - AIO_X (1<<0) handle for exceptions - AIO_R (1<<1) handle for read - AIO_W (1<<2) handle for write */ - -EXPORT(sqInt) -primitiveAioHandle(void) -{ - sqInt exceptionWatch; - sqInt fd; - sqInt flags; - sqInt readWatch; - sqInt writeWatch; - - if ((nilObject()) == (stackValue(3))) { - return primitiveFail(); - } - fd = stackIntegerValue(3); - if (fd < 0) { - return primitiveFail(); - } - exceptionWatch = stackObjectValue(2); - readWatch = stackObjectValue(1); - writeWatch = stackObjectValue(0); - flags = 0; - if (exceptionWatch == (trueObject())) { - flags = flags | (AIO_X); - } - if (readWatch == (trueObject())) { - flags = flags | (AIO_R); - } - if (writeWatch == (trueObject())) { - flags = flags | (AIO_W); - } - aioHandle(fd, aioForwardwithDataandFlags, flags); - pop(5); - pushInteger(flags); -} - - -/* Temporarily suspend asynchronous event notification for a descriptor. The - first parameter is an OS level integer file descriptor. The remaining - three parameters - are Boolean flags representing the types of events for which notification - is being - requested: handle exceptions, handle for read, and handle for write. - Flags are defined in the aio.h source as: - AIO_X (1<<0) handle for exceptions - AIO_R (1<<1) handle for read - AIO_W (1<<2) handle for write */ - -EXPORT(sqInt) -primitiveAioSuspend(void) -{ - sqInt exceptionWatch; - sqInt fd; - sqInt flags; - sqInt readWatch; - sqInt writeWatch; - - if ((nilObject()) == (stackValue(3))) { - return primitiveFail(); - } - fd = stackIntegerValue(3); - if (fd < 0) { - return primitiveFail(); - } - exceptionWatch = stackObjectValue(2); - readWatch = stackObjectValue(1); - writeWatch = stackObjectValue(0); - flags = 0; - if (exceptionWatch == (trueObject())) { - flags = flags | (AIO_X); - } - if (readWatch == (trueObject())) { - flags = flags | (AIO_R); - } - if (writeWatch == (trueObject())) { - flags = flags | (AIO_W); - } - aioSuspend(fd, flags); - pop(5); - pushInteger(flags); -} - - -/* Answer a string containing the module name string for this plugin. */ - -EXPORT(sqInt) -primitiveModuleName(void) -{ - popthenPush(1, stringFromCString(getModuleName())); -} - - -/* Take a struct SQFile from the stack, and answer the value of its Unix file - number. - */ - -EXPORT(sqInt) -primitiveOSFileHandle(void) -{ - sqInt fileNo; - sqInt sqFileOop; - - sqFileOop = stackValue(0); - if (!((((isBytes(sqFileOop)) - && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) - && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) - && (isNonNullSQFile(sqFileOop)))) { - return primitiveFail(); - } - /* begin fileDescriptorFrom: */ - if (!((((isBytes(sqFileOop)) - && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) - && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) - && (isNonNullSQFile(sqFileOop)))) { - fileNo = -1; - goto l1; - } - fileNo = fileno(fileHandleFrom(sqFileOop)); -l1: /* end fileDescriptorFrom: */; - pop(2); - pushInteger(fileNo); -} - - -/* Take a struct SQSocket from the stack, and answer the value of its Unix - file number. - */ - -EXPORT(sqInt) -primitiveOSSocketHandle(void) -{ - int fileNo; - sqInt sqSocketOop; - - sqSocketOop = stackValue(0); - if (!(((isBytes(sqSocketOop)) - && ((byteSizeOf(sqSocketOop)) == (socketRecordSize()))) - && (!(isNullSQSocket(sqSocketOop))))) { - return primitiveFail(); - } - fileNo = socketDescriptorFrom(sqSocketOop); - if (fileNo < 0) { - return primitiveFail(); - } - pop(2); - pushInteger(fileNo); -} - - -/* Answer a string containing the version string for this plugin. */ - -EXPORT(sqInt) -primitiveVersionString(void) -{ - popthenPush(1, stringFromCString(versionString())); -} - - -/* Answer the session identifier from a SQFile structure. For a valid file - reference, this identifier will match the session identifier supplied by - the interpreter. */ - -static SESSIONIDENTIFIERTYPE -sessionIdentifierFromSqFile(SQFile *sqFile) -{ - return sqFile->sessionID; -} - - -/* Note: This is coded so that it can be run in Squeak. */ - -EXPORT(sqInt) -setInterpreter(struct VirtualMachine*anInterpreter) -{ - sqInt ok; - - interpreterProxy = anInterpreter; - ok = ((interpreterProxy->majorVersion()) == (VM_PROXY_MAJOR)) - && ((interpreterProxy->minorVersion()) >= (VM_PROXY_MINOR)); - if (ok) { - -#if !defined(SQUEAK_BUILTIN_PLUGIN) - arrayValueOf = interpreterProxy->arrayValueOf; - byteSizeOf = interpreterProxy->byteSizeOf; - classString = interpreterProxy->classString; - getThisSessionID = interpreterProxy->getThisSessionID; - instantiateClassindexableSize = interpreterProxy->instantiateClassindexableSize; - isBytes = interpreterProxy->isBytes; - nilObject = interpreterProxy->nilObject; - pop = interpreterProxy->pop; - popthenPush = interpreterProxy->popthenPush; - primitiveFail = interpreterProxy->primitiveFail; - pushInteger = interpreterProxy->pushInteger; - signalSemaphoreWithIndex = interpreterProxy->signalSemaphoreWithIndex; - stackIntegerValue = interpreterProxy->stackIntegerValue; - stackObjectValue = interpreterProxy->stackObjectValue; - stackValue = interpreterProxy->stackValue; - trueObject = interpreterProxy->trueObject; -#endif /* !defined(SQUEAK_BUILTIN_PLUGIN) */ - } - return ok; -} - -EXPORT(sqInt) -shutdownModule(void) -{ -} - - -/* Answer the OS file descriptor, an integer value, from a SQSocket data - structure, or answer -1 if unable to obtain the file descriptor (probably - due to receiving - an incorrect type of object as aFileHandle). - - Warning: The first element of privateSocketStruct happens to be the Unix - file number of the socket. See sqUnixSocket.c for the definition. This - method takes - advantage of this, and will break if anyone ever redefines the data - structure. - */ - -static int -socketDescriptorFrom(sqInt sqSocketOop) -{ - void *privateSocketStruct; - SQSocket *sqSocket; - - /* begin socketValueOf: */ - sqSocket = arrayValueOf(sqSocketOop); - privateSocketStruct = sqSocket->privateSocketPtr; - if (privateSocketStruct == 0) { - return -1; - } - return * (int *) privateSocketStruct; -} - - -/* Answer the size of a SQSocket data structure in bytes. */ - -static sqInt -socketRecordSize(void) -{ - return sizeof(SQSocket); -} - - -/* Return a pointer to the first byte of of the SQsocket data structure - socket record within - anSQSocketRecord, which is expected to be a ByteArray of size - self>>socketRecordSize. - */ - -static SQSocket * -socketValueOf(sqInt anSQSocketRecord) -{ - return arrayValueOf(anSQSocketRecord); -} - - -/* Answer a new String copied from a null-terminated C string. - Caution: This may invoke the garbage collector. */ - -static sqInt -stringFromCString(const char *aCString) -{ - sqInt len; - sqInt newString; - - len = strlen(aCString); - newString = instantiateClassindexableSize(classString(), len); - strncpy(arrayValueOf(newString), aCString, len); - return newString; -} - - -/* Answer a string containing the version string for this plugin. Handle MNU - errors, which can occur if class InterpreterPlugin has been removed from - the system. - - Important: When this method is changed, the class side method must also be - changed to match. - */ -/* 2.0 supports 64bit code base */ - -static char * -versionString(void) -{ - static char version[]= "2.2.6"; - - return version; -} - - -#ifdef SQUEAK_BUILTIN_PLUGIN - -void* AioPlugin_exports[][3] = { - {"AioPlugin", "getModuleName", (void*)getModuleName}, - {"AioPlugin", "initialiseModule", (void*)initialiseModule}, - {"AioPlugin", "moduleUnloaded", (void*)moduleUnloaded}, - {"AioPlugin", "primitiveAioDisable\000\000", (void*)primitiveAioDisable}, - {"AioPlugin", "primitiveAioEnable\000\000", (void*)primitiveAioEnable}, - {"AioPlugin", "primitiveAioHandle\000\000", (void*)primitiveAioHandle}, - {"AioPlugin", "primitiveAioSuspend\000\000", (void*)primitiveAioSuspend}, - {"AioPlugin", "primitiveModuleName\000\377", (void*)primitiveModuleName}, - {"AioPlugin", "primitiveOSFileHandle\000\001", (void*)primitiveOSFileHandle}, - {"AioPlugin", "primitiveOSSocketHandle\000\001", (void*)primitiveOSSocketHandle}, - {"AioPlugin", "primitiveVersionString\000\377", (void*)primitiveVersionString}, - {"AioPlugin", "setInterpreter", (void*)setInterpreter}, - {"AioPlugin", "shutdownModule\000\377", (void*)shutdownModule}, - {NULL, NULL, NULL} -}; - -#else /* ifdef SQ_BUILTIN_PLUGIN */ - -signed char primitiveAioDisableAccessorDepth = 0; -signed char primitiveAioEnableAccessorDepth = 0; -signed char primitiveAioHandleAccessorDepth = 0; -signed char primitiveAioSuspendAccessorDepth = 0; -signed char primitiveOSFileHandleAccessorDepth = 1; -signed char primitiveOSSocketHandleAccessorDepth = 1; - -#endif /* ifdef SQ_BUILTIN_PLUGIN */ Copied: branches/Cog/nsspursrc/plugins/AioPlugin/AioPlugin.c (from rev 3260, branches/Cog/nscogsrc/plugins/AioPlugin/AioPlugin.c) =================================================================== --- branches/Cog/nsspursrc/plugins/AioPlugin/AioPlugin.c (rev 0) +++ branches/Cog/nsspursrc/plugins/AioPlugin/AioPlugin.c 2015-02-24 22:04:06 UTC (rev 3263) @@ -0,0 +1,711 @@ +/* Automatically generated by + VMPluginCodeGenerator VMMaker.oscog-eem.1080 uuid: 8b1a09b7-4f58-4375-b16a-e42e63ffd542 + from + UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.17 uuid: a2b39cb2-e681-4bc3-a777-f03b2e3f2de0 + */ +static char __buildInfo[] = "UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.17 uuid: a2b39cb2-e681-4bc3-a777-f03b2e3f2de0 " __DATE__ ; + + + +#include <math.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <time.h> +#include <unistd.h> +#define FILEHANDLETYPE FILE * /* the type of low level stream to be used in a struct SQFile */ + +/* Default EXPORT macro that does nothing (see comment in sq.h): */ +#define EXPORT(returnType) returnType + +/* Do not include the entire sq.h file but just those parts needed. */ +/* The virtual machine proxy definition */ +#include "sqVirtualMachine.h" +/* Configuration options */ +#include "sqConfig.h" +/* Platform specific definitions */ +#include "sqPlatformSpecific.h" + +#define true 1 +#define false 0 +#define null 0 /* using 'null' because nil is predefined in Think C */ +#ifdef SQUEAK_BUILTIN_PLUGIN +#undef EXPORT +// was #undef EXPORT(returnType) but screws NorCroft cc +#define EXPORT(returnType) static returnType +#endif + +#include "FilePlugin.h" +#include "SocketPlugin.h" +#include "config.h" +#define SESSIONIDENTIFIERTYPE int +#include "sqaio.h" +#include "sqMemoryAccess.h" + + +/*** Constants ***/ + + +/*** Function Prototypes ***/ +static void aioForwardwithDataandFlags(int fd, void *data, int flags); +static sqInt fileDescriptorFrom(sqInt aSQFileByteArray); +static FILEHANDLETYPE fileHandleFrom(sqInt sqFileStructByteArray); +static sqInt fileRecordSize(void); +static SQFile * fileValueOf(sqInt anSQFileRecord); +EXPORT(const char*) getModuleName(void); +static sqInt getThisSessionIdentifier(void); +EXPORT(sqInt) initialiseModule(void); +static sqInt isNonNullSQFile(sqInt objectPointer); +static sqInt isNullSQSocket(sqInt objectPointer); +static sqInt isSQFileObject(sqInt objectPointer); +static sqInt isSQSocketObject(sqInt objectPointer); +static sqInt isValidFileSession(sqInt objectPointer); +EXPORT(sqInt) moduleUnloaded(char *aModuleName); +EXPORT(sqInt) primitiveAioDisable(void); +EXPORT(sqInt) primitiveAioEnable(void); +EXPORT(sqInt) primitiveAioHandle(void); +EXPORT(sqInt) primitiveAioSuspend(void); +EXPORT(sqInt) primitiveModuleName(void); +EXPORT(sqInt) primitiveOSFileHandle(void); +EXPORT(sqInt) primitiveOSSocketHandle(void); +EXPORT(sqInt) primitiveVersionString(void); +static SESSIONIDENTIFIERTYPE sessionIdentifierFromSqFile(SQFile *sqFile); +EXPORT(sqInt) setInterpreter(struct VirtualMachine*anInterpreter); +EXPORT(sqInt) shutdownModule(void); +static int socketDescriptorFrom(sqInt sqSocketOop); +static sqInt socketRecordSize(void); +static SQSocket * socketValueOf(sqInt anSQSocketRecord); +static sqInt stringFromCString(const char *aCString); +static char * versionString(void); + + +/*** Variables ***/ + +#if !defined(SQUEAK_BUILTIN_PLUGIN) +static void * (*arrayValueOf)(sqInt oop); +static sqInt (*byteSizeOf)(sqInt oop); +static sqInt (*classString)(void); +static sqInt (*getThisSessionID)(void); +static sqInt (*instantiateClassindexableSize)(sqInt classPointer, sqInt size); +static sqInt (*isBytes)(sqInt oop); +static sqInt (*nilObject)(void); +static sqInt (*pop)(sqInt nItems); +static sqInt (*popthenPush)(sqInt nItems, sqInt oop); +static sqInt (*primitiveFail)(void); +static sqInt (*pushInteger)(sqInt integerValue); +static sqInt (*signalSemaphoreWithIndex)(sqInt semaIndex); +static sqInt (*stackIntegerValue)(sqInt offset); +static sqInt (*stackObjectValue)(sqInt offset); +static sqInt (*stackValue)(sqInt offset); +static sqInt (*trueObject)(void); +#else /* !defined(SQUEAK_BUILTIN_PLUGIN) */ +extern void * arrayValueOf(sqInt oop); +extern sqInt byteSizeOf(sqInt oop); +extern sqInt classString(void); +extern sqInt getThisSessionID(void); +extern sqInt instantiateClassindexableSize(sqInt classPointer, sqInt size); +extern sqInt isBytes(sqInt oop); +extern sqInt nilObject(void); +extern sqInt pop(sqInt nItems); +extern sqInt popthenPush(sqInt nItems, sqInt oop); +extern sqInt primitiveFail(void); +extern sqInt pushInteger(sqInt integerValue); +extern sqInt signalSemaphoreWithIndex(sqInt semaIndex); +extern sqInt stackIntegerValue(sqInt offset); +extern sqInt stackObjectValue(sqInt offset); +extern sqInt stackValue(sqInt offset); +extern sqInt trueObject(void); +extern +#endif +struct VirtualMachine* interpreterProxy; +static const char *moduleName = +#ifdef SQUEAK_BUILTIN_PLUGIN + "AioPlugin VMConstruction-Plugins-AioPlugin-eem.17 (i)" +#else + "AioPlugin VMConstruction-Plugins-AioPlugin-eem.17 (e)" +#endif +; + + + +/* This function is called to signal a Smalltalk Semaphore when an + asynchronous event is + detected. When translated to C, the name of this method is + aioForwardwithDataandFlags. The event handler is set up by + #primitiveAioHandle. + */ + +static void +aioForwardwithDataandFlags(int fd, void *data, int flags) +{ + int *pfd; + sqInt semaIndex; + + pfd = data; + semaIndex = *pfd; + signalSemaphoreWithIndex(semaIndex); +} + + +/* Answer the OS file descriptor, an integer value, from a SQFile data + structure byte array, or answer -1 if unable to obtain the file descriptor + (probably due + to receiving an incorrect type of object as aFileHandle). + */ +/* return type should be int, but skip the declaration to permit inlining */ + +static sqInt +fileDescriptorFrom(sqInt aSQFileByteArray) +{ + if (!((((isBytes(aSQFileByteArray)) + && ((byteSizeOf(aSQFileByteArray)) == (sizeof(SQFile)))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(aSQFileByteArray))))) + && (isNonNullSQFile(aSQFileByteArray)))) { + return -1; + } + return fileno(fileHandleFrom(aSQFileByteArray)); +} + + +/* Answer a file handle from a SQFile structure. On most platforms, this + will be a (FILE *). On Win32, it is a HANDLE. */ + +static FILEHANDLETYPE +fileHandleFrom(sqInt sqFileStructByteArray) +{ + SQFile *sqFile; + + sqFile = arrayValueOf(sqFileStructByteArray); + return sqFile->file; +} + + +/* Answer the size of a SQFile data structure in bytes. */ + +static sqInt +fileRecordSize(void) +{ + return sizeof(SQFile); +} + + +/* Return a pointer to the first byte of of the SQFile data structure file + record within + anSQFileRecord, which is expected to be a ByteArray of size + self>>fileRecordSize. + */ + +static SQFile * +fileValueOf(sqInt anSQFileRecord) +{ + return arrayValueOf(anSQFileRecord); +} + + +/* Note: This is hardcoded so it can be run from Squeak. + The module name is used for validating a module *after* + it is loaded to check if it does really contain the module + we're thinking it contains. This is important! */ + +EXPORT(const char*) +getModuleName(void) +{ + return moduleName; +} + +static sqInt +getThisSessionIdentifier(void) +{ + return getThisSessionID(); +} + +EXPORT(sqInt) +initialiseModule(void) +{ + return 1; +} + + +/* Check for the common failure mode of a SQFile record with all zeros. */ + +static sqInt +isNonNullSQFile(sqInt objectPointer) +{ + unsigned idx; + unsigned char *sqFileBytes; + + sqFileBytes = arrayValueOf(objectPointer); + idx = 0; + while (idx < (sizeof(SQFile))) { + if ((sqFileBytes[idx]) != 0) { + return 1; + } + idx += 1; + } + return 0; +} + + +/* Check for the common failure mode of a SQSocket record with all zeros. */ + +static sqInt +isNullSQSocket(sqInt objectPointer) +{ + sqInt idx; + unsigned char *sqSocketBytes; + + sqSocketBytes = arrayValueOf(objectPointer); + idx = 0; + while (idx < (socketRecordSize())) { + if ((sqSocketBytes[idx]) != 0) { + return 0; + } + idx += 1; + } + return 1; +} + + +/* Answer true if objectPointer appears to be a valid SQFile ByteArray. + This check is appropriate if objectPointer has been passed as a parameter + to a primitive, and is expected to represent a valid file reference. */ + +static sqInt +isSQFileObject(sqInt objectPointer) +{ + return (((isBytes(objectPointer)) + && ((byteSizeOf(objectPointer)) == (sizeof(SQFile)))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(objectPointer))))) + && (isNonNullSQFile(objectPointer)); +} + + +/* Answer true if objectPointer appears to be a valid SQSocket ByteArray. + This check + is appropriate if objectPointer has been passed as a parameter to a + primitive, and + is expected to represent a valid socket reference. + */ + +static sqInt +isSQSocketObject(sqInt objectPointer) +{ + return ((isBytes(objectPointer)) + && ((byteSizeOf(objectPointer)) == (socketRecordSize()))) + && (!(isNullSQSocket(objectPointer))); +} + + +/* Answer true if the file session matches the current interpreter session + identifier. + */ + +static sqInt +isValidFileSession(sqInt objectPointer) +{ + return (getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(objectPointer))); +} + + +/* The module with the given name was just unloaded. + Make sure we have no dangling references. */ + +EXPORT(sqInt) +moduleUnloaded(char *aModuleName) +{ +} + + +/* Definitively disable asynchronous event notification for a descriptor. The + parameter is an OS level integer file descriptor. */ + +EXPORT(sqInt) +primitiveAioDisable(void) +{ + sqInt fd; + + if ((nilObject()) == (stackValue(0))) { + return primitiveFail(); + } + fd = stackIntegerValue(0); + if (fd < 0) { + return primitiveFail(); + } + aioDisable(fd); + pop(2); + pushInteger(fd); +} + + +/* Enable asynchronous notification for a descriptor. The first parameter is + an OS + level integer file descriptor. The second parameter is the index of a + Semaphore to + be notified, and the third parameter is a flag indicating that descriptor + represents an external object and should not be closed on termination of + aio handling. Answer + the semaphore index. + */ + +EXPORT(sqInt) +primitiveAioEnable(void) +{ + static int eventSemaphoreIndices[FD_SETSIZE]; + sqInt externalObject; + sqInt fd; + sqInt flags; + sqInt semaIndex; + + if ((nilObject()) == (stackValue(2))) { + return primitiveFail(); + } + fd = stackIntegerValue(2); + if (fd < 0) { + return primitiveFail(); + } + semaIndex = stackIntegerValue(1); + eventSemaphoreIndices[semaIndex] = semaIndex; + externalObject = stackObjectValue(0); + if (externalObject == (trueObject())) { + flags = AIO_EXT; + } + else { + flags = 0; + } + aioEnable(fd, &(eventSemaphoreIndices[semaIndex]), flags); + pop(4); + pushInteger(semaIndex); +} + + +/* Handle asynchronous event notification for a descriptor. The first + parameter is + an OS level integer file descriptor. The remaining three parameters are + Boolean flags representing the types of events for which notification is + being requested: + handle exceptions, handle for read, and handle for write. + Flags are defined in the aio.h source as: + AIO_X (1<<0) handle for exceptions + AIO_R (1<<1) handle for read + AIO_W (1<<2) handle for write */ + +EXPORT(sqInt) +primitiveAioHandle(void) +{ + sqInt exceptionWatch; + sqInt fd; + usqInt flags; + sqInt readWatch; + sqInt writeWatch; + + if ((nilObject()) == (stackValue(3))) { + return primitiveFail(); + } + fd = stackIntegerValue(3); + if (fd < 0) { + return primitiveFail(); + } + exceptionWatch = stackObjectValue(2); + readWatch = stackObjectValue(1); + writeWatch = stackObjectValue(0); + flags = 0; + if (exceptionWatch == (trueObject())) { + flags = flags | (AIO_X); + } + if (readWatch == (trueObject())) { + flags = flags | (AIO_R); + } + if (writeWatch == (trueObject())) { + flags = flags | (AIO_W); + } + aioHandle(fd, aioForwardwithDataandFlags, flags); + pop(5); + pushInteger(flags); +} + + +/* Temporarily suspend asynchronous event notification for a descriptor. The + first parameter is an OS level integer file descriptor. The remaining + three parameters + are Boolean flags representing the types of events for which notification + is being + requested: handle exceptions, handle for read, and handle for write. + Flags are defined in the aio.h source as: + AIO_X (1<<0) handle for exceptions + AIO_R (1<<1) handle for read + AIO_W (1<<2) handle for write */ + +EXPORT(sqInt) +primitiveAioSuspend(void) +{ + sqInt exceptionWatch; + sqInt fd; + usqInt flags; + sqInt readWatch; + sqInt writeWatch; + + if ((nilObject()) == (stackValue(3))) { + return primitiveFail(); + } + fd = stackIntegerValue(3); + if (fd < 0) { + return primitiveFail(); + } + exceptionWatch = stackObjectValue(2); + readWatch = stackObjectValue(1); + writeWatch = stackObjectValue(0); + flags = 0; + if (exceptionWatch == (trueObject())) { + flags = flags | (AIO_X); + } + if (readWatch == (trueObject())) { + flags = flags | (AIO_R); + } + if (writeWatch == (trueObject())) { + flags = flags | (AIO_W); + } + aioSuspend(fd, flags); + pop(5); + pushInteger(flags); +} + + +/* Answer a string containing the module name string for this plugin. */ + +EXPORT(sqInt) +primitiveModuleName(void) +{ + popthenPush(1, stringFromCString(getModuleName())); +} + + +/* Take a struct SQFile from the stack, and answer the value of its Unix file + number. + */ + +EXPORT(sqInt) +primitiveOSFileHandle(void) +{ + sqInt fileNo; + sqInt sqFileOop; + + sqFileOop = stackValue(0); + if (!((((isBytes(sqFileOop)) + && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) + && (isNonNullSQFile(sqFileOop)))) { + return primitiveFail(); + } + /* begin fileDescriptorFrom: */ + if (!((((isBytes(sqFileOop)) + && ((byteSizeOf(sqFileOop)) == (sizeof(SQFile)))) + && ((getThisSessionID()) == (sessionIdentifierFromSqFile(arrayValueOf(sqFileOop))))) + && (isNonNullSQFile(sqFileOop)))) { + fileNo = -1; + goto l1; + } + fileNo = fileno(fileHandleFrom(sqFileOop)); +l1: /* end fileDescriptorFrom: */; + pop(2); + pushInteger(fileNo); +} + + +/* Take a struct SQSocket from the stack, and answer the value of its Unix + file number. + */ + +EXPORT(sqInt) +primitiveOSSocketHandle(void) +{ + int fileNo; + sqInt sqSocketOop; + + sqSocketOop = stackValue(0); + if (!(((isBytes(sqSocketOop)) + && ((byteSizeOf(sqSocketOop)) == (socketRecordSize()))) + && (!(isNullSQSocket(sqSocketOop))))) { + return primitiveFail(); + } + fileNo = socketDescriptorFrom(sqSocketOop); + if (fileNo < 0) { + return primitiveFail(); + } + pop(2); + pushInteger(fileNo); +} + + +/* Answer a string containing the version string for this plugin. */ + +EXPORT(sqInt) +primitiveVersionString(void) +{ + popthenPush(1, stringFromCString(versionString())); +} + + +/* Answer the session identifier from a SQFile structure. For a valid file + reference, this identifier will match the session identifier supplied by + the interpreter. */ + +static SESSIONIDENTIFIERTYPE +sessionIdentifierFromSqFile(SQFile *sqFile) +{ + return sqFile->sessionID; +} + + +/* Note: This is coded so that it can be run in Squeak. */ + +EXPORT(sqInt) +setInterpreter(struct VirtualMachine*anInterpreter) +{ + sqInt ok; + @@ Diff output truncated at 50000 characters. @@

1 0

VM Maker: VMMaker.oscog-eem.1080.mcz
by commits＠source.squeak.org 24 Feb '15

24 Feb '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1080.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1080 Author: eem Time: 24 February 2015, 1:32:36.301 pm UUID: 8b1a09b7-4f58-4375-b16a-e42e63ffd542 Ancestors: VMMaker.oscog-eem.1079 The Newspeak VMs still need plugins =============== Diff against VMMaker.oscog-eem.1079 =============== Item was changed: ----- Method: VMMaker class>>generateNewspeakSpurCogVM (in category 'configurations') ----- generateNewspeakSpurCogVM "No primitives since we can use those for the Cog Newspeak VM" ^VMMaker generate: CoInterpreter and: StackToRegisterMappingCogit with: #( ObjectMemory Spur32BitCoMemoryManager MULTIPLEBYTECODESETS true NewspeakVM true) to: (FileDirectory default pathFromURI: self sourceTree, '/nsspursrc') platformDir: (FileDirectory default pathFromURI: self sourceTree, '/platforms') + including:#( AsynchFilePlugin BMPReadWriterPlugin BalloonEnginePlugin BitBltSimulation + DeflatePlugin DSAPlugin DropPlugin FileCopyPlugin FilePlugin FloatArrayPlugin FloatMathPlugin + ImmX11Plugin JPEGReadWriter2Plugin JPEGReaderPlugin LargeIntegersPlugin + Matrix2x3Plugin MiscPrimitivePlugin NewsqueakIA32ABIPlugin RePlugin + SecurityPlugin SocketPlugin SoundPlugin SqueakSSLPlugin SurfacePlugin + UUIDPlugin UnixOSProcessPlugin UnixAioPlugin + VMProfileLinuxSupportPlugin VMProfileMacSupportPlugin Win32OSProcessPlugin) + ! - including:#()!

1 0

VM Maker: VMMaker.oscog-eem.1079.mcz
by commits＠source.squeak.org 24 Feb '15

24 Feb '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1079.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1079 Author: eem Time: 24 February 2015, 1:06:45.228 pm UUID: fdd342f3-6d47-4bbe-be50-86e2865b8b3b Ancestors: VMMaker.oscog-eem.1078 Avoid casting nil to pointers =============== Diff against VMMaker.oscog-eem.1078 =============== Item was added: + ----- Method: CCodeGenerator>>variableOfType:acceptsValue:ofType: (in category 'inlining') ----- + variableOfType: variableType acceptsValue: exprNode ofType: expressionType + "Simple type checking for assignment/return values" + + ^variableType isNil "means as yet untyped, hence can adapt" + or: [expressionType isNil "means we don't know. Potentially dangerous to say yes, but Slang is traditionally lax :(" + or: [variableType = expressionType + or: [variableType notNil + and: [(variableType includes: $*) + ifTrue: + [(exprNode isVariable and: [exprNode name = 'nil']) + or: [expressionType last = $* + and: [(self isVoidPointer: variableType) + or: [self isVoidPointer: expressionType]]]] + ifFalse: "Require a cast if assigning integral with floating-point but not the other way around" + [((self isIntegralCType: variableType) + and: [(self isIntegralCType: expressionType) + and: [(self sizeOfIntegralCType: variableType) >= (self sizeOfIntegralCType: expressionType)]]) + or: [(self isFloatingPointCType: variableType) + and: [(self isFloatingPointCType: expressionType) + or: [self isIntegralCType: expressionType]]]]]]]]! Item was removed: - ----- Method: CCodeGenerator>>variableOfType:acceptsValueOfType: (in category 'inlining') ----- - variableOfType: variableType acceptsValueOfType: expressionType - "Simple type checking for assignment/return values" - - ^variableType isNil "means as yet untyped, hence can adapt" - or: [expressionType isNil "means we don't know. Potentially dangerous to say yes, but Slang is traditionally lax :(" - or: [variableType = expressionType - or: [variableType notNil - and: [(variableType includes: $*) - ifTrue: - [expressionType last = $* - and: [(self isVoidPointer: variableType) - or: [self isVoidPointer: expressionType]]] - ifFalse: "Require a cast if assigning integral with floating-point but not the other way around" - [((self isIntegralCType: variableType) - and: [(self isIntegralCType: expressionType) - and: [(self sizeOfIntegralCType: variableType) >= (self sizeOfIntegralCType: expressionType)]]) - or: [(self isFloatingPointCType: variableType) - and: [(self isFloatingPointCType: expressionType) - or: [self isIntegralCType: expressionType]]]]]]]]! Item was changed: ----- Method: TMethod>>node:typeCompatibleWith:inliningInto:in: (in category 'inlining') ----- node: exprNode typeCompatibleWith: argName inliningInto: inlineSelector in: aCodeGen "Answer either exprNode or, iff argName is typed and exprNode is untyped, a cast of exprNode to the type of argName." | formalType actualType | ^((exprNode isSend or: [exprNode isVariable]) and: [(formalType := self typeFor: argName in: aCodeGen) notNil and: [(actualType := aCodeGen typeFor: exprNode in: self) isNil + or: [(aCodeGen variableOfType: formalType acceptsValue: exprNode ofType: actualType) not]]]) - or: [(aCodeGen variableOfType: formalType acceptsValueOfType: actualType) not]]]) ifTrue: [aCodeGen nodeToCast: exprNode to: formalType] ifFalse: [((exprNode isSend or: [exprNode isVariable]) and: [(aCodeGen variableOfType: (aCodeGen typeFor: exprNode in: self) + acceptsValue: exprNode + ofType: (self typeFor: argName in: aCodeGen)) not]) ifTrue: - acceptsValueOfType: (self typeFor: argName in: aCodeGen)) not]) ifTrue: [aCodeGen logger nextPutAll: 'type mismatch for formal ', argName, ' and actual ', exprNode asString, ' when inlining ', inlineSelector, ' in ', selector, '. Use a cast.'; cr; flush]. exprNode]!

1 0

VM Maker: VMMaker.oscog-eem.1078.mcz
by commits＠source.squeak.org 24 Feb '15

24 Feb '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1078.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1078 Author: eem Time: 24 February 2015, 11:41:02.64 am UUID: 4f7efca2-6dd0-40ea-9abb-2b1f68ee8269 Ancestors: VMMaker.oscog-eem.1077 Fix a typing bug in initializeOldSpaceFirstFree:. Add breakpoint in inferReturnTypeFromReturnsIn: =============== Diff against VMMaker.oscog-eem.1077 =============== Item was changed: ----- Method: SpurMemoryManager>>initializeOldSpaceFirstFree: (in category 'free space') ----- initializeOldSpaceFirstFree: startOfFreeOldSpace + <var: 'startOfFreeOldSpace' type: #usqInt> - <var: 'startOfFreeOldSpace' type: #usqLong> | limit freeOldStart freeChunk | + <var: 'limit' type: #usqInt> + <var: 'freeOldStart' type: #usqInt> - <var: 'limit' type: #usqLong> - <var: 'freeOldStart' type: #usqLong> limit := endOfMemory - self bridgeSize. limit > startOfFreeOldSpace ifTrue: [totalFreeOldSpace := totalFreeOldSpace + (limit - startOfFreeOldSpace). freeOldStart := startOfFreeOldSpace. self wordSize > 4 ifTrue: [[limit - freeOldStart >= (1 << 32)] whileTrue: [freeChunk := self freeChunkWithBytes: (1 << 32) at: freeOldStart. freeOldStart := freeOldStart + (1 << 32). self assert: freeOldStart = (self addressAfter: freeChunk)]]. freeOldStart < limit ifTrue: [freeChunk := self freeChunkWithBytes: limit - freeOldStart at: freeOldStart. self assert: (self addressAfter: freeChunk) = limit]]. endOfMemory := endOfMemory - self bridgeSize. freeOldSpaceStart := endOfMemory. self checkFreeSpace! Item was changed: ----- Method: TMethod>>inferReturnTypeFromReturnsIn: (in category 'type inference') ----- inferReturnTypeFromReturnsIn: aCodeGen "Attempt to infer the return type of the receiver from returns in the parse tree." "this for determining which returns have which return types:" "aCodeGen pushScope: declarations while: [parseTree nodesSelect: [:n| n isReturn] thenCollect: [:n| | s | s := Set new. self addTypesFor: n expression to: s in: aCodeGen. {n. s}]]" + + aCodeGen maybeBreakForTestToInline: selector in: self. returnType ifNil: "the initial default" [aCodeGen pushScope: declarations while: [| hasReturn returnTypes | hasReturn := false. returnTypes := Set new. "Debug: (| rettypes | rettypes := Dictionary new. parseTree nodesDo: [:node| node isReturn ifTrue: [| types | self addTypesFor: node expression to: (types := Set new) in: aCodeGen. rettypes at: node expression put: types]]. rettypes)" parseTree nodesDo: [:node| node isReturn ifTrue: [hasReturn := true. self addTypesFor: node expression to: returnTypes in: aCodeGen]]. returnTypes remove: #implicit ifAbsent: []. returnTypes := aCodeGen harmonizeReturnTypesIn: returnTypes. hasReturn ifTrue: [returnTypes size > 1 ifTrue: [| message | message := String streamContents: [:s| s nextPutAll: 'conflicting return types '. returnTypes do: [:t| s nextPutAll: t] separatedBy: [s nextPutAll: ', ']. s nextPutAll: ' in '; nextPutAll: selector; cr]. Notification signal: message. aCodeGen logger show: message]. returnTypes size = 1 ifTrue: [self returnType: returnTypes anyOne]] ifFalse: [self returnType: (aCodeGen implicitReturnTypeFor: selector)]]]!

1 0

VM Maker: VMMaker.oscog-eem.1077.mcz
by commits＠source.squeak.org 24 Feb '15

24 Feb '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1077.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1077 Author: eem Time: 24 February 2015, 11:16:06.136 am UUID: 5c8fcc56-3a1d-4267-a434-e701ce9a2064 Ancestors: VMMaker.oscog-eem.1076 Fix a type declaration error uncvered by the new inlining. Inlcude freeMethod: in Cogit's api for method xray. =============== Diff against VMMaker.oscog-eem.1076 =============== Item was changed: ----- Method: CoInterpreter>>convertToMachineCodeFrame:bcpc: (in category 'frame access') ----- convertToMachineCodeFrame: cogHomeMethod bcpc: bcpc + <var: #cogHomeMethod type: #'CogMethod *'> - <var: #cogHomeMethod type: #'CogHomeMethod *'> <returnTypeC: #usqInt> "Convert the current interpreter frame into a machine code frame and answer the machine code pc matching bcpc." | startBcpc methodField closure cogMethod pc | <var: #cogMethod type: #'CogBlockMethod *'> <var: #p type: #'char *'> self assert: (self isMachineCodeFrame: framePointer) not. "Update the return pc, perhaps saving it in the caller's iframeSavedIP." (self isBaseFrame: framePointer) ifTrue: [stackPages longAt: framePointer + FoxCallerSavedIP put: cogit ceBaseFrameReturnPC] ifFalse: [(self isMachineCodeFrame: (self frameCallerFP: framePointer)) ifFalse: [self iframeSavedIP: (self frameCallerFP: framePointer) put: (self frameCallerSavedIP: framePointer) asInteger. stackPages longAt: framePointer + FoxCallerSavedIP put: cogit ceReturnToInterpreterPC]]. "Compute the cog method field" (self iframeIsBlockActivation: framePointer) ifTrue: [closure := self pushedReceiverOrClosureOfFrame: framePointer. startBcpc := self startPCOfClosure: closure. cogMethod := cogit findMethodForStartBcpc: startBcpc inHomeMethod: cogHomeMethod. methodField := cogMethod asInteger + MFMethodFlagIsBlockFlag] ifFalse: [startBcpc := self startPCOfMethodHeader: cogHomeMethod methodHeader. cogMethod := self cCoerceSimple: cogHomeMethod to: #'CogBlockMethod *'. methodField := cogHomeMethod asInteger]. "compute the pc before converting the frame to help with debugging." pc := cogit mcPCForBackwardBranch: bcpc startBcpc: startBcpc in: cogMethod. self assert: pc > (cogMethod asUnsignedInteger + cogit noCheckEntryOffset). self assert: bcpc = (cogit bytecodePCFor: pc startBcpc: startBcpc in: cogMethod). "now convert to a machine code frame" stackPages longAt: framePointer + FoxMethod put: methodField + ((self iframeHasContext: framePointer) ifTrue: [MFMethodFlagHasContextFlag] ifFalse: [0]). framePointer + FoxIFReceiver to: stackPointer by: objectMemory wordSize negated do: [:p| stackPages longAt: p + FoxMFReceiver - FoxIFReceiver put: (stackPages longAt: p)]. stackPointer := stackPointer + FoxMFReceiver - FoxIFReceiver. ^pc! Item was changed: ----- Method: CoInterpreterPrimitives>>primitiveMethodXray (in category 'indexing primitives') ----- primitiveMethodXray "Lift the veil from a method and answer an integer describing the interior state of its machine code. Used for e.g. VM tests so they can verify they're testing what they think they're testing. 0 implies a vanilla method. Bit 0 = method might be compiled to machine code Bit 1 = method is currently compiled to machine code Bit 2 = is compiled frameless. Bit 3 = method refers to young object. Bit 4 = method too big to be jitted (more than 64k of code, or needs more than 1.5Mb of stack space to compile) Bit 5 = method contains unknown/unjittable bytecode Bit 7 = method should not be jitted because it contains a primitive not to be called from machine code (unused)" - <export: true> | alreadyCogged flags cogMethod | <var: #cogMethod type: #'CogMethod *'> (self methodWithHeaderShouldBeCogged: (objectMemory methodHeaderOf: self stackTop)) ifTrue: [alreadyCogged := self maybeMethodHasCogMethod: self stackTop. flags := 1. alreadyCogged ifFalse: [cogMethod := cogit cog: self stackTop selector: objectMemory nilObject. (cogMethod = nil and: [cogCompiledCodeCompactionCalledFor]) ifTrue: [self commenceCogCompiledCodeCompaction. cogMethod := cogit cog: self stackTop selector: objectMemory nilObject]. cogMethod asInteger caseOf: { [MethodTooBig] -> [flags := 1 + 16]. [EncounteredUnknownBytecode] -> [1 + 32]. [ShouldNotJIT] -> [1 + 64] } otherwise: [self deny: (cogMethod asInteger between: MaxNegativeErrorCode and: NotFullyInitialized)]]. (flags = 1 and: [self maybeMethodHasCogMethod: self stackTop]) ifTrue: [cogMethod := self cogMethodOf: self stackTop. flags := cogMethod stackCheckOffset = 0 ifTrue: [7] ifFalse: [3]. cogMethod cmRefersToYoung ifTrue: [flags := flags + 8]. alreadyCogged ifFalse: [cogit freeMethod: cogMethod]]] ifFalse: [flags := 0]. self pop: 1 thenPush: (objectMemory integerObjectOf: flags)! Item was changed: ----- Method: CogMethodZone>>freeMethod: (in category 'compaction') ----- freeMethod: cogMethod + <api> <var: #cogMethod type: #'CogMethod *'> <inline: false> self assert: cogMethod cmType ~= CMFree. self assert: ((cogit cogMethodDoesntLookKosher: cogMethod) = 0 or: [(cogit cogMethodDoesntLookKosher: cogMethod) = 23 and: [(cogit cCoerceSimple: cogMethod methodObject to: #'CogMethod *') cmType = CMFree]]). cogMethod cmType = CMMethod ifTrue: ["For non-Newspeak there should ne a one-to-one mapping between bytecoded and cog methods. For Newspeak not necessarily, but only for anonymous accessors." "Only reset the original method's header if it is referring to this CogMethod." (coInterpreter rawHeaderOf: cogMethod methodObject) asInteger = cogMethod asInteger ifTrue: [coInterpreter rawHeaderOf: cogMethod methodObject put: cogMethod methodHeader. self cppIf: NewspeakVM ifTrue: [(objectRepresentation canPinObjects and: [cogMethod nextMethodOrIRCs ~= 0]) ifTrue: [objectRepresentation freeIRCs: cogMethod nextMethodOrIRCs]]] ifFalse: [self assert: (cogit noAssertMethodClassAssociationOf: cogMethod methodObject) = objectMemory nilObject. self cppIf: NewspeakVM ifTrue: [self removeFromUnpairedMethodList: cogMethod]]. cogit maybeFreeCountersOf: cogMethod]. cogMethod cmType = CMOpenPIC ifTrue: [self removeFromOpenPICList: cogMethod]. cogMethod cmRefersToYoung: false. cogMethod cmType: CMFree. methodBytesFreedSinceLastCompaction := methodBytesFreedSinceLastCompaction + cogMethod blockSize! Item was added: + ----- Method: Cogit>>freeMethod: (in category 'jit - api') ----- + freeMethod: cogMethod + <doNotGenerate> + methodZone freeMethod: cogMethod!

1 0

VM Maker: VMMaker.oscog-eem.1076.mcz
by commits＠source.squeak.org 24 Feb '15

24 Feb '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1076.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1076 Author: eem Time: 23 February 2015, 9:48:19.026 pm UUID: fbce8f44-4ca0-48db-a0cb-7e06d2adb34f Ancestors: VMMaker.oscog-eem.1075 oops... =============== Diff against VMMaker.oscog-eem.1075 =============== Item was changed: ----- Method: CoInterpreter class>>initializePrimitiveTable (in category 'initialization') ----- initializePrimitiveTable super initializePrimitiveTable. #(216 253) do: [:pidx| self assert: (PrimitiveTable at: pidx + 1) = #primitiveFail]. self assert: (PrimitiveTable at: 215 + 1) = #primitiveFlushCacheByMethod. PrimitiveTable at: 253 + 1 put: #primitiveCollectCogCodeConstituents; at: 215 + 1 put: #primitiveVoidVMStateForMethod; + at: 216 + 1 put: #primitiveMethodXray! - at: 216 + 1 primitiveMethodXray!

1 0

VM Maker: VMMaker.oscog-eem.1075.mcz
by commits＠source.squeak.org 24 Feb '15

24 Feb '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1075.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1075 Author: eem Time: 23 February 2015, 7:54:39.978 pm UUID: 3ced243a-888b-4008-8036-42ec11da99d7 Ancestors: VMMaker.oscog-eem.1074 Slang: More improvement to type inferrence/propagation. Support ifTrue:ifFalse:. Better separate the passes in inferTypesForImplicitlyTypedVariablesAndMethods. Fix slip in nodeToCast:to:. Provide types for atan, et al. Make the inline selector breakpoint machinery allow multiple selectors, and use it to break for type inferrence too. Don't inline complex expressions that are bound to variables used in asserts. Make sure return types are symbols if they exist as symbols. General: Simplify primitiveMakePoint. Include primitiveMethodXray Fix some type warnings in Spur stack VMs. Fix privacy violation checking for super sends. =============== Diff against VMMaker.oscog-eem.1074 =============== Item was changed: Object subclass: #CCodeGenerator + instanceVariableNames: 'vmClass structClasses translationDict asArgumentTranslationDict inlineList constants variables variableDeclarations scopeStack methods macros apiMethods kernelReturnTypes currentMethod headerFiles globalVariableUsage useSymbolicConstants generateDeadCode requiredSelectors logger suppressAsmLabels asmLabelCounts pools selectorTranslations optionsDictionary breakSrcInlineSelectors breakDestInlineSelectors breakOnInline vmMaker' - instanceVariableNames: 'vmClass structClasses translationDict asArgumentTranslationDict inlineList constants variables variableDeclarations scopeStack methods macros apiMethods kernelReturnTypes currentMethod headerFiles globalVariableUsage useSymbolicConstants generateDeadCode requiredSelectors logger suppressAsmLabels asmLabelCounts pools selectorTranslations optionsDictionary breakSrcInlineSelector breakDestInlineSelector breakOnInline vmMaker' classVariableNames: 'NoRegParmsInAssertVMs' poolDictionaries: 'VMBasicConstants' category: 'VMMaker-Translation to C'! !CCodeGenerator commentStamp: 'tpr 5/2/2003 14:30' prior: 0! This class oversees the translation of a subset of Smalltalk to C, allowing the comforts of Smalltalk during development and the efficiency and portability of C for the resulting interpreter. See VMMaker for more useful info! Item was changed: ----- Method: CCodeGenerator>>breakDestInlineSelector: (in category 'accessing') ----- breakDestInlineSelector: aSelector + breakDestInlineSelectors add: aSelector! - breakDestInlineSelector := aSelector! Item was changed: ----- Method: CCodeGenerator>>breakSrcInlineSelector: (in category 'accessing') ----- breakSrcInlineSelector: aSelector + breakSrcInlineSelectors add: aSelector! - breakSrcInlineSelector := aSelector! Item was changed: ----- Method: CCodeGenerator>>collectInlineList: (in category 'inlining') ----- collectInlineList: inlineFlagOrSymbol "Make a list of methods that should be inlined. If inlineFlagOrSymbol == #asSpecified only inline methods marked with <inline: true>." "Details: The method must not include any inline C, since the translator cannot currently map variable names in inlined C code. Methods to be inlined must be small or called from only one place." | selectorsOfMethodsNotToInline callsOf | self assert: (#(true false asSpecified) includes: inlineFlagOrSymbol). selectorsOfMethodsNotToInline := Set new: methods size. selectorsOfMethodsNotToInline addAll: macros keys. apiMethods ifNotNil: [selectorsOfMethodsNotToInline addAll: apiMethods keys]. methods do: [:m| m isStructAccessor ifTrue: [selectorsOfMethodsNotToInline add: m selector]]. "build dictionary to record the number of calls to each method" callsOf := Dictionary new: methods size * 2. methods keysAndValuesDo: [:s :m| (m isRealMethod and: [self shouldGenerateMethod: m]) ifTrue: [callsOf at: s put: 0]]. "For each method, scan its parse tree once or twice to: 1. determine if the method contains unrenamable C code or declarations or has a C builtin 2. determine how many nodes it has 3. increment the sender counts of the methods it calls" inlineList := Set new: methods size * 2. (methods reject: [:m| selectorsOfMethodsNotToInline includes: m selector]) do: [:m| | inlineIt hasUnrenamableCCode nodeCount | + ((breakSrcInlineSelectors includes: m selector) - (breakSrcInlineSelector = m selector and: [breakOnInline isNil]) ifTrue: [self halt]. inlineIt := #dontCare. (translationDict includesKey: m selector) ifTrue: [hasUnrenamableCCode := true] ifFalse: [hasUnrenamableCCode := m hasUnrenamableCCode. nodeCount := 0. m parseTree nodesDo: [:node| node isSend ifTrue: [callsOf at: node selector ifPresent: [:senderCount| callsOf at: node selector put: senderCount + 1]]. nodeCount := nodeCount + 1]. inlineIt := m extractInlineDirective]. "may be true, false, or #dontCare" (hasUnrenamableCCode or: [inlineIt == false]) ifTrue: "don't inline if method has C code or contains negative inline directive" [inlineIt == true ifTrue: [logger ensureCr; nextPutAll: 'failed to inline '; nextPutAll: m selector; nextPutAll: ' as it contains unrenamable C declarations or C code'; cr; flush]. selectorsOfMethodsNotToInline add: m selector] ifFalse: [(inlineFlagOrSymbol == #asSpecified ifTrue: [inlineIt == true] ifFalse: [nodeCount < 40 or: [inlineIt == true]]) ifTrue: "inline if method has no C code and is either small or contains inline directive" [inlineList add: m selector]]]. inlineFlagOrSymbol ~~ #asSpecified ifTrue: [callsOf associationsDo: [:assoc| (assoc value = 1 and: [(selectorsOfMethodsNotToInline includes: assoc key) not]) ifTrue: [inlineList add: assoc key]]]! Item was changed: ----- Method: CCodeGenerator>>inferTypesForImplicitlyTypedVariablesAndMethods (in category 'type inference') ----- inferTypesForImplicitlyTypedVariablesAndMethods "Infer the return tupe and the types of untyped variables. As far as variables go, for now we try only to infer variables assigned the result of #longLongAt:, but much more could be done here." "Iterate over all methods, inferring #void return types, until we reach a fixed point." + | allMethods | - | firstTime allMethods | - firstTime := true. allMethods := apiMethods ifNil: [methods] ifNotNil: [(Set withAll: methods) addAll: apiMethods; yourself]. + "Make an initial pass to assign the return types of all simple methods that return constants, + or those that have explicit return types." - "Make an initial pass to assign the return types of all simple methods that return constants." allMethods do: [:m| + m removeFinalSelfReturnIn: self. "must preceed recordDeclarationsIn: because it may set returnType" + m recordDeclarationsIn: self. + (m returnType isNil + and: [m isReturnConstant]) ifTrue: - m isReturnConstant ifTrue: [m inferReturnTypeIn: self]]. + + "now iterate until we reach a fixed point" [| changedReturnType | changedReturnType := false. allMethods do: [:m| - firstTime ifTrue: - [m removeFinalSelfReturnIn: self. "must preceed recordDeclarationsIn: because it may set returnType" - m recordDeclarationsIn: self]. m inferTypesForImplicitlyTypedVariablesIn: self. (m inferReturnTypeIn: self) ifTrue: [changedReturnType := true]]. - firstTime := false. changedReturnType] whileTrue. "Type all as-yet-untyped methods as the default" methods do: [:m| m returnType ifNil: + [m returnType: (self implicitReturnTypeFor: m selector)]]. + + "Make a final pass to type anything assigned from the default type" + allMethods do: + [:m| + m inferTypesForImplicitlyTypedVariablesIn: self]! - [m returnType: (self implicitReturnTypeFor: m selector)]]! Item was changed: ----- Method: CCodeGenerator>>initialize (in category 'public') ----- initialize translationDict := Dictionary new. inlineList := Array new. constants := Dictionary new: 100. variables := Set new: 100. variableDeclarations := Dictionary new: 100. methods := Dictionary new: 500. kernelReturnTypes := self computeKernelReturnTypes. macros := Dictionary new. self initializeCTranslationDictionary. headerFiles := OrderedCollection new. globalVariableUsage := Dictionary new. useSymbolicConstants := true. generateDeadCode := true. scopeStack := OrderedCollection new. logger := (ProvideAnswerNotification new tag: #logger; signal) ifNil: [Transcript]. pools := IdentitySet new. selectorTranslations := IdentityDictionary new. + suppressAsmLabels := false. + breakSrcInlineSelectors := IdentitySet new. + breakDestInlineSelectors := IdentitySet new! - suppressAsmLabels := false! Item was changed: ----- Method: CCodeGenerator>>maybeBreakForInlineOf:in: (in category 'inlining') ----- maybeBreakForInlineOf: aNode in: aTMethod "convenient for debugging..." (aNode isSend + and: [breakSrcInlineSelectors size + breakDestInlineSelectors size > 0 + and: [(breakSrcInlineSelectors isEmpty or: [breakSrcInlineSelectors includes: aNode selector]) + and: [(breakDestInlineSelectors isEmpty or: [(breakDestInlineSelectors includes: aTMethod selector)]) + and: [breakOnInline ~~ false]]]]) ifTrue: - and: [(breakSrcInlineSelector notNil or: [breakDestInlineSelector notNil]) - and: [(breakSrcInlineSelector ifNil: [true] ifNotNil: [:srcSel| srcSel = aNode selector]) - and: [breakDestInlineSelector ifNil: [true] ifNotNil: [:dstSel| dstSel = aTMethod selector - and: [breakOnInline ~~ false]]]]]) ifTrue: [aTMethod halt: aTMethod selector, ' ', aNode selector]! Item was changed: ----- Method: CCodeGenerator>>maybeBreakForTestToInline:in: (in category 'inlining') ----- + maybeBreakForTestToInline: aNodeOrSelector in: aTMethod - maybeBreakForTestToInline: aNode in: aTMethod "convenient for debugging..." + | selector | + selector := aNodeOrSelector isSymbol + ifTrue: [aNodeOrSelector] + ifFalse: + [aNodeOrSelector isSend + ifTrue: [aNodeOrSelector selector] + ifFalse: [^self]]. + (breakSrcInlineSelectors size + breakDestInlineSelectors size > 0 + and: [(breakSrcInlineSelectors isEmpty or: [breakSrcInlineSelectors includes: selector]) + and: [(breakDestInlineSelectors isEmpty or: [(breakDestInlineSelectors includes: aTMethod selector)]) + and: [breakOnInline ~~ true]]]) ifTrue: + [aTMethod halt: aTMethod selector, ' ', selector]! - (aNode isSend - and: [(breakSrcInlineSelector notNil or: [breakDestInlineSelector notNil]) - and: [(breakSrcInlineSelector ifNil: [true] ifNotNil: [:srcSel| srcSel = aNode selector]) - and: [(breakDestInlineSelector ifNil: [true] ifNotNil: [:dstSel| dstSel = aTMethod selector]) - and: [breakOnInline ~~ true]]]]) ifTrue: - [aTMethod halt: aTMethod selector, ' ', aNode selector]! Item was changed: ----- Method: CCodeGenerator>>nodeToCast:to: (in category 'inlining') ----- nodeToCast: exprNode to: cType ^TSendNode new + setSelector: #cCoerceSimple:to: - setSelector: #cCoerceSimple: receiver: (TVariableNode new setName: 'self') arguments: { exprNode. TConstantNode new setValue: cType } isBuiltInOp: true! Item was changed: ----- Method: CCodeGenerator>>removeMethodForSelector: (in category 'utilities') ----- removeMethodForSelector: aSelector "Remove the given method from the code base" + ((breakSrcInlineSelectors includes: aSelector) + or: [(breakDestInlineSelectors includes: aSelector)]) ifTrue: - (breakSrcInlineSelector == aSelector - or: [breakDestInlineSelector == aSelector]) ifTrue: [self halt]. methods removeKey: aSelector ifAbsent: []! Item was changed: ----- Method: CCodeGenerator>>returnTypeForSend:in: (in category 'type inference') ----- returnTypeForSend: sendNode in: aTMethod "Answer the return type for a send. Absent sends default to #sqInt. The bitwise operators answer unsigned versions of their argument types, at least in gcc although this author can't find that in the C99 spec. If you can find this, please let me know." | sel | ^(self anyMethodNamed: (sel := sendNode selector)) ifNil: [kernelReturnTypes at: sel ifAbsent: [^sel caseOf: { [#+] -> [self typeForArithmetic: sendNode in: aTMethod]. [#-] -> [self typeForArithmetic: sendNode in: aTMethod]. [#*] -> [self typeForArithmetic: sendNode in: aTMethod]. [#/] -> [self typeForArithmetic: sendNode in: aTMethod]. [#addressOf:] -> [(self typeFor: sendNode receiver in: aTMethod) ifNil: [#sqInt] ifNotNil: [:type| type, (type last isLetter ifTrue: [' *'] ifFalse: ['*'])]]. [#at:] -> [self typeForDereference: sendNode in: aTMethod]. [#bitAnd:] -> [self unsignedTypeForBitwiseSend: sendNode in: aTMethod]. [#bitOr:] -> [self unsignedTypeForBitwiseSend: sendNode in: aTMethod]. [#bitXor:] -> [self unsignedTypeForBitwiseSend: sendNode in: aTMethod]. [#asFloat] -> [#double]. + [#atan] -> [#double]. + [#exp] -> [#double]. + [#log] -> [#double]. + [#sin] -> [#double]. + [#sqrt] -> [#double]. [#asLong] -> [#long]. [#asUnsignedInteger] -> [#usqInt]. [#asUnsignedLong] -> [#'unsigned long']. [#asVoidPointer] -> [#'void *']. [#signedIntToLong] -> [#usqInt]. "c.f. generateSignedIntToLong:on:indent:" [#signedIntToShort] -> [#usqInt]. "c.f. generateSignedIntToShort:on:indent:" [#cCoerce:to:] -> [sendNode args last value]. + [#cCoerceSimple:to:] -> [sendNode args last value]. + [#ifTrue:ifFalse:] -> [self typeForConditional: sendNode in: aTMethod]. + [#ifFalse:ifTrue:] -> [self typeForConditional: sendNode in: aTMethod]. + [#ifTrue:] -> [self typeForConditional: sendNode in: aTMethod]. + [#ifFalse:] -> [self typeForConditional: sendNode in: aTMethod] } - [#cCoerceSimple:to:] -> [sendNode args last value] } otherwise: [#sqInt]]] ifNotNil: [:m| m returnType ifNotNil: [:type| self baseTypeForType: type]]! Item was changed: ----- Method: CCodeGenerator>>testInliningFor:as: (in category 'utilities') ----- testInliningFor: selector as: inlineFlagOrSymbol "Test inlining for the method with the given selector. + Do all inlining first (cuz that's how the algorithm works). - Do all inlining first (cuz that's how the algorithm works. Then try and inline into a copy of the method. This isn't exactly what happens in the real deal but is close enough." | meth | + ((breakDestInlineSelectors includes: selector) + or: [(breakSrcInlineSelectors includes: selector)]) ifTrue: - (breakDestInlineSelector = selector - or: [breakSrcInlineSelector = selector]) ifTrue: [self halt]. meth := (self methodNamed: selector) copy. self doBasicInlining: inlineFlagOrSymbol. self halt. meth tryToInlineMethodsIn: self! Item was added: + ----- Method: CCodeGenerator>>typeForConditional:in: (in category 'type inference') ----- + typeForConditional: sendNode in: aTMethod + "Answer the return type for a conditional, ifTrue:ifFalse: et al" + | firstType secondType | + firstType := self typeFor: sendNode args first statements last in: aTMethod. + sendNode selector numArgs = 1 ifTrue: + [^firstType]. + secondType := self typeFor: sendNode args second statements last in: aTMethod. + ((firstType notNil and: [(self isIntegralCType: firstType) or: [self isFloatingPointCType: firstType]]) + and: [secondType notNil and: [(self isIntegralCType: secondType) or: [self isFloatingPointCType: secondType]]]) ifTrue: + [^self promoteArithmeticTypes: firstType and: secondType]. + ^firstType ifNil: [secondType]! Item was changed: ----- Method: CoInterpreter class>>initializePrimitiveTable (in category 'initialization') ----- initializePrimitiveTable super initializePrimitiveTable. + #(216 253) do: + [:pidx| self assert: (PrimitiveTable at: pidx + 1) = #primitiveFail]. - self assert: (PrimitiveTable at: 253 + 1) = #primitiveFail. - PrimitiveTable at: 253 + 1 put: #primitiveCollectCogCodeConstituents. self assert: (PrimitiveTable at: 215 + 1) = #primitiveFlushCacheByMethod. + PrimitiveTable + at: 253 + 1 put: #primitiveCollectCogCodeConstituents; + at: 215 + 1 put: #primitiveVoidVMStateForMethod; + at: 216 + 1 primitiveMethodXray! - PrimitiveTable at: 215 + 1 put: #primitiveVoidVMStateForMethod! Item was changed: ----- Method: CoInterpreterPrimitives>>primitiveMethodXray (in category 'indexing primitives') ----- primitiveMethodXray "Lift the veil from a method and answer an integer describing the interior state of its machine code. Used for e.g. VM tests so they can verify they're testing what they think they're testing. 0 implies a vanilla method. + Bit 0 = method might be compiled to machine code + Bit 1 = method is currently compiled to machine code + Bit 2 = is compiled frameless. + Bit 3 = method refers to young object. + Bit 4 = method too big to be jitted (more than 64k of code, or needs more than 1.5Mb of stack space to compile) + Bit 5 = method contains unknown/unjittable bytecode + Bit 7 = method should not be jitted because it contains a primitive not to be called from machine code (unused)" - Bit 0 = method is currently compiled to machine code - Bit 1 = is compiled frameless. - Bit 2 = method refers to young object" <export: true> + | alreadyCogged flags cogMethod | - | flags cogMethod | <var: #cogMethod type: #'CogMethod *'> + (self methodWithHeaderShouldBeCogged: (objectMemory methodHeaderOf: self stackTop)) - (self maybeMethodHasCogMethod: self stackTop) ifTrue: + [alreadyCogged := self maybeMethodHasCogMethod: self stackTop. + flags := 1. + alreadyCogged ifFalse: + [cogMethod := cogit cog: self stackTop selector: objectMemory nilObject. + (cogMethod = nil + and: [cogCompiledCodeCompactionCalledFor]) ifTrue: + [self commenceCogCompiledCodeCompaction. + cogMethod := cogit cog: self stackTop selector: objectMemory nilObject]. + cogMethod asInteger + caseOf: { + [MethodTooBig] -> [flags := 1 + 16]. + [EncounteredUnknownBytecode] -> [1 + 32]. + [ShouldNotJIT] -> [1 + 64] } + otherwise: [self deny: (cogMethod asInteger between: MaxNegativeErrorCode and: NotFullyInitialized)]]. + (flags = 1 + and: [self maybeMethodHasCogMethod: self stackTop]) ifTrue: + [cogMethod := self cogMethodOf: self stackTop. + flags := cogMethod stackCheckOffset = 0 ifTrue: [7] ifFalse: [3]. + cogMethod cmRefersToYoung ifTrue: + [flags := flags + 8]. + alreadyCogged ifFalse: + [cogit freeMethod: cogMethod]]] - [cogMethod := self cogMethodOf: self stackTop. - flags := cogMethod stackCheckOffset = 0 ifTrue: [3] ifFalse: [1]. - cogMethod cmRefersToYoung ifTrue: - [flags := flags + 4]] ifFalse: [flags := 0]. self pop: 1 thenPush: (objectMemory integerObjectOf: flags)! Item was changed: SharedPool subclass: #CogMethodConstants instanceVariableNames: '' + classVariableNames: 'CMBlock CMClosedPIC CMFree CMMaxUsageCount CMMethod CMOpenPIC CheckAllocationFillerAfterPrimCall EncounteredUnknownBytecode InsufficientCodeSpace MaxLiteralCountForCompile MaxMethodSize MaxNegativeErrorCode MaxNumArgs MaxStackCheckOffset MethodTooBig NotFullyInitialized PrimCallCollectsProfileSamples PrimCallDoNotJIT PrimCallMayCallBack PrimCallNeedsNewMethod PrimCallNeedsPrimitiveFunction ShouldNotJIT UnimplementedPrimitive YoungSelectorInPIC' - classVariableNames: 'CMBlock CMClosedPIC CMFree CMMaxUsageCount CMMethod CMOpenPIC CheckAllocationFillerAfterPrimCall MaxLiteralCountForCompile MaxMethodSize MaxNumArgs MaxStackCheckOffset PrimCallCollectsProfileSamples PrimCallDoNotJIT PrimCallMayCallBack PrimCallNeedsNewMethod PrimCallNeedsPrimitiveFunction' poolDictionaries: '' category: 'VMMaker-JIT'! Item was changed: ----- Method: CogObjectRepresentationForSqueakV3>>genGetClassTagOf:into:scratchReg: (in category 'compile abstract instructions') ----- genGetClassTagOf: instReg into: destReg scratchReg: scratchReg "Compatibility with SpurObjectRepresentation/SpurMemoryManager." | entryLabel | <var: #entryLabel type: #'AbstractInstruction *'> cogit AlignmentNops: (objectMemory wordSize max: 8). entryLabel := cogit Label. + (self genGetClassObjectOf: instReg into: destReg scratchReg: scratchReg instRegIsReceiver: nil) ~= 0 ifTrue: + [self error: 'internal error']. - self genGetClassObjectOf: instReg into: destReg scratchReg: scratchReg instRegIsReceiver: nil. ^entryLabel! Item was added: + ----- Method: CogVMSimulator>>ioMousePoint (in category 'I/O primitives') ----- + ioMousePoint + | relPt | + ^displayForm == nil + ifTrue: [99 < 16 + 66] + ifFalse: [relPt := Sensor cursorPoint - self displayLocation. + relPt x << 16 + relPt y]! Item was removed: - ----- Method: CogVMSimulator>>primitiveMousePoint (in category 'I/O primitives') ----- - primitiveMousePoint - - | relPt | - self pop: 1. - displayForm == nil - ifTrue: [self push: (self makePointwithxValue: 99 yValue: 66)] - ifFalse: [relPt := Sensor cursorPoint - self displayLocation. - self push: (self makePointwithxValue: relPt x yValue: relPt y)]! Item was changed: CogClass subclass: #Cogit instanceVariableNames: 'coInterpreter objectMemory objectRepresentation processor threadManager methodZone methodZoneBase codeBase minValidCallAddress lastNInstructions simulatedAddresses simulatedTrampolines simulatedVariableGetters simulatedVariableSetters printRegisters printInstructions compilationTrace clickConfirm breakPC breakBlock singleStep guardPageSize traceFlags traceStores breakMethod methodObj initialPC endPC methodOrBlockNumArgs inBlock needsFrame hasYoungReferent primitiveIndex backEnd callerSavedRegMask postCompileHook primInvokeLabel methodLabel stackCheckLabel blockEntryLabel blockEntryNoContextSwitch blockNoContextSwitchOffset stackOverflowCall sendMiss missOffset entryPointMask checkedEntryAlignment uncheckedEntryAlignment cmEntryOffset entry cmNoCheckEntryOffset noCheckEntry dynSuperEntry dynSuperEntryAlignment cmDynSuperEntryOffset picMNUAbort picInterpretAbort endCPICCase0 endCPICCase1 numPICCases firstCPICCaseOffset cPICCaseSize cPICEndSize closedPICSize openPICSize fixups abstractOpcodes annotations generatorTable primitiveGeneratorTable byte0 byte1 byte2 byte3 bytecodePC bytecodeSetOffset opcodeIndex numAbstractOpcodes annotationIndex blockStarts blockCount labelCounter cStackAlignment expectedSPAlignment expectedFPAlignment codeModified maxLitIndex ceMethodAbortTrampoline cePICAbortTrampoline ceCheckForInterruptTrampoline ceCPICMissTrampoline ceReturnToInterpreterTrampoline ceBaseFrameReturnTrampoline ceSendMustBeBooleanAddTrueTrampoline ceSendMustBeBooleanAddFalseTrampoline ceCannotResumeTrampoline ceEnterCogCodePopReceiverReg ceCallCogCodePopReceiverReg ceCallCogCodePopReceiverAndClassRegs cePrimReturnEnterCogCode cePrimReturnEnterCogCodeProfiling ceNonLocalReturnTrampoline ceFetchContextInstVarTrampoline ceStoreContextInstVarTrampoline ceImplicitReceiverTrampoline ceEnclosingObjectTrampoline ceCaptureCStackPointers ceFlushICache ceCheckFeaturesFunction ceTraceLinkedSendTrampoline ceTraceBlockActivationTrampoline ceTraceStoreTrampoline ceGetSP sendTrampolines superSendTrampolines dynamicSuperSendTrampolines firstSend lastSend realCEEnterCogCodePopReceiverReg realCECallCogCodePopReceiverReg realCECallCogCodePopReceiverAndClassRegs trampolineTableIndex trampolineAddresses objectReferencesInRuntime runtimeObjectRefIndex cFramePointerInUse debugPrimCallStackOffset ceTryLockVMOwner ceUnlockVMOwner cogMethodSurrogateClass cogBlockMethodSurrogateClass extA extB numIRCs indexOfIRC theIRCs' + classVariableNames: 'AltBlockCreationBytecodeSize AltFirstSpecialSelector AltNSSendIsPCAnnotated AnnotationConstantNames AnnotationShift BlockCreationBytecodeSize Debug DisplacementMask DisplacementX2N EagerInstructionDecoration FirstAnnotation FirstSpecialSelector HasBytecodePC IsAbsPCReference IsDisplacement IsDisplacementX2N IsNSSendCall IsObjectReference IsRelativeCall IsSendCall MapEnd MaxCompiledPrimitiveIndex MaxStackAllocSize MaxUnitDisplacement MaxX2NDisplacement NSSendIsPCAnnotated NumObjRefsInRuntime NumOopsPerIRC NumSendTrampolines NumTrampolines ProcessorClass' - classVariableNames: 'AltBlockCreationBytecodeSize AltFirstSpecialSelector AltNSSendIsPCAnnotated AnnotationConstantNames AnnotationShift BlockCreationBytecodeSize Debug DisplacementMask DisplacementX2N EagerInstructionDecoration EncounteredUnknownBytecode FirstAnnotation FirstSpecialSelector HasBytecodePC InsufficientCodeSpace IsAbsPCReference IsDisplacement IsDisplacementX2N IsNSSendCall IsObjectReference IsRelativeCall IsSendCall MapEnd MaxCompiledPrimitiveIndex MaxNegativeErrorCode MaxStackAllocSize MaxUnitDisplacement MaxX2NDisplacement MethodTooBig NSSendIsPCAnnotated NotFullyInitialized NumObjRefsInRuntime NumOopsPerIRC NumSendTrampolines NumTrampolines ProcessorClass ShouldNotJIT UnimplementedPrimitive YoungSelectorInPIC' poolDictionaries: 'CogCompilationConstants CogMethodConstants CogRTLOpcodes VMBasicConstants VMObjectIndices VMStackFrameOffsets' category: 'VMMaker-JIT'! Cogit class instanceVariableNames: 'generatorTable primitiveTable'! !Cogit commentStamp: 'eem 2/13/2013 15:37' prior: 0! I am the code generator for the Cog VM. My job is to produce machine code versions of methods for faster execution and to manage inline caches for faster send performance. I can be tested in the current image using my class-side in-image compilation facilities. e.g. try StackToRegisterMappingCogit genAndDis: (Integer >> #benchFib) I have concrete subclasses that implement different levels of optimization: SimpleStackBasedCogit is the simplest code generator. StackToRegisterMappingCogit is the current production code generator It defers pushing operands to the stack until necessary and implements a register-based calling convention for low-arity sends. StackToRegisterMappingCogit is an experimental code generator with support for counting conditional branches, intended to support adaptive optimization. coInterpreter <CoInterpreterSimulator> the VM's interpreter with which I cooperate methodZoneManager <CogMethodZoneManager> the manager of the machine code zone objectRepresentation <CogObjectRepresentation> the object used to generate object accesses processor <BochsIA32Alien|?> the simulator that executes the IA32/x86 machine code I generate when simulating execution in Smalltalk simulatedTrampolines <Dictionary of Integer -> MessageSend> the dictionary mapping trap jump addresses to run-time routines used to warp from simulated machine code in to the Smalltalk run-time. simulatedVariableGetters <Dictionary of Integer -> MessageSend> the dictionary mapping trap read addresses to variables in run-time objects used to allow simulated machine code to read variables in the Smalltalk run-time. simulatedVariableSetters <Dictionary of Integer -> MessageSend> the dictionary mapping trap write addresses to variables in run-time objects used to allow simulated machine code to write variables in the Smalltalk run-time. printRegisters printInstructions clickConfirm <Boolean> flags controlling debug printing and code simulation breakPC <Integer> machine code pc breakpoint cFramePointer cStackPointer <Integer> the variables representing the C stack & frame pointers, which must change on FFI callback and return selectorOop <sqInt> the oop of the methodObj being compiled methodObj <sqInt> the bytecode method being compiled initialPC endPC <Integer> the start and end pcs of the methodObj being compiled methodOrBlockNumArgs <Integer> argument count of current method or block being compiled needsFrame <Boolean> whether methodObj or block needs a frame to execute primitiveIndex <Integer> primitive index of current method being compiled methodLabel <CogAbstractOpcode> label for the method header blockEntryLabel <CogAbstractOpcode> label for the start of the block dispatch code stackOverflowCall <CogAbstractOpcode> label for the call of ceStackOverflow in the method prolog sendMissCall <CogAbstractOpcode> label for the call of ceSICMiss in the method prolog entryOffset <Integer> offset of method entry code from start (header) of method entry <CogAbstractOpcode> label for the first instruction of the method entry code noCheckEntryOffset <Integer> offset of the start of a method proper (after the method entry code) from start (header) of method noCheckEntry <CogAbstractOpcode> label for the first instruction of start of a method proper fixups <Array of <AbstractOpcode Label | nil>> the labels for forward jumps that will be fixed up when reaching the relevant bytecode. fixup shas one element per byte in methodObj's bytecode abstractOpcodes <Array of <AbstractOpcode>> the code generated when compiling methodObj byte0 byte1 byte2 byte3 <Integer> individual bytes of current bytecode being compiled in methodObj bytecodePointer <Integer> bytecode pc (same as Smalltalk) of the current bytecode being compiled opcodeIndex <Integer> the index of the next free entry in abstractOpcodes (this code is translated into C where OrderedCollection et al do not exist) numAbstractOpcodes <Integer> the number of elements in abstractOpcocdes blockStarts <Array of <BlockStart>> the starts of blocks in the current method blockCount the index into blockStarts as they are being noted, and hence eventuakly teh total number of blocks in the current method labelCounter <Integer> a nicety for numbering labels not needed in the production system but probably not expensive enough to worry about ceStackOverflowTrampoline <Integer> ceSend0ArgsTrampoline <Integer> ceSend1ArgsTrampoline <Integer> ceSend2ArgsTrampoline <Integer> ceSendNArgsTrampoline <Integer> ceSendSuper0ArgsTrampoline <Integer> ceSendSuper1ArgsTrampoline <Integer> ceSendSuper2ArgsTrampoline <Integer> ceSendSuperNArgsTrampoline <Integer> ceSICMissTrampoline <Integer> ceCPICMissTrampoline <Integer> ceStoreCheckTrampoline <Integer> ceReturnToInterpreterTrampoline <Integer> ceBaseFrameReturnTrampoline <Integer> ceSendMustBeBooleanTrampoline <Integer> ceClosureCopyTrampoline <Integer> the various trampolines (system-call-like jumps from machine code to the run-time). See Cogit>>generateTrampolines for the mapping from trampoline to run-time routine and then read the run-time routine for a funcitonal description. ceEnterCogCodePopReceiverReg <Integer> the enilopmart (jump from run-time to machine-code) methodZoneBase <Integer> ! Cogit class instanceVariableNames: 'generatorTable primitiveTable'! Item was changed: ----- Method: InterpreterPrimitives>>primitiveMakePoint (in category 'arithmetic integer primitives') ----- primitiveMakePoint + <inline: false> + | rcvr pt | - | rcvr argument pt | - argument := self stackTop. rcvr := self stackValue: 1. + ((self isIntegerObject: rcvr) or: [self isFloatObject: rcvr]) ifFalse: + [^self primitiveFail]. + pt := objectMemory eeInstantiateSmallClass: (objectMemory splObj: ClassPoint) numSlots: YIndex + 1. + objectMemory + storePointerUnchecked: XIndex ofObject: pt withValue: rcvr; + storePointerUnchecked: YIndex ofObject: pt withValue: self stackTop. - (objectMemory isIntegerObject: rcvr) - ifTrue: [(objectMemory isIntegerObject: argument) - ifTrue: [pt := self makePointwithxValue: (objectMemory integerValueOf: rcvr) yValue: (objectMemory integerValueOf: argument)] - ifFalse: [pt := self makePointwithxValue: (objectMemory integerValueOf: rcvr) yValue: 0. - "Above may cause GC!!" - objectMemory storePointer: 1 ofObject: pt withValue: (self stackValue: 0)]] - ifFalse: [(self isFloatObject: rcvr) - ifFalse: [^ self success: false]. - pt := self makePointwithxValue: 0 yValue: 0. - "Above may cause GC!!" - objectMemory storePointer: 0 ofObject: pt withValue: (self stackValue: 1). - objectMemory storePointer: 1 ofObject: pt withValue: (self stackValue: 0)]. - self pop: 2 thenPush: pt! Item was changed: ----- Method: InterpreterPrimitives>>primitiveMousePoint (in category 'I/O primitives') ----- primitiveMousePoint "Obsolete on virtually all platforms; old style input polling code. Return a Point indicating current position of the mouse. Note that mouse coordinates may be negative if the mouse moves above or to the left of the top-left corner of the Smalltalk window." | pointWord x y | - self pop: 1. pointWord := self ioMousePoint. x := self signExtend16: ((pointWord >> 16) bitAnd: 16rFFFF). y := self signExtend16: (pointWord bitAnd: 16rFFFF). + self pop: 1 thenPush: (self makePointwithxValue: x yValue: y)! - self push: (self makePointwithxValue: x yValue: y).! Item was changed: ----- Method: InterpreterPrimitives>>primitiveScreenSize (in category 'I/O primitives') ----- primitiveScreenSize "Answer a point indicating the current size of the Smalltalk window. Currently there is a limit of 65535 in each direction because the point is encoded into a single 32bit value in the image header. This might well become a problem one day" + | pointWord | + pointWord := self ioScreenSize. + self pop: 1 + thenPush: (self makePointwithxValue: (pointWord >> 16 bitAnd: 65535) + yValue: (pointWord bitAnd: 65535))! - self - cCode: - [| pointWord | - pointWord := self ioScreenSize. - self pop: 1 - thenPush: (self makePointwithxValue: (pointWord >> 16 bitAnd: 65535) - yValue: (pointWord bitAnd: 65535))] - inSmalltalk: - [| size | - "Default to a reasonable size for simulation, unless the window has opened, - in which case allow the screen to be as large as the simulation window" - size := (self displayView notNil and: [self savedWindowSize notNil]) - ifTrue: [self desiredDisplayExtent] - ifFalse: [self desiredDisplayExtent min: 800@640]. - self pop: 1 thenPush: (self makePointwithxValue: size x yValue: size y)]! Item was changed: ----- Method: SpurMemoryManager>>validFreeTreeChunk:parent: (in category 'free space') ----- validFreeTreeChunk: chunk parent: parent + <var: 'reason' type: #'const char *'> + <returnTypeC: #'const char *'> - <returnTypeC: 'const char *'> chunk = 0 ifTrue: [^nil]. (self addressCouldBeOldObj: chunk) ifFalse: [^'not in old space']. (self bytesInObject: chunk) / self allocationUnit < self numFreeLists ifTrue: [^'too small']. parent ~= (self fetchPointer: self freeChunkParentIndex ofFreeChunk: chunk) ifTrue: [^'bad parent']. (self validFreeTreeChunk: (self fetchPointer: self freeChunkSmallerIndex ofFreeChunk: chunk) parent: chunk) ifNotNil: [:reason| ^reason]. (self validFreeTreeChunk: (self fetchPointer: self freeChunkLargerIndex ofFreeChunk: chunk) parent: chunk) ifNotNil: [:reason| ^reason]. ^nil! Item was changed: ----- Method: SpurSegmentManager>>readHeapFromImageFile:dataBytes: (in category 'snapshot') ----- readHeapFromImageFile: f dataBytes: numBytes "Read numBytes of image data from f into memory at memoryBaseForImageRead. Answer the number of bytes written. In addition, read each segment, build up the segment info for swizzling, while eliminating the bridge objects at the end of each segment that specify the distance to and the size of the subsequent segment." <var: #f type: #sqImageFile> <inline: false> | bytesRead totalBytesRead bridgehead bridge nextSegmentSize oldBase newBase segInfo bridgeSpan | <var: 'segInfo' type: #'SpurSegmentInfo *'> self allocateOrExtendSegmentInfos. "segment sizes include the two-header-word bridge at the end of each segment." numSegments := totalBytesRead := 0. oldBase := 0. "N.B. still must be adjusted by oldBaseAddr." newBase := manager oldSpaceStart. nextSegmentSize := firstSegmentSize. bridgehead := firstSegmentSize + manager oldSpaceStart - manager bridgeSize. [segInfo := self addressOf: (segments at: numSegments). segInfo segStart: oldBase; "N.B. still must be adjusted by oldBaseAddr." segSize: nextSegmentSize; swizzle: newBase - oldBase. "N.B. still must be adjusted by oldBaseAddr." bytesRead := self readHeapFrom: f at: newBase dataBytes: nextSegmentSize. bytesRead > 0 ifTrue: [totalBytesRead := totalBytesRead + bytesRead]. bytesRead ~= nextSegmentSize ifTrue: [^totalBytesRead]. numSegments := numSegments + 1. bridge := bridgehead + manager baseHeaderSize. bridgeSpan := (manager rawNumSlotsOf: bridgehead) = 0 ifTrue: [0] ifFalse: [manager bytesPerOop * (manager rawOverflowSlotsOf: bridge)]. oldBase := oldBase + nextSegmentSize + bridgeSpan. newBase := newBase + nextSegmentSize - manager bridgeSize. + nextSegmentSize := (manager long64At: bridge) asUnsignedInteger. - nextSegmentSize := manager long64At: bridge. nextSegmentSize ~= 0] whileTrue: [bridgehead := bridgehead - manager bridgeSize + nextSegmentSize]. "newBase should point just past the last bridge. all others should have been eliminated." self assert: newBase - manager oldSpaceStart = (totalBytesRead - (numSegments * manager bridgeSize)). "set freeOldSpaceStart now for adjustAllOopsBy:" manager setFreeOldSpaceStart: newBase. "we're done. nil firstSegmentSize for a subsequent snapshot." firstSegmentSize := nil. ^totalBytesRead! Item was changed: ----- Method: StackInterpreter>>dynamicSuperSendBytecode (in category 'send bytecodes') ----- dynamicSuperSendBytecode "Send a message to self, starting lookup in the superclass of the method application of the currently executing method's mixin." "Assume: messageSelector and argumentCount have been set, and that the receiver and arguments have been pushed onto the stack," "WE WANT THE RECEIVER PUSHED IMPLICITLY, BUT IT IS NOT - SO FAR" "Note: This method is inlined into the interpreter dispatch loop." | rcvr mClassMixin mixinApplication | <inline: true> argumentCount := self fetchByte. messageSelector := self literal: self fetchByte. "To maintain the invariant that all receivers are unforwarded we need an explicit read barrier in the super send cases." self ensureReceiverUnforwarded. rcvr := self internalStackValue: argumentCount. mClassMixin := self methodClassOf: method. mixinApplication := self findApplicationOfTargetMixin: mClassMixin startingAtBehavior: (objectMemory fetchClassOf: rcvr). lkupClassTag := objectMemory classTagForClass: (self superclassOf: mixinApplication). + CheckPrivacyViolations ifTrue: + [isPrivateSend := true]. self commonSend! Item was changed: ----- Method: StackInterpreter>>lookupMethodInClass: (in category 'message sending') ----- lookupMethodInClass: class | currentClass dictionary found | <inline: false> self assert: (self addressCouldBeClassObj: class). currentClass := class. [currentClass ~= objectMemory nilObject] whileTrue: [dictionary := objectMemory followObjField: MethodDictionaryIndex ofObject: currentClass. dictionary = objectMemory nilObject ifTrue: ["MethodDict pointer is nil (hopefully due a swapped out stub) -- raise exception #cannotInterpret:." self createActualMessageTo: class. messageSelector := objectMemory splObj: SelectorCannotInterpret. self sendBreakpoint: messageSelector receiver: nil. ^self lookupMethodInClass: (self superclassOf: currentClass)]. found := self lookupMethodInDictionary: dictionary. + found ifTrue: + [self maybeCheckPrivacyOfNewMethod: currentClass. + ^currentClass]. - (NewspeakVM - and: [CheckPrivacyViolations - and: [isPrivateSend not - and: [messageSelector ~= (objectMemory splObj: SelectorDoesNotUnderstand) - and: [(self accessModifierOfMethod: newMethod) ~= 0]]]]) ifTrue: - [self print: (self nameOfClass: currentClass); space. - self printStringOf: (messageSelector); print: ' from '. - self printStringOf: (self maybeSelectorOfMethod: method); cr]. - found ifTrue: [^currentClass]. currentClass := self superclassOf: currentClass]. "Could not find #doesNotUnderstand: -- unrecoverable error." messageSelector = (objectMemory splObj: SelectorDoesNotUnderstand) ifTrue: [self error: 'Recursive not understood error encountered']. "Cound not find a normal message -- raise exception #doesNotUnderstand:" self createActualMessageTo: class. messageSelector := objectMemory splObj: SelectorDoesNotUnderstand. self sendBreak: messageSelector + objectMemory baseHeaderSize point: (objectMemory lengthOf: messageSelector) receiver: nil. ^self lookupMethodInClass: class! Item was added: + ----- Method: StackInterpreter>>maybeCheckPrivacyOfNewMethod: (in category 'message sending') ----- + maybeCheckPrivacyOfNewMethod: currentClass + <inline: true> + (NewspeakVM + and: [CheckPrivacyViolations + and: [isPrivateSend not + and: [messageSelector ~= (objectMemory splObj: SelectorDoesNotUnderstand) + and: [(self accessModifierOfMethod: newMethod) ~= 0]]]]) ifTrue: + [self print: (self nameOfClass: currentClass); space. + self printStringOf: (messageSelector); print: ' from '. + self printStringOf: (self maybeSelectorOfMethod: method); cr]! Item was added: + ----- Method: StackInterpreterSimulator>>ioMousePoint (in category 'I/O primitives') ----- + ioMousePoint + | relPt | + ^displayForm == nil + ifTrue: [99 < 16 + 66] + ifFalse: [relPt := Sensor cursorPoint - self displayLocation. + relPt x << 16 + relPt y]! Item was removed: - ----- Method: StackInterpreterSimulator>>primitiveMousePoint (in category 'I/O primitives') ----- - primitiveMousePoint - - | relPt | - self pop: 1. - displayForm == nil - ifTrue: [self push: (self makePointwithxValue: 99 yValue: 66)] - ifFalse: [relPt := Sensor cursorPoint - self displayLocation. - self push: (self makePointwithxValue: relPt x yValue: relPt y)]! Item was changed: ----- Method: TMethod>>argAssignmentsFor:send:in: (in category 'inlining') ----- argAssignmentsFor: meth send: aSendNode in: aCodeGen "Return a collection of assignment nodes that assign the given argument expressions to the formal parameter variables of the given method." "Optimization: If the actual parameters are either constants or local variables in the target method (the receiver), substitute them directly into the body of meth. Note that global variables cannot be subsituted because the inlined method might depend on the exact ordering of side effects to the globals." | stmtList substitutionDict argList | + meth args size > (argList := aSendNode args) size ifTrue: - stmtList := OrderedCollection new: 100. - substitutionDict := Dictionary new: 100. - argList := aSendNode args. - - meth args size > aSendNode args size ifTrue: [self assert: (meth args first beginsWith: 'self_in_'). argList := {aSendNode receiver}, aSendNode args]. + + stmtList := OrderedCollection new: argList size. + substitutionDict := Dictionary new: 100. meth args with: argList do: [ :argName :exprNode | (self isNode: exprNode substitutableFor: argName inMethod: meth in: aCodeGen) ifTrue: [substitutionDict at: argName + put: (self node: exprNode + typeCompatibleWith: argName + inliningInto: meth selector + in: aCodeGen). - put: (((exprNode isSend or: [exprNode isVariable]) - and: [(self typeFor: argName in: aCodeGen) notNil - and: [(aCodeGen typeFor: exprNode in: self) isNil]]) - ifTrue: [aCodeGen nodeToCast: exprNode to: (self typeFor: argName in: aCodeGen)] - ifFalse: [exprNode]). locals remove: argName] ifFalse: + [stmtList addLast: + (TAssignmentNode new + setVariable: (TVariableNode new setName: argName) + expression: (self node: exprNode copy + typeCompatibleWith: argName + inliningInto: meth selector + in: aCodeGen))]]. - [stmtList add: (TAssignmentNode new - setVariable: (TVariableNode new setName: argName) - expression: exprNode copy)]]. meth parseTree: (meth parseTree bindVariablesIn: substitutionDict). ^stmtList! Item was changed: ----- Method: TMethod>>inferTypesForImplicitlyTypedVariablesIn: (in category 'type inference') ----- inferTypesForImplicitlyTypedVariablesIn: aCodeGen "infer types for untyped variables from assignments and arithmetic uses. For debugging answer a Dictionary from var to the nodes that determined types This for debugging: (self copy inferTypesForImplicitlyTypedVariablesIn: aCodeGen)" | alreadyExplicitlyTyped effectiveNodes | + aCodeGen maybeBreakForTestToInline: selector in: self. - "selector = #transformColor: ifTrue: - [self halt]." alreadyExplicitlyTyped := declarations keys asSet. effectiveNodes := Dictionary new. "this for debugging" parseTree nodesDo: [:node| | type var | "If there is something of the form i >= 0, then i should be signed, not unsigned." (node isSend and: [(locals includes: (var := node receiver variableNameOrNil)) and: [(alreadyExplicitlyTyped includes: var) not "don't be fooled by inferred unsigned types" and: [(#(<= < >= >) includes: node selector) and: [node args first isConstant and: [node args first value = 0 and: [(type := self typeFor: var in: aCodeGen) notNil and: [type first == $u]]]]]]]) ifTrue: [declarations at: var put: (aCodeGen signedTypeForIntegralType: type), ' ', var. effectiveNodes at: var put: { declarations at: var. node }]. "if an assignment to an untyped local of a known type, set the local's type to that type. Only observe known sends (methods in the current set) and typed local variables." (node isAssignment and: [(locals includes: (var := node variable name)) and: [(alreadyExplicitlyTyped includes: var) not "don't be fooled by previously inferred types" and: [(type := node expression isSend ifTrue: [aCodeGen returnTypeForSend: node expression in: self] ifFalse: [self typeFor: node expression in: aCodeGen]) notNil and: [type ~= #void]]]]) ifTrue: [aCodeGen mergeTypeOf: var in: declarations with: type. effectiveNodes at: var put: { declarations at: var. node }, (effectiveNodes at: var ifAbsent: [#()])]]. ^effectiveNodes! Item was changed: ----- Method: TMethod>>inlineSend:directReturn:exitVar:in: (in category 'inlining') ----- inlineSend: aSendNode directReturn: directReturn exitVar: exitVar in: aCodeGen "Answer a collection of statements to replace the given send. directReturn indicates that the send is the expression in a return statement, so returns can be left in the body of the inlined method. If exitVar is nil, the value returned by the send is not used; thus, returns need not assign to the output variable. Types are propagated to as-yet-untyped variables when inlining a send that is assigned, otherwise the assignee variable type must match the return type of the inlinee. Return types are not propagated." | sel meth methArgs exitLabel inlineStmts label exitType | sel := aSendNode selector. meth := aCodeGen methodNamed: sel. methArgs := meth args. "convenient for debugging..." aCodeGen maybeBreakForInlineOf: aSendNode in: self. (methArgs notEmpty and: [methArgs first beginsWith: 'self_in_']) ifTrue: [methArgs := methArgs allButFirst]. methArgs size = aSendNode args size ifFalse: [^nil]. - methArgs with: aSendNode args do: - [:formal :actual| - (actual isVariable - and: [(aCodeGen - variableOfType: (self typeFor: formal using: aCodeGen) - acceptsValueOfType: (self typeFor: actual name in: aCodeGen)) not]) ifTrue: - [aCodeGen logger - nextPutAll: - 'type mismatch for formal ', formal, ' and actual ', actual name, - ' when inlining ', sel, ' in ', selector, '. Use a cast.'; - cr; flush]]. meth := meth copy. "Propagate the return type of an inlined method" + (directReturn or: [exitVar notNil]) ifTrue: + [exitType := directReturn + ifTrue: [returnType] + ifFalse: [(self typeFor: exitVar in: aCodeGen) ifNil: [#sqInt]]. + (exitType = #void or: [exitType = meth returnType]) ifFalse: + [meth propagateReturnIn: aCodeGen]]. - (directReturn or:[exitVar notNil]) ifTrue:[ - exitType := directReturn - ifTrue:[returnType] - ifFalse:[(self typeFor: exitVar in: aCodeGen) ifNil:[#sqInt]]. - (exitType = #void or:[exitType = meth returnType]) - ifFalse:[meth propagateReturnIn: aCodeGen]]. meth renameVarsForInliningInto: self except: #() in: aCodeGen. meth renameLabelsForInliningInto: self. self addVarsDeclarationsAndLabelsOf: meth except: #(). + meth hasReturn ifTrue: + [directReturn ifFalse: + [exitLabel := self unusedLabelForInliningInto: self. + (meth exitVar: exitVar label: exitLabel) "is label used?" - meth hasReturn ifTrue:[ - directReturn ifFalse:[ - exitLabel := self unusedLabelForInliningInto: self. - (meth exitVar: exitVar label: exitLabel) "is label used?" ifTrue: [ labels add: exitLabel ] ifFalse: [ exitLabel := nil ]]]. (inlineStmts := OrderedCollection new: 100) add: (label := TLabeledCommentNode new setComment: 'begin ', sel); addAll: (self argAssignmentsFor: meth send: aSendNode in: aCodeGen); addAll: meth statements. "method body" (directReturn and: [meth endsWithReturn not]) ifTrue: [inlineStmts add: (TReturnNode new setExpression: (TVariableNode new setName: 'nil'))]. exitLabel ~= nil ifTrue: [inlineStmts add: (TLabeledCommentNode new setLabel: exitLabel comment: 'end ', meth selector)]. ^inlineStmts! Item was changed: ----- Method: TMethod>>isNode:substitutableFor:inMethod:in: (in category 'inlining') ----- isNode: aNode substitutableFor: argName inMethod: targetMeth in: aCodeGen "Answer if the given parameter node may be substituted directly into the body of the method during inlining, instead of being bound to the actual parameter variable. We allow a constant, a local variable, or a formal parameter, or simple expressions involving only these to to be directly substituted. Note that global variables cannot be subsituted into methods with possible side effects (i.e., methods that may assign to global variables) because the inlined method might depend on having the value of the global variable captured when it is passed in as an argument." | madeNonTrivialCall count constantExpression usageCount | aNode isConstant ifTrue: [^true]. aNode isVariable ifTrue: [((locals includes: aNode name) or: [(args includes: aNode name) or: [#('self' 'true' 'false' 'nil') includes: aNode name]]) ifTrue: [^true]. "We can substitute any variable provided it is only read in the method being inlined, and if it is not read after any non-trivial call (which may update the variable)." madeNonTrivialCall := false. (targetMeth isComplete and: [targetMeth parseTree noneSatisfy: [:node| (node isSend and: [(aCodeGen isBuiltinSelector: node selector) not]) ifTrue: [madeNonTrivialCall := true]. (madeNonTrivialCall and: [node isVariable and: [node name = argName]]) or: [node isAssignment and: [node variable name = argName]]] unless: [:node| node isSend and: [aCodeGen isAssertSelector: node selector]]]) ifTrue: [^true]. ^targetMeth maySubstituteGlobal: aNode name in: aCodeGen]. + "don't much up asserts with complex expansions" + (targetMeth usesVariableUninlinably: argName in: aCodeGen) ifTrue: + [^false]. + "For now allow literal blocks to be substituted. They better be accessed only with value[:value:*] messages though!!" aNode isStmtList ifTrue: [^true]. "Don't inline expressions unless type-compatible," aNode isSend ifTrue: [(aCodeGen isActualType: (aCodeGen returnTypeForSend: aNode in: self) compatibleWithFormalType: (self typeFor: argName in: aCodeGen)) ifFalse: [^false]]. count := 0. constantExpression := true. "scan expression tree; must contain only constants, builtin ops, and inlineable vars" aNode nodesDo: [:node| node isConstant ifTrue: [] ifFalse: [node isSend ifTrue: [((VMBasicConstants mostBasicConstantSelectors includes: node selector) or: [node isBuiltinOperator]) ifFalse: [^false]. count := count + 1] ifFalse: [node isVariable ifTrue: [(aCodeGen isNonArgumentImplicitReceiverVariableName: node name) ifFalse: [constantExpression := false. ((locals includes: node name) or: [(args includes: node name) or: [(#('self' 'true' 'false' 'nil') includes: node name) or: [targetMeth maySubstituteGlobal: node name in: aCodeGen]]]) ifFalse: [^false]]] ifFalse: [^false]]]]. "inline constant expressions" constantExpression ifNil: [^true]. "scan target to find usage count" usageCount := 0. targetMeth parseTree nodesDo: [:node| (node isVariable and: [node name = argName]) ifTrue: [usageCount := usageCount + 1]]. "(usageCount > 1 and: [count <= usageCount]) ifTrue: [[UsageCounts := Dictionary new. self removeClassVarName: #UsageCounts]. (UsageCounts at: usageCount ifAbsentPut: [Set new]) add: ({targetMeth. argName. aNode})]." "Now only inline expressions if they are used only once or are simple w.r.t. the usage count, and the usage count is not large; a heuristic that seems to work well enough." ^usageCount = 1 or: [usageCount <= 7 and: [count <= usageCount]]! Item was added: + ----- Method: TMethod>>node:typeCompatibleWith:inliningInto:in: (in category 'inlining') ----- + node: exprNode typeCompatibleWith: argName inliningInto: inlineSelector in: aCodeGen + "Answer either exprNode or, iff argName is typed and exprNode is untyped, a cast of exprNode to the type of argName." + | formalType actualType | + ^((exprNode isSend or: [exprNode isVariable]) + and: [(formalType := self typeFor: argName in: aCodeGen) notNil + and: [(actualType := aCodeGen typeFor: exprNode in: self) isNil + or: [(aCodeGen variableOfType: formalType acceptsValueOfType: actualType) not]]]) + ifTrue: [aCodeGen nodeToCast: exprNode to: formalType] + ifFalse: + [((exprNode isSend or: [exprNode isVariable]) + and: [(aCodeGen + variableOfType: (aCodeGen typeFor: exprNode in: self) + acceptsValueOfType: (self typeFor: argName in: aCodeGen)) not]) ifTrue: + [aCodeGen logger + nextPutAll: + 'type mismatch for formal ', argName, ' and actual ', exprNode asString, + ' when inlining ', inlineSelector, ' in ', selector, '. Use a cast.'; + cr; flush]. + exprNode]! Item was changed: ----- Method: TMethod>>returnType: (in category 'accessing') ----- returnType: aString + "Set the type of the values returned by this method. + This string will be used in the C declaration of this function. + If the type exists as a symbol, use that." - "Set the type of the values returned by this method. This string will be used in the C declaration of this function." + returnType := (Symbol findInterned: aString) ifNil: [aString]! - returnType := aString! Item was changed: ----- Method: TMethod>>transformToStructClassMethodFor: (in category 'transformations') ----- transformToStructClassMethodFor: aCCodeGenerator "Transform this method so that it can be used on an instance of a struct class (VMStructType subclass). Convert inst var refs into field dereferences of self. Add selfSelector as the first argument with the right struct type. As a complete hack to avoid breaking the inlinert don't use 'self' as the name for self as this causes serious type redefinitions ``somewhere'' in the inliner." | replacements selfNode typeForSelf | self isStructAccessor ifTrue: + [^self returnType: (definingClass returnTypeForAccessor: selector)]. - [^returnType := definingClass returnTypeForAccessor: selector]. replacements := IdentityDictionary new. selfNode := TVariableNode new setName: 'self_in_', (aCCodeGenerator cFunctionNameFor: selector). args do: [:var| (definingClass isAccessor: var) ifTrue: [self error: 'In ', definingClass name, '>>', selector, ' ', var, ' arg shadows struct field and will break during translation!!']]. parseTree nodesDo: [:node| node isVariable ifTrue: [node name = 'self' ifTrue: [replacements at: node put: selfNode copy]. (definingClass isAccessor: node name) ifTrue: [replacements at: node put: (TSendNode new setSelector: node name asSymbol receiver: selfNode arguments: #())]]]. replacements notEmpty ifTrue: [parseTree := parseTree replaceNodesIn: replacements]. typeForSelf := self typeForSelf. self assert: (typeForSelf notNil and: [typeForSelf ~~ #implicit]). self declarationAt: (args addFirst: selfNode name) put: (declarations removeKey: 'self'), '_in_', (aCCodeGenerator cFunctionNameFor: selector)! Item was removed: - ----- Method: TMethod>>typeFor:using: (in category 'utilities') ----- - typeFor: aVariable using: aCCodeGen - "Answer the type for aVariable. Answer nil for variables without types. nil for - typelessness is required by the type propagation logic in inlineSend:directReturn:exitVar:in:." - ^aCCodeGen extractTypeFor: aVariable fromDeclaration: (declarations at: aVariable asString ifAbsent: [^nil])! Item was added: + ----- Method: TMethod>>usesVariableUninlinably:in: (in category 'inlining') ----- + usesVariableUninlinably: argName in: aCodeGen + ^parseTree anySatisfy: + [:node| + node isSend + and: [(aCodeGen isAssertSelector: node selector) + and: [node args anySatisfy: + [:argNode| + argNode anySatisfy: + [:subNode| + subNode isVariable and: [subNode name = argName]]]]]]!

1 0

Re: [Pharo-dev] Determine if a method is Jitted or not
by Eliot Miranda 23 Feb '15

23 Feb '15

On Feb 23, 2015, at 7:50 AM, Thierry Goubier <thierry.goubier(a)gmail.com> wrote: > > > 2015-02-23 16:36 GMT+01:00 Eliot Miranda <eliot.miranda(a)gmail.com>: >> Hi Thierry, >> >> there's an unadvertised primitive called Context>>#xRay (or ContextPart>>#xRay) that answers these questions for tests. I'm away from the system right now but I'll get you the source soon. Also, the limit on jutting methods, 60 literals, is a default. There's a command line option -maxcoglits (IIRC) that you can change. > > Thanks Eliot! > > It's helping a lot to guide me, even if I have to work at the ast level and, as a result, I estimate the number of literals in the bytecode by counting the number of literal nodes in the AST, with the approximation that ~100 literal nodes will make it under the limit. > > Making it under the limit shaves 30% of the execution time of a parse with SmaCC. And it avoids the too long methods as a side benefit. > > I would dream of having precise ways of estimating things like that on the AST. It's interesting to hit those "I'd like to be able to predict the performance of that piece of code" issues. Alas two things other than the AST affect the number of literals. First is the specialSelectors; these are used for sends only. So if a method only sends one of the special selectors the selector will not occur in the method as a literal. Second is the bytecode set. While we only have one set now, Sista is introducing another, and Newspeak has its own. In the current set, -1, 0, 1 & 2 and true and false have bytecodes to push these literals, so they don't occur as literals in methods. In both the Sista and the Newspeak sets there are bytecodes that encode a much wider range of integers and characters as bytecodes (a push literal bytecode takes 1 byte for the bytecode and 4 or 8 bytes for the literal; a bytecode for the 16-bit integer range takes 3 bytes). Another thing that affects the number of literals is the compiler's decision to include selectors for optimized methods such as ifTrue: et al (which I think is a very good thing). If you could ask the back end which literal would be encoded as a literal (and if course the question is asked when bytecode is generated) you could get a more accurate count. HTH > > Thierry > >> >> Eliot (phone) >> >> On Feb 23, 2015, at 5:05 AM, Thierry Goubier <thierry.goubier(a)gmail.com> wrote: >> >> > Hi All, >> > >> > anybody knows how to check if a method is jitted or not? >> > >> > I remember (maybe wrongly) that the Jit in Cog has a configurable limit on the number of bytecodes for a method to be jitted or not; I'm looking into the performance of generated code where I can, more or less, control the length of methods (SmaCC) and I'd like to find the optimum point. >> > >> > Thanks, >> > >> > Thierry >

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev February 2015