X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=dcpu16.c;h=165b58984e298d76a2cdce30334a2dc141826344;hb=34245ba6868f5d0580c3f16dbd68a4f973ef27f8;hp=7d7456a828a71b96a135457315e7abe4c4585aba;hpb=738eeba229e4087da2b6a42154f6b2ed16c80c5c;p=dcpu16

diff --git a/dcpu16.c b/dcpu16.c
index 7d7456a..165b589 100644
--- a/dcpu16.c
+++ b/dcpu16.c
@@ -87,13 +87,13 @@ void dcpu16_trace_cb_set(void (*fn)(char *fmt, ...)) {
  *  invokes callbacks for specified event
  */
 static inline
-void acct_event_(struct dcpu16 *vm, dcpu16_acct_event_ ev, DCPU16_WORD addr) {
+void acct_event_(struct dcpu16 *vm, dcpu16_acct_event ev, DCPU16_WORD addr) {
     struct dcpu16_acct_cb *cb = vm->cb_table_;
     size_t i;
 
     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, 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)(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;
@@ -787,12 +788,20 @@ int dcpu16_acct_add(struct dcpu16 *vm, dcpu16_acct_event_ mask, void (*fn)(dcpu1
 }
 
 /*  dcpu16_reset
- *  resets a dcpu16 instance to initial state
+ *  signals cpu to reset, clearing runstate and ram, then reload any init callbacks
  */
 void dcpu16_reset(struct dcpu16 *d) {
     if (!d) return;
 
-    memset(d, 0, sizeof *d);
+    d->cycle = 0;
+    memset(d->reg, 0, sizeof d->reg);
+    d->pc = 0;
+    d->sp = 0;
+    d->o = 0;
+    d->skip_ = 0;
+    memset(d->ram, 0, sizeof d->ram);
+
+    acct_event_(d, DCPU16_ACCT_EV_RESET, 0);
 }
 
 /*  dcpu16_new