diff options
Diffstat (limited to 'src/core/memory.cpp')
| -rw-r--r-- | src/core/memory.cpp | 36 |
1 files changed, 11 insertions, 25 deletions
diff --git a/src/core/memory.cpp b/src/core/memory.cpp index 95e070825..432310632 100644 --- a/src/core/memory.cpp +++ b/src/core/memory.cpp | |||
| @@ -832,11 +832,6 @@ std::string Memory::ReadCString(Common::ProcessAddress vaddr, std::size_t max_le | |||
| 832 | return impl->ReadCString(vaddr, max_length); | 832 | return impl->ReadCString(vaddr, max_length); |
| 833 | } | 833 | } |
| 834 | 834 | ||
| 835 | void Memory::ReadBlock(const Kernel::KProcess& process, const Common::ProcessAddress src_addr, | ||
| 836 | void* dest_buffer, const std::size_t size) { | ||
| 837 | impl->ReadBlockImpl<false>(process, src_addr, dest_buffer, size); | ||
| 838 | } | ||
| 839 | |||
| 840 | void Memory::ReadBlock(const Common::ProcessAddress src_addr, void* dest_buffer, | 835 | void Memory::ReadBlock(const Common::ProcessAddress src_addr, void* dest_buffer, |
| 841 | const std::size_t size) { | 836 | const std::size_t size) { |
| 842 | impl->ReadBlock(src_addr, dest_buffer, size); | 837 | impl->ReadBlock(src_addr, dest_buffer, size); |
| @@ -847,11 +842,6 @@ void Memory::ReadBlockUnsafe(const Common::ProcessAddress src_addr, void* dest_b | |||
| 847 | impl->ReadBlockUnsafe(src_addr, dest_buffer, size); | 842 | impl->ReadBlockUnsafe(src_addr, dest_buffer, size); |
| 848 | } | 843 | } |
| 849 | 844 | ||
| 850 | void Memory::WriteBlock(const Kernel::KProcess& process, Common::ProcessAddress dest_addr, | ||
| 851 | const void* src_buffer, std::size_t size) { | ||
| 852 | impl->WriteBlockImpl<false>(process, dest_addr, src_buffer, size); | ||
| 853 | } | ||
| 854 | |||
| 855 | void Memory::WriteBlock(const Common::ProcessAddress dest_addr, const void* src_buffer, | 845 | void Memory::WriteBlock(const Common::ProcessAddress dest_addr, const void* src_buffer, |
| 856 | const std::size_t size) { | 846 | const std::size_t size) { |
| 857 | impl->WriteBlock(dest_addr, src_buffer, size); | 847 | impl->WriteBlock(dest_addr, src_buffer, size); |
| @@ -862,29 +852,25 @@ void Memory::WriteBlockUnsafe(const Common::ProcessAddress dest_addr, const void | |||
| 862 | impl->WriteBlockUnsafe(dest_addr, src_buffer, size); | 852 | impl->WriteBlockUnsafe(dest_addr, src_buffer, size); |
| 863 | } | 853 | } |
| 864 | 854 | ||
| 865 | void Memory::CopyBlock(const Kernel::KProcess& process, Common::ProcessAddress dest_addr, | 855 | void Memory::CopyBlock(Common::ProcessAddress dest_addr, Common::ProcessAddress src_addr, |
| 866 | Common::ProcessAddress src_addr, const std::size_t size) { | 856 | const std::size_t size) { |
| 867 | impl->CopyBlock(process, dest_addr, src_addr, size); | 857 | impl->CopyBlock(*system.ApplicationProcess(), dest_addr, src_addr, size); |
| 868 | } | 858 | } |
| 869 | 859 | ||
| 870 | void Memory::ZeroBlock(const Kernel::KProcess& process, Common::ProcessAddress dest_addr, | 860 | void Memory::ZeroBlock(Common::ProcessAddress dest_addr, const std::size_t size) { |
| 871 | const std::size_t size) { | 861 | impl->ZeroBlock(*system.ApplicationProcess(), dest_addr, size); |
| 872 | impl->ZeroBlock(process, dest_addr, size); | ||
| 873 | } | 862 | } |
| 874 | 863 | ||
| 875 | Result Memory::InvalidateDataCache(const Kernel::KProcess& process, | 864 | Result Memory::InvalidateDataCache(Common::ProcessAddress dest_addr, const std::size_t size) { |
| 876 | Common::ProcessAddress dest_addr, const std::size_t size) { | 865 | return impl->InvalidateDataCache(*system.ApplicationProcess(), dest_addr, size); |
| 877 | return impl->InvalidateDataCache(process, dest_addr, size); | ||
| 878 | } | 866 | } |
| 879 | 867 | ||
| 880 | Result Memory::StoreDataCache(const Kernel::KProcess& process, Common::ProcessAddress dest_addr, | 868 | Result Memory::StoreDataCache(Common::ProcessAddress dest_addr, const std::size_t size) { |
| 881 | const std::size_t size) { | 869 | return impl->StoreDataCache(*system.ApplicationProcess(), dest_addr, size); |
| 882 | return impl->StoreDataCache(process, dest_addr, size); | ||
| 883 | } | 870 | } |
| 884 | 871 | ||
| 885 | Result Memory::FlushDataCache(const Kernel::KProcess& process, Common::ProcessAddress dest_addr, | 872 | Result Memory::FlushDataCache(Common::ProcessAddress dest_addr, const std::size_t size) { |
| 886 | const std::size_t size) { | 873 | return impl->FlushDataCache(*system.ApplicationProcess(), dest_addr, size); |
| 887 | return impl->FlushDataCache(process, dest_addr, size); | ||
| 888 | } | 874 | } |
| 889 | 875 | ||
| 890 | void Memory::RasterizerMarkRegionCached(Common::ProcessAddress vaddr, u64 size, bool cached) { | 876 | void Memory::RasterizerMarkRegionCached(Common::ProcessAddress vaddr, u64 size, bool cached) { |