From bfa8035414d3183d74aa001bc072867e3c2f7a7e Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Sat, 18 May 2019 14:10:38 -0400
Subject: [PATCH] A32/A64: Make public header inclusions consistent

For all public header inclusions, we use the <> form of including them
as opposed to "", which we typically use for internal headers.
---
 src/backend/x64/a32_emit_x64.h               | 5 +++--
 src/backend/x64/a64_emit_x64.h               | 5 +++--
 src/backend/x64/a64_interface.cpp            | 2 +-
 src/frontend/A32/translate/translate_arm.cpp | 3 ++-
 src/ir_opt/a64_callback_config_pass.cpp      | 2 +-
 src/ir_opt/a64_merge_interpret_blocks.cpp    | 2 +-
 6 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/backend/x64/a32_emit_x64.h b/src/backend/x64/a32_emit_x64.h
index 57be4a63..51211196 100644
--- a/src/backend/x64/a32_emit_x64.h
+++ b/src/backend/x64/a32_emit_x64.h
@@ -9,11 +9,12 @@
 #include <array>
 #include <optional>
 
+#include <dynarmic/A32/a32.h>
+#include <dynarmic/A32/config.h>
+
 #include "backend/x64/a32_jitstate.h"
 #include "backend/x64/block_range_information.h"
 #include "backend/x64/emit_x64.h"
-#include "dynarmic/A32/a32.h"
-#include "dynarmic/A32/config.h"
 #include "frontend/A32/location_descriptor.h"
 #include "frontend/ir/terminal.h"
 
diff --git a/src/backend/x64/a64_emit_x64.h b/src/backend/x64/a64_emit_x64.h
index dfb4c196..53620467 100644
--- a/src/backend/x64/a64_emit_x64.h
+++ b/src/backend/x64/a64_emit_x64.h
@@ -9,11 +9,12 @@
 #include <map>
 #include <tuple>
 
+#include <dynarmic/A64/a64.h>
+#include <dynarmic/A64/config.h>
+
 #include "backend/x64/a64_jitstate.h"
 #include "backend/x64/block_range_information.h"
 #include "backend/x64/emit_x64.h"
-#include "dynarmic/A64/a64.h"
-#include "dynarmic/A64/config.h"
 #include "frontend/A64/location_descriptor.h"
 #include "frontend/ir/terminal.h"
 
diff --git a/src/backend/x64/a64_interface.cpp b/src/backend/x64/a64_interface.cpp
index 3065ea69..2a8029ba 100644
--- a/src/backend/x64/a64_interface.cpp
+++ b/src/backend/x64/a64_interface.cpp
@@ -8,6 +8,7 @@
 #include <memory>
 
 #include <boost/icl/interval_set.hpp>
+#include <dynarmic/A64/a64.h>
 
 #include "backend/x64/a64_emit_x64.h"
 #include "backend/x64/a64_jitstate.h"
@@ -17,7 +18,6 @@
 #include "common/assert.h"
 #include "common/llvm_disassemble.h"
 #include "common/scope_exit.h"
-#include "dynarmic/A64/a64.h"
 #include "frontend/A64/translate/translate.h"
 #include "frontend/ir/basic_block.h"
 #include "ir_opt/passes.h"
diff --git a/src/frontend/A32/translate/translate_arm.cpp b/src/frontend/A32/translate/translate_arm.cpp
index 247694d9..a0d29b36 100644
--- a/src/frontend/A32/translate/translate_arm.cpp
+++ b/src/frontend/A32/translate/translate_arm.cpp
@@ -6,8 +6,9 @@
 
 #include <algorithm>
 
+#include <dynarmic/A32/config.h>
+
 #include "common/assert.h"
-#include "dynarmic/A32/config.h"
 #include "frontend/A32/decoder/arm.h"
 #include "frontend/A32/decoder/vfp.h"
 #include "frontend/A32/location_descriptor.h"
diff --git a/src/ir_opt/a64_callback_config_pass.cpp b/src/ir_opt/a64_callback_config_pass.cpp
index fb09b921..247a3326 100644
--- a/src/ir_opt/a64_callback_config_pass.cpp
+++ b/src/ir_opt/a64_callback_config_pass.cpp
@@ -6,7 +6,7 @@
 
 #include <array>
 
-#include "dynarmic/A64/config.h"
+#include <dynarmic/A64/config.h>
 #include "frontend/A64/ir_emitter.h"
 #include "frontend/ir/basic_block.h"
 #include "frontend/ir/microinstruction.h"
diff --git a/src/ir_opt/a64_merge_interpret_blocks.cpp b/src/ir_opt/a64_merge_interpret_blocks.cpp
index 6f241fb3..98050134 100644
--- a/src/ir_opt/a64_merge_interpret_blocks.cpp
+++ b/src/ir_opt/a64_merge_interpret_blocks.cpp
@@ -7,10 +7,10 @@
 #include <array>
 
 #include <boost/variant/get.hpp>
+#include <dynarmic/A64/config.h>
 
 #include "common/assert.h"
 #include "common/common_types.h"
-#include "dynarmic/A64/config.h"
 #include "frontend/A64/location_descriptor.h"
 #include "frontend/A64/translate/translate.h"
 #include "frontend/ir/basic_block.h"