From 8103652a919c18990744208db17b2daa9404f4f5 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sat, 27 Apr 2019 13:30:23 -0400
Subject: [PATCH] frontend: Move imm.h to the top-level directory of the
 frontends

Preparation to utilize the immediate type within the A32 backend as
well, which will allow eliminating numerous type aliases like Imm4,
Imm5, etc.
---
 src/CMakeLists.txt                     | 2 +-
 src/frontend/A64/translate/impl/impl.h | 2 +-
 src/frontend/{A64 => }/imm.h           | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename src/frontend/{A64 => }/imm.h (97%)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ab6bf6b7..44126f72 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -77,6 +77,7 @@ add_library(dynarmic
     common/u128.cpp
     common/u128.h
     common/variant_util.h
+    frontend/imm.h
     frontend/A32/decoder/arm.h
     frontend/A32/decoder/arm.inc
     frontend/A32/decoder/thumb16.h
@@ -118,7 +119,6 @@ add_library(dynarmic
     frontend/A32/types.h
     frontend/A64/decoder/a64.h
     frontend/A64/decoder/a64.inc
-    frontend/A64/imm.h
     frontend/A64/ir_emitter.cpp
     frontend/A64/ir_emitter.h
     frontend/A64/location_descriptor.cpp
diff --git a/src/frontend/A64/translate/impl/impl.h b/src/frontend/A64/translate/impl/impl.h
index bc032476..91b3430b 100644
--- a/src/frontend/A64/translate/impl/impl.h
+++ b/src/frontend/A64/translate/impl/impl.h
@@ -8,7 +8,7 @@
 
 #include <optional>
 
-#include "frontend/A64/imm.h"
+#include "frontend/imm.h"
 #include "frontend/A64/ir_emitter.h"
 #include "frontend/A64/location_descriptor.h"
 #include "frontend/A64/translate/translate.h"
diff --git a/src/frontend/A64/imm.h b/src/frontend/imm.h
similarity index 97%
rename from src/frontend/A64/imm.h
rename to src/frontend/imm.h
index eff6c397..941374b2 100644
--- a/src/frontend/A64/imm.h
+++ b/src/frontend/imm.h
@@ -11,10 +11,10 @@
 #include "common/common_types.h"
 #include "common/math_util.h"
 
-namespace Dynarmic::A64 {
+namespace Dynarmic {
 
 /**
- * Imm represents an immediate value in an AArch64 instruction.
+ * Imm represents an immediate value in an AArch32/AArch64 instruction.
  * Imm is used during translation as a typesafe way of passing around immediates of fixed sizes.
  */
 template <size_t bit_size_>
@@ -158,4 +158,4 @@ auto concatenate(Imm<first_bit_size> first, Imm<rest_bit_sizes> ...rest) {
     }
 }
 
-} // namespace Dynarmic::A64
+} // namespace Dynarmic