dyncom: Rename armdefs.h to armstate.h

src/citra_qt/debugger/disassembler.cpp

@@ -15,7 +15,6 @@
 #include "common/break_points.h"
 #include "common/symbols.h"
 #include "core/arm/arm_interface.h"
-#include "core/arm/skyeye_common/armdefs.h"
 #include "core/arm/disassembler/arm_disasm.h"
 
 

src/core/CMakeLists.txt

@@ -132,7 +132,7 @@ set(HEADERS
             arm/dyncom/arm_dyncom_run.h
             arm/dyncom/arm_dyncom_thumb.h
             arm/skyeye_common/arm_regformat.h
-            arm/skyeye_common/armdefs.h
+            arm/skyeye_common/armstate.h
             arm/skyeye_common/armmmu.h
             arm/skyeye_common/armsupp.h
             arm/skyeye_common/vfp/asm_vfp.h

src/core/arm/dyncom/arm_dyncom.cpp

@@ -6,7 +6,7 @@
 
 #include "common/make_unique.h"
 
-#include "core/arm/skyeye_common/armdefs.h"
+#include "core/arm/skyeye_common/armstate.h"
 #include "core/arm/skyeye_common/armsupp.h"
 #include "core/arm/skyeye_common/vfp/vfp.h"
 

src/core/arm/dyncom/arm_dyncom.h

@@ -9,8 +9,8 @@
 #include "common/common_types.h"
 
 #include "core/arm/arm_interface.h"
-#include "core/arm/skyeye_common/armdefs.h"
 #include "core/arm/skyeye_common/arm_regformat.h"
+#include "core/arm/skyeye_common/armstate.h"
 
 namespace Core {
 struct ThreadContext;

src/core/arm/dyncom/arm_dyncom_interpreter.cpp

@@ -17,8 +17,8 @@
 #include "core/arm/dyncom/arm_dyncom_interpreter.h"
 #include "core/arm/dyncom/arm_dyncom_thumb.h"
 #include "core/arm/dyncom/arm_dyncom_run.h"
-#include "core/arm/skyeye_common/armdefs.h"
 #include "core/arm/skyeye_common/armmmu.h"
+#include "core/arm/skyeye_common/armstate.h"
 #include "core/arm/skyeye_common/armsupp.h"
 #include "core/arm/skyeye_common/vfp/vfp.h"
 

src/core/arm/dyncom/arm_dyncom_interpreter.h

@@ -4,6 +4,6 @@
 
 #pragma once
 
-#include "core/arm/skyeye_common/armdefs.h"
+struct ARMul_State;
 
 unsigned InterpreterMainLoop(ARMul_State* state);

src/core/arm/dyncom/arm_dyncom_run.cpp

@@ -3,7 +3,7 @@
 // Refer to the license.txt file included.
 
 #include "core/arm/dyncom/arm_dyncom_run.h"
-#include "core/arm/skyeye_common/armdefs.h"
+#include "core/arm/skyeye_common/armstate.h"
 
 void switch_mode(ARMul_State* core, uint32_t mode) {
     if (core->Mode == mode)

src/core/arm/dyncom/arm_dyncom_run.h

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "core/arm/skyeye_common/armdefs.h"
+#include "core/arm/skyeye_common/armstate.h"
 
 void switch_mode(ARMul_State* core, uint32_t mode);
 

src/core/arm/dyncom/arm_dyncom_thumb.h

@@ -26,7 +26,7 @@
 
 #pragma once
 
-#include "core/arm/skyeye_common/armdefs.h"
+#include "common/common_types.h"
 
 enum tdstate {
     t_undefined,    // Undefined Thumb instruction

src/core/arm/skyeye_common/arminit.cpp

@@ -16,7 +16,7 @@
     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
 #include <cstring>
-#include "core/arm/skyeye_common/armdefs.h"
+#include "core/arm/skyeye_common/armstate.h"
 #include "core/arm/skyeye_common/vfp/vfp.h"
 
 /***************************************************************************\

src/core/arm/skyeye_common/armmmu.h

@@ -23,7 +23,7 @@
 #include "common/swap.h"
 
 #include "core/memory.h"
-#include "core/arm/skyeye_common/armdefs.h"
+#include "core/arm/skyeye_common/armstate.h"
 #include "core/arm/skyeye_common/armsupp.h"
 
 // Register numbers in the MMU

src/core/arm/skyeye_common/armdefs.h → src/core/arm/skyeye_common/armstate.h

@@ -253,27 +253,27 @@ enum ConditionCode {
 
 // Flags for use with the APSR.
 enum : u32 {
-	NBIT = (1U << 31U),
-	ZBIT = (1 << 30),
-	CBIT = (1 << 29),
-	VBIT = (1 << 28),
-	QBIT = (1 << 27),
-	JBIT = (1 << 24),
-	EBIT = (1 << 9),
-	ABIT = (1 << 8),
-	IBIT = (1 << 7),
-	FBIT = (1 << 6),
-	TBIT = (1 << 5),
-
-	// Masks for groups of bits in the APSR.
-	MODEBITS = 0x1F,
-	INTBITS = 0x1C0,
+    NBIT = (1U << 31U),
+    ZBIT = (1 << 30),
+    CBIT = (1 << 29),
+    VBIT = (1 << 28),
+    QBIT = (1 << 27),
+    JBIT = (1 << 24),
+    EBIT = (1 << 9),
+    ABIT = (1 << 8),
+    IBIT = (1 << 7),
+    FBIT = (1 << 6),
+    TBIT = (1 << 5),
+
+    // Masks for groups of bits in the APSR.
+    MODEBITS = 0x1F,
+    INTBITS = 0x1C0,
 };
 
 // Values for Emulate.
 enum {
-	STOP       = 0, // Stop
-	CHANGEMODE = 1, // Change mode
-	ONCE       = 2, // Execute just one iteration
-	RUN        = 3  // Continuous execution
+    STOP       = 0, // Stop
+    CHANGEMODE = 1, // Change mode
+    ONCE       = 2, // Execute just one iteration
+    RUN        = 3  // Continuous execution
 };

src/core/arm/skyeye_common/armsupp.cpp

@@ -19,7 +19,7 @@
 
 #include "core/mem_map.h"
 #include "core/arm/skyeye_common/arm_regformat.h"
-#include "core/arm/skyeye_common/armdefs.h"
+#include "core/arm/skyeye_common/armstate.h"
 #include "core/arm/skyeye_common/armsupp.h"
 
 // Unsigned sum of absolute difference

src/core/arm/skyeye_common/vfp/vfp.cpp

@@ -23,7 +23,7 @@
 #include "common/common_funcs.h"
 #include "common/logging/log.h"
 
-#include "core/arm/skyeye_common/armdefs.h"
+#include "core/arm/skyeye_common/armstate.h"
 #include "core/arm/skyeye_common/vfp/asm_vfp.h"
 #include "core/arm/skyeye_common/vfp/vfp.h"
 

src/core/arm/skyeye_common/vfp/vfp_helper.h

@@ -34,7 +34,7 @@
 
 #include <cstdio>
 #include "common/common_types.h"
-#include "core/arm/skyeye_common/armdefs.h"
+#include "core/arm/skyeye_common/armstate.h"
 #include "core/arm/skyeye_common/vfp/asm_vfp.h"
 
 #define do_div(n, base) {n/=base;}

src/core/hle/kernel/thread.cpp

@@ -13,7 +13,7 @@
 #include "common/thread_queue_list.h"
 
 #include "core/arm/arm_interface.h"
-#include "core/arm/skyeye_common/armdefs.h"
+#include "core/arm/skyeye_common/armstate.h"
 #include "core/core.h"
 #include "core/core_timing.h"
 #include "core/hle/hle.h"