ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARM: Fix some warnings

This commit is contained in:
Vicki Pfau 2017-01-28 11:26:09 -08:00
parent b17d2d11c3
commit 0fadc1e11d
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/arm/isa-arm.c
View File

@ -194,7 +194,7 @@ static inline void _immediate(struct ARMCore* cpu, uint32_t opcode) {
cpsr = ARMPSROrUnsafeZ(cpsr, !(D)); \ cpsr = ARMPSROrUnsafeZ(cpsr, !(D)); \
cpsr = ARMPSROrUnsafeC(cpsr, ARM_CARRY_FROM(M, N, D)); \ cpsr = ARMPSROrUnsafeC(cpsr, ARM_CARRY_FROM(M, N, D)); \
cpsr = ARMPSROrUnsafeV(cpsr, ARM_V_ADDITION(M, N, D)); \ cpsr = ARMPSROrUnsafeV(cpsr, ARM_V_ADDITION(M, N, D)); \
cpu->cpsr = cpu->cpsr & (0x0FFFFFFF) | cpsr; \ cpu->cpsr = (cpu->cpsr & (0x0FFFFFFF)) | cpsr; \
} }
#define ARM_SUBTRACTION_S(M, N, D) \ #define ARM_SUBTRACTION_S(M, N, D) \
@ -207,7 +207,7 @@ static inline void _immediate(struct ARMCore* cpu, uint32_t opcode) {
cpsr = ARMPSROrUnsafeZ(cpsr, !(D)); \ cpsr = ARMPSROrUnsafeZ(cpsr, !(D)); \
cpsr = ARMPSROrUnsafeC(cpsr, ARM_BORROW_FROM(M, N, D)); \ cpsr = ARMPSROrUnsafeC(cpsr, ARM_BORROW_FROM(M, N, D)); \
cpsr = ARMPSROrUnsafeV(cpsr, ARM_V_SUBTRACTION(M, N, D)); \ cpsr = ARMPSROrUnsafeV(cpsr, ARM_V_SUBTRACTION(M, N, D)); \
cpu->cpsr = cpu->cpsr & (0x0FFFFFFF) | cpsr; \ cpu->cpsr = (cpu->cpsr & (0x0FFFFFFF)) | cpsr; \
} }
#define ARM_SUBTRACTION_CARRY_S(M, N, D, C) \ #define ARM_SUBTRACTION_CARRY_S(M, N, D, C) \
@ -220,7 +220,7 @@ static inline void _immediate(struct ARMCore* cpu, uint32_t opcode) {
cpsr = ARMPSROrUnsafeZ(cpsr, !(D)); \ cpsr = ARMPSROrUnsafeZ(cpsr, !(D)); \
cpsr = ARMPSROrUnsafeC(cpsr, ARM_BORROW_FROM_CARRY(M, N, D, C)); \ cpsr = ARMPSROrUnsafeC(cpsr, ARM_BORROW_FROM_CARRY(M, N, D, C)); \
cpsr = ARMPSROrUnsafeV(cpsr, ARM_V_SUBTRACTION(M, N, D)); \ cpsr = ARMPSROrUnsafeV(cpsr, ARM_V_SUBTRACTION(M, N, D)); \
cpu->cpsr = cpu->cpsr & (0x0FFFFFFF) | cpsr; \ cpu->cpsr = (cpu->cpsr & (0x0FFFFFFF)) | cpsr; \
} }
#define ARM_NEUTRAL_S(M, N, D) \ #define ARM_NEUTRAL_S(M, N, D) \
@ -232,15 +232,15 @@ static inline void _immediate(struct ARMCore* cpu, uint32_t opcode) {
cpsr = ARMPSROrUnsafeN(cpsr, ARM_SIGN(D)); \ cpsr = ARMPSROrUnsafeN(cpsr, ARM_SIGN(D)); \
cpsr = ARMPSROrUnsafeZ(cpsr, !(D)); \ cpsr = ARMPSROrUnsafeZ(cpsr, !(D)); \
cpsr = ARMPSROrUnsafeC(cpsr, cpu->shifterCarryOut); \ cpsr = ARMPSROrUnsafeC(cpsr, cpu->shifterCarryOut); \
cpu->cpsr = cpu->cpsr & (0x1FFFFFFF) | cpsr; \ cpu->cpsr = (cpu->cpsr & (0x1FFFFFFF)) | cpsr; \
} }
#define ARM_NEUTRAL_HI_S(DLO, DHI) \ #define ARM_NEUTRAL_HI_S(DLO, DHI) \
{ \ { \
ARMPSR cpsr = 0; \ ARMPSR cpsr = 0; \
cpsr = ARMPSROrUnsafeN(cpsr, ARM_SIGN(DHI)); \ cpsr = ARMPSROrUnsafeN(cpsr, ARM_SIGN(DHI)); \
cpsr = ARMPSROrUnsafeZ(cpsr, !(DHI) | (DLO)); \ cpsr = ARMPSROrUnsafeZ(cpsr, !((DHI) | (DLO))); \
cpu->cpsr = cpu->cpsr & (0x3FFFFFFF) | cpsr; \ cpu->cpsr = (cpu->cpsr & (0x3FFFFFFF)) | cpsr; \
} }
#define ADDR_MODE_2_I_TEST (opcode & 0x00000F80) #define ADDR_MODE_2_I_TEST (opcode & 0x00000F80)

