Packages May 2014

packages@lists.squeakfoundation.org

1 participants
201 discussions

The Trunk: Tests-eem.296.mcz
by commits＠source.squeak.org 19 May '14

19 May '14

Eliot Miranda uploaded a new version of Tests to project The Trunk: http://source.squeak.org/trunk/Tests-eem.296.mcz ==================== Summary ==================== Name: Tests-eem.296 Author: eem Time: 19 May 2014, 12:13:39.122 pm UUID: e5218e7a-c04d-4739-b5fc-953bb2c06cb5 Ancestors: Tests-cwp.295 Eliminate obsolete long-form bytecode tests. =============== Diff against Tests-cwp.295 =============== Item was changed: ----- Method: ClosureCompilerTest>>testInjectIntoDecompilations (in category 'tests') ----- testInjectIntoDecompilations "Test various compilations decompile to the same code for a method sufficiently simple that this is possible and sufficiently complex that the code generated varies between the compilations." "self new testInjectIntoDecompilations" | source | source := (Collection sourceCodeAt: #inject:into:) asString. { Encoder. + EncoderForV3. + EncoderForV3PlusClosures } do: - EncoderForV3. EncoderForLongFormV3. - EncoderForV3PlusClosures. EncoderForLongFormV3PlusClosures } do: [:encoderClass| | method | method := (Parser new encoderClass: encoderClass; parse: source class: Collection) generate. self assert: (Scanner new scanTokens: method decompileString) = #(inject: t1 into: t2 | t3 | t3 ':=' t1 . self do: [ ':t4' | t3 ':=' t2 value: t3 value: t4 ] . ^ t3)]! Item was changed: ----- Method: ClosureCompilerTest>>testInjectIntoDecompiledDebugs (in category 'tests') ----- testInjectIntoDecompiledDebugs "Test various debugs of the decompiled form debug correctly." "self new testInjectIntoDecompiledDebugs" | source | source := (Collection sourceCodeAt: #inject:into:) asString. { Encoder. + EncoderForV3PlusClosures } do: - EncoderForV3PlusClosures. EncoderForLongFormV3PlusClosures } do: [:encoderClass| | method | method := (Parser new encoderClass: encoderClass; parse: source class: Collection) generate. self supportTestSourceRangeAccessForDecompiledInjectInto: method source: method decompileString]! Item was removed: - ----- Method: ClosureCompilerTest>>testSourceRangeAccessForBlueBookLongFormInjectInto (in category 'tests') ----- - testSourceRangeAccessForBlueBookLongFormInjectInto - "Test debugger source range selection for inject:into: for a version compiled with closures" - "self new testSourceRangeAccessForBlueBookLongFormInjectInto" - | source method | - source := (Collection sourceCodeAt: #inject:into:) asString. - method := (Parser new - encoderClass: EncoderForLongFormV3; - parse: source - class: Collection) - generate: (Collection compiledMethodAt: #inject:into:) trailer. - self supportTestSourceRangeAccessForInjectInto: method source: source! Item was removed: - ----- Method: ClosureCompilerTest>>testSourceRangeAccessForClosureLongFormBytecodeInjectInto (in category 'tests') ----- - testSourceRangeAccessForClosureLongFormBytecodeInjectInto - "Test debugger source range selection for inject:into: for a version compiled with closures" - "self new testSourceRangeAccessForClosureLongFormBytecodeInjectInto" - | source method | - source := (Collection sourceCodeAt: #inject:into:) asString. - method := (Parser new - encoderClass: EncoderForLongFormV3PlusClosures; - parse: source - class: Collection) - generate: (Collection compiledMethodAt: #inject:into:) trailer. - self supportTestSourceRangeAccessForInjectInto: method source: source!

1 0

The Trunk: Tests-eem.296.mcz
by commits＠source.squeak.org 19 May '14

19 May '14

1 0

The Trunk: Tests-eem.296.mcz
by commits＠source.squeak.org 19 May '14

19 May '14

1 0

The Trunk: Compiler-eem.283.mcz
by commits＠source.squeak.org 19 May '14

19 May '14

Eliot Miranda uploaded a new version of Compiler to project The Trunk: http://source.squeak.org/trunk/Compiler-eem.283.mcz ==================== Summary ==================== Name: Compiler-eem.283 Author: eem Time: 19 May 2014, 12:12:07.81 pm UUID: b275818f-33a6-461d-ab33-3d234e62f7ca Ancestors: Compiler-eem.282 Remove some of the class variables of ParseNode that are related to teh SqueakV3 bytecode set that are no longer needed. =============== Diff against Compiler-eem.282 =============== Item was changed: Object subclass: #ParseNode instanceVariableNames: 'comment pc' + classVariableNames: 'CodeBases CodeLimits LdFalse LdInstType LdLitIndType LdLitType LdMinus1 LdNil LdSelf LdSuper LdTempType LdThisContext LdTrue LoadLong NodeFalse NodeNil NodeSelf NodeSuper NodeThisContext NodeTrue Send SendPlus SendType StdLiterals StdSelectors StdVariables' - classVariableNames: 'Bfp BtpLong CodeBases CodeLimits DblExtDoAll Dup EndMethod EndRemote Jmp JmpLimit JmpLong LdFalse LdInstLong LdInstType LdLitIndType LdLitType LdMinus1 LdNil LdSelf LdSuper LdTempType LdThisContext LdTrue LoadLong LongLongDoAll NodeFalse NodeNil NodeSelf NodeSuper NodeThisContext NodeTrue Pop Send SendLimit SendLong SendLong2 SendPlus SendType ShortStoP StdLiterals StdSelectors StdVariables Store StorePop' poolDictionaries: '' category: 'Compiler-ParseNodes'! !ParseNode commentStamp: '<historical>' prior: 0! This superclass of most compiler/decompiler classes declares common class variables, default messages, and the code emitters for jumps. Some of the class variables are initialized here; the rest are initialized in class VariableNode.! Item was removed: - ----- Method: ParseNode class>>blockReturnCode (in category 'accessing') ----- - blockReturnCode - - ^ EndRemote! Item was changed: ----- Method: ParseNode class>>initialize (in category 'class initialization') ----- initialize "ParseNode initialize. VariableNode initialize" LdInstType := 1. LdTempType := 2. LdLitType := 3. LdLitIndType := 4. SendType := 5. + "Back in the day the following constants corresponded to bytecodes. + Now they're just unique values that need to be eliminated when and if + things like code:type: are cleaned up." CodeBases := #(0 16 32 64 208 ). CodeLimits := #(16 16 32 32 16 ). LdSelf := 112. LdTrue := 113. LdFalse := 114. LdNil := 115. LdMinus1 := 116. LoadLong := 128. - Store := 129. - StorePop := 130. - ShortStoP := 96. - SendLong := 131. - DblExtDoAll := 132. - SendLong2 := 134. LdSuper := 133. - Pop := 135. - Dup := 136. LdThisContext := 137. - EndMethod := 124. - EndRemote := 125. - Jmp := 144. - Bfp := 152. - JmpLimit := 8. - JmpLong := 164. "code for jmp 0" - BtpLong := 168. SendPlus := 176. + Send := 208 + + "((ParseNode class >> #initialize) literals select: [:l| l isVariableBinding and: [(ParseNode classPool includesAssociation: l) and: [(self systemNavigation allCallsOn: l localTo: ParseNode) size = 1]]]) sort: [:a :b| a key <= b key]" + + "ParseNode classPool associations select: [:a| (self systemNavigation allCallsOn: a localTo: ParseNode) isEmpty]"! - Send := 208. - SendLimit := 16! Item was removed: - ----- Method: ParseNode class>>popCode (in category 'accessing') ----- - popCode - - ^ Pop!

