diff options
Diffstat (limited to 'src/core/memory.cpp')
| -rw-r--r-- | src/core/memory.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/memory.cpp b/src/core/memory.cpp index 6430daad4..014298ed6 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp | |||
| @@ -119,7 +119,7 @@ void RemoveDebugHook(PageTable& page_table, VAddr base, u64 size, MemoryHookPoin | |||
| 119 | static u8* GetPointerFromVMA(const Kernel::Process& process, VAddr vaddr) { | 119 | static u8* GetPointerFromVMA(const Kernel::Process& process, VAddr vaddr) { |
| 120 | u8* direct_pointer = nullptr; | 120 | u8* direct_pointer = nullptr; |
| 121 | 121 | ||
| 122 | auto& vm_manager = process.vm_manager; | 122 | auto& vm_manager = process.VMManager(); |
| 123 | 123 | ||
| 124 | auto it = vm_manager.FindVMA(vaddr); | 124 | auto it = vm_manager.FindVMA(vaddr); |
| 125 | ASSERT(it != vm_manager.vma_map.end()); | 125 | ASSERT(it != vm_manager.vma_map.end()); |
| @@ -214,7 +214,7 @@ void Write(const VAddr vaddr, const T data) { | |||
| 214 | } | 214 | } |
| 215 | 215 | ||
| 216 | bool IsValidVirtualAddress(const Kernel::Process& process, const VAddr vaddr) { | 216 | bool IsValidVirtualAddress(const Kernel::Process& process, const VAddr vaddr) { |
| 217 | auto& page_table = process.vm_manager.page_table; | 217 | const auto& page_table = process.VMManager().page_table; |
| 218 | 218 | ||
| 219 | const u8* page_pointer = page_table.pointers[vaddr >> PAGE_BITS]; | 219 | const u8* page_pointer = page_table.pointers[vaddr >> PAGE_BITS]; |
| 220 | if (page_pointer) | 220 | if (page_pointer) |
| @@ -363,7 +363,7 @@ void RasterizerFlushVirtualRegion(VAddr start, u64 size, FlushMode mode) { | |||
| 363 | } | 363 | } |
| 364 | }; | 364 | }; |
| 365 | 365 | ||
| 366 | const auto& vm_manager = Core::CurrentProcess()->vm_manager; | 366 | const auto& vm_manager = Core::CurrentProcess()->VMManager(); |
| 367 | 367 | ||
| 368 | CheckRegion(vm_manager.GetCodeRegionBaseAddress(), vm_manager.GetCodeRegionEndAddress()); | 368 | CheckRegion(vm_manager.GetCodeRegionBaseAddress(), vm_manager.GetCodeRegionEndAddress()); |
| 369 | CheckRegion(vm_manager.GetHeapRegionBaseAddress(), vm_manager.GetHeapRegionEndAddress()); | 369 | CheckRegion(vm_manager.GetHeapRegionBaseAddress(), vm_manager.GetHeapRegionEndAddress()); |
| @@ -387,7 +387,7 @@ u64 Read64(const VAddr addr) { | |||
| 387 | 387 | ||
| 388 | void ReadBlock(const Kernel::Process& process, const VAddr src_addr, void* dest_buffer, | 388 | void ReadBlock(const Kernel::Process& process, const VAddr src_addr, void* dest_buffer, |
| 389 | const std::size_t size) { | 389 | const std::size_t size) { |
| 390 | auto& page_table = process.vm_manager.page_table; | 390 | const auto& page_table = process.VMManager().page_table; |
| 391 | 391 | ||
| 392 | std::size_t remaining_size = size; | 392 | std::size_t remaining_size = size; |
| 393 | std::size_t page_index = src_addr >> PAGE_BITS; | 393 | std::size_t page_index = src_addr >> PAGE_BITS; |
| @@ -452,7 +452,7 @@ void Write64(const VAddr addr, const u64 data) { | |||
| 452 | 452 | ||
| 453 | void WriteBlock(const Kernel::Process& process, const VAddr dest_addr, const void* src_buffer, | 453 | void WriteBlock(const Kernel::Process& process, const VAddr dest_addr, const void* src_buffer, |
| 454 | const std::size_t size) { | 454 | const std::size_t size) { |
| 455 | auto& page_table = process.vm_manager.page_table; | 455 | const auto& page_table = process.VMManager().page_table; |
| 456 | std::size_t remaining_size = size; | 456 | std::size_t remaining_size = size; |
| 457 | std::size_t page_index = dest_addr >> PAGE_BITS; | 457 | std::size_t page_index = dest_addr >> PAGE_BITS; |
| 458 | std::size_t page_offset = dest_addr & PAGE_MASK; | 458 | std::size_t page_offset = dest_addr & PAGE_MASK; |
| @@ -498,7 +498,7 @@ void WriteBlock(const VAddr dest_addr, const void* src_buffer, const std::size_t | |||
| 498 | } | 498 | } |
| 499 | 499 | ||
| 500 | void ZeroBlock(const Kernel::Process& process, const VAddr dest_addr, const std::size_t size) { | 500 | void ZeroBlock(const Kernel::Process& process, const VAddr dest_addr, const std::size_t size) { |
| 501 | auto& page_table = process.vm_manager.page_table; | 501 | const auto& page_table = process.VMManager().page_table; |
| 502 | std::size_t remaining_size = size; | 502 | std::size_t remaining_size = size; |
| 503 | std::size_t page_index = dest_addr >> PAGE_BITS; | 503 | std::size_t page_index = dest_addr >> PAGE_BITS; |
| 504 | std::size_t page_offset = dest_addr & PAGE_MASK; | 504 | std::size_t page_offset = dest_addr & PAGE_MASK; |
| @@ -540,7 +540,7 @@ void ZeroBlock(const Kernel::Process& process, const VAddr dest_addr, const std: | |||
| 540 | 540 | ||
| 541 | void CopyBlock(const Kernel::Process& process, VAddr dest_addr, VAddr src_addr, | 541 | void CopyBlock(const Kernel::Process& process, VAddr dest_addr, VAddr src_addr, |
| 542 | const std::size_t size) { | 542 | const std::size_t size) { |
| 543 | auto& page_table = process.vm_manager.page_table; | 543 | const auto& page_table = process.VMManager().page_table; |
| 544 | std::size_t remaining_size = size; | 544 | std::size_t remaining_size = size; |
| 545 | std::size_t page_index = src_addr >> PAGE_BITS; | 545 | std::size_t page_index = src_addr >> PAGE_BITS; |
| 546 | std::size_t page_offset = src_addr & PAGE_MASK; | 546 | std::size_t page_offset = src_addr & PAGE_MASK; |