#include "gmqcc.h"
-MEM_VEC_FUNCTIONS(qc_program, prog_section_statement, code)
-MEM_VEC_FUNCTIONS(qc_program, prog_section_def, defs)
-MEM_VEC_FUNCTIONS(qc_program, prog_section_def, fields)
-MEM_VEC_FUNCTIONS(qc_program, prog_section_function, functions)
-MEM_VEC_FUNCTIONS(qc_program, char, strings)
-MEM_VEC_FUN_APPEND(qc_program, char, strings)
-MEM_VEC_FUN_RESIZE(qc_program, char, strings)
-MEM_VEC_FUNCTIONS(qc_program, qcint, globals)
-MEM_VEC_FUNCTIONS(qc_program, qcint, entitydata)
-MEM_VEC_FUNCTIONS(qc_program, bool, entitypool)
-
-MEM_VEC_FUNCTIONS(qc_program, qcint, localstack)
-MEM_VEC_FUN_APPEND(qc_program, qcint, localstack)
-MEM_VEC_FUN_RESIZE(qc_program, qcint, localstack)
-MEM_VEC_FUNCTIONS(qc_program, qc_exec_stack, stack)
-
-MEM_VEC_FUNCTIONS(qc_program, size_t, profile)
-MEM_VEC_FUN_RESIZE(qc_program, size_t, profile)
-
-MEM_VEC_FUNCTIONS(qc_program, prog_builtin, builtins)
-
-MEM_VEC_FUNCTIONS(qc_program, const char*, function_stack)
+/*
+(prog_section_statement, code)
+(prog_section_def, defs)
+(prog_section_def, fields)
+(prog_section_function, functions)
+(char, strings)
+(qcint, globals)
+(qcint, entitydata)
+(bool, entitypool)
+(qcint, localstack)
+(qc_exec_stack, stack)
+(size_t, profile)
+(prog_builtin, builtins)
+(const char*, function_stack)
+*/
static void loaderror(const char *fmt, ...)
{
{
qc_program *prog;
prog_header header;
- size_t i;
FILE *file;
file = util_fopen(filename, "rb");
goto error;
}
-#define read_data(hdrvar, progvar, type) \
- if (fseek(file, header.hdrvar.offset, SEEK_SET) != 0) { \
- loaderror("seek failed"); \
- goto error; \
- } \
- prog->progvar##_alloc = header.hdrvar.length; \
- prog->progvar##_count = header.hdrvar.length; \
- prog->progvar = (type*)mem_a(header.hdrvar.length * sizeof(*prog->progvar)); \
- if (!prog->progvar) \
- goto error; \
- if (fread(prog->progvar, sizeof(*prog->progvar), header.hdrvar.length, file) \
- != header.hdrvar.length) { \
- loaderror("read failed"); \
- goto error; \
+#define read_data(hdrvar, progvar, reserved) \
+ if (fseek(file, header.hdrvar.offset, SEEK_SET) != 0) { \
+ loaderror("seek failed"); \
+ goto error; \
+ } \
+ if (fread(vec_add(prog->progvar, header.hdrvar.length + reserved), \
+ sizeof(*prog->progvar), \
+ header.hdrvar.length, file) \
+ != header.hdrvar.length) \
+ { \
+ loaderror("read failed"); \
+ goto error; \
}
-#define read_data1(x, y) read_data(x, x, y)
+#define read_data1(x) read_data(x, x, 0)
+#define read_data2(x, y) read_data(x, x, y)
- read_data (statements, code, prog_section_statement);
- read_data1(defs, prog_section_def);
- read_data1(fields, prog_section_def);
- read_data1(functions, prog_section_function);
- read_data1(strings, char);
- read_data1(globals, qcint);
+ read_data (statements, code, 0);
+ read_data1(defs);
+ read_data1(fields);
+ read_data1(functions);
+ read_data1(strings);
+ read_data2(globals, 2); /* reserve more in case a RETURN using with the global at "the end" exists */
fclose(file);
/* profile counters */
- if (!qc_program_profile_resize(prog, prog->code_count))
- goto error;
+ memset(vec_add(prog->profile, vec_size(prog->code)), 0, sizeof(prog->profile[0]) * vec_size(prog->code));
/* Add tempstring area */
- prog->tempstring_start = prog->strings_count;
- prog->tempstring_at = prog->strings_count;
- if (!qc_program_strings_resize(prog, prog->strings_count + 16*1024))
- goto error;
+ prog->tempstring_start = vec_size(prog->strings);
+ prog->tempstring_at = vec_size(prog->strings);
+ memset(vec_add(prog->strings, 16*1024), 0, 16*1024);
/* spawn the world entity */
- if (!qc_program_entitypool_add(prog, true)) {
- loaderror("failed to allocate world entity\n");
- goto error;
- }
- for (i = 0; i < prog->entityfields; ++i) {
- if (!qc_program_entitydata_add(prog, 0)) {
- loaderror("failed to allocate world data\n");
- goto error;
- }
- }
+ vec_push(prog->entitypool, true);
+ memset(vec_add(prog->entitydata, prog->entityfields), 0, prog->entityfields * sizeof(prog->entitydata[0]));
prog->entities = 1;
return prog;
error:
- if (prog->filename) mem_d(prog->filename);
- if (prog->code) mem_d(prog->code);
- if (prog->defs) mem_d(prog->defs);
- if (prog->fields) mem_d(prog->fields);
- if (prog->functions) mem_d(prog->functions);
- if (prog->strings) mem_d(prog->strings);
- if (prog->globals) mem_d(prog->globals);
- if (prog->entitydata) mem_d(prog->entitydata);
- if (prog->entitypool) mem_d(prog->entitypool);
+ if (prog->filename)
+ mem_d(prog->filename);
+ vec_free(prog->code);
+ vec_free(prog->defs);
+ vec_free(prog->fields);
+ vec_free(prog->functions);
+ vec_free(prog->strings);
+ vec_free(prog->globals);
+ vec_free(prog->entitydata);
+ vec_free(prog->entitypool);
mem_d(prog);
return NULL;
}
void prog_delete(qc_program *prog)
{
if (prog->filename) mem_d(prog->filename);
- MEM_VECTOR_CLEAR(prog, code);
- MEM_VECTOR_CLEAR(prog, defs);
- MEM_VECTOR_CLEAR(prog, fields);
- MEM_VECTOR_CLEAR(prog, functions);
- MEM_VECTOR_CLEAR(prog, strings);
- MEM_VECTOR_CLEAR(prog, globals);
- MEM_VECTOR_CLEAR(prog, entitydata);
- MEM_VECTOR_CLEAR(prog, entitypool);
- MEM_VECTOR_CLEAR(prog, localstack);
- MEM_VECTOR_CLEAR(prog, stack);
- MEM_VECTOR_CLEAR(prog, profile);
-
- if (prog->builtins_alloc) {
- MEM_VECTOR_CLEAR(prog, builtins);
- }
- /* otherwise the builtins were statically allocated */
+ vec_free(prog->code);
+ vec_free(prog->defs);
+ vec_free(prog->fields);
+ vec_free(prog->functions);
+ vec_free(prog->strings);
+ vec_free(prog->globals);
+ vec_free(prog->entitydata);
+ vec_free(prog->entitypool);
+ vec_free(prog->localstack);
+ vec_free(prog->stack);
+ vec_free(prog->profile);
mem_d(prog);
}
char* prog_getstring(qc_program *prog, qcint str)
{
- if (str < 0 || str >= prog->strings_count)
+ if (str < 0 || str >= (qcint)vec_size(prog->strings))
return "<<<invalid string>>>";
return prog->strings + str;
}
prog_section_def* prog_entfield(qc_program *prog, qcint off)
{
size_t i;
- for (i = 0; i < prog->fields_count; ++i) {
+ for (i = 0; i < vec_size(prog->fields); ++i) {
if (prog->fields[i].offset == off)
return (prog->fields + i);
}
prog_section_def* prog_getdef(qc_program *prog, qcint off)
{
size_t i;
- for (i = 0; i < prog->defs_count; ++i) {
+ for (i = 0; i < vec_size(prog->defs); ++i) {
if (prog->defs[i].offset == off)
return (prog->defs + i);
}
qcany* prog_getedict(qc_program *prog, qcint e)
{
- if (e >= prog->entitypool_count) {
+ if (e >= (qcint)vec_size(prog->entitypool)) {
prog->vmerror++;
printf("Accessing out of bounds edict %i\n", (int)e);
e = 0;
qcint prog_spawn_entity(qc_program *prog)
{
char *data;
- size_t i;
qcint e;
- for (e = 0; e < (qcint)prog->entitypool_count; ++e) {
+ for (e = 0; e < (qcint)vec_size(prog->entitypool); ++e) {
if (!prog->entitypool[e]) {
data = (char*)(prog->entitydata + (prog->entityfields * e));
memset(data, 0, prog->entityfields * sizeof(qcint));
return e;
}
}
- if (!qc_program_entitypool_add(prog, true)) {
- prog->vmerror++;
- printf("Failed to allocate entity\n");
- return 0;
- }
+ vec_push(prog->entitypool, true);
prog->entities++;
- for (i = 0; i < prog->entityfields; ++i) {
- if (!qc_program_entitydata_add(prog, 0)) {
- printf("Failed to allocate entity\n");
- return 0;
- }
- }
- data = (char*)(prog->entitydata + (prog->entityfields * e));
+ data = (char*)vec_add(prog->entitydata, prog->entityfields);
memset(data, 0, prog->entityfields * sizeof(qcint));
return e;
}
printf("Trying to free world entity\n");
return;
}
- if (e >= prog->entitypool_count) {
+ if (e >= (qcint)vec_size(prog->entitypool)) {
prog->vmerror++;
printf("Trying to free out of bounds entity\n");
return;
size_t at = prog->tempstring_at;
/* when we reach the end we start over */
- if (at + len >= prog->strings_count)
+ if (at + len >= vec_size(prog->strings))
at = prog->tempstring_start;
/* when it doesn't fit, reallocate */
- if (at + len >= prog->strings_count)
+ if (at + len >= vec_size(prog->strings))
{
- prog->strings_count = at;
- if (!qc_program_strings_append(prog, str, len+1)) {
- prog->vmerror = VMERR_TEMPSTRING_ALLOC;
- return 0;
- }
+ (void)vec_add(prog->strings, len+1);
+ memcpy(prog->strings + at, str, len+1);
return at;
}
return at;
}
-static int print_escaped_string(const char *str, size_t maxlen)
+static size_t print_escaped_string(const char *str, size_t maxlen)
{
- int len = 2;
+ size_t len = 2;
putchar('"');
--maxlen; /* because we're lazy and have escape sequences */
while (*str) {
def = prog_getdef(prog, glob);
value = (qcany*)(&prog->globals[glob]);
+ len = printf("[@%u] ", glob);
if (def) {
const char *name = prog_getstring(prog, def->name);
if (name[0] == '#')
- len = printf("$");
+ len += printf("$");
else
- len = printf("%s ", name);
+ len += printf("%s ", name);
vtype = def->type & DEF_TYPEMASK;
}
- else
- len = printf("[@%u] ", glob);
switch (vtype) {
case TYPE_VOID:
break;
}
done:
- if (len < sizeof(spaces)-1) {
+ if (len < (int)sizeof(spaces)-1) {
spaces[sizeof(spaces)-1-len] = 0;
printf(spaces);
spaces[sizeof(spaces)-1-len] = ' ';
printf("<illegal instruction %d>\n", st->opcode);
return;
}
- if ((prog->xflags & VMXF_TRACE) && prog->function_stack_count) {
+ if ((prog->xflags & VMXF_TRACE) && vec_size(prog->function_stack)) {
size_t i;
- for (i = 0; i < prog->function_stack_count; ++i)
+ for (i = 0; i < vec_size(prog->function_stack); ++i)
printf("->");
- printf("%s:", prog->function_stack[prog->function_stack_count-1]);
+ printf("%s:", vec_last(prog->function_stack));
}
printf(" <> %-12s", asm_instr[st->opcode].m);
if (st->opcode >= INSTR_IF &&
size_t p, parampos;
/* back up locals */
- st.localsp = prog->localstack_count;
+ st.localsp = vec_size(prog->localstack);
st.stmt = prog->statement;
st.function = func;
if (prog->xflags & VMXF_TRACE) {
- (void)!qc_program_function_stack_add(prog, prog_getstring(prog, func->name));
+ vec_push(prog->function_stack, prog_getstring(prog, func->name));
}
#ifdef QCVM_BACKUP_STRATEGY_CALLER_VARS
- if (prog->stack_count)
+ if (vec_size(prog->stack))
{
prog_section_function *cur;
- cur = prog->stack[prog->stack_count-1].function;
+ cur = prog->stack[vec_size(prog->stack)-1].function;
if (cur)
{
qcint *globals = prog->globals + cur->firstlocal;
- if (!qc_program_localstack_append(prog, globals, cur->locals))
- {
- printf("out of memory\n");
- exit(1);
- }
+ vec_append(prog->localstack, cur->locals, globals);
}
}
#else
{
qcint *globals = prog->globals + func->firstlocal;
- if (!qc_program_localstack_append(prog, globals, func->locals))
- {
- printf("out of memory\n");
- exit(1);
- }
+ vec_append(prog->localstack, func->locals, globals);
}
#endif
}
}
- if (!qc_program_stack_add(prog, st)) {
- printf("out of memory\n");
- exit(1);
- }
+ vec_push(prog->stack, st);
return func->entry;
}
prog_section_function *prev = NULL;
size_t oldsp;
- qc_exec_stack st = prog->stack[prog->stack_count-1];
+ qc_exec_stack st = vec_last(prog->stack);
if (prog->xflags & VMXF_TRACE) {
- if (prog->function_stack_count)
- prog->function_stack_count--;
+ if (vec_size(prog->function_stack))
+ vec_pop(prog->function_stack);
}
#ifdef QCVM_BACKUP_STRATEGY_CALLER_VARS
- if (prog->stack_count > 1) {
- prev = prog->stack[prog->stack_count-2].function;
- oldsp = prog->stack[prog->stack_count-2].localsp;
+ if (vec_size(prog->stack) > 1) {
+ prev = prog->stack[vec_size(prog->stack)-2].function;
+ oldsp = prog->stack[vec_size(prog->stack)-2].localsp;
}
#else
- prev = prog->stack[prog->stack_count-1].function;
- oldsp = prog->stack[prog->stack_count-1].localsp;
+ prev = prog->stack[vec_size(prog->stack)-1].function;
+ oldsp = prog->stack[vec_size(prog->stack)-1].localsp;
#endif
if (prev) {
qcint *globals = prog->globals + prev->firstlocal;
memcpy(globals, prog->localstack + oldsp, prev->locals);
- if (!qc_program_localstack_resize(prog, oldsp)) {
- printf("out of memory\n");
- exit(1);
- }
+ /* vec_remove(prog->localstack, oldsp, vec_size(prog->localstack)-oldsp); */
+ vec_shrinkto(prog->localstack, oldsp);
}
- if (!qc_program_stack_remove(prog, prog->stack_count-1)) {
- printf("out of memory\n");
- exit(1);
- }
+ vec_pop(prog->stack);
return st.stmt - 1; /* offset the ++st */
}
cleanup:
prog->xflags = oldxflags;
- prog->localstack_count = 0;
- prog->stack_count = 0;
+ vec_free(prog->localstack);
+ vec_free(prog->stack);
if (prog->vmerror)
return false;
return true;
const char *value;
} qcvm_parameter;
-VECTOR_MAKE(qcvm_parameter, main_params);
+qcvm_parameter *main_params = NULL;
#define CheckArgs(num) do { \
if (prog->argc != (num)) { \
{
size_t i;
const char *laststr = NULL;
- for (i = 0; i < prog->argc; ++i) {
+ for (i = 0; i < (size_t)prog->argc; ++i) {
qcany *str = (qcany*)(prog->globals + OFS_PARM0 + 3*i);
printf("%s", (laststr = prog_getstring(prog, str->string)));
}
qcany *vec, len;
CheckArgs(1);
vec = GetArg(0);
- len._float = sqrt(vec->vector[0] * vec->vector[0] +
+ len._float = sqrt(vec->vector[0] * vec->vector[0] +
vec->vector[1] * vec->vector[1] +
vec->vector[2] * vec->vector[2]);
Return(len);
size_t i;
qcany *arg;
- for (i = 0; i < main_params_elements; ++i) {
+ for (i = 0; i < vec_size(main_params); ++i) {
arg = GetGlobal(OFS_PARM0 + 3*i);
arg->vector[0] = 0;
arg->vector[1] = 0;
arg->vector[2] = 0;
- switch (main_params_data[i].vtype) {
+ switch (main_params[i].vtype) {
case TYPE_VECTOR:
#ifdef WIN32
- (void)sscanf_s(main_params_data[i].value, " %f %f %f ",
+ (void)sscanf_s(main_params[i].value, " %f %f %f ",
&arg->vector[0],
&arg->vector[1],
&arg->vector[2]);
#else
- (void)sscanf(main_params_data[i].value, " %f %f %f ",
+ (void)sscanf(main_params[i].value, " %f %f %f ",
&arg->vector[0],
&arg->vector[1],
&arg->vector[2]);
#endif
break;
case TYPE_FLOAT:
- arg->_float = atof(main_params_data[i].value);
+ arg->_float = atof(main_params[i].value);
break;
case TYPE_STRING:
- arg->string = prog_tempstring(prog, main_params_data[i].value);
+ arg->string = prog_tempstring(prog, main_params[i].value);
break;
default:
- printf("error: unhandled parameter type: %i\n", main_params_data[i].vtype);
+ printf("error: unhandled parameter type: %i\n", main_params[i].vtype);
break;
}
}
usage();
p.value = argv[1];
- if (main_params_add(p) < 0) {
- if (main_params_data)
- mem_d(main_params_data);
- printf("cannot add parameter\n");
- exit(1);
- }
+ vec_push(main_params, p);
--argc;
++argv;
}
prog->builtins = qc_builtins;
prog->builtins_count = qc_builtins_count;
- prog->builtins_alloc = 0;
if (opts_info) {
- printf("Program's system-checksum = 0x%04x\n", (int)prog->crc16);
- printf("Entity field space: %i\n", (int)prog->entityfields);
+ printf("Program's system-checksum = 0x%04x\n", (unsigned int)prog->crc16);
+ printf("Entity field space: %u\n", (unsigned int)prog->entityfields);
+ printf("Globals: %u\n", (unsigned int)vec_size(prog->globals));
}
- for (i = 1; i < prog->functions_count; ++i) {
+ for (i = 1; i < vec_size(prog->functions); ++i) {
const char *name = prog_getstring(prog, prog->functions[i].name);
/* printf("Found function: %s\n", name); */
if (!strcmp(name, "main"))
return 0;
}
if (opts_disasm) {
- for (i = 1; i < prog->functions_count; ++i)
+ for (i = 1; i < vec_size(prog->functions); ++i)
prog_disasm_function(prog, i);
return 0;
}
if (opts_printdefs) {
- for (i = 0; i < prog->defs_count; ++i) {
+ for (i = 0; i < vec_size(prog->defs); ++i) {
printf("Global: %8s %-16s at %u\n",
type_name[prog->defs[i].type & DEF_TYPEMASK],
prog_getstring(prog, prog->defs[i].name),
}
}
else if (opts_printfields) {
- for (i = 0; i < prog->fields_count; ++i) {
+ for (i = 0; i < vec_size(prog->fields); ++i) {
printf("Field: %8s %-16s at %u\n",
type_name[prog->fields[i].type],
prog_getstring(prog, prog->fields[i].name),
GLOBAL(OFS_RETURN)->ivector[2] = OPA->ivector[2];
st = prog->code + prog_leavefunction(prog);
- if (!prog->stack_count)
+ if (!vec_size(prog->stack))
goto cleanup;
break;
qcvmerror(prog, "progs `%s` attempted to read an out of bounds entity", prog->filename);
goto cleanup;
}
- if (OPB->_int < 0 || OPB->_int + 3 > prog->entityfields)
+ if (OPB->_int < 0 || OPB->_int + 3 > (qcint)prog->entityfields)
{
qcvmerror(prog, "prog `%s` attempted to read an invalid field from entity (%i)",
prog->filename,
case INSTR_STOREP_ENT:
case INSTR_STOREP_FLD:
case INSTR_STOREP_FNC:
- if (OPB->_int < 0 || OPB->_int >= prog->entitydata_count) {
+ if (OPB->_int < 0 || OPB->_int >= (qcint)vec_size(prog->entitydata)) {
qcvmerror(prog, "`%s` attempted to write to an out of bounds edict (%i)", prog->filename, OPB->_int);
goto cleanup;
}
- if (OPB->_int < prog->entityfields && !prog->allowworldwrites)
+ if (OPB->_int < (qcint)prog->entityfields && !prog->allowworldwrites)
qcvmerror(prog, "`%s` tried to assign to world.%s (field %i)\n",
prog->filename,
prog_getstring(prog, prog_entfield(prog, OPB->_int)->name),
ptr->_int = OPA->_int;
break;
case INSTR_STOREP_V:
- if (OPB->_int < 0 || OPB->_int + 2 >= prog->entitydata_count) {
+ if (OPB->_int < 0 || OPB->_int + 2 >= (qcint)vec_size(prog->entitydata)) {
qcvmerror(prog, "`%s` attempted to write to an out of bounds edict (%i)", prog->filename, OPB->_int);
goto cleanup;
}
- if (OPB->_int < prog->entityfields && !prog->allowworldwrites)
+ if (OPB->_int < (qcint)prog->entityfields && !prog->allowworldwrites)
qcvmerror(prog, "`%s` tried to assign to world.%s (field %i)\n",
prog->filename,
prog_getstring(prog, prog_entfield(prog, OPB->_int)->name),
if (!OPA->function)
qcvmerror(prog, "NULL function in `%s`", prog->filename);
- if(!OPA->function || OPA->function >= (unsigned int)prog->functions_count)
+ if(!OPA->function || OPA->function >= (qcint)vec_size(prog->functions))
{
qcvmerror(prog, "CALL outside the program in `%s`", prog->filename);
goto cleanup;
if (newf->entry < 0)
{
/* negative statements are built in functions */
- int builtinnumber = -newf->entry;
- if (builtinnumber < prog->builtins_count && prog->builtins[builtinnumber])
+ qcint builtinnumber = -newf->entry;
+ if (builtinnumber < (qcint)prog->builtins_count && prog->builtins[builtinnumber])
prog->builtins[builtinnumber](prog);
else
qcvmerror(prog, "No such builtin #%i in %s! Try updating your gmqcc sources",
projects / xonotic / gmqcc.git / blobdiff