Packages June 2015

packages@lists.squeakfoundation.org

1 participants
46 discussions

The Trunk: System-topa.742.mcz
by commits＠source.squeak.org 25 Jun '15

25 Jun '15

Tobias Pape uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-topa.742.mcz ==================== Summary ==================== Name: System-topa.742 Author: topa Time: 25 June 2015, 10:25:17.963 am UUID: fb848387-2569-4297-bcbe-3b292a38b654 Ancestors: System-topa.741 Shortcut float types for DataStream. This is messy but the alternatives aren't better. =============== Diff against System-topa.741 =============== Item was changed: ----- Method: DataStream>>typeIDFor: (in category 'write and read') ----- typeIDFor: anObject "Return the typeID for anObject's class. This is where the tangle of objects is clipped to stop everything from going out. Classes can control their instance variables by defining objectToStoreOnDataStream. Any object in blockers is not written out. See ReferenceStream.objectIfBlocked: and DataStream nextPut:. Morphs do not write their owners. See Morph.storeDataOn: Each morph tells itself to 'prepareToBeSaved' before writing out." + + + anObject isFloat ifTrue: [^14]. "shortcut floats of any representation." - ^ TypeMap at: anObject class ifAbsent: [9 "instance of any normal class"] "See DataStream initialize. nil=1. true=2. false=3. a SmallInteger=4. (a String was 5). a Symbol=6. a ByteArray=7. an Array=8. other = 9. a Bitmap=11. a Metaclass=12. a Float=14. a Rectangle=15. any instance that can have a short header=16. a String=17 (new format). a WordArray=18."!

1 0

The Trunk: System-topa.742.mcz
by commits＠source.squeak.org 25 Jun '15

25 Jun '15

1 0

The Trunk: Tests-topa.320.mcz
by commits＠source.squeak.org 25 Jun '15

25 Jun '15

Tobias Pape uploaded a new version of Tests to project The Trunk: http://source.squeak.org/trunk/Tests-topa.320.mcz ==================== Summary ==================== Name: Tests-topa.320 Author: topa Time: 25 June 2015, 10:17:43.498 am UUID: b92ca80d-36da-49c7-90b5-4cc7e29faa8c Ancestors: Tests-ul.319 Sanity tests for Data/Ref/Smart Streams Works on V3 images, not yet on V5/Spur =============== Diff against Tests-ul.319 =============== Item was added: + TestCase subclass: #DataStreamTest + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Tests-System-Object Storage'! Item was added: + ----- Method: DataStreamTest>>get: (in category 'helper') ----- + get: aSerialized + + ^ self streamClass unStream: aSerialized! Item was added: + ----- Method: DataStreamTest>>put: (in category 'helper') ----- + put: anObject + + ^ self streamClass streamedRepresentationOf: anObject.! Item was added: + ----- Method: DataStreamTest>>streamClass (in category 'constants') ----- + streamClass + ^ DataStream! Item was added: + ----- Method: DataStreamTest>>testCharacter (in category 'tests') ----- + testCharacter + | c | + c := Character value: 16r271D. + self assert: c equals: (self testObject: c) description: 'Characters should be serializable'! Item was added: + ----- Method: DataStreamTest>>testFloat (in category 'tests') ----- + testFloat + | f | + f := Float pi. + self assert: f equals: (self testObject: f) description: 'Floats should be serializable'. + ! Item was added: + ----- Method: DataStreamTest>>testObject: (in category 'helper') ----- + testObject: anObject + + | serialized | + serialized := self put: anObject. + ^ self get: serialized! Item was added: + ----- Method: DataStreamTest>>testSmallInteger (in category 'tests') ----- + testSmallInteger + | i | + i := SmallInteger maxVal. + self assert: i equals: (self testObject: i) description: 'The maximum small integer should be serializable'. + + i := SmallInteger minVal. + self assert: i equals: (self testObject: i) description: 'The minimum small integer should be serializable'! Item was added: + DataStreamTest subclass: #ReferenceStreamTest + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Tests-System-Object Storage'! Item was added: + ----- Method: ReferenceStreamTest>>streamClass (in category 'constants') ----- + streamClass + ^ ReferenceStream! Item was added: + ReferenceStreamTest subclass: #SmartRefStreamTest + instanceVariableNames: '' + classVariableNames: '' + poolDictionaries: '' + category: 'Tests-System-Object Storage'! Item was added: + ----- Method: SmartRefStreamTest>>expectedFailures (in category 'as yet unclassified') ----- + expectedFailures + + ^ Character instSize = 0 + ifTrue: [#( testCharacter )] + ifFalse: [#()]! Item was added: + ----- Method: SmartRefStreamTest>>put: (in category 'helper') ----- + put: anObject + + | s | + s := RWBinaryOrTextStream on: (ByteArray new: 500). + (self streamClass on: s) + nextPutObjOnly: anObject; + close. + ^ s contents! Item was added: + ----- Method: SmartRefStreamTest>>streamClass (in category 'constants') ----- + streamClass + ^ SmartRefStream!

