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

get .param_size and .debug_file linked in properly

Browse source
This commit is contained in:
Bill Currie 2003-04-23 18:25:09 +00:00
parent 57254e5d33
commit 8f4308c86a
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -504,6 +504,7 @@ qfo_to_progs (qfo_t *qfo, pr_info_t *pr)
def_t *pd; def_t *pd;
qfo_def_t *qd; qfo_def_t *qd;
reloc_t *relocs = 0; reloc_t *relocs = 0;
int first_local;
if (qfo->num_relocs) if (qfo->num_relocs)
relocs = calloc (qfo->num_relocs, sizeof (reloc_t)); relocs = calloc (qfo->num_relocs, sizeof (reloc_t));
@ -547,19 +548,12 @@ qfo_to_progs (qfo_t *qfo, pr_info_t *pr)
pd->file = qd->file; pd->file = qd->file;
pd->line = qd->line; pd->line = qd->line;
} }
pr->scope->tail = &pr->scope->head;
for (i = 0, pd = pr->scope->head; i < pr->scope->num_defs; i++, pd++) {
if ((*pr->scope->tail)->local) {
*pr->scope->tail = 0;
break;
}
pr->scope->tail = &(*pr->scope->tail)->def_next;
}
pr->num_functions = qfo->num_funcs + 1; pr->num_functions = qfo->num_funcs + 1;
if (qfo->num_funcs) if (qfo->num_funcs)
pr->func_head = calloc (qfo->num_funcs, sizeof (function_t)); pr->func_head = calloc (qfo->num_funcs, sizeof (function_t));
pr->func_tail = &pr->func_head; pr->func_tail = &pr->func_head;
first_local = qfo->num_defs;
for (i = 0, pf = pr->func_head, qf = qfo->funcs; for (i = 0, pf = pr->func_head, qf = qfo->funcs;
i < qfo->num_funcs; i++, pf++, qf++) { i < qfo->num_funcs; i++, pf++, qf++) {
*pr->func_tail = pf; *pr->func_tail = pf;
@ -580,6 +574,8 @@ qfo_to_progs (qfo_t *qfo, pr_info_t *pr)
pf->scope = new_scope (sc_params, init_space (qf->locals_size, 0), pf->scope = new_scope (sc_params, init_space (qf->locals_size, 0),
pr->scope); pr->scope);
if (qf->num_local_defs) { if (qf->num_local_defs) {
if (first_local > qf->local_defs)
first_local = qf->local_defs;
pf->scope->head = pr->scope->head + qf->local_defs; pf->scope->head = pr->scope->head + qf->local_defs;
pf->scope->tail = &pf->scope->head[qf->num_local_defs - 1].def_next; pf->scope->tail = &pf->scope->head[qf->num_local_defs - 1].def_next;
*pf->scope->tail = 0; *pf->scope->tail = 0;
@ -596,6 +592,11 @@ qfo_to_progs (qfo_t *qfo, pr_info_t *pr)
pf->refs[qf->num_relocs - 1].next = 0; pf->refs[qf->num_relocs - 1].next = 0;
} }
} }
if (first_local > 0) {
pd = pr->scope->head + first_local - 1;
pr->scope->tail = &pd->def_next;
pd->def_next = 0;
}
pr->num_linenos = pr->linenos_size = qfo->num_lines; pr->num_linenos = pr->linenos_size = qfo->num_lines;
if (pr->num_linenos) { if (pr->num_linenos) {
pr->linenos = malloc (pr->num_linenos * sizeof (pr_lineno_t)); pr->linenos = malloc (pr->num_linenos * sizeof (pr_lineno_t));

2
tools/qfcc/source/qfcc.c
View file

@ -770,6 +770,8 @@ main (int argc, char **argv)
opcode_init (); opcode_init ();
init_types (); init_types ();
InitData ();
clear_immediates ();
if (source_files) { if (source_files) {
res = separate_compile (); res = separate_compile ();