#include "dcpu16.h"
#include "common.h"
-#include "display.h"
+
+#include "hw_lem1802.h"
/*
* shell-like driver for dcpu16 core
* Justin Wind <justin.wind@gmail.com>
* 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
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_);
return 0;
}
+
/*
Here follows the various commands the shell can execute.
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]) {
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]) {
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;
}
}
while (count--) {
- dcpu16_disassemble_print(vm, vm->pc);
+ dcpu16_disassemble_print(vm, vm->reg[DCPU16_REG_PC]);
printf("\n");
dcpu16_step(vm);
}
+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.");
+}
+
COMMAND_IMPL(run) {
struct sigaction act;
(void)arg_count, (void)arg_vector;
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");
}
}
#endif /* HAVE_LIBPNG */
;
COMMAND_IMPL(display) {
- static DCPU16_DISPLAY *display = NULL;
- const char *filename = display_filename_default_;
+ 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 == 2) {
- filename = arg_vector[1];
- }
+ if (arg_count == 3)
+ renderer_arg = arg_vector[2];
- if (display) {
- printf("display already enabled..\n");
+ if (hw == NULL) {
+ fprintf(stderr, "failed to initialize new display\n");
return 0;
}
- display = display_new(filename);
+ /* 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;
+ }
- if (display == NULL) {
- fprintf(stderr, "failed to initialize display buffer\n");
- return 0;
+#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 */
- if (dcpu16_acct_add(vm, DCPU16_ACCT_EV_WRITE, display_fn, display)) {
- fprintf(stderr, "failed to register display update callback\n");
- return 0;
+#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 (dcpu16_acct_add(vm, DCPU16_ACCT_EV_RESET, display_reset_fn, display)) {
- fprintf(stderr, "failed to register display reset callback\n");
+ 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_acct_add(vm, DCPU16_ACCT_EV_CYCLE, display_cycle_fn, display)) {
- fprintf(stderr, "failed to register display cycle callback\n");
+ if (dcpu16_hw_add(vm, hw)) {
+ fprintf(stderr, "failed to attach new display\n");
+ lem1802_del(&hw);
return 0;
}
- /* init display as if reset occurred */
- display_reset_fn(vm, DCPU16_ACCT_EV_RESET, 0, display);
-
return 0;
}
COMMAND_HELP(display) {
- fprintf(f, "\tdisplay [file]\n");
+ char *name, *args;
+ void *iter;
+
+ fprintf(f, "\tdisplay renderer [renderer data]\n");
if (summary) return;
- fprintf(f, "Attaches display interface, begins updating an image file of display contents...\n"
- "Image filename may be specified, defaults to '%s'\n",
- display_filename_default_
+ 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 */
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, 0, 1),
+ COMMAND_ENTRY(display, 1, 2),
{ NULL, 0, 0, NULL, NULL }
};
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;
projects / dcpu16 / blobdiff