From 9cf5993655d58da3c9f508ede3ac43a29e6cc6b5 Mon Sep 17 00:00:00 2001 From: Justin Wind Date: Thu, 19 Apr 2012 15:02:34 -0700 Subject: [PATCH] added user data to event callbacks watchpoint callbacks now include a pointer to user-specified data --- dcpu16.c | 5 +++-- dcpu16.h | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dcpu16.c b/dcpu16.c index 5b48258..b88cf05 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(vm, ev, addr); + cb[i].fn(vm, ev, addr, cb[i].data); } } @@ -763,11 +763,12 @@ 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)(struct dcpu16 *, 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, void *), void *data) { struct dcpu16_acct_cb cb; cb.mask = mask; cb.fn = fn; + cb.data = data; if (vm->cb_table_entries_ == vm->cb_table_allocated_) { size_t new_entries = vm->cb_table_allocated_ + 32; diff --git a/dcpu16.h b/dcpu16.h index 9b38093..b1b563d 100644 --- a/dcpu16.h +++ b/dcpu16.h @@ -28,7 +28,8 @@ typedef unsigned int dcpu16_acct_event_; #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 (*fn)(struct dcpu16 *, dcpu16_acct_event_ e, DCPU16_WORD addr, void *); + void *data; dcpu16_acct_event_ mask; }; @@ -48,7 +49,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 *); -- 2.43.2