qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-17 01:11:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

[qfcc] Do full type encoding relocation early

Browse source 
Because type aliases need to be unaliased, the type pointers in the type
encodings need to be correct when it comes to linking defs and
functions. This fixes the linking errors in ruamoko/game.
This commit is contained in:
Bill Currie 2020-03-29 18:19:36 +09:00
parent 188a1ea105
commit d4de1d7418
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -872,6 +872,20 @@ process_type_space (qfo_t *qfo, qfo_mspace_t *space, int pass)
string_t str;
str = linker_add_string (QFOSTR (qfo, reloc->target));
QFO_STRING (work, reloc->space, reloc->offset) = str;
} else if (reloc->type == rel_def_def || reloc->type == -1) {
qfo_def_t *def;
if (reloc->type == -1) {
// The reloc has been copied, and the record number of the new
// reloc is in the old reloc's offset.
reloc = work->relocs + reloc->offset;
}
if (reloc->target >= work->spaces[reloc->space].num_defs) {
linker_error ("Invalid reloc target def %d / %d.\n",
reloc->target, qfo->num_defs);
continue;
}
def = work->spaces[reloc->space].defs + reloc->target;
QFO_INT (work, reloc->space, reloc->offset) = def->offset;
}
}
for (i = 0; i < num_builtins; i++) {
@ -1316,22 +1330,6 @@ build_qfo (void)
reloc++;
}
}
for (i = 0; i < qfo->num_relocs; i++) {
qfo_def_t *def;
reloc = qfo->relocs + i;
if (reloc->space != qfo_type_space)
continue;
if (reloc->type != rel_def_def)
continue;
if (reloc->target >= qfo->num_defs) {
linker_error ("Invalid reloc target def %d / %d.\n",
reloc->target, qfo->num_defs);
continue;
}
def = qfo->defs + reloc->target;
QFO_INT (qfo, reloc->space, reloc->offset) = def->offset;
}
return qfo;
}