fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ben Vanik
2014-09-09 20:25:38 -07:00
parent 437ec45d66
commit a337ce33ed
63 changed files with 471 additions and 453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/xenia/cpu/processor.cc
View File

@@ -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();

5
src/xenia/cpu/processor.h
View File

@@ -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_; }