summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReinUsesLisp <reinuseslisp@airmail.cc>2020-08-26 03:16:40 +0200
committerReinUsesLisp <reinuseslisp@airmail.cc>2020-08-26 04:43:15 +0200
commitea7bda25ba99262267acaa179762c83e3e96a232 (patch)
treecb369d87aba010d75056786120b3ced3b9a8350a
parentMerge pull request #4572 from lioncash/xbyak (diff)
downloadyuzu-ea7bda25ba99262267acaa179762c83e3e96a232.tar
yuzu-ea7bda25ba99262267acaa179762c83e3e96a232.tar.gz
yuzu-ea7bda25ba99262267acaa179762c83e3e96a232.tar.bz2
yuzu-ea7bda25ba99262267acaa179762c83e3e96a232.tar.lz
yuzu-ea7bda25ba99262267acaa179762c83e3e96a232.tar.xz
yuzu-ea7bda25ba99262267acaa179762c83e3e96a232.tar.zst
yuzu-ea7bda25ba99262267acaa179762c83e3e96a232.zip
-rw-r--r--src/core/arm/cpu_interrupt_handler.cpp2
-rw-r--r--src/core/arm/cpu_interrupt_handler.h3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/core/arm/cpu_interrupt_handler.cpp b/src/core/arm/cpu_interrupt_handler.cpp
index df0350881..4c717ebe9 100644
--- a/src/core/arm/cpu_interrupt_handler.cpp
+++ b/src/core/arm/cpu_interrupt_handler.cpp
@@ -7,7 +7,7 @@
namespace Core {
-CPUInterruptHandler::CPUInterruptHandler() : is_interrupted{} {
+CPUInterruptHandler::CPUInterruptHandler() {
interrupt_event = std::make_unique<Common::Event>();
}
diff --git a/src/core/arm/cpu_interrupt_handler.h b/src/core/arm/cpu_interrupt_handler.h
index 3d062d326..61c22fef9 100644
--- a/src/core/arm/cpu_interrupt_handler.h
+++ b/src/core/arm/cpu_interrupt_handler.h
@@ -4,6 +4,7 @@
#pragma once
+#include <atomic>
#include <memory>
namespace Common {
@@ -32,7 +33,7 @@ public:
void AwaitInterrupt();
private:
- bool is_interrupted{};
+ std::atomic_bool is_interrupted{false};
std::unique_ptr<Common::Event> interrupt_event;
};