X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=vm-dcpu16.c;h=367cdbc2669f81008edd4443fa4e4e39df751417;hb=74629db149379f2d67cd2b1cf575b46ef6e317b6;hp=537452af9af8f11066f00dd43aa0eb33961eb00d;hpb=286b0e08bf52ee3eda3d8f73366a786337a7a4bd;p=dcpu16 diff --git a/vm-dcpu16.c b/vm-dcpu16.c index 537452a..367cdbc 100644 --- a/vm-dcpu16.c +++ b/vm-dcpu16.c @@ -7,12 +7,16 @@ #include #include #include +#include +#include #include #include "dcpu16.h" #include "common.h" +#include "hw_lem1802.h" + /* * shell-like driver for dcpu16 core * provides a basic interface to control a single emulation instance @@ -20,6 +24,7 @@ * Justin Wind * 2012 04 10 - implementation started * 2012 04 12 - cleanup, better shell loop + * 2012 05 12 - support v1.7 style devices * * TODO * handle quotes in shell command parsing @@ -64,7 +69,7 @@ void usage_(char *prog, unsigned int full) { if (full) { fprintf(f, "\nOptions:\n" "\t [file] -- ram image to load initially\n" - "\t -v -- displays slightly more information\n" + "\t -v -- prints slightly more information while operating\n" "\t -h -- this screen\n"); fprintf(f, "\n%78s\n", src_id_); @@ -139,6 +144,7 @@ int file_load_(struct dcpu16 *vm, char *filename, DCPU16_WORD addr) { return 0; } + /* Here follows the various commands the shell can execute. @@ -234,7 +240,7 @@ COMMAND_IMPL(dump) { return 0; } } - if (arg_count < 2) addr[0] = vm->pc; + if (arg_count < 2) addr[0] = vm->reg[DCPU16_REG_PC]; if (arg_count < 3) addr[1] = addr[0]; if (addr[1] < addr[0]) { @@ -265,7 +271,7 @@ COMMAND_IMPL(disassemble) { return 0; } } - if (arg_count < 2) addr[0] = vm->pc; + if (arg_count < 2) addr[0] = vm->reg[DCPU16_REG_PC]; if (arg_count < 3) addr[1] = addr[0]; if (addr[1] < addr[0]) { @@ -297,7 +303,7 @@ COMMAND_IMPL(step) { errno = 0; count = strtoul(arg_vector[1], &ep, 0); if (errno - || !(*arg_vector[0] && *ep == '\0') ) { + || !(*arg_vector[1] && *ep == '\0') ) { fprintf(stderr, "count '%s' is not a valid number: %s\n", arg_vector[1], strerror(errno)); return 0; } @@ -309,7 +315,7 @@ COMMAND_IMPL(step) { } while (count--) { - dcpu16_disassemble_print(vm, vm->pc); + dcpu16_disassemble_print(vm, vm->reg[DCPU16_REG_PC]); printf("\n"); dcpu16_step(vm); @@ -327,11 +333,60 @@ COMMAND_HELP(step) { } +COMMAND_IMPL(set) { + int addr, value; + DCPU16_WORD *v; + + (void)arg_count; + + /* check if addr is a register */ + for (addr = 0; dcpu16_reg_names[addr]; addr++) { + if (strcasecmp(arg_vector[1], dcpu16_reg_names[addr]) == 0) + break; + } + if (addr < DCPU16_REG__NUM) { + v = vm->reg + addr; + } else { + addr = str_to_word(arg_vector[1]); + if (addr < 0) { + fprintf(stderr, "address '%s' is not a valid word: %s\n", arg_vector[1], strerror(errno)); + return 0; + } + v = vm->ram + addr; + } + + value = str_to_word(arg_vector[2]); + if (value < 0) { + fprintf(stderr, "address '%s' is not a valid word: %s\n", arg_vector[2], strerror(errno)); + return 0; + } + + *v = value; + + return 0; +} + +COMMAND_HELP(set) { + fprintf(f, "\tset addr value\n"); + if (summary) return; + + fprintf(f, "Sets addr to value."); +} + +#define MICROSECONDS_PER_CYCLE 10 COMMAND_IMPL(run) { struct sigaction act; + struct timeval run_start_tv, run_stop_tv; + long long run_cycle_start; + struct timeval start_tv, now_tv, diff_tv; + long long cycle_start, cycles_to_wait; + struct timespec sleep_time; + (void)arg_count, (void)arg_vector; running_ = 1; + gettimeofday(&run_start_tv, NULL); + run_cycle_start = vm->cycle; memset(&act, 0, sizeof act); act.sa_handler = sigint_handler_; @@ -343,15 +398,46 @@ COMMAND_IMPL(run) { } while(running_) { + gettimeofday(&start_tv, NULL); + cycle_start = vm->cycle; + dcpu16_step(vm); if (opt_.verbose > 1) dcpu16_state_print(vm); else if (opt_.verbose) { - dcpu16_disassemble_print(vm, vm->pc); + dcpu16_disassemble_print(vm, vm->reg[DCPU16_REG_PC]); printf("\n"); } + + /* how many cycles did this instr use? */ + cycles_to_wait = vm->cycle - cycle_start; + + if (cycles_to_wait == 0) + continue; + + /* each cycle wants 10 microseconds */ + + + /* how much of that did we spend already */ + gettimeofday(&now_tv, NULL); + timeval_subtract(&diff_tv, &now_tv, &start_tv); + /* do we have time to kill? */ + if (cycles_to_wait * MICROSECONDS_PER_CYCLE > diff_tv.tv_usec) { + sleep_time.tv_sec = diff_tv.tv_sec; + sleep_time.tv_nsec = 1000 * ( (cycles_to_wait * MICROSECONDS_PER_CYCLE) - diff_tv.tv_usec); + sleep_time.tv_nsec = diff_tv.tv_usec * 1000; + + nanosleep(&sleep_time, NULL); + } } + gettimeofday(&run_stop_tv, NULL); + timeval_subtract(&diff_tv, &run_stop_tv, &run_start_tv); + fprintf(stderr, "ran %llu cycles in %lds %dus\n", + vm->cycle - run_cycle_start, + diff_tv.tv_sec, + diff_tv.tv_usec); + printf("interrupted...\n"); return 0; @@ -364,6 +450,92 @@ COMMAND_HELP(run) { "May be interrupted with SIGINT.\n"); } +static const char * const display_filename_default_ = +#ifdef HAVE_LIBPNG + "dcpu16-display.png" +#else /* HAVE_LIBPNG */ + "dcpu16-display.pnm" +#endif /* HAVE_LIBPNG */ +; +COMMAND_IMPL(display) { + struct dcpu16_hw *hw = lem1802_new(vm); + const char *renderer = arg_vector[1]; + const char *renderer_arg = NULL; + void *renderer_data = NULL; + + if (arg_count == 3) + renderer_arg = arg_vector[2]; + + if (hw == NULL) { + fprintf(stderr, "failed to initialize new display\n"); + return 0; + } + + /* handle per-renderer setup of data.. */ + /* FIXME: these are awkward */ + if (strcmp(renderer, "pnm") == 0) { + if (renderer_arg == NULL) + renderer_arg = display_filename_default_; + renderer_data = (void *)renderer_arg; + } + +#ifdef HAVE_LIBPNG + if (strcmp(renderer, "png") == 0) { + if (renderer_arg == NULL) + renderer_arg = display_filename_default_; + renderer_data = (void *)renderer_arg; + } +#endif /* HAVE_LIBPNG */ + +#ifdef HAVE_LIBVNCSERVER + if (strcmp(renderer, "vnc") == 0) { + int argc = 1; + char *argv[] = { "vm-dcpu16", NULL }; + + renderer_data = lem1802_vnc_init_data(argc, argv, hw); + + /* FIXME: keep refs to vnc displays around somewhere, in global list maybe.. */ + /* keyboards will want to attach to them as well.. */ + + if (renderer_data == NULL) { + fprintf(stderr, "failed to initialize vnc\n"); + lem1802_del(&hw); + return 0; + } + } +#endif /* HAVE_LIBVNCSERVER */ + + if (lem1802_renderer_set(hw, renderer, renderer_data)) { + fprintf(stderr, "failed to set back-end renderer for display\n"); + lem1802_del(&hw); + return 0; + } + + if (dcpu16_hw_add(vm, hw)) { + fprintf(stderr, "failed to attach new display\n"); + lem1802_del(&hw); + return 0; + } + + return 0; +} +COMMAND_HELP(display) { + char *name, *args; + void *iter; + + fprintf(f, "\tdisplay renderer [renderer data]\n"); + if (summary) return; + + fprintf(f, "Attaches new display unit, using 'renderer' as back-end output.\n" + ); + + fprintf(f, "Supported renderers:\n"); + iter = NULL; + while ( (lem1802_renderers_iter(&iter, &name, &args)) ) { + fprintf(f, "\t%s %s\n", name, args); + } +} + /* gather all these together into a searchable table */ /* help command gets some assistance in declarations */ @@ -378,7 +550,9 @@ static struct command_ command_table_[] = { COMMAND_ENTRY(disassemble, 0, 2), COMMAND_ENTRY(step, 0, 1), COMMAND_ENTRY(run, 0, 0), + COMMAND_ENTRY(set, 2, 2), COMMAND_ENTRY(reset, 0, 0), + COMMAND_ENTRY(display, 1, 2), { NULL, 0, 0, NULL, NULL } }; @@ -460,13 +634,13 @@ int main(int argc, char **argv) { for (line = line_prev = NULL, tok_v = tok_v_prev = NULL, tok_c = tok_c_prev= 0, - snprintf(prompt, sizeof prompt, prompt_fmt, vm->pc), + snprintf(prompt, sizeof prompt, prompt_fmt, vm->reg[DCPU16_REG_PC]), dcpu16_state_print(vm); (line = readline(prompt)); printf("\n"), - snprintf(prompt, sizeof prompt, prompt_fmt, vm->pc), + snprintf(prompt, sizeof prompt, prompt_fmt, vm->reg[DCPU16_REG_PC]), dcpu16_state_print(vm)) { const char whitespace[] = " \t"; char *line_start;