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

Set the target of string relocs to the string index.

Browse source
This commit is contained in:
Bill Currie 2011-03-04 21:29:10 +09:00
parent 7fb22bd1e4
commit bc78b84869
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tools/qfcc/source/dump_globals.c
View file

@ -302,9 +302,8 @@ qfo_relocs (qfo_t *qfo)
break; break;
case rel_def_string: case rel_def_string:
printf (" def@%d:%x string:%x `%s'", printf (" def@%d:%x string:%x `%s'",
reloc->space, reloc->offset, reloc->space, reloc->offset, reloc->target,
QFO_STRING (qfo, reloc->space, reloc->offset), QFO_GETSTR (qfo, reloc->target));
QFO_GSTRING (qfo, reloc->space, reloc->offset));
break; break;
case rel_def_field: case rel_def_field:
def = qfo->defs + reloc->target; def = qfo->defs + reloc->target;

10
tools/qfcc/source/obj_file.c
View file

@ -315,11 +315,17 @@ qfo_from_progs (pr_info_t *pr)
qfo->num_loose_relocs = qfo->num_relocs - (reloc - qfo->relocs); qfo->num_loose_relocs = qfo->num_relocs - (reloc - qfo->relocs);
for (r = pr->relocs; r; r = r->next) { for (r = pr->relocs; r; r = r->next) {
if (r->type == rel_def_op) if (r->type == rel_def_op) {
qfo_encode_one_reloc (r, &reloc, r->label->dest->offset); qfo_encode_one_reloc (r, &reloc, r->label->dest->offset);
else } else if (r->type == rel_def_string) {
def_t d;
d.space = r->space;
d.offset = r->offset;
qfo_encode_one_reloc (r, &reloc, D_STRING (&d));
} else {
qfo_encode_one_reloc (r, &reloc, 0); qfo_encode_one_reloc (r, &reloc, 0);
} }
}
return qfo; return qfo;
} }