qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-23 04:42:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

Correct non-external def processing.

Browse source
This commit is contained in:
Bill Currie 2011-03-04 14:33:03 +09:00
parent c5dac6d1d1
commit 7b7f4c70e0
1 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
tools/qfcc/source/linker.c
View file

@ -242,6 +242,10 @@ linker_add_string (const char *str)
static void
resolve_external_def (defref_t *ext, defref_t *def)
{
if (!(REF (ext)->flags & QFOD_EXTERNAL))
internal_error (0, "ext is not an external def");
if (!(REF (def)->flags & QFOD_GLOBAL))
internal_error (0, "def is not a global def");
if (REF (ext)->type != REF (def)->type) {
linker_type_mismatch (REF (ext), REF (def));
return;
@ -272,25 +276,27 @@ process_def (defref_t *ref, qfo_mspace_t *space)
} else {
Hash_Add (extern_defs, ref);
}
} else if (def->flags & QFOD_GLOBAL) {
if (r) {
if (REF (r)->flags & QFOD_SYSTEM) {
/// System defs may be redefined only once.
REF (r)->flags &= ~QFOD_SYSTEM;
// treat the new def as external
resolve_external_def (ref, r);
//FIXME copy stuff from new def to existing def???
} else {
def_error (def, "%s redefined", WORKSTR (def->name));
def_error (REF (r), "previous definition");
}
return;
}
Hash_Add (defined_defs, ref);
} else {
if (!(def->flags & QFOD_LOCAL))
def->offset += space->data_size;
while ((r = Hash_Del (extern_defs, name)))
resolve_external_def (r, ref);
if (def->flags & QFOD_GLOBAL) {
if (r) {
if (REF (r)->flags & QFOD_SYSTEM) {
/// System defs may be redefined only once.
REF (r)->flags &= ~QFOD_SYSTEM;
// treat the new def as external
resolve_external_def (ref, r);
//FIXME copy stuff from new def to existing def???
} else {
def_error (def, "%s redefined", WORKSTR (def->name));
def_error (REF (r), "previous definition");
}
return;
}
Hash_Add (defined_defs, ref);
while ((r = Hash_Del (extern_defs, name)))
resolve_external_def (r, ref);
}
}
}