X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fgmqcc.git;a=blobdiff_plain;f=ir.c;h=42999c53564770bb53e3910993b630d57568f7ae;hp=30817a07bbfea1bcaade0081a19319b1f5e3a0aa;hb=9c2e6a2334132a6c22a1cf48263bc3df420da22f;hpb=61d3a9d1a0d94406bd6ee215b18748d7ba9c83a8 diff --git a/ir.c b/ir.c index 30817a0..42999c5 100644 --- a/ir.c +++ b/ir.c @@ -25,6 +25,57 @@ #include "gmqcc.h" #include "ir.h" +/*********************************************************************** + * Type sizes used at multiple points in the IR codegen + */ + +size_t type_sizeof[TYPE_COUNT] = { + 1, /* TYPE_VOID */ + 1, /* TYPE_STRING */ + 1, /* TYPE_FLOAT */ + 3, /* TYPE_VECTOR */ + 1, /* TYPE_ENTITY */ + 1, /* TYPE_FIELD */ + 1, /* TYPE_FUNCTION */ + 1, /* TYPE_POINTER */ +#if 0 + 1, /* TYPE_INTEGER */ +#endif + 3, /* TYPE_VARIANT */ +}; + +uint16_t type_store_instr[TYPE_COUNT] = { + INSTR_STORE_F, /* should use I when having integer support */ + INSTR_STORE_S, + INSTR_STORE_F, + INSTR_STORE_V, + INSTR_STORE_ENT, + INSTR_STORE_FLD, + INSTR_STORE_FNC, + INSTR_STORE_ENT, /* should use I */ +#if 0 + INSTR_STORE_ENT, /* integer type */ +#endif + INSTR_STORE_V, /* variant, should never be accessed */ +}; + +uint16_t type_storep_instr[TYPE_COUNT] = { + INSTR_STOREP_F, /* should use I when having integer support */ + INSTR_STOREP_S, + INSTR_STOREP_F, + INSTR_STOREP_V, + INSTR_STOREP_ENT, + INSTR_STOREP_FLD, + INSTR_STOREP_FNC, + INSTR_STOREP_ENT, /* should use I */ +#if 0 + INSTR_STOREP_ENT, /* integer type */ +#endif + INSTR_STOREP_V, /* variant, should never be accessed */ +}; + +MEM_VEC_FUNCTIONS(ir_value_vector, ir_value*, v) + /*********************************************************************** *IR Builder */ @@ -39,6 +90,7 @@ ir_builder* ir_builder_new(const char *modulename) MEM_VECTOR_INIT(self, functions); MEM_VECTOR_INIT(self, globals); + MEM_VECTOR_INIT(self, fields); self->name = NULL; if (!ir_builder_set_name(self, modulename)) { mem_d(self); @@ -54,6 +106,7 @@ ir_builder* ir_builder_new(const char *modulename) } MEM_VEC_FUNCTIONS(ir_builder, ir_value*, globals) +MEM_VEC_FUNCTIONS(ir_builder, ir_value*, fields) MEM_VEC_FUNCTIONS(ir_builder, ir_function*, functions) void ir_builder_delete(ir_builder* self) @@ -67,7 +120,11 @@ void ir_builder_delete(ir_builder* self) for (i = 0; i != self->globals_count; ++i) { ir_value_delete(self->globals[i]); } - MEM_VECTOR_CLEAR(self, globals); + MEM_VECTOR_CLEAR(self, fields); + for (i = 0; i != self->fields_count; ++i) { + ir_value_delete(self->fields[i]); + } + MEM_VECTOR_CLEAR(self, fields); mem_d(self); } @@ -89,20 +146,32 @@ ir_function* ir_builder_get_function(ir_builder *self, const char *name) return NULL; } -ir_function* ir_builder_create_function(ir_builder *self, const char *name) +ir_function* ir_builder_create_function(ir_builder *self, const char *name, int outtype) { ir_function *fn = ir_builder_get_function(self, name); if (fn) { return NULL; } - fn = ir_function_new(self); + fn = ir_function_new(self, outtype); if (!ir_function_set_name(fn, name) || !ir_builder_functions_add(self, fn) ) { ir_function_delete(fn); return NULL; } + + fn->value = ir_builder_create_global(self, fn->name, TYPE_FUNCTION); + if (!fn->value) { + ir_function_delete(fn); + return NULL; + } + + fn->value->isconst = true; + fn->value->outtype = outtype; + fn->value->constval.vfunc = fn; + fn->value->context = fn->context; + return fn; } @@ -131,6 +200,33 @@ ir_value* ir_builder_create_global(ir_builder *self, const char *name, int vtype return ve; } +ir_value* ir_builder_get_field(ir_builder *self, const char *name) +{ + size_t i; + for (i = 0; i < self->fields_count; ++i) { + if (!strcmp(self->fields[i]->name, name)) + return self->fields[i]; + } + return NULL; +} + + +ir_value* ir_builder_create_field(ir_builder *self, const char *name, int vtype) +{ + ir_value *ve = ir_builder_get_field(self, name); + if (ve) { + return NULL; + } + + ve = ir_value_var(name, store_global, TYPE_FIELD); + ve->fieldtype = vtype; + if (!ir_builder_fields_add(self, ve)) { + ir_value_delete(ve); + return NULL; + } + return ve; +} + /*********************************************************************** *IR Function */ @@ -138,8 +234,9 @@ ir_value* ir_builder_create_global(ir_builder *self, const char *name, int vtype bool ir_function_naive_phi(ir_function*); void ir_function_enumerate(ir_function*); bool ir_function_calculate_liferanges(ir_function*); +bool ir_function_allocate_locals(ir_function*); -ir_function* ir_function_new(ir_builder* owner) +ir_function* ir_function_new(ir_builder* owner, int outtype) { ir_function *self; self = (ir_function*)mem_a(sizeof(*self)); @@ -155,7 +252,9 @@ ir_function* ir_function_new(ir_builder* owner) self->owner = owner; self->context.file = "<@no context>"; self->context.line = 0; - self->retype = TYPE_VOID; + self->outtype = outtype; + self->value = NULL; + self->builtin = 0; MEM_VECTOR_INIT(self, params); MEM_VECTOR_INIT(self, blocks); MEM_VECTOR_INIT(self, values); @@ -167,6 +266,7 @@ ir_function* ir_function_new(ir_builder* owner) MEM_VEC_FUNCTIONS(ir_function, ir_value*, values) MEM_VEC_FUNCTIONS(ir_function, ir_block*, blocks) MEM_VEC_FUNCTIONS(ir_function, ir_value*, locals) +MEM_VEC_FUNCTIONS(ir_function, int, params) bool ir_function_set_name(ir_function *self, const char *name) { @@ -195,6 +295,8 @@ void ir_function_delete(ir_function *self) ir_value_delete(self->locals[i]); MEM_VECTOR_CLEAR(self, locals); + /* self->value is deleted by the builder */ + mem_d(self); } @@ -216,6 +318,9 @@ ir_block* ir_function_create_block(ir_function *self, const char *label) bool ir_function_finalize(ir_function *self) { + if (self->builtin) + return true; + if (!ir_function_naive_phi(self)) return false; @@ -223,6 +328,9 @@ bool ir_function_finalize(ir_function *self) if (!ir_function_calculate_liferanges(self)) return false; + + if (!ir_function_allocate_locals(self)) + return false; return true; } @@ -236,14 +344,21 @@ ir_value* ir_function_get_local(ir_function *self, const char *name) return NULL; } -ir_value* ir_function_create_local(ir_function *self, const char *name, int vtype) +ir_value* ir_function_create_local(ir_function *self, const char *name, int vtype, bool param) { ir_value *ve = ir_function_get_local(self, name); if (ve) { return NULL; } - ve = ir_value_var(name, store_local, vtype); + if (param && + self->locals_count && + self->locals[self->locals_count-1]->store != store_param) { + printf("cannot add parameters after adding locals\n"); + return NULL; + } + + ve = ir_value_var(name, (param ? store_param : store_local), vtype); if (!ir_function_locals_add(self, ve)) { ir_value_delete(ve); return NULL; @@ -333,11 +448,13 @@ ir_instr* ir_instr_new(ir_block* owner, int op) self->bops[0] = NULL; self->bops[1] = NULL; MEM_VECTOR_INIT(self, phi); + MEM_VECTOR_INIT(self, params); self->eid = 0; return self; } MEM_VEC_FUNCTIONS(ir_instr, ir_phi_entry_t, phi) +MEM_VEC_FUNCTIONS(ir_instr, ir_value*, params) void ir_instr_delete(ir_instr *self) { @@ -351,14 +468,22 @@ void ir_instr_delete(ir_instr *self) for (i = 0; i < self->phi_count; ++i) { size_t idx; if (ir_value_writes_find(self->phi[i].value, self, &idx)) - if (ir_value_writes_remove(self->phi[i].value, idx)) GMQCC_SUPRESS_EMPTY_BODY; + if (ir_value_writes_remove(self->phi[i].value, idx)) GMQCC_SUPPRESS_EMPTY_BODY; if (ir_value_reads_find(self->phi[i].value, self, &idx)) - if (ir_value_reads_remove (self->phi[i].value, idx)) GMQCC_SUPRESS_EMPTY_BODY; + if (ir_value_reads_remove (self->phi[i].value, idx)) GMQCC_SUPPRESS_EMPTY_BODY; } MEM_VECTOR_CLEAR(self, phi); - if (ir_instr_op(self, 0, NULL, false)) GMQCC_SUPRESS_EMPTY_BODY; - if (ir_instr_op(self, 1, NULL, false)) GMQCC_SUPRESS_EMPTY_BODY; - if (ir_instr_op(self, 2, NULL, false)) GMQCC_SUPRESS_EMPTY_BODY; + for (i = 0; i < self->params_count; ++i) { + size_t idx; + if (ir_value_writes_find(self->params[i], self, &idx)) + if (ir_value_writes_remove(self->params[i], idx)) GMQCC_SUPPRESS_EMPTY_BODY; + if (ir_value_reads_find(self->params[i], self, &idx)) + if (ir_value_reads_remove (self->params[i], idx)) GMQCC_SUPPRESS_EMPTY_BODY; + } + MEM_VECTOR_CLEAR(self, params); + if (ir_instr_op(self, 0, NULL, false)) GMQCC_SUPPRESS_EMPTY_BODY; + if (ir_instr_op(self, 1, NULL, false)) GMQCC_SUPPRESS_EMPTY_BODY; + if (ir_instr_op(self, 2, NULL, false)) GMQCC_SUPPRESS_EMPTY_BODY; mem_d(self); } @@ -394,12 +519,18 @@ bool ir_instr_op(ir_instr *self, int op, ir_value *v, bool writing) *IR Value */ +int32_t ir_value_code_addr(const ir_value *self) +{ + return self->code.globaladdr + self->code.addroffset; +} + ir_value* ir_value_var(const char *name, int storetype, int vtype) { ir_value *self; self = (ir_value*)mem_a(sizeof(*self)); self->vtype = vtype; self->fieldtype = TYPE_VOID; + self->outtype = TYPE_VOID; self->store = storetype; MEM_VECTOR_INIT(self, reads); MEM_VECTOR_INIT(self, writes); @@ -415,6 +546,27 @@ ir_value* ir_value_var(const char *name, int storetype, int vtype) MEM_VECTOR_INIT(self, life); return self; } + +ir_value* ir_value_vector_member(ir_value *self, unsigned int member) +{ + ir_value *m; + if (member >= 3) + return NULL; + + if (self->members[member]) + return self->members[member]; + + m = ir_value_var(self->name, self->store, TYPE_FLOAT); + if (!m) + return NULL; + m->context = self->context; + + self->members[member] = m; + m->code.addroffset = member; + + return m; +} + MEM_VEC_FUNCTIONS(ir_value, ir_life_entry_t, life) MEM_VEC_FUNCTIONS_ALL(ir_value, ir_instr*, reads) MEM_VEC_FUNCTIONS_ALL(ir_value, ir_instr*, writes) @@ -434,12 +586,18 @@ ir_value* ir_value_out(ir_function *owner, const char *name, int storetype, int void ir_value_delete(ir_value* self) { - mem_d((void*)self->name); + size_t i; + if (self->name) + mem_d((void*)self->name); if (self->isconst) { if (self->vtype == TYPE_STRING) mem_d((void*)self->constval.vstring); } + for (i = 0; i < 3; ++i) { + if (self->members[i]) + ir_value_delete(self->members[i]); + } MEM_VECTOR_CLEAR(self, reads); MEM_VECTOR_CLEAR(self, writes); MEM_VECTOR_CLEAR(self, life); @@ -462,6 +620,15 @@ bool ir_value_set_float(ir_value *self, float f) return true; } +bool ir_value_set_func(ir_value *self, int f) +{ + if (self->vtype != TYPE_FUNCTION) + return false; + self->constval.vint = f; + self->isconst = true; + return true; +} + bool ir_value_set_vector(ir_value *self, vector v) { if (self->vtype != TYPE_VECTOR) @@ -580,7 +747,84 @@ bool ir_value_life_merge(ir_value *self, size_t s) return ir_value_life_insert(self, i, new_entry); } -bool ir_values_overlap(ir_value *a, ir_value *b) +bool ir_value_life_merge_into(ir_value *self, const ir_value *other) +{ + size_t i, myi; + + if (!other->life_count) + return true; + + if (!self->life_count) { + for (i = 0; i < other->life_count; ++i) { + if (!ir_value_life_add(self, other->life[i])) + return false; + } + return true; + } + + myi = 0; + for (i = 0; i < other->life_count; ++i) + { + const ir_life_entry_t *life = &other->life[i]; + while (true) + { + ir_life_entry_t *entry = &self->life[myi]; + + if (life->end+1 < entry->start) + { + /* adding an interval before entry */ + if (!ir_value_life_insert(self, myi, *life)) + return false; + ++myi; + break; + } + + if (life->start < entry->start && + life->end >= entry->start) + { + /* starts earlier and overlaps */ + entry->start = life->start; + } + + if (life->end > entry->end && + life->start-1 <= entry->end) + { + /* ends later and overlaps */ + entry->end = life->end; + } + + /* see if our change combines it with the next ranges */ + while (myi+1 < self->life_count && + entry->end+1 >= self->life[1+myi].start) + { + /* overlaps with (myi+1) */ + if (entry->end < self->life[1+myi].end) + entry->end = self->life[1+myi].end; + if (!ir_value_life_remove(self, myi+1)) + return false; + entry = &self->life[myi]; + } + + /* see if we're after the entry */ + if (life->start > entry->end) + { + ++myi; + /* append if we're at the end */ + if (myi >= self->life_count) { + if (!ir_value_life_add(self, *life)) + return false; + break; + } + /* otherweise check the next range */ + continue; + } + break; + } + } + return true; +} + +bool ir_values_overlap(const ir_value *a, const ir_value *b) { /* For any life entry in A see if it overlaps with * any life entry in B. @@ -619,7 +863,7 @@ bool ir_values_overlap(ir_value *a, ir_value *b) * one entry is earlier than the other * that earlier entry will be moved forward */ - if (la->end < lb->end) + if (la->start < lb->start) { /* order: A B, move A forward * check if we hit the end with A @@ -627,7 +871,7 @@ bool ir_values_overlap(ir_value *a, ir_value *b) if (++la == enda) break; } - else if (lb->end < la->end) + else if (lb->start < la->start) { /* order: B A, move B forward * check if we hit the end with B @@ -672,46 +916,14 @@ bool ir_block_create_store(ir_block *self, ir_value *target, ir_value *what) else vtype = target->vtype; - switch (vtype) { - case TYPE_FLOAT: #if 0 - if (what->vtype == TYPE_INTEGER) - op = INSTR_CONV_ITOF; - else + if (vtype == TYPE_FLOAT && what->vtype == TYPE_INTEGER) + op = INSTR_CONV_ITOF; + else if (vtype == TYPE_INTEGER && what->vtype == TYPE_FLOAT) + op = INSTR_CONV_FTOI; #endif - op = INSTR_STORE_F; - break; - case TYPE_VECTOR: - op = INSTR_STORE_V; - break; - case TYPE_ENTITY: - op = INSTR_STORE_ENT; - break; - case TYPE_STRING: - op = INSTR_STORE_S; - break; - case TYPE_FIELD: - op = INSTR_STORE_FLD; - break; -#if 0 - case TYPE_INTEGER: - if (what->vtype == TYPE_INTEGER) - op = INSTR_CONV_FTOI; - else - op = INSTR_STORE_I; - break; -#endif - case TYPE_POINTER: -#if 0 - op = INSTR_STORE_I; -#else - op = INSTR_STORE_ENT; -#endif - break; - default: - /* Unknown type */ - return false; - } + op = type_store_instr[vtype]; + return ir_block_create_store_op(self, op, target, what); } @@ -728,38 +940,8 @@ bool ir_block_create_storep(ir_block *self, ir_value *target, ir_value *what) */ vtype = what->vtype; - switch (vtype) { - case TYPE_FLOAT: - op = INSTR_STOREP_F; - break; - case TYPE_VECTOR: - op = INSTR_STOREP_V; - break; - case TYPE_ENTITY: - op = INSTR_STOREP_ENT; - break; - case TYPE_STRING: - op = INSTR_STOREP_S; - break; - case TYPE_FIELD: - op = INSTR_STOREP_FLD; - break; -#if 0 - case TYPE_INTEGER: - op = INSTR_STOREP_I; - break; -#endif - case TYPE_POINTER: -#if 0 - op = INSTR_STOREP_I; -#else - op = INSTR_STOREP_ENT; -#endif - break; - default: - /* Unknown type */ - return false; - } + op = type_storep_instr[vtype]; + return ir_block_create_store_op(self, op, target, what); } @@ -916,6 +1098,47 @@ bool ir_phi_add(ir_instr* self, ir_block *b, ir_value *v) return ir_instr_phi_add(self, pe); } +/* call related code */ +ir_instr* ir_block_create_call(ir_block *self, const char *label, ir_value *func) +{ + ir_value *out; + ir_instr *in; + in = ir_instr_new(self, INSTR_CALL0); + if (!in) + return NULL; + out = ir_value_out(self->owner, label, store_return, func->outtype); + if (!out) { + ir_instr_delete(in); + return NULL; + } + if (!ir_instr_op(in, 0, out, true) || + !ir_instr_op(in, 1, func, false) || + !ir_block_instr_add(self, in)) + { + ir_instr_delete(in); + ir_value_delete(out); + return NULL; + } + return in; +} + +ir_value* ir_call_value(ir_instr *self) +{ + return self->_ops[0]; +} + +bool ir_call_param(ir_instr* self, ir_value *v) +{ + if (!ir_instr_params_add(self, v)) + return false; + if (!ir_value_reads_add(v, self)) { + if (!ir_instr_params_remove(self, self->params_count-1)) + GMQCC_SUPPRESS_EMPTY_BODY; + return false; + } + return true; +} + /* binary op related code */ ir_value* ir_block_create_binop(ir_block *self, @@ -1010,6 +1233,39 @@ ir_value* ir_block_create_binop(ir_block *self, return ir_block_create_general_instr(self, label, opcode, left, right, ot); } +ir_value* ir_block_create_unary(ir_block *self, + const char *label, int opcode, + ir_value *operand) +{ + int ot = TYPE_FLOAT; + switch (opcode) { + case INSTR_NOT_F: + case INSTR_NOT_V: + case INSTR_NOT_S: + case INSTR_NOT_ENT: + case INSTR_NOT_FNC: +#if 0 + case INSTR_NOT_I: +#endif + ot = TYPE_FLOAT; + break; + /* QC doesn't have other unary operations. We expect extensions to fill + * the above list, otherwise we assume out-type = in-type, eg for an + * unary minus + */ + default: + ot = operand->vtype; + break; + }; + if (ot == TYPE_VOID) { + /* The AST or parser were supposed to check this! */ + return NULL; + } + + /* let's use the general instruction creator and pass NULL for OPB */ + return ir_block_create_general_instr(self, label, opcode, operand, NULL, ot); +} + ir_value* ir_block_create_general_instr(ir_block *self, const char *label, int op, ir_value *a, ir_value *b, int outype) { @@ -1045,6 +1301,8 @@ on_error: ir_value* ir_block_create_fieldaddress(ir_block *self, const char *label, ir_value *ent, ir_value *field) { + ir_value *v; + /* Support for various pointer types todo if so desired */ if (ent->vtype != TYPE_ENTITY) return NULL; @@ -1052,7 +1310,9 @@ ir_value* ir_block_create_fieldaddress(ir_block *self, const char *label, ir_val if (field->vtype != TYPE_FIELD) return NULL; - return ir_block_create_general_instr(self, label, INSTR_ADDRESS, ent, field, TYPE_POINTER); + v = ir_block_create_general_instr(self, label, INSTR_ADDRESS, ent, field, TYPE_POINTER); + v->fieldtype = field->fieldtype; + return v; } ir_value* ir_block_create_load_from_ent(ir_block *self, const char *label, ir_value *ent, ir_value *field, int outype) @@ -1305,7 +1565,7 @@ static bool ir_block_naive_phi(ir_block *self) if (v->writes[w]->_ops[0] == v) v->writes[w]->_ops[0] = instr->_ops[0]; - if (old->store != store_value && old->store != store_local) + if (old->store != store_value && old->store != store_local && old->store != store_param) { /* If it originally wrote to a global we need to store the value * there as welli @@ -1414,6 +1674,135 @@ bool ir_function_calculate_liferanges(ir_function *self) return true; } +/* Local-value allocator + * After finishing creating the liferange of all values used in a function + * we can allocate their global-positions. + * This is the counterpart to register-allocation in register machines. + */ +typedef struct { + MEM_VECTOR_MAKE(ir_value*, locals); + MEM_VECTOR_MAKE(size_t, sizes); + MEM_VECTOR_MAKE(size_t, positions); +} function_allocator; +MEM_VEC_FUNCTIONS(function_allocator, ir_value*, locals) +MEM_VEC_FUNCTIONS(function_allocator, size_t, sizes) +MEM_VEC_FUNCTIONS(function_allocator, size_t, positions) + +static bool function_allocator_alloc(function_allocator *alloc, const ir_value *var) +{ + ir_value *slot; + size_t vsize = type_sizeof[var->vtype]; + + slot = ir_value_var("reg", store_global, var->vtype); + if (!slot) + return false; + + if (!ir_value_life_merge_into(slot, var)) + goto localerror; + + if (!function_allocator_locals_add(alloc, slot)) + goto localerror; + + if (!function_allocator_sizes_add(alloc, vsize)) + goto localerror; + + return true; + +localerror: + ir_value_delete(slot); + return false; +} + +bool ir_function_allocate_locals(ir_function *self) +{ + size_t i, a; + bool retval = true; + size_t pos; + + ir_value *slot; + const ir_value *v; + + function_allocator alloc; + + if (!self->locals_count) + return true; + + MEM_VECTOR_INIT(&alloc, locals); + MEM_VECTOR_INIT(&alloc, sizes); + MEM_VECTOR_INIT(&alloc, positions); + + for (i = 0; i < self->locals_count; ++i) + { + if (!function_allocator_alloc(&alloc, self->locals[i])) + goto error; + } + + /* Allocate a slot for any value that still exists */ + for (i = 0; i < self->values_count; ++i) + { + v = self->values[i]; + + if (!v->life_count) + continue; + + for (a = 0; a < alloc.locals_count; ++a) + { + slot = alloc.locals[a]; + + if (ir_values_overlap(v, slot)) + continue; + + if (!ir_value_life_merge_into(slot, v)) + goto error; + + /* adjust size for this slot */ + if (alloc.sizes[a] < type_sizeof[v->vtype]) + alloc.sizes[a] = type_sizeof[v->vtype]; + + self->values[i]->code.local = a; + break; + } + if (a >= alloc.locals_count) { + self->values[i]->code.local = alloc.locals_count; + if (!function_allocator_alloc(&alloc, v)) + goto error; + } + } + + /* Adjust slot positions based on sizes */ + if (!function_allocator_positions_add(&alloc, 0)) + goto error; + + if (alloc.sizes_count) + pos = alloc.positions[0] + alloc.sizes[0]; + else + pos = 0; + for (i = 1; i < alloc.sizes_count; ++i) + { + pos = alloc.positions[i-1] + alloc.sizes[i-1]; + if (!function_allocator_positions_add(&alloc, pos)) + goto error; + } + + self->allocated_locals = pos + alloc.sizes[alloc.sizes_count-1]; + + /* Take over the actual slot positions */ + for (i = 0; i < self->values_count; ++i) + self->values[i]->code.local = alloc.positions[self->values[i]->code.local]; + + goto cleanup; + +error: + retval = false; +cleanup: + for (i = 0; i < alloc.locals_count; ++i) + ir_value_delete(alloc.locals[i]); + MEM_VECTOR_CLEAR(&alloc, locals); + MEM_VECTOR_CLEAR(&alloc, sizes); + MEM_VECTOR_CLEAR(&alloc, positions); + return retval; +} + /* Get information about which operand * is read from, or written to. */ @@ -1556,8 +1945,11 @@ static bool ir_block_life_propagate(ir_block *self, ir_block *prev, bool *change value = instr->_ops[o]; /* We only care about locals */ + /* we also calculate parameter liferanges so that locals + * can take up parameter slots */ if (value->store != store_value && - value->store != store_local) + value->store != store_local && + value->store != store_param) continue; /* read operands */ @@ -1722,21 +2114,7 @@ static bool gen_global_field(ir_value *global) } else { - prog_section_field fld; - - fld.name = global->code.name; - fld.offset = code_fields_elements; - fld.type = global->fieldtype; - - if (fld.type == TYPE_VOID) { - printf("Field is missing a type: %s\n", global->name); - return false; - } - - if (code_fields_add(fld) < 0) - return false; - - global->code.globaladdr = code_globals_add(fld.offset); + global->code.globaladdr = code_globals_add(0); } if (global->code.globaladdr < 0) return false; @@ -1783,7 +2161,6 @@ static bool gen_global_pointer(ir_value *global) static bool gen_blocks_recursive(ir_function *func, ir_block *block) { prog_section_statement stmt; - prog_section_statement *stptr; ir_instr *instr; ir_block *target; ir_block *ontrue; @@ -1815,7 +2192,7 @@ tailcall: /* otherwise we generate a jump instruction */ stmt.opcode = INSTR_GOTO; - stmt.o1.s1 = (target->code_start-1) - code_statements_elements; + stmt.o1.s1 = (target->code_start) - code_statements_elements; stmt.o2.s1 = 0; stmt.o3.s1 = 0; if (code_statements_add(stmt) < 0) @@ -1832,9 +2209,10 @@ tailcall: * come first: eg. optimize IFs without ELSE... */ - stmt.o1.s1 = instr->_ops[0]->code.globaladdr; - + stmt.o1.u1 = ir_value_code_addr(instr->_ops[0]); + stmt.o2.u1 = 0; stmt.o3.s1 = 0; + if (ontrue->generated) { stmt.opcode = INSTR_IF; stmt.o2.s1 = (ontrue->code_start-1) - code_statements_elements; @@ -1861,22 +2239,23 @@ tailcall: } /* neither ontrue nor onfalse exist */ stmt.opcode = INSTR_IFNOT; - stidx = code_statements_elements - 1; + stidx = code_statements_elements; if (code_statements_add(stmt) < 0) return false; - stptr = &code_statements_data[stidx]; /* on false we jump, so add ontrue-path */ if (!gen_blocks_recursive(func, ontrue)) return false; /* fixup the jump address */ - stptr->o2.s1 = (ontrue->code_start-1) - (stidx+1); + code_statements_data[stidx].o2.s1 = code_statements_elements - stidx; /* generate onfalse path */ if (onfalse->generated) { + /* fixup the jump address */ + code_statements_data[stidx].o2.s1 = (onfalse->code_start) - (stidx); /* may have been generated in the previous recursive call */ stmt.opcode = INSTR_GOTO; + stmt.o1.s1 = (onfalse->code_start) - code_statements_elements; stmt.o2.s1 = 0; stmt.o3.s1 = 0; - stmt.o1.s1 = (onfalse->code_start-1) - code_statements_elements; return (code_statements_add(stmt) >= 0); } /* if not, generate now */ @@ -1885,8 +2264,56 @@ tailcall: } if (instr->opcode >= INSTR_CALL0 && instr->opcode <= INSTR_CALL8) { - printf("TODO: call instruction\n"); - return false; + /* Trivial call translation: + * copy all params to OFS_PARM* + * if the output's storetype is not store_return, + * add append a STORE instruction! + * + * NOTES on how to do it better without much trouble: + * -) The liferanges! + * Simply check the liferange of all parameters for + * other CALLs. For each param with no CALL in its + * liferange, we can store it in an OFS_PARM at + * generation already. This would even include later + * reuse.... probably... :) + */ + size_t p; + ir_value *retvalue; + + for (p = 0; p < instr->params_count; ++p) + { + ir_value *param = instr->params[p]; + + stmt.opcode = INSTR_STORE_F; + stmt.o3.u1 = 0; + + stmt.opcode = type_store_instr[param->vtype]; + stmt.o1.u1 = ir_value_code_addr(param); + stmt.o2.u1 = OFS_PARM0 + 3 * p; + if (code_statements_add(stmt) < 0) + return false; + } + stmt.opcode = INSTR_CALL0 + instr->params_count; + if (stmt.opcode > INSTR_CALL8) + stmt.opcode = INSTR_CALL8; + stmt.o1.u1 = ir_value_code_addr(instr->_ops[1]); + stmt.o2.u1 = 0; + stmt.o3.u1 = 0; + if (code_statements_add(stmt) < 0) + return false; + + retvalue = instr->_ops[0]; + if (retvalue && retvalue->store != store_return && retvalue->life_count) + { + /* not to be kept in OFS_RETURN */ + stmt.opcode = type_store_instr[retvalue->vtype]; + stmt.o1.u1 = OFS_RETURN; + stmt.o2.u1 = ir_value_code_addr(retvalue); + stmt.o3.u1 = 0; + if (code_statements_add(stmt) < 0) + return false; + } + continue; } if (instr->opcode == INSTR_STATE) { @@ -1901,19 +2328,26 @@ tailcall: /* This is the general order of operands */ if (instr->_ops[0]) - stmt.o3.u1 = instr->_ops[0]->code.globaladdr; + stmt.o3.u1 = ir_value_code_addr(instr->_ops[0]); if (instr->_ops[1]) - stmt.o1.u1 = instr->_ops[1]->code.globaladdr; + stmt.o1.u1 = ir_value_code_addr(instr->_ops[1]); if (instr->_ops[2]) - stmt.o2.u1 = instr->_ops[2]->code.globaladdr; + stmt.o2.u1 = ir_value_code_addr(instr->_ops[2]); - if (stmt.opcode == INSTR_RETURN) + if (stmt.opcode == INSTR_RETURN || stmt.opcode == INSTR_DONE) { stmt.o1.u1 = stmt.o3.u1; stmt.o3.u1 = 0; } + else if (stmt.opcode >= INSTR_STORE_F && + stmt.opcode <= INSTR_STORE_FNC) + { + /* 2-operand instructions with A -> B */ + stmt.o2.u1 = stmt.o3.u1; + stmt.o3.u1 = 0; + } if (code_statements_add(stmt) < 0) return false; @@ -1924,6 +2358,7 @@ tailcall: static bool gen_function_code(ir_function *self) { ir_block *block; + prog_section_statement stmt; /* Starting from entry point, we generate blocks "as they come" * for now. Dead blocks will not be translated obviously. @@ -1937,7 +2372,17 @@ static bool gen_function_code(ir_function *self) if (block->generated) return true; - if (!gen_blocks_recursive(self, block)) + if (!gen_blocks_recursive(self, block)) { + printf("failed to generate blocks for '%s'\n", self->name); + return false; + } + + /* otherwise code_write crashes since it debug-prints functions until AINSTR_END */ + stmt.opcode = AINSTR_END; + stmt.o1.u1 = 0; + stmt.o2.u1 = 0; + stmt.o3.u1 = 0; + if (code_statements_add(stmt) < 0) return false; return true; } @@ -1948,9 +2393,9 @@ static bool gen_global_function(ir_builder *ir, ir_value *global) ir_function *irfun; size_t i; + size_t local_var_end; - if (!global->isconst || - !global->constval.vfunc) + if (!global->isconst || (!global->constval.vfunc)) { printf("Invalid state of function-global: not constant: %s\n", global->name); return false; @@ -1966,32 +2411,56 @@ static bool gen_global_function(ir_builder *ir, ir_value *global) for (i = 0;i < 8; ++i) { if (i >= fun.nargs) fun.argsize[i] = 0; - else if (irfun->params[i] == TYPE_VECTOR) - fun.argsize[i] = 3; else - fun.argsize[i] = 1; + fun.argsize[i] = type_sizeof[irfun->params[i]]; } - fun.locals = irfun->locals_count; fun.firstlocal = code_globals_elements; + fun.locals = irfun->allocated_locals + irfun->locals_count; + + local_var_end = 0; for (i = 0; i < irfun->locals_count; ++i) { - if (!ir_builder_gen_global(ir, irfun->locals[i])) + if (!ir_builder_gen_global(ir, irfun->locals[i])) { + printf("Failed to generate global %s\n", irfun->locals[i]->name); return false; + } + } + if (irfun->locals_count) { + ir_value *last = irfun->locals[irfun->locals_count-1]; + local_var_end = last->code.globaladdr; + local_var_end += type_sizeof[last->vtype]; + } + for (i = 0; i < irfun->values_count; ++i) + { + /* generate code.globaladdr for ssa values */ + ir_value *v = irfun->values[i]; + v->code.globaladdr = local_var_end + v->code.local; + } + for (i = 0; i < irfun->locals_count; ++i) { + /* fill the locals with zeros */ + code_globals_add(0); } - fun.entry = code_statements_elements; - if (!gen_function_code(irfun)) - return false; + if (irfun->builtin) + fun.entry = irfun->builtin; + else { + fun.entry = code_statements_elements; + if (!gen_function_code(irfun)) { + printf("Failed to generate code for function %s\n", irfun->name); + return false; + } + } return (code_functions_add(fun) >= 0); } static bool ir_builder_gen_global(ir_builder *self, ir_value *global) { + size_t i; int32_t *iptr; prog_section_def def; - def.type = global->vtype; + def.type = global->vtype; def.offset = code_globals_elements; def.name = global->code.name = code_genstring(global->name); @@ -2006,8 +2475,7 @@ static bool ir_builder_gen_global(ir_builder *self, ir_value *global) return false; return gen_global_field(global); case TYPE_ENTITY: - if (code_defs_add(def) < 0) - return false; + /* fall through */ case TYPE_FLOAT: { if (code_defs_add(def) < 0) @@ -2033,25 +2501,44 @@ static bool ir_builder_gen_global(ir_builder *self, ir_value *global) } case TYPE_VECTOR: { + size_t d; if (code_defs_add(def) < 0) return false; if (global->isconst) { iptr = (int32_t*)&global->constval.vvec; global->code.globaladdr = code_globals_add(iptr[0]); - if (code_globals_add(iptr[1]) < 0 || code_globals_add(iptr[2]) < 0) + if (global->code.globaladdr < 0) return false; + for (d = 1; d < type_sizeof[global->vtype]; ++d) + { + if (code_globals_add(iptr[d]) < 0) + return false; + } } else { global->code.globaladdr = code_globals_add(0); - if (code_globals_add(0) < 0 || code_globals_add(0) < 0) + if (global->code.globaladdr < 0) return false; + for (d = 1; d < type_sizeof[global->vtype]; ++d) + { + if (code_globals_add(0) < 0) + return false; + } } return global->code.globaladdr >= 0; } case TYPE_FUNCTION: if (code_defs_add(def) < 0) return false; + global->code.globaladdr = code_globals_elements; + code_globals_add(code_functions_elements); return gen_global_function(self, global); + case TYPE_VARIANT: + /* assume biggest type */ + global->code.globaladdr = code_globals_add(0); + for (i = 1; i < type_sizeof[TYPE_VARIANT]; ++i) + code_globals_add(0); + return true; default: /* refuse to create 'void' type or any other fancy business. */ printf("Invalid type for global variable %s\n", global->name); @@ -2059,24 +2546,59 @@ static bool ir_builder_gen_global(ir_builder *self, ir_value *global) } } +static bool ir_builder_gen_field(ir_builder *self, ir_value *field) +{ + prog_section_def def; + prog_section_field fld; + + def.type = field->vtype; + def.offset = code_globals_elements; + def.name = field->code.name = code_genstring(field->name); + + if (code_defs_add(def) < 0) + return false; + + fld.name = def.name; + fld.offset = code_fields_elements; + fld.type = field->fieldtype; + + if (fld.type == TYPE_VOID) { + printf("field is missing a type: %s - don't know its size\n", field->name); + return false; + } + + if (code_fields_add(fld) < 0) + return false; + + if (!code_globals_add(code_alloc_field(type_sizeof[field->fieldtype]))) + return false; + + field->code.globaladdr = code_globals_add(fld.offset); + return field->code.globaladdr >= 0; +} + bool ir_builder_generate(ir_builder *self, const char *filename) { size_t i; code_init(); - /* FIXME: generate TYPE_FUNCTION globals and link them - * to their ir_function. - */ + for (i = 0; i < self->fields_count; ++i) + { + if (!ir_builder_gen_field(self, self->fields[i])) { + return false; + } + } for (i = 0; i < self->globals_count; ++i) { - if (!ir_builder_gen_global(self, self->globals[i])) + if (!ir_builder_gen_global(self, self->globals[i])) { return false; + } } - code_write(filename); - return false; + printf("writing '%s'...\n", filename); + return code_write(filename); } /*********************************************************************** @@ -2123,6 +2645,10 @@ void ir_function_dump(ir_function *f, char *ind, int (*oprintf)(const char*, ...)) { size_t i; + if (f->builtin != 0) { + oprintf("%sfunction %s = builtin %i\n", ind, f->name, -f->builtin); + return; + } oprintf("%sfunction %s\n", ind, f->name); strncat(ind, "\t", IND_BUFSZ); if (f->locals_count)