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

Code cleanup: moving ExportResolver to xe::cpu

Browse Source
This commit is contained in:
Ben Vanik
2015-05-02 02:11:11 -07:00
parent d76998915a
commit 642259e16f
50 changed files with 148 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/xenia/emulator.h
View File

@@ -23,6 +23,7 @@ namespace apu {
class AudioSystem;
} // namespace apu
namespace cpu {
class ExportResolver;
class Processor;
class ThreadState;
} // namespace cpu
@@ -43,8 +44,6 @@ class MainWindow;
namespace xe {
class ExportResolver;
class Emulator {
public:
Emulator(const std::wstring& command_line);
@@ -65,7 +64,9 @@ class Emulator {
}
hid::InputSystem* input_system() const { return input_system_.get(); }
ExportResolver* export_resolver() const { return export_resolver_.get(); }
cpu::ExportResolver* export_resolver() const {
return export_resolver_.get();
}
kernel::fs::FileSystem* file_system() const { return file_system_.get(); }
kernel::XboxkrnlModule* xboxkrnl() const { return xboxkrnl_.get(); }
@@ -95,7 +96,7 @@ class Emulator {
std::unique_ptr<gpu::GraphicsSystem> graphics_system_;
std::unique_ptr<hid::InputSystem> input_system_;
std::unique_ptr<ExportResolver> export_resolver_;
std::unique_ptr<cpu::ExportResolver> export_resolver_;
std::unique_ptr<kernel::fs::FileSystem> file_system_;
std::unique_ptr<kernel::KernelState> kernel_state_;