[squeak-dev] The Trunk: Kernel-eem.1090.mcz
commits at source.squeak.org
commits at source.squeak.org
Thu Apr 6 21:18:29 UTC 2017
Eliot Miranda uploaded a new version of Kernel to project The Trunk:
http://source.squeak.org/trunk/Kernel-eem.1090.mcz
==================== Summary ====================
Name: Kernel-eem.1090
Author: eem
Time: 6 April 2017, 2:18:12.358916 pm
UUID: 8cad183e-c092-4335-b341-f5296bc8c048
Ancestors: Kernel-eem.1089
Fix slip in interpretNext2ByteSistaV1Instruction:for:extA:extB:startPC: for super sends.
=============== Diff against Kernel-eem.1089 ===============
Item was changed:
----- Method: InstructionStream>>interpretNext2ByteSistaV1Instruction:for:extA:extB:startPC: (in category 'decoding - private - sista v1') -----
interpretNext2ByteSistaV1Instruction: bytecode for: client extA: extA extB: extB startPC: startPC
"Send to the argument, client, a message that specifies the next instruction.
This method handles the two-byte codes.
For a table of the bytecode set, see EncoderForV1's class comment."
| byte method |
method := self method.
byte := self method at: pc.
pc := pc + 1.
"We do an inline quasi-binary search on bytecode"
bytecode < 234 ifTrue: "pushes"
[bytecode < 231 ifTrue:
[bytecode < 229 ifTrue:
[| literal |
bytecode = 226 ifTrue:
[^client pushReceiverVariable: (extA bitShift: 8) + byte].
literal := method literalAt: (extA bitShift: 8) + byte + 1.
bytecode = 227 ifTrue:
[^client pushLiteralVariable: literal].
^client pushConstant: literal].
bytecode = 229 ifTrue:
[^client pushClosureTemps: byte].
^client pushTemporaryVariable: byte].
bytecode = 231 ifTrue:
[^byte < 128
ifTrue: [client pushNewArrayOfSize: byte]
ifFalse: [client pushConsArrayWithElements: byte - 128]].
bytecode = 232 ifTrue:
[^client pushConstant: (extB bitShift: 8) + byte].
^client pushConstant: (Character value: (extB bitShift: 8) + byte)].
bytecode < 240 ifTrue: "sends, trap and jump"
[bytecode < 236 ifTrue: "sends"
[^client
send: (method literalAt: (extA bitShift: 5) + (byte // 8) + 1)
+ super: bytecode = 235
- super: bytecode = 239
numArgs: (extB bitShift: 3) + (byte \\ 8)].
bytecode = 236 ifTrue:
[^client trapIfNotInstanceOf: (method literalAt: (extA bitShift: 8) + byte + 1)].
bytecode = 237 ifTrue:
[^client jump: (extB bitShift: 8) + byte].
^client jump: (extB bitShift: 8) + byte if: bytecode = 238].
bytecode < 243 ifTrue:
[bytecode = 240 ifTrue:
[^client popIntoReceiverVariable: (extA bitShift: 8) + byte].
bytecode = 241 ifTrue:
[^client popIntoLiteralVariable: (method literalAt: (extA bitShift: 8) + byte + 1)].
^client popIntoTemporaryVariable: byte].
bytecode = 243 ifTrue:
[^client storeIntoReceiverVariable: (extA bitShift: 8) + byte].
bytecode = 244 ifTrue:
[^client storeIntoLiteralVariable: (method literalAt: (extA bitShift: 8) + byte + 1)].
bytecode = 245 ifTrue:
[^client storeIntoTemporaryVariable: byte].
"246-247 1111011 i xxxxxxxx UNASSIGNED"
^self unusedBytecode: client at: startPC!
More information about the Squeak-dev
mailing list
|