qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

change FNC to FN and fnc to fn for function based opcodes

This commit is contained in:
Bill Currie 2004-02-11 06:52:19 +00:00
parent 1c090c38a3
commit a821f048a0
3 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/QF/pr_comp.h
View File

@ -81,13 +81,13 @@ typedef enum {
OP_EQ_V, OP_EQ_V,
OP_EQ_S, OP_EQ_S,
OP_EQ_E, OP_EQ_E,
OP_EQ_FNC, OP_EQ_FN,
OP_NE_F, OP_NE_F,
OP_NE_V, OP_NE_V,
OP_NE_S, OP_NE_S,
OP_NE_E, OP_NE_E,
OP_NE_FNC, OP_NE_FN,
OP_LE_F, OP_LE_F,
OP_GE_F, OP_GE_F,
@ -99,7 +99,7 @@ typedef enum {
OP_LOAD_S, OP_LOAD_S,
OP_LOAD_ENT, OP_LOAD_ENT,
OP_LOAD_FLD, OP_LOAD_FLD,
OP_LOAD_FNC, OP_LOAD_FN,
OP_ADDRESS, OP_ADDRESS,
@ -108,21 +108,21 @@ typedef enum {
OP_STORE_S, OP_STORE_S,
OP_STORE_ENT, OP_STORE_ENT,
OP_STORE_FLD, OP_STORE_FLD,
OP_STORE_FNC, OP_STORE_FN,
OP_STOREP_F, OP_STOREP_F,
OP_STOREP_V, OP_STOREP_V,
OP_STOREP_S, OP_STOREP_S,
OP_STOREP_ENT, OP_STOREP_ENT,
OP_STOREP_FLD, OP_STOREP_FLD,
OP_STOREP_FNC, OP_STOREP_FN,
OP_RETURN, OP_RETURN,
OP_NOT_F, OP_NOT_F,
OP_NOT_V, OP_NOT_V,
OP_NOT_S, OP_NOT_S,
OP_NOT_ENT, OP_NOT_ENT,
OP_NOT_FNC, OP_NOT_FN,
OP_IF, OP_IF,
OP_IFNOT, OP_IFNOT,
OP_CALL0, OP_CALL0,
@ -188,7 +188,7 @@ typedef enum {
OP_LOADB_S, OP_LOADB_S,
OP_LOADB_ENT, OP_LOADB_ENT,
OP_LOADB_FLD, OP_LOADB_FLD,
OP_LOADB_FNC, OP_LOADB_FN,
OP_LOADB_I, OP_LOADB_I,
OP_LOADB_P, OP_LOADB_P,
@ -197,7 +197,7 @@ typedef enum {
OP_STOREB_S, OP_STOREB_S,
OP_STOREB_ENT, OP_STOREB_ENT,
OP_STOREB_FLD, OP_STOREB_FLD,
OP_STOREB_FNC, OP_STOREB_FN,
OP_STOREB_I, OP_STOREB_I,
OP_STOREB_P, OP_STOREB_P,
@ -206,7 +206,7 @@ typedef enum {
OP_ADDRESS_S, OP_ADDRESS_S,
OP_ADDRESS_ENT, OP_ADDRESS_ENT,
OP_ADDRESS_FLD, OP_ADDRESS_FLD,
OP_ADDRESS_FNC, OP_ADDRESS_FN,
OP_ADDRESS_I, OP_ADDRESS_I,
OP_ADDRESS_P, OP_ADDRESS_P,
@ -230,7 +230,7 @@ typedef enum {
OP_LOADBI_S, OP_LOADBI_S,
OP_LOADBI_ENT, OP_LOADBI_ENT,
OP_LOADBI_FLD, OP_LOADBI_FLD,
OP_LOADBI_FNC, OP_LOADBI_FN,
OP_LOADBI_I, OP_LOADBI_I,
OP_LOADBI_P, OP_LOADBI_P,
@ -239,7 +239,7 @@ typedef enum {
OP_STOREBI_S, OP_STOREBI_S,
OP_STOREBI_ENT, OP_STOREBI_ENT,
OP_STOREBI_FLD, OP_STOREBI_FLD,
OP_STOREBI_FNC, OP_STOREBI_FN,
OP_STOREBI_I, OP_STOREBI_I,
OP_STOREBI_P, OP_STOREBI_P,

22
libs/gamecode/engine/pr_exec.c
View File

@ -386,7 +386,7 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum)
OPC.integer_var = !OPA.string_var || OPC.integer_var = !OPA.string_var ||
!*PR_GetString (pr, OPA.string_var); !*PR_GetString (pr, OPA.string_var);
break; break;
case OP_NOT_FNC: case OP_NOT_FN:
OPC.integer_var = !OPA.func_var; OPC.integer_var = !OPA.func_var;
break; break;
case OP_NOT_ENT: case OP_NOT_ENT:
@ -402,7 +402,7 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum)
case OP_EQ_E: case OP_EQ_E:
OPC.integer_var = OPA.integer_var == OPB.integer_var; OPC.integer_var = OPA.integer_var == OPB.integer_var;
break; break;
case OP_EQ_FNC: case OP_EQ_FN:
OPC.integer_var = OPA.func_var == OPB.func_var; OPC.integer_var = OPA.func_var == OPB.func_var;
break; break;
case OP_NE_F: case OP_NE_F:
@ -436,7 +436,7 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum)
case OP_NE_E: case OP_NE_E:
OPC.integer_var = OPA.integer_var != OPB.integer_var; OPC.integer_var = OPA.integer_var != OPB.integer_var;
break; break;
case OP_NE_FNC: case OP_NE_FN:
OPC.integer_var = OPA.func_var != OPB.func_var; OPC.integer_var = OPA.func_var != OPB.func_var;
break; break;
@ -445,7 +445,7 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum)
case OP_STORE_ENT: case OP_STORE_ENT:
case OP_STORE_FLD: // integers case OP_STORE_FLD: // integers
case OP_STORE_S: case OP_STORE_S:
case OP_STORE_FNC: // pointers case OP_STORE_FN: // pointers
case OP_STORE_I: case OP_STORE_I:
case OP_STORE_U: case OP_STORE_U:
case OP_STORE_P: case OP_STORE_P:
@ -459,7 +459,7 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum)
case OP_STOREP_ENT: case OP_STOREP_ENT:
case OP_STOREP_FLD: // integers case OP_STOREP_FLD: // integers
case OP_STOREP_S: case OP_STOREP_S:
case OP_STOREP_FNC: // pointers case OP_STOREP_FN: // pointers
case OP_STOREP_I: case OP_STOREP_I:
case OP_STOREP_U: case OP_STOREP_U:
case OP_STOREP_P: case OP_STOREP_P:
@ -493,7 +493,7 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum)
case OP_ADDRESS_S: case OP_ADDRESS_S:
case OP_ADDRESS_ENT: case OP_ADDRESS_ENT:
case OP_ADDRESS_FLD: case OP_ADDRESS_FLD:
case OP_ADDRESS_FNC: case OP_ADDRESS_FN:
case OP_ADDRESS_I: case OP_ADDRESS_I:
case OP_ADDRESS_U: case OP_ADDRESS_U:
case OP_ADDRESS_P: case OP_ADDRESS_P:
@ -504,7 +504,7 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum)
case OP_LOAD_FLD: case OP_LOAD_FLD:
case OP_LOAD_ENT: case OP_LOAD_ENT:
case OP_LOAD_S: case OP_LOAD_S:
case OP_LOAD_FNC: case OP_LOAD_FN:
case OP_LOAD_I: case OP_LOAD_I:
case OP_LOAD_U: case OP_LOAD_U:
case OP_LOAD_P: case OP_LOAD_P:
@ -538,7 +538,7 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum)
case OP_LOADB_S: case OP_LOADB_S:
case OP_LOADB_ENT: case OP_LOADB_ENT:
case OP_LOADB_FLD: case OP_LOADB_FLD:
case OP_LOADB_FNC: case OP_LOADB_FN:
case OP_LOADB_I: case OP_LOADB_I:
case OP_LOADB_U: case OP_LOADB_U:
case OP_LOADB_P: case OP_LOADB_P:
@ -558,7 +558,7 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum)
case OP_LOADBI_S: case OP_LOADBI_S:
case OP_LOADBI_ENT: case OP_LOADBI_ENT:
case OP_LOADBI_FLD: case OP_LOADBI_FLD:
case OP_LOADBI_FNC: case OP_LOADBI_FN:
case OP_LOADBI_I: case OP_LOADBI_I:
case OP_LOADBI_U: case OP_LOADBI_U:
case OP_LOADBI_P: case OP_LOADBI_P:
@ -588,7 +588,7 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum)
case OP_STOREB_S: case OP_STOREB_S:
case OP_STOREB_ENT: case OP_STOREB_ENT:
case OP_STOREB_FLD: case OP_STOREB_FLD:
case OP_STOREB_FNC: case OP_STOREB_FN:
case OP_STOREB_I: case OP_STOREB_I:
case OP_STOREB_U: case OP_STOREB_U:
case OP_STOREB_P: case OP_STOREB_P:
@ -608,7 +608,7 @@ PR_ExecuteProgram (progs_t * pr, func_t fnum)
case OP_STOREBI_S: case OP_STOREBI_S:
case OP_STOREBI_ENT: case OP_STOREBI_ENT:
case OP_STOREBI_FLD: case OP_STOREBI_FLD:
case OP_STOREBI_FNC: case OP_STOREBI_FN:
case OP_STOREBI_I: case OP_STOREBI_I:
case OP_STOREBI_U: case OP_STOREBI_U:
case OP_STOREBI_P: case OP_STOREBI_P:

