+#include <errno.h>
+#include <string.h>
+#include <stdarg.h>
+
#include "gmqcc.h"
-#include "exec.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, 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)
-#define QCVM_EXECUTOR
+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)
+
+static void loaderror(const char *fmt, ...)
+{
+ int err = errno;
+ va_list ap;
+ va_start(ap, fmt);
+ vprintf(fmt, ap);
+ va_end(ap);
+ printf(": %s\n", strerror(err));
+}
qc_program* prog_load(const char *filename)
{
return NULL;
if (fread(&header, sizeof(header), 1, file) != 1) {
- perror("read");
+ loaderror("failed to read header from '%s'", filename);
fclose(file);
return NULL;
}
if (header.version != 6) {
- printf("header says this is a version %i progs, we need version 6\n",
- header.version);
+ loaderror("header says this is a version %i progs, we need version 6\n", header.version);
fclose(file);
return NULL;
}
prog->entityfields = header.entfield;
prog->filename = util_strdup(filename);
- if (!prog->filename)
+ if (!prog->filename) {
+ loaderror("failed to store program name");
goto error;
+ }
+
#define read_data(hdrvar, progvar, type) \
if (fseek(file, header.hdrvar.offset, SEEK_SET) != 0) { \
- perror("fseek"); \
+ loaderror("seek failed"); \
goto error; \
} \
prog->progvar##_alloc = header.hdrvar.length; \
goto error; \
if (fread(prog->progvar, sizeof(*prog->progvar), header.hdrvar.length, file) \
!= header.hdrvar.length) { \
- perror("read"); \
+ loaderror("read failed"); \
goto error; \
}
#define read_data1(x, y) read_data(x, x, y)
- read_data (statements, code, prog_statement);
- read_data1(defs, prog_def);
- read_data1(fields, prog_def);
- read_data1(functions, prog_function);
+ 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);
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 */
mem_d(prog);
}
return prog->strings + str;
}
-prog_def* prog_entfield(qc_program *prog, qcint off)
+prog_section_def* prog_entfield(qc_program *prog, qcint off)
{
size_t i;
for (i = 0; i < prog->fields_count; ++i) {
return NULL;
}
-prog_def* prog_getdef(qc_program *prog, qcint off)
+prog_section_def* prog_getdef(qc_program *prog, qcint off)
{
size_t i;
for (i = 0; i < prog->defs_count; ++i) {
return at;
}
+static int print_escaped_string(const char *str)
+{
+ int len = 2;
+ putchar('"');
+ while (*str) {
+ switch (*str) {
+ case '\a': len += 2; putchar('\\'); putchar('a'); break;
+ case '\b': len += 2; putchar('\\'); putchar('b'); break;
+ case '\r': len += 2; putchar('\\'); putchar('r'); break;
+ case '\n': len += 2; putchar('\\'); putchar('n'); break;
+ case '\t': len += 2; putchar('\\'); putchar('t'); break;
+ case '\f': len += 2; putchar('\\'); putchar('f'); break;
+ case '\v': len += 2; putchar('\\'); putchar('v'); break;
+ case '\\': len += 2; putchar('\\'); putchar('\\'); break;
+ case '"': len += 2; putchar('\\'); putchar('"'); break;
+ default:
+ ++len;
+ putchar(*str);
+ break;
+ }
+ ++str;
+ }
+ putchar('"');
+ return len;
+}
+
static void trace_print_global(qc_program *prog, unsigned int glob, int vtype)
{
static char spaces[16+1] = " ";
- prog_def *def;
+ prog_section_def *def;
qcany *value;
int len;
vtype = def->type;
}
else
- len = printf("[#%u] ", glob);
+ len = printf("[@%u] ", glob);
switch (vtype) {
case TYPE_VOID:
value->vector[2]);
break;
case TYPE_STRING:
- len += printf("\"%s\",", prog_getstring(prog, value->string));
+ len += print_escaped_string(prog_getstring(prog, value->string));
+ /* len += printf("\"%s\",", prog_getstring(prog, value->string)); */
break;
case TYPE_FLOAT:
default:
}
}
-static void prog_print_statement(qc_program *prog, prog_statement *st)
+static void prog_print_statement(qc_program *prog, prog_section_statement *st)
{
if (st->opcode >= (sizeof(asm_instr)/sizeof(asm_instr[0]))) {
printf("<illegal instruction %d>\n", st->opcode);
return;
}
- printf("%-12s", asm_instr[st->opcode].m);
+ printf(" <> %-12s", asm_instr[st->opcode].m);
if (st->opcode >= INSTR_IF &&
st->opcode <= INSTR_IFNOT)
{
}
}
-static qcint prog_enterfunction(qc_program *prog, prog_function *func)
+static qcint prog_enterfunction(qc_program *prog, prog_section_function *func)
{
qc_exec_stack st;
- prog_function *cur = NULL;
-
- if (prog->stack_count)
- cur = prog->stack[prog->stack_count-1].function;
+ size_t p, parampos;
/* back up locals */
st.localsp = prog->localstack_count;
st.stmt = prog->statement;
st.function = func;
- if (cur)
+#ifdef QCVM_BACKUP_STRATEGY_CALLER_VARS
+ if (prog->stack_count)
+ {
+ prog_section_function *cur;
+ cur = prog->stack[prog->stack_count-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);
+ }
+ }
+ }
+#else
{
- qcint *globals = prog->globals + cur->firstlocal;
- if (!qc_program_localstack_append(prog, globals, cur->locals))
+ qcint *globals = prog->globals + func->firstlocal;
+ if (!qc_program_localstack_append(prog, globals, func->locals))
{
printf("out of memory\n");
exit(1);
}
}
+#endif
+
+ /* copy parameters */
+ parampos = func->firstlocal;
+ for (p = 0; p < func->nargs; ++p)
+ {
+ size_t s;
+ for (s = 0; s < func->argsize[p]; ++s) {
+ prog->globals[parampos] = prog->globals[OFS_PARM0 + 3*p + s];
+ ++parampos;
+ }
+ }
if (!qc_program_stack_add(prog, st)) {
printf("out of memory\n");
static qcint prog_leavefunction(qc_program *prog)
{
+ prog_section_function *prev = NULL;
+ size_t oldsp;
+
qc_exec_stack st = prog->stack[prog->stack_count-1];
- if (!qc_program_stack_remove(prog, prog->stack_count-1)) {
- printf("out of memory\n");
- exit(1);
- }
- if (st.localsp != prog->localstack_count) {
- if (!qc_program_localstack_resize(prog, st.localsp)) {
+#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;
+ }
+#else
+ prev = prog->stack[prog->stack_count-1].function;
+ oldsp = prog->stack[prog->stack_count-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);
}
}
+ if (!qc_program_stack_remove(prog, prog->stack_count-1)) {
+ printf("out of memory\n");
+ exit(1);
+ }
+
return st.stmt;
}
-bool prog_exec(qc_program *prog, prog_function *func, size_t flags, long maxjumps)
+bool prog_exec(qc_program *prog, prog_section_function *func, size_t flags, long maxjumps)
{
long jumpcount = 0;
- prog_statement *st;
+ prog_section_statement *st;
st = prog->code + prog_enterfunction(prog, func);
--st;
{
#define QCVM_PROFILE 0
#define QCVM_TRACE 0
-# include "qcvm_execprogram.h"
+# include "execloop.h"
break;
}
case (VMXF_TRACE):
{
#define QCVM_PROFILE 0
#define QCVM_TRACE 1
-# include "qcvm_execprogram.h"
+# include "execloop.h"
break;
}
case (VMXF_PROFILE):
{
#define QCVM_PROFILE 1
#define QCVM_TRACE 0
-# include "qcvm_execprogram.h"
+# include "execloop.h"
break;
}
case (VMXF_TRACE|VMXF_PROFILE):
{
#define QCVM_PROFILE 1
#define QCVM_TRACE 1
-# include "qcvm_execprogram.h"
+# include "execloop.h"
break;
}
};
*/
#if defined(QCVM_EXECUTOR)
+bool opts_debug = false;
+bool opts_memchk = false;
+
+static int qc_print(qc_program *prog)
+{
+ qcany *str = (qcany*)(prog->globals + OFS_PARM0);
+ printf("%s", prog_getstring(prog, str->string));
+ return 0;
+}
+
+static prog_builtin qc_builtins[] = {
+ NULL,
+ &qc_print
+};
+static size_t qc_builtins_count = sizeof(qc_builtins) / sizeof(qc_builtins[0]);
+
int main(int argc, char **argv)
{
size_t i;
exit(1);
}
+ prog->builtins = qc_builtins;
+ prog->builtins_count = qc_builtins_count;
+ prog->builtins_alloc = 0;
+
for (i = 1; i < prog->functions_count; ++i) {
const char *name = prog_getstring(prog, prog->functions[i].name);
printf("Found function: %s\n", name);
}
if (fnmain > 0)
{
- prog_exec(prog, &prog->functions[fnmain], VMXF_TRACE, JUMPS_DEFAULT);
+ prog_exec(prog, &prog->functions[fnmain], VMXF_TRACE, VM_JUMPS_DEFAULT);
}
else
printf("No main function found\n");
projects / xonotic / gmqcc.git / blobdiff