Moving cpu/runtime/ to cpu/.

src/xenia/cpu/test/test_add.cc

@@ -12,7 +12,7 @@
 #include <cfloat>
 
 using namespace xe::cpu::hir;
-using namespace xe::cpu::runtime;
+using namespace xe::cpu;
 using namespace xe::cpu::test;
 using xe::cpu::frontend::ppc::PPCContext;
 

src/xenia/cpu/test/test_byte_swap.cc

@@ -10,7 +10,7 @@
 #include "xenia/cpu/test/util.h"
 
 using namespace xe::cpu::hir;
-using namespace xe::cpu::runtime;
+using namespace xe::cpu;
 using namespace xe::cpu::test;
 using xe::cpu::frontend::ppc::PPCContext;
 using namespace poly;

src/xenia/cpu/test/test_extract.cc

@@ -12,7 +12,7 @@
 #include <cfloat>
 
 using namespace xe::cpu::hir;
-using namespace xe::cpu::runtime;
+using namespace xe::cpu;
 using namespace xe::cpu::test;
 using xe::cpu::frontend::ppc::PPCContext;
 using namespace poly;

src/xenia/cpu/test/test_insert.cc

@@ -12,7 +12,7 @@
 #include <cfloat>
 
 using namespace xe::cpu::hir;
-using namespace xe::cpu::runtime;
+using namespace xe::cpu;
 using namespace xe::cpu::test;
 using xe::cpu::frontend::ppc::PPCContext;
 using namespace poly;

src/xenia/cpu/test/test_load_vector_shl_shr.cc

@@ -10,7 +10,7 @@
 #include "xenia/cpu/test/util.h"
 
 using namespace xe::cpu::hir;
-using namespace xe::cpu::runtime;
+using namespace xe::cpu;
 using namespace xe::cpu::test;
 using xe::cpu::frontend::ppc::PPCContext;
 using namespace poly;

src/xenia/cpu/test/test_pack.cc

@@ -10,7 +10,7 @@
 #include "xenia/cpu/test/util.h"
 
 using namespace xe::cpu::hir;
-using namespace xe::cpu::runtime;
+using namespace xe::cpu;
 using namespace xe::cpu::test;
 using xe::cpu::frontend::ppc::PPCContext;
 using namespace poly;

src/xenia/cpu/test/test_permute.cc

@@ -10,7 +10,7 @@
 #include "xenia/cpu/test/util.h"
 
 using namespace xe::cpu::hir;
-using namespace xe::cpu::runtime;
+using namespace xe::cpu;
 using namespace xe::cpu::test;
 using xe::cpu::frontend::ppc::PPCContext;
 using namespace poly;

src/xenia/cpu/test/test_sha.cc

@@ -10,7 +10,7 @@
 #include "xenia/cpu/test/util.h"
 
 using namespace xe::cpu::hir;
-using namespace xe::cpu::runtime;
+using namespace xe::cpu;
 using namespace xe::cpu::test;
 using xe::cpu::frontend::ppc::PPCContext;
 

src/xenia/cpu/test/test_shl.cc

@@ -10,7 +10,7 @@
 #include "xenia/cpu/test/util.h"
 
 using namespace xe::cpu::hir;
-using namespace xe::cpu::runtime;
+using namespace xe::cpu;
 using namespace xe::cpu::test;
 using xe::cpu::frontend::ppc::PPCContext;
 

src/xenia/cpu/test/test_shr.cc

@@ -10,7 +10,7 @@
 #include "xenia/cpu/test/util.h"
 
 using namespace xe::cpu::hir;
-using namespace xe::cpu::runtime;
+using namespace xe::cpu;
 using namespace xe::cpu::test;
 using xe::cpu::frontend::ppc::PPCContext;
 using namespace poly;

src/xenia/cpu/test/test_swizzle.cc

@@ -10,7 +10,7 @@
 #include "xenia/cpu/test/util.h"
 
 using namespace xe::cpu::hir;
-using namespace xe::cpu::runtime;
+using namespace xe::cpu;
 using namespace xe::cpu::test;
 using xe::cpu::frontend::ppc::PPCContext;
 using namespace poly;

src/xenia/cpu/test/test_unpack.cc

@@ -10,7 +10,7 @@
 #include "xenia/cpu/test/util.h"
 
 using namespace xe::cpu::hir;
-using namespace xe::cpu::runtime;
+using namespace xe::cpu;
 using namespace xe::cpu::test;
 using xe::cpu::frontend::ppc::PPCContext;
 using namespace poly;

src/xenia/cpu/test/test_vector_add.cc

@@ -12,7 +12,7 @@
 #include <cfloat>
 
 using namespace xe::cpu::hir;
-using namespace xe::cpu::runtime;
+using namespace xe::cpu;
 using namespace xe::cpu::test;
 using xe::cpu::frontend::ppc::PPCContext;
 using namespace poly;

src/xenia/cpu/test/test_vector_max.cc

@@ -12,7 +12,7 @@
 #include <cfloat>
 
 using namespace xe::cpu::hir;
