diff options
| author | 2016-08-28 22:21:24 -0700 | |
|---|---|---|
| committer | 2016-08-28 22:21:24 -0700 | |
| commit | 474586bc53eb6fda40fb0db23ea1d50d32af28b6 (patch) | |
| tree | 49df9979f3351f3eac26d8a74e25c5181ba35e6c /src/core/memory.h | |
| parent | Merge pull request #1987 from Lectem/ipcdescriptors (diff) | |
| parent | LDR: Implement CRO (diff) | |
| download | yuzu-474586bc53eb6fda40fb0db23ea1d50d32af28b6.tar.gz yuzu-474586bc53eb6fda40fb0db23ea1d50d32af28b6.tar.xz yuzu-474586bc53eb6fda40fb0db23ea1d50d32af28b6.zip | |
Merge pull request #1948 from wwylele/cro++
Implemented CRO
Diffstat (limited to 'src/core/memory.h')
| -rw-r--r-- | src/core/memory.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/memory.h b/src/core/memory.h index ae5588dee..cad845385 100644 --- a/src/core/memory.h +++ b/src/core/memory.h | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include <cstddef> | 7 | #include <cstddef> |
| 8 | #include <string> | ||
| 8 | 9 | ||
| 9 | #include "common/common_types.h" | 10 | #include "common/common_types.h" |
| 10 | 11 | ||
| @@ -130,6 +131,8 @@ void CopyBlock(VAddr dest_addr, VAddr src_addr, size_t size); | |||
| 130 | 131 | ||
| 131 | u8* GetPointer(VAddr virtual_address); | 132 | u8* GetPointer(VAddr virtual_address); |
| 132 | 133 | ||
| 134 | std::string ReadCString(VAddr virtual_address, std::size_t max_length); | ||
| 135 | |||
| 133 | /** | 136 | /** |
| 134 | * Converts a virtual address inside a region with 1:1 mapping to physical memory to a physical | 137 | * Converts a virtual address inside a region with 1:1 mapping to physical memory to a physical |
| 135 | * address. This should be used by services to translate addresses for use by the hardware. | 138 | * address. This should be used by services to translate addresses for use by the hardware. |