summaryrefslogtreecommitdiff
path: root/src/core/memory.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/memory.cpp')
-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 af9660b55..4397fcfb1 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -247,11 +247,11 @@ struct Memory::Impl {
247 } 247 }
248 248
249 void ReadBlock(const VAddr src_addr, void* dest_buffer, const std::size_t size) { 249 void ReadBlock(const VAddr src_addr, void* dest_buffer, const std::size_t size) {
250 ReadBlockImpl<false>(*system.CurrentProcess(), src_addr, dest_buffer, size); 250 ReadBlockImpl<false>(*system.ApplicationProcess(), src_addr, dest_buffer, size);
251 } 251 }
252 252
253 void ReadBlockUnsafe(const VAddr src_addr, void* dest_buffer, const std::size_t size) { 253 void ReadBlockUnsafe(const VAddr src_addr, void* dest_buffer, const std::size_t size) {
254 ReadBlockImpl<true>(*system.CurrentProcess(), src_addr, dest_buffer, size); 254 ReadBlockImpl<true>(*system.ApplicationProcess(), src_addr, dest_buffer, size);
255 } 255 }
256 256
257 template <bool UNSAFE> 257 template <bool UNSAFE>
@@ -279,11 +279,11 @@ struct Memory::Impl {
279 } 279 }
280 280
281 void WriteBlock(const VAddr dest_addr, const void* src_buffer, const std::size_t size) { 281 void WriteBlock(const VAddr dest_addr, const void* src_buffer, const std::size_t size) {
282 WriteBlockImpl<false>(*system.CurrentProcess(), dest_addr, src_buffer, size); 282 WriteBlockImpl<false>(*system.ApplicationProcess(), dest_addr, src_buffer, size);
283 } 283 }
284 284
285 void WriteBlockUnsafe(const VAddr dest_addr, const void* src_buffer, const std::size_t size) { 285 void WriteBlockUnsafe(const VAddr dest_addr, const void* src_buffer, const std::size_t size) {
286 WriteBlockImpl<true>(*system.CurrentProcess(), dest_addr, src_buffer, size); 286 WriteBlockImpl<true>(*system.ApplicationProcess(), dest_addr, src_buffer, size);
287 } 287 }
288 288
289 void ZeroBlock(const Kernel::KProcess& process, const VAddr dest_addr, const std::size_t size) { 289 void ZeroBlock(const Kernel::KProcess& process, const VAddr dest_addr, const std::size_t size) {
@@ -711,7 +711,7 @@ void Memory::UnmapRegion(Common::PageTable& page_table, VAddr base, u64 size) {
711} 711}
712 712
713bool Memory::IsValidVirtualAddress(const VAddr vaddr) const { 713bool Memory::IsValidVirtualAddress(const VAddr vaddr) const {
714 const Kernel::KProcess& process = *system.CurrentProcess(); 714 const Kernel::KProcess& process = *system.ApplicationProcess();
715 const auto& page_table = process.PageTable().PageTableImpl(); 715 const auto& page_table = process.PageTable().PageTableImpl();
716 const size_t page = vaddr >> YUZU_PAGEBITS; 716 const size_t page = vaddr >> YUZU_PAGEBITS;
717 if (page >= page_table.pointers.size()) { 717 if (page >= page_table.pointers.size()) {