diff options
-rw-r--r-- | src/core/core_cpu.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/kernel/address_arbiter.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/kernel/address_arbiter.h | 2 | ||||
-rw-r--r-- | src/core/hle/kernel/client_port.cpp | 1 | ||||
-rw-r--r-- | src/core/hle/kernel/client_port.h | 2 | ||||
-rw-r--r-- | src/core/hle/kernel/handle_table.h | 2 | ||||
-rw-r--r-- | src/core/hle/kernel/kernel.cpp | 1 | ||||
-rw-r--r-- | src/core/hle/kernel/kernel.h | 1 | ||||
-rw-r--r-- | src/core/hle/kernel/mutex.cpp | 1 | ||||
-rw-r--r-- | src/core/hle/kernel/resource_limit.h | 2 | ||||
-rw-r--r-- | src/core/hle/kernel/scheduler.cpp | 1 | ||||
-rw-r--r-- | src/core/hle/kernel/scheduler.h | 5 | ||||
-rw-r--r-- | src/core/hle/kernel/session.h | 2 | ||||
-rw-r--r-- | src/core/hle/kernel/shared_memory.h | 1 | ||||
-rw-r--r-- | src/core/hle/kernel/transfer_memory.h | 1 | ||||
-rw-r--r-- | src/core/hle/kernel/wait_object.h | 3 | ||||
-rw-r--r-- | src/core/hle/kernel/writable_event.h | 2 |
17 files changed, 19 insertions, 12 deletions
diff --git a/src/core/core_cpu.cpp b/src/core/core_cpu.cpp index cf3fe0b0b..630cd4feb 100644 --- a/src/core/core_cpu.cpp +++ b/src/core/core_cpu.cpp @@ -96,6 +96,8 @@ void Cpu::RunLoop(bool tight_loop) { } else { arm_interface->Step(); } + // We are stopping a run, exclusive state must be cleared + arm_interface->ClearExclusiveState(); } core_timing.Advance(); diff --git a/src/core/hle/kernel/address_arbiter.cpp b/src/core/hle/kernel/address_arbiter.cpp index 98d07fa5b..8422d05e0 100644 --- a/src/core/hle/kernel/address_arbiter.cpp +++ b/src/core/hle/kernel/address_arbiter.cpp @@ -11,8 +11,6 @@ #include "core/core_cpu.h" #include "core/hle/kernel/address_arbiter.h" #include "core/hle/kernel/errors.h" -#include "core/hle/kernel/object.h" -#include "core/hle/kernel/process.h" #include "core/hle/kernel/scheduler.h" #include "core/hle/kernel/thread.h" #include "core/hle/result.h" diff --git a/src/core/hle/kernel/address_arbiter.h b/src/core/hle/kernel/address_arbiter.h index 608918de5..1e1f00e60 100644 --- a/src/core/hle/kernel/address_arbiter.h +++ b/src/core/hle/kernel/address_arbiter.h @@ -4,10 +4,10 @@ #pragma once +#include <memory> #include <vector> #include "common/common_types.h" -#include "core/hle/kernel/object.h" union ResultCode; diff --git a/src/core/hle/kernel/client_port.cpp b/src/core/hle/kernel/client_port.cpp index 00bb939a0..5498fd313 100644 --- a/src/core/hle/kernel/client_port.cpp +++ b/src/core/hle/kernel/client_port.cpp @@ -8,7 +8,6 @@ #include "core/hle/kernel/hle_ipc.h" #include "core/hle/kernel/object.h" #include "core/hle/kernel/server_port.h" -#include "core/hle/kernel/server_session.h" #include "core/hle/kernel/session.h" namespace Kernel { diff --git a/src/core/hle/kernel/client_port.h b/src/core/hle/kernel/client_port.h index 715edd18c..9762bbf0d 100644 --- a/src/core/hle/kernel/client_port.h +++ b/src/core/hle/kernel/client_port.h @@ -4,7 +4,9 @@ #pragma once +#include <memory> #include <string> + #include "common/common_types.h" #include "core/hle/kernel/object.h" #include "core/hle/result.h" diff --git a/src/core/hle/kernel/handle_table.h b/src/core/hle/kernel/handle_table.h index 9fcb4cc15..8029660ed 100644 --- a/src/core/hle/kernel/handle_table.h +++ b/src/core/hle/kernel/handle_table.h @@ -6,6 +6,8 @@ #include <array> #include <cstddef> +#include <memory> + #include "common/common_types.h" #include "core/hle/kernel/object.h" #include "core/hle/result.h" diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 1c90546a4..0b149067a 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -13,7 +13,6 @@ #include "core/core.h" #include "core/core_timing.h" #include "core/core_timing_util.h" -#include "core/hle/kernel/address_arbiter.h" #include "core/hle/kernel/client_port.h" #include "core/hle/kernel/errors.h" #include "core/hle/kernel/handle_table.h" diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index babb531c6..3bf0068ed 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h @@ -4,6 +4,7 @@ #pragma once +#include <memory> #include <string> #include <unordered_map> #include <vector> diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp index 061e9bcb0..eff4e45b0 100644 --- a/src/core/hle/kernel/mutex.cpp +++ b/src/core/hle/kernel/mutex.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include <memory> #include <utility> #include <vector> diff --git a/src/core/hle/kernel/resource_limit.h b/src/core/hle/kernel/resource_limit.h index b5534620d..53b89e621 100644 --- a/src/core/hle/kernel/resource_limit.h +++ b/src/core/hle/kernel/resource_limit.h @@ -5,6 +5,8 @@ #pragma once #include <array> +#include <memory> + #include "common/common_types.h" #include "core/hle/kernel/object.h" diff --git a/src/core/hle/kernel/scheduler.cpp b/src/core/hle/kernel/scheduler.cpp index 3f5192087..d36fcd7d9 100644 --- a/src/core/hle/kernel/scheduler.cpp +++ b/src/core/hle/kernel/scheduler.cpp @@ -458,7 +458,6 @@ void Scheduler::SwitchContext() { cpu_core.LoadContext(new_thread->GetContext()); cpu_core.SetTlsAddress(new_thread->GetTLSAddress()); cpu_core.SetTPIDR_EL0(new_thread->GetTPIDR_EL0()); - cpu_core.ClearExclusiveState(); } else { current_thread = nullptr; // Note: We do not reset the current process and current page table when idling because diff --git a/src/core/hle/kernel/scheduler.h b/src/core/hle/kernel/scheduler.h index 3c5c21346..14b77960a 100644 --- a/src/core/hle/kernel/scheduler.h +++ b/src/core/hle/kernel/scheduler.h @@ -4,11 +4,12 @@ #pragma once -#include <mutex> +#include <atomic> +#include <memory> #include <vector> + #include "common/common_types.h" #include "common/multi_level_queue.h" -#include "core/hle/kernel/object.h" #include "core/hle/kernel/thread.h" namespace Core { diff --git a/src/core/hle/kernel/session.h b/src/core/hle/kernel/session.h index 5a9d4e9ad..15a5ac15f 100644 --- a/src/core/hle/kernel/session.h +++ b/src/core/hle/kernel/session.h @@ -6,9 +6,9 @@ #include <memory> #include <string> +#include <utility> #include "core/hle/kernel/wait_object.h" -#include "core/hle/result.h" namespace Kernel { diff --git a/src/core/hle/kernel/shared_memory.h b/src/core/hle/kernel/shared_memory.h index 18400a5ad..014951d82 100644 --- a/src/core/hle/kernel/shared_memory.h +++ b/src/core/hle/kernel/shared_memory.h @@ -6,7 +6,6 @@ #include <memory> #include <string> -#include <vector> #include "common/common_types.h" #include "core/hle/kernel/object.h" diff --git a/src/core/hle/kernel/transfer_memory.h b/src/core/hle/kernel/transfer_memory.h index 556e6c62b..0a6e15d18 100644 --- a/src/core/hle/kernel/transfer_memory.h +++ b/src/core/hle/kernel/transfer_memory.h @@ -5,7 +5,6 @@ #pragma once #include <memory> -#include <vector> #include "core/hle/kernel/object.h" #include "core/hle/kernel/physical_memory.h" diff --git a/src/core/hle/kernel/wait_object.h b/src/core/hle/kernel/wait_object.h index f9d596db9..9a17958a4 100644 --- a/src/core/hle/kernel/wait_object.h +++ b/src/core/hle/kernel/wait_object.h @@ -4,8 +4,9 @@ #pragma once +#include <memory> #include <vector> -#include <boost/smart_ptr/intrusive_ptr.hpp> + #include "core/hle/kernel/object.h" namespace Kernel { diff --git a/src/core/hle/kernel/writable_event.h b/src/core/hle/kernel/writable_event.h index afe97f3a9..6189cf65c 100644 --- a/src/core/hle/kernel/writable_event.h +++ b/src/core/hle/kernel/writable_event.h @@ -4,6 +4,8 @@ #pragma once +#include <memory> + #include "core/hle/kernel/object.h" namespace Kernel { |