22
libs/gamecode/engine/pr_opcode.c
View File

@ -165,7 +165,7 @@ opcode_t pr_opcodes[] = {
ev_entity, ev_entity, ev_integer, ev_entity, ev_entity, ev_integer,
PROG_ID_VERSION, PROG_ID_VERSION,
}, },
{"==", "eq.fnc", OP_EQ_FNC, false, {"==", "eq.fn", OP_EQ_FN, false,
ev_func, ev_func, ev_integer, ev_func, ev_func, ev_integer,
PROG_ID_VERSION, PROG_ID_VERSION,
}, },
@ -186,7 +186,7 @@ opcode_t pr_opcodes[] = {
ev_entity, ev_entity, ev_integer, ev_entity, ev_entity, ev_integer,
PROG_ID_VERSION, PROG_ID_VERSION,
}, },
{"!=", "ne.fnc", OP_NE_FNC, false, {"!=", "ne.fn", OP_NE_FN, false,
ev_func, ev_func, ev_integer, ev_func, ev_func, ev_integer,
PROG_ID_VERSION, PROG_ID_VERSION,
}, },
@ -249,7 +249,7 @@ opcode_t pr_opcodes[] = {
PROG_ID_VERSION, PROG_ID_VERSION,
"%Ga.%Gb, %gc", "%Ga.%Gb, %gc",
}, },
{".", "load.fnc", OP_LOAD_FNC, false, {".", "load.fn", OP_LOAD_FN, false,
ev_entity, ev_field, ev_func, ev_entity, ev_field, ev_func,
PROG_ID_VERSION, PROG_ID_VERSION,
"%Ga.%Gb, %gc", "%Ga.%Gb, %gc",
@ -295,7 +295,7 @@ opcode_t pr_opcodes[] = {
PROG_VERSION, PROG_VERSION,
"*(%Ga + %Gb), %gc", "*(%Ga + %Gb), %gc",
}, },
{".", "loadb.fnc", OP_LOADB_FNC, false, {".", "loadb.fn", OP_LOADB_FN, false,
ev_pointer, ev_integer, ev_func, ev_pointer, ev_integer, ev_func,
PROG_VERSION, PROG_VERSION,
"*(%Ga + %Gb), %gc", "*(%Ga + %Gb), %gc",
@ -341,7 +341,7 @@ opcode_t pr_opcodes[] = {
PROG_VERSION, PROG_VERSION,
"*(%Ga + %sb), %gc", "*(%Ga + %sb), %gc",
}, },
{".", "loadbi.fnc", OP_LOADBI_FNC, false, {".", "loadbi.fn", OP_LOADBI_FN, false,
ev_pointer, ev_short, ev_func, ev_pointer, ev_short, ev_func,
PROG_VERSION, PROG_VERSION,
"*(%Ga + %sb), %gc", "*(%Ga + %sb), %gc",
@ -392,7 +392,7 @@ opcode_t pr_opcodes[] = {
PROG_VERSION, PROG_VERSION,
"%Ga, %gc", "%Ga, %gc",
}, },
{"&", "address.fnc", OP_ADDRESS_FNC, false, {"&", "address.fn", OP_ADDRESS_FN, false,
ev_func, ev_void, ev_pointer, ev_func, ev_void, ev_pointer,
PROG_VERSION, PROG_VERSION,
"%Ga, %gc", "%Ga, %gc",
@ -471,7 +471,7 @@ opcode_t pr_opcodes[] = {
PROG_ID_VERSION, PROG_ID_VERSION,
"%Ga, %gb", "%Ga, %gb",
}, },
{"=", "store.fnc", OP_STORE_FNC, true, {"=", "store.fn", OP_STORE_FN, true,
ev_func, ev_func, ev_void, ev_func, ev_func, ev_void,
PROG_ID_VERSION, PROG_ID_VERSION,
"%Ga, %gb", "%Ga, %gb",
@ -517,7 +517,7 @@ opcode_t pr_opcodes[] = {
PROG_ID_VERSION, PROG_ID_VERSION,
"%Ga, *%Gb", "%Ga, *%Gb",
}, },
{".=", "storep.fnc", OP_STOREP_FNC, true, {".=", "storep.fn", OP_STOREP_FN, true,
ev_func, ev_pointer, ev_void, ev_func, ev_pointer, ev_void,
PROG_ID_VERSION, PROG_ID_VERSION,
"%Ga, *%Gb", "%Ga, *%Gb",
@ -563,7 +563,7 @@ opcode_t pr_opcodes[] = {
PROG_VERSION, PROG_VERSION,
"%Ga, *(%Gb + %Gc)", "%Ga, *(%Gb + %Gc)",
}, },
{".=", "storeb.fnc", OP_STOREB_FNC, true, {".=", "storeb.fn", OP_STOREB_FN, true,
ev_func, ev_pointer, ev_integer, ev_func, ev_pointer, ev_integer,
PROG_VERSION, PROG_VERSION,
"%Ga, *(%Gb + %Gc)", "%Ga, *(%Gb + %Gc)",
@ -609,7 +609,7 @@ opcode_t pr_opcodes[] = {
PROG_VERSION, PROG_VERSION,
"%Ga, *(%Gb + %sc)", "%Ga, *(%Gb + %sc)",
}, },
{".=", "storebi.fnc", OP_STOREBI_FNC, true, {".=", "storebi.fn", OP_STOREBI_FN, true,
ev_func, ev_pointer, ev_short, ev_func, ev_pointer, ev_short,
PROG_VERSION, PROG_VERSION,
"%Ga, *(%Gb + %sc)", "%Ga, *(%Gb + %sc)",
@ -656,7 +656,7 @@ opcode_t pr_opcodes[] = {
PROG_ID_VERSION, PROG_ID_VERSION,
"%Ga, %gc", "%Ga, %gc",
}, },
{"!", "not.fnc", OP_NOT_FNC, false, {"!", "not.fn", OP_NOT_FN, false,
ev_func, ev_void, ev_integer, ev_func, ev_void, ev_integer,
PROG_ID_VERSION, PROG_ID_VERSION,
"%Ga, %gc", "%Ga, %gc",