Removing old run loop/ref/core/etc.

src/xenia/cpu/processor.h

@@ -13,8 +13,9 @@
 #include <mutex>
 #include <vector>
 
-#include <xenia/core.h>
+#include <xenia/common.h>
 #include <xenia/export_resolver.h>
+#include <xenia/memory.h>
 
 namespace xe {
 namespace cpu {

src/xenia/cpu/xenon_runtime.h

@@ -11,10 +11,10 @@
 #define XENIA_CPU_XENON_RUNTIME_H_
 
 #include <alloy/runtime/runtime.h>
-
-#include <xenia/core.h>
+#include <xenia/common.h>
 #include <xenia/cpu/xenon_thread_state.h>
 #include <xenia/export_resolver.h>
+#include <xenia/memory.h>
 
 namespace xe {
 namespace cpu {

src/xenia/cpu/xenon_thread_state.h

@@ -12,7 +12,8 @@
 
 #include <alloy/frontend/ppc/ppc_context.h>
 #include <alloy/runtime/thread_state.h>
-#include <xenia/core.h>
+#include <xenia/common.h>
+#include <xenia/memory.h>
 
 namespace xdb {
 namespace protocol {

src/xenia/cpu/xex_module.cc

@@ -27,23 +27,22 @@ void UndefinedImport(PPCContext* ppc_state, void* arg0, void* arg1) {
 }
 }
 
-
-XexModule::XexModule(
-    XenonRuntime* runtime) :
-    runtime_(runtime),
-    xex_(0),
-    base_address_(0), low_address_(0), high_address_(0),
-    Module(runtime) {
-}
+XexModule::XexModule(XenonRuntime* runtime)
+    : Module(runtime),
+      runtime_(runtime),
+      xex_(nullptr),
+      base_address_(0),
+      low_address_(0),
+      high_address_(0) {}
 
 XexModule::~XexModule() {
-  xe_xex2_release(xex_);
+  xe_xex2_dealloc(xex_);
 }
 
 int XexModule::Load(const std::string& name, const std::string& path, xe_xex2_ref xex) {
   int result;
 
-  xex_ = xe_xex2_retain(xex);
+  xex_ = xex;
   const xe_xex2_header_t* header = xe_xex2_get_header(xex);
 
   // Scan and find the low/high addresses.

src/xenia/cpu/xex_module.h

@@ -13,16 +13,14 @@
 #include <string>
 
 #include <alloy/runtime/module.h>
-#include <xenia/core.h>
+#include <xenia/common.h>
 #include <xenia/kernel/util/xex2.h>
 
-
 namespace xe {
 namespace cpu {
 
 class XenonRuntime;
 
-
 class XexModule : public alloy::runtime::Module {
 public:
   XexModule(XenonRuntime* runtime);
@@ -52,9 +50,7 @@ private:
   uint64_t      high_address_;
 };
 
-
 }  // namespace cpu
 }  // namespace xe
 
-
 #endif  // XENIA_CPU_XEX_MODULE_H_