1 0

The Trunk: Tests-topa.320.mcz
by commits＠source.squeak.org 25 Jun '15

25 Jun '15

1 0

The Trunk: System-topa.741.mcz
by commits＠source.squeak.org 25 Jun '15

25 Jun '15

Tobias Pape uploaded a new version of System to project The Trunk: http://source.squeak.org/trunk/System-topa.741.mcz ==================== Summary ==================== Name: System-topa.741 Author: topa Time: 25 June 2015, 10:14:29.118 am UUID: c6c42b80-9c1d-4abd-acf8-3b1b8bfce809 Ancestors: System-eem.740 Ensure characters read and write on Data/Ref streams todo: SmartRef =============== Diff against System-eem.740 =============== Item was changed: ----- Method: DataStream class>>example (in category 'as yet unclassified') ----- example "An example and test of DataStream/ReferenceStream. 11/19/92 jhm: Use self testWith:." "DataStream example" "ReferenceStream example" | input sharedPoint | "Construct the test data." + input := Array new: 10. - input := Array new: 9. input at: 1 put: nil. input at: 2 put: true. input at: 3 put: (Form extent: 63 @ 50 depth: 8). (input at: 3) fillWithColor: Color lightBlue. input at: 4 put: #(3 3.0 'three'). input at: 5 put: false. input at: 6 put: 1024 @ -2048. input at: 7 put: #x. input at: 8 put: (Array with: (sharedPoint := 0 @ -30000)). input at: 9 put: sharedPoint. + input at: 10 put: (Character value: 16r200d). "Write it out, read it back, and return it for inspection." ^ self testWith: input! Item was added: + ----- Method: DataStream>>readCharacterOfSize: (in category 'write and read') ----- + readCharacterOfSize: instSize + | refPosn val | + self assert: instSize = 1. + refPosn := self getCurrentReference. + self setCurrentReference: refPosn. + val := self next. + ^ Character value: val. + ! Item was changed: ----- Method: DataStream>>readInstance (in category 'write and read') ----- readInstance "PRIVATE -- Read the contents of an arbitrary instance. ASSUMES: readDataFrom:size: sends me beginReference: after it instantiates the new object but before reading nested objects. NOTE: We must restore the current reference position after recursive calls to next. Let the instance, not the class read the data. " | instSize aSymbol refPosn anObject newClass | instSize := (byteStream nextNumber: 4) - 1. refPosn := self getCurrentReference. aSymbol := self next. + aSymbol == #Character + ifTrue: [^ self readCharacterOfSize: instSize]. newClass := Smalltalk at: aSymbol asSymbol. anObject := newClass isVariable "Create object here" ifFalse: [newClass basicNew] ifTrue: [newClass basicNew: instSize - (newClass instSize)]. self setCurrentReference: refPosn. "before readDataFrom:size:" anObject := anObject readDataFrom: self size: instSize. self setCurrentReference: refPosn. "before returning to next" ^ anObject!

1 0

The Trunk: System-topa.741.mcz
by commits＠source.squeak.org 25 Jun '15

25 Jun '15

1 0

The Trunk: Compiler.spur-eem.301.mcz
by commits＠source.squeak.org 19 Jun '15

