fix(IR): use register operands instead of variable for local variables
This commit is contained in:
@@ -5,6 +5,8 @@
|
|||||||
#include "furc/ast/visitor.hpp"
|
#include "furc/ast/visitor.hpp"
|
||||||
#include "furlang/ir/module.hpp"
|
#include "furlang/ir/module.hpp"
|
||||||
|
|
||||||
|
#include <unordered_map>
|
||||||
|
|
||||||
namespace furc {
|
namespace furc {
|
||||||
namespace front {
|
namespace front {
|
||||||
|
|
||||||
@@ -39,6 +41,8 @@ private:
|
|||||||
std::unique_ptr<furlang::ir::function> m_currentFunction;
|
std::unique_ptr<furlang::ir::function> m_currentFunction;
|
||||||
std::shared_ptr<furlang::ir::block> m_currentBlock;
|
std::shared_ptr<furlang::ir::block> m_currentBlock;
|
||||||
ir_register m_registerCounter = 0;
|
ir_register m_registerCounter = 0;
|
||||||
|
|
||||||
|
std::unordered_map<std::string_view, ir_register> m_variables;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace front
|
} // namespace front
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ void ir_generator::visit(const ast::if_statement_node& node) {
|
|||||||
node.elze()->accept(*this);
|
node.elze()->accept(*this);
|
||||||
}
|
}
|
||||||
|
|
||||||
push_block();
|
push_block(); // merge block
|
||||||
}
|
}
|
||||||
|
|
||||||
void ir_generator::visit(const ast::compound_statement_node& node) {
|
void ir_generator::visit(const ast::compound_statement_node& node) {
|
||||||
@@ -77,8 +77,12 @@ void ir_generator::visit(const ast::integer_literal_node& node) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void ir_generator::visit(const ast::var_read_expression_node& node) {
|
void ir_generator::visit(const ast::var_read_expression_node& node) {
|
||||||
m_currentBlock->emplace<furlang::ir::assign_instruction>(ir::operand::new_variable(std::string(*node.get_name())),
|
if (auto it = m_variables.find(*node.get_name()); it != m_variables.end()) {
|
||||||
ir::operand::new_reg(m_registerCounter++));
|
m_currentBlock->emplace<furlang::ir::assign_instruction>(ir::operand::new_reg(it->second),
|
||||||
|
ir::operand::new_reg(m_registerCounter++));
|
||||||
|
} else {
|
||||||
|
throw std::runtime_error("unknown variable");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ir_generator::visit(const ast::unaryop_expression_node& node) {
|
void ir_generator::visit(const ast::unaryop_expression_node& node) {
|
||||||
@@ -121,19 +125,22 @@ void ir_generator::visit(const ast::var_assign_expression_node& node) {
|
|||||||
assert(node.lhs()->expression_type() == ast::expression_node_t::VarRead);
|
assert(node.lhs()->expression_type() == ast::expression_node_t::VarRead);
|
||||||
ast::var_read_expression_node_h lhs = node.lhs();
|
ast::var_read_expression_node_h lhs = node.lhs();
|
||||||
|
|
||||||
ir_register reg = m_registerCounter++;
|
ir_register reg = 0;
|
||||||
|
if (auto it = m_variables.find(*lhs->get_name()); it != m_variables.end()) {
|
||||||
|
reg = it->second;
|
||||||
|
} else {
|
||||||
|
m_variables[*lhs->get_name()] = reg = m_registerCounter++;
|
||||||
|
}
|
||||||
|
|
||||||
auto compound = node.compound();
|
auto compound = node.compound();
|
||||||
if (compound != ast::binop_expression_node_t::None) {
|
if (compound != ast::binop_expression_node_t::None) {
|
||||||
m_currentBlock->emplace<ir::binary_op_instruction>(binary_op_instruction_t(compound),
|
m_currentBlock->emplace<ir::binary_op_instruction>(binary_op_instruction_t(compound),
|
||||||
ir::operand::new_variable(std::string(*lhs->get_name())),
|
ir::operand::new_reg(reg),
|
||||||
ir::operand::new_reg(rhs),
|
ir::operand::new_reg(rhs),
|
||||||
ir::operand::new_reg(reg));
|
ir::operand::new_reg(reg));
|
||||||
} else {
|
} else {
|
||||||
m_currentBlock->emplace<ir::assign_instruction>(ir::operand::new_reg(rhs), ir::operand::new_reg(reg));
|
m_currentBlock->emplace<ir::assign_instruction>(ir::operand::new_reg(rhs), ir::operand::new_reg(reg));
|
||||||
}
|
}
|
||||||
m_currentBlock->emplace<ir::assign_instruction>(ir::operand::new_reg(reg),
|
|
||||||
ir::operand::new_variable(std::string(*lhs->get_name())));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
furlang::ir::block_index ir_generator::push_block() {
|
furlang::ir::block_index ir_generator::push_block() {
|
||||||
|
|||||||
Reference in New Issue
Block a user