X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=dcpu16.h;h=73592d9c358e907b1c8d1b7d62e17162ebd6045b;hb=bca632cc1c329a45dde32f476b0ef9f6ef5db05a;hp=9b38093fec8de936cef9985ed8f8e9def11a8580;hpb=662d752f2adae37efcfa62354b2107c0d0de2d6d;p=dcpu16

diff --git a/dcpu16.h b/dcpu16.h
index 9b38093..73592d9 100644
--- a/dcpu16.h
+++ b/dcpu16.h
@@ -1,6 +1,8 @@
 #ifndef DCPU16_H_3XXIQQG2
 #define DCPU16_H_3XXIQQG2
 
+#include <stdlib.h>
+
 /* the target system's concept of a word */
 typedef unsigned short DCPU16_WORD;
 
@@ -17,19 +19,21 @@ 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_;
+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);
-    dcpu16_acct_event_ mask;
+    void (*fn)(struct dcpu16 *, dcpu16_acct_event e, DCPU16_WORD addr, void *);
+    void *data;
+    dcpu16_acct_event mask;
 };
 
 /* instantiate a new core */
@@ -48,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)(struct dcpu16 *, 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 *);