1 0

The Trunk: Compiler-eem.283.mcz
by commits＠source.squeak.org 19 May '14

19 May '14

1 0

The Trunk: Compiler-eem.283.mcz
by commits＠source.squeak.org 19 May '14

19 May '14

1 0

The Trunk: Kernel-eem.852.mcz
by commits＠source.squeak.org 19 May '14

19 May '14

Eliot Miranda uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-eem.852.mcz ==================== Summary ==================== Name: Kernel-eem.852 Author: eem Time: 19 May 2014, 11:49:49.951 am UUID: 6d0add2f-b4ae-4e90-9b0d-7c938c4f4c1c Ancestors: Kernel-eem.851 Change scanning methods in InstructionStream and CompiledMethod to double-dispatch through CompiledMethod>>#encoderClass to provide pluggable multiple bytecode set support. The sign of a method's header chooses which of two bytecode sets are in effect, choosing between PrimaryBytecodeSetEncoderClass (header >= 0), and SecondaryBytecodeSetEncoderClass (header <= 0). =============== Diff against Kernel-eem.851 =============== Item was changed: ----- Method: CompiledMethod class>>newBytes:trailerBytes:nArgs:nTemps:nStack:nLits:primitive: (in category 'instance creation') ----- newBytes: numberOfBytes trailerBytes: trailer nArgs: nArgs nTemps: nTemps nStack: stackSize nLits: nLits primitive: primitiveIndex "Answer an instance of me. The header is specified by the message + arguments. The remaining parts are not as yet determined." - arguments. The remaining parts are not as yet determined." | largeBit primBits | nTemps > 63 ifTrue: [^ self error: 'Cannot compile -- too many temporary variables']. nLits > 255 ifTrue: + [^ self error: 'Cannot compile -- too many literals']. - [^ self error: 'Cannot compile -- too many literals variables']. largeBit := (nTemps + stackSize) > SmallFrame ifTrue: [1] ifFalse: [0]. 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)]. ^trailer createMethod: numberOfBytes class: self header: (nArgs bitShift: 24) + (nTemps bitShift: 18) + (largeBit bitShift: 17) + (nLits bitShift: 9) + primBits! Item was changed: ----- Method: CompiledMethod class>>newBytes:trailerBytes:nArgs:nTemps:nStack:nLits:primitive:flag: (in category 'instance creation') ----- newBytes: numberOfBytes trailerBytes: trailer nArgs: nArgs nTemps: nTemps nStack: stackSize nLits: nLits primitive: primitiveIndex flag: flag "Answer an instance of me. The header is specified by the message + arguments. The remaining parts are not as yet determined." - arguments. The remaining parts are not as yet determined." | largeBit primBits flagBit | nTemps > 63 ifTrue: [^ self error: 'Cannot compile -- too many temporary variables']. nLits > 255 ifTrue: + [^ self error: 'Cannot compile -- too many literals']. - [^ self error: 'Cannot compile -- too many literals variables']. largeBit := (nTemps + stackSize) > SmallFrame ifTrue: [1] ifFalse: [0]. "For now the high bit of the primitive no. is in a high bit of the header" primBits := (primitiveIndex bitAnd: 16r1FF) + ((primitiveIndex bitAnd: 16r200) bitShift: 19). flagBit := flag ifTrue: [ 1 ] ifFalse: [ 0 ]. - "Copy the source code trailer to the end" ^trailer createMethod: numberOfBytes class: self header: (nArgs bitShift: 24) + (nTemps bitShift: 18) + (largeBit bitShift: 17) + (nLits bitShift: 9) + primBits + (flagBit bitShift: 29)! Item was changed: ----- Method: CompiledMethod>>containsBlockClosures (in category 'closures') ----- containsBlockClosures + ^self scanner scanFor: self encoderClass createClosureScanBlock! - ^ self scanner scanFor: [ :bc | bc = 143 "push closure bytecode" ]! Item was changed: ----- Method: CompiledMethod>>header (in category 'literals') ----- header "Answer the word containing the information about the form of the + receiver and the form of the context needed to run the receiver. + There are two different formats, selected by the sign bit. These are - receiver and the form of the context needed to run the receiver." + Original Squeak V3: + 30:sign:0 29:flag 28:prim (high bit) 27-24:numArgs 23-18:numTemps 17:largeFrameFlag 16-9:numLits 8-0:prim (low 9 bits) + + Alternate Bytecode Set + 30:sign:1 29-28:accessModifier 27-24:numArgs 23-18:numTemps 17:largeFrameFlag 16:hasPrimitive 15-0:numLits + + i.e. the Alternate Bytecode Set expands the number of literals to 65535 by assuming a CallPrimitive bytecode." + ^self objectAt: 1! Item was changed: ----- Method: CompiledMethod>>isBlueBookCompiled (in category 'testing') ----- isBlueBookCompiled + "Answer whether the receiver was compiled using the old Smalltalk-80 blocks + compiler. This is used to help DebuggerMethodMap choose which mechanisms + to use to inspect (debug) activations of the receiver." - "Answer whether the receiver was compiled using the closure compiler. - This is used to help DebuggerMethodMap choose which mechanisms to - use to inspect activations of the receiver. - This method answers false negatives in that it only identifies methods - that create old BlockClosures or use the new BlockClosure bytecodes. - It cannot tell if a method which uses neither the old nor the new block - bytecodes is compiled with the blue-book compiler or the new compiler. - But since methods that don't create blocks have essentially the same - code when compiled with either compiler this makes little difference." + ^self encoderClass supportsClosures not! - ^((InstructionStream on: self) scanFor: - [:instr | - (instr >= 138 and: [instr <= 143]) ifTrue: [^false]. - instr = 200]) - or: [(self hasLiteral: #blockCopy:) - and: [self messages includes: #blockCopy:]]! Item was changed: ----- Method: CompiledMethod>>isClosureCompiled (in category 'testing') ----- isClosureCompiled "Answer whether the receiver was compiled using the closure compiler. This is used to help DebuggerMethodMap choose which mechanisms to + use to inspect (debug) activations of the receiver." - use to inspect activations of the receiver. - This method answers false negatives in that it only identifies methods - that create new BlockClosures or use the new BlockClosure bytecodes. - But since methods that don't create blocks have essentially the same - code when compiled with either compiler this makes little difference." + ^self encoderClass supportsClosures! - ^((InstructionStream on: self) scanFor: [:instr | instr >= 138 and: [instr <= 143]]) - or: [(self hasLiteral: #closureCopy:copiedValues:) - and: [self messages includes: #closureCopy:copiedValues:]]! Item was changed: ----- Method: CompiledMethod>>methodNode (in category 'decompiling') ----- methodNode "Return the parse tree that represents self. If parsing fails, decompile the method." | aClass source | aClass := self methodClass. source := self getSourceFor: (self selector ifNil: [self defaultSelector]) in: aClass. ^[(aClass newParser + encoderClass: self encoderClass; - encoderClass: (self isBlueBookCompiled - ifTrue: [EncoderForV3] - ifFalse: [EncoderForV3PlusClosures]); parse: source class: aClass) sourceText: source; yourself] on: SyntaxErrorNotification + do: [:ex | ex return: self decompileWithTemps]! - do: [:ex | ex return: self decompileWithTemps].! Item was changed: ----- Method: CompiledMethod>>numLiterals (in category 'accessing') ----- numLiterals "Answer the number of literals used by the receiver." + | header | + ^(header := self header) < 0 + ifTrue: [header bitAnd: 65535] + ifFalse: [(header bitShift: -9) bitAnd: 16rFF]! - - ^ (self header bitShift: -9) bitAnd: 16rFF! Item was changed: ----- Method: CompiledMethod>>primitive (in category 'accessing') ----- primitive "Answer the primitive index associated with the receiver. + Zero indicates that this is not a primitive method. + In the original header format we currently allow 10 bits of primitive index, but they are + in two places for backward compatibility. In the new format the primitive index is in the + last two bytes of a three byte callPrimitive: bytecode. The time to unpack is negligible, + since the derived primitive function pointer full index is stored in the method cache." + | header initialPC | + ^(header := self header) < 0 + ifTrue: + [(header anyMask: 65536) "Is the hasPrimitive? flag set?" + ifTrue: [(self at: (initialPC := self initialPC) + 1) + ((self at: initialPC + 2) bitShift: 8)] + ifFalse: [0]] + ifFalse: + [(header bitAnd: 16r1FF) + ((header bitShift: -19) bitAnd: 16r200)]! - Zero indicates that this is not a primitive method. - We currently allow 10 bits of primitive index, but they are in two places - for backward compatibility. The time to unpack is negligible, - since the reconstituted full index is stored in the method cache." - | primBits | - primBits := self header bitAnd: 16r100001FF. - - ^ (primBits bitAnd: 16r1FF) + (primBits bitShift: -19) - ! Item was changed: ----- Method: CompiledMethod>>readsField: (in category 'scanning') ----- readsField: varIndex + "Answer whether the receiver loads the instance variable indexed by the argument." - "Answer whether the receiver loads the instance variable indexed by the - argument." - "eem 5/24/2008 Rewritten to no longer assume the compiler uses the - most compact encoding available (for EncoderForLongFormV3 support)." | varIndexCode scanner | varIndexCode := varIndex - 1. + self isQuick ifTrue: + [^self isReturnField and: [self returnField = varIndexCode]]. + scanner := InstructionStream on: self. + ^scanner scanFor:(self encoderClass instVarReadScanBlockFor: varIndexCode using: scanner)! - self isReturnField ifTrue: [^self returnField = varIndexCode]. - ^(scanner := InstructionStream on: self) scanFor: - [:b| - b < 16 - ifTrue: [b = varIndexCode] - ifFalse: - [b = 128 - ifTrue: [scanner followingByte = varIndexCode and: [varIndexCode <= 63]] - ifFalse: - [b = 132 - and: [(scanner followingByte between: 64 and: 95) - and: [scanner thirdByte = varIndexCode]]]]]! Item was changed: ----- Method: CompiledMethod>>readsRef: (in category 'scanning') ----- + readsRef: variableBinding + "Answer whether the receiver reads the value of the argument." - readsRef: literalAssociation - "Answer whether the receiver loads the argument." "eem 5/24/2008 Rewritten to no longer assume the compler uses the most compact encoding available (for EncoderForLongFormV3 support)." | litIndex scanner | + (litIndex := self indexOfLiteral: variableBinding) = 0 ifTrue: - (litIndex := self indexOfLiteral: literalAssociation) = 0 ifTrue: [^false]. + scanner := InstructionStream on: self. + ^scanner scanFor: (self encoderClass bindingReadScanBlockFor: litIndex - 1 using: scanner)! - litIndex := litIndex - 1. - ^(scanner := InstructionStream on: self) scanFor: - [:b| - b >= 64 - and: - [b <= 95 - ifTrue: [b - 64 = litIndex] - ifFalse: - [b = 128 - ifTrue: [scanner followingByte - 192 = litIndex] - ifFalse: - [b = 132 - and: [(scanner followingByte between: 128 and: 159) - and: [scanner thirdByte = litIndex]]]]]]! Item was removed: - ----- Method: CompiledMethod>>scanLongLoad: (in category 'scanning') ----- - scanLongLoad: extension - "Answer whether the receiver contains a long load whose extension is the - argument." - - | scanner | - scanner := InstructionStream on: self. - ^scanner scanFor: [:instr | instr = 128 and: [scanner followingByte = extension]]! Item was removed: - ----- Method: CompiledMethod>>scanLongStore: (in category 'scanning') ----- - scanLongStore: extension - "Answer whether the receiver contains a long store whose extension is - the argument." - | scanner | - scanner := InstructionStream on: self. - ^scanner scanFor: - [:instr | (instr = 129 or: [instr = 130]) and: [scanner followingByte = extension]]! Item was removed: - ----- Method: CompiledMethod>>scanVeryLongLoad:offset: (in category 'scanning') ----- - scanVeryLongLoad: extension offset: offset - "Answer whether the receiver contains a long load whose extension is the - argument." - | scanner | - scanner := InstructionStream on: self. - ^ scanner scanFor: [:instr | (instr = 132 and: [scanner followingByte = extension]) - and: [scanner thirdByte = offset]]! Item was removed: - ----- Method: CompiledMethod>>scanVeryLongStore:offset: (in category 'scanning') ----- - scanVeryLongStore: extension offset: offset - "Answer whether the receiver contains a long load with the given offset. - Note that the constant +32 is the known difference between a - store and a storePop for instVars, and it will always fail on literal variables, - but these only use store (followed by pop) anyway." - | scanner | - scanner := InstructionStream on: self. - ^scanner scanFor: - [:instr | | ext | - (instr = 132 and: [(ext := scanner followingByte) = extension - or: ["might be a store/pop into rcvr" - ext = (extension+32)]]) - and: [scanner thirdByte = offset]]! Item was changed: ----- Method: CompiledMethod>>sendsToSuper (in category 'scanning') ----- sendsToSuper "Answer whether the receiver sends any message to super." | scanner | scanner := InstructionStream on: self. + ^scanner scanFor: (self encoderClass superSendScanBlockUsing: scanner)! - ^ scanner scanFor: - [:instr | instr = 16r85 or: [instr = 16r84 - and: [scanner followingByte between: 16r20 and: 16r3F]]]! Item was changed: ----- Method: CompiledMethod>>usesClosureBytecodes (in category 'testing') ----- usesClosureBytecodes "Answer whether the receiver was compiled using the closure compiler. This is used to help DebuggerMethodMap choose which mechanisms to use to inspect activations of the receiver. This method answers false negatives in that it only identifies methods that use the new BlockClosure bytecodes. But since methods that don't create blocks have essentially the same code when compiled with either compiler this makes little difference." + ^self encoderClass supportsClosures! - ^(InstructionStream on: self) scanFor: [:instr | instr >= 138 and: [instr <= 143]]! Item was changed: ----- Method: CompiledMethod>>writesField: (in category 'scanning') ----- writesField: varIndex "Answer whether the receiver stores into the instance variable indexed by the argument." - "eem 5/24/2008 Rewritten to no longer assume the compler uses the - most compact encoding available (for EncoderForLongFormV3 support)." + | scanner | - | varIndexCode scanner | self isQuick ifTrue: [^false]. + scanner := InstructionStream on: self. + ^scanner scanFor: (self encoderClass instVarWriteScanBlockFor: varIndex - 1 using: scanner)! - varIndexCode := varIndex - 1. - ^(scanner := InstructionStream on: self) scanFor: - [:b| - b >= 96 - and: [b <= 103 - ifTrue: [b - 96 = varIndexCode] - ifFalse: - [(b = 129 or: [b = 130]) - ifTrue: [scanner followingByte = varIndexCode and: [varIndexCode <= 63]] - ifFalse: - [b = 132 - and: [(scanner followingByte between: 160 and: 223) - and: [scanner thirdByte = varIndexCode]]]]]]! Item was changed: ----- Method: CompiledMethod>>writesRef: (in category 'scanning') ----- + writesRef: variableBinding + "Answer whether the receiver writes the value of the argument." - writesRef: literalAssociation - "Answer whether the receiver stores into the argument." "eem 5/24/2008 Rewritten to no longer assume the compler uses the most compact encoding available (for EncoderForLongFormV3 support)." | litIndex scanner | + (litIndex := self indexOfLiteral: variableBinding) = 0 ifTrue: - (litIndex := self indexOfLiteral: literalAssociation) = 0 ifTrue: [^false]. + scanner := InstructionStream on: self. + ^scanner scanFor: (self encoderClass bindingWriteScanBlockFor: litIndex - 1 using: scanner)! - litIndex := litIndex - 1. - ^(scanner := InstructionStream on: self) scanFor: - [:b| - (b = 129 or: [b = 130]) - ifTrue: [scanner followingByte - 192 = litIndex] - ifFalse: - [b = 132 - and: [scanner followingByte >= 224 - and: [scanner thirdByte = litIndex]]]]! Item was changed: ----- Method: InstructionStream>>followingPc (in category 'scanning') ----- followingPc "Answer the pc of the following bytecode." + | method | + method := self method. + ^pc + (method encoderClass bytecodeSize: (method at: pc))! - - ^self nextPc: (self method at: pc)! Item was removed: - ----- Method: InstructionStream>>interpret (in category 'decoding') ----- - interpret - - [self atEnd] whileFalse: [self interpretNextInstructionFor: self]! Item was changed: ----- Method: InstructionStream>>interpretJump (in category 'decoding') ----- interpretJump + "If the instruction at pc is an unconditional jump, interpret it, advancing the pc, + and answering the jump distance. Otherwise answer nil." + ^self method encoderClass interpretJumpIn: self! - - | byte | - byte := self method at: pc. - (byte between: 144 and: 151) ifTrue: - [pc := pc + 1. ^byte - 143]. - (byte between: 160 and: 167) ifTrue: - [pc := pc + 2. ^(byte - 164) * 256 + (self method at: pc - 1)]. - ^nil! Item was changed: ----- Method: InstructionStream>>interpretJumpIfCond (in category 'decoding') ----- interpretJumpIfCond + "If the instruction at pc is a conditional jump, interpret it, advancing the pc, + and answering the jump distance. Otherwise answer nil." + ^self method encoderClass interpretJumpIfCondIn: self! - - | byte | - byte := self method at: pc. - (byte between: 152 and: 159) ifTrue: - [pc := pc + 1. ^byte - 151]. - (byte between: 168 and: 175) ifTrue: - [pc := pc + 2. ^(byte bitAnd: 3) * 256 + (self method at: pc - 1)]. - ^nil! Item was changed: ----- Method: InstructionStream>>interpretNextInstructionFor: (in category 'decoding') ----- + interpretNextInstructionFor: client + "Send to the argument, client, a message that specifies the type of the next instruction." - interpretNextInstructionFor: client - "Send to the argument, client, a message that specifies the type of the - next instruction." + ^self method encoderClass interpretNextInstructionFor: client in: self! - | byte type offset method | - method := self method. - byte := method at: pc. - type := byte // 16. - offset := byte \\ 16. - pc := pc+1. - "We do an inline binary search on each of the possible 16 values of type: - The old, cleaner but slowe code is retained as a comment below" - type < 8 - ifTrue: [type < 4 - ifTrue: [type < 2 - ifTrue: [type < 1 - ifTrue: ["type = 0" - ^ client pushReceiverVariable: offset] - ifFalse: ["type = 1" - ^ client pushTemporaryVariable: offset]] - ifFalse: [type < 3 - ifTrue: ["type = 2" - ^ client - pushConstant: (method literalAt: offset + 1)] - ifFalse: ["type = 3" - ^ client - pushConstant: (method literalAt: offset + 17)]]] - ifFalse: [type < 6 - ifTrue: [type < 5 - ifTrue: ["type = 4" - ^ client - pushLiteralVariable: (method literalAt: offset + 1)] - ifFalse: ["type = 5" - ^ client - pushLiteralVariable: (method literalAt: offset + 17)]] - ifFalse: [type < 7 - ifTrue: ["type = 6" - offset < 8 - ifTrue: [^ client popIntoReceiverVariable: offset] - ifFalse: [^ client popIntoTemporaryVariable: offset - 8]] - ifFalse: ["type = 7" - offset = 0 - ifTrue: [^ client pushReceiver]. - offset < 8 - ifTrue: [^ client - pushConstant: (SpecialConstants at: offset)]. - offset = 8 - ifTrue: [^ client methodReturnReceiver]. - offset < 12 - ifTrue: [^ client - methodReturnConstant: (SpecialConstants at: offset - 8)]. - offset = 12 - ifTrue: [^ client methodReturnTop]. - offset = 13 - ifTrue: [^ client blockReturnTop]. - offset > 13 - ifTrue: [^ self error: 'unusedBytecode']]]]] - ifFalse: [type < 12 - ifTrue: [type < 10 - ifTrue: [type < 9 - ifTrue: ["type = 8" - ^ self - interpretExtension: offset - in: method - for: client] - ifFalse: ["type = 9 (short jumps)" - offset < 8 - ifTrue: [^ client jump: offset + 1]. - ^ client jump: offset - 8 + 1 if: false]] - ifFalse: [type < 11 - ifTrue: ["type = 10 (long jumps)" - byte := method at: pc. - pc := pc + 1. - offset < 8 - ifTrue: [^ client jump: offset - 4 * 256 + byte]. - ^ client jump: (offset bitAnd: 3) - * 256 + byte if: offset < 12] - ifFalse: ["type = 11" - ^ client - send: (Smalltalk specialSelectorAt: offset + 1) - super: false - numArgs: (Smalltalk specialNargsAt: offset + 1)]]] - ifFalse: [type = 12 - ifTrue: [^ client - send: (Smalltalk specialSelectorAt: offset + 17) - super: false - numArgs: (Smalltalk specialNargsAt: offset + 17)] - ifFalse: ["type = 13, 14 or 15" - ^ client - send: (method literalAt: offset + 1) - super: false - numArgs: type - 13]]]. - - - " old code - type=0 ifTrue: [^client pushReceiverVariable: offset]. - type=1 ifTrue: [^client pushTemporaryVariable: offset]. - type=2 ifTrue: [^client pushConstant: (method literalAt: offset+1)]. - type=3 ifTrue: [^client pushConstant: (method literalAt: offset+17)]. - type=4 ifTrue: [^client pushLiteralVariable: (method literalAt: offset+1)]. - type=5 ifTrue: [^client pushLiteralVariable: (method literalAt: offset+17)]. - type=6 - ifTrue: [offset<8 - ifTrue: [^client popIntoReceiverVariable: offset] - ifFalse: [^client popIntoTemporaryVariable: offset-8]]. - type=7 - ifTrue: [offset=0 ifTrue: [^client pushReceiver]. - offset<8 ifTrue: [^client pushConstant: (SpecialConstants at: offset)]. - offset=8 ifTrue: [^client methodReturnReceiver]. - offset<12 ifTrue: [^client methodReturnConstant: - (SpecialConstants at: offset-8)]. - offset=12 ifTrue: [^client methodReturnTop]. - offset=13 ifTrue: [^client blockReturnTop]. - offset>13 ifTrue: [^self error: 'unusedBytecode']]. - type=8 ifTrue: [^self interpretExtension: offset in: method for: client]. - type=9 - ifTrue: short jumps - [offset<8 ifTrue: [^client jump: offset+1]. - ^client jump: offset-8+1 if: false]. - type=10 - ifTrue: long jumps - [byte:= method at: pc. pc:= pc+1. - offset<8 ifTrue: [^client jump: offset-4*256 + byte]. - ^client jump: (offset bitAnd: 3)*256 + byte if: offset<12]. - type=11 - ifTrue: - [^client - send: (Smalltalk specialSelectorAt: offset+1) - super: false - numArgs: (Smalltalk specialNargsAt: offset+1)]. - type=12 - ifTrue: - [^client - send: (Smalltalk specialSelectorAt: offset+17) - super: false - numArgs: (Smalltalk specialNargsAt: offset+17)]. - type>12 - ifTrue: - [^client send: (method literalAt: offset+1) - super: false - numArgs: type-13]"! Item was added: + ----- Method: InstructionStream>>interpretNextV3ClosuresInstructionFor: (in category 'decoding - private - v3 plus closures') ----- + interpretNextV3ClosuresInstructionFor: client + "Send to the argument, client, a message that specifies the type of the + next instruction." + + | byte type offset method | + method := self method. + byte := method at: pc. + type := byte // 16. + offset := byte \\ 16. + pc := pc+1. + "We do an inline binary search on each of the possible 16 values of type." + type < 8 ifTrue: + [type < 4 ifTrue: + [type < 2 ifTrue: + [type = 0 ifTrue: + [^ client pushReceiverVariable: offset]. + ^ client pushTemporaryVariable: offset]. "type = 1" + type = 2 ifTrue: + [^ client pushConstant: (method literalAt: offset + 1)]. + ^ client pushConstant: (method literalAt: offset + 17)]. "type = 3" + type < 6 ifTrue: + [type = 4 ifTrue: + [^ client pushLiteralVariable: (method literalAt: offset + 1)]. + ^ client pushLiteralVariable: (method literalAt: offset + 17)]."type = 5" + type = 6 ifTrue: + [offset < 8 ifTrue: + [^ client popIntoReceiverVariable: offset]. + ^ client popIntoTemporaryVariable: offset - 8]. + "type = 7" + offset = 0 ifTrue: [^ client pushReceiver]. + offset < 8 ifTrue: [^ client pushConstant: (SpecialConstants at: offset)]. + offset = 8 ifTrue: [^ client methodReturnReceiver]. + offset < 12 ifTrue: [^ client methodReturnConstant: (SpecialConstants at: offset - 8)]. + offset = 12 ifTrue: [^ client methodReturnTop]. + offset = 13 ifTrue: [^ client blockReturnTop]. + offset > 13 ifTrue: [^ self error: 'unusedBytecode']]. + type < 12 ifTrue: + [type < 10 ifTrue: + [type = 8 ifTrue: + [^ self + interpretV3ClosuresExtension: offset + in: method + for: client]. + "type = 9 (short jumps)" + offset < 8 ifTrue: [^ client jump: offset + 1]. + ^ client jump: offset - 8 + 1 if: false]. + type = 10 ifTrue: "(long jumps)" + [byte := method at: pc. + pc := pc + 1. + offset < 8 ifTrue: [^ client jump: offset - 4 * 256 + byte]. + ^ client jump: (offset bitAnd: 3) * 256 + byte if: offset < 12]. + "type = 11; arithmetic special selector sends" + ^ client + send: (Smalltalk specialSelectorAt: offset + 1) + super: false + numArgs: (Smalltalk specialNargsAt: offset + 1)]. + type = 12 ifTrue: "non-arithmetic special selector sends" + [^ client + send: (Smalltalk specialSelectorAt: offset + 17) + super: false + numArgs: (Smalltalk specialNargsAt: offset + 17)]. + "type = 13, 14 or 15" + ^ client + send: (method literalAt: offset + 1) + super: false + numArgs: type - 13 "0, 1 & 2"! Item was added: + ----- Method: InstructionStream>>interpretNextV3InstructionFor: (in category 'decoding - private - v3 plus closures') ----- + interpretNextV3InstructionFor: client + "Send to the argument, client, a message that specifies the type of the + next instruction." + + | byte type offset method | + method := self method. + byte := method at: pc. + type := byte // 16. + offset := byte \\ 16. + pc := pc+1. + "We do an inline binary search on each of the possible 16 values of type." + type < 8 ifTrue: + [type < 4 ifTrue: + [type < 2 ifTrue: + [type = 0 ifTrue: + [^ client pushReceiverVariable: offset]. + ^ client pushTemporaryVariable: offset]. "type = 1" + type = 2 ifTrue: + [^ client pushConstant: (method literalAt: offset + 1)]. + ^ client pushConstant: (method literalAt: offset + 17)]. "type = 3" + type < 6 ifTrue: + [type = 4 ifTrue: + [^ client pushLiteralVariable: (method literalAt: offset + 1)]. + ^ client pushLiteralVariable: (method literalAt: offset + 17)]."type = 5" + type = 6 ifTrue: + [offset < 8 ifTrue: + [^ client popIntoReceiverVariable: offset]. + ^ client popIntoTemporaryVariable: offset - 8]. + "type = 7" + offset = 0 ifTrue: [^ client pushReceiver]. + offset < 8 ifTrue: [^ client pushConstant: (SpecialConstants at: offset)]. + offset = 8 ifTrue: [^ client methodReturnReceiver]. + offset < 12 ifTrue: [^ client methodReturnConstant: (SpecialConstants at: offset - 8)]. + offset = 12 ifTrue: [^ client methodReturnTop]. + offset = 13 ifTrue: [^ client blockReturnTop]. + ^ self error: 'unusedBytecode']. "offset = 14 & offset = 15, 126 & 127" + type < 12 ifTrue: + [type < 10 ifTrue: + [type = 8 ifTrue: + [^ self + interpretV3Extension: offset + in: method + for: client]. + "type = 9 (short jumps)" + offset < 8 ifTrue: [^ client jump: offset + 1]. + ^ client jump: offset - 8 + 1 if: false]. + type = 10 ifTrue: "(long jumps)" + [byte := method at: pc. + pc := pc + 1. + offset < 8 ifTrue: [^ client jump: offset - 4 * 256 + byte]. + ^ client jump: (offset bitAnd: 3) * 256 + byte if: offset < 12]. + "type = 11; arithmetic special selector sends" + ^ client + send: (Smalltalk specialSelectorAt: offset + 1) + super: false + numArgs: (Smalltalk specialNargsAt: offset + 1)]. + type = 12 ifTrue: "non-arithmetic special selector sends" + [^ client + send: (Smalltalk specialSelectorAt: offset + 17) + super: false + numArgs: (Smalltalk specialNargsAt: offset + 17)]. + "type = 13, 14 or 15" + ^ client + send: (method literalAt: offset + 1) + super: false + numArgs: type - 13 "0, 1 & 2"! Item was added: + ----- Method: InstructionStream>>interpretV3ClosuresExtension:in:for: (in category 'decoding - private - v3 plus closures') ----- + interpretV3ClosuresExtension: offset in: method for: client + | type offset2 byte2 byte3 byte4 | + offset <= 6 ifTrue: + ["Extended op codes 128-134" + byte2 := method at: pc. pc := pc + 1. + offset <= 2 ifTrue: + ["128-130: extended pushes and pops" + type := byte2 // 64. + offset2 := byte2 \\ 64. + offset = 0 ifTrue: + [type = 0 ifTrue: [^client pushReceiverVariable: offset2]. + type = 1 ifTrue: [^client pushTemporaryVariable: offset2]. + type = 2 ifTrue: [^client pushConstant: (method literalAt: offset2 + 1)]. + type = 3 ifTrue: [^client pushLiteralVariable: (method literalAt: offset2 + 1)]]. + offset = 1 ifTrue: + [type = 0 ifTrue: [^client storeIntoReceiverVariable: offset2]. + type = 1 ifTrue: [^client storeIntoTemporaryVariable: offset2]. + type = 2 ifTrue: [self error: 'illegalStore']. + type = 3 ifTrue: [^client storeIntoLiteralVariable: (method literalAt: offset2 + 1)]]. + offset = 2 ifTrue: + [type = 0 ifTrue: [^client popIntoReceiverVariable: offset2]. + type = 1 ifTrue: [^client popIntoTemporaryVariable: offset2]. + type = 2 ifTrue: [self error: 'illegalStore']. + type = 3 ifTrue: [^client popIntoLiteralVariable: (method literalAt: offset2 + 1)]]]. + "131-134: extended sends" + offset = 3 ifTrue: "Single extended send" + [^client send: (method literalAt: byte2 \\ 32 + 1) + super: false numArgs: byte2 // 32]. + offset = 4 ifTrue: "Double extended do-anything" + [byte3 := method at: pc. pc := pc + 1. + type := byte2 // 32. + type = 0 ifTrue: [^client send: (method literalAt: byte3 + 1) + super: false numArgs: byte2 \\ 32]. + type = 1 ifTrue: [^client send: (method literalAt: byte3 + 1) + super: true numArgs: byte2 \\ 32]. + type = 2 ifTrue: [^client pushReceiverVariable: byte3]. + type = 3 ifTrue: [^client pushConstant: (method literalAt: byte3 + 1)]. + type = 4 ifTrue: [^client pushLiteralVariable: (method literalAt: byte3 + 1)]. + type = 5 ifTrue: [^client storeIntoReceiverVariable: byte3]. + type = 6 ifTrue: [^client popIntoReceiverVariable: byte3]. + type = 7 ifTrue: [^client storeIntoLiteralVariable: (method literalAt: byte3 + 1)]]. + offset = 5 ifTrue: "Single extended send to super" + [^client send: (method literalAt: byte2 \\ 32 + 1) + super: true + numArgs: byte2 // 32]. + offset = 6 ifTrue: "Second extended send" + [^client send: (method literalAt: byte2 \\ 64 + 1) + super: false + numArgs: byte2 // 64]]. + offset = 7 ifTrue: [^client doPop]. + offset = 8 ifTrue: [^client doDup]. + offset = 9 ifTrue: [^client pushActiveContext]. + byte2 := method at: pc. pc := pc + 1. + offset = 10 ifTrue: + [^byte2 < 128 + ifTrue: [client pushNewArrayOfSize: byte2] + ifFalse: [client pushConsArrayWithElements: byte2 - 128]]. + offset = 11 ifTrue: [^self error: 'unusedBytecode']. + byte3 := method at: pc. pc := pc + 1. + offset = 12 ifTrue: [^client pushRemoteTemp: byte2 inVectorAt: byte3]. + offset = 13 ifTrue: [^client storeIntoRemoteTemp: byte2 inVectorAt: byte3]. + offset = 14 ifTrue: [^client popIntoRemoteTemp: byte2 inVectorAt: byte3]. + "offset = 15" + byte4 := method at: pc. pc := pc + 1. + ^client + pushClosureCopyNumCopiedValues: (byte2 bitShift: -4) + numArgs: (byte2 bitAnd: 16rF) + blockSize: (byte3 * 256) + byte4! Item was added: + ----- Method: InstructionStream>>interpretV3Extension:in:for: (in category 'decoding - private - v3 plus closures') ----- + interpretV3Extension: offset in: method for: client + | type offset2 byte2 byte3 | + offset <= 6 ifTrue: + ["Extended op codes 128-134" + byte2 := method at: pc. pc := pc + 1. + offset <= 2 ifTrue: + ["128-130: extended pushes and pops" + type := byte2 // 64. + offset2 := byte2 \\ 64. + offset = 0 ifTrue: + [type = 0 ifTrue: [^client pushReceiverVariable: offset2]. + type = 1 ifTrue: [^client pushTemporaryVariable: offset2]. + type = 2 ifTrue: [^client pushConstant: (method literalAt: offset2 + 1)]. + type = 3 ifTrue: [^client pushLiteralVariable: (method literalAt: offset2 + 1)]]. + offset = 1 ifTrue: + [type = 0 ifTrue: [^client storeIntoReceiverVariable: offset2]. + type = 1 ifTrue: [^client storeIntoTemporaryVariable: offset2]. + type = 2 ifTrue: [self error: 'illegalStore']. + type = 3 ifTrue: [^client storeIntoLiteralVariable: (method literalAt: offset2 + 1)]]. + offset = 2 ifTrue: + [type = 0 ifTrue: [^client popIntoReceiverVariable: offset2]. + type = 1 ifTrue: [^client popIntoTemporaryVariable: offset2]. + type = 2 ifTrue: [self error: 'illegalStore']. + type = 3 ifTrue: [^client popIntoLiteralVariable: (method literalAt: offset2 + 1)]]]. + "131-134: extended sends" + offset = 3 ifTrue: "Single extended send" + [^client send: (method literalAt: byte2 \\ 32 + 1) + super: false numArgs: byte2 // 32]. + offset = 4 ifTrue: "Double extended do-anything" + [byte3 := method at: pc. pc := pc + 1. + type := byte2 // 32. + type = 0 ifTrue: [^client send: (method literalAt: byte3 + 1) + super: false numArgs: byte2 \\ 32]. + type = 1 ifTrue: [^client send: (method literalAt: byte3 + 1) + super: true numArgs: byte2 \\ 32]. + type = 2 ifTrue: [^client pushReceiverVariable: byte3]. + type = 3 ifTrue: [^client pushConstant: (method literalAt: byte3 + 1)]. + type = 4 ifTrue: [^client pushLiteralVariable: (method literalAt: byte3 + 1)]. + type = 5 ifTrue: [^client storeIntoReceiverVariable: byte3]. + type = 6 ifTrue: [^client popIntoReceiverVariable: byte3]. + type = 7 ifTrue: [^client storeIntoLiteralVariable: (method literalAt: byte3 + 1)]]. + offset = 5 ifTrue: "Single extended send to super" + [^client send: (method literalAt: byte2 \\ 32 + 1) + super: true + numArgs: byte2 // 32]. + offset = 6 ifTrue: "Second extended send" + [^client send: (method literalAt: byte2 \\ 64 + 1) + super: false + numArgs: byte2 // 64]]. + offset = 7 ifTrue: [^client doPop]. + offset = 8 ifTrue: [^client doDup]. + offset = 9 ifTrue: [^client pushActiveContext]. + ^self error: 'unusedBytecode'! Item was added: + ----- Method: InstructionStream>>interpretV3Jump (in category 'decoding - private - v3 plus closures') ----- + interpretV3Jump + "If the instruction at pc is an unconditional jump, interpret it, advancing the pc, + and answering the target pc. Otherwise answer nil." + + "144-151 10010iii Jump iii + 1 (i.e., 1 through 8) + 160-167 10100iii jjjjjjjj Jump(iii - 4) *256+jjjjjjjj" + | byte | + byte := self method at: pc. + (byte between: 144 and: 151) ifTrue: + [pc := pc + 1. + ^byte - 143]. + (byte between: 160 and: 167) ifTrue: + [pc := pc + 2. + ^(byte - 164) * 256 + (self method at: pc - 1)]. + ^nil! Item was added: + ----- Method: InstructionStream>>interpretV3JumpIfCond (in category 'decoding - private - v3 plus closures') ----- + interpretV3JumpIfCond + "If the instruction at pc is a conditional jump, interpret it, advancing the pc, + and answering the jump distance. Otherwise answer nil." + + "152-159 10011iii Pop and Jump 0n False iii +1 (i.e., 1 through 8) + 168-171 101010ii jjjjjjjj Pop and Jump On True ii *256+jjjjjjjj + 172-175 101011ii jjjjjjjj Pop and Jump On False ii *256+jjjjjjjj" + | byte | + byte := self method at: pc. + (byte between: 152 and: 159) ifTrue: + [pc := pc + 1. + ^byte - 151]. + (byte between: 168 and: 175) ifTrue: + [pc := pc + 2. + ^(byte bitAnd: 3) * 256 + (self method at: pc - 1)]. + ^nil! Item was changed: ----- Method: InstructionStream>>nextPc: (in category 'private') ----- nextPc: currentByte "Answer the pc of the next bytecode following the current one, given the current bytecode.." + ^pc + (self method encoderClass bytecodeSize: currentByte)! - | type | - type := currentByte // 16. - ^type = 8 "extensions" - ifTrue: [pc + (#(2 2 2 2 3 2 2 1 1 1 2 1 3 3 3 4) at: currentByte \\ 16 + 1)] - ifFalse: [type = 10 "long jumps" - ifTrue: [pc + 2] - ifFalse: [pc + 1]]! Item was changed: ----- Method: InstructionStream>>scanFor: (in category 'scanning') ----- scanFor: scanBlock "Check all bytecode instructions with scanBlock, answer true if scanBlock answers true. This can be used to, e.g., check whether a method contains 'push closure' bytecodes like this: aMethod scanFor: [ :b | b = 143 ]" + | method encoderClass end byte | - | method end byte | method := self method. end := method endPC. + encoderClass := method encoderClass. [pc <= end] whileTrue: [(scanBlock value: (byte := method at: pc)) ifTrue: [^true]. + pc := pc + (encoderClass bytecodeSize: byte)]. - pc := self nextPc: byte]. ^false! Item was changed: ----- Method: InstructionStream>>willBlockReturn (in category 'testing') ----- willBlockReturn + "Answer whether the next bytecode is a return." + | method | + method := self method. + ^method encoderClass isBlockReturnAt: pc in: method! - - ^ (self method at: pc) = Encoder blockReturnCode! Item was changed: ----- Method: InstructionStream>>willJump (in category 'testing') ----- willJump + "Answer whether the next bytecode is an uncoinditional jump." + | method | + method := self method. + ^method encoderClass isJumpAt: pc in: method! - "unconditionally" - - | byte | - byte := self method at: pc. - ^ (byte between: 144 and: 151) or: [byte between: 160 and: 167]! Item was changed: ----- Method: InstructionStream>>willJumpIfFalse (in category 'testing') ----- willJumpIfFalse "Answer whether the next bytecode is a jump-if-false." + | method | + method := self method. + ^method encoderClass isBranchIfFalseAt: pc in: method! - - | byte | - byte := self method at: pc. - ^(byte between: 152 and: 159) or: [byte between: 172 and: 175]! Item was changed: ----- Method: InstructionStream>>willJumpIfTrue (in category 'testing') ----- + willJumpIfTrue - willJumpIfTrue "Answer whether the next bytecode is a jump-if-true." + | method | + method := self method. + ^method encoderClass isBranchIfTrueAt: pc in: method! - - | byte | - byte := self method at: pc. - ^ byte between: 168 and: 171! Item was changed: ----- Method: InstructionStream>>willJustPop (in category 'testing') ----- willJustPop + "Answer whether the bytecode at pc is a pop." + | method | + method := self method. + ^method encoderClass isJustPopAt: pc in: method! - - ^ (self method at: pc) = Encoder popCode! Item was changed: ----- Method: InstructionStream>>willReallySend (in category 'testing') ----- willReallySend + "Answer whether the next bytecode is a real message-send, not blockCopy:." + | method | + method := self method. + ^method encoderClass isRealSendAt: pc in: method! - "Answer whether the next bytecode is a real message-send, - not blockCopy:." - - | byte | - byte := self method at: pc. - ^byte >= 131 - and: [byte ~= 200 - and: [byte >= 176 "special send or short send" - or: [byte <= 134 "long sends" - and: [| litIndex | - "long form support demands we check the selector" - litIndex := byte = 132 - ifTrue: [(self method at: pc + 1) // 32 > 1 ifTrue: [^false]. - self method at: pc + 2] - ifFalse: [byte = 134 - ifTrue: [(self method at: pc + 1) bitAnd: 2r111111] - ifFalse: [(self method at: pc + 1) bitAnd: 2r11111]]. - (self method literalAt: litIndex + 1) ~~ #blockCopy:]]]]! Item was changed: ----- Method: InstructionStream>>willReturn (in category 'testing') ----- willReturn "Answer whether the next bytecode is a return." + | method | + method := self method. + ^method encoderClass isReturnAt: pc in: method! - - ^(self method at: pc) between: 120 and: 125! Item was changed: ----- Method: InstructionStream>>willSend (in category 'testing') ----- willSend "Answer whether the next bytecode is a message-send." + | method | + method := self method. + ^method encoderClass isSendAt: pc in: method! - - | byte | - byte := self method at: pc. - ^byte >= 131 - and: [byte >= 176 "special send or short send" - or: [byte <= 134]] "long sends"! Item was changed: ----- Method: InstructionStream>>willStore (in category 'testing') ----- willStore + "Answer whether the bytecode at pc is a store or store-pop." + | method | + method := self method. + ^method encoderClass isStoreAt: pc in: method! - "Answer whether the next bytecode is a store or store-pop" - - | byte | - byte := self method at: pc. - ^(byte between: 96 and: 142) - and: [byte <= 111 "96 103 storeAndPopReceiverVariableBytecode" - "104 111 storeAndPopTemporaryVariableBytecode" - or: [byte >= 129 "129 extendedStoreBytecode" - and: [byte <= 130 "130 extendedStoreAndPopBytecode" - or: [(byte = 132 "132 doubleExtendedDoAnythingBytecode" - and: [(self method at: pc+1) >= 160]) - or: [byte = 141 "141 storeRemoteTempLongBytecode" - or: [byte = 142 "142 storeAndPopRemoteTempLongBytecode"]]]]]]! Item was changed: ----- Method: InstructionStream>>willStorePop (in category 'testing') ----- willStorePop + "Answer whether the bytecode at pc is a store-pop." + | method | + method := self method. + ^method encoderClass isStorePopAt: pc in: method! - "Answer whether the next bytecode is a store-pop." - - | byte | - byte := self method at: pc. - ^byte = 130 "130 extendedStoreAndPopBytecode" - or: [byte = 142 "142 storeAndPopRemoteTempLongBytecode" - or: [byte between: 96 and: 111 "96 103 storeAndPopReceiverVariableBytecode" - "104 111 storeAndPopTemporaryVariableBytecode"]]!

