diff options
author | Lioncash <mathew1800@gmail.com> | 2018-12-19 04:16:53 +0100 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2018-12-19 04:28:55 +0100 |
commit | 9b3a38e3d331b2fb647cd7286dad51d7051bdf64 (patch) | |
tree | b7b3508d540b5d9959a6873dde414fb7be8fc5d8 /src | |
parent | Merge pull request #1905 from bunnei/ignore-empty-gpu-lists (diff) | |
download | yuzu-9b3a38e3d331b2fb647cd7286dad51d7051bdf64.tar yuzu-9b3a38e3d331b2fb647cd7286dad51d7051bdf64.tar.gz yuzu-9b3a38e3d331b2fb647cd7286dad51d7051bdf64.tar.bz2 yuzu-9b3a38e3d331b2fb647cd7286dad51d7051bdf64.tar.lz yuzu-9b3a38e3d331b2fb647cd7286dad51d7051bdf64.tar.xz yuzu-9b3a38e3d331b2fb647cd7286dad51d7051bdf64.tar.zst yuzu-9b3a38e3d331b2fb647cd7286dad51d7051bdf64.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/core/hle/kernel/kernel.cpp | 4 | ||||
-rw-r--r-- | src/core/hle/kernel/kernel.h | 2 | ||||
-rw-r--r-- | src/core/hle/kernel/process.h | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index e441c5bc6..a221734c1 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -155,7 +155,7 @@ struct KernelCore::Impl { std::atomic<u32> next_object_id{0}; // TODO(Subv): Start the process ids from 10 for now, as lower PIDs are // reserved for low-level services - std::atomic<u32> next_process_id{10}; + std::atomic<u64> next_process_id{10}; std::atomic<u32> next_thread_id{1}; // Lists all processes that exist in the current session. @@ -246,7 +246,7 @@ u32 KernelCore::CreateNewThreadID() { return impl->next_thread_id++; } -u32 KernelCore::CreateNewProcessID() { +u64 KernelCore::CreateNewProcessID() { return impl->next_process_id++; } diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index ea00c89f5..4f0f2331c 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h @@ -88,7 +88,7 @@ private: u32 CreateNewObjectID(); /// Creates a new process ID, incrementing the internal process ID counter; - u32 CreateNewProcessID(); + u64 CreateNewProcessID(); /// Creates a new thread ID, incrementing the internal thread ID counter. u32 CreateNewThreadID(); diff --git a/src/core/hle/kernel/process.h b/src/core/hle/kernel/process.h index 459eedfa6..725bfa01a 100644 --- a/src/core/hle/kernel/process.h +++ b/src/core/hle/kernel/process.h @@ -162,7 +162,7 @@ public: } /// Gets the unique ID that identifies this particular process. - u32 GetProcessID() const { + u64 GetProcessID() const { return process_id; } @@ -288,10 +288,10 @@ private: ProcessStatus status; /// The ID of this process - u32 process_id = 0; + u64 process_id = 0; /// Title ID corresponding to the process - u64 program_id; + u64 program_id = 0; /// Resource limit descriptor for this process SharedPtr<ResourceLimit> resource_limit; |