-using namespace xe::cpu::runtime;
+using namespace xe::cpu;
 using namespace xe::cpu::test;
 using xe::cpu::frontend::ppc::PPCContext;
 using namespace poly;

src/xenia/cpu/test/test_vector_min.cc

@@ -12,7 +12,7 @@
 #include <cfloat>
 
 using namespace xe::cpu::hir;
-using namespace xe::cpu::runtime;
+using namespace xe::cpu;
 using namespace xe::cpu::test;
 using xe::cpu::frontend::ppc::PPCContext;
 using namespace poly;

src/xenia/cpu/test/test_vector_rotate_left.cc

@@ -11,7 +11,7 @@
 #include "xenia/cpu/test/util.h"
 
 using namespace xe::cpu::hir;
-using namespace xe::cpu::runtime;
+using namespace xe::cpu;
 using namespace xe::cpu::test;
 using xe::cpu::frontend::ppc::PPCContext;
 using namespace poly;

src/xenia/cpu/test/test_vector_sha.cc

@@ -10,7 +10,7 @@
 #include "xenia/cpu/test/util.h"
 
 using namespace xe::cpu::hir;
-using namespace xe::cpu::runtime;
+using namespace xe::cpu;
 using namespace xe::cpu::test;
 using xe::cpu::frontend::ppc::PPCContext;
 using namespace poly;

src/xenia/cpu/test/test_vector_shl.cc

@@ -10,7 +10,7 @@
 #include "xenia/cpu/test/util.h"
 
 using namespace xe::cpu::hir;
-using namespace xe::cpu::runtime;
+using namespace xe::cpu;
 using namespace xe::cpu::test;
 using xe::cpu::frontend::ppc::PPCContext;
 using namespace poly;

src/xenia/cpu/test/test_vector_shr.cc

@@ -10,7 +10,7 @@
 #include "xenia/cpu/test/util.h"
 
 using namespace xe::cpu::hir;
-using namespace xe::cpu::runtime;
+using namespace xe::cpu;
 using namespace xe::cpu::test;
 using xe::cpu::frontend::ppc::PPCContext;
 using namespace poly;

src/xenia/cpu/test/util.h

@@ -15,7 +15,7 @@
 #include "xenia/cpu/frontend/ppc/ppc_context.h"
 #include "xenia/cpu/frontend/ppc/ppc_frontend.h"
 #include "xenia/cpu/hir/hir_builder.h"
-#include "xenia/cpu/runtime/test_module.h"
+#include "xenia/cpu/test_module.h"
 #include "poly/main.h"
 #include "poly/poly.h"
 
