|
|
@ -591,7 +591,15 @@ struct Memory::Impl { |
|
|
* @returns The instance of T read from the specified virtual address. |
|
|
* @returns The instance of T read from the specified virtual address. |
|
|
*/ |
|
|
*/ |
|
|
template <typename T> |
|
|
template <typename T> |
|
|
T Read(const VAddr vaddr) { |
|
|
|
|
|
|
|
|
T Read(VAddr vaddr) { |
|
|
|
|
|
// AARCH64 masks the upper 16 bit of all memory accesses
|
|
|
|
|
|
vaddr &= 0xffffffffffffLL; |
|
|
|
|
|
|
|
|
|
|
|
if (vaddr >= 1uLL << current_page_table->GetAddressSpaceBits()) { |
|
|
|
|
|
LOG_ERROR(HW_Memory, "Unmapped Read{} @ 0x{:08X}", sizeof(T) * 8, vaddr); |
|
|
|
|
|
return 0; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
// Avoid adding any extra logic to this fast-path block
|
|
|
// Avoid adding any extra logic to this fast-path block
|
|
|
const uintptr_t raw_pointer = current_page_table->pointers[vaddr >> PAGE_BITS].Raw(); |
|
|
const uintptr_t raw_pointer = current_page_table->pointers[vaddr >> PAGE_BITS].Raw(); |
|
|
if (const u8* const pointer = Common::PageTable::PageInfo::ExtractPointer(raw_pointer)) { |
|
|
if (const u8* const pointer = Common::PageTable::PageInfo::ExtractPointer(raw_pointer)) { |
|
|
@ -629,7 +637,16 @@ struct Memory::Impl { |
|
|
* is undefined. |
|
|
* is undefined. |
|
|
*/ |
|
|
*/ |
|
|
template <typename T> |
|
|
template <typename T> |
|
|
void Write(const VAddr vaddr, const T data) { |
|
|
|
|
|
|
|
|
void Write(VAddr vaddr, const T data) { |
|
|
|
|
|
// AARCH64 masks the upper 16 bit of all memory accesses
|
|
|
|
|
|
vaddr &= 0xffffffffffffLL; |
|
|
|
|
|
|
|
|
|
|
|
if (vaddr >= 1uLL << current_page_table->GetAddressSpaceBits()) { |
|
|
|
|
|
LOG_ERROR(HW_Memory, "Unmapped Write{} 0x{:08X} @ 0x{:016X}", sizeof(data) * 8, |
|
|
|
|
|
static_cast<u32>(data), vaddr); |
|
|
|
|
|
return; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
// Avoid adding any extra logic to this fast-path block
|
|
|
// Avoid adding any extra logic to this fast-path block
|
|
|
const uintptr_t raw_pointer = current_page_table->pointers[vaddr >> PAGE_BITS].Raw(); |
|
|
const uintptr_t raw_pointer = current_page_table->pointers[vaddr >> PAGE_BITS].Raw(); |
|
|
if (u8* const pointer = Common::PageTable::PageInfo::ExtractPointer(raw_pointer)) { |
|
|
if (u8* const pointer = Common::PageTable::PageInfo::ExtractPointer(raw_pointer)) { |
|
|
@ -656,7 +673,16 @@ struct Memory::Impl { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
template <typename T> |
|
|
template <typename T> |
|
|
bool WriteExclusive(const VAddr vaddr, const T data, const T expected) { |
|
|
|
|
|
|
|
|
bool WriteExclusive(VAddr vaddr, const T data, const T expected) { |
|
|
|
|
|
// AARCH64 masks the upper 16 bit of all memory accesses
|
|
|
|
|
|
vaddr &= 0xffffffffffffLL; |
|
|
|
|
|
|
|
|
|
|
|
if (vaddr >= 1uLL << current_page_table->GetAddressSpaceBits()) { |
|
|
|
|
|
LOG_ERROR(HW_Memory, "Unmapped Write{} 0x{:08X} @ 0x{:016X}", sizeof(data) * 8, |
|
|
|
|
|
static_cast<u32>(data), vaddr); |
|
|
|
|
|
return true; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
const uintptr_t raw_pointer = current_page_table->pointers[vaddr >> PAGE_BITS].Raw(); |
|
|
const uintptr_t raw_pointer = current_page_table->pointers[vaddr >> PAGE_BITS].Raw(); |
|
|
if (u8* const pointer = Common::PageTable::PageInfo::ExtractPointer(raw_pointer)) { |
|
|
if (u8* const pointer = Common::PageTable::PageInfo::ExtractPointer(raw_pointer)) { |
|
|
// NOTE: Avoid adding any extra logic to this fast-path block
|
|
|
// NOTE: Avoid adding any extra logic to this fast-path block
|
|
|
@ -683,7 +709,16 @@ struct Memory::Impl { |
|
|
return true; |
|
|
return true; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
bool WriteExclusive128(const VAddr vaddr, const u128 data, const u128 expected) { |
|
|
|
|
|
|
|
|
bool WriteExclusive128(VAddr vaddr, const u128 data, const u128 expected) { |
|
|
|
|
|
// AARCH64 masks the upper 16 bit of all memory accesses
|
|
|
|
|
|
vaddr &= 0xffffffffffffLL; |
|
|
|
|
|
|
|
|
|
|
|
if (vaddr >= 1uLL << current_page_table->GetAddressSpaceBits()) { |
|
|
|
|
|
LOG_ERROR(HW_Memory, "Unmapped Write{} 0x{:08X} @ 0x{:016X}", sizeof(data) * 8, |
|
|
|
|
|
static_cast<u32>(data[0]), vaddr); |
|
|
|
|
|
return true; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
const uintptr_t raw_pointer = current_page_table->pointers[vaddr >> PAGE_BITS].Raw(); |
|
|
const uintptr_t raw_pointer = current_page_table->pointers[vaddr >> PAGE_BITS].Raw(); |
|
|
if (u8* const pointer = Common::PageTable::PageInfo::ExtractPointer(raw_pointer)) { |
|
|
if (u8* const pointer = Common::PageTable::PageInfo::ExtractPointer(raw_pointer)) { |
|
|
// NOTE: Avoid adding any extra logic to this fast-path block
|
|
|
// NOTE: Avoid adding any extra logic to this fast-path block
|
|
|
|