/*
- * Copyright (C) 2012
+ * Copyright (C) 2012, 2013
* Wolfgang Bumiller
* Dale Weiler
*
#include <stdio.h>
#include <string.h>
#include <stdarg.h>
+#include <stdlib.h>
#include "gmqcc.h"
va_start(ap, fmt);
vprintf(fmt, ap);
va_end(ap);
- printf(": %s\n", strerror(err));
+ printf(": %s\n", util_strerror(err));
}
-static void qcvmerror(qc_program *prog, const char *fmt, ...)
+static void qcvmerror(qc_program_t *prog, const char *fmt, ...)
{
va_list ap;
putchar('\n');
}
-qc_program* prog_load(const char *filename)
+qc_program_t* prog_load(const char *filename, bool skipversion)
{
- qc_program *prog;
- prog_header header;
- FILE *file = file_open(filename, "rb");
+ qc_program_t *prog;
+ prog_header_t header;
+ FILE *file = fs_file_open(filename, "rb");
if (!file)
return NULL;
- if (file_read(&header, sizeof(header), 1, file) != 1) {
+ if (fs_file_read(&header, sizeof(header), 1, file) != 1) {
loaderror("failed to read header from '%s'", filename);
- file_close(file);
+ fs_file_close(file);
return NULL;
}
- if (header.version != 6) {
+ if (!skipversion && header.version != 6) {
loaderror("header says this is a version %i progs, we need version 6\n", header.version);
- file_close(file);
+ fs_file_close(file);
return NULL;
}
- prog = (qc_program*)mem_a(sizeof(qc_program));
+ prog = (qc_program_t*)mem_a(sizeof(qc_program_t));
if (!prog) {
- file_close(file);
- printf("failed to allocate program data\n");
+ fs_file_close(file);
+ fprintf(stderr, "failed to allocate program data\n");
return NULL;
}
memset(prog, 0, sizeof(*prog));
}
#define read_data(hdrvar, progvar, reserved) \
- if (file_seek(file, header.hdrvar.offset, SEEK_SET) != 0) { \
+ if (fs_file_seek(file, header.hdrvar.offset, SEEK_SET) != 0) { \
loaderror("seek failed"); \
goto error; \
} \
- if (file_read ( \
+ if (fs_file_read ( \
vec_add(prog->progvar, header.hdrvar.length + reserved), \
sizeof(*prog->progvar), \
header.hdrvar.length, \
read_data1(strings);
read_data2(globals, 2); /* reserve more in case a RETURN using with the global at "the end" exists */
- file_close(file);
+ fs_file_close(file);
/* profile counters */
memset(vec_add(prog->profile, vec_size(prog->code)), 0, sizeof(prog->profile[0]) * vec_size(prog->code));
vec_free(prog->entitydata);
vec_free(prog->entitypool);
mem_d(prog);
+
+ fs_file_close(file);
return NULL;
}
-void prog_delete(qc_program *prog)
+void prog_delete(qc_program_t *prog)
{
if (prog->filename) mem_d(prog->filename);
vec_free(prog->code);
* VM code
*/
-char* prog_getstring(qc_program *prog, qcint str)
-{
- if (str < 0 || str >= (qcint)vec_size(prog->strings))
- return "<<<invalid string>>>";
+const char* prog_getstring(qc_program_t *prog, qcint_t str) {
+ /* cast for return required for C++ */
+ if (str < 0 || str >= (qcint_t)vec_size(prog->strings))
+ return "<<<invalid string>>>";
+
return prog->strings + str;
}
-prog_section_def* prog_entfield(qc_program *prog, qcint off)
-{
+prog_section_def_t* prog_entfield(qc_program_t *prog, qcint_t off) {
size_t i;
for (i = 0; i < vec_size(prog->fields); ++i) {
if (prog->fields[i].offset == off)
return NULL;
}
-prog_section_def* prog_getdef(qc_program *prog, qcint off)
+prog_section_def_t* prog_getdef(qc_program_t *prog, qcint_t off)
{
size_t i;
for (i = 0; i < vec_size(prog->defs); ++i) {
return NULL;
}
-qcany* prog_getedict(qc_program *prog, qcint e)
-{
- if (e >= (qcint)vec_size(prog->entitypool)) {
+qcany_t* prog_getedict(qc_program_t *prog, qcint_t e) {
+ if (e >= (qcint_t)vec_size(prog->entitypool)) {
prog->vmerror++;
- printf("Accessing out of bounds edict %i\n", (int)e);
+ fprintf(stderr, "Accessing out of bounds edict %i\n", (int)e);
e = 0;
}
- return (qcany*)(prog->entitydata + (prog->entityfields * e));
+ return (qcany_t*)(prog->entitydata + (prog->entityfields * e));
}
-qcint prog_spawn_entity(qc_program *prog)
-{
+qcint_t prog_spawn_entity(qc_program_t *prog) {
char *data;
- qcint e;
- for (e = 0; e < (qcint)vec_size(prog->entitypool); ++e) {
+ qcint_t e;
+ for (e = 0; e < (qcint_t)vec_size(prog->entitypool); ++e) {
if (!prog->entitypool[e]) {
data = (char*)(prog->entitydata + (prog->entityfields * e));
- memset(data, 0, prog->entityfields * sizeof(qcint));
+ memset(data, 0, prog->entityfields * sizeof(qcint_t));
return e;
}
}
vec_push(prog->entitypool, true);
prog->entities++;
data = (char*)vec_add(prog->entitydata, prog->entityfields);
- memset(data, 0, prog->entityfields * sizeof(qcint));
+ memset(data, 0, prog->entityfields * sizeof(qcint_t));
return e;
}
-void prog_free_entity(qc_program *prog, qcint e)
-{
+void prog_free_entity(qc_program_t *prog, qcint_t e) {
if (!e) {
prog->vmerror++;
- printf("Trying to free world entity\n");
+ fprintf(stderr, "Trying to free world entity\n");
return;
}
- if (e >= (qcint)vec_size(prog->entitypool)) {
+ if (e >= (qcint_t)vec_size(prog->entitypool)) {
prog->vmerror++;
- printf("Trying to free out of bounds entity\n");
+ fprintf(stderr, "Trying to free out of bounds entity\n");
return;
}
if (!prog->entitypool[e]) {
prog->vmerror++;
- printf("Double free on entity\n");
+ fprintf(stderr, "Double free on entity\n");
return;
}
prog->entitypool[e] = false;
}
-qcint prog_tempstring(qc_program *prog, const char *_str)
-{
- /* we don't access it, but the macro-generated functions don't use
- * const
- */
- char *str = (char*)_str;
-
+qcint_t prog_tempstring(qc_program_t *prog, const char *str) {
size_t len = strlen(str);
size_t at = prog->tempstring_at;
return at;
}
-static size_t print_escaped_string(const char *str, size_t maxlen)
-{
+static size_t print_escaped_string(const char *str, size_t maxlen) {
size_t len = 2;
putchar('"');
--maxlen; /* because we're lazy and have escape sequences */
return len;
}
-static void trace_print_global(qc_program *prog, unsigned int glob, int vtype)
-{
+static void trace_print_global(qc_program_t *prog, unsigned int glob, int vtype) {
static char spaces[28+1] = " ";
- prog_section_def *def;
- qcany *value;
+ prog_section_def_t *def;
+ qcany_t *value;
int len;
if (!glob) {
- len = printf("<null>,");
+ if ((len = printf("<null>,")) == -1)
+ len = 0;
+
goto done;
}
def = prog_getdef(prog, glob);
- value = (qcany*)(&prog->globals[glob]);
+ value = (qcany_t*)(&prog->globals[glob]);
len = printf("[@%u] ", glob);
if (def) {
value->vector[2]);
break;
case TYPE_STRING:
- len += print_escaped_string(prog_getstring(prog, value->string), sizeof(spaces)-len-5);
+ if (value->string)
+ len += print_escaped_string(prog_getstring(prog, value->string), sizeof(spaces)-len-5);
+ else
+ len += printf("(null)");
len += printf(",");
/* len += printf("\"%s\",", prog_getstring(prog, value->string)); */
break;
done:
if (len < (int)sizeof(spaces)-1) {
spaces[sizeof(spaces)-1-len] = 0;
- printf(spaces);
+ fs_file_puts(stdout, spaces);
spaces[sizeof(spaces)-1-len] = ' ';
}
}
-static void prog_print_statement(qc_program *prog, prog_section_statement *st)
-{
- if (st->opcode >= (sizeof(asm_instr)/sizeof(asm_instr[0]))) {
+static void prog_print_statement(qc_program_t *prog, prog_section_statement_t *st) {
+ if (st->opcode >= VINSTR_END) {
printf("<illegal instruction %d>\n", st->opcode);
return;
}
printf("->");
printf("%s:", vec_last(prog->function_stack));
}
- printf(" <> %-12s", asm_instr[st->opcode].m);
+ printf(" <> %-12s", util_instr_str[st->opcode]);
if (st->opcode >= INSTR_IF &&
st->opcode <= INSTR_IFNOT)
{
else printf("(none)");
printf("\n");
}
- fflush(stdout);
}
-static qcint prog_enterfunction(qc_program *prog, prog_section_function *func)
-{
- qc_exec_stack st;
+static qcint_t prog_enterfunction(qc_program_t *prog, prog_section_function_t *func) {
+ qc_exec_stack_t st;
size_t parampos;
int32_t p;
st.function = func;
if (prog->xflags & VMXF_TRACE) {
- vec_push(prog->function_stack, prog_getstring(prog, func->name));
+ const char *str = prog_getstring(prog, func->name);
+ vec_push(prog->function_stack, str);
}
#ifdef QCVM_BACKUP_STRATEGY_CALLER_VARS
if (vec_size(prog->stack))
{
- prog_section_function *cur;
+ prog_section_function_t *cur;
cur = prog->stack[vec_size(prog->stack)-1].function;
if (cur)
{
- qcint *globals = prog->globals + cur->firstlocal;
+ qcint_t *globals = prog->globals + cur->firstlocal;
vec_append(prog->localstack, cur->locals, globals);
}
}
#else
{
- qcint *globals = prog->globals + func->firstlocal;
+ qcint_t *globals = prog->globals + func->firstlocal;
vec_append(prog->localstack, func->locals, globals);
}
#endif
return func->entry;
}
-static qcint prog_leavefunction(qc_program *prog)
-{
- prog_section_function *prev = NULL;
+static qcint_t prog_leavefunction(qc_program_t *prog) {
+ prog_section_function_t *prev = NULL;
size_t oldsp;
- qc_exec_stack st = vec_last(prog->stack);
+ qc_exec_stack_t st = vec_last(prog->stack);
if (prog->xflags & VMXF_TRACE) {
if (vec_size(prog->function_stack))
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);
+ qcint_t *globals = prog->globals + prev->firstlocal;
+ memcpy(globals, prog->localstack + oldsp, prev->locals * sizeof(prog->localstack[0]));
/* vec_remove(prog->localstack, oldsp, vec_size(prog->localstack)-oldsp); */
vec_shrinkto(prog->localstack, oldsp);
}
return st.stmt - 1; /* offset the ++st */
}
-bool prog_exec(qc_program *prog, prog_section_function *func, size_t flags, long maxjumps)
-{
+bool prog_exec(qc_program_t *prog, prog_section_function_t *func, size_t flags, long maxjumps) {
long jumpcount = 0;
size_t oldxflags = prog->xflags;
- prog_section_statement *st;
+ prog_section_statement_t *st;
prog->vmerror = 0;
prog->xflags = flags;
"field",
"function",
"pointer",
-#if 0
"integer",
-#endif
- "variant"
+
+ "variant",
+
+ "struct",
+ "union",
+ "array",
+
+ "nil",
+ "noexpr"
};
typedef struct {
const char *value;
} qcvm_parameter;
-qcvm_parameter *main_params = NULL;
+static qcvm_parameter *main_params = NULL;
#define CheckArgs(num) do { \
if (prog->argc != (num)) { \
prog->vmerror++; \
- printf("ERROR: invalid number of arguments for %s: %i, expected %i\n", \
+ fprintf(stderr, "ERROR: invalid number of arguments for %s: %i, expected %i\n", \
__FUNCTION__, prog->argc, (num)); \
return -1; \
} \
} while (0)
-#define GetGlobal(idx) ((qcany*)(prog->globals + (idx)))
+#define GetGlobal(idx) ((qcany_t*)(prog->globals + (idx)))
#define GetArg(num) GetGlobal(OFS_PARM0 + 3*(num))
#define Return(any) *(GetGlobal(OFS_RETURN)) = (any)
-static int qc_print(qc_program *prog)
-{
+static int qc_print(qc_program_t *prog) {
size_t i;
const char *laststr = NULL;
for (i = 0; i < (size_t)prog->argc; ++i) {
- qcany *str = (qcany*)(prog->globals + OFS_PARM0 + 3*i);
+ qcany_t *str = (qcany_t*)(prog->globals + OFS_PARM0 + 3*i);
laststr = prog_getstring(prog, str->string);
printf("%s", laststr);
}
return 0;
}
-static int qc_error(qc_program *prog)
-{
- printf("*** VM raised an error:\n");
+static int qc_error(qc_program_t *prog) {
+ fprintf(stderr, "*** VM raised an error:\n");
qc_print(prog);
prog->vmerror++;
return -1;
}
-static int qc_ftos(qc_program *prog)
-{
+static int qc_ftos(qc_program_t *prog) {
char buffer[512];
- qcany *num;
- qcany str;
+ qcany_t *num;
+ qcany_t str;
CheckArgs(1);
num = GetArg(0);
- snprintf(buffer, sizeof(buffer), "%g", num->_float);
+ util_snprintf(buffer, sizeof(buffer), "%g", num->_float);
str.string = prog_tempstring(prog, buffer);
Return(str);
return 0;
}
-static int qc_stof(qc_program *prog)
-{
- qcany *str;
- qcany num;
+static int qc_stof(qc_program_t *prog) {
+ qcany_t *str;
+ qcany_t num;
CheckArgs(1);
str = GetArg(0);
- num._float = strtof(prog_getstring(prog, str->string), NULL);
+ num._float = (float)strtod(prog_getstring(prog, str->string), NULL);
Return(num);
return 0;
}
-static int qc_vtos(qc_program *prog)
-{
+static int qc_vtos(qc_program_t *prog) {
char buffer[512];
- qcany *num;
- qcany str;
+ qcany_t *num;
+ qcany_t str;
CheckArgs(1);
num = GetArg(0);
- snprintf(buffer, sizeof(buffer), "'%g %g %g'", num->vector[0], num->vector[1], num->vector[2]);
+ util_snprintf(buffer, sizeof(buffer), "'%g %g %g'", num->vector[0], num->vector[1], num->vector[2]);
str.string = prog_tempstring(prog, buffer);
Return(str);
return 0;
}
-static int qc_etos(qc_program *prog)
-{
+static int qc_etos(qc_program_t *prog) {
char buffer[512];
- qcany *num;
- qcany str;
+ qcany_t *num;
+ qcany_t str;
CheckArgs(1);
num = GetArg(0);
- snprintf(buffer, sizeof(buffer), "%i", num->_int);
+ util_snprintf(buffer, sizeof(buffer), "%i", num->_int);
str.string = prog_tempstring(prog, buffer);
Return(str);
return 0;
}
-static int qc_spawn(qc_program *prog)
-{
- qcany ent;
+static int qc_spawn(qc_program_t *prog) {
+ qcany_t ent;
CheckArgs(0);
ent.edict = prog_spawn_entity(prog);
Return(ent);
return (ent.edict ? 0 : -1);
}
-static int qc_kill(qc_program *prog)
-{
- qcany *ent;
+static int qc_kill(qc_program_t *prog) {
+ qcany_t *ent;
CheckArgs(1);
ent = GetArg(0);
prog_free_entity(prog, ent->edict);
return 0;
}
-static int qc_vlen(qc_program *prog)
-{
- qcany *vec, len;
+static int qc_sqrt(qc_program_t *prog) {
+ qcany_t *num, out;
+ CheckArgs(1);
+ num = GetArg(0);
+ out._float = sqrt(num->_float);
+ Return(out);
+ return 0;
+}
+
+static int qc_vlen(qc_program_t *prog) {
+ qcany_t *vec, len;
CheckArgs(1);
vec = GetArg(0);
len._float = sqrt(vec->vector[0] * vec->vector[0] +
return 0;
}
-static prog_builtin qc_builtins[] = {
+static int qc_normalize(qc_program_t *prog) {
+ double len;
+ qcany_t *vec;
+ qcany_t out;
+ CheckArgs(1);
+ vec = GetArg(0);
+ len = sqrt(vec->vector[0] * vec->vector[0] +
+ vec->vector[1] * vec->vector[1] +
+ vec->vector[2] * vec->vector[2]);
+ if (len)
+ len = 1.0 / len;
+ else
+ len = 0;
+ out.vector[0] = len * vec->vector[0];
+ out.vector[1] = len * vec->vector[1];
+ out.vector[2] = len * vec->vector[2];
+ Return(out);
+ return 0;
+}
+
+static int qc_strcat(qc_program_t *prog) {
+ char *buffer;
+ size_t len1, len2;
+ qcany_t *str1, *str2;
+ qcany_t out;
+
+ const char *cstr1;
+ const char *cstr2;
+
+ CheckArgs(2);
+ str1 = GetArg(0);
+ str2 = GetArg(1);
+ cstr1 = prog_getstring(prog, str1->string);
+ cstr2 = prog_getstring(prog, str2->string);
+ len1 = strlen(cstr1);
+ len2 = strlen(cstr2);
+ buffer = (char*)mem_a(len1 + len2 + 1);
+ memcpy(buffer, cstr1, len1);
+ memcpy(buffer+len1, cstr2, len2+1);
+ out.string = prog_tempstring(prog, buffer);
+ mem_d(buffer);
+ Return(out);
+ return 0;
+}
+
+static int qc_strcmp(qc_program_t *prog) {
+ qcany_t *str1, *str2;
+ qcany_t out;
+
+ const char *cstr1;
+ const char *cstr2;
+
+ if (prog->argc != 2 && prog->argc != 3) {
+ fprintf(stderr, "ERROR: invalid number of arguments for strcmp/strncmp: %i, expected 2 or 3\n",
+ prog->argc);
+ return -1;
+ }
+
+ str1 = GetArg(0);
+ str2 = GetArg(1);
+ cstr1 = prog_getstring(prog, str1->string);
+ cstr2 = prog_getstring(prog, str2->string);
+ if (prog->argc == 3)
+ out._float = strncmp(cstr1, cstr2, GetArg(2)->_float);
+ else
+ out._float = strcmp(cstr1, cstr2);
+ Return(out);
+ return 0;
+}
+
+static int qc_floor(qc_program_t *prog) {
+ qcany_t *num, out;
+ CheckArgs(1);
+ num = GetArg(0);
+ out._float = floor(num->_float);
+ Return(out);
+ return 0;
+}
+
+static prog_builtin_t qc_builtins[] = {
NULL,
- &qc_print, /* 1 */
- &qc_ftos, /* 2 */
- &qc_spawn, /* 3 */
- &qc_kill, /* 4 */
- &qc_vtos, /* 5 */
- &qc_error, /* 6 */
- &qc_vlen, /* 7 */
- &qc_etos, /* 8 */
- &qc_stof /* 9 */
+ &qc_print, /* 1 */
+ &qc_ftos, /* 2 */
+ &qc_spawn, /* 3 */
+ &qc_kill, /* 4 */
+ &qc_vtos, /* 5 */
+ &qc_error, /* 6 */
+ &qc_vlen, /* 7 */
+ &qc_etos, /* 8 */
+ &qc_stof, /* 9 */
+ &qc_strcat, /* 10 */
+ &qc_strcmp, /* 11 */
+ &qc_normalize, /* 12 */
+ &qc_sqrt, /* 13 */
+ &qc_floor /* 14 */
};
static size_t qc_builtins_count = sizeof(qc_builtins) / sizeof(qc_builtins[0]);
static const char *arg0 = NULL;
-static void version() {
+static void version(void) {
printf("GMQCC-QCVM %d.%d.%d Built %s %s\n",
GMQCC_VERSION_MAJOR,
GMQCC_VERSION_MINOR,
);
}
-static void usage()
-{
+static void usage(void) {
printf("usage: %s [options] [parameters] file\n", arg0);
printf("options:\n");
- printf(" -h, --help print this message\n"
- " -trace trace the execution\n"
- " -profile perform profiling during execution\n"
- " -info print information from the prog's header\n"
- " -disasm disassemble and exit\n"
- " -printdefs list the defs section\n"
- " -printfields list the field section\n"
- " -printfuns list functions information\n");
+ printf(" -h, --help print this message\n"
+ " -trace trace the execution\n"
+ " -profile perform profiling during execution\n"
+ " -info print information from the prog's header\n"
+ " -disasm disassemble and exit\n"
+ " -disasm-func func disassemble and exit\n"
+ " -printdefs list the defs section\n"
+ " -printfields list the field section\n"
+ " -printfuns list functions information\n"
+ " -v be verbose\n"
+ " -vv be even more verbose\n");
printf("parameters:\n");
printf(" -vector <V> pass a vector parameter to main()\n"
" -float <f> pass a float parameter to main()\n"
" -string <s> pass a string parameter to main() \n");
}
-static void prog_main_setparams(qc_program *prog)
-{
+static void prog_main_setparams(qc_program_t *prog) {
size_t i;
- qcany *arg;
+ qcany_t *arg;
for (i = 0; i < vec_size(main_params); ++i) {
arg = GetGlobal(OFS_PARM0 + 3*i);
arg->string = prog_tempstring(prog, main_params[i].value);
break;
default:
- printf("error: unhandled parameter type: %i\n", main_params[i].vtype);
+ fprintf(stderr, "error: unhandled parameter type: %i\n", main_params[i].vtype);
break;
}
}
}
-void prog_disasm_function(qc_program *prog, size_t id);
-int main(int argc, char **argv)
-{
+void escapestring(char* dest, const char* src) {
+ char c;
+ while ((c = *(src++))) {
+ switch(c) {
+ case '\t':
+ *(dest++) = '\\', *(dest++) = 't';
+ break;
+ case '\n':
+ *(dest++) = '\\', *(dest++) = 'n';
+ break;
+ case '\r':
+ *(dest++) = '\\', *(dest++) = 'r';
+ break;
+ case '\\':
+ *(dest++) = '\\', *(dest++) = '\\';
+ break;
+ case '\"':
+ *(dest++) = '\\', *(dest++) = '\"';
+ break;
+ default:
+ *(dest++) = c;
+ }
+ }
+ *dest = '\0';
+}
+
+void prog_disasm_function(qc_program_t *prog, size_t id);
+
+int main(int argc, char **argv) {
size_t i;
- qcint fnmain = -1;
- qc_program *prog;
+ qcint_t fnmain = -1;
+ qc_program_t *prog;
size_t xflags = VMXF_DEFAULT;
bool opts_printfields = false;
bool opts_printdefs = false;
bool opts_info = false;
bool noexec = false;
const char *progsfile = NULL;
+ const char **dis_list = NULL;
+ int opts_v = 0;
arg0 = argv[0];
usage();
exit(0);
}
- else if (!strcmp(argv[1], "-v") ||
- !strcmp(argv[1], "-version") ||
+ else if (!strcmp(argv[1], "-v")) {
+ ++opts_v;
+ --argc;
+ ++argv;
+ }
+ else if (!strncmp(argv[1], "-vv", 3)) {
+ const char *av = argv[1]+1;
+ for (; *av; ++av) {
+ if (*av == 'v')
+ ++opts_v;
+ else {
+ usage();
+ exit(1);
+ }
+ }
+ --argc;
+ ++argv;
+ }
+ else if (!strcmp(argv[1], "-version") ||
!strcmp(argv[1], "--version"))
{
version();
opts_disasm = true;
noexec = true;
}
+ else if (!strcmp(argv[1], "-disasm-func")) {
+ --argc;
+ ++argv;
+ if (argc <= 1) {
+ usage();
+ exit(1);
+ }
+ vec_push(dis_list, argv[1]);
+ --argc;
+ ++argv;
+ noexec = true;
+ }
else if (!strcmp(argv[1], "-printdefs")) {
--argc;
++argv;
p.vtype = TYPE_STRING;
else if (argv[1][1] == 'v')
p.vtype = TYPE_VECTOR;
+ else
+ p.vtype = TYPE_VOID;
--argc;
++argv;
- if (argc < 3) {
+ if (argc < 2) {
usage();
exit(1);
}
}
else if (argv[1][0] != '-') {
if (progsfile) {
- printf("only 1 program file may be specified\n");
+ fprintf(stderr, "only 1 program file may be specified\n");
usage();
exit(1);
}
}
else
{
+ fprintf(stderr, "unknown parameter: %s\n", argv[1]);
usage();
exit(1);
}
}
- if (argc > 2) {
- usage();
- exit(1);
- }
- if (argc > 1) {
- if (progsfile) {
- printf("only 1 program file may be specified\n");
- usage();
- exit(1);
- }
+ if (argc == 2 && !progsfile) {
progsfile = argv[1];
--argc;
++argv;
}
if (!progsfile) {
+ fprintf(stderr, "must specify a program to execute\n");
usage();
exit(1);
}
- prog = prog_load(progsfile);
+ prog = prog_load(progsfile, noexec);
if (!prog) {
- printf("failed to load program '%s'\n", progsfile);
+ fprintf(stderr, "failed to load program '%s'\n", progsfile);
exit(1);
}
prog_delete(prog);
return 0;
}
+ for (i = 0; i < vec_size(dis_list); ++i) {
+ size_t k;
+ printf("Looking for `%s`\n", dis_list[i]);
+ for (k = 1; k < vec_size(prog->functions); ++k) {
+ const char *name = prog_getstring(prog, prog->functions[k].name);
+ if (!strcmp(name, dis_list[i])) {
+ prog_disasm_function(prog, k);
+ break;
+ }
+ }
+ }
if (opts_disasm) {
for (i = 1; i < vec_size(prog->functions); ++i)
prog_disasm_function(prog, i);
return 0;
}
if (opts_printdefs) {
+ char *escape = NULL;
+ const char *getstring = NULL;
+
for (i = 0; i < vec_size(prog->defs); ++i) {
- printf("Global: %8s %-16s at %u%s\n",
+ printf("Global: %8s %-16s at %u%s",
type_name[prog->defs[i].type & DEF_TYPEMASK],
prog_getstring(prog, prog->defs[i].name),
(unsigned int)prog->defs[i].offset,
((prog->defs[i].type & DEF_SAVEGLOBAL) ? " [SAVE]" : ""));
+ if (opts_v) {
+ switch (prog->defs[i].type & DEF_TYPEMASK) {
+ case TYPE_FLOAT:
+ printf(" [init: %g]", ((qcany_t*)(prog->globals + prog->defs[i].offset))->_float);
+ break;
+ case TYPE_INTEGER:
+ printf(" [init: %i]", (int)( ((qcany_t*)(prog->globals + prog->defs[i].offset))->_int ));
+ break;
+ case TYPE_ENTITY:
+ case TYPE_FUNCTION:
+ case TYPE_FIELD:
+ case TYPE_POINTER:
+ printf(" [init: %u]", (unsigned)( ((qcany_t*)(prog->globals + prog->defs[i].offset))->_int ));
+ break;
+ case TYPE_STRING:
+ getstring = prog_getstring(prog, ((qcany_t*)(prog->globals + prog->defs[i].offset))->string);
+ escape = (char*)mem_a(strlen(getstring) * 2 + 1); /* will be enough */
+ escapestring(escape, getstring);
+ printf(" [init: `%s`]", escape);
+
+ mem_d(escape); /* free */
+ break;
+ default:
+ break;
+ }
+ }
+ printf("\n");
}
}
if (opts_printfields) {
for (a = 0; a < prog->functions[i].nargs; ++a) {
printf(" %i", prog->functions[i].argsize[a]);
}
- printf(") locals: %i + %i\n",
- prog->functions[i].firstlocal,
- prog->functions[i].locals);
+ if (opts_v > 1) {
+ int32_t start = prog->functions[i].entry;
+ if (start < 0)
+ printf(") builtin %i\n", (int)-start);
+ else {
+ size_t funsize = 0;
+ prog_section_statement_t *st = prog->code + start;
+ for (;st->opcode != INSTR_DONE; ++st)
+ ++funsize;
+ printf(") - %lu instructions", (unsigned long)funsize);
+ if (opts_v > 2) {
+ printf(" - locals: %i + %i\n",
+ prog->functions[i].firstlocal,
+ prog->functions[i].locals);
+ }
+ else
+ printf("\n");
+ }
+ }
+ else if (opts_v) {
+ printf(") locals: %i + %i\n",
+ prog->functions[i].firstlocal,
+ prog->functions[i].locals);
+ }
+ else
+ printf(")\n");
}
}
if (!noexec) {
for (i = 1; i < vec_size(prog->functions); ++i) {
const char *name = prog_getstring(prog, prog->functions[i].name);
if (!strcmp(name, "main"))
- fnmain = (qcint)i;
+ fnmain = (qcint_t)i;
}
if (fnmain > 0)
{
prog_exec(prog, &prog->functions[fnmain], xflags, VM_JUMPS_DEFAULT);
}
else
- printf("No main function found\n");
+ fprintf(stderr, "No main function found\n");
}
prog_delete(prog);
return 0;
}
-void prog_disasm_function(qc_program *prog, size_t id)
-{
- prog_section_function *fdef = prog->functions + id;
- prog_section_statement *st;
+void prog_disasm_function(qc_program_t *prog, size_t id) {
+ prog_section_function_t *fdef = prog->functions + id;
+ prog_section_statement_t *st;
if (fdef->entry < 0) {
printf("FUNCTION \"%s\" = builtin #%i\n", prog_getstring(prog, fdef->name), (int)-fdef->entry);
* sort of isn't, which makes it nicer looking.
*/
-#define OPA ( (qcany*) (prog->globals + st->o1.u1) )
-#define OPB ( (qcany*) (prog->globals + st->o2.u1) )
-#define OPC ( (qcany*) (prog->globals + st->o3.u1) )
+#define OPA ( (qcany_t*) (prog->globals + st->o1.u1) )
+#define OPB ( (qcany_t*) (prog->globals + st->o2.u1) )
+#define OPC ( (qcany_t*) (prog->globals + st->o3.u1) )
-#define GLOBAL(x) ( (qcany*) (prog->globals + (x)) )
+#define GLOBAL(x) ( (qcany_t*) (prog->globals + (x)) )
/* to be consistent with current darkplaces behaviour */
#if !defined(FLOAT_IS_TRUE_FOR_INT)
#endif
while (1) {
- prog_section_function *newf;
- qcany *ed;
- qcany *ptr;
+ prog_section_function_t *newf;
+ qcany_t *ed;
+ qcany_t *ptr;
++st;
OPA->vector[2]*OPB->vector[2];
break;
case INSTR_MUL_FV:
- OPC->vector[0] = OPA->_float * OPB->vector[0];
- OPC->vector[1] = OPA->_float * OPB->vector[1];
- OPC->vector[2] = OPA->_float * OPB->vector[2];
+ {
+ qcfloat_t f = OPA->_float;
+ OPC->vector[0] = f * OPB->vector[0];
+ OPC->vector[1] = f * OPB->vector[1];
+ OPC->vector[2] = f * OPB->vector[2];
break;
+ }
case INSTR_MUL_VF:
- OPC->vector[0] = OPB->_float * OPA->vector[0];
- OPC->vector[1] = OPB->_float * OPA->vector[1];
- OPC->vector[2] = OPB->_float * OPA->vector[2];
+ {
+ qcfloat_t f = OPB->_float;
+ OPC->vector[0] = f * OPA->vector[0];
+ OPC->vector[1] = f * OPA->vector[1];
+ OPC->vector[2] = f * OPA->vector[2];
break;
+ }
case INSTR_DIV_F:
if (OPB->_float != 0.0f)
OPC->_float = OPA->_float / OPB->_float;
goto cleanup;
}
ed = prog_getedict(prog, OPA->edict);
- OPC->_int = ((qcany*)( ((qcint*)ed) + OPB->_int ))->_int;
+ OPC->_int = ((qcany_t*)( ((qcint_t*)ed) + OPB->_int ))->_int;
break;
case INSTR_LOAD_V:
if (OPA->edict < 0 || OPA->edict >= prog->entities) {
qcvmerror(prog, "progs `%s` attempted to read an out of bounds entity", prog->filename);
goto cleanup;
}
- if (OPB->_int < 0 || OPB->_int + 3 > (qcint)prog->entityfields)
+ if (OPB->_int < 0 || OPB->_int + 3 > (qcint_t)prog->entityfields)
{
qcvmerror(prog, "prog `%s` attempted to read an invalid field from entity (%i)",
prog->filename,
goto cleanup;
}
ed = prog_getedict(prog, OPA->edict);
- OPC->ivector[0] = ((qcany*)( ((qcint*)ed) + OPB->_int ))->ivector[0];
- OPC->ivector[1] = ((qcany*)( ((qcint*)ed) + OPB->_int ))->ivector[1];
- OPC->ivector[2] = ((qcany*)( ((qcint*)ed) + OPB->_int ))->ivector[2];
+ ptr = (qcany_t*)( ((qcint_t*)ed) + OPB->_int );
+ OPC->ivector[0] = ptr->ivector[0];
+ OPC->ivector[1] = ptr->ivector[1];
+ OPC->ivector[2] = ptr->ivector[2];
break;
case INSTR_ADDRESS:
}
ed = prog_getedict(prog, OPA->edict);
- OPC->_int = ((qcint*)ed) - prog->entitydata + OPB->_int;
+ OPC->_int = ((qcint_t*)ed) - prog->entitydata + OPB->_int;
break;
case INSTR_STORE_F:
case INSTR_STOREP_ENT:
case INSTR_STOREP_FLD:
case INSTR_STOREP_FNC:
- if (OPB->_int < 0 || OPB->_int >= (qcint)vec_size(prog->entitydata)) {
+ if (OPB->_int < 0 || OPB->_int >= (qcint_t)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 < (qcint)prog->entityfields && !prog->allowworldwrites)
+ if (OPB->_int < (qcint_t)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),
OPB->_int);
- ptr = (qcany*)(prog->entitydata + OPB->_int);
+ ptr = (qcany_t*)(prog->entitydata + OPB->_int);
ptr->_int = OPA->_int;
break;
case INSTR_STOREP_V:
- if (OPB->_int < 0 || OPB->_int + 2 >= (qcint)vec_size(prog->entitydata)) {
+ if (OPB->_int < 0 || OPB->_int + 2 >= (qcint_t)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 < (qcint)prog->entityfields && !prog->allowworldwrites)
+ if (OPB->_int < (qcint_t)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),
OPB->_int);
- ptr = (qcany*)(prog->entitydata + OPB->_int);
+ ptr = (qcany_t*)(prog->entitydata + OPB->_int);
ptr->ivector[0] = OPA->ivector[0];
ptr->ivector[1] = OPA->ivector[1];
ptr->ivector[2] = OPA->ivector[2];
if (!OPA->function)
qcvmerror(prog, "NULL function in `%s`", prog->filename);
- if(!OPA->function || OPA->function >= (qcint)vec_size(prog->functions))
+ if(!OPA->function || OPA->function >= (qcint_t)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 */
- qcint builtinnumber = -newf->entry;
- if (builtinnumber < (qcint)prog->builtins_count && prog->builtins[builtinnumber])
+ qcint_t builtinnumber = -newf->entry;
+ if (builtinnumber < (qcint_t)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