ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-07 16:18:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Separation of certain instructions for better clarity.

Browse Source
This commit is contained in:
Ginger Bill
2016-10-23 15:57:59 +01:00
parent bd5d095de4
commit b454371f3b
6 changed files with 496 additions and 429 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/demo.odin
+3 -1
View File
@@ -1,7 +1,9 @@
#import "fmt.odin" #import "fmt.odin"
main :: proc() { main :: proc() {
fmt.println("Hellope!") v: {4}f32
v[0] = 123
fmt.println("Hellope!", v, v[0])
} }
code/game.odin
+2 -1
View File
@@ -46,7 +46,8 @@ make_window :: proc(title: string, msg, height: int, window_proc: win32.WNDPROC)
w: Window w: Window
w.width, w.height = msg, height w.width, w.height = msg, height
c_class_name := "Win32-Odin-Window\x00".data class_name := "Win32-Odin-Window\x00"
c_class_name := class_name.data
if title[title.count-1] != 0 { if title[title.count-1] != 0 {
w.c_title = to_c_string(title) w.c_title = to_c_string(title)
} else { } else {
src/codegen/codegen.cpp
+58 -64
View File
@@ -292,11 +292,6 @@ void ssa_gen_tree(ssaGen *s) {
CheckerInfo *info = proc->module->info; CheckerInfo *info = proc->module->info;
// Useful types // Useful types
Type *t_int_ptr = make_type_pointer(a, t_int);
Type *t_i64_ptr = make_type_pointer(a, t_i64);
Type *t_bool_ptr = make_type_pointer(a, t_bool);
Type *t_string_ptr = make_type_pointer(a, t_string);
Type *t_type_info_ptr_ptr = make_type_pointer(a, t_type_info_ptr);
Type *t_i64_slice_ptr = make_type_pointer(a, make_type_slice(a, t_i64)); Type *t_i64_slice_ptr = make_type_pointer(a, make_type_slice(a, t_i64));
Type *t_string_slice_ptr = make_type_pointer(a, make_type_slice(a, t_string)); Type *t_string_slice_ptr = make_type_pointer(a, make_type_slice(a, t_string));
@@ -320,7 +315,6 @@ void ssa_gen_tree(ssaGen *s) {
t = default_type(t); t = default_type(t);
isize entry_index = entry->value; isize entry_index = entry->value;
ssaValue *tag = NULL; ssaValue *tag = NULL;
switch (t->kind) { switch (t->kind) {
@@ -336,8 +330,8 @@ void ssa_gen_tree(ssaGen *s) {
ssaValue *gep = get_type_info_ptr(proc, type_info_data, t->Named.base); ssaValue *gep = get_type_info_ptr(proc, type_info_data, t->Named.base);
ssa_emit_store(proc, ssa_emit_struct_gep(proc, tag, 0), name); ssa_emit_store(proc, ssa_emit_struct_ep(proc, tag, 0), name);
ssa_emit_store(proc, ssa_emit_struct_gep(proc, tag, 1), gep); ssa_emit_store(proc, ssa_emit_struct_ep(proc, tag, 1), gep);
} break; } break;
case Type_Basic: case Type_Basic:
@@ -359,15 +353,15 @@ void ssa_gen_tree(ssaGen *s) {
b32 is_unsigned = (t->Basic.flags & BasicFlag_Unsigned) != 0; b32 is_unsigned = (t->Basic.flags & BasicFlag_Unsigned) != 0;
ssaValue *bits = ssa_make_const_int(a, type_size_of(m->sizes, a, t)); ssaValue *bits = ssa_make_const_int(a, type_size_of(m->sizes, a, t));
ssaValue *is_signed = ssa_make_const_bool(a, !is_unsigned); ssaValue *is_signed = ssa_make_const_bool(a, !is_unsigned);
ssa_emit_store(proc, ssa_emit_struct_gep(proc, tag, 0), bits); ssa_emit_store(proc, ssa_emit_struct_ep(proc, tag, 0), bits);
ssa_emit_store(proc, ssa_emit_struct_gep(proc, tag, 1), is_signed); ssa_emit_store(proc, ssa_emit_struct_ep(proc, tag, 1), is_signed);
} break; } break;
case Basic_f32: case Basic_f32:
case Basic_f64: { case Basic_f64: {
tag = ssa_add_local_generated(proc, t_type_info_float); tag = ssa_add_local_generated(proc, t_type_info_float);
ssaValue *bits = ssa_make_const_int(a, type_size_of(m->sizes, a, t)); ssaValue *bits = ssa_make_const_int(a, type_size_of(m->sizes, a, t));
ssa_emit_store(proc, ssa_emit_struct_gep(proc, tag, 0), bits); ssa_emit_store(proc, ssa_emit_struct_ep(proc, tag, 0), bits);
} break; } break;
case Basic_rawptr: case Basic_rawptr:
@@ -387,46 +381,46 @@ void ssa_gen_tree(ssaGen *s) {
case Type_Pointer: { case Type_Pointer: {
tag = ssa_add_local_generated(proc, t_type_info_pointer); tag = ssa_add_local_generated(proc, t_type_info_pointer);
ssaValue *gep = get_type_info_ptr(proc, type_info_data, t->Pointer.elem); ssaValue *gep = get_type_info_ptr(proc, type_info_data, t->Pointer.elem);
ssa_emit_store(proc, ssa_emit_struct_gep(proc, tag, 0), gep); ssa_emit_store(proc, ssa_emit_struct_ep(proc, tag, 0), gep);
} break; } break;
case Type_Maybe: { case Type_Maybe: {
tag = ssa_add_local_generated(proc, t_type_info_maybe); tag = ssa_add_local_generated(proc, t_type_info_maybe);
ssaValue *gep = get_type_info_ptr(proc, type_info_data, t->Maybe.elem); ssaValue *gep = get_type_info_ptr(proc, type_info_data, t->Maybe.elem);
ssa_emit_store(proc, ssa_emit_struct_gep(proc, tag, 0), gep); ssa_emit_store(proc, ssa_emit_struct_ep(proc, tag, 0), gep);
} break; } break;
case Type_Array: { case Type_Array: {
tag = ssa_add_local_generated(proc, t_type_info_array); tag = ssa_add_local_generated(proc, t_type_info_array);
ssaValue *gep = get_type_info_ptr(proc, type_info_data, t->Array.elem); ssaValue *gep = get_type_info_ptr(proc, type_info_data, t->Array.elem);
ssa_emit_store(proc, ssa_emit_struct_gep(proc, tag, 0), gep); ssa_emit_store(proc, ssa_emit_struct_ep(proc, tag, 0), gep);
isize ez = type_size_of(m->sizes, a, t->Array.elem); isize ez = type_size_of(m->sizes, a, t->Array.elem);
ssaValue *elem_size = ssa_emit_struct_gep(proc, tag, 1); ssaValue *elem_size = ssa_emit_struct_ep(proc, tag, 1);
ssa_emit_store(proc, elem_size, ssa_make_const_int(a, ez)); ssa_emit_store(proc, elem_size, ssa_make_const_int(a, ez));
ssaValue *count = ssa_emit_struct_gep(proc, tag, 2); ssaValue *count = ssa_emit_struct_ep(proc, tag, 2);
ssa_emit_store(proc, count, ssa_make_const_int(a, t->Array.count)); ssa_emit_store(proc, count, ssa_make_const_int(a, t->Array.count));
} break; } break;
case Type_Slice: { case Type_Slice: {
tag = ssa_add_local_generated(proc, t_type_info_slice); tag = ssa_add_local_generated(proc, t_type_info_slice);
ssaValue *gep = get_type_info_ptr(proc, type_info_data, t->Slice.elem); ssaValue *gep = get_type_info_ptr(proc, type_info_data, t->Slice.elem);
ssa_emit_store(proc, ssa_emit_struct_gep(proc, tag, 0), gep); ssa_emit_store(proc, ssa_emit_struct_ep(proc, tag, 0), gep);
isize ez = type_size_of(m->sizes, a, t->Slice.elem); isize ez = type_size_of(m->sizes, a, t->Slice.elem);
ssaValue *elem_size = ssa_emit_struct_gep(proc, tag, 1); ssaValue *elem_size = ssa_emit_struct_ep(proc, tag, 1);
ssa_emit_store(proc, elem_size, ssa_make_const_int(a, ez)); ssa_emit_store(proc, elem_size, ssa_make_const_int(a, ez));
} break; } break;
case Type_Vector: { case Type_Vector: {
tag = ssa_add_local_generated(proc, t_type_info_vector); tag = ssa_add_local_generated(proc, t_type_info_vector);
ssaValue *gep = get_type_info_ptr(proc, type_info_data, t->Vector.elem); ssaValue *gep = get_type_info_ptr(proc, type_info_data, t->Vector.elem);
ssa_emit_store(proc, ssa_emit_struct_gep(proc, tag, 0), gep); ssa_emit_store(proc, ssa_emit_struct_ep(proc, tag, 0), gep);
isize ez = type_size_of(m->sizes, a, t->Vector.elem); isize ez = type_size_of(m->sizes, a, t->Vector.elem);
ssaValue *elem_size = ssa_emit_struct_gep(proc, tag, 1); ssaValue *elem_size = ssa_emit_struct_ep(proc, tag, 1);
ssa_emit_store(proc, elem_size, ssa_make_const_int(a, ez)); ssa_emit_store(proc, elem_size, ssa_make_const_int(a, ez));
ssaValue *count = ssa_emit_struct_gep(proc, tag, 2); ssaValue *count = ssa_emit_struct_ep(proc, tag, 2);
ssa_emit_store(proc, count, ssa_make_const_int(a, t->Vector.count)); ssa_emit_store(proc, count, ssa_make_const_int(a, t->Vector.count));
} break; } break;
@@ -440,10 +434,10 @@ void ssa_gen_tree(ssaGen *s) {
ssaValue *ordered = ssa_make_const_bool(a, t->Record.struct_is_ordered); ssaValue *ordered = ssa_make_const_bool(a, t->Record.struct_is_ordered);
ssaValue *size = ssa_make_const_int(a, type_size_of(m->sizes, a, t)); ssaValue *size = ssa_make_const_int(a, type_size_of(m->sizes, a, t));
ssaValue *align = ssa_make_const_int(a, type_align_of(m->sizes, a, t)); ssaValue *align = ssa_make_const_int(a, type_align_of(m->sizes, a, t));
ssa_emit_store(proc, ssa_emit_struct_gep(proc, tag, 1), size); ssa_emit_store(proc, ssa_emit_struct_ep(proc, tag, 1), size);
ssa_emit_store(proc, ssa_emit_struct_gep(proc, tag, 2), align); ssa_emit_store(proc, ssa_emit_struct_ep(proc, tag, 2), align);
ssa_emit_store(proc, ssa_emit_struct_gep(proc, tag, 3), packed); ssa_emit_store(proc, ssa_emit_struct_ep(proc, tag, 3), packed);
ssa_emit_store(proc, ssa_emit_struct_gep(proc, tag, 4), ordered); ssa_emit_store(proc, ssa_emit_struct_ep(proc, tag, 4), ordered);
} }
ssaValue *memory = type_info_member_offset(proc, type_info_member_data, t->Record.field_count, &type_info_member_index); ssaValue *memory = type_info_member_offset(proc, type_info_member_data, t->Record.field_count, &type_info_member_index);
@@ -457,9 +451,9 @@ void ssa_gen_tree(ssaGen *s) {
GB_ASSERT(f->kind == Entity_Variable && f->Variable.field); GB_ASSERT(f->kind == Entity_Variable && f->Variable.field);
ssaValue *field = ssa_emit_ptr_offset(proc, memory, ssa_make_const_int(a, source_index)); ssaValue *field = ssa_emit_ptr_offset(proc, memory, ssa_make_const_int(a, source_index));
ssaValue *name = ssa_emit_struct_gep(proc, field, 0); ssaValue *name = ssa_emit_struct_ep(proc, field, 0);
ssaValue *type_info = ssa_emit_struct_gep(proc, field, 1); ssaValue *type_info = ssa_emit_struct_ep(proc, field, 1);
ssaValue *offset = ssa_emit_struct_gep(proc, field, 2); ssaValue *offset = ssa_emit_struct_ep(proc, field, 2);
if (f->token.string.len > 0) { if (f->token.string.len > 0) {
ssa_emit_store(proc, name, ssa_emit_global_string(proc, f->token.string)); ssa_emit_store(proc, name, ssa_emit_global_string(proc, f->token.string));
@@ -470,12 +464,12 @@ void ssa_gen_tree(ssaGen *s) {
Type *slice_type = make_type_slice(a, t_type_info_member); Type *slice_type = make_type_slice(a, t_type_info_member);
Type *slice_type_ptr = make_type_pointer(a, slice_type); Type *slice_type_ptr = make_type_pointer(a, slice_type);
ssaValue *slice = ssa_emit_struct_gep(proc, tag, 0); ssaValue *slice = ssa_emit_struct_ep(proc, tag, 0);
ssaValue *field_count = ssa_make_const_int(a, t->Record.field_count); ssaValue *field_count = ssa_make_const_int(a, t->Record.field_count);
ssaValue *elem = ssa_emit_struct_gep(proc, slice, 0); ssaValue *elem = ssa_emit_struct_ep(proc, slice, 0);
ssaValue *len = ssa_emit_struct_gep(proc, slice, 1); ssaValue *len = ssa_emit_struct_ep(proc, slice, 1);
ssaValue *cap = ssa_emit_struct_gep(proc, slice, 2); ssaValue *cap = ssa_emit_struct_ep(proc, slice, 2);
ssa_emit_store(proc, elem, memory); ssa_emit_store(proc, elem, memory);
ssa_emit_store(proc, len, field_count); ssa_emit_store(proc, len, field_count);
@@ -486,8 +480,8 @@ void ssa_gen_tree(ssaGen *s) {
{ {
ssaValue *size = ssa_make_const_int(a, type_size_of(m->sizes, a, t)); ssaValue *size = ssa_make_const_int(a, type_size_of(m->sizes, a, t));
ssaValue *align = ssa_make_const_int(a, type_align_of(m->sizes, a, t)); ssaValue *align = ssa_make_const_int(a, type_align_of(m->sizes, a, t));
ssa_emit_store(proc, ssa_emit_struct_gep(proc, tag, 1), size); ssa_emit_store(proc, ssa_emit_struct_ep(proc, tag, 1), size);
ssa_emit_store(proc, ssa_emit_struct_gep(proc, tag, 2), align); ssa_emit_store(proc, ssa_emit_struct_ep(proc, tag, 2), align);
} }
break; break;
case TypeRecord_RawUnion: { case TypeRecord_RawUnion: {
@@ -495,17 +489,17 @@ void ssa_gen_tree(ssaGen *s) {
{ {
ssaValue *size = ssa_make_const_int(a, type_size_of(m->sizes, a, t)); ssaValue *size = ssa_make_const_int(a, type_size_of(m->sizes, a, t));
ssaValue *align = ssa_make_const_int(a, type_align_of(m->sizes, a, t)); ssaValue *align = ssa_make_const_int(a, type_align_of(m->sizes, a, t));
ssa_emit_store(proc, ssa_emit_struct_gep(proc, tag, 1), size); ssa_emit_store(proc, ssa_emit_struct_ep(proc, tag, 1), size);
ssa_emit_store(proc, ssa_emit_struct_gep(proc, tag, 2), align); ssa_emit_store(proc, ssa_emit_struct_ep(proc, tag, 2), align);
} }
ssaValue *memory = type_info_member_offset(proc, type_info_member_data, t->Record.field_count, &type_info_member_index); ssaValue *memory = type_info_member_offset(proc, type_info_member_data, t->Record.field_count, &type_info_member_index);
for (isize i = 0; i < t->Record.field_count; i++) { for (isize i = 0; i < t->Record.field_count; i++) {
ssaValue *field = ssa_emit_ptr_offset(proc, memory, ssa_make_const_int(a, i)); ssaValue *field = ssa_emit_ptr_offset(proc, memory, ssa_make_const_int(a, i));
ssaValue *name = ssa_emit_struct_gep(proc, field, 0); ssaValue *name = ssa_emit_struct_ep(proc, field, 0);
ssaValue *type_info = ssa_emit_struct_gep(proc, field, 1); ssaValue *type_info = ssa_emit_struct_ep(proc, field, 1);
ssaValue *offset = ssa_emit_struct_gep(proc, field, 2); ssaValue *offset = ssa_emit_struct_ep(proc, field, 2);
Entity *f = t->Record.fields[i]; Entity *f = t->Record.fields[i];
ssaValue *tip = get_type_info_ptr(proc, type_info_data, f->type); ssaValue *tip = get_type_info_ptr(proc, type_info_data, f->type);
@@ -519,12 +513,12 @@ void ssa_gen_tree(ssaGen *s) {
Type *slice_type = make_type_slice(a, t_type_info_member); Type *slice_type = make_type_slice(a, t_type_info_member);
Type *slice_type_ptr = make_type_pointer(a, slice_type); Type *slice_type_ptr = make_type_pointer(a, slice_type);
ssaValue *slice = ssa_emit_struct_gep(proc, tag, 0); ssaValue *slice = ssa_emit_struct_ep(proc, tag, 0);
ssaValue *field_count = ssa_make_const_int(a, t->Record.field_count); ssaValue *field_count = ssa_make_const_int(a, t->Record.field_count);
ssaValue *elem = ssa_emit_struct_gep(proc, slice, 0); ssaValue *elem = ssa_emit_struct_ep(proc, slice, 0);
ssaValue *len = ssa_emit_struct_gep(proc, slice, 1); ssaValue *len = ssa_emit_struct_ep(proc, slice, 1);
ssaValue *cap = ssa_emit_struct_gep(proc, slice, 2); ssaValue *cap = ssa_emit_struct_ep(proc, slice, 2);
ssa_emit_store(proc, elem, memory); ssa_emit_store(proc, elem, memory);
ssa_emit_store(proc, len, field_count); ssa_emit_store(proc, len, field_count);
@@ -536,7 +530,7 @@ void ssa_gen_tree(ssaGen *s) {
if (enum_base == NULL) { if (enum_base == NULL) {
enum_base = t_int; enum_base = t_int;
} }
ssaValue *base = ssa_emit_struct_gep(proc, tag, 0); ssaValue *base = ssa_emit_struct_ep(proc, tag, 0);
ssa_emit_store(proc, base, get_type_info_ptr(proc, type_info_data, enum_base)); ssa_emit_store(proc, base, get_type_info_ptr(proc, type_info_data, enum_base));
if (t->Record.other_field_count > 0) { if (t->Record.other_field_count > 0) {
@@ -576,8 +570,8 @@ void ssa_gen_tree(ssaGen *s) {
} }
for (isize i = 0; i < count; i++) { for (isize i = 0; i < count; i++) {
ssaValue *value_gep = ssa_emit_struct_gep(proc, value_array, i); ssaValue *value_gep = ssa_emit_struct_ep(proc, value_array, i);
ssaValue *name_gep = ssa_emit_struct_gep(proc, name_array, i); ssaValue *name_gep = ssa_emit_struct_ep(proc, name_array, i);
ssa_emit_store(proc, value_gep, ssa_make_const_i64(a, fields[i]->Constant.value.value_integer)); ssa_emit_store(proc, value_gep, ssa_make_const_i64(a, fields[i]->Constant.value.value_integer));
ssa_emit_store(proc, name_gep, ssa_emit_global_string(proc, fields[i]->token.string)); ssa_emit_store(proc, name_gep, ssa_emit_global_string(proc, fields[i]->token.string));
@@ -586,18 +580,18 @@ void ssa_gen_tree(ssaGen *s) {
ssaValue *v_count = ssa_make_const_int(a, count); ssaValue *v_count = ssa_make_const_int(a, count);
ssaValue *values = ssa_emit_struct_gep(proc, tag, 1); ssaValue *values = ssa_emit_struct_ep(proc, tag, 1);
ssaValue *names = ssa_emit_struct_gep(proc, tag, 2); ssaValue *names = ssa_emit_struct_ep(proc, tag, 2);
ssaValue *value_slice = ssa_add_local_generated(proc, type_deref(t_i64_slice_ptr)); ssaValue *value_slice = ssa_add_local_generated(proc, type_deref(t_i64_slice_ptr));
ssaValue *name_slice = ssa_add_local_generated(proc, type_deref(t_string_slice_ptr)); ssaValue *name_slice = ssa_add_local_generated(proc, type_deref(t_string_slice_ptr));
ssa_emit_store(proc, ssa_emit_struct_gep(proc, value_slice, 0), ssa_array_elem(proc, value_array)); ssa_emit_store(proc, ssa_emit_struct_ep(proc, value_slice, 0), ssa_array_elem(proc, value_array));
ssa_emit_store(proc, ssa_emit_struct_gep(proc, value_slice, 1), v_count); ssa_emit_store(proc, ssa_emit_struct_ep(proc, value_slice, 1), v_count);
ssa_emit_store(proc, ssa_emit_struct_gep(proc, value_slice, 2), v_count); ssa_emit_store(proc, ssa_emit_struct_ep(proc, value_slice, 2), v_count);
ssa_emit_store(proc, ssa_emit_struct_gep(proc, name_slice, 0), ssa_array_elem(proc, name_array)); ssa_emit_store(proc, ssa_emit_struct_ep(proc, name_slice, 0), ssa_array_elem(proc, name_array));
ssa_emit_store(proc, ssa_emit_struct_gep(proc, name_slice, 1), v_count); ssa_emit_store(proc, ssa_emit_struct_ep(proc, name_slice, 1), v_count);
ssa_emit_store(proc, ssa_emit_struct_gep(proc, name_slice, 2), v_count); ssa_emit_store(proc, ssa_emit_struct_ep(proc, name_slice, 2), v_count);
ssa_emit_store(proc, values, ssa_emit_load(proc, value_slice)); ssa_emit_store(proc, values, ssa_emit_load(proc, value_slice));
ssa_emit_store(proc, names, ssa_emit_load(proc, name_slice)); ssa_emit_store(proc, names, ssa_emit_load(proc, name_slice));
@@ -611,15 +605,15 @@ void ssa_gen_tree(ssaGen *s) {
{ {
ssaValue *align = ssa_make_const_int(a, type_align_of(m->sizes, a, t)); ssaValue *align = ssa_make_const_int(a, type_align_of(m->sizes, a, t));
ssa_emit_store(proc, ssa_emit_struct_gep(proc, tag, 2), align); ssa_emit_store(proc, ssa_emit_struct_ep(proc, tag, 2), align);
} }
ssaValue *memory = type_info_member_offset(proc, type_info_member_data, t->Tuple.variable_count, &type_info_member_index); ssaValue *memory = type_info_member_offset(proc, type_info_member_data, t->Tuple.variable_count, &type_info_member_index);
for (isize i = 0; i < t->Tuple.variable_count; i++) { for (isize i = 0; i < t->Tuple.variable_count; i++) {
ssaValue *field = ssa_emit_ptr_offset(proc, memory, ssa_make_const_int(a, i)); ssaValue *field = ssa_emit_ptr_offset(proc, memory, ssa_make_const_int(a, i));
ssaValue *name = ssa_emit_struct_gep(proc, field, 0); ssaValue *name = ssa_emit_struct_ep(proc, field, 0);
ssaValue *type_info = ssa_emit_struct_gep(proc, field, 1); ssaValue *type_info = ssa_emit_struct_ep(proc, field, 1);
// NOTE(bill): offset is not used for tuples // NOTE(bill): offset is not used for tuples
Entity *f = t->Tuple.variables[i]; Entity *f = t->Tuple.variables[i];
@@ -633,12 +627,12 @@ void ssa_gen_tree(ssaGen *s) {
Type *slice_type = make_type_slice(a, t_type_info_member); Type *slice_type = make_type_slice(a, t_type_info_member);
Type *slice_type_ptr = make_type_pointer(a, slice_type); Type *slice_type_ptr = make_type_pointer(a, slice_type);
ssaValue *slice = ssa_emit_struct_gep(proc, tag, 0); ssaValue *slice = ssa_emit_struct_ep(proc, tag, 0);
ssaValue *variable_count = ssa_make_const_int(a, t->Tuple.variable_count); ssaValue *variable_count = ssa_make_const_int(a, t->Tuple.variable_count);
ssaValue *elem = ssa_emit_struct_gep(proc, slice, 0); ssaValue *elem = ssa_emit_struct_ep(proc, slice, 0);
ssaValue *len = ssa_emit_struct_gep(proc, slice, 1); ssaValue *len = ssa_emit_struct_ep(proc, slice, 1);
ssaValue *cap = ssa_emit_struct_gep(proc, slice, 2); ssaValue *cap = ssa_emit_struct_ep(proc, slice, 2);
ssa_emit_store(proc, elem, memory); ssa_emit_store(proc, elem, memory);
ssa_emit_store(proc, len, variable_count); ssa_emit_store(proc, len, variable_count);
@@ -648,9 +642,9 @@ void ssa_gen_tree(ssaGen *s) {
case Type_Proc: { case Type_Proc: {
tag = ssa_add_local_generated(proc, t_type_info_procedure); tag = ssa_add_local_generated(proc, t_type_info_procedure);
ssaValue *params = ssa_emit_struct_gep(proc, tag, 0); ssaValue *params = ssa_emit_struct_ep(proc, tag, 0);
ssaValue *results = ssa_emit_struct_gep(proc, tag, 1); ssaValue *results = ssa_emit_struct_ep(proc, tag, 1);
ssaValue *variadic = ssa_emit_struct_gep(proc, tag, 2); ssaValue *variadic = ssa_emit_struct_ep(proc, tag, 2);
if (t->Proc.params) { if (t->Proc.params) {
ssa_emit_store(proc, params, get_type_info_ptr(proc, type_info_data, t->Proc.params)); ssa_emit_store(proc, params, get_type_info_ptr(proc, type_info_data, t->Proc.params));
src/codegen/print_llvm.cpp
+69 -40
View File
@@ -633,26 +633,59 @@ void ssa_print_instr(ssaFileBuffer *f, ssaModule *m, ssaValue *value) {
ssa_fprintf(f, ", align %lld\n", type_align_of(m->sizes, m->allocator, type)); ssa_fprintf(f, ", align %lld\n", type_align_of(m->sizes, m->allocator, type));
} break; } break;
case ssaInstr_GetElementPtr: { case ssaInstr_ArrayElementPtr: {
Type *et = instr->GetElementPtr.elem_type; Type *et = ssa_type(instr->ArrayElementPtr.address);
ssa_fprintf(f, "%%%d = getelementptr ", value->index); ssa_fprintf(f, "%%%d = getelementptr inbounds ", value->index);
if (instr->GetElementPtr.inbounds) {
ssa_fprintf(f, "inbounds ");
}
ssa_print_type(f, m, type_deref(et)); ssa_print_type(f, m, type_deref(et));
ssa_fprintf(f, ", "); ssa_fprintf(f, ", ");
ssa_print_type(f, m, et); ssa_print_type(f, m, et);
ssa_fprintf(f, " "); ssa_fprintf(f, " ");
ssa_print_value(f, m, instr->GetElementPtr.address, et); ssa_print_value(f, m, instr->ArrayElementPtr.address, et);
for (isize i = 0; i < instr->GetElementPtr.index_count; i++) {
ssaValue *index = instr->GetElementPtr.indices[i];
Type *t = ssa_type(index);
ssa_fprintf(f, ", "); ssa_fprintf(f, ", ");
ssa_print_type(f, m, t_int);
ssa_fprintf(f, " 0, ");
ssaValue *index =instr->ArrayElementPtr.elem_index;
Type *t = ssa_type(index);
ssa_print_type(f, m, t); ssa_print_type(f, m, t);
ssa_fprintf(f, " "); ssa_fprintf(f, " ");
ssa_print_value(f, m, index, t); ssa_print_value(f, m, index, t);
} ssa_fprintf(f, "\n");
} break;
case ssaInstr_StructElementPtr: {
Type *et = ssa_type(instr->StructElementPtr.address);
ssa_fprintf(f, "%%%d = getelementptr inbounds ", value->index);
ssa_print_type(f, m, type_deref(et));
ssa_fprintf(f, ", ");
ssa_print_type(f, m, et);
ssa_fprintf(f, " ");
ssa_print_value(f, m, instr->StructElementPtr.address, et);
ssa_fprintf(f, ", ");
ssa_print_type(f, m, t_int);
ssa_fprintf(f, " 0, ");
ssa_print_type(f, m, t_i32);
ssa_fprintf(f, " %d", instr->StructElementPtr.elem_index);
ssa_fprintf(f, "\n");
} break;
case ssaInstr_PtrOffset: {
Type *pt = ssa_type(instr->PtrOffset.address);
ssa_fprintf(f, "%%%d = getelementptr inbounds ", value->index);
ssa_print_type(f, m, type_deref(pt));
ssa_fprintf(f, ", ");
ssa_print_type(f, m, pt);
ssa_fprintf(f, " ");
ssa_print_value(f, m, instr->PtrOffset.address, pt);
ssaValue *offset = instr->PtrOffset.offset;
Type *t = ssa_type(offset);
ssa_fprintf(f, ", ");
ssa_print_type(f, m, t);
ssa_fprintf(f, " ");
ssa_print_value(f, m, offset, t);
ssa_fprintf(f, "\n"); ssa_fprintf(f, "\n");
} break; } break;
@@ -692,29 +725,25 @@ void ssa_print_instr(ssaFileBuffer *f, ssaModule *m, ssaValue *value) {
ssa_fprintf(f, ", %d\n", instr->ExtractValue.index); ssa_fprintf(f, ", %d\n", instr->ExtractValue.index);
} break; } break;
case ssaInstr_NoOp: {; case ssaInstr_Jump: {;
ssa_fprintf(f, "%%%d = add i32 0, 0\n", value->index); ssa_fprintf(f, "br label %%");
} break; ssa_print_block_name(f, instr->Jump.block);
case ssaInstr_Br: {;
ssa_fprintf(f, "br ");
if (instr->Br.cond != NULL) {
ssa_print_type(f, m, t_bool);
ssa_fprintf(f, " ");
ssa_print_value(f, m, instr->Br.cond, t_bool);
ssa_fprintf(f, ", ", instr->Br.cond->index);
}
ssa_fprintf(f, "label ");
ssa_fprintf(f, "%%"); ssa_print_block_name(f, instr->Br.true_block);
if (instr->Br.false_block != NULL) {
ssa_fprintf(f, ", label ");
ssa_fprintf(f, "%%"); ssa_print_block_name(f, instr->Br.false_block);
}
ssa_fprintf(f, "\n"); ssa_fprintf(f, "\n");
} break; } break;
case ssaInstr_Ret: { case ssaInstr_CondJump: {;
auto *ret = &instr->Ret; ssa_fprintf(f, "br ");
ssa_print_type(f, m, t_bool);
ssa_fprintf(f, " ");
ssa_print_value(f, m, instr->CondJump.cond, t_bool);
ssa_fprintf(f, ", ", instr->CondJump.cond->index);
ssa_fprintf(f, "label %%"); ssa_print_block_name(f, instr->CondJump.true_block);
ssa_fprintf(f, ", label %%"); ssa_print_block_name(f, instr->CondJump.false_block);
ssa_fprintf(f, "\n");
} break;
case ssaInstr_Return: {
auto *ret = &instr->Return;
ssa_fprintf(f, "ret "); ssa_fprintf(f, "ret ");
if (ret->value == NULL) { if (ret->value == NULL) {
ssa_fprintf(f, "void"); ssa_fprintf(f, "void");
@@ -904,23 +933,23 @@ void ssa_print_instr(ssaFileBuffer *f, ssaModule *m, ssaValue *value) {
ssa_fprintf(f, "\n"); ssa_fprintf(f, "\n");
} break; } break;
case ssaInstr_ExtractElement: { case ssaInstr_VectorExtractElement: {
Type *vt = ssa_type(instr->ExtractElement.vector); Type *vt = ssa_type(instr->VectorExtractElement.vector);
Type *it = ssa_type(instr->VectorExtractElement.index);
ssa_fprintf(f, "%%%d = extractelement ", value->index); ssa_fprintf(f, "%%%d = extractelement ", value->index);
ssa_print_type(f, m, vt); ssa_print_type(f, m, vt);
ssa_fprintf(f, " "); ssa_fprintf(f, " ");
ssa_print_value(f, m, instr->ExtractElement.vector, vt); ssa_print_value(f, m, instr->VectorExtractElement.vector, vt);
ssa_fprintf(f, ", "); ssa_fprintf(f, ", ");
Type *it = ssa_type(instr->ExtractElement.index);
ssa_print_type(f, m, it); ssa_print_type(f, m, it);
ssa_fprintf(f, " "); ssa_fprintf(f, " ");
ssa_print_value(f, m, instr->ExtractElement.index, it); ssa_print_value(f, m, instr->VectorExtractElement.index, it);
ssa_fprintf(f, "\n"); ssa_fprintf(f, "\n");
} break; } break;
case ssaInstr_InsertElement: { case ssaInstr_VectorInsertElement: {
auto *ie = &instr->InsertElement; auto *ie = &instr->VectorInsertElement;
Type *vt = ssa_type(ie->vector); Type *vt = ssa_type(ie->vector);
ssa_fprintf(f, "%%%d = insertelement ", value->index); ssa_fprintf(f, "%%%d = insertelement ", value->index);
@@ -941,8 +970,8 @@ void ssa_print_instr(ssaFileBuffer *f, ssaModule *m, ssaValue *value) {
ssa_fprintf(f, "\n"); ssa_fprintf(f, "\n");
} break; } break;
case ssaInstr_ShuffleVector: { case ssaInstr_VectorShuffle: {
auto *sv = &instr->ShuffleVector; auto *sv = &instr->VectorShuffle;
Type *vt = ssa_type(sv->vector); Type *vt = ssa_type(sv->vector);
ssa_fprintf(f, "%%%d = shufflevector ", value->index); ssa_fprintf(f, "%%%d = shufflevector ", value->index);
src/codegen/ssa.cpp
+327 -286
View File
File diff suppressed because it is too large Load Diff
src/parser.cpp
+1 -1
View File
@@ -18,7 +18,7 @@ enum ParseFileError {
typedef Array<AstNode *> AstNodeArray; typedef Array<AstNode *> AstNodeArray;
struct AstFile { struct AstFile {
u32 id; i32 id;
gbArena arena; gbArena arena;
Tokenizer tokenizer; Tokenizer tokenizer;
Array<Token> tokens; Array<Token> tokens;