minor cleanups to display and callback routines

[dcpu16] / dcpu16.h

diff --git a/dcpu16.h b/dcpu16.h
index 73592d9c358e907b1c8d1b7d62e17162ebd6045b..7741c93ebe263c511c14360bd2ca604153c97f13 100644 (file)
--- a/dcpu16.h
+++ b/dcpu16.h
@@ -11,27 +11,29 @@ typedef unsigned short DCPU16_WORD;
 
 /* a self-contained dcpu16 core */
 struct dcpu16 {
+    struct dcpu16_acct_cb *cb_table_;   /* list of callbacks to invoke for certain events */
+    size_t cb_table_entries_;           /* callback list maintenance */
+    size_t cb_table_allocated_;         /* callback list maintenance */
+    unsigned int skip_ : 1;             /* skip execution of next instruction */
+    DCPU16_WORD reg_work_[2];           /* work registers for holding literal values while decoding instructions */
+
     unsigned long long cycle;           /* number of cycles this core has executed */
     DCPU16_WORD reg[8];                 /* system registers, a b c x y z i j */
     DCPU16_WORD pc;                     /* program counter */
     DCPU16_WORD sp;                     /* stack pointer */
     DCPU16_WORD o;                      /* overflow */
-    unsigned int skip_ : 1;             /* skip execution of next instruction */
     DCPU16_WORD ram[DCPU16_RAM];        /* memory */
-    DCPU16_WORD reg_work_[2];           /* (private) work registers for holding literal values while decoding instructions */
-    struct dcpu16_acct_cb *cb_table_;   /* list of callbacks to invoke for certain events */
-    size_t cb_table_entries_;           /* callback list maintenance */
-    size_t cb_table_allocated_;         /* callback list maintenance */
 };
 
-/* these are used for accounting/watchpointing/&c */
+/* these are used for accounting/watchpointing/modules/&c */
 typedef unsigned int dcpu16_acct_event;
+typedef void (dcpu16_ev_cb_t)(struct dcpu16 *, dcpu16_acct_event, DCPU16_WORD, void *);
 #define DCPU16_ACCT_EV_READ     (1<<1)
 #define DCPU16_ACCT_EV_WRITE    (1<<2)
 #define DCPU16_ACCT_EV_NOP      (1<<3)
 #define DCPU16_ACCT_EV_RESET    (1<<4)
 struct dcpu16_acct_cb {
-    void (*fn)(struct dcpu16 *, dcpu16_acct_event e, DCPU16_WORD addr, void *);
+    dcpu16_ev_cb_t *fn;
     void *data;
     dcpu16_acct_event mask;
 };
@@ -52,7 +54,7 @@ void dcpu16_dump_ram(struct dcpu16 *, DCPU16_WORD, DCPU16_WORD);
 DCPU16_WORD dcpu16_disassemble_print(struct dcpu16 *, DCPU16_WORD);
 
 /* register a callback for an accounting event */
-int dcpu16_acct_add(struct dcpu16 *, dcpu16_acct_event mask, void (*fn)(struct dcpu16 *, dcpu16_acct_event, DCPU16_WORD, void *), void *data);
+int dcpu16_acct_add(struct dcpu16 *, dcpu16_acct_event mask, dcpu16_ev_cb_t *fn, void *data);
 
 /* execute the next instruction */
 void dcpu16_step(struct dcpu16 *);