Reconcile debugger and save state stuff into a single implementation.
Fixes #497 and fixes #496. Still rough edges, but at least less duplication.
This commit is contained in:
@@ -14,7 +14,6 @@
|
||||
#include <string>
|
||||
|
||||
#include "xenia/base/exception_handler.h"
|
||||
#include "xenia/debug/debugger.h"
|
||||
#include "xenia/kernel/kernel_state.h"
|
||||
#include "xenia/memory.h"
|
||||
#include "xenia/vfs/virtual_file_system.h"
|
||||
@@ -63,9 +62,6 @@ class Emulator {
|
||||
// system.
|
||||
Memory* memory() const { return memory_.get(); }
|
||||
|
||||
// Active debugger, which may or may not be attached.
|
||||
debug::Debugger* debugger() const { return debugger_.get(); }
|
||||
|
||||
// Virtualized processor that can execute PPC code.
|
||||
cpu::Processor* processor() const { return processor_.get(); }
|
||||
|
||||
@@ -146,8 +142,6 @@ class Emulator {
|
||||
|
||||
std::unique_ptr<Memory> memory_;
|
||||
|
||||
std::unique_ptr<debug::Debugger> debugger_;
|
||||
|
||||
std::unique_ptr<cpu::Processor> processor_;
|
||||
std::unique_ptr<apu::AudioSystem> audio_system_;
|
||||
std::unique_ptr<gpu::GraphicsSystem> graphics_system_;
|
||||
|
||||
Reference in New Issue
Block a user