* 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;
* 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, void *), void *data) {
+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;
}
/* 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