@@ -28,56 +28,7 @@ namespace cpu {
 namespace test {
 
 using xe::cpu::frontend::ppc::PPCContext;
-using xe::cpu::runtime::Runtime;
-
-class ThreadState : public xe::cpu::runtime::ThreadState {
- public:
-  ThreadState(Runtime* runtime, uint32_t thread_id, uint64_t stack_address,
-              size_t stack_size, uint64_t thread_state_address)
-      : xe::cpu::runtime::ThreadState(runtime, thread_id),
-        stack_address_(stack_address),
-        stack_size_(stack_size),
-        thread_state_address_(thread_state_address) {
-    memset(memory_->Translate(stack_address_), 0, stack_size_);
-
-    // Allocate with 64b alignment.
-    context_ = (PPCContext*)calloc(1, sizeof(PPCContext));
-    assert_true((reinterpret_cast<uint64_t>(context_) & 0xF) == 0);
-
-    // Stash pointers to common structures that callbacks may need.
-    context_->reserve_address = memory_->reserve_address();
-    context_->reserve_value = memory_->reserve_value();
-    context_->membase = memory_->membase();
-    context_->runtime = runtime;
-    context_->thread_state = this;
-
-    // Set initial registers.
-    context_->r[1] = stack_address_ + stack_size;
-    context_->r[13] = thread_state_address_;
-
-    // Pad out stack a bit, as some games seem to overwrite the caller by about
-    // 16 to 32b.
-    context_->r[1] -= 64;
-
-    raw_context_ = context_;
-
-    runtime_->debugger()->OnThreadCreated(this);
-  }
-  ~ThreadState() override {
-    runtime_->debugger()->OnThreadDestroyed(this);
-    free(context_);
-  }
-
-  PPCContext* context() const { return context_; }
-
- private:
-  uint64_t stack_address_;
-  size_t stack_size_;
-  uint64_t thread_state_address_;
-
-  // NOTE: must be 64b aligned for SSE ops.
-  PPCContext* context_;
-};
+using xe::cpu::Runtime;
 
 class TestFunction {
  public:
@@ -88,18 +39,16 @@ class TestFunction {
 
 #if XENIA_TEST_X64
     {
-      auto runtime = std::make_unique<Runtime>(memory.get());
-      auto frontend =
-          std::make_unique<xe::cpu::frontend::ppc::PPCFrontend>(runtime.get());
+      auto runtime = std::make_unique<Runtime>(memory.get(), nullptr, 0, 0);
       auto backend =
           std::make_unique<xe::cpu::backend::x64::X64Backend>(runtime.get());
-      runtime->Initialize(std::move(frontend), std::move(backend));
+      runtime->Initialize(std::move(backend));
       runtimes.emplace_back(std::move(runtime));
     }
 #endif  // XENIA_TEST_X64
 
     for (auto& runtime : runtimes) {
-      auto module = std::make_unique<xe::cpu::runtime::TestModule>(
+      auto module = std::make_unique<xe::cpu::TestModule>(
           runtime.get(), "Test",
           [](uint64_t address) { return address == 0x1000; },
           [generator](hir::HIRBuilder& b) {
@@ -120,7 +69,7 @@ class TestFunction {
     for (auto& runtime : runtimes) {
       memory->Zero(0, memory_size);
 
-      xe::cpu::runtime::Function* fn;
+      xe::cpu::Function* fn;
       runtime->ResolveFunction(0x1000, &fn);
 
       uint64_t stack_size = 64 * 1024;

src/xenia/cpu/test/xe-cpu-hir-test.cc

@@ -17,7 +17,7 @@ namespace cpu {
 namespace test {
 
 using xe::cpu::frontend::ppc::PPCContext;
-using xe::cpu::runtime::Runtime;
+using xe::cpu::Runtime;
 
 int main(std::vector<std::wstring>& args) {
   std::vector<std::string> narrow_args;

src/xenia/cpu/test/xe-cpu-sandbox.cc

@@ -11,7 +11,7 @@
 #include "xenia/cpu/backend/x64/x64_backend.h"
 #include "xenia/cpu/frontend/ppc/ppc_context.h"
 #include "xenia/cpu/frontend/ppc/ppc_frontend.h"
-#include "xenia/cpu/runtime/raw_module.h"
+#include "xenia/cpu/raw_module.h"
 #include "poly/main.h"
 #include "poly/poly.h"
 
@@ -22,55 +22,7 @@ namespace cpu {
 namespace sandbox {
 
 using xe::cpu::frontend::ppc::PPCContext;
-using xe::cpu::runtime::Runtime;
-
-class ThreadState : public xe::cpu::runtime::ThreadState {
- public:
-  ThreadState(Runtime* runtime, uint32_t thread_id, uint64_t stack_address,
-              size_t stack_size, uint64_t thread_state_address)
-      : xe::cpu::runtime::ThreadState(runtime, thread_id),
-        stack_address_(stack_address),
-        stack_size_(stack_size),
-        thread_state_address_(thread_state_address) {
-    memset(memory_->Translate(stack_address_), 0, stack_size_);
-
-    // Allocate with 64b alignment.
-    context_ = (PPCContext*)calloc(1, sizeof(PPCContext));
-    assert_true((reinterpret_cast<uint64_t>(context_) & 0xF) == 0);
-
-    // Stash pointers to common structures that callbacks may need.
-    context_->reserve_address = memory_->reserve_address();
-    context_->membase = memory_->membase();
-    context_->runtime = runtime;
-    context_->thread_state = this;
-
-    // Set initial registers.
-    context_->r[1] = stack_address_ + stack_size;
-    context_->r[13] = thread_state_address_;
-
-    // Pad out stack a bit, as some games seem to overwrite the caller by about
-    // 16 to 32b.
-    context_->r[1] -= 64;
-
-    raw_context_ = context_;
-
-    runtime_->debugger()->OnThreadCreated(this);
-  }
-  ~ThreadState() override {
-    runtime_->debugger()->OnThreadDestroyed(this);
-    free(context_);
-  }
-
-  PPCContext* context() const { return context_; }
-
- private:
-  uint64_t stack_address_;
-  size_t stack_size_;
-  uint64_t thread_state_address_;
-
-  // NOTE: must be 64b aligned for SSE ops.
-  PPCContext* context_;
-};
+using xe::cpu::Runtime;
 
 // TODO(benvanik): simple memory? move more into core?
 
@@ -93,7 +45,7 @@ int main(std::vector<std::wstring>& args) {
   //     std::make_unique<xe::cpu::backend::x64::X64Backend>(runtime.get());
   runtime->Initialize(std::move(frontend), std::move(backend));
 
-  auto module = std::make_unique<xe::cpu::runtime::RawModule>(runtime.get());
+  auto module = std::make_unique<xe::cpu::RawModule>(runtime.get());
   module->LoadFile(0x00001000, L"test\\codegen\\instr_add.bin");
   runtime->AddModule(std::move(module));
 
@@ -104,7 +56,7 @@ int main(std::vector<std::wstring>& args) {
     auto thread_state = std::make_unique<ThreadState>(
         runtime.get(), 100, stack_address, stack_size, thread_state_address);
 
-    xe::cpu::runtime::Function* fn;
+    xe::cpu::Function* fn;
     runtime->ResolveFunction(0x1000, &fn);
     auto ctx = thread_state->context();
     ctx->lr = 0xBEBEBEBE;