summaryrefslogtreecommitdiffstats
path: root/src/core/hle
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2022-01-18 01:41:06 +0100
committerbunnei <bunneidev@gmail.com>2022-01-21 02:08:00 +0100
commitf6cbb14dce48bc4ae112a7d5ae2bbca476d3457e (patch)
tree8f993e94c63848f4b4f72392a83d119be9fd351d /src/core/hle
parentMerge pull request #7710 from german77/just-shake-it (diff)
downloadyuzu-f6cbb14dce48bc4ae112a7d5ae2bbca476d3457e.tar
yuzu-f6cbb14dce48bc4ae112a7d5ae2bbca476d3457e.tar.gz
yuzu-f6cbb14dce48bc4ae112a7d5ae2bbca476d3457e.tar.bz2
yuzu-f6cbb14dce48bc4ae112a7d5ae2bbca476d3457e.tar.lz
yuzu-f6cbb14dce48bc4ae112a7d5ae2bbca476d3457e.tar.xz
yuzu-f6cbb14dce48bc4ae112a7d5ae2bbca476d3457e.tar.zst
yuzu-f6cbb14dce48bc4ae112a7d5ae2bbca476d3457e.zip
Diffstat (limited to 'src/core/hle')
-rw-r--r--src/core/hle/kernel/k_thread.cpp2
-rw-r--r--src/core/hle/kernel/k_thread.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/kernel/k_thread.cpp b/src/core/hle/kernel/k_thread.cpp
index 7a5e6fc08..5eb64a381 100644
--- a/src/core/hle/kernel/k_thread.cpp
+++ b/src/core/hle/kernel/k_thread.cpp
@@ -140,7 +140,7 @@ ResultCode KThread::Initialize(KThreadFunction func, uintptr_t arg, VAddr user_s
UNREACHABLE_MSG("KThread::Initialize: Unknown ThreadType {}", static_cast<u32>(type));
break;
}
- thread_type_for_debugging = type;
+ thread_type = type;
// Set the ideal core ID and affinity mask.
virtual_ideal_core_id = virt_core;
diff --git a/src/core/hle/kernel/k_thread.h b/src/core/hle/kernel/k_thread.h
index cc427f6cf..86d4b7c55 100644
--- a/src/core/hle/kernel/k_thread.h
+++ b/src/core/hle/kernel/k_thread.h
@@ -553,8 +553,8 @@ public:
return wait_reason_for_debugging;
}
- [[nodiscard]] ThreadType GetThreadTypeForDebugging() const {
- return thread_type_for_debugging;
+ [[nodiscard]] ThreadType GetThreadType() const {
+ return thread_type;
}
void SetWaitObjectsForDebugging(const std::span<KSynchronizationObject*>& objects) {
@@ -753,12 +753,12 @@ private:
// For emulation
std::shared_ptr<Common::Fiber> host_context{};
bool is_single_core{};
+ ThreadType thread_type{};
// For debugging
std::vector<KSynchronizationObject*> wait_objects_for_debugging;
VAddr mutex_wait_address_for_debugging{};
ThreadWaitReasonForDebugging wait_reason_for_debugging{};
- ThreadType thread_type_for_debugging{};
public:
using ConditionVariableThreadTreeType = ConditionVariableThreadTree;