Getting ppc tests building again (big surprise: they are failing).

src/xenia/cpu/processor.cc

@@ -9,7 +9,6 @@
 
 #include <xenia/cpu/processor.h>
 
-#include <xenia/emulator.h>
 #include <xenia/export_resolver.h>
 #include <xenia/cpu/cpu-private.h>
 #include <xenia/cpu/xenon_runtime.h>
@@ -45,10 +44,10 @@ void InitializeIfNeeded() {
 void CleanupOnShutdown() {}
 }
 
-Processor::Processor(Emulator* emulator)
-    : export_resolver_(emulator->export_resolver()),
+Processor::Processor(xe::Memory* memory, ExportResolver* export_resolver)
+    : export_resolver_(export_resolver),
       runtime_(0),
-      memory_(emulator->memory()),
+      memory_(memory),
       interrupt_thread_state_(NULL),
       interrupt_thread_block_(0) {
   InitializeIfNeeded();

src/xenia/cpu/processor.h

@@ -14,12 +14,11 @@
 #include <vector>
 
 #include <xenia/core.h>
-#include <xenia/emulator.h>
+#include <xenia/export_resolver.h>
 
 namespace xe {
 namespace cpu {
 
-class XenonMemory;
 class XenonRuntime;
 class XenonThreadState;
 class XexModule;
@@ -33,7 +32,7 @@ enum class Irql : uint32_t {
 
 class Processor {
  public:
-  Processor(Emulator* emulator);
+  Processor(Memory* memory, ExportResolver* export_resolver);
   ~Processor();
 
   ExportResolver* export_resolver() const { return export_resolver_; }

src/xenia/emulator.cc

@@ -89,7 +89,8 @@ X_STATUS Emulator::Setup() {
   export_resolver_ = std::make_unique<ExportResolver>();
 
   // Initialize the CPU.
-  processor_ = std::make_unique<Processor>(this);
+  processor_ =
+      std::make_unique<Processor>(memory_.get(), export_resolver_.get());
 
   // Initialize the APU.
   audio_system_ = std::move(xe::apu::Create(this));