X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=vm-dcpu16.c;h=b4798838328aeae8e7d9698c9af64c25b79014a3;hb=33efa05d43acf927c97daab10c00d1cbc2a7b9f6;hp=5accf2f740ed5c76baaf0235896ff845c6860612;hpb=ce296c260b229bb5c2e866db7842f3a46ea8c4b7;p=dcpu16 diff --git a/vm-dcpu16.c b/vm-dcpu16.c index 5accf2f..b479883 100644 --- a/vm-dcpu16.c +++ b/vm-dcpu16.c @@ -148,10 +148,57 @@ int file_load_(struct dcpu16 *vm, char *filename, DCPU16_WORD addr) { return 0; } +/* dump_ram_ + * print raw ram contents from start to stop + */ +static +void dump_ram_(struct dcpu16 *vm, DCPU16_WORD start, DCPU16_WORD end) { + unsigned int i, j; + const unsigned int n = 8; /* words per line */ + + if (!vm) return; + + for (i = start, j = 0; i <= end; i++, j++) { + if (j % n == 0) + printf("0x%04x:\t", i); + printf(" %04x%s", vm->ram[i], (j % n) == (n - 1) ? "\n" : ""); + } + if ((j % n) != (n - 1)) + printf("\n"); +} + + +/* + print the current state of the machine + shows current cycle count, registers, and next instruction +*/ +static +void state_print_(struct dcpu16 *vm) { + unsigned int i; + + if (!vm) return; + + printf(" "); + for (i = 0; i < 8; i++) + printf(" %s:0x%04x", dcpu16_reg_names[i], vm->reg[i]); + printf("\n"); + + printf("(0x%08llx) %2s:0x%04x %2s:0x%04x %2s:0x%04x %2s:0x%04x [%2s]:", + vm->cycle_, + dcpu16_reg_names[DCPU16_REG_EX], vm->reg[DCPU16_REG_EX], + dcpu16_reg_names[DCPU16_REG_SP], vm->reg[DCPU16_REG_SP], + dcpu16_reg_names[DCPU16_REG_PC], vm->reg[DCPU16_REG_PC], + dcpu16_reg_names[DCPU16_REG_IA], vm->reg[DCPU16_REG_IA], + "PC"); + + dcpu16_disassemble_print(vm, vm->reg[DCPU16_REG_PC]); + printf("\n"); +} + #ifdef HAVE_LIBVNCSERVER static struct dynamic_array rfbScreens_; -/* wups, kbdAddEvent isn't null by default, so I guess track things externally */ +/* wups, kbdAddEvent isn't null by default, so I guess track associations externally */ struct rfb_instance_ { rfbScreenInfoPtr screen; struct dcpu16_hw *attached_display; @@ -163,6 +210,10 @@ static struct rfb_instance_ *rfbScreen_next_available_display_(struct dynamic_array *rfbScreens, int argc, char *argv[]) { size_t i; struct rfb_instance_ new_instance, *s; + struct packed_args_ { + int argc; + char **argv; + } parg = { argc, argv }; fprintf(stderr, "DEBUG: rfbScreens->entries:%zu\n", rfbScreens->entries); @@ -172,7 +223,11 @@ struct rfb_instance_ *rfbScreen_next_available_display_(struct dynamic_array *rf return s; } - new_instance.screen = lem1802_rfb_new(argc, argv); + if (dcpu16_hw_module_lem1802.ctl(NULL, "new_rfbScreen", &parg, &new_instance.screen)) { + fprintf(stderr, "failed to allocate new rfbScreen"); + return NULL; + } + new_instance.attached_display = NULL; new_instance.attached_keyboard = NULL; s = dynarray_add(rfbScreens, &new_instance); @@ -184,6 +239,10 @@ static struct rfb_instance_ *rfbScreen_next_available_keyboard_(struct dynamic_array *rfbScreens, int argc, char *argv[]) { size_t i; struct rfb_instance_ new_instance, *s; + struct packed_args_ { + int argc; + char **argv; + } parg = { argc, argv }; for (i = 0; i < rfbScreens->entries; i++) { s = (struct rfb_instance_ *)DYNARRAY_ITEM(*rfbScreens, i); @@ -191,7 +250,11 @@ struct rfb_instance_ *rfbScreen_next_available_keyboard_(struct dynamic_array *r return s; } - new_instance.screen = lem1802_rfb_new(argc, argv); + if (dcpu16_hw_module_lem1802.ctl(NULL, "new_rfbScreen", &parg, &new_instance.screen)) { + fprintf(stderr, "failed to allocate new rfbScreen"); + return NULL; + } + new_instance.attached_display = NULL; new_instance.attached_keyboard = NULL; s = dynarray_add(rfbScreens, &new_instance); @@ -308,7 +371,7 @@ COMMAND_IMPL(dump) { return 0; } - dcpu16_dump_ram(vm, addr[0], addr[1]); + dump_ram_(vm, addr[0], addr[1]); return 0; } @@ -380,7 +443,7 @@ COMMAND_IMPL(step) { dcpu16_step(vm); if (count > 1 && opt_.verbose) - dcpu16_state_print(vm); + state_print_(vm); } return 0; @@ -464,7 +527,7 @@ COMMAND_IMPL(run) { dcpu16_step(vm); if (opt_.verbose > 1) - dcpu16_state_print(vm); + state_print_(vm); else if (opt_.verbose) { dcpu16_disassemble_print(vm, vm->reg[DCPU16_REG_PC]); printf("\n"); @@ -533,7 +596,7 @@ COMMAND_IMPL(display) { if (arg_count == 3) renderer_arg = arg_vector[2]; - hw = lem1802_new(vm); + hw = dcpu16_hw_new(vm, &dcpu16_hw_module_lem1802, NULL); if (hw == NULL) { fprintf(stderr, "failed to initialize new display\n"); return 0; @@ -542,16 +605,12 @@ COMMAND_IMPL(display) { /* 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; + renderer_data = (void *)(renderer_arg ? renderer_arg : display_filename_default_); } #ifdef HAVE_LIBPNG if (strcmp(renderer, "png") == 0) { - if (renderer_arg == NULL) - renderer_arg = display_filename_default_; - renderer_data = (void *)renderer_arg; + renderer_data = (void *)(renderer_arg ? renderer_arg : display_filename_default_); } #endif /* HAVE_LIBPNG */ @@ -564,33 +623,37 @@ COMMAND_IMPL(display) { s = rfbScreen_next_available_display_(&rfbScreens_, argc, argv); if (s == NULL) { fprintf(stderr, "failed to initialize vnc\n"); - lem1802_del(&hw); + dcpu16_hw_del(&hw); return 0; } - lem1802_vnc_associate(hw, s->screen); + if (dcpu16_hw_ctl(hw, "associate_rfbScreen", s->screen, NULL)) { + fprintf(stderr, "failed to configure display/vnc"); + dcpu16_hw_del(&hw); + return 0; + } s->attached_display = hw; rfbScreen_start(s->screen); renderer_data = s->screen; } #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; - } + dcpu16_hw_ctl(hw, "renderer", (char *)renderer, NULL); + dcpu16_hw_ctl(hw, "renderer_data", renderer_data, NULL); - if (dcpu16_hw_add(vm, hw)) { + if (dcpu16_hw_attach(vm, hw)) { fprintf(stderr, "failed to attach new display\n"); - lem1802_del(&hw); + dcpu16_hw_del(&hw); return 0; } return 0; } COMMAND_HELP(display) { - char *name, *args; + struct renderer_ { + char *name; + char *args; + } renderer; void *iter; fprintf(f, "\tdisplay renderer [renderer data]\n"); @@ -600,10 +663,18 @@ COMMAND_HELP(display) { ); fprintf(f, "Supported renderers:\n"); + iter = NULL; - while ( (lem1802_renderers_iter(&iter, &name, &args)) ) { - fprintf(f, "\t%s %s\n", name, args); - } + do { + if (dcpu16_hw_module_lem1802.ctl(NULL, "renderers_iter", &iter, &renderer)) { + fprintf(stderr, "error fetching next renderer\n"); + break; + } + if (iter == NULL || renderer.name == NULL) + break; + + fprintf(f, "\t%s %s\n", renderer.name, renderer.args); + } while (iter); } COMMAND_IMPL(keyboard) { @@ -611,7 +682,7 @@ COMMAND_IMPL(keyboard) { (void)arg_count, (void)arg_vector; - hw = keyboard_new(vm); + hw = dcpu16_hw_new(vm, &dcpu16_hw_module_keyboard, NULL); if (hw == NULL) { fprintf(stderr, "failed to initialize new keyboard\n"); return 0; @@ -625,15 +696,19 @@ COMMAND_IMPL(keyboard) { s = rfbScreen_next_available_keyboard_(&rfbScreens_, argc, argv); if (s == NULL) { fprintf(stderr, "failed to initialize vnc\n"); - keyboard_del(&hw); + dcpu16_hw_del(&hw); + return 0; + } + if (dcpu16_hw_ctl(hw, "associate_rfbScreen", s->screen, NULL)) { + fprintf(stderr, "failed to configure keyboard/vnc\n"); + dcpu16_hw_del(&hw); return 0; } - keyboard_vnc_associate(hw, s->screen); s->attached_keyboard = hw; - if (dcpu16_hw_add(vm, hw)) { + if (dcpu16_hw_attach(vm, hw)) { fprintf(stderr, "failed to attach new keyboard\n"); - keyboard_del(&hw); + dcpu16_hw_del(&hw); return 0; } #endif /* HAVE_LIBVNCSERVER */ @@ -754,13 +829,13 @@ int main(int argc, char **argv) { tok_v = tok_v_prev = NULL, tok_c = tok_c_prev= 0, snprintf(prompt, sizeof prompt, prompt_fmt, vm->reg[DCPU16_REG_PC]), - dcpu16_state_print(vm); + state_print_(vm); (line = readline(prompt)); printf("\n"), snprintf(prompt, sizeof prompt, prompt_fmt, vm->reg[DCPU16_REG_PC]), - dcpu16_state_print(vm)) { + state_print_(vm)) { const char whitespace[] = " \t"; char *line_start; struct command_ *c;