diff options
| author |  bunnei | 2014-11-24 15:31:53 -0500 |
|---|---|---|
| committer | bunnei | 2014-11-24 15:31:53 -0500 |
| commit | bb730855e58d18d8964d158a55822c40503d548f (patch) | |
| tree | 9c3ff113839583d1deca837e9888d81f25d485a0 /src/core/arm | |
| parent | Merge pull request #191 from archshift/deletexyz (diff) | |
| parent | Use pointers instead of passing handles around in some functions. (diff) | |
| download | yuzu-bb730855e58d18d8964d158a55822c40503d548f.tar.gz yuzu-bb730855e58d18d8964d158a55822c40503d548f.tar.xz yuzu-bb730855e58d18d8964d158a55822c40503d548f.zip | |
Merge pull request #147 from yuriks/error-codes
Error codes
Diffstat (limited to 'src/core/arm')
| -rw-r--r-- | src/core/arm/skyeye_common/armdefs.h | 34 | ||||
| -rw-r--r-- | src/core/arm/skyeye_common/armemu.h | 18 |
2 files changed, 18 insertions, 34 deletions
diff --git a/src/core/arm/skyeye_common/armdefs.h b/src/core/arm/skyeye_common/armdefs.h index 8e71948c6..8343aaa01 100644 --- a/src/core/arm/skyeye_common/armdefs.h +++ b/src/core/arm/skyeye_common/armdefs.h | |||
| @@ -799,22 +799,24 @@ pascal void SpinCursor (short increment); /* copied from CursorCtl.h */ | |||
| 799 | #include "list.h" | 799 | #include "list.h" |
| 800 | #include "tb.h" | 800 | #include "tb.h" |
| 801 | */ | 801 | */ |
| 802 | #define EQ 0 | 802 | enum ConditionCode { |
| 803 | #define NE 1 | 803 | EQ = 0, |
| 804 | #define CS 2 | 804 | NE = 1, |
| 805 | #define CC 3 | 805 | CS = 2, |
| 806 | #define MI 4 | 806 | CC = 3, |
| 807 | #define PL 5 | 807 | MI = 4, |
| 808 | #define VS 6 | 808 | PL = 5, |
| 809 | #define VC 7 | 809 | VS = 6, |
| 810 | #define HI 8 | 810 | VC = 7, |
| 811 | #define LS 9 | 811 | HI = 8, |
| 812 | #define GE 10 | 812 | LS = 9, |
| 813 | #define LT 11 | 813 | GE = 10, |
| 814 | #define GT 12 | 814 | LT = 11, |
| 815 | #define LE 13 | 815 | GT = 12, |
| 816 | #define AL 14 | 816 | LE = 13, |
| 817 | #define NV 15 | 817 | AL = 14, |
| 818 | NV = 15, | ||
| 819 | }; | ||
| 818 | 820 | ||
| 819 | #ifndef NFLAG | 821 | #ifndef NFLAG |
| 820 | #define NFLAG state->NFlag | 822 | #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 @@ | |||
| 25 | 25 | ||
| 26 | #define DEBUG(...) DEBUG_LOG(ARM11, __VA_ARGS__) | 26 | #define DEBUG(...) DEBUG_LOG(ARM11, __VA_ARGS__) |
| 27 | 27 | ||
| 28 | /* Condition code values. */ | ||
| 29 | #define EQ 0 | ||
| 30 | #define NE 1 | ||
| 31 | #define CS 2 | ||
| 32 | #define CC 3 | ||
| 33 | #define MI 4 | ||
| 34 | #define PL 5 | ||
| 35 | #define VS 6 | ||
| 36 | #define VC 7 | ||
| 37 | #define HI 8 | ||
| 38 | #define LS 9 | ||
| 39 | #define GE 10 | ||
| 40 | #define LT 11 | ||
| 41 | #define GT 12 | ||
| 42 | #define LE 13 | ||
| 43 | #define AL 14 | ||
| 44 | #define NV 15 | ||
| 45 | |||
| 46 | /* Shift Opcodes. */ | 28 | /* Shift Opcodes. */ |
| 47 | #define LSL 0 | 29 | #define LSL 0 |
| 48 | #define LSR 1 | 30 | #define LSR 1 |