mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-09-09 16:29:08 +01:00
Memory: Make PhysicalToVirtualAddress return a boost::optional
And fix a few places in the code to take advantage of that.
This commit is contained in:
parent
72b69cea4b
commit
326e7c7020
4 changed files with 18 additions and 14 deletions
|
@ -149,7 +149,7 @@ ResultCode SharedMemory::Map(Process* target_process, VAddr address, MemoryPermi
|
||||||
|
|
||||||
if (base_address == 0 && target_address == 0) {
|
if (base_address == 0 && target_address == 0) {
|
||||||
// Calculate the address at which to map the memory block.
|
// Calculate the address at which to map the memory block.
|
||||||
target_address = Memory::PhysicalToVirtualAddress(linear_heap_phys_address);
|
target_address = Memory::PhysicalToVirtualAddress(linear_heap_phys_address).value();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Map the memory block into the target process
|
// Map the memory block into the target process
|
||||||
|
|
|
@ -82,7 +82,7 @@ void GetSharedFont(Service::Interface* self) {
|
||||||
// The shared font has to be relocated to the new address before being passed to the
|
// The shared font has to be relocated to the new address before being passed to the
|
||||||
// application.
|
// application.
|
||||||
VAddr target_address =
|
VAddr target_address =
|
||||||
Memory::PhysicalToVirtualAddress(shared_font_mem->linear_heap_phys_address);
|
Memory::PhysicalToVirtualAddress(shared_font_mem->linear_heap_phys_address).value();
|
||||||
if (!shared_font_relocated) {
|
if (!shared_font_relocated) {
|
||||||
BCFNT::RelocateSharedFont(shared_font_mem, target_address);
|
BCFNT::RelocateSharedFont(shared_font_mem, target_address);
|
||||||
shared_font_relocated = true;
|
shared_font_relocated = true;
|
||||||
|
|
|
@ -268,7 +268,8 @@ bool IsValidVirtualAddress(const VAddr vaddr) {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool IsValidPhysicalAddress(const PAddr paddr) {
|
bool IsValidPhysicalAddress(const PAddr paddr) {
|
||||||
return IsValidVirtualAddress(PhysicalToVirtualAddress(paddr));
|
boost::optional<VAddr> vaddr = PhysicalToVirtualAddress(paddr);
|
||||||
|
return vaddr && IsValidVirtualAddress(*vaddr);
|
||||||
}
|
}
|
||||||
|
|
||||||
u8* GetPointer(const VAddr vaddr) {
|
u8* GetPointer(const VAddr vaddr) {
|
||||||
|
@ -301,7 +302,8 @@ std::string ReadCString(VAddr vaddr, std::size_t max_length) {
|
||||||
|
|
||||||
u8* GetPhysicalPointer(PAddr address) {
|
u8* GetPhysicalPointer(PAddr address) {
|
||||||
// TODO(Subv): This call should not go through the application's memory mapping.
|
// TODO(Subv): This call should not go through the application's memory mapping.
|
||||||
return GetPointer(PhysicalToVirtualAddress(address));
|
boost::optional<VAddr> vaddr = PhysicalToVirtualAddress(address);
|
||||||
|
return vaddr ? GetPointer(*vaddr) : nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
void RasterizerMarkRegionCached(PAddr start, u32 size, int count_delta) {
|
void RasterizerMarkRegionCached(PAddr start, u32 size, int count_delta) {
|
||||||
|
@ -312,8 +314,12 @@ void RasterizerMarkRegionCached(PAddr start, u32 size, int count_delta) {
|
||||||
u32 num_pages = ((start + size - 1) >> PAGE_BITS) - (start >> PAGE_BITS) + 1;
|
u32 num_pages = ((start + size - 1) >> PAGE_BITS) - (start >> PAGE_BITS) + 1;
|
||||||
PAddr paddr = start;
|
PAddr paddr = start;
|
||||||
|
|
||||||
for (unsigned i = 0; i < num_pages; ++i) {
|
for (unsigned i = 0; i < num_pages; ++i, paddr += PAGE_SIZE) {
|
||||||
VAddr vaddr = PhysicalToVirtualAddress(paddr);
|
boost::optional<VAddr> maybe_vaddr = PhysicalToVirtualAddress(paddr);
|
||||||
|
if (!maybe_vaddr)
|
||||||
|
continue;
|
||||||
|
VAddr vaddr = *maybe_vaddr;
|
||||||
|
|
||||||
u8& res_count = current_page_table->cached_res_count[vaddr >> PAGE_BITS];
|
u8& res_count = current_page_table->cached_res_count[vaddr >> PAGE_BITS];
|
||||||
ASSERT_MSG(count_delta <= UINT8_MAX - res_count,
|
ASSERT_MSG(count_delta <= UINT8_MAX - res_count,
|
||||||
"Rasterizer resource cache counter overflow!");
|
"Rasterizer resource cache counter overflow!");
|
||||||
|
@ -353,7 +359,6 @@ void RasterizerMarkRegionCached(PAddr start, u32 size, int count_delta) {
|
||||||
UNREACHABLE();
|
UNREACHABLE();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
paddr += PAGE_SIZE;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -687,7 +692,7 @@ PAddr VirtualToPhysicalAddress(const VAddr addr) {
|
||||||
return addr | 0x80000000;
|
return addr | 0x80000000;
|
||||||
}
|
}
|
||||||
|
|
||||||
VAddr PhysicalToVirtualAddress(const PAddr addr) {
|
boost::optional<VAddr> PhysicalToVirtualAddress(const PAddr addr) {
|
||||||
if (addr == 0) {
|
if (addr == 0) {
|
||||||
return 0;
|
return 0;
|
||||||
} else if (addr >= VRAM_PADDR && addr < VRAM_PADDR_END) {
|
} else if (addr >= VRAM_PADDR && addr < VRAM_PADDR_END) {
|
||||||
|
@ -702,9 +707,7 @@ VAddr PhysicalToVirtualAddress(const PAddr addr) {
|
||||||
return addr - N3DS_EXTRA_RAM_PADDR + N3DS_EXTRA_RAM_VADDR;
|
return addr - N3DS_EXTRA_RAM_PADDR + N3DS_EXTRA_RAM_VADDR;
|
||||||
}
|
}
|
||||||
|
|
||||||
LOG_ERROR(HW_Memory, "Unknown physical address @ 0x%08X", addr);
|
return boost::none;
|
||||||
// To help with debugging, set bit on address so that it's obviously invalid.
|
|
||||||
return addr | 0x80000000;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <boost/optional.hpp>
|
||||||
#include "common/common_types.h"
|
#include "common/common_types.h"
|
||||||
|
|
||||||
namespace Memory {
|
namespace Memory {
|
||||||
|
@ -154,9 +155,9 @@ std::string ReadCString(VAddr virtual_address, std::size_t max_length);
|
||||||
PAddr VirtualToPhysicalAddress(VAddr addr);
|
PAddr VirtualToPhysicalAddress(VAddr addr);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Undoes a mapping performed by VirtualToPhysicalAddress().
|
* Undoes a mapping performed by VirtualToPhysicalAddress().
|
||||||
*/
|
*/
|
||||||
VAddr PhysicalToVirtualAddress(PAddr addr);
|
boost::optional<VAddr> PhysicalToVirtualAddress(PAddr addr);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets a pointer to the memory region beginning at the specified physical address.
|
* Gets a pointer to the memory region beginning at the specified physical address.
|
||||||
|
|
Loading…
Reference in a new issue