diff options
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/common_types.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/common/common_types.h b/src/common/common_types.h index ee18eac81..844d34965 100644 --- a/src/common/common_types.h +++ b/src/common/common_types.h | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | 24 | ||
| 25 | #pragma once | 25 | #pragma once |
| 26 | 26 | ||
| 27 | #include <array> | ||
| 27 | #include <cstdint> | 28 | #include <cstdint> |
| 28 | 29 | ||
| 29 | #ifdef _MSC_VER | 30 | #ifdef _MSC_VER |
| @@ -47,8 +48,11 @@ typedef double f64; ///< 64-bit floating point | |||
| 47 | 48 | ||
| 48 | // TODO: It would be nice to eventually replace these with strong types that prevent accidental | 49 | // TODO: It would be nice to eventually replace these with strong types that prevent accidental |
| 49 | // conversion between each other. | 50 | // conversion between each other. |
| 50 | typedef u32 VAddr; ///< Represents a pointer in the userspace virtual address space. | 51 | typedef u64 VAddr; ///< Represents a pointer in the userspace virtual address space. |
| 51 | typedef u32 PAddr; ///< Represents a pointer in the ARM11 physical address space. | 52 | typedef u64 PAddr; ///< Represents a pointer in the ARM11 physical address space. |
| 53 | |||
| 54 | using u128 = std::array<std::uint64_t, 2>; | ||
| 55 | static_assert(sizeof(u128) == 16, "u128 must be 128 bits wide"); | ||
| 52 | 56 | ||
| 53 | // An inheritable class to disallow the copy constructor and operator= functions | 57 | // An inheritable class to disallow the copy constructor and operator= functions |
| 54 | class NonCopyable { | 58 | class NonCopyable { |