From c665df353145681f35abf87304556656e6bcefc1 Mon Sep 17 00:00:00 2001
From: Peter Evans <peter@modul8r.com>
Date: Sat, 7 Apr 2018 00:33:40 -0500
Subject: [PATCH] Move reflect to event

---
 sources.cmake       |  2 +-
 src/apple2/apple2.c |  2 +-
 src/apple2/event.c  |  2 +-
 src/main.c          |  8 +-------
 src/vm_debug.c      | 13 +++++--------
 5 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/sources.cmake b/sources.cmake
index 9abf8df..2607e8b 100644
--- a/sources.cmake
+++ b/sources.cmake
@@ -6,12 +6,12 @@ set(erc_sources
 	apple2/dec.c
 	apple2/draw.c
 	apple2/enc.c
+	apple2/event.c
 	apple2/hires.c
 	apple2/kb.c
 	apple2/lores.c
 	apple2/mem.c
 	apple2/pc.c
-	apple2/reflect.c
 	apple2/text.c
 	log.c
 	mos6502/mos6502.c
diff --git a/src/apple2/apple2.c b/src/apple2/apple2.c
index 1d5b121..ae1a7ee 100644
--- a/src/apple2/apple2.c
+++ b/src/apple2/apple2.c
@@ -341,7 +341,7 @@ apple2_run_loop(apple2 *mach)
     int sleep = 5;
 
     if (dlog != NULL) {
-        vm_reflect_disasm(NULL);
+        mach->disasm = true;
     }
 
     int i = 0;
diff --git a/src/apple2/event.c b/src/apple2/event.c
index bd0e737..59e69a0 100644
--- a/src/apple2/event.c
+++ b/src/apple2/event.c
@@ -6,7 +6,7 @@
  */
 
 #include "apple2/apple2.h"
-#include "apple2/reflect.h"
+#include "apple2/event.h"
 #include "vm_di.h"
 
 /*
diff --git a/src/main.c b/src/main.c
index fe3c1b9..1f43a42 100644
--- a/src/main.c
+++ b/src/main.c
@@ -13,11 +13,10 @@
 
 #include "apple2/apple2.h"
 #include "apple2/draw.h"
-#include "apple2/reflect.h"
+#include "apple2/event.h"
 #include "log.h"
 #include "option.h"
 #include "vm_di.h"
-#include "vm_reflect.h"
 #include "vm_screen.h"
 
 /*
@@ -93,7 +92,6 @@ main(int argc, char **argv)
 {
     apple2 *mach;
     vm_screen *screen;
-    vm_reflect *ref;
     int err;
 
     init(argc, argv);
@@ -117,9 +115,6 @@ main(int argc, char **argv)
     // _to_ define a cpu field.
     vm_di_set(VM_CPU, mach->cpu);
 
-    ref = vm_reflect_create();
-    vm_di_set(VM_REFLECT, ref);
-
     apple2_event_init();
 
     // Ok, it's time to boot this up!
@@ -137,7 +132,6 @@ main(int argc, char **argv)
 
     // We're all done, so let's tear everything down.
     apple2_free(mach);
-    vm_reflect_free(ref);
 
     // ha ha ha ha #nervous #laughter
     printf("Hello, world\n");
diff --git a/src/vm_debug.c b/src/vm_debug.c
index bdf9f10..a69b80e 100644
--- a/src/vm_debug.c
+++ b/src/vm_debug.c
@@ -15,7 +15,7 @@
 #include "mos6502/dis.h"
 #include "vm_debug.h"
 #include "vm_di.h"
-#include "vm_reflect.h"
+#include "vm_event.h"
 
 /*
  * The largest address size we can set a breakpoint for
@@ -321,13 +321,13 @@ DEBUG_CMD(help)
  */
 DEBUG_CMD(resume)
 {
-    mos6502 *cpu = (mos6502 *)vm_di_get(VM_CPU);
+    apple2 *mach = (apple2 *)vm_di_get(VM_MACHINE);
 
     // If we paused because of a breakpoint, then we need to clear it
     // before we can really keep moving.
-    vm_debug_unbreak(cpu->PC);
+    vm_debug_unbreak(mach->cpu->PC);
 
-    vm_reflect_pause(NULL);
+    mach->paused = false;
 }
 
 /*
@@ -365,9 +365,6 @@ DEBUG_CMD(printaddr)
  */
 DEBUG_CMD(jump)
 {
-    // FIXME: same issue as for printaddr -- overall we need to refactor
-    // vm_reflect quite a bit
-
     mos6502 *cpu = (mos6502 *)vm_di_get(VM_CPU);
     cpu->PC = args->addr1;
 }
@@ -439,7 +436,7 @@ DEBUG_CMD(disasm)
     apple2 *mach = (apple2 *)vm_di_get(VM_MACHINE);
     FILE *stream = (FILE *)vm_di_get(VM_OUTPUT);
 
-    vm_reflect_disasm(NULL);
+    mach->disasm = true;
 
     fprintf(stream, "disassembly %s\n", mach->disasm ? "ON" : "OFF");
 }