MEM_VECTOR_INIT(self, functions);
MEM_VECTOR_INIT(self, globals);
MEM_VECTOR_INIT(self, fields);
+ MEM_VECTOR_INIT(self, filenames);
+ MEM_VECTOR_INIT(self, filestrings);
self->name = NULL;
if (!ir_builder_set_name(self, modulename)) {
mem_d(self);
return self;
}
-MEM_VEC_FUNCTIONS(ir_builder, ir_value*, globals)
-MEM_VEC_FUNCTIONS(ir_builder, ir_value*, fields)
+MEM_VEC_FUNCTIONS(ir_builder, ir_value*, globals)
+MEM_VEC_FUNCTIONS(ir_builder, ir_value*, fields)
MEM_VEC_FUNCTIONS(ir_builder, ir_function*, functions)
+MEM_VEC_FUNCTIONS(ir_builder, const char*, filenames)
+MEM_VEC_FUNCTIONS(ir_builder, qcint, filestrings)
void ir_builder_delete(ir_builder* self)
{
ir_value_delete(self->fields[i]);
}
MEM_VECTOR_CLEAR(self, fields);
+ MEM_VECTOR_CLEAR(self, filenames);
+ MEM_VECTOR_CLEAR(self, filestrings);
mem_d(self);
}
self->context.file = "<@no context>";
self->context.line = 0;
self->name = NULL;
- ir_value_set_name(self, name);
+ if (name && !ir_value_set_name(self, name)) {
+ irerror(self->context, "out of memory");
+ mem_d(self);
+ return NULL;
+ }
memset(&self->constval, 0, sizeof(self->constval));
memset(&self->code, 0, sizeof(self->code));
mem_d(self);
}
-void ir_value_set_name(ir_value *self, const char *name)
+bool ir_value_set_name(ir_value *self, const char *name)
{
if (self->name)
mem_d((void*)self->name);
self->name = util_strdup(name);
+ return !!self->name;
}
bool ir_value_set_float(ir_value *self, float f)
return true;
}
+static qcint ir_builder_filestring(ir_builder *ir, const char *filename)
+{
+ /* NOTE: filename pointers are copied, we never strdup them,
+ * thus we can use pointer-comparison to find the string.
+ */
+ size_t i;
+ qcint str;
+
+ for (i = 0; i < ir->filenames_count; ++i) {
+ if (ir->filenames[i] == filename)
+ return ir->filestrings[i];
+ }
+
+ str = code_genstring(filename);
+ if (!ir_builder_filenames_add(ir, filename))
+ return 0;
+ if (!ir_builder_filestrings_add(ir, str))
+ ir->filenames_count--;
+ return str;
+}
+
static bool gen_global_function(ir_builder *ir, ir_value *global)
{
prog_section_function fun;
irfun = global->constval.vfunc;
fun.name = global->code.name;
- fun.file = code_cachedstring(global->context.file);
+ fun.file = ir_builder_filestring(ir, global->context.file);
fun.profile = 0; /* always 0 */
fun.nargs = irfun->params_count;
case TYPE_STRING:
{
if (global->isconst)
- ir_value_code_setaddr(global, code_globals_add(code_cachedstring(global->constval.vstring)));
+ ir_value_code_setaddr(global, code_globals_add(code_genstring(global->constval.vstring)));
else {
ir_value_code_setaddr(global, code_globals_add(0));
if (!islocal)