19 Jun '15

Eliot Miranda uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler.spur-eem.301.mcz ==================== Summary ==================== Name: Compiler.spur-eem.301 Author: eem Time: 19 June 2015, 12:42:21.36 pm UUID: 36fb91f1-929c-4d36-ba0b-49983331a34b Ancestors: Compiler-eem.301, Compiler.spur-eem.300 Compiler-eem.301 patched for Spur by SpurBootstrapMonticelloPackagePatcher Cog-eem.269 Fix pc range highlighting when at the #+ in the increment at the end of an optimized to:[by:]do: loop. =============== Diff against Compiler-eem.301 =============== Item was changed: ----- Method: BytecodeEncoder>>computeMethodHeaderForNumArgs:numTemps:numLits:primitive: (in category 'method generation') ----- computeMethodHeaderForNumArgs: numArgs numTemps: numTemps numLits: numLits primitive: primitiveIndex + numArgs > 15 ifTrue: + [^self error: 'Cannot compile -- too many arguments']. + numTemps > 63 ifTrue: + [^self error: 'Cannot compile -- too many temporary variables']. + numLits > 65535 ifTrue: + [^self error: 'Cannot compile -- too many literals']. + ^(CompiledMethod headerFlagForEncoder: self) + + (numArgs bitShift: 24) + + (numTemps bitShift: 18) + "+ (largeBit bitShift: 17)" "largeBit gets filled in later" + + (primitiveIndex > 0 ifTrue: [1 bitShift: 16] ifFalse: [0]) + + numLits! - "Compute the compiled method header that encodes the arguments - in the receiver's header format (see CompiledMehtod's class comment)." - self subclassResponsibility! Item was removed: - ----- Method: EncoderForV3>>computeMethodHeaderForNumArgs:numTemps:numLits:primitive: (in category 'method generation') ----- - computeMethodHeaderForNumArgs: numArgs numTemps: numTemps numLits: numLits primitive: primitiveIndex - | primBits | - numTemps > 63 ifTrue: - [^self error: 'Cannot compile -- too many temporary variables']. - numLits > 255 ifTrue: - [^self error: 'Cannot compile -- too many literals']. - primBits := primitiveIndex <= 16r1FF - ifTrue: [primitiveIndex] - ifFalse: "For now the high bit of primitive no. is in the 29th bit of header" - [primitiveIndex > 16r3FF ifTrue: [self error: 'prim num too large']. - (primitiveIndex bitAnd: 16r1FF) + ((primitiveIndex bitAnd: 16r200) bitShift: 19)]. - ^(numArgs bitShift: 24) - + (numTemps bitShift: 18) - "+ (largeBit bitShift: 17)" "largeBit gets filled in later" - + (numLits bitShift: 9) - + primBits! Item was changed: ----- Method: EncoderForV3PlusClosures class>>bytecodeSize: (in category 'instruction stream support') ----- bytecodeSize: bytecode "Answer the number of bytes in the bytecode." bytecode <= 125 ifTrue: [^1]. bytecode >= 176 ifTrue: [^1]. bytecode >= 160 ifTrue: "long jumps" [^2]. bytecode >= 144 ifTrue: "short jumps" [^1]. "extensions" bytecode >= 128 ifTrue: + [^#(2 2 2 2 3 2 2 1 1 1 2 3 3 3 3 4) at: bytecode - 127]. - [^#(2 2 2 2 3 2 2 1 1 1 2 nil 3 3 3 4) at: bytecode - 127]. ^nil! Item was added: + ----- Method: EncoderForV3PlusClosures class>>callPrimitiveCode (in category 'bytecode decoding') ----- + callPrimitiveCode + "139 11101111 iiiiiiii jjjjjjjj Call Primitive #iiiiiiii + (jjjjjjjj * 256)" + ^139! Item was added: + ----- Method: EncoderForV3PlusClosures>>genCallPrimitive: (in category 'bytecode generation') ----- + genCallPrimitive: primitiveIndex + "139 11101111 iiiiiiii jjjjjjjj Call Primitive #iiiiiiii + (jjjjjjjj * 256)" + (primitiveIndex < 1 or: [primitiveIndex > 65535]) ifTrue: + [self outOfRangeError: 'primitive index' index: primitiveIndex range: 1 to: 65535]. + stream + nextPut: 139; + nextPut: (primitiveIndex bitAnd: 255); + nextPut: (primitiveIndex bitShift: -8)! Item was changed: ----- Method: MethodNode>>generate:using: (in category 'code generation') ----- generate: trailer using: aCompiledMethodClass "The receiver is the root of a parse tree. Answer an instance of aCompiledMethodClass. The argument, trailer, is arbitrary but is typically either the reference to the source code that is stored with every CompiledMethod, or an encoding of the method's temporary names." + | primErrNode blkSize nLits locals literals stack header method | - | primErrNode blkSize nLits literals stack method | self generate: trailer using: aCompiledMethodClass ifQuick: [:m | encoder noteBlockExtent: (0 to: 2) hasLocals: arguments. m literalAt: 2 put: encoder associationForClass; properties: properties. ^m]. primErrNode := self primitiveErrorVariableName ifNotNil: [encoder fixTemp: self primitiveErrorVariableName]. + self ensureClosureAnalysisDone. + encoder rootNode: self. "this is for BlockNode>>sizeCodeForClosureValue:" - encoder supportsClosureOpcodes ifTrue: - [self ensureClosureAnalysisDone. - encoder rootNode: self. "this is for BlockNode>>sizeCodeForClosureValue:"]. blkSize := (block sizeCodeForEvaluatedValue: encoder) + + (primitive > 0 + ifTrue: [encoder sizeCallPrimitive: primitive] + ifFalse: [0]) + (primErrNode ifNil: [0] ifNotNil: [primErrNode index: arguments size + temporaries size; sizeCodeForStore: encoder "The VM relies on storeIntoTemp: (129)"]). + locals := arguments, temporaries, (primErrNode ifNil: [#()] ifNotNil: [{primErrNode}]). + encoder noteBlockExtent: block blockExtent hasLocals: locals. + header := encoder computeMethodHeaderForNumArgs: arguments size + numTemps: locals size + numLits: (nLits := (literals := encoder allLiterals) size) + primitive: primitive. + method := trailer + createMethod: blkSize + class: aCompiledMethodClass + header: header. - method := aCompiledMethodClass - newBytes: blkSize - trailerBytes: trailer - nArgs: arguments size - nTemps: (encoder supportsClosureOpcodes - ifTrue: [| locals | - locals := arguments, - temporaries, - (primErrNode - ifNil: [#()] - ifNotNil: [{primErrNode}]). - encoder - noteBlockExtent: block blockExtent - hasLocals: locals. - locals size] - ifFalse: [encoder maxTemp]) - nStack: 0 - nLits: (nLits := (literals := encoder allLiterals) size) - primitive: primitive. - nLits > 255 ifTrue: - [^self error: 'Too many literals referenced']. 1 to: nLits do: [:lit | method literalAt: lit put: (literals at: lit)]. encoder streamToMethod: method. stack := ParseStack new init. + primitive > 0 ifTrue: + [encoder genCallPrimitive: primitive. + primErrNode ifNotNil: + [primErrNode emitCodeForStore: stack encoder: encoder]]. - primErrNode ifNotNil: [primErrNode emitCodeForStore: stack encoder: encoder]. stack position: method numTemps. [block emitCodeForEvaluatedValue: stack encoder: encoder] on: Error "If an attempt is made to write too much code the method will be asked" do: [:ex| "to grow, and the grow attempt will fail in CompiledMethod class>>#new:" ex signalerContext sender method = (CompiledMethod class>>#new:) ifTrue: [^self error: 'Compiler code size discrepancy'] ifFalse: [ex pass]]. stack position ~= (method numTemps + 1) ifTrue: [^self error: 'Compiler stack discrepancy']. encoder methodStreamPosition ~= (method size - trailer size) ifTrue: [^self error: 'Compiler code size discrepancy']. method needsFrameSize: stack size - method numTemps. method properties: properties. ^method!

