diff --git a/libs/ir/mir/include/arch/scc_x86_isel.h b/libs/ir/mir/include/arch/scc_x86_isel.h index 22ee35a..fa37fa0 100644 --- a/libs/ir/mir/include/arch/scc_x86_isel.h +++ b/libs/ir/mir/include/arch/scc_x86_isel.h @@ -27,10 +27,18 @@ static inline void emit_direct_call(scc_x86_64_isel_t *isel, const char *callee) { (void)callee; scc_mir_x86_instr_t instr = {0}; - scc_mir_x86_instr_1(&instr, SCC_X86_IFORM_CALL_NEAR_GPRV, + scc_mir_x86_instr_1(&instr, SCC_X86_IFORM_CALL_NEAR_RELBRZ, scc_x86_op_relbr(0), scc_pos_create()); scc_vec_push(isel->instrs, instr); } + +static inline void emit_indirect_call(scc_x86_64_isel_t *isel, + scc_x86_operand_value_t reg) { + scc_mir_x86_instr_t instr = {0}; + scc_mir_x86_instr_1(&instr, SCC_X86_IFORM_CALL_NEAR_GPRV, reg, + scc_pos_create()); +} + static inline void emit_ret(scc_x86_64_isel_t *isel) { scc_mir_x86_instr_t instr = {0}; scc_mir_x86_instr_0(&instr, SCC_X86_IFORM_RET_NEAR, scc_pos_create()); diff --git a/libs/ir/mir/include/core_pass/scc_prolog_epilog.h b/libs/ir/mir/include/core_pass/scc_prolog_epilog.h index 00ba1f6..8362929 100644 --- a/libs/ir/mir/include/core_pass/scc_prolog_epilog.h +++ b/libs/ir/mir/include/core_pass/scc_prolog_epilog.h @@ -4,12 +4,14 @@ #include "../scc_mir_module.h" #include -typedef void (*scc_prolog_epilog_fn)(void *userdata, +typedef void (*scc_prolog_epilog_fn)(scc_mir_instr_vec_t *userdata, const scc_mir_func_t *func); +typedef int (*scc_need_epilog_fn)(const scc_mir_instr_t *instr); typedef struct scc_prolog_epilog { scc_prolog_epilog_fn prolog; scc_prolog_epilog_fn epilog; + scc_need_epilog_fn need_epilog; } scc_prolog_epilog_t; #endif /* __SCC_PROLOG_EPILOG_H__ */ diff --git a/libs/ir/mir/include/scc_mir.h b/libs/ir/mir/include/scc_mir.h index b0665a5..ebeda16 100644 --- a/libs/ir/mir/include/scc_mir.h +++ b/libs/ir/mir/include/scc_mir.h @@ -37,6 +37,7 @@ typedef scc_cfg_bblock_t scc_mir_bblock_t; // 函数元数据 —— 不包含任何指令结构,由各后端自行定义指令布局 typedef scc_cfg_func_t scc_mir_func_t; typedef struct scc_mir_func_meta { + int need_va_args; int frame_size; int stack_alignment; int vregs_count; diff --git a/libs/ir/mir/include/scc_mir_module.h b/libs/ir/mir/include/scc_mir_module.h index 97811a7..6b663d8 100644 --- a/libs/ir/mir/include/scc_mir_module.h +++ b/libs/ir/mir/include/scc_mir_module.h @@ -6,6 +6,9 @@ typedef SCC_VEC(char) scc_mir_instr_vec_t; +typedef struct { + +} scc_mir_symbol_t; typedef scc_lir_symbol_meta_vec_t scc_mir_symbol_meta_vec_t; typedef SCC_VEC(scc_mir_func_meta_t *) scc_mir_func_meta_vec_t; diff --git a/libs/ir/mir/src/scc_mir.c b/libs/ir/mir/src/scc_mir.c index 9dae72d..b44ff2e 100644 --- a/libs/ir/mir/src/scc_mir.c +++ b/libs/ir/mir/src/scc_mir.c @@ -1,6 +1,7 @@ #include void scc_mir_func_meta_init(scc_mir_func_meta_t *func_meta) { + func_meta->need_va_args = false; func_meta->frame_size = 0; func_meta->stack_alignment = 0; func_meta->vregs_count = 0; diff --git a/libs/ir/mir/src/scc_mir_pass.c b/libs/ir/mir/src/scc_mir_pass.c index 0a0ab65..ec3a1d8 100644 --- a/libs/ir/mir/src/scc_mir_pass.c +++ b/libs/ir/mir/src/scc_mir_pass.c @@ -34,18 +34,18 @@ void scc_prolog_epilog(scc_prolog_epilog_t *ctx, scc_mir_module_t *module) { scc_vec_init(new_instrs); if (i == 0) { - - } else if (i == scc_vec_size(func->bblocks) - 1) { - // FIXME epilog it maybe used in ret instr + ctx->prolog(&new_instrs, func); } scc_vec_foreach(*old_instrs, i) { scc_mir_instr_t *ins = scc_vec_sized_at_ptr(*old_instrs, module->instr_size, i); - if (ins->opcode == SCC_MIR_PSEUDO_ALLOCA) { + if (ins->opcode < 0) { continue; } - // FIXME error + if (ctx->need_epilog(ins)) { + ctx->epilog(&new_instrs, func); + } scc_vec_sized_push(new_instrs, module->instr_size, ins, module->instr_size); } diff --git a/libs/ir/mir/src/target/win64_abi.c b/libs/ir/mir/src/target/win64_abi.c index 80709b1..c24d779 100644 --- a/libs/ir/mir/src/target/win64_abi.c +++ b/libs/ir/mir/src/target/win64_abi.c @@ -50,8 +50,10 @@ void scc_win_pc_x64_frame_alloc_init(scc_frame_layout_t *ctx) { windows x86 prolog epilog https://learn.microsoft.com/zh-cn/cpp/build/prolog-and-epilog?view=msvc-180 */ -static void prologue(void *userdata, const scc_mir_func_t *func) { - scc_x86_64_isel_t *isel = userdata; +static void prologue(scc_mir_instr_vec_t *userdata, + const scc_mir_func_t *func) { + scc_mir_x86_instr_vec_t *instrs = (void *)userdata; + scc_mir_x86_instr_t instr; /* mov [RSP + 8], RCX push R15 @@ -62,27 +64,26 @@ static void prologue(void *userdata, const scc_mir_func_t *func) { ... */ scc_mir_func_meta_t *meta = SCC_MIR_FUNC_META(func); - int frame_size = meta->frame_size; // 之前计算好的 + int frame_size = meta->frame_size; - // 1. push rbp - add_instr_1(isel, SCC_X86_IFORM_PUSH_GPRV_50, - scc_x86_op_preg(SCC_X86_REG_RBP)); + // va_arg + if (meta->need_va_args) { + /// FILL to shadow space + } - // 2. mov rbp, rsp - add_instr_2(isel, SCC_X86_IFORM_MOV_GPRV_GPRV_8B, - scc_x86_op_preg(SCC_X86_REG_RBP), - scc_x86_op_preg(SCC_X86_REG_RSP)); - - // 3. sub rsp, frame_size + // sub rsp, frame_size if (frame_size > 0) { - scc_x86_operand_value_t imm = scc_x86_op_imm(frame_size); - add_instr_2(isel, SCC_X86_IFORM_SUB_GPRV_IMMZ, - scc_x86_op_preg(SCC_X86_REG_RSP), imm); + scc_mir_x86_instr_2(&instr, SCC_X86_IFORM_SUB_GPRV_IMMZ, + scc_x86_op_preg(SCC_X86_REG_RSP), + scc_x86_op_imm(frame_size), scc_pos_create()); + scc_vec_push(*instrs, instr); } } -static void epilogue(void *userdata, const scc_mir_func_t *func) { - scc_x86_64_isel_t *isel = userdata; +static void epilogue(scc_mir_instr_vec_t *userdata, + const scc_mir_func_t *func) { + scc_mir_x86_instr_vec_t *instrs = (void *)userdata; + scc_mir_x86_instr_t instr; /* add RSP, fixed-allocation-size pop R13 @@ -90,19 +91,36 @@ static void epilogue(void *userdata, const scc_mir_func_t *func) { pop R15 ret */ - // 1. mov rsp, rbp - add_instr_2(isel, SCC_X86_IFORM_MOV_GPRV_GPRV_8B, - scc_x86_op_preg(SCC_X86_REG_RSP), - scc_x86_op_preg(SCC_X86_REG_RBP)); + scc_mir_func_meta_t *meta = SCC_MIR_FUNC_META(func); + int frame_size = meta->frame_size; - // 2. pop rbp - add_instr_1(isel, SCC_X86_IFORM_POP_GPRV_8F, - scc_x86_op_preg(SCC_X86_REG_RBP)); + // add rsp, frame_size + if (frame_size > 0) { + scc_mir_x86_instr_2(&instr, SCC_X86_IFORM_ADD_GPRV_IMMZ, + scc_x86_op_preg(SCC_X86_REG_RSP), + scc_x86_op_imm(frame_size), scc_pos_create()); + scc_vec_push(*instrs, instr); + } +} + +static int need_epilog(const scc_mir_instr_t *instr) { + scc_mir_x86_instr_t *ins = (scc_mir_x86_instr_t *)instr; + switch (ins->x86_instr.opcode) { + case SCC_X86_IFORM_RET_FAR: + case SCC_X86_IFORM_RET_NEAR: + case SCC_X86_IFORM_RET_FAR_IMMW: + case SCC_X86_IFORM_RET_NEAR_IMMW: + return true; + default: + break; + } + return false; } void scc_win_pc_x64_prolog_epilog_init(scc_prolog_epilog_t *ctx) { ctx->prolog = prologue; ctx->epilog = epilogue; + ctx->need_epilog = need_epilog; } static void lower_call(void *userdata, const scc_lir_instr_t *instr) {