summaryrefslogtreecommitdiff
path: root/src/core/memory.cpp
diff options
context:
space:
mode:
authorGravatar liamwhite2022-07-23 15:20:39 -0400
committerGravatar GitHub2022-07-23 15:20:39 -0400
commit97729fd8e9c2f8cabc626ab03a666c9428e01c5e (patch)
treef6a2f3b6c71b51a646d1502c01a4f6be92a3ed26 /src/core/memory.cpp
parentMerge pull request #8629 from Docteh/test_transifex (diff)
parentProject Andio (diff)
downloadyuzu-97729fd8e9c2f8cabc626ab03a666c9428e01c5e.tar.gz
yuzu-97729fd8e9c2f8cabc626ab03a666c9428e01c5e.tar.xz
yuzu-97729fd8e9c2f8cabc626ab03a666c9428e01c5e.zip
Merge pull request #8545 from Kelebek1/Audio
Project Andio
Diffstat (limited to 'src/core/memory.cpp')
-rw-r--r--src/core/memory.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/memory.cpp b/src/core/memory.cpp
index 584808d50..635449fce 100644
--- a/src/core/memory.cpp
+++ b/src/core/memory.cpp
@@ -511,7 +511,7 @@ struct Memory::Impl {
511 511
512 [[nodiscard]] u8* GetPointerImpl(VAddr vaddr, auto on_unmapped, auto on_rasterizer) const { 512 [[nodiscard]] u8* GetPointerImpl(VAddr vaddr, auto on_unmapped, auto on_rasterizer) const {
513 // AARCH64 masks the upper 16 bit of all memory accesses 513 // AARCH64 masks the upper 16 bit of all memory accesses
514 vaddr &= 0xffffffffffffLL; 514 vaddr &= 0xffffffffffffULL;
515 515
516 if (vaddr >= 1uLL << current_page_table->GetAddressSpaceBits()) { 516 if (vaddr >= 1uLL << current_page_table->GetAddressSpaceBits()) {
517 on_unmapped(); 517 on_unmapped();
@@ -776,6 +776,10 @@ void Memory::CopyBlock(const Kernel::KProcess& process, VAddr dest_addr, VAddr s
776 impl->CopyBlock(process, dest_addr, src_addr, size); 776 impl->CopyBlock(process, dest_addr, src_addr, size);
777} 777}
778 778
779void Memory::ZeroBlock(const Kernel::KProcess& process, VAddr dest_addr, const std::size_t size) {
780 impl->ZeroBlock(process, dest_addr, size);
781}
782
779void Memory::RasterizerMarkRegionCached(VAddr vaddr, u64 size, bool cached) { 783void Memory::RasterizerMarkRegionCached(VAddr vaddr, u64 size, bool cached) {
780 impl->RasterizerMarkRegionCached(vaddr, size, cached); 784 impl->RasterizerMarkRegionCached(vaddr, size, cached);
781} 785}