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

Make add_defs take a function to process the defs.

Browse source 
For now, no other change has been made, but I'll be able to split up
process_def for data def vs field def processing and add a function for
processing type encoding defs.
This commit is contained in:
Bill Currie 2012-11-13 12:40:40 +09:00
parent 93b007b1f8
commit ba6fb5802d
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -359,7 +359,8 @@ add_relocs (qfo_t *qfo, int start, int count, int target)
}
static int
add_defs (qfo_t *qfo, qfo_mspace_t *space, qfo_mspace_t *dest_space, int field)
add_defs (qfo_t *qfo, qfo_mspace_t *space, qfo_mspace_t *dest_space, int field,
void (*process) (defref_t *ref, qfo_mspace_t *space, int field))
{
int count = space->num_defs;
int size;
@ -386,7 +387,7 @@ add_defs (qfo_t *qfo, qfo_mspace_t *space, qfo_mspace_t *dest_space, int field)
continue;
ref = get_defref (odef, dest_space);
work_defrefs[num_work_defrefs++] = ref;
process_def (ref, dest_space, field);
process (ref, dest_space, field);
odef->relocs = add_relocs (qfo, odef->relocs, odef->num_relocs,
odef - dest_space->defs);
}
@ -457,7 +458,7 @@ add_space (qfo_t *qfo, qfo_mspace_t *space)
memset (ws, 0, sizeof (qfo_mspace_t));
ws->type = space->type;
if (space->num_defs)
add_defs (qfo, space, ws, 0);
add_defs (qfo, space, ws, 0, process_def);
if (space->d.data) {
int size = space->data_size * sizeof (pr_type_t);
ws->d.data = malloc (size);
@ -683,10 +684,12 @@ process_data_space (qfo_t *qfo, qfo_mspace_t *space, int pass)
if (pass != 1)
return 0;
if (space->id == qfo_near_data_space) {
add_defs (qfo, space, work->spaces + qfo_near_data_space, 0);
add_defs (qfo, space, work->spaces + qfo_near_data_space, 0,
process_def);
add_data (qfo_near_data_space, space);
} else if (space->id == qfo_far_data_space) {
add_defs (qfo, space, work->spaces + qfo_far_data_space, 0);
add_defs (qfo, space, work->spaces + qfo_far_data_space, 0,
process_def);
add_data (qfo_far_data_space, space);
} else {
add_space (qfo, space);
@ -712,7 +715,7 @@ process_entity_space (qfo_t *qfo, qfo_mspace_t *space, int pass)
{
if (pass != 1)
return 0;
add_defs (qfo, space, work->spaces + qfo_entity_space, 1);
add_defs (qfo, space, work->spaces + qfo_entity_space, 1, process_def);
add_data (qfo_entity_space, space);
return 0;
}