Skip to content

Commit

Permalink
Fix array pointer as iterators; Remove stack allocations in `startup_…
Browse files Browse the repository at this point in the history 
…runtime`
  • Loading branch information
@gingerBill
gingerBill committed Jan 6, 2017
1 parent fc1af0a commit b1e35b6
Show file tree
Hide file tree
Showing 5 changed files with 89 additions and 37 deletions.
3 changes: 1 addition & 2 deletions src/build.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@ String get_fullpath_core(gbAllocator a, String path) {
return res;
}


String get_filepath_extension(String path) {
isize dot = 0;
bool seen_slash = false;
Expand All @@ -149,7 +148,7 @@ String get_filepath_extension(String path) {

void init_build_context(BuildContext *bc) {
bc->ODIN_VENDOR = str_lit("odin");
bc->ODIN_VERSION = str_lit("0.0.5c");
bc->ODIN_VERSION = str_lit("0.0.5d");
bc->ODIN_ROOT = odin_root_dir();

#if defined(GB_SYSTEM_WINDOWS)
Expand Down
18 changes: 18 additions & 0 deletions src/checker/checker.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1045,6 +1045,24 @@ void init_preload(Checker *c) {
t_type_info_union = record->fields[15]->type;
t_type_info_raw_union = record->fields[16]->type;
t_type_info_enum = record->fields[17]->type;

t_type_info_named_ptr = make_type_pointer(heap_allocator(), t_type_info_named);
t_type_info_integer_ptr = make_type_pointer(heap_allocator(), t_type_info_integer);
t_type_info_float_ptr = make_type_pointer(heap_allocator(), t_type_info_float);
t_type_info_any_ptr = make_type_pointer(heap_allocator(), t_type_info_any);
t_type_info_string_ptr = make_type_pointer(heap_allocator(), t_type_info_string);
t_type_info_boolean_ptr = make_type_pointer(heap_allocator(), t_type_info_boolean);
t_type_info_pointer_ptr = make_type_pointer(heap_allocator(), t_type_info_pointer);
t_type_info_maybe_ptr = make_type_pointer(heap_allocator(), t_type_info_maybe);
t_type_info_procedure_ptr = make_type_pointer(heap_allocator(), t_type_info_procedure);
t_type_info_array_ptr = make_type_pointer(heap_allocator(), t_type_info_array);
t_type_info_slice_ptr = make_type_pointer(heap_allocator(), t_type_info_slice);
t_type_info_vector_ptr = make_type_pointer(heap_allocator(), t_type_info_vector);
t_type_info_tuple_ptr = make_type_pointer(heap_allocator(), t_type_info_tuple);
t_type_info_struct_ptr = make_type_pointer(heap_allocator(), t_type_info_struct);
t_type_info_union_ptr = make_type_pointer(heap_allocator(), t_type_info_union);
t_type_info_raw_union_ptr = make_type_pointer(heap_allocator(), t_type_info_raw_union);
t_type_info_enum_ptr = make_type_pointer(heap_allocator(), t_type_info_enum);
}

if (t_allocator == NULL) {
Expand Down
21 changes: 21 additions & 0 deletions src/checker/types.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,27 @@ gb_global Type *t_type_info_union = NULL;
gb_global Type *t_type_info_raw_union = NULL;
gb_global Type *t_type_info_enum = NULL;


gb_global Type *t_type_info_named_ptr = NULL;
gb_global Type *t_type_info_integer_ptr = NULL;
gb_global Type *t_type_info_float_ptr = NULL;
gb_global Type *t_type_info_any_ptr = NULL;
gb_global Type *t_type_info_string_ptr = NULL;
gb_global Type *t_type_info_boolean_ptr = NULL;
gb_global Type *t_type_info_pointer_ptr = NULL;
gb_global Type *t_type_info_maybe_ptr = NULL;
gb_global Type *t_type_info_procedure_ptr = NULL;
gb_global Type *t_type_info_array_ptr = NULL;
gb_global Type *t_type_info_slice_ptr = NULL;
gb_global Type *t_type_info_vector_ptr = NULL;
gb_global Type *t_type_info_tuple_ptr = NULL;
gb_global Type *t_type_info_struct_ptr = NULL;
gb_global Type *t_type_info_union_ptr = NULL;
gb_global Type *t_type_info_raw_union_ptr = NULL;
gb_global Type *t_type_info_enum_ptr = NULL;



gb_global Type *t_allocator = NULL;
gb_global Type *t_allocator_ptr = NULL;
gb_global Type *t_context = NULL;
Expand Down
82 changes: 47 additions & 35 deletions src/ir.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -708,21 +708,21 @@ irValueArray *ir_value_referrers(irValue *v) {
//
////////////////////////////////////////////////////////////////

void ir_module_add_value (irModule *m, Entity *e, irValue *v);
void ir_module_add_value (irModule *m, Entity *e, irValue *v);
irValue *ir_emit_zero_init (irProcedure *p, irValue *address);
irValue *ir_emit_comment (irProcedure *p, String text);
irValue *ir_emit_store (irProcedure *p, irValue *address, irValue *value);
irValue *ir_emit_load (irProcedure *p, irValue *address);
void ir_emit_jump (irProcedure *proc, irBlock *block);
void ir_emit_jump (irProcedure *proc, irBlock *block);
irValue *ir_emit_conv (irProcedure *proc, irValue *value, Type *t);
irValue *ir_type_info (irProcedure *proc, Type *type);
irValue *ir_build_expr (irProcedure *proc, AstNode *expr);
void ir_build_stmt (irProcedure *proc, AstNode *node);
void ir_build_stmt (irProcedure *proc, AstNode *node);
irValue *ir_build_cond (irProcedure *proc, AstNode *cond, irBlock *true_block, irBlock *false_block);
void ir_build_defer_stmt (irProcedure *proc, irDefer d);
void ir_build_defer_stmt (irProcedure *proc, irDefer d);
irAddr ir_build_addr (irProcedure *proc, AstNode *expr);
void ir_build_proc (irValue *value, irProcedure *parent);
void ir_gen_global_type_name(irModule *m, Entity *e, String name);
void ir_build_proc (irValue *value, irProcedure *parent);
void ir_gen_global_type_name(irModule *m, Entity *e, String name);



Expand Down Expand Up @@ -817,7 +817,7 @@ irValue *ir_make_instr_array_element_ptr(irProcedure *p, irValue *address, irVal
irValue *v = ir_alloc_instr(p, irInstr_ArrayElementPtr);
irInstr *i = &v->Instr;
Type *t = ir_type(address);
GB_ASSERT(is_type_pointer(t));
GB_ASSERT_MSG(is_type_pointer(t), "%s", type_to_string(t));
t = base_type(type_deref(t));
GB_ASSERT(is_type_array(t) || is_type_vector(t));

Expand Down Expand Up @@ -1561,7 +1561,9 @@ irValue *ir_emit_comp(irProcedure *proc, TokenKind op_kind, irValue *left, irVal

irValue *ir_emit_array_ep(irProcedure *proc, irValue *s, irValue *index) {
GB_ASSERT(index != NULL);
Type *st = base_type(type_deref(ir_type(s)));
Type *t = ir_type(s);
GB_ASSERT(is_type_pointer(t));
Type *st = base_type(type_deref(t));
GB_ASSERT(is_type_array(st) || is_type_vector(st));

// NOTE(bill): For some weird legacy reason in LLVM, structure elements must be accessed as an i32
Expand Down Expand Up @@ -3871,9 +3873,9 @@ void ir_emit_increment(irProcedure *proc, irValue *addr) {
}

void ir_build_range_indexed(irProcedure *proc, irValue *expr, Type *val_type,
irValue **val_, irValue **idx_, irBlock **loop_, irBlock **done_) {
irValue **val_, irValue **idx_, irBlock **loop_, irBlock **done_) {
irValue *count = NULL;
Type *expr_type = base_type(ir_type(expr));
Type *expr_type = base_type(type_deref(ir_type(expr)));
switch (expr_type->kind) {
case Type_Array:
count = ir_make_const_int(proc->module->allocator, expr_type->Array.count);
Expand Down Expand Up @@ -4454,25 +4456,24 @@ void ir_build_stmt_internal(irProcedure *proc, AstNode *node) {
} else {
Type *expr_type = type_of_expr(proc->module->info, rs->expr);
Type *et = base_type(type_deref(expr_type));
bool deref = is_type_pointer(expr_type);
switch (et->kind) {
case Type_Array: {
irValue *array = ir_build_addr(proc, rs->expr).addr;
if (deref) {
if (is_type_pointer(type_deref(ir_type(array)))) {
array = ir_emit_load(proc, array);
}
ir_build_range_indexed(proc, array, val_type, &val, &index, &loop, &done);
} break;
case Type_Slice: {
irValue *slice = ir_build_expr(proc, rs->expr);
if (deref) {
if (is_type_pointer(ir_type(slice))) {
slice = ir_emit_load(proc, slice);
}
ir_build_range_indexed(proc, slice, val_type, &val, &index, &loop, &done);
} break;
case Type_Basic: {
irValue *string = ir_build_expr(proc, rs->expr);
if (deref) {
if (is_type_pointer(ir_type(string))) {
string = ir_emit_load(proc, string);
}
if (is_type_untyped(expr_type)) {
Expand Down Expand Up @@ -5463,10 +5464,11 @@ void ir_gen_tree(irGen *s) {
isize entry_index = entry->value;

irValue *tag = NULL;
irValue *ti_ptr = ir_emit_array_epi(proc, type_info_data, entry_index);

switch (t->kind) {
case Type_Named: {
tag = ir_add_local_generated(proc, t_type_info_named);
tag = ir_emit_conv(proc, ti_ptr, t_type_info_named_ptr);

// TODO(bill): Which is better? The mangled name or actual name?
irValue *name = ir_make_const_string(a, t->Named.type_name->token.string);
Expand All @@ -5479,7 +5481,7 @@ void ir_gen_tree(irGen *s) {
case Type_Basic:
switch (t->Basic.kind) {
case Basic_bool:
tag = ir_add_local_generated(proc, t_type_info_boolean);
tag = ir_emit_conv(proc, ti_ptr, t_type_info_boolean_ptr);
break;
case Basic_i8:
case Basic_u8:
Expand All @@ -5493,7 +5495,7 @@ void ir_gen_tree(irGen *s) {
// case Basic_u128:
case Basic_int:
case Basic_uint: {
tag = ir_add_local_generated(proc, t_type_info_integer);
tag = ir_emit_conv(proc, ti_ptr, t_type_info_integer_ptr);
bool is_unsigned = (t->Basic.flags & BasicFlag_Unsigned) != 0;
irValue *bits = ir_make_const_int(a, type_size_of(m->sizes, a, t));
irValue *is_signed = ir_make_const_bool(a, !is_unsigned);
Expand All @@ -5506,37 +5508,37 @@ void ir_gen_tree(irGen *s) {
case Basic_f64:
// case Basic_f128:
{
tag = ir_add_local_generated(proc, t_type_info_float);
tag = ir_emit_conv(proc, ti_ptr, t_type_info_float_ptr);
irValue *bits = ir_make_const_int(a, type_size_of(m->sizes, a, t));
ir_emit_store(proc, ir_emit_struct_ep(proc, tag, 0), bits);
} break;

case Basic_rawptr:
tag = ir_add_local_generated(proc, t_type_info_pointer);
tag = ir_emit_conv(proc, ti_ptr, t_type_info_pointer_ptr);
break;

case Basic_string:
tag = ir_add_local_generated(proc, t_type_info_string);
tag = ir_emit_conv(proc, ti_ptr, t_type_info_string_ptr);
break;

case Basic_any:
tag = ir_add_local_generated(proc, t_type_info_any);
tag = ir_emit_conv(proc, ti_ptr, t_type_info_any_ptr);
break;
}
break;

case Type_Pointer: {
tag = ir_add_local_generated(proc, t_type_info_pointer);
tag = ir_emit_conv(proc, ti_ptr, t_type_info_pointer_ptr);
irValue *gep = ir_get_type_info_ptr(proc, type_info_data, t->Pointer.elem);
ir_emit_store(proc, ir_emit_struct_ep(proc, tag, 0), gep);
} break;
case Type_Maybe: {
tag = ir_add_local_generated(proc, t_type_info_maybe);
tag = ir_emit_conv(proc, ti_ptr, t_type_info_maybe_ptr);
irValue *gep = ir_get_type_info_ptr(proc, type_info_data, t->Maybe.elem);
ir_emit_store(proc, ir_emit_struct_ep(proc, tag, 0), gep);
} break;
case Type_Array: {
tag = ir_add_local_generated(proc, t_type_info_array);
tag = ir_emit_conv(proc, ti_ptr, t_type_info_array_ptr);
irValue *gep = ir_get_type_info_ptr(proc, type_info_data, t->Array.elem);
ir_emit_store(proc, ir_emit_struct_ep(proc, tag, 0), gep);

Expand All @@ -5549,7 +5551,7 @@ void ir_gen_tree(irGen *s) {

} break;
case Type_Slice: {
tag = ir_add_local_generated(proc, t_type_info_slice);
tag = ir_emit_conv(proc, ti_ptr, t_type_info_slice_ptr);
irValue *gep = ir_get_type_info_ptr(proc, type_info_data, t->Slice.elem);
ir_emit_store(proc, ir_emit_struct_ep(proc, tag, 0), gep);

Expand All @@ -5559,7 +5561,7 @@ void ir_gen_tree(irGen *s) {

} break;
case Type_Vector: {
tag = ir_add_local_generated(proc, t_type_info_vector);
tag = ir_emit_conv(proc, ti_ptr, t_type_info_vector_ptr);
irValue *gep = ir_get_type_info_ptr(proc, type_info_data, t->Vector.elem);
ir_emit_store(proc, ir_emit_struct_ep(proc, tag, 0), gep);

Expand All @@ -5572,7 +5574,7 @@ void ir_gen_tree(irGen *s) {
case Type_Record: {
switch (t->Record.kind) {
case TypeRecord_Struct: {
tag = ir_add_local_generated(proc, t_type_info_struct);
tag = ir_emit_conv(proc, ti_ptr, t_type_info_struct_ptr);

{
irValue *packed = ir_make_const_bool(a, t->Record.struct_is_packed);
Expand Down Expand Up @@ -5621,7 +5623,7 @@ void ir_gen_tree(irGen *s) {
ir_emit_store(proc, cap, field_count);
} break;
case TypeRecord_Union:
tag = ir_add_local_generated(proc, t_type_info_union);
tag = ir_emit_conv(proc, ti_ptr, t_type_info_union_ptr);
{
irValue *size = ir_make_const_int(a, type_size_of(m->sizes, a, t));
irValue *align = ir_make_const_int(a, type_align_of(m->sizes, a, t));
Expand All @@ -5630,7 +5632,7 @@ void ir_gen_tree(irGen *s) {
}
break;
case TypeRecord_RawUnion: {
tag = ir_add_local_generated(proc, t_type_info_raw_union);
tag = ir_emit_conv(proc, ti_ptr, t_type_info_raw_union_ptr);
{
irValue *size = ir_make_const_int(a, type_size_of(m->sizes, a, t));
irValue *align = ir_make_const_int(a, type_align_of(m->sizes, a, t));
Expand Down Expand Up @@ -5670,7 +5672,7 @@ void ir_gen_tree(irGen *s) {
ir_emit_store(proc, cap, field_count);
} break;
case TypeRecord_Enum:
tag = ir_add_local_generated(proc, t_type_info_enum);
tag = ir_emit_conv(proc, ti_ptr, t_type_info_enum_ptr);
{
GB_ASSERT(t->Record.enum_base_type != NULL);
irValue *base = ir_type_info(proc, t->Record.enum_base_type);
Expand Down Expand Up @@ -5716,7 +5718,7 @@ void ir_gen_tree(irGen *s) {
} break;

case Type_Tuple: {
tag = ir_add_local_generated(proc, t_type_info_tuple);
tag = ir_emit_conv(proc, ti_ptr, t_type_info_tuple_ptr);

{
irValue *align = ir_make_const_int(a, type_align_of(m->sizes, a, t));
Expand Down Expand Up @@ -5755,7 +5757,7 @@ void ir_gen_tree(irGen *s) {
} break;

case Type_Proc: {
tag = ir_add_local_generated(proc, t_type_info_procedure);
tag = ir_emit_conv(proc, ti_ptr, t_type_info_procedure_ptr);

irValue *params = ir_emit_struct_ep(proc, tag, 0);
irValue *results = ir_emit_struct_ep(proc, tag, 1);
Expand All @@ -5774,9 +5776,19 @@ void ir_gen_tree(irGen *s) {
}

if (tag != NULL) {
irValue *gep = ir_emit_array_epi(proc, type_info_data, entry_index);
irValue *val = ir_emit_conv(proc, ir_emit_load(proc, tag), t_type_info);
ir_emit_store(proc, gep, val);
Type *tag_type = type_deref(ir_type(tag));
Type *ti = base_type(t_type_info);
bool found = false;
for (isize i = 1; i < ti->Record.field_count; i++) {
Entity *f = ti->Record.fields[i];
if (are_types_identical(f->type, tag_type)) {
found = true;
irValue *tag = ir_make_const_int(proc->module->allocator, i);
ir_emit_store(proc, ir_emit_union_tag_ptr(proc, ti_ptr), tag);
break;
}
}
GB_ASSERT(found);
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,8 @@ int main(int argc, char **argv) {
if (build_context.is_dll) {
output_ext = "dll";
link_settings = "/DLL";
} else {
link_settings = "/ENTRY:mainCRTStartup";
}

exit_code = win32_exec_command_line_app("msvc-link", true,
Expand Down

0 comments on commit b1e35b6

Please sign in to comment.