Merge branch 'memory'

2015-05-19 20:29:00 -07:00
parent 3e9323b657 721974185f
commit 7a82ad839a
51 changed files with 1978 additions and 871 deletions
--- a/src/xenia/cpu/frontend/test/xe-cpu-ppc-test.cc
+++ b/src/xenia/cpu/frontend/test/xe-cpu-ppc-test.cc
@@ -197,9 +197,10 @@ class TestRunner {
    // Simulate a thread.
    uint32_t stack_size = 64 * 1024;
    uint32_t stack_address = START_ADDRESS - stack_size;
-    uint32_t thread_state_address = stack_address - 0x1000;
-    thread_state.reset(new ThreadState(processor.get(), 0x100, stack_address,
-                                       stack_size, thread_state_address));
+    uint32_t pcr_address = stack_address - 0x1000;
+    thread_state.reset(new ThreadState(processor.get(), 0x100,
+                                       ThreadStackType::kUserStack,
+                                       stack_address, stack_size, pcr_address));

    return true;
  }