From 662d752f2adae37efcfa62354b2107c0d0de2d6d Mon Sep 17 00:00:00 2001 From: Justin Wind Date: Thu, 19 Apr 2012 13:08:06 -0700 Subject: [PATCH] added cpu context to event callbacks watchpoint callbacks now include a pointer to the cpu structure. --- dcpu16.c | 4 ++-- dcpu16.h | 23 +++++++++++------------ 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/dcpu16.c b/dcpu16.c index 7d7456a..5b48258 100644 --- a/dcpu16.c +++ b/dcpu16.c @@ -93,7 +93,7 @@ void acct_event_(struct dcpu16 *vm, dcpu16_acct_event_ ev, DCPU16_WORD addr) { for (i = 0; i < vm->cb_table_entries_; i++) { if ( (cb[i].mask & ev) ) - cb[i].fn(ev, addr); + cb[i].fn(vm, ev, addr); } } @@ -763,7 +763,7 @@ void dcpu16_dump_ram(struct dcpu16 *d, DCPU16_WORD start, DCPU16_WORD end) { * Register callback fn to be triggered whenever event matching any events * in bitwise mask occur. */ -int dcpu16_acct_add(struct dcpu16 *vm, dcpu16_acct_event_ mask, void (*fn)(dcpu16_acct_event_, DCPU16_WORD)) { +int dcpu16_acct_add(struct dcpu16 *vm, dcpu16_acct_event_ mask, void (*fn)(struct dcpu16 *, dcpu16_acct_event_, DCPU16_WORD)) { struct dcpu16_acct_cb cb; cb.mask = mask; 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 *); -- 2.45.2