X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=dcpu16.h;h=b1b563dfc3483a9d09052bd827d6e14c2f6bdb35;hb=9cf5993655d58da3c9f508ede3ac43a29e6cc6b5;hp=af964e7e46c561f1923e5f49ff8dc5f8768623e8;hpb=0b4991bc7e50f503769a2d2a1a4b5c1690251899;p=dcpu16

diff --git a/dcpu16.h b/dcpu16.h
index af964e7..b1b563d 100644
--- a/dcpu16.h
+++ b/dcpu16.h
@@ -7,18 +7,6 @@ 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_RAM         (1<<3)
-
-struct dcpu16_acct_cb {
-    void (*fn)(dcpu16_acct_event_ e, DCPU16_WORD addr);
-    dcpu16_acct_event_ match_all;
-    dcpu16_acct_event_ match_any;
-};
-
 /* a self-contained dcpu16 core */
 struct dcpu16 {
     unsigned long long cycle;           /* number of cycles this core has executed */
@@ -34,6 +22,17 @@ struct dcpu16 {
     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)
+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);
 
@@ -46,11 +45,11 @@ void dcpu16_state_print(struct dcpu16 *);
 /* print the contents of ram from second to third argument */
 void dcpu16_dump_ram(struct dcpu16 *, DCPU16_WORD, DCPU16_WORD);
 
-/* print the instruction at the specified address */
-void dcpu16_disassemble_print(struct dcpu16 *, DCPU16_WORD);
+/* print the instruction at the specified address, returns number of words consumed in decoding */
+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_ match_all, dcpu16_acct_event_ match_any, 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 *);