summaryrefslogtreecommitdiffstats
path: root/src/core/memory.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2019-10-06 19:51:31 +0200
committerLioncash <mathew1800@gmail.com>2019-10-06 19:53:12 +0200
commitf1382cf0e7180cd31505ee89e774cc93bde6211e (patch)
treec732e422a882f0e40e42094533546b32e61d56c2 /src/core/memory.cpp
parenthle/service: Replace global system instance calls with instance-based ones (diff)
downloadyuzu-f1382cf0e7180cd31505ee89e774cc93bde6211e.tar
yuzu-f1382cf0e7180cd31505ee89e774cc93bde6211e.tar.gz
yuzu-f1382cf0e7180cd31505ee89e774cc93bde6211e.tar.bz2
yuzu-f1382cf0e7180cd31505ee89e774cc93bde6211e.tar.lz
yuzu-f1382cf0e7180cd31505ee89e774cc93bde6211e.tar.xz
yuzu-f1382cf0e7180cd31505ee89e774cc93bde6211e.tar.zst
yuzu-f1382cf0e7180cd31505ee89e774cc93bde6211e.zip
Diffstat (limited to '')
-rw-r--r--src/core/memory.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index 9e030789d..fa49f3dd0 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -146,7 +146,7 @@ static u8* GetPointerFromVMA(const Kernel::Process& process, VAddr vaddr) {
* using a VMA from the current process.
*/
static u8* GetPointerFromVMA(VAddr vaddr) {
- return GetPointerFromVMA(*Core::CurrentProcess(), vaddr);
+ return GetPointerFromVMA(*Core::System::GetInstance().CurrentProcess(), vaddr);
}
template <typename T>
@@ -226,7 +226,7 @@ bool IsValidVirtualAddress(const Kernel::Process& process, const VAddr vaddr) {
}
bool IsValidVirtualAddress(const VAddr vaddr) {
- return IsValidVirtualAddress(*Core::CurrentProcess(), vaddr);
+ return IsValidVirtualAddress(*Core::System::GetInstance().CurrentProcess(), vaddr);
}
bool IsKernelVirtualAddress(const VAddr vaddr) {
@@ -387,7 +387,7 @@ void ReadBlock(const Kernel::Process& process, const VAddr src_addr, void* dest_
}
void ReadBlock(const VAddr src_addr, void* dest_buffer, const std::size_t size) {
- ReadBlock(*Core::CurrentProcess(), src_addr, dest_buffer, size);
+ ReadBlock(*Core::System::GetInstance().CurrentProcess(), src_addr, dest_buffer, size);
}
void Write8(const VAddr addr, const u8 data) {
@@ -450,7 +450,7 @@ void WriteBlock(const Kernel::Process& process, const VAddr dest_addr, const voi
}
void WriteBlock(const VAddr dest_addr, const void* src_buffer, const std::size_t size) {
- WriteBlock(*Core::CurrentProcess(), dest_addr, src_buffer, size);
+ WriteBlock(*Core::System::GetInstance().CurrentProcess(), dest_addr, src_buffer, size);
}
void ZeroBlock(const Kernel::Process& process, const VAddr dest_addr, const std::size_t size) {
@@ -539,7 +539,7 @@ void CopyBlock(const Kernel::Process& process, VAddr dest_addr, VAddr src_addr,
}
void CopyBlock(VAddr dest_addr, VAddr src_addr, std::size_t size) {
- CopyBlock(*Core::CurrentProcess(), dest_addr, src_addr, size);
+ CopyBlock(*Core::System::GetInstance().CurrentProcess(), dest_addr, src_addr, size);
}
} // namespace Memory