Moving cpu/runtime/ to cpu/.

src/xenia/cpu/compiler/compiler.cc

@@ -17,7 +17,7 @@ namespace cpu {
 namespace compiler {
 
 using xe::cpu::hir::HIRBuilder;
-using xe::cpu::runtime::Runtime;
+using xe::cpu::Runtime;
 
 Compiler::Compiler(Runtime* runtime) : runtime_(runtime) {}
 

src/xenia/cpu/compiler/compiler.h

@@ -18,9 +18,7 @@
 
 namespace xe {
 namespace cpu {
-namespace runtime {
 class Runtime;
-}  // namespace runtime
 }  // namespace cpu
 }  // namespace xe
 
@@ -32,10 +30,10 @@ class CompilerPass;
 
 class Compiler {
  public:
-  Compiler(runtime::Runtime* runtime);
+  Compiler(Runtime* runtime);
   ~Compiler();
 
-  runtime::Runtime* runtime() const { return runtime_; }
+  Runtime* runtime() const { return runtime_; }
   poly::Arena* scratch_arena() { return &scratch_arena_; }
 
   void AddPass(std::unique_ptr<CompilerPass> pass);
@@ -45,7 +43,7 @@ class Compiler {
   int Compile(hir::HIRBuilder* builder);
 
  private:
-  runtime::Runtime* runtime_;
+  Runtime* runtime_;
   poly::Arena scratch_arena_;
 
   std::vector<std::unique_ptr<CompilerPass>> passes_;

src/xenia/cpu/compiler/compiler_pass.h

@@ -15,9 +15,7 @@
 
 namespace xe {
 namespace cpu {
-namespace runtime {
 class Runtime;
-}  // namespace runtime
 }  // namespace cpu
 }  // namespace xe
 
@@ -40,7 +38,7 @@ class CompilerPass {
   poly::Arena* scratch_arena() const;
 
  protected:
-  runtime::Runtime* runtime_;
+  Runtime* runtime_;
   Compiler* compiler_;
 };
 

src/xenia/cpu/compiler/passes/constant_propagation_pass.cc

@@ -9,8 +9,8 @@
 
 #include "xenia/cpu/compiler/passes/constant_propagation_pass.h"
 
-#include "xenia/cpu/runtime/function.h"
-#include "xenia/cpu/runtime/runtime.h"
+#include "xenia/cpu/function.h"
+#include "xenia/cpu/runtime.h"
 #include "xenia/profiling.h"
 
 namespace xe {
@@ -96,7 +96,7 @@ int ConstantPropagationPass::Run(HIRBuilder* builder) {
           break;
         case OPCODE_CALL_INDIRECT:
           if (i->src1.value->IsConstant()) {
-            runtime::FunctionInfo* symbol_info;
+            FunctionInfo* symbol_info;
             if (runtime_->LookupFunctionInfo(
                     (uint32_t)i->src1.value->constant.i32, &symbol_info)) {
               break;

src/xenia/cpu/compiler/passes/context_promotion_pass.cc

@@ -12,7 +12,7 @@
 #include <gflags/gflags.h>
 
 #include "xenia/cpu/compiler/compiler.h"
-#include "xenia/cpu/runtime/runtime.h"
+#include "xenia/cpu/runtime.h"
 #include "xenia/profiling.h"
 
 DEFINE_bool(store_all_context_values, false,

src/xenia/cpu/compiler/passes/control_flow_analysis_pass.cc

@@ -11,7 +11,7 @@
 
 #include "xenia/cpu/backend/backend.h"
 #include "xenia/cpu/compiler/compiler.h"
-#include "xenia/cpu/runtime/runtime.h"
+#include "xenia/cpu/runtime.h"
 #include "xenia/profiling.h"
 
 namespace xe {

src/xenia/cpu/compiler/passes/control_flow_simplification_pass.cc

@@ -11,7 +11,7 @@
 
 #include "xenia/cpu/backend/backend.h"
 #include "xenia/cpu/compiler/compiler.h"
-#include "xenia/cpu/runtime/runtime.h"
+#include "xenia/cpu/runtime.h"
 #include "xenia/profiling.h"
 
 namespace xe {

src/xenia/cpu/compiler/passes/data_flow_analysis_pass.cc

@@ -11,7 +11,7 @@
 
 #include "xenia/cpu/backend/backend.h"
 #include "xenia/cpu/compiler/compiler.h"
-#include "xenia/cpu/runtime/runtime.h"
+#include "xenia/cpu/runtime.h"
 #include "xenia/profiling.h"
 
 #if XE_COMPILER_MSVC

src/xenia/cpu/compiler/passes/finalization_pass.cc

@@ -11,7 +11,7 @@
 
 #include "xenia/cpu/backend/backend.h"
 #include "xenia/cpu/compiler/compiler.h"
-#include "xenia/cpu/runtime/runtime.h"
+#include "xenia/cpu/runtime.h"
 #include "xenia/profiling.h"
 
 namespace xe {

src/xenia/cpu/compiler/passes/validation_pass.cc

@@ -11,7 +11,7 @@
 
 #include "xenia/cpu/backend/backend.h"
 #include "xenia/cpu/compiler/compiler.h"
-#include "xenia/cpu/runtime/runtime.h"
+#include "xenia/cpu/runtime.h"
 #include "xenia/profiling.h"
 
 namespace xe {

src/xenia/cpu/compiler/passes/value_reduction_pass.cc

@@ -11,7 +11,7 @@
 
 #include "xenia/cpu/backend/backend.h"
 #include "xenia/cpu/compiler/compiler.h"
-#include "xenia/cpu/runtime/runtime.h"
+#include "xenia/cpu/runtime.h"
 #include "xenia/profiling.h"
 
 #if XE_COMPILER_MSVC