Add Subtract, generalized binary operations

6 files changed, 101 insertions, 71 deletions

diff --git a/asm/intel64/encode.cpp b/asm/intel64/encode.cpp
index 6118743..d3bfd91 100644
--- a/asm/intel64/encode.cpp
+++ b/asm/intel64/encode.cpp
@@ -83,6 +83,33 @@ std::shared_ptr<Op> makeAddValue(const FlowGraph::Data& data, const FlowGraph::G
   throw std::runtime_error("ICE: Unsupported type for operand data at add: "s + demangle(typeid(data_storage)));
 }
 
+std::shared_ptr<Op> makeSubValue(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())));
+ }
+
+ if (!data.storage())
+  throw std::runtime_error("ICE: Operand storage is 0");
+
+ auto& data_storage{*data.storage()};
+ if (typeid(data_storage) == typeid(FlowGraph::Constant)) {
+  FlowGraph::Constant& value {dynamic_cast<FlowGraph::Constant&>(data_storage)};
+  if (value.value().size() < sizeof(uint32_t))
+   throw std::runtime_error("ICE: Int data from operand needs at least 4 bytes, got "s + std::to_string(value.value().size()));
+
+  uint32_t immediate = endian::from_little32(value.value());
+
+  return makeOp("sub", Asm::Args{{Asm::Args::Register32("eax"), Asm::Args::Immediate32(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)};
+  return makeOp("sub", Asm::Args{{Asm::Args::Register32("eax"), Asm::Args::Mem32Ptr64("rbp", int32_t(index + 1) * -4)}});
+ } else
+  throw std::runtime_error("ICE: Unsupported type for operand data at sub: "s + demangle(typeid(data_storage)));
+}
+
 std::vector<std::shared_ptr<Chunk>> makeMulValue(const FlowGraph::Data& data, const FlowGraph::Graph& graph)
 {
  if (data.type() != FlowGraph::DataType::Int) {
@@ -192,6 +219,10 @@ void Asm::toMachineCode(const FlowGraph::Graph& graph, Segment& segment)
      segment.push_back(makeLoadValue(operands[1], graph));
      segment.push_back(makeAddValue(operands[2], graph));
      segment.push_back(makeStoreValue(operands[0], graph));
+    } else if (op.type() == FlowGraph::BinaryOperationType::Subtract) {
+     segment.push_back(makeLoadValue(operands[1], graph));
+     segment.push_back(makeSubValue(operands[2], graph));
+     segment.push_back(makeStoreValue(operands[0], graph));
     } else if (op.type() == FlowGraph::BinaryOperationType::Multiply) {
      segment.push_back(makeLoadValue(operands[1], graph));
      segment.append(makeMulValue(operands[2], graph));
diff --git a/asm/intel64/sub.cpp b/asm/intel64/sub.cpp
index 2447c15..9efc644 100644
--- a/asm/intel64/sub.cpp
+++ b/asm/intel64/sub.cpp
@@ -14,15 +14,22 @@ Op_sub::Op_sub(const Asm::Args& args)
      args[1].type() == typeid(Asm::Args::Immediate32))
  { // sub eax, imm32 (before "sub reg32, imm32"! It's shorter.)
   machine_code = std::vector<uint8_t>{ 0x2D } + std::any_cast<Asm::Args::Immediate32>(args[1]).getCode();
- } else if (args[0].type() == typeid(Asm::Args::Register32) &&
-     args[1].type() == typeid(Asm::Args::Immediate32))
- { // sub reg32, imm32
+
+ } else if (args[0].type() == typeid(Asm::Args::Register32) && args[1].type() == typeid(Asm::Args::Immediate32)) { // sub reg32, imm32
   machine_code = std::vector<uint8_t>{ 0x81 } + ModRM("/5", std::any_cast<Asm::Args::Register32>(args[0]).name()) + std::any_cast<Asm::Args::Immediate32>(args[1]).getCode();
+
+ } else if (args[0].type() == typeid(Asm::Args::Register32) && args[1].type() == typeid(Asm::Args::Mem32Ptr64)) { // sub reg32, [reg64]
+  machine_code = std::vector<uint8_t>{ 0x2B } + ModRM(std::any_cast<Asm::Args::Register32>(args[0]).name(), std::any_cast<Asm::Args::Mem32Ptr64>(args[1]).reg());
+
+ } else if (args[0].type() == typeid(Asm::Args::Register16) && args[1].type() == typeid(Asm::Args::Mem16Ptr64)) { // sub reg16, [reg64]
+  machine_code = OpSizePrefix() + std::vector<uint8_t>{ 0x2B } + ModRM(std::any_cast<Asm::Args::Register16>(args[0]).name(), std::any_cast<Asm::Args::Mem16Ptr64>(args[1]).reg());
+
  } else if (args[0].type() == typeid(Asm::Args::Register64) &&
             std::any_cast<Asm::Args::Register64>(args[0]).name() == "rax"  &&
             args[1].type() == typeid(Asm::Args::Immediate32))
  { // sub reg, imm32
   machine_code = REX("W") + machine_code = std::vector<uint8_t>{ 0x81 } + ModRM("/5", std::any_cast<Asm::Args::Register32>(args[0]).name()) + std::any_cast<Asm::Args::Immediate32>(args[1]).getCode();
+
  } else {
   throw std::runtime_error("Unimplemented: sub "s + args[0].type().name() + " "s + args[1].type().name());
  }
@@ -36,6 +43,12 @@ bool registered {
                              }) &&
  registerOp(mangleName<Asm::Args::Register64, Asm::Args::Immediate32>("sub"), [](const Asm::Args& args) -> std::shared_ptr<Op>{
                              return std::make_shared<Op_sub>(args);
+                             }) &&
+ registerOp(mangleName<Asm::Args::Register16, Asm::Args::Mem16Ptr64>("sub"), [](const Asm::Args& args) -> std::shared_ptr<Op>{
+                             return std::make_shared<Op_sub>(args);
+                             }) &&
+ registerOp(mangleName<Asm::Args::Register32, Asm::Args::Mem32Ptr64>("sub"), [](const Asm::Args& args) -> std::shared_ptr<Op>{
+                             return std::make_shared<Op_sub>(args);
                              })
 };
 
