diff options
| author | Lioncash <mathew1800@gmail.com> | 2015-02-13 14:08:21 +0100 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2015-02-13 15:11:12 +0100 |
| commit | a75e1ff6e6b33b3e4751b82e0ab91b8dad169fc6 (patch) | |
| tree | fb2a89cbc953be437c43db3b16654be8f4d7efb8 /src/core/arm/skyeye_common/armdefs.h | |
| parent | Merge pull request #569 from lioncash/modeswitch (diff) | |
| download | yuzu-a75e1ff6e6b33b3e4751b82e0ab91b8dad169fc6.tar yuzu-a75e1ff6e6b33b3e4751b82e0ab91b8dad169fc6.tar.gz yuzu-a75e1ff6e6b33b3e4751b82e0ab91b8dad169fc6.tar.bz2 yuzu-a75e1ff6e6b33b3e4751b82e0ab91b8dad169fc6.tar.lz yuzu-a75e1ff6e6b33b3e4751b82e0ab91b8dad169fc6.tar.xz yuzu-a75e1ff6e6b33b3e4751b82e0ab91b8dad169fc6.tar.zst yuzu-a75e1ff6e6b33b3e4751b82e0ab91b8dad169fc6.zip | |
Diffstat (limited to 'src/core/arm/skyeye_common/armdefs.h')
| -rw-r--r-- | src/core/arm/skyeye_common/armdefs.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/src/core/arm/skyeye_common/armdefs.h b/src/core/arm/skyeye_common/armdefs.h index dc2256a35..070fcf7dc 100644 --- a/src/core/arm/skyeye_common/armdefs.h +++ b/src/core/arm/skyeye_common/armdefs.h @@ -17,19 +17,9 @@ #pragma once -#include <cerrno> -#include <csignal> -#include <cstdio> -#include <cstdlib> -#include <cstring> -#include <fcntl.h> -#include <sys/stat.h> -#include <sys/types.h> - -#include "arm_regformat.h" #include "common/common_types.h" -#include "common/platform.h" #include "core/arm/skyeye_common/armmmu.h" +#include "core/arm/skyeye_common/arm_regformat.h" #include "core/arm/skyeye_common/skyeye_defs.h" #define BITS(s, a, b) ((s << ((sizeof(s) * 8 - 1) - b)) >> (sizeof(s) * 8 - b + a - 1)) @@ -118,9 +108,7 @@ struct ARMul_State // Add armv6 flags dyf:2010-08-09 ARMword GEFlag, EFlag, AFlag, QFlag; -#ifdef MODET ARMword TFlag; // Thumb state -#endif unsigned long long NumInstrs; // The number of instructions executed unsigned NumInstrsToExecute; @@ -218,8 +206,6 @@ So, if lateabtSig=1, then it means Late Abort Model(Base Updated Abort Model) u32 CurrWrite; }; -typedef ARMul_State arm_core_t; - /***************************************************************************\ * Types of ARM we know about * \***************************************************************************/ |