Implement shl reg, cl

1 files changed, 7 insertions, 5 deletions

diff --git a/asm/intel64/encode.cpp b/asm/intel64/encode.cpp
index 6c18d1c..0d7eacb 100644
--- a/asm/intel64/encode.cpp
+++ b/asm/intel64/encode.cpp
@@ -171,7 +171,7 @@ std::vector<std::shared_ptr<Chunk>> makeDivValue(const FlowGraph::Data& data, co
   throw std::runtime_error("ICE: Unsupported type for operand data at div: "s + demangle(typeid(data_storage)));
 }
 
-std::shared_ptr<Op> makeShiftLeftValue(const FlowGraph::Data& data, const FlowGraph::Graph& graph)
+std::vector<std::shared_ptr<Chunk>> makeShiftLeftValue(const FlowGraph::Data& data, const FlowGraph::Graph& graph)
 {
  if (data.type() != FlowGraph::DataType::Int) {
   throw std::runtime_error("Bad type for operand: "s + std::to_string(int(data.type())));
@@ -189,13 +189,15 @@ std::shared_ptr<Op> makeShiftLeftValue(const FlowGraph::Data& data, const FlowGr
   uint32_t immediate = endian::from_little32(value.value());
   immediate = std::min(immediate, uint32_t(0xFF));
 
-  return makeOp("shl", Asm::Args{{Asm::Args::Register32("eax"), Asm::Args::Immediate8(static_cast<uint8_t>(immediate))}});
+  return {makeOp("shl", Asm::Args{{Asm::Args::Register32("eax"), Asm::Args::Immediate8(static_cast<uint8_t>(immediate))}})};
  } else if (typeid(data_storage) == typeid(FlowGraph::TemporaryStorage)) {
   //FlowGraph::TemporaryStorage& storage {dynamic_cast<FlowGraph::TemporaryStorage&>(data_storage)};
 
   index_t index { graph.scope()->indexOfData(data)};
-  // makeOp("mov", Asm::Args{{Asm::Args::Register32("ecx"), Asm::Args::Mem32Ptr64("rbp", int32_t(index + 1) * -4)}}); // TODO: return list of ops; limit ecx to 0xff; implement shr x, cl
-  return makeOp("nop");//makeOp("shl", Asm::Args{{Asm::Args::Register32("eax"), Asm::Args::Register8("cl")}});
+  std::vector<std::shared_ptr<Chunk>> result;
+  result.push_back(makeOp("mov", Asm::Args{{Asm::Args::Register32("ecx"), Asm::Args::Mem32Ptr64("rbp", int32_t(index + 1) * -4)}})); // TODO: limit ecx to 0xff
+  result.push_back(makeOp("shl", Asm::Args{{Asm::Args::Register32("eax"), Asm::Args::Register8("cl")}}));
+  return result;
  } else
   throw std::runtime_error("ICE: Unsupported type for operand data at shift left: "s + demangle(typeid(data_storage)));
 }
@@ -270,7 +272,7 @@ void Asm::toMachineCode(const FlowGraph::Graph& graph, Segment& segment)
      segment.push_back(makeStoreValue(operands[0], graph));
     } else if (op.type() == FlowGraph::BinaryOperationType::ShiftLeft) {
      segment.push_back(makeLoadValue(operands[1], graph));
-     segment.push_back(makeShiftLeftValue(operands[2], graph));
+     segment.append(makeShiftLeftValue(operands[2], graph));
      segment.push_back(makeStoreValue(operands[0], graph));
     } else
      throw std::runtime_error("ICE: Asm: Unsupported binary operation type: "s + std::to_string(static_cast<int>(op.type())));