From 28be8aec9a4499206662a7bd74091706000e3d6d Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Fri, 19 Mar 2021 23:52:47 -0700
Subject: common: Move common sizes to their own header for code reuse.

---
 src/common/CMakeLists.txt                    |  1 +
 src/common/common_sizes.h                    | 23 +++++++++++++++++++++++
 src/core/hle/kernel/k_address_space_info.cpp | 14 +-------------
 3 files changed, 25 insertions(+), 13 deletions(-)
 create mode 100644 src/common/common_sizes.h

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 788516ded..7253c0f4d 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -109,6 +109,7 @@ add_library(common STATIC
     cityhash.h
     common_funcs.h
     common_paths.h
+    common_sizes.h
     common_types.h
     concepts.h
     div_ceil.h
diff --git a/src/common/common_sizes.h b/src/common/common_sizes.h
new file mode 100644
index 000000000..26425a57d
--- /dev/null
+++ b/src/common/common_sizes.h
@@ -0,0 +1,23 @@
+// Copyright 2021 yuzu Emulator Project
+// Licensed under GPLv2 or any later version
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include "common/common_types.h"
+
+enum : u64 {
+    Size_1_MB = 0x100000ULL,
+    Size_2_MB = 2ULL * Size_1_MB,
+    Size_4_MB = 4ULL * Size_1_MB,
+    Size_14_MB = 14ULL * Size_1_MB,
+    Size_32_MB = 32ULL * Size_1_MB,
+    Size_128_MB = 128ULL * Size_1_MB,
+    Size_1_GB = 0x40000000ULL,
+    Size_2_GB = 2ULL * Size_1_GB,
+    Size_4_GB = 4ULL * Size_1_GB,
+    Size_6_GB = 6ULL * Size_1_GB,
+    Size_64_GB = 64ULL * Size_1_GB,
+    Size_512_GB = 512ULL * Size_1_GB,
+    Invalid = std::numeric_limits<u64>::max(),
+};
diff --git a/src/core/hle/kernel/k_address_space_info.cpp b/src/core/hle/kernel/k_address_space_info.cpp
index e9f56fbed..eb8af660c 100644
--- a/src/core/hle/kernel/k_address_space_info.cpp
+++ b/src/core/hle/kernel/k_address_space_info.cpp
@@ -5,25 +5,13 @@
 #include <array>
 
 #include "common/assert.h"
+#include "common/common_sizes.h"
 #include "core/hle/kernel/k_address_space_info.h"
 
 namespace Kernel {
 
 namespace {
 
-enum : u64 {
-    Size_1_MB = 0x100000ULL,
-    Size_2_MB = 2ULL * Size_1_MB,
-    Size_128_MB = 128ULL * Size_1_MB,
-    Size_1_GB = 0x40000000ULL,
-    Size_2_GB = 2ULL * Size_1_GB,
-    Size_4_GB = 4ULL * Size_1_GB,
-    Size_6_GB = 6ULL * Size_1_GB,
-    Size_64_GB = 64ULL * Size_1_GB,
-    Size_512_GB = 512ULL * Size_1_GB,
-    Invalid = std::numeric_limits<u64>::max(),
-};
-
 // clang-format off
 constexpr std::array<KAddressSpaceInfo, 13> AddressSpaceInfos{{
    { .bit_width = 32, .address = Size_2_MB  , .size = Size_1_GB   - Size_2_MB  , .type = KAddressSpaceInfo::Type::MapSmall,    },
-- 
cgit v1.2.3