projects
/
dcpu16
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge: expanded accounting-event coverage, rewrote cycle timing
[dcpu16]
/
dcpu16.h
diff --git
a/dcpu16.h
b/dcpu16.h
index d0b366ac6d1a7e223eb357d7da6acf4012e4ff83..94e70a3fc02cf901c064ab622ecb2a57a561553e 100644
(file)
--- a/
dcpu16.h
+++ b/
dcpu16.h
@@
-59,12
+59,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_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 {
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 *);
};
typedef void (dcpu16_hw_signal_t)(struct dcpu16 *, struct dcpu16_hw *);
@@
-128,7
+132,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_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 *);
/* execute the next instruction */
void dcpu16_step(struct dcpu16 *);