From af010996a55c756f43c5326eaea4b7ba7a8be870 Mon Sep 17 00:00:00 2001
From: BreadFish64 <mohror64@gmail.com>
Date: Tue, 7 Apr 2020 22:58:14 -0500
Subject: [PATCH] backend/A64: fix mp

---
 src/backend/A64/devirtualize.h              | 11 ++++++-----
 src/backend/A64/emit_a64_floating_point.cpp |  9 ---------
 src/backend/A64/emit_a64_saturation.cpp     |  3 ---
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/backend/A64/devirtualize.h b/src/backend/A64/devirtualize.h
index f98a4a57..caefc9b0 100644
--- a/src/backend/A64/devirtualize.h
+++ b/src/backend/A64/devirtualize.h
@@ -9,11 +9,12 @@
 #include <cstring>
 #include <memory>
 
+#include <mp/traits/function_info.h>
+
 #include "backend/A64/callback.h"
 #include "common/assert.h"
 #include "common/cast_util.h"
 #include "common/common_types.h"
-#include "common/mp/function_info.h"
 
 namespace Dynarmic::BackendA64 {
 
@@ -32,18 +33,18 @@ struct ThunkBuilder<R(C::*)(Args...), mfp> {
 } // namespace impl
 
 template<auto mfp>
-ArgCallback DevirtualizeGeneric(Common::mp::class_type_t<decltype(mfp)>* this_) {
+ArgCallback DevirtualizeGeneric(mp::class_type<decltype(mfp)>* this_) {
     return ArgCallback{&impl::ThunkBuilder<decltype(mfp), mfp>::Thunk, reinterpret_cast<u64>(this_)};
 }
 
 template<auto mfp>
-ArgCallback DevirtualizeWindows(Common::mp::class_type_t<decltype(mfp)>* this_) {
+ArgCallback DevirtualizeWindows(mp::class_type<decltype(mfp)>* this_) {
     static_assert(sizeof(mfp) == 8);
     return ArgCallback{Common::BitCast<u64>(mfp), reinterpret_cast<u64>(this_)};
 }
 
 template<auto mfp>
-ArgCallback DevirtualizeAarch64(Common::mp::class_type_t<decltype(mfp)>* this_) {
+ArgCallback DevirtualizeAarch64(mp::class_type<decltype(mfp)>* this_) {
     struct MemberFunctionPointer {
         /// For a non-virtual function, this is a simple function pointer.
         /// For a virtual function, it is virtual table offset in bytes.
@@ -65,7 +66,7 @@ ArgCallback DevirtualizeAarch64(Common::mp::class_type_t<decltype(mfp)>* this_)
 }
 
 template<auto mfp>
-ArgCallback Devirtualize(Common::mp::class_type_t<decltype(mfp)>* this_) {
+ArgCallback Devirtualize(mp::class_type<decltype(mfp)>* this_) {
 #if defined(linux) || defined(__linux) || defined(__linux__)
     return DevirtualizeAarch64<mfp>(this_);
 #else
diff --git a/src/backend/A64/emit_a64_floating_point.cpp b/src/backend/A64/emit_a64_floating_point.cpp
index da957cef..be0b97a6 100644
--- a/src/backend/A64/emit_a64_floating_point.cpp
+++ b/src/backend/A64/emit_a64_floating_point.cpp
@@ -19,21 +19,12 @@
 #include "common/fp/op.h"
 #include "common/fp/rounding_mode.h"
 #include "common/fp/util.h"
-#include "common/mp/cartesian_product.h"
-#include "common/mp/integer.h"
-#include "common/mp/list.h"
-#include "common/mp/lut.h"
-#include "common/mp/to_tuple.h"
-#include "common/mp/vlift.h"
-#include "common/mp/vllift.h"
 #include "frontend/ir/basic_block.h"
 #include "frontend/ir/microinstruction.h"
 #include "frontend/ir/opcodes.h"
 
 namespace Dynarmic::BackendA64 {
 
-namespace mp = Dynarmic::Common::mp;
-
 namespace {
 
 Arm64Gen::RoundingMode ConvertRoundingModeToA64RoundingMode(FP::RoundingMode rounding_mode) {
diff --git a/src/backend/A64/emit_a64_saturation.cpp b/src/backend/A64/emit_a64_saturation.cpp
index 0f02be4b..5462fba4 100644
--- a/src/backend/A64/emit_a64_saturation.cpp
+++ b/src/backend/A64/emit_a64_saturation.cpp
@@ -11,15 +11,12 @@
 #include "common/assert.h"
 #include "common/bit_util.h"
 #include "common/common_types.h"
-#include "common/mp/integer.h"
 #include "frontend/ir/basic_block.h"
 #include "frontend/ir/microinstruction.h"
 #include "frontend/ir/opcodes.h"
 
 namespace Dynarmic::BackendA64 {
 
-namespace mp = Dynarmic::Common::mp;
-
 namespace {
 
 enum class Op {