diff options
| author | 2014-07-04 23:46:16 -0400 | |
|---|---|---|
| committer | 2014-07-04 23:46:16 -0400 | |
| commit | 3013015a0c7b830c9985e4d3a6b2bd66f15546e2 (patch) | |
| tree | 1b514233226d458efa501d9367cccc11bbe8e700 /src/core/mem_map_funcs.cpp | |
| parent | Merge pull request #26 from bunnei/romfs-archive (diff) | |
| download | yuzu-3013015a0c7b830c9985e4d3a6b2bd66f15546e2.tar.gz yuzu-3013015a0c7b830c9985e4d3a6b2bd66f15546e2.tar.xz yuzu-3013015a0c7b830c9985e4d3a6b2bd66f15546e2.zip | |
mem_map: Updated interface to expose template functions to other modules.
Diffstat (limited to 'src/core/mem_map_funcs.cpp')
| -rw-r--r-- | src/core/mem_map_funcs.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/core/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp index 37913119e..d0ca85ccd 100644 --- a/src/core/mem_map_funcs.cpp +++ b/src/core/mem_map_funcs.cpp | |||
| @@ -41,7 +41,7 @@ u32 _VirtualAddress(const u32 addr) { | |||
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | template <typename T> | 43 | template <typename T> |
| 44 | inline void _Read(T &var, const u32 addr) { | 44 | inline void Read(T &var, const u32 addr) { |
| 45 | // TODO: Figure out the fastest order of tests for both read and write (they are probably different). | 45 | // TODO: Figure out the fastest order of tests for both read and write (they are probably different). |
| 46 | // TODO: Make sure this represents the mirrors in a correct way. | 46 | // TODO: Make sure this represents the mirrors in a correct way. |
| 47 | // Could just do a base-relative read, too.... TODO | 47 | // Could just do a base-relative read, too.... TODO |
| @@ -91,7 +91,7 @@ inline void _Read(T &var, const u32 addr) { | |||
| 91 | } | 91 | } |
| 92 | 92 | ||
| 93 | template <typename T> | 93 | template <typename T> |
| 94 | inline void _Write(u32 addr, const T data) { | 94 | inline void Write(u32 addr, const T data) { |
| 95 | u32 vaddr = _VirtualAddress(addr); | 95 | u32 vaddr = _VirtualAddress(addr); |
| 96 | 96 | ||
| 97 | // Kernel memory command buffer | 97 | // Kernel memory command buffer |
| @@ -247,25 +247,25 @@ u32 MapBlock_HeapGSP(u32 size, u32 operation, u32 permissions) { | |||
| 247 | 247 | ||
| 248 | u8 Read8(const u32 addr) { | 248 | u8 Read8(const u32 addr) { |
| 249 | u8 _var = 0; | 249 | u8 _var = 0; |
| 250 | _Read<u8>(_var, addr); | 250 | Read<u8>(_var, addr); |
| 251 | return (u8)_var; | 251 | return (u8)_var; |
| 252 | } | 252 | } |
| 253 | 253 | ||
| 254 | u16 Read16(const u32 addr) { | 254 | u16 Read16(const u32 addr) { |
| 255 | u16_le _var = 0; | 255 | u16_le _var = 0; |
| 256 | _Read<u16_le>(_var, addr); | 256 | Read<u16_le>(_var, addr); |
| 257 | return (u16)_var; | 257 | return (u16)_var; |
| 258 | } | 258 | } |
| 259 | 259 | ||
| 260 | u32 Read32(const u32 addr) { | 260 | u32 Read32(const u32 addr) { |
| 261 | u32_le _var = 0; | 261 | u32_le _var = 0; |
| 262 | _Read<u32_le>(_var, addr); | 262 | Read<u32_le>(_var, addr); |
| 263 | return _var; | 263 | return _var; |
| 264 | } | 264 | } |
| 265 | 265 | ||
| 266 | u64 Read64(const u32 addr) { | 266 | u64 Read64(const u32 addr) { |
| 267 | u64_le _var = 0; | 267 | u64_le _var = 0; |
| 268 | _Read<u64_le>(_var, addr); | 268 | Read<u64_le>(_var, addr); |
| 269 | return _var; | 269 | return _var; |
| 270 | } | 270 | } |
| 271 | 271 | ||
| @@ -278,19 +278,19 @@ u32 Read16_ZX(const u32 addr) { | |||
| 278 | } | 278 | } |
| 279 | 279 | ||
| 280 | void Write8(const u32 addr, const u8 data) { | 280 | void Write8(const u32 addr, const u8 data) { |
| 281 | _Write<u8>(addr, data); | 281 | Write<u8>(addr, data); |
| 282 | } | 282 | } |
| 283 | 283 | ||
| 284 | void Write16(const u32 addr, const u16 data) { | 284 | void Write16(const u32 addr, const u16 data) { |
| 285 | _Write<u16_le>(addr, data); | 285 | Write<u16_le>(addr, data); |
| 286 | } | 286 | } |
| 287 | 287 | ||
| 288 | void Write32(const u32 addr, const u32 data) { | 288 | void Write32(const u32 addr, const u32 data) { |
| 289 | _Write<u32_le>(addr, data); | 289 | Write<u32_le>(addr, data); |
| 290 | } | 290 | } |
| 291 | 291 | ||
| 292 | void Write64(const u32 addr, const u64 data) { | 292 | void Write64(const u32 addr, const u64 data) { |
| 293 | _Write<u64_le>(addr, data); | 293 | Write<u64_le>(addr, data); |
| 294 | } | 294 | } |
| 295 | 295 | ||
| 296 | void WriteBlock(const u32 addr, const u8* data, const int size) { | 296 | void WriteBlock(const u32 addr, const u8* data, const int size) { |