Merge pull request #2799 from yuriks/virtual-cached-range-flush
Add address conversion functions returning optional, Add function to flush virtual region from rasterizer cache
This commit is contained in:
commit
045d0b5bbd
@ -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
|
||||||
|
@ -85,7 +85,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;
|
||||||
|
@ -475,12 +475,11 @@ static void ExecuteCommand(const Command& command, u32 thread_id) {
|
|||||||
|
|
||||||
// TODO: Consider attempting rasterizer-accelerated surface blit if that usage is ever
|
// TODO: Consider attempting rasterizer-accelerated surface blit if that usage is ever
|
||||||
// possible/likely
|
// possible/likely
|
||||||
Memory::RasterizerFlushRegion(
|
Memory::RasterizerFlushVirtualRegion(command.dma_request.source_address,
|
||||||
Memory::VirtualToPhysicalAddress(command.dma_request.source_address),
|
command.dma_request.size, Memory::FlushMode::Flush);
|
||||||
command.dma_request.size);
|
Memory::RasterizerFlushVirtualRegion(command.dma_request.dest_address,
|
||||||
Memory::RasterizerFlushAndInvalidateRegion(
|
command.dma_request.size,
|
||||||
Memory::VirtualToPhysicalAddress(command.dma_request.dest_address),
|
Memory::FlushMode::FlushAndInvalidate);
|
||||||
command.dma_request.size);
|
|
||||||
|
|
||||||
// TODO(Subv): These memory accesses should not go through the application's memory mapping.
|
// TODO(Subv): These memory accesses should not go through the application's memory mapping.
|
||||||
// They should go through the GSP module's memory mapping.
|
// They should go through the GSP module's memory mapping.
|
||||||
|
@ -587,8 +587,8 @@ static void StartConversion(Interface* self) {
|
|||||||
// dst_image_size would seem to be perfect for this, but it doesn't include the gap :(
|
// dst_image_size would seem to be perfect for this, but it doesn't include the gap :(
|
||||||
u32 total_output_size =
|
u32 total_output_size =
|
||||||
conversion.input_lines * (conversion.dst.transfer_unit + conversion.dst.gap);
|
conversion.input_lines * (conversion.dst.transfer_unit + conversion.dst.gap);
|
||||||
Memory::RasterizerFlushAndInvalidateRegion(
|
Memory::RasterizerFlushVirtualRegion(conversion.dst.address, total_output_size,
|
||||||
Memory::VirtualToPhysicalAddress(conversion.dst.address), total_output_size);
|
Memory::FlushMode::FlushAndInvalidate);
|
||||||
|
|
||||||
HW::Y2R::PerformConversion(conversion);
|
HW::Y2R::PerformConversion(conversion);
|
||||||
|
|
||||||
|
@ -83,19 +83,13 @@ static void MapPages(u32 base, u32 size, u8* memory, PageType type) {
|
|||||||
LOG_DEBUG(HW_Memory, "Mapping %p onto %08X-%08X", memory, base * PAGE_SIZE,
|
LOG_DEBUG(HW_Memory, "Mapping %p onto %08X-%08X", memory, base * PAGE_SIZE,
|
||||||
(base + size) * PAGE_SIZE);
|
(base + size) * PAGE_SIZE);
|
||||||
|
|
||||||
u32 end = base + size;
|
RasterizerFlushVirtualRegion(base << PAGE_BITS, size * PAGE_SIZE,
|
||||||
|
FlushMode::FlushAndInvalidate);
|
||||||
|
|
||||||
|
u32 end = base + size;
|
||||||
while (base != end) {
|
while (base != end) {
|
||||||
ASSERT_MSG(base < PAGE_TABLE_NUM_ENTRIES, "out of range mapping at %08X", base);
|
ASSERT_MSG(base < PAGE_TABLE_NUM_ENTRIES, "out of range mapping at %08X", base);
|
||||||
|
|
||||||
// Since pages are unmapped on shutdown after video core is shutdown, the renderer may be
|
|
||||||
// null here
|
|
||||||
if (current_page_table->attributes[base] == PageType::RasterizerCachedMemory ||
|
|
||||||
current_page_table->attributes[base] == PageType::RasterizerCachedSpecial) {
|
|
||||||
RasterizerFlushAndInvalidateRegion(VirtualToPhysicalAddress(base << PAGE_BITS),
|
|
||||||
PAGE_SIZE);
|
|
||||||
}
|
|
||||||
|
|
||||||
current_page_table->attributes[base] = type;
|
current_page_table->attributes[base] = type;
|
||||||
current_page_table->pointers[base] = memory;
|
current_page_table->pointers[base] = memory;
|
||||||
current_page_table->cached_res_count[base] = 0;
|
current_page_table->cached_res_count[base] = 0;
|
||||||
@ -196,7 +190,7 @@ T Read(const VAddr vaddr) {
|
|||||||
ASSERT_MSG(false, "Mapped memory page without a pointer @ %08X", vaddr);
|
ASSERT_MSG(false, "Mapped memory page without a pointer @ %08X", vaddr);
|
||||||
break;
|
break;
|
||||||
case PageType::RasterizerCachedMemory: {
|
case PageType::RasterizerCachedMemory: {
|
||||||
RasterizerFlushRegion(VirtualToPhysicalAddress(vaddr), sizeof(T));
|
RasterizerFlushVirtualRegion(vaddr, sizeof(T), FlushMode::Flush);
|
||||||
|
|
||||||
T value;
|
T value;
|
||||||
std::memcpy(&value, GetPointerFromVMA(vaddr), sizeof(T));
|
std::memcpy(&value, GetPointerFromVMA(vaddr), sizeof(T));
|
||||||
@ -205,8 +199,7 @@ T Read(const VAddr vaddr) {
|
|||||||
case PageType::Special:
|
case PageType::Special:
|
||||||
return ReadMMIO<T>(GetMMIOHandler(vaddr), vaddr);
|
return ReadMMIO<T>(GetMMIOHandler(vaddr), vaddr);
|
||||||
case PageType::RasterizerCachedSpecial: {
|
case PageType::RasterizerCachedSpecial: {
|
||||||
RasterizerFlushRegion(VirtualToPhysicalAddress(vaddr), sizeof(T));
|
RasterizerFlushVirtualRegion(vaddr, sizeof(T), FlushMode::Flush);
|
||||||
|
|
||||||
return ReadMMIO<T>(GetMMIOHandler(vaddr), vaddr);
|
return ReadMMIO<T>(GetMMIOHandler(vaddr), vaddr);
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
@ -236,8 +229,7 @@ void Write(const VAddr vaddr, const T data) {
|
|||||||
ASSERT_MSG(false, "Mapped memory page without a pointer @ %08X", vaddr);
|
ASSERT_MSG(false, "Mapped memory page without a pointer @ %08X", vaddr);
|
||||||
break;
|
break;
|
||||||
case PageType::RasterizerCachedMemory: {
|
case PageType::RasterizerCachedMemory: {
|
||||||
RasterizerFlushAndInvalidateRegion(VirtualToPhysicalAddress(vaddr), sizeof(T));
|
RasterizerFlushVirtualRegion(vaddr, sizeof(T), FlushMode::FlushAndInvalidate);
|
||||||
|
|
||||||
std::memcpy(GetPointerFromVMA(vaddr), &data, sizeof(T));
|
std::memcpy(GetPointerFromVMA(vaddr), &data, sizeof(T));
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -245,8 +237,7 @@ void Write(const VAddr vaddr, const T data) {
|
|||||||
WriteMMIO<T>(GetMMIOHandler(vaddr), vaddr, data);
|
WriteMMIO<T>(GetMMIOHandler(vaddr), vaddr, data);
|
||||||
break;
|
break;
|
||||||
case PageType::RasterizerCachedSpecial: {
|
case PageType::RasterizerCachedSpecial: {
|
||||||
RasterizerFlushAndInvalidateRegion(VirtualToPhysicalAddress(vaddr), sizeof(T));
|
RasterizerFlushVirtualRegion(vaddr, sizeof(T), FlushMode::FlushAndInvalidate);
|
||||||
|
|
||||||
WriteMMIO<T>(GetMMIOHandler(vaddr), vaddr, data);
|
WriteMMIO<T>(GetMMIOHandler(vaddr), vaddr, data);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -275,7 +266,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) {
|
||||||
@ -308,7 +300,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) {
|
||||||
@ -319,8 +312,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!");
|
||||||
@ -368,7 +365,6 @@ void RasterizerMarkRegionCached(PAddr start, u32 size, int count_delta) {
|
|||||||
UNREACHABLE();
|
UNREACHABLE();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
paddr += PAGE_SIZE;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -379,11 +375,48 @@ void RasterizerFlushRegion(PAddr start, u32 size) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void RasterizerFlushAndInvalidateRegion(PAddr start, u32 size) {
|
void RasterizerFlushAndInvalidateRegion(PAddr start, u32 size) {
|
||||||
|
// Since pages are unmapped on shutdown after video core is shutdown, the renderer may be
|
||||||
|
// null here
|
||||||
if (VideoCore::g_renderer != nullptr) {
|
if (VideoCore::g_renderer != nullptr) {
|
||||||
VideoCore::g_renderer->Rasterizer()->FlushAndInvalidateRegion(start, size);
|
VideoCore::g_renderer->Rasterizer()->FlushAndInvalidateRegion(start, size);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void RasterizerFlushVirtualRegion(VAddr start, u32 size, FlushMode mode) {
|
||||||
|
// Since pages are unmapped on shutdown after video core is shutdown, the renderer may be
|
||||||
|
// null here
|
||||||
|
if (VideoCore::g_renderer != nullptr) {
|
||||||
|
VAddr end = start + size;
|
||||||
|
|
||||||
|
auto CheckRegion = [&](VAddr region_start, VAddr region_end) {
|
||||||
|
if (start >= region_end || end <= region_start) {
|
||||||
|
// No overlap with region
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
VAddr overlap_start = std::max(start, region_start);
|
||||||
|
VAddr overlap_end = std::min(end, region_end);
|
||||||
|
|
||||||
|
PAddr physical_start = TryVirtualToPhysicalAddress(overlap_start).value();
|
||||||
|
u32 overlap_size = overlap_end - overlap_start;
|
||||||
|
|
||||||
|
auto* rasterizer = VideoCore::g_renderer->Rasterizer();
|
||||||
|
switch (mode) {
|
||||||
|
case FlushMode::Flush:
|
||||||
|
rasterizer->FlushRegion(physical_start, overlap_size);
|
||||||
|
break;
|
||||||
|
case FlushMode::FlushAndInvalidate:
|
||||||
|
rasterizer->FlushAndInvalidateRegion(physical_start, overlap_size);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
CheckRegion(LINEAR_HEAP_VADDR, LINEAR_HEAP_VADDR_END);
|
||||||
|
CheckRegion(NEW_LINEAR_HEAP_VADDR, NEW_LINEAR_HEAP_VADDR_END);
|
||||||
|
CheckRegion(VRAM_VADDR, VRAM_VADDR_END);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
u8 Read8(const VAddr addr) {
|
u8 Read8(const VAddr addr) {
|
||||||
return Read<u8>(addr);
|
return Read<u8>(addr);
|
||||||
}
|
}
|
||||||
@ -430,16 +463,13 @@ void ReadBlock(const VAddr src_addr, void* dest_buffer, const size_t size) {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case PageType::RasterizerCachedMemory: {
|
case PageType::RasterizerCachedMemory: {
|
||||||
RasterizerFlushRegion(VirtualToPhysicalAddress(current_vaddr), copy_amount);
|
RasterizerFlushVirtualRegion(current_vaddr, copy_amount, FlushMode::Flush);
|
||||||
|
|
||||||
std::memcpy(dest_buffer, GetPointerFromVMA(current_vaddr), copy_amount);
|
std::memcpy(dest_buffer, GetPointerFromVMA(current_vaddr), copy_amount);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case PageType::RasterizerCachedSpecial: {
|
case PageType::RasterizerCachedSpecial: {
|
||||||
DEBUG_ASSERT(GetMMIOHandler(current_vaddr));
|
DEBUG_ASSERT(GetMMIOHandler(current_vaddr));
|
||||||
|
RasterizerFlushVirtualRegion(current_vaddr, copy_amount, FlushMode::Flush);
|
||||||
RasterizerFlushRegion(VirtualToPhysicalAddress(current_vaddr), copy_amount);
|
|
||||||
|
|
||||||
GetMMIOHandler(current_vaddr)->ReadBlock(current_vaddr, dest_buffer, copy_amount);
|
GetMMIOHandler(current_vaddr)->ReadBlock(current_vaddr, dest_buffer, copy_amount);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -500,18 +530,13 @@ void WriteBlock(const VAddr dest_addr, const void* src_buffer, const size_t size
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case PageType::RasterizerCachedMemory: {
|
case PageType::RasterizerCachedMemory: {
|
||||||
RasterizerFlushAndInvalidateRegion(VirtualToPhysicalAddress(current_vaddr),
|
RasterizerFlushVirtualRegion(current_vaddr, copy_amount, FlushMode::FlushAndInvalidate);
|
||||||
copy_amount);
|
|
||||||
|
|
||||||
std::memcpy(GetPointerFromVMA(current_vaddr), src_buffer, copy_amount);
|
std::memcpy(GetPointerFromVMA(current_vaddr), src_buffer, copy_amount);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case PageType::RasterizerCachedSpecial: {
|
case PageType::RasterizerCachedSpecial: {
|
||||||
DEBUG_ASSERT(GetMMIOHandler(current_vaddr));
|
DEBUG_ASSERT(GetMMIOHandler(current_vaddr));
|
||||||
|
RasterizerFlushVirtualRegion(current_vaddr, copy_amount, FlushMode::FlushAndInvalidate);
|
||||||
RasterizerFlushAndInvalidateRegion(VirtualToPhysicalAddress(current_vaddr),
|
|
||||||
copy_amount);
|
|
||||||
|
|
||||||
GetMMIOHandler(current_vaddr)->WriteBlock(current_vaddr, src_buffer, copy_amount);
|
GetMMIOHandler(current_vaddr)->WriteBlock(current_vaddr, src_buffer, copy_amount);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -557,18 +582,13 @@ void ZeroBlock(const VAddr dest_addr, const size_t size) {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case PageType::RasterizerCachedMemory: {
|
case PageType::RasterizerCachedMemory: {
|
||||||
RasterizerFlushAndInvalidateRegion(VirtualToPhysicalAddress(current_vaddr),
|
RasterizerFlushVirtualRegion(current_vaddr, copy_amount, FlushMode::FlushAndInvalidate);
|
||||||
copy_amount);
|
|
||||||
|
|
||||||
std::memset(GetPointerFromVMA(current_vaddr), 0, copy_amount);
|
std::memset(GetPointerFromVMA(current_vaddr), 0, copy_amount);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case PageType::RasterizerCachedSpecial: {
|
case PageType::RasterizerCachedSpecial: {
|
||||||
DEBUG_ASSERT(GetMMIOHandler(current_vaddr));
|
DEBUG_ASSERT(GetMMIOHandler(current_vaddr));
|
||||||
|
RasterizerFlushVirtualRegion(current_vaddr, copy_amount, FlushMode::FlushAndInvalidate);
|
||||||
RasterizerFlushAndInvalidateRegion(VirtualToPhysicalAddress(current_vaddr),
|
|
||||||
copy_amount);
|
|
||||||
|
|
||||||
GetMMIOHandler(current_vaddr)->WriteBlock(current_vaddr, zeros.data(), copy_amount);
|
GetMMIOHandler(current_vaddr)->WriteBlock(current_vaddr, zeros.data(), copy_amount);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -613,15 +633,13 @@ void CopyBlock(VAddr dest_addr, VAddr src_addr, const size_t size) {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case PageType::RasterizerCachedMemory: {
|
case PageType::RasterizerCachedMemory: {
|
||||||
RasterizerFlushRegion(VirtualToPhysicalAddress(current_vaddr), copy_amount);
|
RasterizerFlushVirtualRegion(current_vaddr, copy_amount, FlushMode::Flush);
|
||||||
|
|
||||||
WriteBlock(dest_addr, GetPointerFromVMA(current_vaddr), copy_amount);
|
WriteBlock(dest_addr, GetPointerFromVMA(current_vaddr), copy_amount);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case PageType::RasterizerCachedSpecial: {
|
case PageType::RasterizerCachedSpecial: {
|
||||||
DEBUG_ASSERT(GetMMIOHandler(current_vaddr));
|
DEBUG_ASSERT(GetMMIOHandler(current_vaddr));
|
||||||
|
RasterizerFlushVirtualRegion(current_vaddr, copy_amount, FlushMode::Flush);
|
||||||
RasterizerFlushRegion(VirtualToPhysicalAddress(current_vaddr), copy_amount);
|
|
||||||
|
|
||||||
std::vector<u8> buffer(copy_amount);
|
std::vector<u8> buffer(copy_amount);
|
||||||
GetMMIOHandler(current_vaddr)->ReadBlock(current_vaddr, buffer.data(), buffer.size());
|
GetMMIOHandler(current_vaddr)->ReadBlock(current_vaddr, buffer.data(), buffer.size());
|
||||||
@ -680,7 +698,7 @@ void WriteMMIO<u64>(MMIORegionPointer mmio_handler, VAddr addr, const u64 data)
|
|||||||
mmio_handler->Write64(addr, data);
|
mmio_handler->Write64(addr, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
PAddr VirtualToPhysicalAddress(const VAddr addr) {
|
boost::optional<PAddr> TryVirtualToPhysicalAddress(const VAddr addr) {
|
||||||
if (addr == 0) {
|
if (addr == 0) {
|
||||||
return 0;
|
return 0;
|
||||||
} else if (addr >= VRAM_VADDR && addr < VRAM_VADDR_END) {
|
} else if (addr >= VRAM_VADDR && addr < VRAM_VADDR_END) {
|
||||||
@ -697,12 +715,20 @@ PAddr VirtualToPhysicalAddress(const VAddr addr) {
|
|||||||
return addr - N3DS_EXTRA_RAM_VADDR + N3DS_EXTRA_RAM_PADDR;
|
return addr - N3DS_EXTRA_RAM_VADDR + N3DS_EXTRA_RAM_PADDR;
|
||||||
}
|
}
|
||||||
|
|
||||||
LOG_ERROR(HW_Memory, "Unknown virtual address @ 0x%08X", addr);
|
return boost::none;
|
||||||
// To help with debugging, set bit on address so that it's obviously invalid.
|
|
||||||
return addr | 0x80000000;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
VAddr PhysicalToVirtualAddress(const PAddr addr) {
|
PAddr VirtualToPhysicalAddress(const VAddr addr) {
|
||||||
|
auto paddr = TryVirtualToPhysicalAddress(addr);
|
||||||
|
if (!paddr) {
|
||||||
|
LOG_ERROR(HW_Memory, "Unknown virtual address @ 0x%08X", addr);
|
||||||
|
// To help with debugging, set bit on address so that it's obviously invalid.
|
||||||
|
return addr | 0x80000000;
|
||||||
|
}
|
||||||
|
return *paddr;
|
||||||
|
}
|
||||||
|
|
||||||
|
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) {
|
||||||
@ -717,9 +743,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 {
|
||||||
@ -148,15 +149,23 @@ u8* GetPointer(VAddr virtual_address);
|
|||||||
std::string ReadCString(VAddr virtual_address, std::size_t max_length);
|
std::string ReadCString(VAddr virtual_address, std::size_t max_length);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Converts a virtual address inside a region with 1:1 mapping to physical memory to a physical
|
* Converts a virtual address inside a region with 1:1 mapping to physical memory to a physical
|
||||||
* address. This should be used by services to translate addresses for use by the hardware.
|
* address. This should be used by services to translate addresses for use by the hardware.
|
||||||
*/
|
*/
|
||||||
|
boost::optional<PAddr> TryVirtualToPhysicalAddress(VAddr addr);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Converts a virtual address inside a region with 1:1 mapping to physical memory to a physical
|
||||||
|
* address. This should be used by services to translate addresses for use by the hardware.
|
||||||
|
*
|
||||||
|
* @deprecated Use TryVirtualToPhysicalAddress(), which reports failure.
|
||||||
|
*/
|
||||||
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.
|
||||||
@ -181,6 +190,19 @@ void RasterizerFlushRegion(PAddr start, u32 size);
|
|||||||
*/
|
*/
|
||||||
void RasterizerFlushAndInvalidateRegion(PAddr start, u32 size);
|
void RasterizerFlushAndInvalidateRegion(PAddr start, u32 size);
|
||||||
|
|
||||||
|
enum class FlushMode {
|
||||||
|
/// Write back modified surfaces to RAM
|
||||||
|
Flush,
|
||||||
|
/// Write back modified surfaces to RAM, and also remove them from the cache
|
||||||
|
FlushAndInvalidate,
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Flushes and invalidates any externally cached rasterizer resources touching the given virtual
|
||||||
|
* address region.
|
||||||
|
*/
|
||||||
|
void RasterizerFlushVirtualRegion(VAddr start, u32 size, FlushMode mode);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Dynarmic has an optimization to memory accesses when the pointer to the page exists that
|
* Dynarmic has an optimization to memory accesses when the pointer to the page exists that
|
||||||
* can be used by setting up the current page table as a callback. This function is used to
|
* can be used by setting up the current page table as a callback. This function is used to
|
||||||
|
Loading…
Reference in New Issue
Block a user