mirrors/Odin
1
0
Fork 0
mirror of https://github.com/odin-lang/Odin.git synced 2026-02-27 21:34:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Addressing for SOA on store; Add intrinsics.type_struct_field_count(T)

Browse Source
This commit is contained in:
gingerBill
2021-03-01 17:54:49 +00:00
parent b428e9ee14
commit 667aa3671e
5 changed files with 68 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/check_expr.cpp
View File

@@ -5768,6 +5768,20 @@ bool check_builtin_procedure(CheckerContext *c, Operand *operand, Ast *call, i32
}
break;
case BuiltinProc_type_struct_field_count:
operand->value = exact_value_i64(0);
if (operand->mode != Addressing_Type) {
error(operand->expr, "Expected a struct type for '%.*s'", LIT(builtin_name));
} else if (!is_type_struct(operand->type)) {
error(operand->expr, "Expected a struct type for '%.*s'", LIT(builtin_name));
} else {
Type *bt = base_type(operand->type);
operand->value = exact_value_i64(bt->Struct.fields.count);
}
operand->mode = Addressing_Constant;
operand->type = t_untyped_integer;
break;
case BuiltinProc_type_proc_parameter_count:
operand->value = exact_value_i64(0);
if (operand->mode != Addressing_Type) {

5
src/checker_builtin_procs.hpp
View File

@@ -171,6 +171,8 @@ BuiltinProc__type_simple_boolean_end,
BuiltinProc_type_is_specialization_of,
BuiltinProc_type_struct_field_count,
BuiltinProc_type_proc_parameter_count,
BuiltinProc_type_proc_return_count,
@@ -357,6 +359,9 @@ gb_global BuiltinProc builtin_procs[BuiltinProc_COUNT] = {
{STR_LIT("type_has_field"), 2, false, Expr_Expr, BuiltinProcPkg_intrinsics},
{STR_LIT("type_is_specialization_of"), 2, false, Expr_Expr, BuiltinProcPkg_intrinsics},
{STR_LIT("type_struct_field_count"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
{STR_LIT("type_proc_parameter_count"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},
{STR_LIT("type_proc_return_count"), 1, false, Expr_Expr, BuiltinProcPkg_intrinsics},

29
src/ir.cpp
View File

@@ -3932,22 +3932,39 @@ void ir_addr_store(irProcedure *proc, irAddr addr, irValue *value) {
Type *t = type_deref(ir_type(addr.addr));
t = base_type(t);
GB_ASSERT(t->kind == Type_Struct && t->Struct.soa_kind != StructSoa_None);
value = ir_emit_conv(proc, value, t->Struct.soa_elem);
Type *elem_type = t->Struct.soa_elem;
value = ir_emit_conv(proc, value, elem_type);
elem_type = base_type(elem_type);
irValue *index = addr.soa.index;
if (index->kind != irValue_Constant || t->Struct.soa_kind != StructSoa_Fixed) {
Type *t = base_type(type_deref(ir_type(addr.addr)));
GB_ASSERT(t->kind == Type_Struct && t->Struct.soa_kind != StructSoa_None);
i64 count = t->Struct.soa_count;
irValue *len = ir_const_int(count);
irValue *len = ir_soa_struct_len(proc, addr.addr);
ir_emit_bounds_check(proc, ast_token(addr.soa.index_expr), index, len);
}
for_array(i, t->Struct.fields) {
isize field_count = 0;
switch (elem_type->kind) {
case Type_Struct:
field_count = elem_type->Struct.fields.count;
break;
case Type_Array:
field_count = elem_type->Array.count;
break;
}
for (isize i = 0; i < field_count; i++) {
irValue *dst = ir_emit_struct_ep(proc, addr.addr, cast(i32)i);
dst = ir_emit_array_ep(proc, dst, index);
irValue *src = ir_emit_struct_ev(proc, value, cast(i32)i);
ir_emit_store(proc, dst, src);
if (t->Struct.soa_kind == StructSoa_Fixed) {
dst = ir_emit_array_ep(proc, dst, index);
ir_emit_store(proc, dst, src);
} else {
irValue *field = ir_emit_load(proc, dst);
dst = ir_emit_ptr_offset(proc, field, index);
ir_emit_store(proc, dst, src);
}
}
return;
}

29
src/llvm_backend.cpp
View File

@@ -406,22 +406,39 @@ void lb_addr_store(lbProcedure *p, lbAddr addr, lbValue value) {
Type *t = type_deref(addr.addr.type);
t = base_type(t);
GB_ASSERT(t->kind == Type_Struct && t->Struct.soa_kind != StructSoa_None);
value = lb_emit_conv(p, value, t->Struct.soa_elem);
Type *elem_type = t->Struct.soa_elem;
value = lb_emit_conv(p, value, elem_type);
elem_type = base_type(elem_type);
lbValue index = addr.soa.index;
if (!lb_is_const(index) || t->Struct.soa_kind != StructSoa_Fixed) {
Type *t = base_type(type_deref(addr.addr.type));
GB_ASSERT(t->kind == Type_Struct && t->Struct.soa_kind != StructSoa_None);
i64 count = t->Struct.soa_count;
lbValue len = lb_const_int(p->module, t_int, count);
lbValue len = lb_soa_struct_len(p, addr.addr);
lb_emit_bounds_check(p, ast_token(addr.soa.index_expr), index, len);
}
for_array(i, t->Struct.fields) {
isize field_count = 0;
switch (elem_type->kind) {
case Type_Struct:
field_count = elem_type->Struct.fields.count;
break;
case Type_Array:
field_count = elem_type->Array.count;
break;
}
for (isize i = 0; i < field_count; i++) {
lbValue dst = lb_emit_struct_ep(p, addr.addr, cast(i32)i);
dst = lb_emit_array_ep(p, dst, index);
lbValue src = lb_emit_struct_ev(p, value, cast(i32)i);
lb_emit_store(p, dst, src);
if (t->Struct.soa_kind == StructSoa_Fixed) {
dst = lb_emit_array_ep(p, dst, index);
lb_emit_store(p, dst, src);
} else {
lbValue field = lb_emit_load(p, dst);
dst = lb_emit_ptr_offset(p, field, index);
lb_emit_store(p, dst, src);
}
}
return;
}

3
src/types.cpp
View File

@@ -1865,6 +1865,9 @@ bool is_type_comparable(Type *t) {
if (type_size_of(t) == 0) {
return false;
}
if (t->Struct.soa_kind != StructSoa_None) {
return false;
}
if (t->Struct.is_raw_union) {
return is_type_simple_compare(t);
}