diff options
author | Zach Hilman <DarkLordZach@users.noreply.github.com> | 2019-07-04 21:32:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-04 21:32:32 +0200 |
commit | 54a02d14fd38282e446a56892a1c45f558ee0e42 (patch) | |
tree | 79a86a51973712ee8307071a6c5dc471289746eb /src/core/hle/kernel/process.h | |
parent | Merge pull request #2670 from DarkLordZach/fix-merge-discrep-1 (diff) | |
parent | kernel/process: Default initialize all member variables (diff) | |
download | yuzu-54a02d14fd38282e446a56892a1c45f558ee0e42.tar yuzu-54a02d14fd38282e446a56892a1c45f558ee0e42.tar.gz yuzu-54a02d14fd38282e446a56892a1c45f558ee0e42.tar.bz2 yuzu-54a02d14fd38282e446a56892a1c45f558ee0e42.tar.lz yuzu-54a02d14fd38282e446a56892a1c45f558ee0e42.tar.xz yuzu-54a02d14fd38282e446a56892a1c45f558ee0e42.tar.zst yuzu-54a02d14fd38282e446a56892a1c45f558ee0e42.zip |
Diffstat (limited to 'src/core/hle/kernel/process.h')
-rw-r--r-- | src/core/hle/kernel/process.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/hle/kernel/process.h b/src/core/hle/kernel/process.h index 248fd3840..83ea02bee 100644 --- a/src/core/hle/kernel/process.h +++ b/src/core/hle/kernel/process.h @@ -5,7 +5,6 @@ #pragma once #include <array> -#include <bitset> #include <cstddef> #include <list> #include <string> @@ -32,6 +31,7 @@ namespace Kernel { class KernelCore; class ResourceLimit; class Thread; +class TLSPage; struct CodeSet; @@ -260,10 +260,10 @@ public: // Thread-local storage management // Marks the next available region as used and returns the address of the slot. - VAddr MarkNextAvailableTLSSlotAsUsed(Thread& thread); + [[nodiscard]] VAddr CreateTLSRegion(); // Frees a used TLS slot identified by the given address - void FreeTLSSlot(VAddr tls_address); + void FreeTLSRegion(VAddr tls_address); private: explicit Process(Core::System& system); @@ -290,7 +290,7 @@ private: u64 code_memory_size = 0; /// Current status of the process - ProcessStatus status; + ProcessStatus status{}; /// The ID of this process u64 process_id = 0; @@ -310,7 +310,7 @@ private: /// holds the TLS for a specific thread. This vector contains which parts are in use for each /// page as a bitmask. /// This vector will grow as more pages are allocated for new threads. - std::vector<std::bitset<8>> tls_slots; + std::vector<TLSPage> tls_pages; /// Contains the parsed process capability descriptors. ProcessCapabilities capabilities; @@ -339,7 +339,7 @@ private: Mutex mutex; /// Random values for svcGetInfo RandomEntropy - std::array<u64, RANDOM_ENTROPY_SIZE> random_entropy; + std::array<u64, RANDOM_ENTROPY_SIZE> random_entropy{}; /// List of threads that are running with this process as their owner. std::list<const Thread*> thread_list; |