qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-26 22:31:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

immidiate indexed pointer access and some whitespace + reorg

Browse source
This commit is contained in:
Bill Currie 2001-12-07 20:07:38 +00:00
parent d222f25f0b
commit 028f8a116d
4 changed files with 163 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
include/QF/pr_comp.h
View file

@ -38,12 +38,13 @@ typedef enum {
ev_quaternion, ev_quaternion,
ev_integer, ev_integer,
ev_uinteger, ev_uinteger,
ev_short, // value is embedded in the opcode
ev_type_count // not a type, gives number of types ev_type_count // not a type, gives number of types
} etype_t; } etype_t;
extern int pr_type_size[ev_type_count]; extern int pr_type_size[ev_type_count];
extern const char *type_name[ev_type_count];
#define OFS_NULL 0 #define OFS_NULL 0
#define OFS_RETURN 1 #define OFS_RETURN 1
@ -217,6 +218,24 @@ typedef enum {
OP_GT_UI, OP_GT_UI,
OP_LE_UI, OP_LE_UI,
OP_GE_UI, OP_GE_UI,
OP_LOADBI_F,
OP_LOADBI_V,
OP_LOADBI_S,
OP_LOADBI_ENT,
OP_LOADBI_FLD,
OP_LOADBI_FNC,
OP_LOADBI_I,
OP_LOADBI_P,
OP_STOREBI_F,
OP_STOREBI_V,
OP_STOREBI_S,
OP_STOREBI_ENT,
OP_STOREBI_FLD,
OP_STOREBI_FNC,
OP_STOREBI_I,
OP_STOREBI_P,
} pr_opcode_e; } pr_opcode_e;
typedef struct typedef struct
@ -230,7 +249,6 @@ typedef struct
} opcode_t; } opcode_t;
extern opcode_t pr_opcodes[]; extern opcode_t pr_opcodes[];
extern const char *type_name[ev_type_count];
opcode_t *PR_Opcode (short opcode); opcode_t *PR_Opcode (short opcode);
void PR_Opcode_Init (void); void PR_Opcode_Init (void);

6
libs/gamecode/engine/pr_edict.c
View file

@ -68,6 +68,7 @@ int pr_type_size[ev_type_count] = {
4, 4,
1, 1,
1, 1,
0, // value in opcode
}; };
const char *type_name[ev_type_count] = { const char *type_name[ev_type_count] = {
@ -82,6 +83,7 @@ const char *type_name[ev_type_count] = {
"quaternion", "quaternion",
"integer", "integer",
"uinteger", "uinteger",
"short",
}; };
ddef_t *ED_FieldAtOfs (progs_t * pr, int ofs); ddef_t *ED_FieldAtOfs (progs_t * pr, int ofs);
@ -476,6 +478,10 @@ PR_GlobalString (progs_t * pr, int ofs, etype_t type)
void *val; void *val;
static char line[128]; static char line[128];
if (type == ev_short) {
snprintf (line, sizeof (line), "%-20d", (short) ofs);
return line;
}
if (pr_debug->int_val && pr->debug) if (pr_debug->int_val && pr->debug)
def = PR_Get_Local_Def (pr, ofs); def = PR_Get_Local_Def (pr, ofs);
val = (void *) &pr->pr_globals[ofs]; val = (void *) &pr->pr_globals[ofs];

38
libs/gamecode/engine/pr_exec.c
View file

@ -574,6 +574,25 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum)
VectorCopy (ptr->vector_var, OPC.vector_var); VectorCopy (ptr->vector_var, OPC.vector_var);
break; break;
case OP_LOADBI_F:
case OP_LOADBI_S:
case OP_LOADBI_ENT:
case OP_LOADBI_FLD:
case OP_LOADBI_FNC:
case OP_LOADBI_I:
case OP_LOADBI_P:
//FIXME put bounds checking in
pointer = OPA.integer_var + (short) st->b;
ptr = pr->pr_globals + pointer;
OPC.integer_var = ptr->integer_var;
break;
case OP_LOADBI_V:
//FIXME put bounds checking in
pointer = OPA.integer_var + (short) st->b;
ptr = pr->pr_globals + pointer;
VectorCopy (ptr->vector_var, OPC.vector_var);
break;
case OP_LEA: case OP_LEA:
pointer = OPA.integer_var + OPB.integer_var; pointer = OPA.integer_var + OPB.integer_var;
OPC.integer_var = pointer; OPC.integer_var = pointer;
@ -598,6 +617,25 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum)
VectorCopy (OPA.vector_var, ptr->vector_var); VectorCopy (OPA.vector_var, ptr->vector_var);
break; break;
case OP_STOREBI_F:
case OP_STOREBI_S:
case OP_STOREBI_ENT:
case OP_STOREBI_FLD:
case OP_STOREBI_FNC:
case OP_STOREBI_I:
case OP_STOREBI_P:
//FIXME put bounds checking in
pointer = OPB.integer_var + (short) st->c;
ptr = pr->pr_globals + pointer;
ptr->integer_var = OPA.integer_var;
break;
case OP_STOREBI_V:
//FIXME put bounds checking in
pointer = OPB.integer_var + (short) st->c;
ptr = pr->pr_globals + pointer;
VectorCopy (OPA.vector_var, ptr->vector_var);
break;
// ================== // ==================
case OP_IFNOT: case OP_IFNOT:
if (!OPA.integer_var) if (!OPA.integer_var)

