diff options
| author | 2017-06-21 20:25:46 -0700 | |
|---|---|---|
| committer | 2017-06-21 22:55:18 -0700 | |
| commit | 6ae0086b39769f5f11d7d4bb7115be8bf2565afe (patch) | |
| tree | 1940846ad71e490ae37f643c57cbdbfb850ef3c9 /src/core/memory.h | |
| parent | Memory: Make PhysicalToVirtualAddress return a boost::optional (diff) | |
| download | yuzu-6ae0086b39769f5f11d7d4bb7115be8bf2565afe.tar.gz yuzu-6ae0086b39769f5f11d7d4bb7115be8bf2565afe.tar.xz yuzu-6ae0086b39769f5f11d7d4bb7115be8bf2565afe.zip | |
Memory: Add TryVirtualToPhysicalAddress, returning a boost::optional
Diffstat (limited to 'src/core/memory.h')
| -rw-r--r-- | src/core/memory.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/core/memory.h b/src/core/memory.h index 77277c342..96ce9e52e 100644 --- a/src/core/memory.h +++ b/src/core/memory.h | |||
| @@ -149,9 +149,17 @@ u8* GetPointer(VAddr virtual_address); | |||
| 149 | std::string ReadCString(VAddr virtual_address, std::size_t max_length); | 149 | std::string ReadCString(VAddr virtual_address, std::size_t max_length); |
| 150 | 150 | ||
| 151 | /** | 151 | /** |
| 152 | * Converts a virtual address inside a region with 1:1 mapping to physical memory to a physical | 152 | * Converts a virtual address inside a region with 1:1 mapping to physical memory to a physical |
| 153 | * address. This should be used by services to translate addresses for use by the hardware. | 153 | * address. This should be used by services to translate addresses for use by the hardware. |
| 154 | */ | 154 | */ |
| 155 | boost::optional<PAddr> TryVirtualToPhysicalAddress(VAddr addr); | ||
| 156 | |||
| 157 | /** | ||
| 158 | * Converts a virtual address inside a region with 1:1 mapping to physical memory to a physical | ||
| 159 | * address. This should be used by services to translate addresses for use by the hardware. | ||
| 160 | * | ||
| 161 | * @deprecated Use TryVirtualToPhysicalAddress(), which reports failure. | ||
| 162 | */ | ||
| 155 | PAddr VirtualToPhysicalAddress(VAddr addr); | 163 | PAddr VirtualToPhysicalAddress(VAddr addr); |
| 156 | 164 | ||
| 157 | /** | 165 | /** |