|
|
@ -199,7 +199,7 @@ const u8* MemoryManager::GetPointer(GPUVAddr addr) const {
|
|
|
|
return {};
|
|
|
|
return {};
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void MemoryManager::ReadBlock(GPUVAddr src_addr, void* dest_buffer, std::size_t size) const {
|
|
|
|
void MemoryManager::ReadBlock(GPUVAddr src_addr, void* dest_buffer, const std::size_t size) const {
|
|
|
|
std::size_t remaining_size{size};
|
|
|
|
std::size_t remaining_size{size};
|
|
|
|
std::size_t page_index{src_addr >> page_bits};
|
|
|
|
std::size_t page_index{src_addr >> page_bits};
|
|
|
|
std::size_t page_offset{src_addr & page_mask};
|
|
|
|
std::size_t page_offset{src_addr & page_mask};
|
|
|
@ -226,7 +226,8 @@ void MemoryManager::ReadBlock(GPUVAddr src_addr, void* dest_buffer, std::size_t
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void MemoryManager::ReadBlockUnsafe(GPUVAddr src_addr, void* dest_buffer, std::size_t size) const {
|
|
|
|
void MemoryManager::ReadBlockUnsafe(GPUVAddr src_addr, void* dest_buffer,
|
|
|
|
|
|
|
|
const std::size_t size) const {
|
|
|
|
std::size_t remaining_size{size};
|
|
|
|
std::size_t remaining_size{size};
|
|
|
|
std::size_t page_index{src_addr >> page_bits};
|
|
|
|
std::size_t page_index{src_addr >> page_bits};
|
|
|
|
std::size_t page_offset{src_addr & page_mask};
|
|
|
|
std::size_t page_offset{src_addr & page_mask};
|
|
|
@ -243,7 +244,7 @@ void MemoryManager::ReadBlockUnsafe(GPUVAddr src_addr, void* dest_buffer, std::s
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void MemoryManager::WriteBlock(GPUVAddr dest_addr, const void* src_buffer, std::size_t size) {
|
|
|
|
void MemoryManager::WriteBlock(GPUVAddr dest_addr, const void* src_buffer, const std::size_t size) {
|
|
|
|
std::size_t remaining_size{size};
|
|
|
|
std::size_t remaining_size{size};
|
|
|
|
std::size_t page_index{dest_addr >> page_bits};
|
|
|
|
std::size_t page_index{dest_addr >> page_bits};
|
|
|
|
std::size_t page_offset{dest_addr & page_mask};
|
|
|
|
std::size_t page_offset{dest_addr & page_mask};
|
|
|
@ -270,7 +271,8 @@ void MemoryManager::WriteBlock(GPUVAddr dest_addr, const void* src_buffer, std::
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void MemoryManager::WriteBlockUnsafe(GPUVAddr dest_addr, const void* src_buffer, std::size_t size) {
|
|
|
|
void MemoryManager::WriteBlockUnsafe(GPUVAddr dest_addr, const void* src_buffer,
|
|
|
|
|
|
|
|
const std::size_t size) {
|
|
|
|
std::size_t remaining_size{size};
|
|
|
|
std::size_t remaining_size{size};
|
|
|
|
std::size_t page_index{dest_addr >> page_bits};
|
|
|
|
std::size_t page_index{dest_addr >> page_bits};
|
|
|
|
std::size_t page_offset{dest_addr & page_mask};
|
|
|
|
std::size_t page_offset{dest_addr & page_mask};
|
|
|
@ -287,7 +289,7 @@ void MemoryManager::WriteBlockUnsafe(GPUVAddr dest_addr, const void* src_buffer,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void MemoryManager::CopyBlock(GPUVAddr dest_addr, GPUVAddr src_addr, std::size_t size) {
|
|
|
|
void MemoryManager::CopyBlock(GPUVAddr dest_addr, GPUVAddr src_addr, const std::size_t size) {
|
|
|
|
std::size_t remaining_size{size};
|
|
|
|
std::size_t remaining_size{size};
|
|
|
|
std::size_t page_index{src_addr >> page_bits};
|
|
|
|
std::size_t page_index{src_addr >> page_bits};
|
|
|
|
std::size_t page_offset{src_addr & page_mask};
|
|
|
|
std::size_t page_offset{src_addr & page_mask};
|
|
|
@ -315,6 +317,12 @@ void MemoryManager::CopyBlock(GPUVAddr dest_addr, GPUVAddr src_addr, std::size_t
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void MemoryManager::CopyBlockUnsafe(GPUVAddr dest_addr, GPUVAddr src_addr, const std::size_t size) {
|
|
|
|
|
|
|
|
std::vector<u8> tmp_buffer(size);
|
|
|
|
|
|
|
|
ReadBlockUnsafe(src_addr, tmp_buffer.data(), size);
|
|
|
|
|
|
|
|
WriteBlockUnsafe(dest_addr, tmp_buffer.data(), size);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void MemoryManager::MapPages(GPUVAddr base, u64 size, u8* memory, Common::PageType type,
|
|
|
|
void MemoryManager::MapPages(GPUVAddr base, u64 size, u8* memory, Common::PageType type,
|
|
|
|
VAddr backing_addr) {
|
|
|
|
VAddr backing_addr) {
|
|
|
|
LOG_DEBUG(HW_GPU, "Mapping {} onto {:016X}-{:016X}", fmt::ptr(memory), base * page_size,
|
|
|
|
LOG_DEBUG(HW_GPU, "Mapping {} onto {:016X}-{:016X}", fmt::ptr(memory), base * page_size,
|
|
|
|