qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Split the type processing into two passes. 

This allows all duplicate types to be "merged" before adding any new
types, thus avoiding any accidental duplication caused by possible
differences in order between defs and the type descriptors.
This commit is contained in:
Bill Currie 2011-03-01 08:46:02 +09:00
parent 05e6f00e72
commit eb11a19ed4
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/qfcc/source/linker.c
View File

@ -551,6 +551,7 @@ process_type (qfo_t *qfo, qfo_mspace_t *space)
type_space = &work->spaces[qfo_type_space]; type_space = &work->spaces[qfo_type_space];
size = (type_space->num_defs + space->num_defs) * sizeof (qfo_def_t); size = (type_space->num_defs + space->num_defs) * sizeof (qfo_def_t);
type_space->defs = realloc (type_space->defs, size); type_space->defs = realloc (type_space->defs, size);
// first pass: check for already defined types
for (i = 0, def = space->defs; i < space->num_defs; i++, def++) { for (i = 0, def = space->defs; i < space->num_defs; i++, def++) {
name = QFOSTR (qfo, def->name); name = QFOSTR (qfo, def->name);
type = (qfot_type_t *) (char *) &space->d.data[def->offset]; type = (qfot_type_t *) (char *) &space->d.data[def->offset];
@ -559,6 +560,13 @@ process_type (qfo_t *qfo, qfo_mspace_t *space)
type->t.class = REF (ref)->offset; type->t.class = REF (ref)->offset;
continue; continue;
} }
}
// second pass: transfer any new types
for (i = 0, def = space->defs; i < space->num_defs; i++, def++) {
name = QFOSTR (qfo, def->name);
type = (qfot_type_t *) (char *) &space->d.data[def->offset];
if (type->ty < 0)
continue;
offset = transfer_type (qfo, space, def->offset); offset = transfer_type (qfo, space, def->offset);
type_def = type_space->defs + type_space->num_defs++; type_def = type_space->defs + type_space->num_defs++;
memset (type_def, 0, sizeof (*type_def)); memset (type_def, 0, sizeof (*type_def));