6
src/arm/isa-thumb.c
View File

@ -18,7 +18,7 @@
cpsr = ARMPSROrUnsafeZ(cpsr, !(D)); \ cpsr = ARMPSROrUnsafeZ(cpsr, !(D)); \
cpsr = ARMPSROrUnsafeC(cpsr, ARM_CARRY_FROM(M, N, D)); \ cpsr = ARMPSROrUnsafeC(cpsr, ARM_CARRY_FROM(M, N, D)); \
cpsr = ARMPSROrUnsafeV(cpsr, ARM_V_ADDITION(M, N, D)); \ cpsr = ARMPSROrUnsafeV(cpsr, ARM_V_ADDITION(M, N, D)); \
cpu->cpsr = cpu->cpsr & (0x0FFFFFFF) | cpsr; \ cpu->cpsr = (cpu->cpsr & (0x0FFFFFFF)) | cpsr; \
} }
#define THUMB_SUBTRACTION_S(M, N, D) \ #define THUMB_SUBTRACTION_S(M, N, D) \
@ -28,7 +28,7 @@
cpsr = ARMPSROrUnsafeZ(cpsr, !(D)); \ cpsr = ARMPSROrUnsafeZ(cpsr, !(D)); \
cpsr = ARMPSROrUnsafeC(cpsr, ARM_BORROW_FROM(M, N, D)); \ cpsr = ARMPSROrUnsafeC(cpsr, ARM_BORROW_FROM(M, N, D)); \
cpsr = ARMPSROrUnsafeV(cpsr, ARM_V_SUBTRACTION(M, N, D)); \ cpsr = ARMPSROrUnsafeV(cpsr, ARM_V_SUBTRACTION(M, N, D)); \
cpu->cpsr = cpu->cpsr & (0x0FFFFFFF) | cpsr; \ cpu->cpsr = (cpu->cpsr & (0x0FFFFFFF)) | cpsr; \
} }
#define THUMB_NEUTRAL_S(M, N, D) \ #define THUMB_NEUTRAL_S(M, N, D) \
@ -36,7 +36,7 @@
ARMPSR cpsr = 0; \ ARMPSR cpsr = 0; \
cpsr = ARMPSROrUnsafeN(cpsr, ARM_SIGN(D)); \ cpsr = ARMPSROrUnsafeN(cpsr, ARM_SIGN(D)); \
cpsr = ARMPSROrUnsafeZ(cpsr, !(D)); \ cpsr = ARMPSROrUnsafeZ(cpsr, !(D)); \
cpu->cpsr = cpu->cpsr & (0x3FFFFFFF) | cpsr; \ cpu->cpsr = (cpu->cpsr & (0x3FFFFFFF)) | cpsr; \
} }
#define THUMB_ADDITION(D, M, N) \ #define THUMB_ADDITION(D, M, N) \