diff options
author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2014-10-25 21:52:39 +0200 |
---|---|---|
committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2014-11-24 19:47:01 +0100 |
commit | 924bbde89b80ff2aa8b98fe8f3c7f728ede34edc (patch) | |
tree | 2e0f73a3f084fd74d4fd6220e11d191d48407bb5 | |
parent | Merge pull request #191 from archshift/deletexyz (diff) | |
download | yuzu-924bbde89b80ff2aa8b98fe8f3c7f728ede34edc.tar yuzu-924bbde89b80ff2aa8b98fe8f3c7f728ede34edc.tar.gz yuzu-924bbde89b80ff2aa8b98fe8f3c7f728ede34edc.tar.bz2 yuzu-924bbde89b80ff2aa8b98fe8f3c7f728ede34edc.tar.lz yuzu-924bbde89b80ff2aa8b98fe8f3c7f728ede34edc.tar.xz yuzu-924bbde89b80ff2aa8b98fe8f3c7f728ede34edc.tar.zst yuzu-924bbde89b80ff2aa8b98fe8f3c7f728ede34edc.zip |
-rw-r--r-- | src/core/arm/skyeye_common/armdefs.h | 32 | ||||
-rw-r--r-- | src/core/arm/skyeye_common/armemu.h | 18 |
2 files changed, 16 insertions, 34 deletions
diff --git a/src/core/arm/skyeye_common/armdefs.h b/src/core/arm/skyeye_common/armdefs.h index 8e71948c6..6e8187c8e 100644 --- a/src/core/arm/skyeye_common/armdefs.h +++ b/src/core/arm/skyeye_common/armdefs.h @@ -799,22 +799,22 @@ pascal void SpinCursor (short increment); /* copied from CursorCtl.h */ #include "list.h" #include "tb.h" */ -#define EQ 0 -#define NE 1 -#define CS 2 -#define CC 3 -#define MI 4 -#define PL 5 -#define VS 6 -#define VC 7 -#define HI 8 -#define LS 9 -#define GE 10 -#define LT 11 -#define GT 12 -#define LE 13 -#define AL 14 -#define NV 15 +const int EQ = 0; +const int NE = 1; +const int CS = 2; +const int CC = 3; +const int MI = 4; +const int PL = 5; +const int VS = 6; +const int VC = 7; +const int HI = 8; +const int LS = 9; +const int GE = 10; +const int LT = 11; +const int GT = 12; +const int LE = 13; +const int AL = 14; +const int NV = 15; #ifndef NFLAG #define NFLAG state->NFlag diff --git a/src/core/arm/skyeye_common/armemu.h b/src/core/arm/skyeye_common/armemu.h index c0f0270fe..075fc7e9e 100644 --- a/src/core/arm/skyeye_common/armemu.h +++ b/src/core/arm/skyeye_common/armemu.h @@ -25,24 +25,6 @@ #define DEBUG(...) DEBUG_LOG(ARM11, __VA_ARGS__) -/* Condition code values. */ -#define EQ 0 -#define NE 1 -#define CS 2 -#define CC 3 -#define MI 4 -#define PL 5 -#define VS 6 -#define VC 7 -#define HI 8 -#define LS 9 -#define GE 10 -#define LT 11 -#define GT 12 -#define LE 13 -#define AL 14 -#define NV 15 - /* Shift Opcodes. */ #define LSL 0 #define LSR 1 |