aboutsummaryrefslogtreecommitdiff
path: root/src/codegen
diff options
context:
space:
mode:
Diffstat (limited to 'src/codegen')
-rw-r--r--src/codegen/print_llvm.cpp48
-rw-r--r--src/codegen/ssa.cpp46
2 files changed, 78 insertions, 16 deletions
diff --git a/src/codegen/print_llvm.cpp b/src/codegen/print_llvm.cpp
index 1015207c4..d0debf173 100644
--- a/src/codegen/print_llvm.cpp
+++ b/src/codegen/print_llvm.cpp
@@ -387,13 +387,22 @@ void ssa_print_instr(ssaFileBuffer *f, ssaModule *m, ssaValue *value) {
ssa_fprintf(f, "%%%d = alloca ", value->id);
ssa_print_type(f, m->sizes, type);
ssa_fprintf(f, ", align %lld\n", type_align_of(m->sizes, m->allocator, type));
- if (instr->Local.zero_initialized) {
- ssa_fprintf(f, "\tstore ");
- ssa_print_type(f, m->sizes, type);
- ssa_fprintf(f, " zeroinitializer, ");
- ssa_print_type(f, m->sizes, type);
- ssa_fprintf(f, "* %%%d\n", value->id);
- }
+ // if (instr->Local.zero_initialized) {
+ // ssa_fprintf(f, "\tstore ");
+ // ssa_print_type(f, m->sizes, type);
+ // ssa_fprintf(f, " zeroinitializer, ");
+ // ssa_print_type(f, m->sizes, type);
+ // ssa_fprintf(f, "* %%%d\n", value->id);
+ // }
+ } break;
+
+ case ssaInstr_ZeroInit: {
+ Type *type = type_deref(ssa_type(instr->ZeroInit.address));
+ ssa_fprintf(f, "\tstore ");
+ ssa_print_type(f, m->sizes, type);
+ ssa_fprintf(f, " zeroinitializer, ");
+ ssa_print_type(f, m->sizes, type);
+ ssa_fprintf(f, "* %%%d\n", instr->ZeroInit.address->id);
} break;
case ssaInstr_Store: {
@@ -745,10 +754,23 @@ void ssa_print_instr(ssaFileBuffer *f, ssaModule *m, ssaValue *value) {
void ssa_print_proc(ssaFileBuffer *f, ssaModule *m, ssaProcedure *proc) {
if (proc->body == NULL) {
ssa_fprintf(f, "declare ");
+ if (proc->tags & ProcTag_dll_import) {
+ ssa_fprintf(f, "dllimport ");
+ }
+ if (proc->tags & ProcTag_dll_export) {
+ ssa_fprintf(f, "dllexport ");
+ }
} else {
ssa_fprintf(f, "\ndefine ");
}
+ if (proc->tags & ProcTag_stdcall) {
+ ssa_fprintf(f, "cc 64 ");
+ }
+ if (proc->tags & ProcTag_fastcall) {
+ ssa_fprintf(f, "cc 65 ");
+ }
+
auto *proc_type = &proc->type->Proc;
if (proc_type->result_count == 0) {
@@ -773,7 +795,9 @@ void ssa_print_proc(ssaFileBuffer *f, ssaModule *m, ssaProcedure *proc) {
ssa_fprintf(f, ", ");
}
ssa_print_type(f, m->sizes, e->type);
- ssa_fprintf(f, " %%%.*s", LIT(e->token.string));
+ if (proc->body != NULL) {
+ ssa_fprintf(f, " %%%.*s", LIT(e->token.string));
+ }
}
}
@@ -787,14 +811,20 @@ void ssa_print_proc(ssaFileBuffer *f, ssaModule *m, ssaProcedure *proc) {
ssa_fprintf(f, "noinline ");
}
+ // if (proc->tags & ProcTag_stdcall) {
+ // ssa_fprintf(f, "\"cc\"=\"64\" ");
+ // }
+ // if (proc->tags & ProcTag_fastcall) {
+ // ssa_fprintf(f, "\"cc\"=\"65\" ");
+ // }
if (proc->tags & ProcTag_foreign) {
- // TODO(bill): Set calling convention
ssa_fprintf(f, "; foreign\n");
}
}
if (proc->body != NULL) {
+ // ssa_fprintf(f, "nounwind uwtable {\n");
ssa_fprintf(f, "{\n");
gb_for_array(i, proc->blocks) {
ssaBlock *block = proc->blocks[i];
diff --git a/src/codegen/ssa.cpp b/src/codegen/ssa.cpp
index 268778493..bcbe35634 100644
--- a/src/codegen/ssa.cpp
+++ b/src/codegen/ssa.cpp
@@ -65,6 +65,8 @@ struct ssaProcedure {
isize scope_index;
gbArray(ssaDefer) defer_stmts;
gbArray(ssaBlock *) blocks;
+ ssaBlock * decl_block;
+ ssaBlock * entry_block;
ssaBlock * curr_block;
ssaTargetList * target_list;
};
@@ -78,6 +80,7 @@ struct ssaProcedure {
SSA_INSTR_KIND(Invalid), \
SSA_INSTR_KIND(Comment), \
SSA_INSTR_KIND(Local), \
+ SSA_INSTR_KIND(ZeroInit), \
SSA_INSTR_KIND(Store), \
SSA_INSTR_KIND(Load), \
SSA_INSTR_KIND(GetElementPtr), \
@@ -153,6 +156,9 @@ struct ssaInstr {
} Local;
struct {
ssaValue *address;
+ } ZeroInit;
+ struct {
+ ssaValue *address;
ssaValue *value;
} Store;
struct {
@@ -509,6 +515,13 @@ ssaValue *ssa_make_instr_store(ssaProcedure *p, ssaValue *address, ssaValue *val
return v;
}
+ssaValue *ssa_make_instr_zero_init(ssaProcedure *p, ssaValue *address) {
+ ssaValue *v = ssa_alloc_instr(p, ssaInstr_ZeroInit);
+ ssaInstr *i = &v->Instr;
+ i->ZeroInit.address = address;
+ return v;
+}
+
ssaValue *ssa_make_instr_load(ssaProcedure *p, ssaValue *address) {
ssaValue *v = ssa_alloc_instr(p, ssaInstr_Load);
ssaInstr *i = &v->Instr;
@@ -743,13 +756,26 @@ ssaValue *ssa_emit_select(ssaProcedure *p, ssaValue *cond, ssaValue *t, ssaValue
return ssa_emit(p, ssa_make_instr_select(p, cond, t, f));
}
+ssaValue *ssa_emit_zero_init(ssaProcedure *p, ssaValue *address) {
+ return ssa_emit(p, ssa_make_instr_zero_init(p, address));
+}
+
ssaValue *ssa_emit_comment(ssaProcedure *p, String text) {
return ssa_emit(p, ssa_make_instr_comment(p, text));
}
ssaValue *ssa_add_local(ssaProcedure *proc, Entity *e, b32 zero_initialized = true) {
- return ssa_emit(proc, ssa_make_instr_local(proc, e, zero_initialized));
+ ssaBlock *b = proc->decl_block; // all variables must be in the first block
+ ssaValue *instr = ssa_make_instr_local(proc, e, zero_initialized);
+ instr->Instr.parent = b;
+ gb_array_append(b->instrs, instr);
+
+ if (zero_initialized) {
+ ssa_emit_zero_init(proc, instr);
+ }
+
+ return instr;
}
ssaValue *ssa_add_local_for_identifier(ssaProcedure *proc, AstNode *name, b32 zero_initialized) {
@@ -769,11 +795,11 @@ ssaValue *ssa_add_local_generated(ssaProcedure *proc, Type *type) {
if (proc->curr_block) {
scope = proc->curr_block->scope;
}
- Entity *entity = make_entity_variable(proc->module->allocator,
- scope,
- empty_token,
- type);
- return ssa_emit(proc, ssa_make_instr_local(proc, entity, true));
+ Entity *e = make_entity_variable(proc->module->allocator,
+ scope,
+ empty_token,
+ type);
+ return ssa_add_local(proc, e, true);
}
ssaValue *ssa_add_param(ssaProcedure *proc, Entity *e) {
@@ -944,7 +970,9 @@ ssaValue *ssa_lvalue_load(ssaProcedure *proc, ssaAddr lval) {
void ssa_begin_procedure_body(ssaProcedure *proc) {
gb_array_init(proc->blocks, gb_heap_allocator());
gb_array_init(proc->defer_stmts, gb_heap_allocator());
- proc->curr_block = ssa_add_block(proc, proc->type_expr, make_string("entry"));
+ proc->decl_block = ssa_add_block(proc, proc->type_expr, make_string("decls"));
+ proc->entry_block = ssa_add_block(proc, proc->type_expr, make_string("entry"));
+ proc->curr_block = proc->entry_block;
if (proc->type->Proc.params != NULL) {
auto *params = &proc->type->Proc.params->Tuple;
@@ -960,6 +988,9 @@ void ssa_end_procedure_body(ssaProcedure *proc) {
ssa_emit_ret(proc, NULL);
}
+ proc->curr_block = proc->decl_block;
+ ssa_emit_jump(proc, proc->entry_block);
+
// Number blocks and registers
i32 reg_id = 0;
@@ -973,6 +1004,7 @@ void ssa_end_procedure_body(ssaProcedure *proc) {
// NOTE(bill): Ignore non-returning instructions
switch (instr->kind) {
case ssaInstr_Comment:
+ case ssaInstr_ZeroInit:
case ssaInstr_Store:
case ssaInstr_Br:
case ssaInstr_Ret:
generated by cgit v1.2.3 (git 2.39.1) at 2026-02-15 18:01:32 +0000