/*
- * Copyright (C) 2012
+ * Copyright (C) 2012, 2013
* Wolfgang Bumiller
* Dale Weiler
*
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, ...)
putchar('\n');
}
-qc_program* prog_load(const char *filename)
+qc_program* prog_load(const char *filename, bool skipversion)
{
qc_program *prog;
prog_header header;
- FILE *file = file_open(filename, "rb");
+ 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));
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));
char* prog_getstring(qc_program *prog, qcint str)
{
+ /* cast for return required for C++ */
if (str < 0 || str >= (qcint)vec_size(prog->strings))
- return "<<<invalid string>>>";
+ return (char*)"<<<invalid string>>>";
return prog->strings + str;
}
{
if (e >= (qcint)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));
{
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)) {
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)
+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;
-
size_t len = strlen(str);
size_t at = prog->tempstring_at;
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] = ' ';
}
}
else printf("(none)");
printf("\n");
}
- fflush(stdout);
}
static qcint prog_enterfunction(qc_program *prog, prog_section_function *func)
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
#endif
if (prev) {
qcint *globals = prog->globals + prev->firstlocal;
- memcpy(globals, prog->localstack + oldsp, prev->locals);
+ 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);
}
"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; \
} \
static int qc_error(qc_program *prog)
{
- printf("*** VM raised an error:\n");
+ fprintf(stderr, "*** VM raised an error:\n");
qc_print(prog);
prog->vmerror++;
return -1;
qcany 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;
qcany 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;
}
qcany 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;
qcany 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;
return 0;
}
+static int qc_sqrt(qc_program *prog)
+{
+ qcany *num, out;
+ CheckArgs(1);
+ num = GetArg(0);
+ out._float = sqrt(num->_float);
+ Return(out);
+ return 0;
+}
+
static int qc_vlen(qc_program *prog)
{
qcany *vec, len;
return 0;
}
+static int qc_normalize(qc_program *prog)
+{
+ double len;
+ qcany *vec;
+ qcany 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 *prog)
+{
+ char *buffer;
+ size_t len1, len2;
+ char *cstr1, *cstr2;
+ qcany *str1, *str2;
+ qcany out;
+
+ 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 *prog)
+{
+ char *cstr1, *cstr2;
+ qcany *str1, *str2;
+ qcany out;
+
+ 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 *prog)
+{
+ qcany *num, out;
+ CheckArgs(1);
+ num = GetArg(0);
+ out._float = floor(num->_float);
+ Return(out);
+ return 0;
+}
+
static prog_builtin 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]);
{
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"
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;
}
}
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;
--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);
}
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));
+ printf("Counts:\n"
+ " code: %lu\n"
+ " defs: %lu\n"
+ " fields: %lu\n"
+ " functions: %lu\n"
+ " strings: %lu\n",
+ (unsigned long)vec_size(prog->code),
+ (unsigned long)vec_size(prog->defs),
+ (unsigned long)vec_size(prog->fields),
+ (unsigned long)vec_size(prog->functions),
+ (unsigned long)vec_size(prog->strings));
}
if (opts_info) {
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);
}
if (opts_printdefs) {
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*)(prog->globals + prog->defs[i].offset))->_float);
+ break;
+ case TYPE_INTEGER:
+ printf(" [init: %i]", (int)( ((qcany*)(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*)(prog->globals + prog->defs[i].offset))->_int ));
+ break;
+ case TYPE_STRING:
+ printf(" [init: `%s`]", prog_getstring(prog, ((qcany*)(prog->globals + prog->defs[i].offset))->string ));
+ 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 *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) {
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);
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 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 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->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*)( ((qcint*)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:
projects / xonotic / gmqcc.git / blobdiff