#include <stdlib.h>
#include <stdio.h>
+#include <stdarg.h>
#include <unistd.h>
#include <string.h>
#include <strings.h>
}
#define VERBOSE_PRINTF(...) do { if (opt_.verbose) printf(__VA_ARGS__); } while (0)
+#ifdef DEBUG
+#define DEBUG_PRINTF(...) do { if (opt_.verbose > 4) fprintf(stderr, __VA_ARGS__); } while (0)
+#else /* DEBUG */
+#define DEBUG_PRINTF(...) do { } while (0)
+#endif /* DEBUG */
static
void usage_(char *prog, unsigned int full) {
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;
struct dcpu16_hw *attached_keyboard;
};
-/* locate or allocate the next display with an un-occupied framebuffer */
+enum rfbscreen_next_what_ {
+ NEXT_DISPLAY,
+ NEXT_KEYBOARD,
+};
+/* locate next rfb not paired to requested type */
static
-struct rfb_instance_ *rfbScreen_next_available_display_(struct dynamic_array *rfbScreens, int argc, char *argv[]) {
+struct rfb_instance_ *rfbScreen_next_available_(enum rfbscreen_next_what_ what, struct dynamic_array *rfbScreens, int argc, char *argv[]) {
size_t i;
struct rfb_instance_ new_instance, *s;
-
- fprintf(stderr, "DEBUG: rfbScreens->entries:%zu\n", rfbScreens->entries);
+ struct packed_args_ {
+ int argc;
+ char **argv;
+ } parg = { argc, argv };
for (i = 0; i < rfbScreens->entries; i++) {
+ struct dcpu16_hw *attached;
+
s = (struct rfb_instance_ *)DYNARRAY_ITEM(*rfbScreens, i);
- if (s->attached_display == NULL)
+ switch (what) {
+ case NEXT_DISPLAY: attached = s->attached_display; break;
+ case NEXT_KEYBOARD: attached = s->attached_keyboard; break;
+ }
+ if (attached == NULL)
return s;
}
- new_instance.screen = lem1802_rfb_new(argc, argv);
+ /* no available rfb, create new */
+ if (dcpu16_hw_module_lem1802.ctl(NULL, "new_rfbScreen", &parg, &new_instance.screen)) {
+ fprintf(stderr, "failed to allocate new rfbScreen\n");
+ return NULL;
+ }
+
new_instance.attached_display = NULL;
new_instance.attached_keyboard = NULL;
- s = dynarray_add(rfbScreens, &new_instance);
- return s;
-}
-/* locate or allocate the next display with an un-occupied keyboard */
-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;
+ new_instance.screen->port += rfbScreens->entries;
+ new_instance.screen->ipv6port += rfbScreens->entries;
- for (i = 0; i < rfbScreens->entries; i++) {
- s = (struct rfb_instance_ *)DYNARRAY_ITEM(*rfbScreens, i);
- if (s->attached_keyboard == NULL)
- return s;
- }
+ DEBUG_PRINTF("%s>> port:%u\n", __func__, new_instance.screen->port);
- new_instance.screen = lem1802_rfb_new(argc, argv);
- new_instance.attached_display = NULL;
- new_instance.attached_keyboard = NULL;
s = dynarray_add(rfbScreens, &new_instance);
+
return s;
}
+
/* begin serving a screen */
void rfbScreen_start(rfbScreenInfoPtr s) {
rfbInitServer(s);
dcpu16_reset(vm);
printf("initialized\n");
+
return 0;
}
COMMAND_HELP(reset) {
}
+COMMAND_IMPL(verbosity) {
+ int l;
+ (void)vm, (void)arg_count;
+
+ l = str_to_word(arg_vector[1]);
+ if (l < 0) {
+ fprintf(stderr, "invalid level\n");
+ return 0;
+ }
+
+ opt_.verbose = l;
+
+ return 0;
+}
+COMMAND_HELP(verbosity) {
+ fprintf(f, "\tverbosity level\n");
+ if (summary) return;
+
+ fprintf(f, "sets the verbosity level\n");
+}
+
COMMAND_IMPL(load) {
int addr = 0;
return 0;
}
- dcpu16_dump_ram(vm, addr[0], addr[1]);
+ dump_ram_(vm, addr[0], addr[1]);
return 0;
}
dcpu16_step(vm);
if (count > 1 && opt_.verbose)
- dcpu16_state_print(vm);
+ state_print_(vm);
}
return 0;
fprintf(f, "Sets addr to value.");
}
-#define MICROSECONDS_PER_CYCLE 10
+#define NANOSECONDS_PER_CYCLE 10000
+#define MIN_NANOSLEEP 31000
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 run_cycle_start, run_cycle_end;
long long cycle_start, cycles_to_wait;
- struct timespec sleep_time, rem_time;
- long long run_usec;
+
+ struct timespec ts_run_start, ts_run_end, ts_run_diff;
+ struct timespec ts_cycle_start, ts_cycle_end_target, ts_cycle_end, ts_cycle_waste, ts_cycle_rem;
+ const struct timespec ts_cycle_time = { .tv_sec = 0, .tv_nsec = NANOSECONDS_PER_CYCLE };
(void)arg_count, (void)arg_vector;
running_ = 1;
- gettimeofday(&run_start_tv, NULL);
- run_cycle_start = vm->cycle;
+ gettimespecofday(&ts_run_start);
+ run_cycle_start = vm->cycle_;
memset(&act, 0, sizeof act);
act.sa_handler = sigint_handler_;
}
while (running_) {
- gettimeofday(&start_tv, NULL);
- cycle_start = vm->cycle;
+ gettimespecofday(&ts_cycle_start);
+ ts_cycle_end_target = ts_cycle_start;
+
+ cycle_start = vm->cycle_;
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");
}
/* how many cycles did this instr use? */
- cycles_to_wait = vm->cycle - cycle_start;
-
- if (cycles_to_wait == 0)
- continue;
+ cycles_to_wait = vm->cycle_ - cycle_start;
- /* each cycle wants 10 microseconds */
+ /* each cycle wants to take 10 microseconds */
+ while (cycles_to_wait--)
+ timespec_add(&ts_cycle_end_target, &ts_cycle_time);
/* 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;
- /* this is not accurate.. */
- sleep_time.tv_nsec = 250 * ( (cycles_to_wait * MICROSECONDS_PER_CYCLE) - diff_tv.tv_usec);
+ gettimespecofday(&ts_cycle_end);
+ /* do we have time to kill? */
+ if (timespec_subtract(&ts_cycle_waste, &ts_cycle_end_target, &ts_cycle_end) == 0) {
/* nanosleep doesn't interfere with libvncserver, unlike usleep */
- while ( nanosleep(&sleep_time, &rem_time) ) {
- sleep_time = rem_time;
- fprintf(stderr, "rem:%ld %ld\n", rem_time.tv_sec, rem_time.tv_nsec);
- }
+ if (ts_cycle_waste.tv_sec == 0 && ts_cycle_waste.tv_nsec >= MIN_NANOSLEEP)
+ while ( nanosleep(&ts_cycle_waste, &ts_cycle_rem) )
+ ts_cycle_waste = ts_cycle_rem;
+ } else {
+ /* negative, we've already blown our time */
+ DEBUG_PRINTF("cycle time overrun %ld.%09lds\n", ts_cycle_waste.tv_sec, ts_cycle_waste.tv_nsec);
}
+
+#ifdef DEBUG
+ /* how did we do */
+ gettimespecofday(&ts_cycle_end);
+ timespec_subtract(&ts_cycle_rem, &ts_cycle_end_target, &ts_cycle_end);
+ DEBUG_PRINTF("projected end: %ld.%09ld actual end: %ld.%09ld diff: %ld.%09ld\n",
+ ts_cycle_end_target.tv_sec, ts_cycle_end_target.tv_nsec,
+ ts_cycle_end.tv_sec, ts_cycle_end.tv_nsec,
+ ts_cycle_rem.tv_sec, ts_cycle_rem.tv_nsec);
+#endif /* DEBUG */
+
}
- gettimeofday(&run_stop_tv, NULL);
- timeval_subtract(&diff_tv, &run_stop_tv, &run_start_tv);
- run_usec = diff_tv.tv_sec * 1000000;
- run_usec += diff_tv.tv_usec;
- fprintf(stderr, "ran %llu cycles in %lds %dus (%lldus)\n",
- vm->cycle - run_cycle_start,
- diff_tv.tv_sec,
- diff_tv.tv_usec,
- run_usec);
+ run_cycle_end = vm->cycle_;
+ gettimespecofday(&ts_run_end);
+ timespec_subtract(&ts_run_diff, &ts_run_end, &ts_run_start);
+ VERBOSE_PRINTF("ran %lld cycles in %ld.%09lds\n",
+ run_cycle_end - run_cycle_start,
+ ts_run_diff.tv_sec, ts_run_diff.tv_nsec);
printf("interrupted...\n");
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;
/* 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 */
char *argv[] = { "vm-dcpu16", NULL };
struct rfb_instance_ *s;
- s = rfbScreen_next_available_display_(&rfbScreens_, argc, argv);
+ s = rfbScreen_next_available_(NEXT_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;
+
+ DEBUG_PRINTF("attached display to rfb (frameBuffer:%p)\n", s->screen->frameBuffer);
}
#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");
);
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) {
(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;
int argc = 1;
char *argv[] = { "vm-dcpu16", NULL };
- s = rfbScreen_next_available_keyboard_(&rfbScreens_, argc, argv);
+ s = rfbScreen_next_available_(NEXT_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 */
static struct command_ command_table_[] = {
COMMAND_ENTRY(help, 0, -1),
COMMAND_ENTRY(quit, 0, -1),
+ COMMAND_ENTRY(verbosity, 1, 1),
COMMAND_ENTRY(load, 1, 2),
COMMAND_ENTRY(dump, 0, 2),
COMMAND_ENTRY(disassemble, 0, 2),
fprintf(f, "Displays a list of available commands, or detailed help on a specific command.\n");
}
+static
+void msg_verbose_filter_(unsigned int level, char *fmt, ...) {
+ static const char * const levels[] = { "error", "info", "debug" };
+ FILE *f = (level <= DCPU16_MSG_ERROR) ? stderr : stdout;
+ va_list ap;
+
+ if (level + 2 > opt_.verbose)
+ return;
+
+ if (level < sizeof levels / sizeof *levels)
+ fprintf(f, "[%s %s] ", "dcpu16", levels[level]);
+ else
+ fprintf(f, "[%s %u] ", "dcpu16", level);
+
+ va_start(ap, fmt);
+ vfprintf(f, fmt, ap);
+ va_end(ap);
+
+ fprintf(f, "\n");
+
+ fflush(f);
+}
int main(int argc, char **argv) {
const char prompt_fmt[] = "PC:%04x> ";
exit(EX_USAGE);
}
}
- if (opt_.verbose < 1) {
- dcpu16_warn_cb_set(NULL);
- dcpu16_trace_cb_set(NULL);
- } else if (opt_.verbose < 2) {
- dcpu16_trace_cb_set(NULL);
- }
argc -= optind;
argv += optind;
+ dcpu16_msg_set_default(msg_verbose_filter_);
+
if ((vm = dcpu16_new()) == NULL) {
fprintf(stderr, "could not allocate new dcpu16 instance\n");
exit(EX_UNAVAILABLE);
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;
projects / dcpu16 / blobdiff