diff --git a/include/vm_reflect.h b/include/vm_reflect.h index c9115e8..eeecde2 100644 --- a/include/vm_reflect.h +++ b/include/vm_reflect.h @@ -36,16 +36,14 @@ struct vm_reflect { vm_reflect_fn machine_info; /* - * These functions pause or resume operation of the virtual machine. + * This function will pause or resume operation of the virtual machine. */ vm_reflect_fn pause; - vm_reflect_fn resume; /* * Turn on, or off, disassembly of the instructions being executed. */ - vm_reflect_fn disasm_on; - vm_reflect_fn disasm_off; + vm_reflect_fn disasm; /* * Eventually we will have the ability to load and save state to a @@ -65,11 +63,9 @@ struct vm_reflect { void x(vm_reflect *ref) extern int vm_reflect_cpu_info(vm_reflect *); -extern int vm_reflect_disasm_off(vm_reflect *); -extern int vm_reflect_disasm_on(vm_reflect *); +extern int vm_reflect_disasm(vm_reflect *); extern int vm_reflect_machine_info(vm_reflect *); extern int vm_reflect_pause(vm_reflect *); -extern int vm_reflect_resume(vm_reflect *); extern vm_reflect *vm_reflect_create(); extern void vm_reflect_free(vm_reflect *); diff --git a/src/vm_reflect.c b/src/vm_reflect.c index 9d11816..e808cf6 100644 --- a/src/vm_reflect.c +++ b/src/vm_reflect.c @@ -30,9 +30,7 @@ vm_reflect_create() ref->cpu_info = NULL; ref->machine_info = NULL; ref->pause = NULL; - ref->resume = NULL; - ref->disasm_on = NULL; - ref->disasm_off = NULL; + ref->disasm = NULL; return ref; } @@ -59,6 +57,4 @@ vm_reflect_free(vm_reflect *ref) REFLECT_HANDLER(cpu_info); // ignore docblock REFLECT_HANDLER(machine_info); // ignore docblock REFLECT_HANDLER(pause); // ignore docblock -REFLECT_HANDLER(resume); // ignore docblock -REFLECT_HANDLER(disasm_on); // ignore docblock -REFLECT_HANDLER(disasm_off); // ignore docblock +REFLECT_HANDLER(disasm); // ignore docblock