further cleanup of message callback changes

diff --git a/dcpu16.c b/dcpu16.c
index c63c8002ae3762c2aed40973745ae38047a04344..0b1d391e58261f46332fa914aeda4673abe889df 100644 (file)
--- a/dcpu16.c
+++ b/dcpu16.c
@@ -55,15 +55,15 @@ const char * const dcpu16_reg_names[] = {
 };
 
 #define MSG_(__level__, __vm__, ...) do { ((__vm__) ? ((struct dcpu16 *)(__vm__))->msg_cb_ : dcpu16_msg_)((__level__), __VA_ARGS__); } while (0)
-#define MSG_INFO(__vm__,...) MSG_(MSG_INFO, __vm__, __VA_ARGS__)
-#define MSG_ERROR(__vm__,...) MSG_(MSG_ERROR, __vm__, __VA_ARGS__)
+#define MSG_INFO(__vm__,...) MSG_(DCPU16_MSG_INFO, __vm__, __VA_ARGS__)
+#define MSG_ERROR(__vm__,...) MSG_(DCPU16_MSG_ERROR, __vm__, __VA_ARGS__)
 #ifdef DEBUG
-#define MSG_DEBUG(__vm__,...) MSG_(MSG_DEBUG, __vm__, __VA_ARGS__)
+#define MSG_DEBUG(__vm__,...) MSG_(DCPU16_MSG_DEBUG, __vm__, __VA_ARGS__)
 #else /* DEBUG */
 #define MSG_DEBUG(__vm__,...) do {} while (0)
 #endif /* DEBUG */
 #ifdef DEBUG_DECODE
-#define MSG_DEBUG_DECODE (MSG_DEBUG + 2)
+#define MSG_DEBUG_DECODE (DCPU16_MSG_DEBUG + 2)
 #endif /* DEBUG_DECODE
 
 /* messages could be sent nowhere */
