summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel
diff options
context:
space:
mode:
authorSubv <subv2112@gmail.com>2015-05-11 16:15:10 +0200
committerSubv <subv2112@gmail.com>2015-05-11 16:15:10 +0200
commit41f74a16fd55934f747f6f7e1f7a6d4d6a3d4e57 (patch)
treeb9500ee328f5b918edca38251878c4f346a30807 /src/core/hle/kernel
parentMerge pull request #740 from yuriks/gsp-shmem (diff)
downloadyuzu-41f74a16fd55934f747f6f7e1f7a6d4d6a3d4e57.tar
yuzu-41f74a16fd55934f747f6f7e1f7a6d4d6a3d4e57.tar.gz
yuzu-41f74a16fd55934f747f6f7e1f7a6d4d6a3d4e57.tar.bz2
yuzu-41f74a16fd55934f747f6f7e1f7a6d4d6a3d4e57.tar.lz
yuzu-41f74a16fd55934f747f6f7e1f7a6d4d6a3d4e57.tar.xz
yuzu-41f74a16fd55934f747f6f7e1f7a6d4d6a3d4e57.tar.zst
yuzu-41f74a16fd55934f747f6f7e1f7a6d4d6a3d4e57.zip
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r--src/core/hle/kernel/kernel.cpp4
-rw-r--r--src/core/hle/kernel/process.cpp2
-rw-r--r--src/core/hle/kernel/process.h11
-rw-r--r--src/core/hle/kernel/thread.cpp2
-rw-r--r--src/core/hle/kernel/thread.h2
5 files changed, 19 insertions, 2 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index a3715e555..87a0dbe37 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -115,8 +115,7 @@ SharedPtr<Object> HandleTable::GetGeneric(Handle handle) const {
if (handle == CurrentThread) {
return GetCurrentThread();
} else if (handle == CurrentProcess) {
- LOG_ERROR(Kernel, "Current process (%08X) pseudo-handle not supported", CurrentProcess);
- return nullptr;
+ return g_current_process;
}
if (!IsValid(handle)) {
@@ -138,6 +137,7 @@ void Init() {
Kernel::ThreadingInit();
Kernel::TimersInit();
+ Process::next_process_id = 0;
Object::next_object_id = 0;
}
diff --git a/src/core/hle/kernel/process.cpp b/src/core/hle/kernel/process.cpp
index 26a9c2360..4c940bcba 100644
--- a/src/core/hle/kernel/process.cpp
+++ b/src/core/hle/kernel/process.cpp
@@ -12,6 +12,8 @@
namespace Kernel {
+u32 Process::next_process_id;
+
SharedPtr<Process> Process::Create(std::string name, u64 program_id) {
SharedPtr<Process> process(new Process);
diff --git a/src/core/hle/kernel/process.h b/src/core/hle/kernel/process.h
index 88ed9a5a5..11c2ad12d 100644
--- a/src/core/hle/kernel/process.h
+++ b/src/core/hle/kernel/process.h
@@ -55,6 +55,14 @@ public:
static const HandleType HANDLE_TYPE = HandleType::Process;
HandleType GetHandleType() const override { return HANDLE_TYPE; }
+ static u32 next_process_id;
+
+ /*
+ * Gets the process' id
+ * @returns The process' id
+ */
+ u32 GetProcessId() const { return process_id; }
+
/// Name of the process
std::string name;
/// Title ID corresponding to the process
@@ -69,6 +77,9 @@ public:
boost::container::static_vector<AddressMapping, 8> address_mappings;
ProcessFlags flags;
+ /// The id of this process
+ u32 process_id = next_process_id++;
+
/**
* Parses a list of kernel capability descriptors (as found in the ExHeader) and applies them
* to this process.
diff --git a/src/core/hle/kernel/thread.cpp b/src/core/hle/kernel/thread.cpp
index 5de8f9a73..56ded72cd 100644
--- a/src/core/hle/kernel/thread.cpp
+++ b/src/core/hle/kernel/thread.cpp
@@ -17,6 +17,7 @@
#include "core/core_timing.h"
#include "core/hle/hle.h"
#include "core/hle/kernel/kernel.h"
+#include "core/hle/kernel/process.h"
#include "core/hle/kernel/thread.h"
#include "core/hle/kernel/mutex.h"
#include "core/hle/result.h"
@@ -402,6 +403,7 @@ ResultVal<SharedPtr<Thread>> Thread::Create(std::string name, VAddr entry_point,
thread->wait_address = 0;
thread->name = std::move(name);
thread->callback_handle = wakeup_callback_handle_table.Create(thread).MoveFrom();
+ thread->owner_process = g_current_process;
VAddr tls_address = Memory::TLS_AREA_VADDR + (thread->thread_id - 1) * 0x200;
diff --git a/src/core/hle/kernel/thread.h b/src/core/hle/kernel/thread.h
index 6891c8c2f..c5f4043ca 100644
--- a/src/core/hle/kernel/thread.h
+++ b/src/core/hle/kernel/thread.h
@@ -45,6 +45,7 @@ enum ThreadStatus {
namespace Kernel {
class Mutex;
+class Process;
class Thread final : public WaitObject {
public:
@@ -161,6 +162,7 @@ public:
/// Mutexes currently held by this thread, which will be released when it exits.
boost::container::flat_set<SharedPtr<Mutex>> held_mutexes;
+ SharedPtr<Process> owner_process; ///< Process that owns this thread
std::vector<SharedPtr<WaitObject>> wait_objects; ///< Objects that the thread is waiting on
VAddr wait_address; ///< If waiting on an AddressArbiter, this is the arbitration address
bool wait_all; ///< True if the thread is waiting on all objects before resuming