summaryrefslogtreecommitdiffstats
path: root/src/core/arm/dyncom
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2016-09-20 17:21:23 +0200
committerEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2016-09-21 04:15:47 +0200
commitebdae19fd226104baec712b9da9939ff82ef3c3a (patch)
treee046c0f562fc4400480b2e3257f140e973a9ce6a /src/core/arm/dyncom
parentManually tweak source formatting and then re-run clang-format (diff)
downloadyuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar
yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar.gz
yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar.bz2
yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar.lz
yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar.xz
yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar.zst
yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.zip
Diffstat (limited to '')
-rw-r--r--src/core/arm/dyncom/arm_dyncom.cpp11
-rw-r--r--src/core/arm/dyncom/arm_dyncom.h2
-rw-r--r--src/core/arm/dyncom/arm_dyncom_interpreter.cpp7
-rw-r--r--src/core/arm/dyncom/arm_dyncom_trans.cpp4
-rw-r--r--src/core/arm/dyncom/arm_dyncom_trans.h3
5 files changed, 10 insertions, 17 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom.cpp b/src/core/arm/dyncom/arm_dyncom.cpp
index 912560402..bc9ba2941 100644
--- a/src/core/arm/dyncom/arm_dyncom.cpp
+++ b/src/core/arm/dyncom/arm_dyncom.cpp
@@ -2,18 +2,15 @@
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
+#include "core/arm/dyncom/arm_dyncom.h"
#include <cstring>
#include <memory>
-
-#include "core/arm/skyeye_common/armstate.h"
-#include "core/arm/skyeye_common/armsupp.h"
-#include "core/arm/skyeye_common/vfp/vfp.h"
-
-#include "core/arm/dyncom/arm_dyncom.h"
#include "core/arm/dyncom/arm_dyncom_interpreter.h"
#include "core/arm/dyncom/arm_dyncom_run.h"
#include "core/arm/dyncom/arm_dyncom_trans.h"
-
+#include "core/arm/skyeye_common/armstate.h"
+#include "core/arm/skyeye_common/armsupp.h"
+#include "core/arm/skyeye_common/vfp/vfp.h"
#include "core/core.h"
#include "core/core_timing.h"
diff --git a/src/core/arm/dyncom/arm_dyncom.h b/src/core/arm/dyncom/arm_dyncom.h
index 70f71a828..65db1f0f9 100644
--- a/src/core/arm/dyncom/arm_dyncom.h
+++ b/src/core/arm/dyncom/arm_dyncom.h
@@ -5,9 +5,7 @@
#pragma once
#include <memory>
-
#include "common/common_types.h"
-
#include "core/arm/arm_interface.h"
#include "core/arm/skyeye_common/arm_regformat.h"
#include "core/arm/skyeye_common/armstate.h"
diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
index 211d49edb..4f83d8332 100644
--- a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
+++ b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
@@ -4,27 +4,24 @@
#define CITRA_IGNORE_EXIT(x)
+#include "core/arm/dyncom/arm_dyncom_interpreter.h"
#include <algorithm>
#include <cstdio>
-
#include "common/common_types.h"
#include "common/logging/log.h"
#include "common/microprofile.h"
-
#include "core/arm/disassembler/arm_disasm.h"
#include "core/arm/dyncom/arm_dyncom_dec.h"
-#include "core/arm/dyncom/arm_dyncom_interpreter.h"
#include "core/arm/dyncom/arm_dyncom_run.h"
#include "core/arm/dyncom/arm_dyncom_thumb.h"
#include "core/arm/dyncom/arm_dyncom_trans.h"
#include "core/arm/skyeye_common/armstate.h"
#include "core/arm/skyeye_common/armsupp.h"
#include "core/arm/skyeye_common/vfp/vfp.h"
+#include "core/gdbstub/gdbstub.h"
#include "core/hle/svc.h"
#include "core/memory.h"
-#include "core/gdbstub/gdbstub.h"
-
#define RM BITS(sht_oper, 0, 3)
#define RS BITS(sht_oper, 8, 11)
diff --git a/src/core/arm/dyncom/arm_dyncom_trans.cpp b/src/core/arm/dyncom/arm_dyncom_trans.cpp
index 526cf28f3..5f3644c28 100644
--- a/src/core/arm/dyncom/arm_dyncom_trans.cpp
+++ b/src/core/arm/dyncom/arm_dyncom_trans.cpp
@@ -1,10 +1,8 @@
+#include "core/arm/dyncom/arm_dyncom_trans.h"
#include <cstdlib>
-
#include "common/assert.h"
#include "common/common_types.h"
-
#include "core/arm/dyncom/arm_dyncom_interpreter.h"
-#include "core/arm/dyncom/arm_dyncom_trans.h"
#include "core/arm/skyeye_common/armstate.h"
#include "core/arm/skyeye_common/armsupp.h"
#include "core/arm/skyeye_common/vfp/vfp.h"
diff --git a/src/core/arm/dyncom/arm_dyncom_trans.h b/src/core/arm/dyncom/arm_dyncom_trans.h
index 6fdb3d248..b1ec90662 100644
--- a/src/core/arm/dyncom/arm_dyncom_trans.h
+++ b/src/core/arm/dyncom/arm_dyncom_trans.h
@@ -1,3 +1,6 @@
+#include <cstddef>
+#include "common/common_types.h"
+
struct ARMul_State;
typedef unsigned int (*shtop_fp_t)(ARMul_State* cpu, unsigned int sht_oper);