ZYM/MXCompiler
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix bugs

Browse Source
This commit is contained in:
ZhuangYumin
2024-08-28 23:33:29 +00:00
parent 88c7ae3fab
commit bd9392ec83
4 changed files with 66 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
include/naivebackend/codegen.hpp
View File

@ -21,7 +21,12 @@ inline void GenerateASM(std::shared_ptr<ActionItem> act, std::vector<std::string
}
code_lines.push_back("lw ra, -4(s0)");
code_lines.push_back("lw s0, -8(s0)");
code_lines.push_back("addi sp, sp, " + std::to_string(layout.total_frame_size));
if (layout.total_frame_size < 2048) {
code_lines.push_back("addi sp, sp, " + std::to_string(layout.total_frame_size));
} else {
code_lines.push_back("li t0, " + std::to_string(layout.total_frame_size));
code_lines.push_back("add sp, sp, t0");
}
code_lines.push_back("ret");
} else if (auto binary_act = std::dynamic_pointer_cast<BinaryOperationAction>(act)) {
size_t sz = CalcSize(binary_act->type);
@ -94,7 +99,12 @@ inline void GenerateASM(std::shared_ptr<ActionItem> act, std::vector<std::string
const IRClassInfo &class_info = low_level_class_info.at(class_ty.class_name_full);
size_t offset = class_info.member_var_pos_after_align[element_idx];
IRVar2RISCVReg(get_element_act->ptr_full, 4, "t0", layout, code_lines);
code_lines.push_back("addi t2, t0, " + std::to_string(offset));
if (offset < 2048) {
code_lines.push_back("addi t2, t0, " + std::to_string(offset));
} else {
code_lines.push_back("li t1, " + std::to_string(offset));
code_lines.push_back("add t2, t0, t1");
}
GenerateWriteAccess(get_element_act->result_full, 4, "t2", layout, code_lines);
} else {
throw std::runtime_error("Unknown getelementptr indices size");
@ -134,7 +144,12 @@ inline void GenerateASM(std::shared_ptr<ActionItem> act, std::vector<std::string
}
if (num_of_args >= 8) {
size_t ps_delta = (num_of_args * 4 + 15) / 16 * 16;
code_lines.push_back("addi sp, sp, -" + std::to_string(ps_delta));
if (ps_delta < 2048) {
code_lines.push_back("addi sp, sp, -" + std::to_string(ps_delta));
} else {
code_lines.push_back("li t0, -" + std::to_string(ps_delta));
code_lines.push_back("add sp, sp, t0");
}
for (size_t i = 8; i < num_of_args; i++) {
IRVar2RISCVReg(call_act->args_val_full[i], CalcSize(call_act->args_ty[i]), "t0", layout, code_lines);
code_lines.push_back("sw t0, " + std::to_string((i - 8) * 4) + "(sp)");

39
include/naivebackend/naivebackend.h
View File

@ -153,14 +153,31 @@ inline void GenerateReadAccess(std::string val, size_t bytes, std::string output
} else if (val.size() > 12 && val.substr(0, 12) == "%.var.local.") {
// local variable address keeper
size_t offset = layout.QueryOffeset(val);
code_lines.push_back("addi " + output_reg + ", s0, -" + std::to_string(offset));
if (offset < 2048) {
code_lines.push_back("addi " + output_reg + ", s0, -" + std::to_string(offset));
} else {
code_lines.push_back("li " + output_reg + ", -" + std::to_string(offset));
code_lines.push_back("add " + output_reg + ", s0, " + output_reg);
}
} else if (val.size() > 10 && val.substr(0, 10) == "%.var.tmp.") {
// tmp variable, not address keeper
size_t offset = layout.QueryOffeset(val);
if (bytes == 1) {
code_lines.push_back("lb " + output_reg + ", -" + std::to_string(offset) + "(s0)");
if (offset < 2048) {
code_lines.push_back("lb " + output_reg + ", -" + std::to_string(offset) + "(s0)");
} else {
code_lines.push_back("li " + output_reg + ", -" + std::to_string(offset));
code_lines.push_back("add " + output_reg + ", s0, " + output_reg);
code_lines.push_back("lb " + output_reg + ", 0(" + output_reg + ")");
}
} else if (bytes == 4) {
code_lines.push_back("lw " + output_reg + ", -" + std::to_string(offset) + "(s0)");
if (offset < 2048) {
code_lines.push_back("lw " + output_reg + ", -" + std::to_string(offset) + "(s0)");
} else {
code_lines.push_back("li " + output_reg + ", -" + std::to_string(offset));
code_lines.push_back("add " + output_reg + ", s0, " + output_reg);
code_lines.push_back("lw " + output_reg + ", 0(" + output_reg + ")");
}
} else {
throw std::runtime_error("Unknown bytes");
}
@ -211,9 +228,21 @@ inline void GenerateWriteAccess(std::string val, size_t bytes, std::string data_
// tmp variable, not address keeper
size_t offset = layout.QueryOffeset(val);
if (bytes == 1) {
code_lines.push_back("sb " + data_reg + ", -" + std::to_string(offset) + "(s0)");
if (offset < 2048) {
code_lines.push_back("sb " + data_reg + ", -" + std::to_string(offset) + "(s0)");
} else {
code_lines.push_back("li t0, -" + std::to_string(offset));
code_lines.push_back("add t0, s0, t0");
code_lines.push_back("sb " + data_reg + ", 0(t0)");
}
} else if (bytes == 4) {
code_lines.push_back("sw " + data_reg + ", -" + std::to_string(offset) + "(s0)");
if (offset < 2048) {
code_lines.push_back("sw " + data_reg + ", -" + std::to_string(offset) + "(s0)");
} else {
code_lines.push_back("li t0, -" + std::to_string(offset));
code_lines.push_back("add t0, s0, t0");
code_lines.push_back("sw " + data_reg + ", 0(t0)");
}
} else {
throw std::runtime_error("Unknown bytes");
}

2
src/IR/IRBuilder.cpp
View File

@ -430,7 +430,7 @@ void IRBuilder::ActuralVisit(NewArrayExpr_ASTNode *node) {
}
auto dim_info = std::make_shared<AllocaAction>();
std::string dim_info_var = "%.var.tmp." + std::to_string(tmp_var_counter++);
std::string dim_info_var = "%.var.local.tmp." + std::to_string(tmp_var_counter++);
cur_alloca_block->actions.push_back(dim_info);
dim_info->num = dims_with_size;
dim_info->name_full = dim_info_var;

17
src/naivebackend/naivebackend.cpp
View File

@ -52,10 +52,19 @@ void GenerateNaiveASM(std::ostream &os, std::shared_ptr<ModuleItem> prog) {
riscv->funcs.push_back(func_asm);
func_asm->full_label = func_def->func_name_raw;
FuncLayout &layout = func_layouts[func_def->func_name_raw];
func_asm->code_lines.push_back("addi sp, sp, -" + std::to_string(layout.total_frame_size));
func_asm->code_lines.push_back("sw ra, " + std::to_string(layout.total_frame_size - 4) + "(sp)");
func_asm->code_lines.push_back("sw s0, " + std::to_string(layout.total_frame_size - 8) + "(sp)");
func_asm->code_lines.push_back("addi s0, sp, " + std::to_string(layout.total_frame_size));
if (layout.total_frame_size < 2048) {
func_asm->code_lines.push_back("addi sp, sp, -" + std::to_string(layout.total_frame_size));
func_asm->code_lines.push_back("sw ra, " + std::to_string(layout.total_frame_size - 4) + "(sp)");
func_asm->code_lines.push_back("sw s0, " + std::to_string(layout.total_frame_size - 8) + "(sp)");
func_asm->code_lines.push_back("addi s0, sp, " + std::to_string(layout.total_frame_size));
} else {
func_asm->code_lines.push_back("li t0, " + std::to_string(layout.total_frame_size));
func_asm->code_lines.push_back("sub sp, sp, t0");
func_asm->code_lines.push_back("add t0, t0, sp");
func_asm->code_lines.push_back("sw ra, -4(t0)");
func_asm->code_lines.push_back("sw s0, -8(t0)");
func_asm->code_lines.push_back("mv s0, t0");
}
if (func_def->init_block) {
func_asm->code_lines.push_back(".entrylabel." + func_def->init_block->label_full + ":");
for (auto act : func_def->init_block->actions) {