qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-26 14:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[qfcc] Make things clearer about relocated types

Browse source 
I was very uncertain about the validity of messing with the old type
encoding that way, but adding the check to ensure the type has been
processed never fired, so it seems ok. And the comments help me a lot :)
This commit is contained in:
Bill Currie 2020-03-29 16:26:36 +09:00
parent 62b6e95746
commit c6d5ceab0e
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -495,8 +495,20 @@ add_defs (qfo_t *qfo, qfo_mspace_t *space, qfo_mspace_t *dest_space,
odef->file = linker_add_string (QFOSTR (qfo, idef->file)); odef->file = linker_add_string (QFOSTR (qfo, idef->file));
idef->file = -1; // mark def as copied idef->file = -1; // mark def as copied
idef->line = num_work_defrefs; // so def can be found idef->line = num_work_defrefs; // so def can be found
// In the first passs, process_type_def sets the type meta to -1 and
// class to the offset of the copied type, but the null type encodiing
// is not modified. Other defs are processed in the second pass.
type = QFOTYPE(idef->type); type = QFOTYPE(idef->type);
if (idef->type && (int) type->meta != -1) {
linker_internal_error ("reference to type that has not been "
"relocated");
}
// Type encodings have no type (type = 0) so setting the type
// to the idef type class has no effect.
odef->type = type->t.class; // pointer to type in work odef->type = type->t.class; // pointer to type in work
// don't add unused (no attached relocs) external defs to the work
// defref list so they will not cause unused object files to be
// pulled in from libraries
if (odef->flags & QFOD_EXTERNAL && !odef->num_relocs) if (odef->flags & QFOD_EXTERNAL && !odef->num_relocs)
continue; continue;
ref = get_defref (odef, dest_space); ref = get_defref (odef, dest_space);