1 0

The Trunk: Kernel-eem.852.mcz
by commits＠source.squeak.org 19 May '14

19 May '14

1 0

The Trunk: Kernel-eem.852.mcz
by commits＠source.squeak.org 19 May '14

19 May '14

1 0

The Trunk: Kernel-eem.851.mcz
by commits＠source.squeak.org 19 May '14

19 May '14

Eliot Miranda uploaded a new version of Kernel to project The Trunk: http://source.squeak.org/trunk/Kernel-eem.851.mcz ==================== Summary ==================== Name: Kernel-eem.851 Author: eem Time: 19 May 2014, 11:41:55.614 am UUID: 3ced43fc-fd88-4b0c-b029-fd870592dbc2 Ancestors: Kernel-dtl.850 First part of Kernel multiple bytecode sets switchover. Make sure CompiledMethod>>ncoderClass works as expected before depening on it. =============== Diff against Kernel-dtl.850 =============== Item was changed: ByteArray variableByteSubclass: #CompiledMethod instanceVariableNames: '' + classVariableNames: 'LargeFrame PrimaryBytecodeSetEncoderClass SecondaryBytecodeSetEncoderClass SmallFrame' - classVariableNames: 'LargeFrame SmallFrame' poolDictionaries: '' category: 'Kernel-Methods'! + !CompiledMethod commentStamp: 'eem 5/12/2014 18:02' prior: 0! + My instances are methods suitable for interpretation by the virtual machine. This is the only class in the system whose instances have both indexable pointer fields and indexable 8-bit integer fields. The first part of a CompiledMethod is pointers, the second part is bytes. I'm a subclass of ByteArray to avoid duplicating some of ByteArray's methods, not because a CompiledMethod is-a ByteArray. - !CompiledMethod commentStamp: 'ul 1/29/2011 13:18' prior: 0! - My instances are methods suitable for interpretation by the virtual machine. This is the only class in the system whose instances intermix both indexable pointer fields and indexable integer fields. - I'm a subclass of ByteArray to avoid duplicating some of ByteArray's methods, not because a CompiledMethod is-a ByteArray. + Class variables: + SmallFrame - the number of stack slots in a small frame Context + LargeFrame - the number of stack slots in a large frame Context + PrimaryBytecodeSetEncoderClass - the encoder class that defines the primary instruction set + SecondaryBytecodeSetEncoderClass - the encoder class that defines the secondary instruction set + - The current format of a CompiledMethod is as follows: + header (4 or 8 bytes, SmallInteger) + literals (4 or 8 bytes each, Object) + bytecodes (variable, bytes) + trailer (variable, bytes) - header (4 bytes) - literals (4 bytes each) - bytecodes (variable) - trailer (variable) + The header is a 31-bit signed integer (a SmallInteger) with one of the two following formats, selected by the sign bit: - The header is a 30-bit integer with the following format: + sign bit 0, header >= 0: + (index 0) 9 bits: main part of primitive number (#primitive) + (index 9) 8 bits: number of literals (#numLiterals) + (index 17) 1 bit: whether a large frame size is needed (#frameSize) + (index 18) 6 bits: number of temporary variables (#numTemps) + (index 24) 4 bits: number of arguments to the method (#numArgs) + (index 28) 1 bit: high-bit of primitive number (#primitive) + (index 29) 1 bit: flag bit, ignored by the VM (#flag) + (index 30/63) sign bit: 0 selects the Primary instruction set (#signFlag) + sign bit 1, header < 0: + (index 0) 16 bits: number of literals (#numLiterals) + (index 16) 1 bit: has primitive + (index 17) 1 bit: whether a large frame size is needed (#frameSize) + (index 18) 6 bits: number of temporary variables (#numTemps) + (index 24) 4 bits: number of arguments to the method (#numArgs) + (index 28) 2 bits: reserved for an access modifier (00-unused, 01-private, 10-protected, 11-public) + (index 30/63) sign bit: 1 selects the Secondary instruction set (e.g. NewsqueakV4) (#signFlag) + i.e. the Secondary Bytecode Set expands the number of literals to 65535 by assuming a CallPrimitive bytecode. - (index 0) 9 bits: main part of primitive number (#primitive) - (index 9) 8 bits: number of literals (#numLiterals) - (index 17) 1 bit: whether a large frame size is needed (#frameSize) - (index 18) 6 bits: number of temporary variables (#numTemps) - (index 24) 4 bits: number of arguments to the method (#numArgs) - (index 28) 1 bit: high-bit of primitive number (#primitive) - (index 29) 1 bit: flag bit, ignored by the VM (#flag) + The trailer is an encoding of an instance of CompiledMethodTrailer. It is typically used to encode the index into the source files array of the method's source, but may be used to encode other values, e.g. tempNames, source as a string, etc. See the class CompiledMethodTrailer.! - - The trailer has two variant formats. In the first variant, the last byte is at least 252 and the last four bytes represent a source pointer into one of the sources files (see #sourcePointer). In the second variant, the last byte is less than 252, and the last several bytes are a compressed version of the names of the method's temporary variables. The number of bytes used for this purpose is the value of the last byte in the method. - ! Item was changed: ----- Method: CompiledMethod class>>initialize (in category 'class initialization') ----- initialize "CompiledMethod initialize" "Initialize class variables specifying the size of the temporary frame needed to run instances of me." SmallFrame := 16. "Context range for temps+stack" + LargeFrame := 56. + PrimaryBytecodeSetEncoderClass ifNil: + [PrimaryBytecodeSetEncoderClass := EncoderForV3PlusClosures]. + SecondaryBytecodeSetEncoderClass ifNil: + [SecondaryBytecodeSetEncoderClass := EncoderForV3PlusClosures]! - LargeFrame := 56! Item was added: + ----- Method: CompiledMethod>>encoderClass (in category 'accessing') ----- + encoderClass + "Answer the encoder class that encoded the bytecodes in this method. + The sign flag bit is used by the VM to select a bytecode set." + + ^self header >= 0 + ifTrue: [PrimaryBytecodeSetEncoderClass] + ifFalse: [SecondaryBytecodeSetEncoderClass]!

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Packages May 2014