summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar ReinUsesLisp2020-08-26 01:19:01 +0000
committerGravatar ReinUsesLisp2020-08-26 02:43:26 +0000
commit56ac22f7371fdf45016972ce9f487cb3f02551ae (patch)
treeb57a1bf7a8f3b2cd84671670dbf313708127fbcb /src
parentcpu_interrupt_handler: Make is_interrupted an atomic (diff)
downloadyuzu-56ac22f7371fdf45016972ce9f487cb3f02551ae.tar.gz
yuzu-56ac22f7371fdf45016972ce9f487cb3f02551ae.tar.xz
yuzu-56ac22f7371fdf45016972ce9f487cb3f02551ae.zip
cpu_interrupt_handler: Misc style changes
Diffstat (limited to '')
-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 @@
7 7
8namespace Core { 8namespace Core {
9 9
10CPUInterruptHandler::CPUInterruptHandler() { 10CPUInterruptHandler::CPUInterruptHandler() : interrupt_event{std::make_unique<Common::Event>()} {}
11 interrupt_event = std::make_unique<Common::Event>();
12}
13 11
14CPUInterruptHandler::~CPUInterruptHandler() = default; 12CPUInterruptHandler::~CPUInterruptHandler() = default;
15 13
@@ -17,7 +15,7 @@ void CPUInterruptHandler::SetInterrupt(bool is_interrupted_) {
17 if (is_interrupted_) { 15 if (is_interrupted_) {
18 interrupt_event->Set(); 16 interrupt_event->Set();
19 } 17 }
20 this->is_interrupted = is_interrupted_; 18 is_interrupted = is_interrupted_;
21} 19}
22 20
23void CPUInterruptHandler::AwaitInterrupt() { 21void 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:
33 void AwaitInterrupt(); 33 void AwaitInterrupt();
34 34
35private: 35private:
36 std::atomic_bool is_interrupted{false};
37 std::unique_ptr<Common::Event> interrupt_event; 36 std::unique_ptr<Common::Event> interrupt_event;
37 std::atomic_bool is_interrupted{false};
38}; 38};
39 39
40} // namespace Core 40} // namespace Core