merge

[dcpu16] / dcpu16.h

diff --git a/dcpu16.h b/dcpu16.h
index d0b366ac6d1a7e223eb357d7da6acf4012e4ff83..b5710789028f6356484382246a27588dbd2a11b3 100644 (file)
--- a/dcpu16.h
+++ b/dcpu16.h
@@ -27,10 +27,25 @@ enum dcpu16_register_indexes {
     DCPU16_REG__NUM
 };
 
+/* we call this sort of function for emitting a readable message */
+typedef void (dcpu16_msg_cb_t)(unsigned int, char *, ...);
+
+/* we may emit any of these types of messages */
+enum dcpu16_msg_type {
+    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 *);
+
+/* 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 {
-    void (*warn_cb_)(char *fmt, ...);
-    void (*trace_cb_)(char *fmt, ...);
+    dcpu16_msg_cb_t *msg_cb_;           /* callback to invoke for messages */
 
     struct dcpu16_acct_cb *cb_table_;   /* list of callbacks to invoke for certain events */
     size_t cb_table_entries_;           /* callback list maintenance */
@@ -59,12 +74,16 @@ typedef void (dcpu16_ev_cb_t)(struct dcpu16 *, dcpu16_acct_event, DCPU16_WORD, v
 #define DCPU16_ACCT_EV_CYCLE    (1<<1)
 #define DCPU16_ACCT_EV_READ     (1<<2)
 #define DCPU16_ACCT_EV_WRITE    (1<<3)
-#define DCPU16_ACCT_EV_NOP      (1<<4)
-#define DCPU16_ACCT_EV_RESET    (1<<5)
+#define DCPU16_ACCT_EV_REG_READ (1<<4)
+#define DCPU16_ACCT_EV_REG_WRITE (1<<5)
+#define DCPU16_ACCT_EV_NOP      (1<<6)
+#define DCPU16_ACCT_EV_RESET    (1<<7)
 struct dcpu16_acct_cb {
-    dcpu16_ev_cb_t *fn;
-    void *data;
-    dcpu16_acct_event mask;
+    dcpu16_ev_cb_t *fn; /* call this */
+    void *data;         /* also mention this */
+    dcpu16_acct_event mask; /* when (mask & event) is true and */
+    DCPU16_WORD addr_l, /* addr is this or higher and */
+                addr_h; /* addr is this or lower */
 };
 
 typedef void (dcpu16_hw_signal_t)(struct dcpu16 *, struct dcpu16_hw *);
@@ -105,6 +124,9 @@ struct dcpu16_hw_module {
     struct dcpu16_hw_ctl_cmd *ctl_cmd;
 };
 
+/* update a message handler */
+dcpu16_msg_cb_t *dcpu16_msg_set(struct dcpu16 *, dcpu16_msg_cb_t *);
+
 /* instantiate a new core */
 struct dcpu16 *dcpu16_new(void);
 
@@ -128,7 +150,7 @@ int dcpu16_hw_ctl(struct dcpu16_hw *, const char *, void *, void *);
 int dcpu16_hw_attach(struct dcpu16 *, struct dcpu16_hw *);
 
 /* register a callback for an accounting event */
-int dcpu16_acct_add(struct dcpu16 *, dcpu16_acct_event, dcpu16_ev_cb_t *, void *);
+int dcpu16_acct_add(struct dcpu16 *, dcpu16_acct_event, dcpu16_ev_cb_t *, DCPU16_WORD, DCPU16_WORD, void *);
 
 /* execute the next instruction */
 void dcpu16_step(struct dcpu16 *);
@@ -142,8 +164,4 @@ int dcpu16_interrupt(struct dcpu16 *, DCPU16_WORD);
 /* consume a cycle */
 void dcpu16_cycle_inc(struct dcpu16 *, unsigned int);
 
-/* register callbacks to handle warning and debug messages, default is writing to stderr, may be set to null */
-void dcpu16_warn_cb_set(void (*)(char *, ...));
-void dcpu16_trace_cb_set(void (*)(char *, ...));
-
 #endif /* DCPU16_H_3XXIQQG2 */