diff options
Diffstat (limited to 'src/core/arm/arm_interface.h')
| -rw-r--r-- | src/core/arm/arm_interface.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/core/arm/arm_interface.h b/src/core/arm/arm_interface.h index c092db9ff..d0c9f8857 100644 --- a/src/core/arm/arm_interface.h +++ b/src/core/arm/arm_interface.h | |||
| @@ -28,7 +28,6 @@ namespace Core { | |||
| 28 | class System; | 28 | class System; |
| 29 | class CPUInterruptHandler; | 29 | class CPUInterruptHandler; |
| 30 | 30 | ||
| 31 | using CPUInterrupts = std::array<CPUInterruptHandler, Core::Hardware::NUM_CPU_CORES>; | ||
| 32 | using WatchpointArray = std::array<Kernel::DebugWatchpoint, Core::Hardware::NUM_WATCHPOINTS>; | 31 | using WatchpointArray = std::array<Kernel::DebugWatchpoint, Core::Hardware::NUM_WATCHPOINTS>; |
| 33 | 32 | ||
| 34 | /// Generic ARMv8 CPU interface | 33 | /// Generic ARMv8 CPU interface |
| @@ -37,10 +36,8 @@ public: | |||
| 37 | YUZU_NON_COPYABLE(ARM_Interface); | 36 | YUZU_NON_COPYABLE(ARM_Interface); |
| 38 | YUZU_NON_MOVEABLE(ARM_Interface); | 37 | YUZU_NON_MOVEABLE(ARM_Interface); |
| 39 | 38 | ||
| 40 | explicit ARM_Interface(System& system_, CPUInterrupts& interrupt_handlers_, | 39 | explicit ARM_Interface(System& system_, bool uses_wall_clock_) |
| 41 | bool uses_wall_clock_) | 40 | : system{system_}, uses_wall_clock{uses_wall_clock_} {} |
| 42 | : system{system_}, interrupt_handlers{interrupt_handlers_}, uses_wall_clock{ | ||
| 43 | uses_wall_clock_} {} | ||
| 44 | virtual ~ARM_Interface() = default; | 41 | virtual ~ARM_Interface() = default; |
| 45 | 42 | ||
| 46 | struct ThreadContext32 { | 43 | struct ThreadContext32 { |
| @@ -182,6 +179,9 @@ public: | |||
| 182 | /// Signal an interrupt and ask the core to halt as soon as possible. | 179 | /// Signal an interrupt and ask the core to halt as soon as possible. |
| 183 | virtual void SignalInterrupt() = 0; | 180 | virtual void SignalInterrupt() = 0; |
| 184 | 181 | ||
| 182 | /// Clear a previous interrupt. | ||
| 183 | virtual void ClearInterrupt() = 0; | ||
| 184 | |||
| 185 | struct BacktraceEntry { | 185 | struct BacktraceEntry { |
| 186 | std::string module; | 186 | std::string module; |
| 187 | u64 address; | 187 | u64 address; |
| @@ -209,7 +209,6 @@ public: | |||
| 209 | protected: | 209 | protected: |
| 210 | /// System context that this ARM interface is running under. | 210 | /// System context that this ARM interface is running under. |
| 211 | System& system; | 211 | System& system; |
| 212 | CPUInterrupts& interrupt_handlers; | ||
| 213 | const WatchpointArray* watchpoints; | 212 | const WatchpointArray* watchpoints; |
| 214 | bool uses_wall_clock; | 213 | bool uses_wall_clock; |
| 215 | 214 | ||