From 93654877974ca09236b2679bc3fc41f73fd87593 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 18 May 2019 14:25:08 -0400 Subject: [PATCH] frontend/A32/ir_emitter: Remove unnecessary includes std::initializer_list isn't used anywhere in here, and we can just forward declare the CoprocReg enum to avoid needing to include the header. --- src/frontend/A32/ir_emitter.cpp | 1 + src/frontend/A32/ir_emitter.h | 12 +++++------- src/frontend/A32/translate/impl/translate_arm.h | 1 + src/frontend/A32/translate/impl/translate_thumb.h | 1 + 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/frontend/A32/ir_emitter.cpp b/src/frontend/A32/ir_emitter.cpp index ac540f92..8e3f5241 100644 --- a/src/frontend/A32/ir_emitter.cpp +++ b/src/frontend/A32/ir_emitter.cpp @@ -6,6 +6,7 @@ #include "common/assert.h" #include "frontend/A32/ir_emitter.h" +#include "frontend/A32/types.h" #include "frontend/ir/opcodes.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/ir_emitter.h b/src/frontend/A32/ir_emitter.h index 8798eea4..4c89c009 100644 --- a/src/frontend/A32/ir_emitter.h +++ b/src/frontend/A32/ir_emitter.h @@ -6,19 +6,17 @@ #pragma once -#include - -#include - #include "common/common_types.h" #include "frontend/A32/location_descriptor.h" -#include "frontend/A32/types.h" #include "frontend/ir/ir_emitter.h" #include "frontend/ir/value.h" namespace Dynarmic::A32 { +enum class CoprocReg; enum class Exception; +enum class ExtReg; +enum class Reg; /** * Convenience class to construct a basic block of the intermediate representation. @@ -36,8 +34,8 @@ public: IR::U32 GetRegister(Reg source_reg); IR::U32U64 GetExtendedRegister(ExtReg source_reg); - void SetRegister(const Reg dest_reg, const IR::U32& value); - void SetExtendedRegister(const ExtReg dest_reg, const IR::U32U64& value); + void SetRegister(Reg dest_reg, const IR::U32& value); + void SetExtendedRegister(ExtReg dest_reg, const IR::U32U64& value); void ALUWritePC(const IR::U32& value); void BranchWritePC(const IR::U32& value); diff --git a/src/frontend/A32/translate/impl/translate_arm.h b/src/frontend/A32/translate/impl/translate_arm.h index 8619fb5d..53427173 100644 --- a/src/frontend/A32/translate/impl/translate_arm.h +++ b/src/frontend/A32/translate/impl/translate_arm.h @@ -11,6 +11,7 @@ #include "frontend/A32/ir_emitter.h" #include "frontend/A32/location_descriptor.h" #include "frontend/A32/translate/translate.h" +#include "frontend/A32/types.h" namespace Dynarmic::A32 { diff --git a/src/frontend/A32/translate/impl/translate_thumb.h b/src/frontend/A32/translate/impl/translate_thumb.h index 0cb873c5..e89123f6 100644 --- a/src/frontend/A32/translate/impl/translate_thumb.h +++ b/src/frontend/A32/translate/impl/translate_thumb.h @@ -11,6 +11,7 @@ #include "frontend/A32/ir_emitter.h" #include "frontend/A32/location_descriptor.h" #include "frontend/A32/translate/translate.h" +#include "frontend/A32/types.h" namespace Dynarmic::A32 {