X-Git-Url: http://git.squeep.com/?p=dcpu16;a=blobdiff_plain;f=dcpu16.h;h=9b38093fec8de936cef9985ed8f8e9def11a8580;hp=005aad3a858fbe656adfd8bc9df92841c7f26696;hb=662d752f2adae37efcfa62354b2107c0d0de2d6d;hpb=738eeba229e4087da2b6a42154f6b2ed16c80c5c

diff --git a/dcpu16.h b/dcpu16.h
index 005aad3..9b38093 100644
--- a/dcpu16.h
+++ b/dcpu16.h
@@ -7,17 +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_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 */
@@ -33,6 +22,16 @@ 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);
+    dcpu16_acct_event_ mask;
+};
+
 /* instantiate a new core */
 struct dcpu16 *dcpu16_new(void);
 
@@ -49,7 +48,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));
 
 /* execute the next instruction */
 void dcpu16_step(struct dcpu16 *);