From 9b3a38e3d331b2fb647cd7286dad51d7051bdf64 Mon Sep 17 00:00:00 2001
From: Lioncash
Date: Tue, 18 Dec 2018 22:16:53 -0500
Subject: 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.
---
 src/core/hle/kernel/kernel.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/core/hle/kernel/kernel.cpp')

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++;
 }
 
-- 
cgit v1.2.3


From 8435451093b193c1a1556a9edadc5663d3372b02 Mon Sep 17 00:00:00 2001
From: Lioncash
Date: Tue, 18 Dec 2018 22:37:01 -0500
Subject: kernel/thread: Make thread_id a 64-bit value

The kernel uses a 64-bit value for the thread ID, so we shouldn't be
using a 32-bit value.
---
 src/core/hle/kernel/kernel.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/core/hle/kernel/kernel.cpp')

diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index a221734c1..2be39fb52 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -156,7 +156,7 @@ struct KernelCore::Impl {
     // TODO(Subv): Start the process ids from 10 for now, as lower PIDs are
     // reserved for low-level services
     std::atomic<u64> next_process_id{10};
-    std::atomic<u32> next_thread_id{1};
+    std::atomic<u64> next_thread_id{1};
 
     // Lists all processes that exist in the current session.
     std::vector<SharedPtr<Process>> process_list;
@@ -242,7 +242,7 @@ u32 KernelCore::CreateNewObjectID() {
     return impl->next_object_id++;
 }
 
-u32 KernelCore::CreateNewThreadID() {
+u64 KernelCore::CreateNewThreadID() {
     return impl->next_thread_id++;
 }
 
-- 
cgit v1.2.3


From 62d437705367421a1b919922f1ecf3c4a43d75c5 Mon Sep 17 00:00:00 2001
From: Lioncash
Date: Tue, 18 Dec 2018 22:53:58 -0500
Subject: kernel/kernel: Use correct initial PID for userland Process instances

Starts the process ID counter off at 81, which is what the kernel itself
checks against internally when creating processes. It's actually
supposed to panic if the PID is less than 81 for a userland process.
---
 src/core/hle/kernel/kernel.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/core/hle/kernel/kernel.cpp')

diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index 2be39fb52..1c2290651 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -112,7 +112,7 @@ struct KernelCore::Impl {
 
     void Shutdown() {
         next_object_id = 0;
-        next_process_id = 10;
+        next_process_id = Process::ProcessIDMin;
         next_thread_id = 1;
 
         process_list.clear();
@@ -153,9 +153,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<u64> next_process_id{10};
+    std::atomic<u64> next_process_id{Process::ProcessIDMin};
     std::atomic<u64> next_thread_id{1};
 
     // Lists all processes that exist in the current session.
-- 
cgit v1.2.3