1 0

The Trunk: Compiler.spur-eem.301.mcz
by commits＠source.squeak.org 19 Jun '15

19 Jun '15

1 0

The Trunk: Compiler-eem.301.mcz
by commits＠source.squeak.org 19 Jun '15

19 Jun '15

Eliot Miranda uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-eem.301.mcz ==================== Summary ==================== Name: Compiler-eem.301 Author: eem Time: 19 June 2015, 10:01:55.282 am UUID: 2e7f25b0-33b9-4efc-b492-27a58ff8d78f Ancestors: Compiler-eem.300 Fix pc range highlighting when at the #+ in the increment at the end of an optimized to:[by:]do: loop. =============== Diff against Compiler-eem.300 =============== Item was changed: ----- Method: MessageNode>>transformToDo: (in category 'macro transformations') ----- transformToDo: encoder + " var := rcvr. L1: [var <= arg1] Bfp(L2) [block body. var := var + inc] Jmp(L1) L2: " - " var := rcvr. L1: [var <= arg1] Bfp(L2) [block body. var := var + inc] - Jmp(L1) L2: " | limit increment block initStmt test incStmt limitInit blockVar myRange blockRange limitIsAssignedTo | + block := arguments last. "First check for valid arguments" + (block notNil + and: [block isBlockNode + and: [block numberOfArguments = 1 + and: [block firstArgument isVariableReference "As with debugger remote vars"]]]) ifFalse: - ((arguments last isMemberOf: BlockNode) - and: [arguments last numberOfArguments = 1 - and: [arguments last firstArgument isVariableReference "As with debugger remote vars"]]) ifFalse: [^false]. arguments size = 3 ifTrue: [increment := arguments at: 2. (increment isConstantNumber and: [increment literalValue ~= 0]) ifFalse: [^false]] ifFalse: [increment := encoder encodeLiteral: 1]. (limit := arguments at: 1) isVariableReference ifTrue: [limitIsAssignedTo := false. + block nodesDo: - arguments last nodesDo: [:node| (node isAssignmentNode and: [node variable = limit]) ifTrue: [limitIsAssignedTo := true]]. limitIsAssignedTo ifTrue: [^false]]. arguments size < 3 ifTrue: "transform to full form" [selector := SelectorNode new key: #to:by:do: code: #macro]. "Now generate auxiliary structures" myRange := encoder rawSourceRanges at: self ifAbsent: [1 to: 0]. - block := arguments last. blockRange := encoder rawSourceRanges at: block ifAbsent: [1 to: 0]. blockVar := block firstArgument. initStmt := AssignmentNode new variable: blockVar value: receiver. limit isVariableReference | limit isConstantNumber ifTrue: [limitInit := nil] ifFalse: "Need to store limit in a var" [limit := encoder bindBlockArg: blockVar key, 'LimiT' within: block. limit scope: -2. "Already done parsing block; flag so it won't print" block addArgument: limit. limitInit := AssignmentNode new variable: limit value: arguments first]. test := MessageNode new receiver: blockVar selector: (increment key > 0 ifTrue: [#<=] ifFalse: [#>=]) + arguments: {limit} + precedence: precedence + from: encoder - arguments: (Array with: limit) - precedence: precedence from: encoder sourceRange: (myRange first to: blockRange first). incStmt := AssignmentNode new variable: blockVar value: (MessageNode new receiver: blockVar selector: #+ + arguments: {increment} + precedence: precedence + from: encoder + sourceRange: (myRange last to: (myRange last max: blockRange last))) - arguments: (Array with: increment) - precedence: precedence from: encoder) from: encoder + sourceRange: (myRange last to: (myRange last max: blockRange last)). + arguments := {limit. increment. block. initStmt. test. incStmt. limitInit}. - sourceRange: (myRange last to: myRange last). - arguments := (Array with: limit with: increment with: block), - (Array with: initStmt with: test with: incStmt with: limitInit). block noteOptimizedIn: self. ^true!

1 0

The Trunk: Compiler-eem.301.mcz
by commits＠source.squeak.org 19 Jun '15

19 Jun '15

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Packages June 2015