diff options
| author | 2018-12-18 22:16:53 -0500 | |
|---|---|---|
| committer | 2018-12-18 22:28:55 -0500 | |
| commit | 9b3a38e3d331b2fb647cd7286dad51d7051bdf64 (patch) | |
| tree | b7b3508d540b5d9959a6873dde414fb7be8fc5d8 /src | |
| parent | Merge pull request #1905 from bunnei/ignore-empty-gpu-lists (diff) | |
| download | yuzu-9b3a38e3d331b2fb647cd7286dad51d7051bdf64.tar.gz yuzu-9b3a38e3d331b2fb647cd7286dad51d7051bdf64.tar.xz yuzu-9b3a38e3d331b2fb647cd7286dad51d7051bdf64.zip | |
kernel/process: Make process_id a 64-bit value
In the actual kernel, this is a 64-bit value, so we shouldn't be using a
32-bit type to handle it.
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 { | |||
| 155 | std::atomic<u32> next_object_id{0}; | 155 | std::atomic<u32> next_object_id{0}; |
| 156 | // TODO(Subv): Start the process ids from 10 for now, as lower PIDs are | 156 | // TODO(Subv): Start the process ids from 10 for now, as lower PIDs are |
| 157 | // reserved for low-level services | 157 | // reserved for low-level services |
| 158 | std::atomic<u32> next_process_id{10}; | 158 | std::atomic<u64> next_process_id{10}; |
| 159 | std::atomic<u32> next_thread_id{1}; | 159 | std::atomic<u32> next_thread_id{1}; |
| 160 | 160 | ||
| 161 | // Lists all processes that exist in the current session. | 161 | // Lists all processes that exist in the current session. |
| @@ -246,7 +246,7 @@ u32 KernelCore::CreateNewThreadID() { | |||
| 246 | return impl->next_thread_id++; | 246 | return impl->next_thread_id++; |
| 247 | } | 247 | } |
| 248 | 248 | ||
| 249 | u32 KernelCore::CreateNewProcessID() { | 249 | u64 KernelCore::CreateNewProcessID() { |
| 250 | return impl->next_process_id++; | 250 | return impl->next_process_id++; |
| 251 | } | 251 | } |
| 252 | 252 | ||
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: | |||
| 88 | u32 CreateNewObjectID(); | 88 | u32 CreateNewObjectID(); |
| 89 | 89 | ||
| 90 | /// Creates a new process ID, incrementing the internal process ID counter; | 90 | /// Creates a new process ID, incrementing the internal process ID counter; |
| 91 | u32 CreateNewProcessID(); | 91 | u64 CreateNewProcessID(); |
| 92 | 92 | ||
| 93 | /// Creates a new thread ID, incrementing the internal thread ID counter. | 93 | /// Creates a new thread ID, incrementing the internal thread ID counter. |
| 94 | u32 CreateNewThreadID(); | 94 | 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: | |||
| 162 | } | 162 | } |
| 163 | 163 | ||
| 164 | /// Gets the unique ID that identifies this particular process. | 164 | /// Gets the unique ID that identifies this particular process. |
| 165 | u32 GetProcessID() const { | 165 | u64 GetProcessID() const { |
| 166 | return process_id; | 166 | return process_id; |
| 167 | } | 167 | } |
| 168 | 168 | ||
| @@ -288,10 +288,10 @@ private: | |||
| 288 | ProcessStatus status; | 288 | ProcessStatus status; |
| 289 | 289 | ||
| 290 | /// The ID of this process | 290 | /// The ID of this process |
| 291 | u32 process_id = 0; | 291 | u64 process_id = 0; |
| 292 | 292 | ||
| 293 | /// Title ID corresponding to the process | 293 | /// Title ID corresponding to the process |
| 294 | u64 program_id; | 294 | u64 program_id = 0; |
| 295 | 295 | ||
| 296 | /// Resource limit descriptor for this process | 296 | /// Resource limit descriptor for this process |
| 297 | SharedPtr<ResourceLimit> resource_limit; | 297 | SharedPtr<ResourceLimit> resource_limit; |