VM Maker: VMMaker.oscog-eem.2660.mcz

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

VM Maker: VMMaker.oscog-eem.2660.mcz

commits-2
 
Eliot Miranda uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-eem.2660.mcz

==================== Summary ====================

Name: VMMaker.oscog-eem.2660
Author: eem
Time: 12 January 2020, 7:11:53.897322 pm
UUID: 328ecbd4-9050-425b-9214-849fae63a95b
Ancestors: VMMaker.oscog-eem.2659

Fix another slip in CogARMCompiler>>concretizeLoadEffectiveAddressMwrR

=============== Diff against VMMaker.oscog-eem.2659 ===============

Item was changed:
  ----- Method: CogARMCompiler>>concretizeLoadEffectiveAddressMwrR (in category 'generate machine code - concretize') -----
  concretizeLoadEffectiveAddressMwrR
  "Will get inlined into concretizeAt: switch."
  "destReg = srcReg + offset, but does not need to set condition codes, etc"
  <inline: true>
  | srcReg offset destReg instrOffset |
  offset := operands at: 0.
  srcReg := operands at: 1.
  destReg := operands at: 2.
  ^self rotateable8bitImmediate: offset
  ifTrue:
  [ :rot :immediate |
  self machineCodeAt: 0
  "add destReg, srcReg, #immediate ROR rot"
  put: (self add: destReg rn: srcReg imm: immediate ror: rot).
  4]
  ifFalse:
  [instrOffset := self moveCw: offset intoR: ConcreteIPReg.
  "add destReg, srcReg, ConcreteIPReg"
+ self machineCodeAt: instrOffset put: (self add: destReg rn: srcReg rm: ConcreteIPReg).
- self machineCodeAt: 16 put: (self add: destReg rn: srcReg rm: ConcreteIPReg).
  instrOffset + 4]
 
  "cogit processor disassembleInstructionAt: 0 In: machineCode object"!