mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2024-11-23 04:42:32 +00:00
while not yet perfect, qfprogs now works with qfo files
This commit is contained in:
Bill Currie
parent
74404b229d
commit
206a15ef14
3 changed files with 182 additions and 10 deletions
|
|
@ -59,7 +59,7 @@ qfcc_LDADD= $(QFCC_LIBS)
|
|||
qfcc_DEPENDENCIES= $(QFCC_DEPS)
|
||||
|
||||
qfprogs_SOURCES= \
|
||||
disassemble.c globals.c lines.c modules.c qfprogs.c strings.c
|
||||
disassemble.c globals.c lines.c modules.c obj_file.c stub.c qfprogs.c strings.c
|
||||
qfprogs_LDADD= $(QFCC_LIBS)
|
||||
qfprogs_DEPENDENCIES= $(QFCC_DEPS)
|
||||
|
||||
|
|
|
|||
|
|
@ -65,6 +65,7 @@ static __attribute__ ((unused)) const char rcsid[] =
|
|||
#include "QF/va.h"
|
||||
#include "QF/zone.h"
|
||||
|
||||
#include "obj_file.h"
|
||||
#include "qfprogs.h"
|
||||
|
||||
int sorted = 0;
|
||||
|
|
@ -91,6 +92,9 @@ static progs_t pr;
|
|||
static void *membase;
|
||||
static int memsize = 1024*1024;
|
||||
|
||||
static qfo_t *qfo;
|
||||
static dprograms_t progs;
|
||||
|
||||
static const char *source_path = "";
|
||||
|
||||
static hashtab_t *func_tab;
|
||||
|
|
@ -193,18 +197,152 @@ init_qf (void)
|
|||
Hash_SetHashCompare (func_tab, func_hash, func_compare);
|
||||
}
|
||||
|
||||
static void
|
||||
convert_qfo (void)
|
||||
{
|
||||
int i;
|
||||
|
||||
pr.progs = &progs;
|
||||
progs.version = PROG_VERSION;
|
||||
|
||||
pr.pr_statements = qfo->code;
|
||||
progs.numstatements = qfo->code_size;
|
||||
|
||||
pr.pr_strings = qfo->strings;
|
||||
progs.numstrings = qfo->strings_size;
|
||||
pr.pr_stringsize = qfo->strings_size;
|
||||
|
||||
pr.pr_globals = qfo->data;
|
||||
progs.numglobals = qfo->data_size;
|
||||
|
||||
progs.numglobaldefs = 0;
|
||||
progs.numfielddefs = 0;
|
||||
progs.entityfields = 0;
|
||||
pr.pr_globaldefs = calloc (qfo->num_defs, sizeof (ddef_t));
|
||||
pr.pr_fielddefs = calloc (qfo->num_defs, sizeof (ddef_t));
|
||||
for (i = 0; i < qfo->num_defs; i++) {
|
||||
qfo_def_t *def = qfo->defs + i;
|
||||
ddef_t ddef;
|
||||
|
||||
if ((def->flags & QFOD_LOCAL) || !def->name)
|
||||
continue;
|
||||
|
||||
ddef.type = def->basic_type;
|
||||
ddef.ofs = def->ofs;
|
||||
ddef.s_name = def->name;
|
||||
if (!(def->flags & QFOD_NOSAVE)
|
||||
&& !(def->flags & QFOD_CONSTANT)
|
||||
&& (def->flags & QFOD_GLOBAL)
|
||||
&& def->basic_type != ev_func
|
||||
&& def->basic_type != ev_field)
|
||||
ddef.type |= DEF_SAVEGLOBAL;
|
||||
pr.pr_globaldefs[progs.numglobaldefs++] = ddef;
|
||||
if (ddef.type == ev_field) {
|
||||
const char *type = qfo->types + def->full_type;
|
||||
if (type[0] != 'F') {
|
||||
ddef.type = ev_void;
|
||||
} else {
|
||||
switch (type[1]) {
|
||||
default:
|
||||
case 'v':
|
||||
ddef.type = ev_void;
|
||||
break;
|
||||
case '*':
|
||||
ddef.type = ev_string;
|
||||
break;
|
||||
case 'f':
|
||||
ddef.type = ev_float;
|
||||
break;
|
||||
case 'V':
|
||||
ddef.type = ev_vector;
|
||||
break;
|
||||
case 'E':
|
||||
ddef.type = ev_entity;
|
||||
break;
|
||||
case 'F':
|
||||
ddef.type = ev_field;
|
||||
break;
|
||||
case '(':
|
||||
ddef.type = ev_func;
|
||||
break;
|
||||
case ':':
|
||||
ddef.type = ev_sel;
|
||||
break;
|
||||
case '@': // id
|
||||
case '#': // class
|
||||
case '^':
|
||||
ddef.type = ev_pointer;
|
||||
break;
|
||||
case 'Q':
|
||||
ddef.type = ev_quaternion;
|
||||
break;
|
||||
case 'i':
|
||||
ddef.type = ev_integer;
|
||||
break;
|
||||
case 'I':
|
||||
ddef.type = ev_uinteger;
|
||||
break;
|
||||
case 's':
|
||||
ddef.type = ev_short;
|
||||
break;
|
||||
case '{':
|
||||
ddef.type = ev_struct;
|
||||
break;
|
||||
case '[':
|
||||
ddef.type = ev_array;
|
||||
break;
|
||||
}
|
||||
}
|
||||
ddef.ofs = G_INT (&pr, ddef.ofs);
|
||||
pr.pr_fielddefs[progs.numfielddefs++] = ddef;
|
||||
}
|
||||
}
|
||||
|
||||
progs.numfunctions = qfo->num_funcs;
|
||||
pr.pr_functions = calloc (qfo->num_funcs, sizeof (dfunction_t));
|
||||
for (i = 0; i < qfo->num_funcs; i++) {
|
||||
qfo_func_t *func = qfo->funcs + i;
|
||||
dfunction_t df;
|
||||
|
||||
df.first_statement = func->builtin ? -func->builtin : func->code;
|
||||
df.parm_start = 0;
|
||||
df.locals = func->locals_size;
|
||||
df.profile = 0;
|
||||
df.s_name = func->name;
|
||||
df.s_file = func->file;
|
||||
df.numparms = func->num_parms;
|
||||
memcpy (df.parm_size, func->parm_size, sizeof (df.parm_size));
|
||||
|
||||
pr.pr_functions[i] = df;
|
||||
}
|
||||
}
|
||||
|
||||
static int
|
||||
load_progs (const char *name)
|
||||
{
|
||||
QFile *file;
|
||||
int i, size;
|
||||
char buff[5];
|
||||
|
||||
Hash_FlushTable (func_tab);
|
||||
|
||||
file = open_file (name, &size);
|
||||
if (!file) {
|
||||
perror (name);
|
||||
return 0;
|
||||
}
|
||||
Hash_FlushTable (func_tab);
|
||||
Qread (file, buff, 4);
|
||||
buff[4] = 0;
|
||||
Qseek (file, 0, SEEK_SET);
|
||||
if (!strcmp (buff, QFO)) {
|
||||
qfo = qfo_read (file);
|
||||
Qclose (file);
|
||||
|
||||
if (!qfo)
|
||||
return 0;
|
||||
|
||||
convert_qfo ();
|
||||
} else {
|
||||
pr.progs_name = name;
|
||||
PR_LoadProgsFile (&pr, file, size, 1, 0);
|
||||
Qclose (file);
|
||||
|
|
@ -214,11 +352,13 @@ load_progs (const char *name)
|
|||
|
||||
PR_LoadStrings (&pr);
|
||||
|
||||
PR_LoadDebug (&pr);
|
||||
}
|
||||
for (i = 0; i < pr.progs->numfunctions; i++) {
|
||||
if (pr.pr_functions[i].first_statement > 0)// don't bother with builtins
|
||||
// don't bother with builtins
|
||||
if (pr.pr_functions[i].first_statement > 0)
|
||||
Hash_AddElement (func_tab, &pr.pr_functions[i]);
|
||||
}
|
||||
PR_LoadDebug (&pr);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
32
tools/qfcc/source/stub.c
Normal file
32
tools/qfcc/source/stub.c
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
#include "class.h"
|
||||
#include "debug.h"
|
||||
#include "def.h"
|
||||
#include "emit.h"
|
||||
#include "function.h"
|
||||
#include "immediate.h"
|
||||
#include "obj_file.h"
|
||||
#include "options.h"
|
||||
#include "qfcc.h"
|
||||
#include "strpool.h"
|
||||
#include "type.h"
|
||||
|
||||
struct dstring_s;
|
||||
options_t options;
|
||||
int num_linenos;
|
||||
pr_lineno_t *linenos;
|
||||
pr_info_t pr;
|
||||
defspace_t *new_defspace (void) {return 0;}
|
||||
scope_t *new_scope (scope_type type, defspace_t *space, scope_t *parent) {return 0;}
|
||||
string_t ReuseString (const char *str) {return 0;}
|
||||
void encode_type (struct dstring_s *str, type_t *type) {}
|
||||
codespace_t *codespace_new (void) {return 0;}
|
||||
void codespace_addcode (codespace_t *codespace, struct statement_s *code, int size) {}
|
||||
type_t *parse_type (const char *str) {return 0;}
|
||||
int function_parms (function_t *f, byte *parm_size) {return 0;}
|
||||
pr_auxfunction_t *new_auxfunction (void) {return 0;}
|
||||
ddef_t *new_local (void) {return 0;}
|
||||
void def_to_ddef (def_t *def, ddef_t *ddef, int aux) {}
|
||||
int strpool_addstr (strpool_t *strpool, const char *str) {return 0;}
|
||||
strpool_t *strpool_new (void) {return 0;}
|
||||
void strpool_delete (strpool_t *strpool) {}
|
||||
strpool_t *strpool_build (const char *strings, int size) {return 0;}
|
||||
Loading…
Reference in a new issue