diff options
| -rw-r--r-- | src/core/hle/kernel/k_thread.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/k_thread.h | 6 | ||||
| -rw-r--r-- | src/yuzu/debugger/wait_tree.cpp | 4 |
3 files changed, 6 insertions, 6 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 | |||
| 140 | UNREACHABLE_MSG("KThread::Initialize: Unknown ThreadType {}", static_cast<u32>(type)); | 140 | UNREACHABLE_MSG("KThread::Initialize: Unknown ThreadType {}", static_cast<u32>(type)); |
| 141 | break; | 141 | break; |
| 142 | } | 142 | } |
| 143 | thread_type_for_debugging = type; | 143 | thread_type = type; |
| 144 | 144 | ||
| 145 | // Set the ideal core ID and affinity mask. | 145 | // Set the ideal core ID and affinity mask. |
| 146 | virtual_ideal_core_id = virt_core; | 146 | 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: | |||
| 553 | return wait_reason_for_debugging; | 553 | return wait_reason_for_debugging; |
| 554 | } | 554 | } |
| 555 | 555 | ||
| 556 | [[nodiscard]] ThreadType GetThreadTypeForDebugging() const { | 556 | [[nodiscard]] ThreadType GetThreadType() const { |
| 557 | return thread_type_for_debugging; | 557 | return thread_type; |
| 558 | } | 558 | } |
| 559 | 559 | ||
| 560 | void SetWaitObjectsForDebugging(const std::span<KSynchronizationObject*>& objects) { | 560 | void SetWaitObjectsForDebugging(const std::span<KSynchronizationObject*>& objects) { |
| @@ -753,12 +753,12 @@ private: | |||
| 753 | // For emulation | 753 | // For emulation |
| 754 | std::shared_ptr<Common::Fiber> host_context{}; | 754 | std::shared_ptr<Common::Fiber> host_context{}; |
| 755 | bool is_single_core{}; | 755 | bool is_single_core{}; |
| 756 | ThreadType thread_type{}; | ||
| 756 | 757 | ||
| 757 | // For debugging | 758 | // For debugging |
| 758 | std::vector<KSynchronizationObject*> wait_objects_for_debugging; | 759 | std::vector<KSynchronizationObject*> wait_objects_for_debugging; |
| 759 | VAddr mutex_wait_address_for_debugging{}; | 760 | VAddr mutex_wait_address_for_debugging{}; |
| 760 | ThreadWaitReasonForDebugging wait_reason_for_debugging{}; | 761 | ThreadWaitReasonForDebugging wait_reason_for_debugging{}; |
| 761 | ThreadType thread_type_for_debugging{}; | ||
| 762 | 762 | ||
| 763 | public: | 763 | public: |
| 764 | using ConditionVariableThreadTreeType = ConditionVariableThreadTree; | 764 | using ConditionVariableThreadTreeType = ConditionVariableThreadTree; |
diff --git a/src/yuzu/debugger/wait_tree.cpp b/src/yuzu/debugger/wait_tree.cpp index 1f41c46c4..2d1a2d9cb 100644 --- a/src/yuzu/debugger/wait_tree.cpp +++ b/src/yuzu/debugger/wait_tree.cpp | |||
| @@ -95,7 +95,7 @@ std::vector<std::unique_ptr<WaitTreeThread>> WaitTreeItem::MakeThreadItemList( | |||
| 95 | std::size_t row = 0; | 95 | std::size_t row = 0; |
| 96 | auto add_threads = [&](const std::vector<Kernel::KThread*>& threads) { | 96 | auto add_threads = [&](const std::vector<Kernel::KThread*>& threads) { |
| 97 | for (std::size_t i = 0; i < threads.size(); ++i) { | 97 | for (std::size_t i = 0; i < threads.size(); ++i) { |
| 98 | if (threads[i]->GetThreadTypeForDebugging() == Kernel::ThreadType::User) { | 98 | if (threads[i]->GetThreadType() == Kernel::ThreadType::User) { |
| 99 | item_list.push_back(std::make_unique<WaitTreeThread>(*threads[i], system)); | 99 | item_list.push_back(std::make_unique<WaitTreeThread>(*threads[i], system)); |
| 100 | item_list.back()->row = row; | 100 | item_list.back()->row = row; |
| 101 | } | 101 | } |
| @@ -153,7 +153,7 @@ QString WaitTreeCallstack::GetText() const { | |||
| 153 | std::vector<std::unique_ptr<WaitTreeItem>> WaitTreeCallstack::GetChildren() const { | 153 | std::vector<std::unique_ptr<WaitTreeItem>> WaitTreeCallstack::GetChildren() const { |
| 154 | std::vector<std::unique_ptr<WaitTreeItem>> list; | 154 | std::vector<std::unique_ptr<WaitTreeItem>> list; |
| 155 | 155 | ||
| 156 | if (thread.GetThreadTypeForDebugging() != Kernel::ThreadType::User) { | 156 | if (thread.GetThreadType() != Kernel::ThreadType::User) { |
| 157 | return list; | 157 | return list; |
| 158 | } | 158 | } |
| 159 | 159 | ||