@@ -74,7 +74,7 @@ static void msg_default_(unsigned int, char *, ...) __attribute__((format(printf
 static inline
 void msg_default_(unsigned int l, char *fmt, ...) {
     static const char * const msg_tag_[] = { "info", "error", "debug" };
-    FILE *f = (l <= MSG_INFO) ? stderr : stdout;
+    FILE *f = (l <= DCPU16_MSG_INFO) ? stderr : stdout;
     va_list ap;
 
     if (l < sizeof msg_tag_ / sizeof *msg_tag_)

diff --git a/dcpu16.h b/dcpu16.h
index 1f46d454c618537b918cdddc436029d5442cad23..b5710789028f6356484382246a27588dbd2a11b3 100644 (file)
--- a/dcpu16.h
+++ b/dcpu16.h
@@ -32,17 +32,16 @@ typedef void (dcpu16_msg_cb_t)(unsigned int, char *, ...);
 
 /* we may emit any of these types of messages */
 enum dcpu16_msg_type {
-    MSG_ERROR = 0,
-    MSG_INFO,
-    MSG_DEBUG
+    DCPU16_MSG_ERROR = 0,
+    DCPU16_MSG_INFO,
+    DCPU16_MSG_DEBUG
 };
 
 /* update the default message handler */
 dcpu16_msg_cb_t *dcpu16_msg_set_default(dcpu16_msg_cb_t *);
 
-/*
-extern dcpu16_msg_cb_t *dcpu16_msg;
-*/
+/* hardware devices may want to call this directly, without a core context */
+extern dcpu16_msg_cb_t *dcpu16_msg_;
 
 /* a self-contained dcpu16 core */
 struct dcpu16 {

diff --git a/hw_clock.c b/hw_clock.c
index ebd58fde5568cdf4367503336acc65e869cdb638..fb9e195abe410b6f3c29fe82c4f110a3fbb09bef 100644 (file)
--- a/hw_clock.c
+++ b/hw_clock.c
@@ -39,7 +39,7 @@ void clock_cycle_(struct dcpu16 *vm, struct dcpu16_hw *hw) {
 
         if (clock->interrupt_message) {
             if (dcpu16_interrupt(vm, clock->interrupt_message))
-                vm->msg_cb_(MSG_ERROR, "%s: could not send interrupt", hw->mod->name_);
+                vm->msg_cb_(DCPU16_MSG_ERROR, "%s: could not send interrupt", hw->mod->name_);
         }
     }
 }
@@ -71,7 +71,7 @@ int clock_data_init_(struct dcpu16_hw *hw, void *data) {
 
     hw->data = calloc(1, sizeof(struct clock_));
     if (hw->data == NULL) {
-        hw->vm->msg_cb_(MSG_ERROR, "%s():%s", "calloc", strerror(errno));
+        hw->vm->msg_cb_(DCPU16_MSG_ERROR, "%s():%s", "calloc", strerror(errno));
         return -1;
     }
     return 0;

diff --git a/hw_keyboard.c b/hw_keyboard.c
index f69b8f4227e7eaa07a69ce7ffcfdc3ab9f5c0004..9d6c996484e4e0929fba91288c38db2b5b7ecd8f 100644 (file)
--- a/hw_keyboard.c
+++ b/hw_keyboard.c
@@ -71,7 +71,7 @@ void keyboard_rfbevent_(rfbBool down, rfbKeySym key, rfbClientPtr cl) {
     struct keyboard_ *keyboard = (struct keyboard_ *)hw->data;
 
 #ifdef DEBUG
-    hw->vm->msg_cb_(MSG_DEBUG, "%s>> down:%u rfb_key:0x%04x", down, key);
+    hw->vm->msg_cb_(DCPU16_MSG_DEBUG, "%s>> down:%u rfb_key:0x%04x", down, key);
 #endif /* DEBUG */
 
     if (keysym_rfbtodcpu(key, &dcpu_key)) {
@@ -82,7 +82,7 @@ void keyboard_rfbevent_(rfbBool down, rfbKeySym key, rfbClientPtr cl) {
     keyboard->keys_pressed[dcpu_key] = (down ? 1 : 0);
     if (down) {
         if ((keyboard->buf_tail + 1) % keyboard->buf_sz == keyboard->buf_head) {
-            hw->vm->msg_cb_(MSG_INFO, "keyboard buffer overflow");
+            hw->vm->msg_cb_(DCPU16_MSG_INFO, "keyboard buffer overflow");
             return;
         }
         keyboard->buf[keyboard->buf_tail] = dcpu_key;
@@ -152,13 +152,13 @@ int keyboard_data_init_(struct dcpu16_hw *hw, void *data) {
 
     hw->data = calloc(1, sizeof(struct keyboard_));
     if (hw->data == NULL) {
-        hw->vm->msg_cb_(MSG_ERROR, "%s():%s", "calloc", strerror(errno));
+        hw->vm->msg_cb_(DCPU16_MSG_ERROR, "%s():%s", "calloc", strerror(errno));
         return -1;
     }
 
     ((struct keyboard_ *)(hw->data))->buf = malloc(buf_sz * sizeof *((struct keyboard_ *)(hw->data))->buf);
     if (((struct keyboard_ *)(hw->data))->buf == NULL) {
-        hw->vm->msg_cb_(MSG_ERROR, "%s():%s", "malloc", strerror(errno));
+        hw->vm->msg_cb_(DCPU16_MSG_ERROR, "%s():%s", "malloc", strerror(errno));
         free(hw->data);
         hw->data = NULL;
         return -1;
@@ -202,12 +202,12 @@ int keyboard_data_ctl_(struct dcpu16_hw *hw, const char *cmd, void *data_in, voi
 
         if (buf_sz_in) {
 #ifdef DEBUG
-            hw->vm->msg_cb_(MSG_DEBUG, "%s>> resizing buffer from %zu to %zu", __func__, keyboard->buf_sz, *buf_sz_in);
+            hw->vm->msg_cb_(DCPU16_MSG_DEBUG, "%s>> resizing buffer from %zu to %zu", __func__, keyboard->buf_sz, *buf_sz_in);
 #endif /* DEBUG */
 
             tmp_ptr = realloc(keyboard->buf, *buf_sz_in);
             if (tmp_ptr == NULL) {
-                hw->vm->msg_cb_(MSG_DEBUG, "%s():%s", "realloc", strerror(errno));
+                hw->vm->msg_cb_(DCPU16_MSG_DEBUG, "%s():%s", "realloc", strerror(errno));
                 return -1;
             }
             keyboard->buf = tmp_ptr;

diff --git a/hw_lem1802.c b/hw_lem1802.c
index 1ae7b57d049452da312165b70444d0fd41ba5ec8..4cdaa2f4d6b69ed644a0300ad6e5a6f68d694c39 100644 (file)
--- a/hw_lem1802.c
+++ b/hw_lem1802.c
@@ -24,10 +24,13 @@
  * multiple vnc displays
  */
 
+#define MSG_(__level__, __vm__, ...) do { ((__vm__) ? ((struct dcpu16 *)(__vm__))->msg_cb_ : dcpu16_msg_)(__level__, __VA_ARGS__); } while (0)
+#define MSG_INFO(__vm__, ...) MSG_(DCPU16_MSG_INFO, __vm__, __VA_ARGS__)
+#define MSG_ERROR(__vm__, ...) MSG_(DCPU16_MSG_ERROR, __vm__, __VA_ARGS__)
 #ifdef DEBUG
-#define TRACE(...) do { printf("[debug] "); printf(__VA_ARGS__); printf("\n"); } while (0)
+#define MSG_DEBUG(__vm__, ...) MSG_(DCPU16_MSG_DEBUG, __vm__, __VA_ARGS__)
 #else /* DEBUG  */
-#define TRACE(...) do {} while (0)
+#define MSG_DEBUG(__vm__, ...) do { } while (0)
 #endif /* DEBUG */
 
 #ifdef WANT_VARIADIC_VOIDP_CAST
@@ -140,7 +143,7 @@ static
 void pixbuf_border_paint_(struct pixel_ *pixbuf, struct pixel_ *border) {
     size_t x, y, i;
 
-    TRACE("%s>> painting border", __func__);
+    MSG_DEBUG(NULL, "%s>> painting border", __func__);
 
     /* top */
     for (y = 0; y < PIX_BORDER; y++) {
@@ -167,7 +170,7 @@ void font_tile_paint_(struct pixel_ *p, struct pixel_ *fg, struct pixel_ *bg, DC
     unsigned char *font_bitmap = (unsigned char *)tile;
 
 #if 0
-    TRACE("%s>> fg:(%u,%u,%u) bg:(%u,%u,%u) font_bitmap:%02x %02x %02x %02x", __func__,
+    MSG_DEBUG(NULL, "%s>> fg:(%u,%u,%u) bg:(%u,%u,%u) font_bitmap:%02x %02x %02x %02x", __func__,
           fg->r, fg->g, fg->b,
           bg->r, bg->g, bg->b,
           font_bitmap[0], font_bitmap[1], font_bitmap[2], font_bitmap[3]);
@@ -196,7 +199,7 @@ void pixbuf_addr_paint_(struct pixel_ *pixbuf, DCPU16_WORD *mem, DCPU16_WORD bas
     cell_y = (addr - base) / CELL_X;
 
 #if 0
-    TRACE("%s>> addr:0x%04x col:%u row:%u v:%hu",
+    MSG_DEBUG(NULL, "%s>> addr:0x%04x col:%u row:%u v:%hu",
           __func__,
           addr,
           cell_x, cell_y, mem[addr]);
@@ -228,7 +231,7 @@ void lem1802_pixbuf_refresh_full_(struct lem1802_ *display, DCPU16_WORD *mem) {
     size_t tile;
 
 #if 0
-    TRACE("%s>> video_base:0x%04x", __func__, display->video_base);
+    MSG_DEBUG(NULL, "%s>> video_base:0x%04x", __func__, display->video_base);
 #endif
 
     if (display->cycles_until_active_) {
@@ -339,8 +342,8 @@ rfbScreenInfoPtr lem1802_rfb_new_(int argc, char *argv[]) {
     s->httpDir = "../classes";
 #endif
 
-    TRACE("%s>> s:%p", __func__, VOIDP(s));
-    TRACE("%s>> s->kbdAddEvent:%p s->frameBuffer:%p", __func__, VOIDFP(s->kbdAddEvent), s->frameBuffer);
+    MSG_DEBUG(NULL, "%s>> s:%p", __func__, VOIDP(s));
+    MSG_DEBUG(NULL, "%s>> s->kbdAddEvent:%p s->frameBuffer:%p", __func__, VOIDFP(s->kbdAddEvent), s->frameBuffer);
 
     return s;
 }
@@ -354,13 +357,13 @@ int pixbuf_render_vnc_(void *data, struct pixel_ *pixbuf, size_t x, size_t y) {
 
     (void)pixbuf;
 
-    TRACE("%s>> s:%p", __func__, s);
+    MSG_DEBUG(NULL, "%s>> s:%p", __func__, s);
 
     /* derp */
     if (s)
         rfbMarkRectAsModified(s, 0, 0, x, y);
 
-    TRACE("%s>>", __func__);
+    MSG_DEBUG(NULL, "%s>>", __func__);
 
     return retval;
 }
@@ -387,9 +390,7 @@ void lem1802_reset_(struct dcpu16 *vm, struct dcpu16_hw *hw) {
 
     display->cycle_state_ = 0;
 
-#if DEBUG
-    vm->msg_cb_(MSG_DEBUG, "%s>>", __func__);
-#endif /* DEBUG */
+    MSG_DEBUG(vm, "%s>>", __func__);
 }
 
 static
@@ -408,14 +409,14 @@ void lem1802_cycle_(struct dcpu16 *vm, struct dcpu16_hw *hw) {
     if (display->blink_tally_ >= display->blink_rate) {
         display->blink_tally_ = 0;
         display->blink_state ^= 1;
-        TRACE("%s>> blink:%u (%u cycles)", __func__, display->blink_state, display->blink_rate);
+        MSG_DEBUG(vm, "%s>> blink:%u (%u cycles)", __func__, display->blink_state, display->blink_rate);
     }
 
     display->refresh_tally_++;
     if (display->refresh_tally_ >= display->refresh_rate) {
         display->refresh_tally_ = 0;
         if (display->render)
-            TRACE("%s>> refresh", __func__);
+            MSG_DEBUG(vm, "%s>> refresh", __func__);
             lem1802_pixbuf_refresh_full_(display, vm->ram);
             display->render(display->renderer_data, display->pixbuf, PIX_X, PIX_Y);
     }
@@ -425,7 +426,7 @@ void lem1802_cycle_(struct dcpu16 *vm, struct dcpu16_hw *hw) {
             break;
 
         case CYCLE_COPY_TO_RAM:
-            TRACE("%s>> copy_to_ram words:%zu src:%p dst_addr:0x%04x",
+            MSG_DEBUG(vm, "%s>> copy_to_ram words:%zu src:%p dst_addr:0x%04x",
                   __func__,
                   display->cycle_state_copy_words_,
                   VOIDP(display->cycle_state_copy_src_ptr_),
@@ -443,7 +444,7 @@ void lem1802_cycle_(struct dcpu16 *vm, struct dcpu16_hw *hw) {
     if (display->cycles_until_active_) {
         display->cycles_until_active_--;
         if (display->cycles_until_active_ == 0) {
-            TRACE("%s>> display now active", __func__);
+            MSG_DEBUG(vm, "%s>> display now active", __func__);
         }
     }
 }
@@ -454,7 +455,7 @@ void lem1802_hwi_(struct dcpu16 *vm, struct dcpu16_hw *hw) {
     DCPU16_WORD reg_a = vm->reg[DCPU16_REG_A];
     DCPU16_WORD reg_b = vm->reg[DCPU16_REG_B];
 
-    TRACE("%s>> A:0x%04x B:0x%04x", __func__, reg_a, reg_b);
+    MSG_DEBUG(vm, "%s>> A:0x%04x B:0x%04x", __func__, reg_a, reg_b);
 
     switch (reg_a) {
         case 0: /* MEM_MAP_SCREEN */
@@ -539,13 +540,13 @@ int lem1802_data_init_(struct dcpu16_hw *hw, void *data) {
 
     hw->data = calloc(1, sizeof(struct lem1802_));
     if (hw->data == NULL) {
-        hw->vm->msg_cb_(MSG_ERROR, "%s():%s", "calloc", strerror(errno));
+        MSG_ERROR(hw->vm, "%s():%s", "calloc", strerror(errno));
         return -1;
     }
 
     ((struct lem1802_ *)(hw->data))->pixbuf = calloc(PIX_X * PIX_Y, sizeof *((struct lem1802_ *)(hw->data))->pixbuf);
     if (((struct lem1802_ *)(hw->data))->pixbuf == NULL) {
-        hw->vm->msg_cb_(MSG_ERROR, "%s():%s", "calloc", strerror(errno));
+        MSG_ERROR(hw->vm, "%s():%s", "calloc", strerror(errno));
         free(hw->data);
         hw->data = NULL;
         return -1;
@@ -670,12 +671,12 @@ int lem1802_data_ctl_(struct dcpu16_hw *hw, const char *cmd, void *data_in, void
         for (r = lem1802_renderers_; r->renderer; r++) {
             if (strcmp(renderer, r->name) == 0) {
                 display->render = r->renderer;
-                TRACE("%s>> renderer set to %s", __func__, renderer);
+                MSG_DEBUG(hw->vm, "%s>> renderer set to %s", __func__, renderer);
                 return 0;
             }
         }
 
-        hw->vm->msg_cb_(MSG_ERROR, "unknown renderer '%s'", renderer);
+        MSG_ERROR(hw->vm, "unknown renderer '%s'", renderer);
 
         return -ENOENT;
     }

diff --git a/hw_spc2000.c b/hw_spc2000.c
index f34b276021dedf3f790bd1075fcdf0a4ed0de47a..47b0bf905425206df89a54452b643ee20b6c0818 100644 (file)
--- a/hw_spc2000.c
+++ b/hw_spc2000.c
@@ -16,7 +16,7 @@ int spc2000_data_init_(struct dcpu16_hw *hw, void *data) {
 
     hw->data = calloc(1, sizeof(struct spc2000_));
     if (hw->data == NULL) {
-        hw->vm->msg_cb_(MSG_ERROR, "%s():%s", "calloc", strerror(errno));
+        hw->vm->msg_cb_(DCPU16_MSG_ERROR, "%s():%s", "calloc", strerror(errno));
         return -1;
     }
     return 0;
@@ -66,7 +66,7 @@ void spc2000_hwi_(struct dcpu16 *vm, struct dcpu16_hw *hw) {
             ||  vm->reg[DCPU16_REG_C] != 0)
                 break;
             /* trigger */
-            vm->msg_cb_(MSG_INFO, "spc2000 triggered\n");
+            vm->msg_cb_(DCPU16_MSG_INFO, "spc2000 triggered\n");
             break;
 
         case 1: /* SET_UNIT_TO_SKIP */

diff --git a/vm-dcpu16.c b/vm-dcpu16.c
index aefbcf16560c6ec4733503574dd4dfa73d1af525..e46f27bc55524e696cd723170377b9d0587f1fac 100644 (file)
--- a/vm-dcpu16.c
+++ b/vm-dcpu16.c
@@ -803,7 +803,7 @@ COMMAND_HELP(help) {
 static
 void msg_verbose_filter_(unsigned int level, char *fmt, ...) {
     static const char * const levels[] = { "error", "info", "debug" };
-    FILE *f = (level <= MSG_ERROR) ? stderr : stdout;
+    FILE *f = (level <= DCPU16_MSG_ERROR) ? stderr : stdout;
     va_list ap;
 
     if (level + 2 > opt_.verbose)