diff options
| author | bunnei <bunneidev@gmail.com> | 2017-10-09 23:56:20 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2017-10-09 23:56:20 -0400 |
| commit | b1d5db1cf60344b6b081c9d03cb6ccc3264326cd (patch) | |
| tree | fde377c4ba3c0f92c032e6f5ec8627aae37270ef /src/common/common_types.h | |
| parent | 23ce4f5afc66eb04a7aafc4f89685b8109b8d5c6 (diff) | |
| parent | d15e15bd058f93f1600c86ad8de7482740724f3f (diff) | |
Merge remote-tracking branch 'upstream/master' into nx
# Conflicts:
# src/core/CMakeLists.txt
# src/core/arm/dynarmic/arm_dynarmic.cpp
# src/core/arm/dyncom/arm_dyncom.cpp
# src/core/hle/kernel/process.cpp
# src/core/hle/kernel/thread.cpp
# src/core/hle/kernel/thread.h
# src/core/hle/kernel/vm_manager.cpp
# src/core/loader/3dsx.cpp
# src/core/loader/elf.cpp
# src/core/loader/ncch.cpp
# src/core/memory.cpp
# src/core/memory.h
# src/core/memory_setup.h
Diffstat (limited to 'src/common/common_types.h')
| -rw-r--r-- | src/common/common_types.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/common/common_types.h b/src/common/common_types.h index e8f7ac6be..844d34965 100644 --- a/src/common/common_types.h +++ b/src/common/common_types.h @@ -24,6 +24,7 @@ #pragma once +#include <array> #include <cstdint> #ifdef _MSC_VER @@ -50,6 +51,9 @@ typedef double f64; ///< 64-bit floating point typedef u64 VAddr; ///< Represents a pointer in the userspace virtual address space. typedef u64 PAddr; ///< Represents a pointer in the ARM11 physical address space. +using u128 = std::array<std::uint64_t, 2>; +static_assert(sizeof(u128) == 16, "u128 must be 128 bits wide"); + // An inheritable class to disallow the copy constructor and operator= functions class NonCopyable { protected: |