From 69f16ba50e3c52a17405670b976ac4ba63f58021 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sun, 6 Oct 2019 13:02:23 -0400
Subject: hle/service: Replace global system instance calls with instance-based
 ones

Migrates the HLE service code off the use of directly accessing the
global system instance where trivially able to do so.

This removes all usages of Core::CurrentProcess from the service code,
only 8 occurrences of this function exist elsewhere. There's still quite
a bit of "System::GetInstance()" being used, however this was able to
replace a few instances.
---
 src/core/core.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/core/core.h')

diff --git a/src/core/core.h b/src/core/core.h
index f49b7fbf9..fecfdb959 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -98,6 +98,8 @@ FileSys::VirtualFile GetGameFileFromPath(const FileSys::VirtualFilesystem& vfs,
 
 class System {
 public:
+    using CurrentBuildProcessID = std::array<u8, 0x20>;
+
     System(const System&) = delete;
     System& operator=(const System&) = delete;
 
@@ -330,9 +332,9 @@ public:
 
     bool GetExitLock() const;
 
-    void SetCurrentProcessBuildID(std::array<u8, 0x20> id);
+    void SetCurrentProcessBuildID(const CurrentBuildProcessID& id);
 
-    const std::array<u8, 0x20>& GetCurrentProcessBuildID() const;
+    const CurrentBuildProcessID& GetCurrentProcessBuildID() const;
 
 private:
     System();
-- 
cgit v1.2.3


From f1382cf0e7180cd31505ee89e774cc93bde6211e Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sun, 6 Oct 2019 13:51:31 -0400
Subject: core: Remove Core::CurrentProcess()

This only encourages the use of the global system instance (which will
be phased out long-term). Instead, we use the direct system function
call directly to remove the appealing but discouraged short-hand.
---
 src/core/core.h | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/core/core.h')

diff --git a/src/core/core.h b/src/core/core.h
index fecfdb959..97944c366 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -359,8 +359,4 @@ private:
     static System s_instance;
 };
 
-inline Kernel::Process* CurrentProcess() {
-    return System::GetInstance().CurrentProcess();
-}
-
 } // namespace Core
-- 
cgit v1.2.3


From 839b38c404224592372647c4adb316bbe6f856e4 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sun, 6 Oct 2019 13:54:24 -0400
Subject: core/core: Remove unused header

This isn't used anywhere in either the cpp or header file.
---
 src/core/core.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/core/core.h')

diff --git a/src/core/core.h b/src/core/core.h
index 97944c366..d13b6aa5e 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -8,7 +8,6 @@
 #include <memory>
 #include <string>
 
-#include <map>
 #include "common/common_types.h"
 #include "core/file_sys/vfs_types.h"
 #include "core/hle/kernel/object.h"
-- 
cgit v1.2.3