summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/process.cpp
diff options
context:
space:
mode:
authorGravatar Lioncash2018-09-21 01:26:29 -0400
committerGravatar Lioncash2018-09-21 03:50:12 -0400
commitacfc801d14b1883f54b8fe66ac428982f9898258 (patch)
treeefb94a0647b8756638fc4d95d18ad9782578ce4c /src/core/hle/kernel/process.cpp
parentAdded support for uncompressed NSOs (#1374) (diff)
downloadyuzu-acfc801d14b1883f54b8fe66ac428982f9898258.tar.gz
yuzu-acfc801d14b1883f54b8fe66ac428982f9898258.tar.xz
yuzu-acfc801d14b1883f54b8fe66ac428982f9898258.zip
thread/process: Move TLS slot marking/freeing to the process class
Allows making several members of the process class private, it also avoids going through Core::CurrentProcess() just to retrieve the owning process.
Diffstat (limited to 'src/core/hle/kernel/process.cpp')
-rw-r--r--src/core/hle/kernel/process.cpp58
1 files changed, 58 insertions, 0 deletions
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp
index 914bbe0a1..0c8ea94fc 100644
--- a/src/core/hle/kernel/process.cpp
+++ b/src/core/hle/kernel/process.cpp
@@ -128,6 +128,64 @@ void Process::Run(VAddr entry_point, s32 main_thread_priority, u32 stack_size) {
128 Kernel::SetupMainThread(kernel, entry_point, main_thread_priority, *this); 128 Kernel::SetupMainThread(kernel, entry_point, main_thread_priority, *this);
129} 129}
130 130
131/**
132 * Finds a free location for the TLS section of a thread.
133 * @param tls_slots The TLS page array of the thread's owner process.
134 * Returns a tuple of (page, slot, alloc_needed) where:
135 * page: The index of the first allocated TLS page that has free slots.
136 * slot: The index of the first free slot in the indicated page.
137 * alloc_needed: Whether there's a need to allocate a new TLS page (All pages are full).
138 */
139static std::tuple<std::size_t, std::size_t, bool> FindFreeThreadLocalSlot(
140 const std::vector<std::bitset<8>>& tls_slots) {
141 // Iterate over all the allocated pages, and try to find one where not all slots are used.
142 for (std::size_t page = 0; page < tls_slots.size(); ++page) {
143 const auto& page_tls_slots = tls_slots[page];
144 if (!page_tls_slots.all()) {
145 // We found a page with at least one free slot, find which slot it is
146 for (std::size_t slot = 0; slot < page_tls_slots.size(); ++slot) {
147 if (!page_tls_slots.test(slot)) {
148 return std::make_tuple(page, slot, false);
149 }
150 }
151 }
152 }
153
154 return std::make_tuple(0, 0, true);
155}
156
157VAddr Process::MarkNextAvailableTLSSlotAsUsed(Thread& thread) {
158 auto [available_page, available_slot, needs_allocation] = FindFreeThreadLocalSlot(tls_slots);
159
160 if (needs_allocation) {
161 tls_slots.emplace_back(0); // The page is completely available at the start
162 available_page = tls_slots.size() - 1;
163 available_slot = 0; // Use the first slot in the new page
164
165 // Allocate some memory from the end of the linear heap for this region.
166 auto& tls_memory = thread.GetTLSMemory();
167 tls_memory->insert(tls_memory->end(), Memory::PAGE_SIZE, 0);
168
169 vm_manager.RefreshMemoryBlockMappings(tls_memory.get());
170
171 vm_manager.MapMemoryBlock(Memory::TLS_AREA_VADDR + available_page * Memory::PAGE_SIZE,
172 tls_memory, 0, Memory::PAGE_SIZE, MemoryState::ThreadLocal);
173 }
174
175 tls_slots[available_page].set(available_slot);
176
177 return Memory::TLS_AREA_VADDR + available_page * Memory::PAGE_SIZE +
178 available_slot * Memory::TLS_ENTRY_SIZE;
179}
180
181void Process::FreeTLSSlot(VAddr tls_address) {
182 const VAddr tls_base = tls_address - Memory::TLS_AREA_VADDR;
183 const VAddr tls_page = tls_base / Memory::PAGE_SIZE;
184 const VAddr tls_slot = (tls_base % Memory::PAGE_SIZE) / Memory::TLS_ENTRY_SIZE;
185
186 tls_slots[tls_page].reset(tls_slot);
187}
188
131void Process::LoadModule(SharedPtr<CodeSet> module_, VAddr base_addr) { 189void Process::LoadModule(SharedPtr<CodeSet> module_, VAddr base_addr) {
132 const auto MapSegment = [&](CodeSet::Segment& segment, VMAPermission permissions, 190 const auto MapSegment = [&](CodeSet::Segment& segment, VMAPermission permissions,
133 MemoryState memory_state) { 191 MemoryState memory_state) {