ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Memory] 0xE… adjustment in TranslateVirtual

This commit is contained in:
Triang3l 2019-08-14 00:07:27 +03:00
parent 741b5ae2ec
commit 2152c79965
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/xenia/memory.cc
View File

@ -306,7 +306,7 @@ void Memory::Reset() {
heaps_.physical.Reset();
}
BaseHeap* Memory::LookupHeap(uint32_t address) {
const BaseHeap* Memory::LookupHeap(uint32_t address) const {
if (address < 0x40000000) {
return &heaps_.v00000000;
} else if (address < 0x7F000000) {

14
src/xenia/memory.h
View File

@ -286,7 +286,12 @@ class Memory {
// Note that the contents at the specified host address are big-endian.
template <typename T = uint8_t*>
inline T TranslateVirtual(uint32_t guest_address) const {
return reinterpret_cast<T>(virtual_membase_ + guest_address);
uint8_t* host_address = virtual_membase_ + guest_address;
const auto heap = LookupHeap(guest_address);
if (heap) {
host_address += heap->host_address_offset();
}
return reinterpret_cast<T>(host_address);
}
// Base address of physical memory in the host address space.
@ -399,7 +404,12 @@ class Memory {
void SystemHeapFree(uint32_t address);
// Gets the heap for the address space containing the given address.
BaseHeap* LookupHeap(uint32_t address);
const BaseHeap* LookupHeap(uint32_t address) const;
inline BaseHeap* LookupHeap(uint32_t address) {
return const_cast<BaseHeap*>(
const_cast<const Memory*>(this)->LookupHeap(address));
}
// Gets the heap with the given properties.
BaseHeap* LookupHeapByType(bool physical, uint32_t page_size);