47
libs/gamecode/engine/pr_opcode.c
View file

@ -90,6 +90,7 @@ opcode_t pr_opcodes[] = {
{".", "load.ent", OP_LOAD_ENT, false, ev_entity, ev_field, ev_entity, PROG_ID_VERSION}, {".", "load.ent", OP_LOAD_ENT, false, ev_entity, ev_field, ev_entity, PROG_ID_VERSION},
{".", "load.fld", OP_LOAD_FLD, false, ev_entity, ev_field, ev_field, PROG_ID_VERSION}, {".", "load.fld", OP_LOAD_FLD, false, ev_entity, ev_field, ev_field, PROG_ID_VERSION},
{".", "load.fnc", OP_LOAD_FNC, false, ev_entity, ev_field, ev_func, PROG_ID_VERSION}, {".", "load.fnc", OP_LOAD_FNC, false, ev_entity, ev_field, ev_func, PROG_ID_VERSION},
{".", "load.i", OP_LOAD_I, false, ev_entity, ev_field, ev_integer, PROG_VERSION},
{".", "loadb.f", OP_LOADB_F, false, ev_pointer, ev_integer, ev_float, PROG_VERSION}, {".", "loadb.f", OP_LOADB_F, false, ev_pointer, ev_integer, ev_float, PROG_VERSION},
{".", "loadb.v", OP_LOADB_V, false, ev_pointer, ev_integer, ev_vector, PROG_VERSION}, {".", "loadb.v", OP_LOADB_V, false, ev_pointer, ev_integer, ev_vector, PROG_VERSION},
@ -100,6 +101,15 @@ opcode_t pr_opcodes[] = {
{".", "loadb.i", OP_LOADB_I, false, ev_pointer, ev_integer, ev_integer, PROG_VERSION}, {".", "loadb.i", OP_LOADB_I, false, ev_pointer, ev_integer, ev_integer, PROG_VERSION},
{".", "loadb.p", OP_LOADB_P, false, ev_pointer, ev_integer, ev_pointer, PROG_VERSION}, {".", "loadb.p", OP_LOADB_P, false, ev_pointer, ev_integer, ev_pointer, PROG_VERSION},
{".", "loadbi.f", OP_LOADBI_F, false, ev_pointer, ev_short, ev_float, PROG_VERSION},
{".", "loadbi.v", OP_LOADBI_V, false, ev_pointer, ev_short, ev_vector, PROG_VERSION},
{".", "loadbi.s", OP_LOADBI_S, false, ev_pointer, ev_short, ev_string, PROG_VERSION},
{".", "loadbi.ent", OP_LOADBI_ENT, false, ev_pointer, ev_short, ev_entity, PROG_VERSION},
{".", "loadbi.fld", OP_LOADBI_FLD, false, ev_pointer, ev_short, ev_field, PROG_VERSION},
{".", "loadbi.fnc", OP_LOADBI_FNC, false, ev_pointer, ev_short, ev_func, PROG_VERSION},
{".", "loadbi.i", OP_LOADBI_I, false, ev_pointer, ev_short, ev_integer, PROG_VERSION},
{".", "loadbi.p", OP_LOADBI_P, false, ev_pointer, ev_short, ev_pointer, PROG_VERSION},
{".", "address", OP_ADDRESS, false, ev_entity, ev_field, ev_pointer, PROG_ID_VERSION}, {".", "address", OP_ADDRESS, false, ev_entity, ev_field, ev_pointer, PROG_ID_VERSION},
{"&", "address.f", OP_ADDRESS_F, false, ev_float, ev_void, ev_pointer, PROG_VERSION}, {"&", "address.f", OP_ADDRESS_F, false, ev_float, ev_void, ev_pointer, PROG_VERSION},
@ -119,6 +129,7 @@ opcode_t pr_opcodes[] = {
{"=", "store.ent", OP_STORE_ENT, true, ev_entity, ev_entity, ev_void, PROG_ID_VERSION}, {"=", "store.ent", OP_STORE_ENT, true, ev_entity, ev_entity, ev_void, PROG_ID_VERSION},
{"=", "store.fld", OP_STORE_FLD, true, ev_field, ev_field, ev_void, PROG_ID_VERSION}, {"=", "store.fld", OP_STORE_FLD, true, ev_field, ev_field, ev_void, PROG_ID_VERSION},
{"=", "store.fnc", OP_STORE_FNC, true, ev_func, ev_func, ev_void, PROG_ID_VERSION}, {"=", "store.fnc", OP_STORE_FNC, true, ev_func, ev_func, ev_void, PROG_ID_VERSION},
{"=", "store.i", OP_STORE_I, true, ev_integer, ev_integer, ev_void, PROG_VERSION},
{"=", "storep.f", OP_STOREP_F, true, ev_float, ev_pointer, ev_void, PROG_ID_VERSION}, {"=", "storep.f", OP_STOREP_F, true, ev_float, ev_pointer, ev_void, PROG_ID_VERSION},
{"=", "storep.v", OP_STOREP_V, true, ev_vector, ev_pointer, ev_void, PROG_ID_VERSION}, {"=", "storep.v", OP_STOREP_V, true, ev_vector, ev_pointer, ev_void, PROG_ID_VERSION},
@ -126,6 +137,7 @@ opcode_t pr_opcodes[] = {
{"=", "storep.ent", OP_STOREP_ENT, true, ev_entity, ev_pointer, ev_void, PROG_ID_VERSION}, {"=", "storep.ent", OP_STOREP_ENT, true, ev_entity, ev_pointer, ev_void, PROG_ID_VERSION},
{"=", "storep.fld", OP_STOREP_FLD, true, ev_field, ev_pointer, ev_void, PROG_ID_VERSION}, {"=", "storep.fld", OP_STOREP_FLD, true, ev_field, ev_pointer, ev_void, PROG_ID_VERSION},
{"=", "storep.fnc", OP_STOREP_FNC, true, ev_func, ev_pointer, ev_void, PROG_ID_VERSION}, {"=", "storep.fnc", OP_STOREP_FNC, true, ev_func, ev_pointer, ev_void, PROG_ID_VERSION},
{"=", "storep.i", OP_STOREP_I, true, ev_integer, ev_pointer, ev_void, PROG_VERSION},
{"=", "storeb.f", OP_STOREB_F, true, ev_float, ev_pointer, ev_integer, PROG_VERSION}, {"=", "storeb.f", OP_STOREB_F, true, ev_float, ev_pointer, ev_integer, PROG_VERSION},
{"=", "storeb.v", OP_STOREB_V, true, ev_vector, ev_pointer, ev_integer, PROG_VERSION}, {"=", "storeb.v", OP_STOREB_V, true, ev_vector, ev_pointer, ev_integer, PROG_VERSION},
@ -136,6 +148,15 @@ opcode_t pr_opcodes[] = {
{"=", "storeb.i", OP_STOREB_I, true, ev_integer, ev_pointer, ev_integer, PROG_VERSION}, {"=", "storeb.i", OP_STOREB_I, true, ev_integer, ev_pointer, ev_integer, PROG_VERSION},
{"=", "storeb.p", OP_STOREB_P, true, ev_pointer, ev_pointer, ev_integer, PROG_VERSION}, {"=", "storeb.p", OP_STOREB_P, true, ev_pointer, ev_pointer, ev_integer, PROG_VERSION},
{"=", "storebi.f", OP_STOREBI_F, true, ev_float, ev_pointer, ev_short, PROG_VERSION},
{"=", "storebi.v", OP_STOREBI_V, true, ev_vector, ev_pointer, ev_short, PROG_VERSION},
{"=", "storebi.s", OP_STOREBI_S, true, ev_string, ev_pointer, ev_short, PROG_VERSION},
{"=", "storebi.ent", OP_STOREBI_ENT, true, ev_entity, ev_pointer, ev_short, PROG_VERSION},
{"=", "storebi.fld", OP_STOREBI_FLD, true, ev_field, ev_pointer, ev_short, PROG_VERSION},
{"=", "storebi.fnc", OP_STOREBI_FNC, true, ev_func, ev_pointer, ev_short, PROG_VERSION},
{"=", "storebi.i", OP_STOREBI_I, true, ev_integer, ev_pointer, ev_short, PROG_VERSION},
{"=", "storebi.p", OP_STOREBI_P, true, ev_pointer, ev_pointer, ev_short, PROG_VERSION},
{"<RETURN>", "return", OP_RETURN, false, ev_void, ev_void, ev_void, PROG_ID_VERSION}, {"<RETURN>", "return", OP_RETURN, false, ev_void, ev_void, ev_void, PROG_ID_VERSION},
{"!", "not.f", OP_NOT_F, false, ev_float, ev_void, ev_integer, PROG_ID_VERSION}, {"!", "not.f", OP_NOT_F, false, ev_float, ev_void, ev_integer, PROG_ID_VERSION},
@ -203,13 +224,10 @@ opcode_t pr_opcodes[] = {
{"!", "not.i", OP_NOT_I, false, ev_integer, ev_void, ev_integer, PROG_VERSION}, {"!", "not.i", OP_NOT_I, false, ev_integer, ev_void, ev_integer, PROG_VERSION},
{"==", "eq.i", OP_EQ_I, false, ev_integer, ev_integer, ev_integer, PROG_VERSION}, {"==", "eq.i", OP_EQ_I, false, ev_integer, ev_integer, ev_integer, PROG_VERSION},
{"!=", "ne.i", OP_NE_I, false, ev_integer, ev_integer, ev_integer, PROG_VERSION}, {"!=", "ne.i", OP_NE_I, false, ev_integer, ev_integer, ev_integer, PROG_VERSION},
{"=", "store.i", OP_STORE_I, true, ev_integer, ev_integer, ev_void, PROG_VERSION},
{"=", "storep.i", OP_STOREP_I, true, ev_integer, ev_pointer, ev_void, PROG_VERSION},
{".", "load.i", OP_LOAD_I, false, ev_entity, ev_field, ev_integer, PROG_VERSION},
{"^", "bitxor.f", OP_BITXOR_F, false, ev_float, ev_float, ev_float, PROG_VERSION}, {"^", "bitxor.f", OP_BITXOR_F, false, ev_float, ev_float, ev_float, PROG_VERSION},
{"^", "bitxor.i", OP_BITXOR_I, false, ev_integer, ev_integer, ev_integer, PROG_VERSION},
{"~", "bitnot.f", OP_BITNOT_F, false, ev_float, ev_void, ev_float, PROG_VERSION}, {"~", "bitnot.f", OP_BITNOT_F, false, ev_float, ev_void, ev_float, PROG_VERSION},
{"^", "bitxor.i", OP_BITXOR_I, false, ev_integer, ev_integer, ev_integer, PROG_VERSION},
{"~", "bitnot.i", OP_BITNOT_I, false, ev_integer, ev_void, ev_integer, PROG_VERSION}, {"~", "bitnot.i", OP_BITNOT_I, false, ev_integer, ev_void, ev_integer, PROG_VERSION},
{0}, {0},
}; };
@ -267,11 +285,22 @@ static inline void
check_global (progs_t *pr, dstatement_t *st, opcode_t *op, etype_t type, check_global (progs_t *pr, dstatement_t *st, opcode_t *op, etype_t type,
unsigned short operand) unsigned short operand)
{ {
if (type == ev_void && operand) { switch (type) {
if (st->op != OP_RETURN && st->op != OP_DONE) //FIXME need better "not used flags" case ev_short:
PR_Error (pr, "PR_Check_Opcodes: non-zero global index in void operand (statement %ld: %s)\n", (long)(st - pr->pr_statements), op->opname); break;
} else if (operand >= pr->progs->numglobals) { case ev_void:
PR_Error (pr, "PR_Check_Opcodes: out of bounds global index (statement %ld: %s)\n", (long)(st - pr->pr_statements), op->opname); //FIXME need better "not used flags"
if (operand && st->op != OP_RETURN && st->op != OP_DONE)
PR_Error (pr, "PR_Check_Opcodes: non-zero global index in "
"void operand (statement %ld: %s)\n",
(long)(st - pr->pr_statements), op->opname);
break;
default:
if (operand >= pr->progs->numglobals)
PR_Error (pr, "PR_Check_Opcodes: out of bounds global index "
"(statement %ld: %s)\n",
(long)(st - pr->pr_statements), op->opname);
break;
} }
} }