diff options
| author | Lioncash <mathew1800@gmail.com> | 2015-01-05 15:10:59 +0100 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2015-01-05 15:13:41 +0100 |
| commit | d00c22c706e76edd1be009faeab69a94cd0d5ef1 (patch) | |
| tree | c7dff0a7f0e7daf0a9d2973d3ab2df128fe06522 /src/core/arm/skyeye_common | |
| parent | Merge pull request #403 from yuriks/shutdown-system (diff) | |
| download | yuzu-d00c22c706e76edd1be009faeab69a94cd0d5ef1.tar yuzu-d00c22c706e76edd1be009faeab69a94cd0d5ef1.tar.gz yuzu-d00c22c706e76edd1be009faeab69a94cd0d5ef1.tar.bz2 yuzu-d00c22c706e76edd1be009faeab69a94cd0d5ef1.tar.lz yuzu-d00c22c706e76edd1be009faeab69a94cd0d5ef1.tar.xz yuzu-d00c22c706e76edd1be009faeab69a94cd0d5ef1.tar.zst yuzu-d00c22c706e76edd1be009faeab69a94cd0d5ef1.zip | |
Diffstat (limited to 'src/core/arm/skyeye_common')
| -rw-r--r-- | src/core/arm/skyeye_common/armdefs.h | 5 | ||||
| -rw-r--r-- | src/core/arm/skyeye_common/armemu.h | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/core/arm/skyeye_common/armdefs.h b/src/core/arm/skyeye_common/armdefs.h index c2c78cd5a..3100d7adc 100644 --- a/src/core/arm/skyeye_common/armdefs.h +++ b/src/core/arm/skyeye_common/armdefs.h @@ -70,6 +70,9 @@ #define DATACACHE 1 #define INSTCACHE 2 +#define POS(i) ( (~(i)) >> 31 ) +#define NEG(i) ( (i) >> 31 ) + #ifndef __STDC__ typedef char *VoidStar; #endif @@ -783,6 +786,8 @@ RUn %x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x,%x\n",\ //#define PXA250 0x69052903 // 0x69052903; //PXA250 B1 from intel 278522-001.pdf +extern bool AddOverflow(ARMword, ARMword, ARMword); +extern bool SubOverflow(ARMword, ARMword, ARMword); extern void ARMul_UndefInstr(ARMul_State*, ARMword); extern void ARMul_FixCPSR(ARMul_State*, ARMword, ARMword); diff --git a/src/core/arm/skyeye_common/armemu.h b/src/core/arm/skyeye_common/armemu.h index e1b286f0f..1dfcc635a 100644 --- a/src/core/arm/skyeye_common/armemu.h +++ b/src/core/arm/skyeye_common/armemu.h @@ -42,9 +42,6 @@ #define R15FBIT (1L << 26) #define R15IFBITS (3L << 26) -#define POS(i) ( (~(i)) >> 31 ) -#define NEG(i) ( (i) >> 31 ) - #ifdef MODET /* Thumb support. */ /* ??? This bit is actually in the low order bit of the PC in the hardware. It isn't clear if the simulator needs to model that or not. */ @@ -561,8 +558,7 @@ tdstate; /* Prototypes for exported functions. */ extern unsigned ARMul_NthReg (ARMword, unsigned); -extern int AddOverflow (ARMword, ARMword, ARMword); -extern int SubOverflow (ARMword, ARMword, ARMword); + /* Prototypes for exported functions. */ #ifdef __cplusplus extern "C" { |