diff --git a/cpp.cpp b/cpp.cpp
index 5dbf5e6..cefd5fd 100644
--- a/cpp.cpp
+++ b/cpp.cpp
@@ -354,6 +354,8 @@ std::string CPP::ruleString(index_t node_id)
  return result;
 }
 
+namespace {
+
 // Promote last op of specified graph if appropriate (i.e. if not yet big enough)
 void promoteLastOp(FlowGraph::Graph& graph, FlowGraph::DataType targetType)
 {
@@ -382,6 +384,52 @@ void promoteLastOps(FlowGraph::Graph& graph0, FlowGraph::Graph& graph1)
  promoteLastOp(graph1, targetType);
 }
 
+std::unordered_map<std::string, FlowGraph::BinaryOperationType> binaryOperationsMap {
+ {"+", FlowGraph::BinaryOperationType::Add},
+ {"-", FlowGraph::BinaryOperationType::Subtract},
+ {"*", FlowGraph::BinaryOperationType::Multiply},
+ {"/", FlowGraph::BinaryOperationType::Divide},
+ {"%", FlowGraph::BinaryOperationType::Modulo},
+};
+
+} // namespace
+
+FlowGraph::Graph CPP::BinaryOperation(index_t index)
+{
+ if (getValue(index, 0).type() != typeid(FlowGraph::Graph))
+  throw std::runtime_error("ICE: Bad data type for argument 1: "s + demangle(getValue(index, 0).type()));
+ if (getValue(index, 2).type() != typeid(FlowGraph::Graph))
+  throw std::runtime_error("ICE: Bad data type for argument 3: "s + demangle(getValue(index, 2).type()));
+
+ FlowGraph::Graph value0{std::any_cast<FlowGraph::Graph>(getValue(index, 0))};
+ FlowGraph::Graph value1{std::any_cast<FlowGraph::Graph>(getValue(index, 2))};
+
+ promoteLastOps(value0, value1);
+ 
+ std::shared_ptr<FlowGraph::Node> lastOp0{value0.lastOp()};
+ std::shared_ptr<FlowGraph::Node> lastOp1{value1.lastOp()};
+
+ FlowGraph::Graph result{value0};
+ result.append(value1);
+
+ FlowGraph::Data destination{FlowGraph::MakeTemporary(result.scope(), lastOp0->destination().type())};
+
+ std::string typeString{getType(index, 1)};
+ auto it{binaryOperationsMap.find(typeString)};
+ FlowGraph::BinaryOperationType type{};
+ if (it != binaryOperationsMap.end()) {
+  type = it->second;
+ } else {
+  throw std::runtime_error("ICE: Unknown operation: "s + typeString);
+ }
+
+ std::shared_ptr<FlowGraph::Node> node {std::make_shared<FlowGraph::BinaryOperation>(type,
+                                                                                     destination,
+                                                                                     lastOp0->destination(), lastOp1->destination())};
+ result.append(node);
+ return result;
+}
+
 std::unordered_map<std::string, std::function<std::any(index_t)>> CPP::getNodeEvalMap()
 {
  return {
@@ -425,41 +473,7 @@ std::unordered_map<std::string, std::function<std::any(index_t)>> CPP::getNodeEv
   { "multiplicative-expression", [&](index_t index) -> std::any
    {
     if (childTypesOfNodeMatch(index, {"multiplicative-expression", "", "pm-expression"})) {
-     if (getValue(index, 0).type() != typeid(FlowGraph::Graph))
-      throw std::runtime_error("ICE: multiplicative-expression: Bad data type for argument 1: "s + demangle(getValue(index, 0).type()));
-     if (getValue(index, 2).type() != typeid(FlowGraph::Graph))
-      throw std::runtime_error("ICE: multiplicative-expression: Bad data type for argument 3: "s + demangle(getValue(index, 2).type()));
-
-     FlowGraph::Graph value0{std::any_cast<FlowGraph::Graph>(getValue(index, 0))};
-     FlowGraph::Graph value1{std::any_cast<FlowGraph::Graph>(getValue(index, 2))};
-     
-     promoteLastOps(value0, value1);
-     
-     std::shared_ptr<FlowGraph::Node> lastOp0{value0.lastOp()};
-     std::shared_ptr<FlowGraph::Node> lastOp1{value1.lastOp()};
-
-     FlowGraph::Graph result{value0};
-     result.append(value1);
-
-     FlowGraph::Data destination{FlowGraph::MakeTemporary(result.scope(), lastOp0->destination().type())};
-
-     FlowGraph::BinaryOperationType type{};
-     if (getType(index, 1) == "*")
-      type = FlowGraph::BinaryOperationType::Multiply;
-     else if (getType(index, 1) == "/")
-      type = FlowGraph::BinaryOperationType::Divide;
-     else if (getType(index, 1) == "%")
-      type = FlowGraph::BinaryOperationType::Modulo;
-     else
-      throw std::runtime_error("ICE: multiplicative-expression: Unknown operand: "s + getType(index, 1));
-
-     std::shared_ptr<FlowGraph::Node> node {std::make_shared<FlowGraph::BinaryOperation>(type,
-                                                                                         destination,
-                                                                                         lastOp0->destination(), lastOp1->destination())};
-
-     result.append(node);
-
-     return result;
+     return BinaryOperation(index);
     }
     if (childTypesOfNodeMatch(index, {"pm-expression"}))
      return getValue(index, 0);
@@ -469,39 +483,7 @@ std::unordered_map<std::string, std::function<std::any(index_t)>> CPP::getNodeEv
   { "additive-expression", [&](index_t index) -> std::any
    {
     if (childTypesOfNodeMatch(index, {"additive-expression", "", "multiplicative-expression"})) {
-     if (getValue(index, 0).type() != typeid(FlowGraph::Graph))
-      throw std::runtime_error("ICE: additive-expression: Bad data type for argument 1: "s + demangle(getValue(index, 0).type()));
-     if (getValue(index, 2).type() != typeid(FlowGraph::Graph))
-      throw std::runtime_error("ICE: additive-expression: Bad data type for argument 3: "s + demangle(getValue(index, 2).type()));
-
-     FlowGraph::Graph value0{std::any_cast<FlowGraph::Graph>(getValue(index, 0))};
-     FlowGraph::Graph value1{std::any_cast<FlowGraph::Graph>(getValue(index, 2))};
-
-     promoteLastOps(value0, value1);
-     
-     std::shared_ptr<FlowGraph::Node> lastOp0{value0.lastOp()};
-     std::shared_ptr<FlowGraph::Node> lastOp1{value1.lastOp()};
-
-     FlowGraph::Graph result{value0};
-     result.append(value1);
-
-     FlowGraph::Data destination{FlowGraph::MakeTemporary(result.scope(), lastOp0->destination().type())};
-
-     FlowGraph::BinaryOperationType type{};
-     if (getType(index, 1) == "+")
-      type = FlowGraph::BinaryOperationType::Add;
-     else if (getType(index, 1) == "-")
-      type = FlowGraph::BinaryOperationType::Subtract;
-     else
-      throw std::runtime_error("ICE: additive-expression: Unknown operand: "s + getType(index, 1));
-
-     std::shared_ptr<FlowGraph::Node> node {std::make_shared<FlowGraph::BinaryOperation>(type,
-                                                                                         destination,
-                                                                                         lastOp0->destination(), lastOp1->destination())};
-
-     result.append(node);
-
-     return result;
+     return BinaryOperation(index);
     }
     if (childTypesOfNodeMatch(index, {"multiplicative-expression"}))
      return getValue(index, 0);
diff --git a/cpp.h b/cpp.h
index 3207ef9..b18c251 100644
--- a/cpp.h
+++ b/cpp.h
@@ -73,6 +73,8 @@ private:
  void getValueOfNode(index_t index);
  void visitRecursive(index_t node_id);
 
+ FlowGraph::Graph BinaryOperation(index_t index); // index: node
+
  // phase 8: instantiate: instantiate templates; flowgraph->asm
  Segment mSegment;
 
diff --git a/systemtest/mcc-execute.tests/exitcodes.exp b/systemtest/mcc-execute.tests/exitcodes.exp
index dc4d377..fcd70ec 100644
--- a/systemtest/mcc-execute.tests/exitcodes.exp
+++ b/systemtest/mcc-execute.tests/exitcodes.exp
@@ -2,6 +2,7 @@
 
 runtest_exit_code "Return 1" "systemtest/mcc-execute.tests/test-return-1" 1
 runtest_exit_code "Addition" "systemtest/mcc-execute.tests/test-addition" 3
+runtest_exit_code "Subtraction" "systemtest/mcc-execute.tests/test-subtraction" 4
 runtest_exit_code "Multiplication" "systemtest/mcc-execute.tests/test-multiplication" 6
 runtest_exit_code "Division" "systemtest/mcc-execute.tests/test-division" 2
 runtest_exit_code "Modulo" "systemtest/mcc-execute.tests/test-modulo" 1
diff --git a/systemtest/mcc-execute.tests/test-subtraction.cpp b/systemtest/mcc-execute.tests/test-subtraction.cpp
new file mode 100644
index 0000000..6980d76
--- /dev/null
+++ b/systemtest/mcc-execute.tests/test-subtraction.cpp
@@ -0,0 +1 @@
+int main() { return 9-5; }