summaryrefslogtreecommitdiffstats
path: root/src/core/arm
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2020-08-26 03:19:01 +0200
committerReinUsesLisp <reinuseslisp@airmail.cc>2020-08-26 04:43:26 +0200
commit56ac22f7371fdf45016972ce9f487cb3f02551ae (patch)
treeb57a1bf7a8f3b2cd84671670dbf313708127fbcb /src/core/arm
parentcpu_interrupt_handler: Make is_interrupted an atomic (diff)
downloadyuzu-56ac22f7371fdf45016972ce9f487cb3f02551ae.tar
yuzu-56ac22f7371fdf45016972ce9f487cb3f02551ae.tar.gz
yuzu-56ac22f7371fdf45016972ce9f487cb3f02551ae.tar.bz2
yuzu-56ac22f7371fdf45016972ce9f487cb3f02551ae.tar.lz
yuzu-56ac22f7371fdf45016972ce9f487cb3f02551ae.tar.xz
yuzu-56ac22f7371fdf45016972ce9f487cb3f02551ae.tar.zst
yuzu-56ac22f7371fdf45016972ce9f487cb3f02551ae.zip
Diffstat (limited to 'src/core/arm')
-rw-r--r--src/core/arm/cpu_interrupt_handler.cpp6
-rw-r--r--src/core/arm/cpu_interrupt_handler.h2
2 files changed, 3 insertions, 5 deletions
diff --git a/src/core/arm/cpu_interrupt_handler.cpp b/src/core/arm/cpu_interrupt_handler.cpp
index 4c717ebe9..9c8898700 100644
--- a/src/core/arm/cpu_interrupt_handler.cpp
+++ b/src/core/arm/cpu_interrupt_handler.cpp
@@ -7,9 +7,7 @@
namespace Core {
-CPUInterruptHandler::CPUInterruptHandler() {
- interrupt_event = std::make_unique<Common::Event>();
-}
+CPUInterruptHandler::CPUInterruptHandler() : interrupt_event{std::make_unique<Common::Event>()} {}
CPUInterruptHandler::~CPUInterruptHandler() = default;
@@ -17,7 +15,7 @@ void CPUInterruptHandler::SetInterrupt(bool is_interrupted_) {
if (is_interrupted_) {
interrupt_event->Set();
}
- this->is_interrupted = is_interrupted_;
+ is_interrupted = is_interrupted_;
}
void CPUInterruptHandler::AwaitInterrupt() {
diff --git a/src/core/arm/cpu_interrupt_handler.h b/src/core/arm/cpu_interrupt_handler.h
index 61c22fef9..71e582f79 100644
--- a/src/core/arm/cpu_interrupt_handler.h
+++ b/src/core/arm/cpu_interrupt_handler.h
@@ -33,8 +33,8 @@ public:
void AwaitInterrupt();
private:
- std::atomic_bool is_interrupted{false};
std::unique_ptr<Common::Event> interrupt_event;
+ std::atomic_bool is_interrupted{false};
};
} // namespace Core