summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2018-08-02 18:01:22 +0200
committerLioncash <mathew1800@gmail.com>2018-08-02 18:01:25 +0200
commit6058c84b79327960052036fbecd490f20f2d5c51 (patch)
tree660a47053151d8a5c1df3061b81e8137888beeae
parentkernel/thread: Make GetFreeThreadLocalSlot() reference parameter a const reference (diff)
downloadyuzu-6058c84b79327960052036fbecd490f20f2d5c51.tar
yuzu-6058c84b79327960052036fbecd490f20f2d5c51.tar.gz
yuzu-6058c84b79327960052036fbecd490f20f2d5c51.tar.bz2
yuzu-6058c84b79327960052036fbecd490f20f2d5c51.tar.lz
yuzu-6058c84b79327960052036fbecd490f20f2d5c51.tar.xz
yuzu-6058c84b79327960052036fbecd490f20f2d5c51.tar.zst
yuzu-6058c84b79327960052036fbecd490f20f2d5c51.zip
-rw-r--r--src/core/hle/kernel/thread.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index 02bdca802..8af84d8cc 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -252,14 +252,14 @@ void Thread::ResumeFromWait() {
* slot: The index of the first free slot in the indicated page.
* alloc_needed: Whether there's a need to allocate a new TLS page (All pages are full).
*/
-static std::tuple<u32, u32, bool> GetFreeThreadLocalSlot(
+static std::tuple<std::size_t, std::size_t, bool> GetFreeThreadLocalSlot(
const std::vector<std::bitset<8>>& tls_slots) {
// Iterate over all the allocated pages, and try to find one where not all slots are used.
- for (unsigned page = 0; page < tls_slots.size(); ++page) {
+ for (std::size_t page = 0; page < tls_slots.size(); ++page) {
const auto& page_tls_slots = tls_slots[page];
if (!page_tls_slots.all()) {
// We found a page with at least one free slot, find which slot it is
- for (unsigned slot = 0; slot < page_tls_slots.size(); ++slot) {
+ for (std::size_t slot = 0; slot < page_tls_slots.size(); ++slot) {
if (!page_tls_slots.test(slot)) {
return std::make_tuple(page, slot, false);
}
@@ -334,11 +334,8 @@ ResultVal<SharedPtr<Thread>> Thread::Create(std::string name, VAddr entry_point,
// Find the next available TLS index, and mark it as used
auto& tls_slots = owner_process->tls_slots;
- bool needs_allocation = true;
- u32 available_page; // Which allocated page has free space
- u32 available_slot; // Which slot within the page is free
- std::tie(available_page, available_slot, needs_allocation) = GetFreeThreadLocalSlot(tls_slots);
+ auto [available_page, available_slot, needs_allocation] = GetFreeThreadLocalSlot(tls_slots);
if (needs_allocation) {
// There are no already-allocated pages with free slots, lets allocate a new one.
@@ -360,7 +357,7 @@ ResultVal<SharedPtr<Thread>> Thread::Create(std::string name, VAddr entry_point,
owner_process->linear_heap_used += Memory::PAGE_SIZE;
tls_slots.emplace_back(0); // The page is completely available at the start
- available_page = static_cast<u32>(tls_slots.size() - 1);
+ available_page = tls_slots.size() - 1;
available_slot = 0; // Use the first slot in the new page
auto& vm_manager = owner_process->vm_manager;