finished reorg of abstracted module interfaces

[dcpu16] / vm-dcpu16.c

diff --git a/vm-dcpu16.c b/vm-dcpu16.c
index a463f7ac94858856c5a6e6a2697f44b44811f44f..86f773aac4cfa691921da0488ddddaceaa9243e9 100644 (file)
--- a/vm-dcpu16.c
+++ b/vm-dcpu16.c
@@ -151,7 +151,7 @@ int file_load_(struct dcpu16 *vm, char *filename, DCPU16_WORD addr) {
 
 #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 +163,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 +176,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 +192,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 +203,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);
@@ -447,7 +463,7 @@ COMMAND_IMPL(run) {
 
     running_ = 1;
     gettimeofday(&run_start_tv, NULL);
-    run_cycle_start = vm->cycle;
+    run_cycle_start = vm->cycle_;
 
     memset(&act, 0, sizeof act);
     act.sa_handler = sigint_handler_;
@@ -460,7 +476,7 @@ COMMAND_IMPL(run) {
 
     while (running_) {
         gettimeofday(&start_tv, NULL);
-        cycle_start = vm->cycle;
+        cycle_start = vm->cycle_;
 
         dcpu16_step(vm);
         if (opt_.verbose > 1)
@@ -471,7 +487,7 @@ COMMAND_IMPL(run) {
         }
 
         /* how many cycles did this instr use? */
-        cycles_to_wait = vm->cycle - cycle_start;
+        cycles_to_wait = vm->cycle_ - cycle_start;
 
         if (cycles_to_wait == 0)
             continue;
@@ -500,7 +516,7 @@ COMMAND_IMPL(run) {
     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,
+            vm->cycle_ - run_cycle_start,
             diff_tv.tv_sec,
             diff_tv.tv_usec,
             run_usec);
@@ -533,7 +549,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 +558,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 +576,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 +616,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 +635,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 +649,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 */