tile rendering for chargen now working correctly

[dcpu16] / dcpu16.h

diff --git a/dcpu16.h b/dcpu16.h
index 005aad3a858fbe656adfd8bc9df92841c7f26696..73592d9c358e907b1c8d1b7d62e17162ebd6045b 100644 (file)
--- a/dcpu16.h
+++ b/dcpu16.h
@@ -1,23 +1,14 @@
 #ifndef DCPU16_H_3XXIQQG2
 #define DCPU16_H_3XXIQQG2
 
+#include <stdlib.h>
+
 /* the target system's concept of a word */
 typedef unsigned short DCPU16_WORD;
 
 /* how much ram the system has */
 #define DCPU16_RAM 0x10000
 
-/* these are used for accounting/watchpointing/&c */
-typedef unsigned int dcpu16_acct_event_;
-#define DCPU16_ACCT_EV_READ     (1<<1)
-#define DCPU16_ACCT_EV_WRITE    (1<<2)
-#define DCPU16_ACCT_EV_NOP      (1<<3)
-
-struct dcpu16_acct_cb {
-    void (*fn)(dcpu16_acct_event_ e, DCPU16_WORD addr);
-    dcpu16_acct_event_ mask;
-};
-
 /* a self-contained dcpu16 core */
 struct dcpu16 {
     unsigned long long cycle;           /* number of cycles this core has executed */
@@ -28,11 +19,23 @@ struct dcpu16 {
     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 under certain conditions */
+    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 */
+typedef unsigned int dcpu16_acct_event;
+#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 *);
+    void *data;
+    dcpu16_acct_event mask;
+};
+
 /* instantiate a new core */
 struct dcpu16 *dcpu16_new(void);
 
@@ -49,7 +52,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)(dcpu16_acct_event_, DCPU16_WORD));
+int dcpu16_acct_add(struct dcpu16 *, dcpu16_acct_event mask, void (*fn)(struct dcpu16 *, dcpu16_acct_event, DCPU16_WORD, void *), void *data);
 
 /* execute the next instruction */
 void dcpu16_step(struct dcpu16 *);