all repos — mgba @ 0fadc1e11d0fa83f4c4fb5b707e9506071404410

mGBA Game Boy Advance Emulator

ARM: Fix some warnings
Vicki Pfau vi@endrift.com
Sat, 28 Jan 2017 11:26:09 -0800
commit

0fadc1e11d0fa83f4c4fb5b707e9506071404410

parent

b17d2d11c304d942ae0efdbd27f0157eb37ce249

2 files changed, 9 insertions(+), 9 deletions(-)

jump to
M src/arm/isa-arm.c → src/arm/isa-arm.c 
@@ -194,7 +194,7 @@ cpsr = ARMPSROrUnsafeN(cpsr, ARM_SIGN(D)); \
 		cpsr = ARMPSROrUnsafeZ(cpsr, !(D)); \
 		cpsr = ARMPSROrUnsafeC(cpsr, ARM_CARRY_FROM(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) \

@@ -207,7 +207,7 @@ cpsr = ARMPSROrUnsafeN(cpsr, ARM_SIGN(D)); \
 		cpsr = ARMPSROrUnsafeZ(cpsr, !(D)); \
 		cpsr = ARMPSROrUnsafeC(cpsr, ARM_BORROW_FROM(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) \

@@ -220,7 +220,7 @@ cpsr = ARMPSROrUnsafeN(cpsr, ARM_SIGN(D)); \
 		cpsr = ARMPSROrUnsafeZ(cpsr, !(D)); \
 		cpsr = ARMPSROrUnsafeC(cpsr, ARM_BORROW_FROM_CARRY(M, N, D, C)); \
 		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) \

@@ -232,15 +232,15 @@ ARMPSR cpsr = 0; \
 		cpsr = ARMPSROrUnsafeN(cpsr, ARM_SIGN(D)); \
 		cpsr = ARMPSROrUnsafeZ(cpsr, !(D)); \
 		cpsr = ARMPSROrUnsafeC(cpsr, cpu->shifterCarryOut); \
-		cpu->cpsr = cpu->cpsr & (0x1FFFFFFF) | cpsr; \
+		cpu->cpsr = (cpu->cpsr & (0x1FFFFFFF)) | cpsr; \
 	}
 
 #define ARM_NEUTRAL_HI_S(DLO, DHI) \
 	{ \
 		ARMPSR cpsr = 0; \
 		cpsr = ARMPSROrUnsafeN(cpsr, ARM_SIGN(DHI)); \
-		cpsr = ARMPSROrUnsafeZ(cpsr, !(DHI) | (DLO)); \
-		cpu->cpsr = cpu->cpsr & (0x3FFFFFFF) | cpsr; \
+		cpsr = ARMPSROrUnsafeZ(cpsr, !((DHI) | (DLO))); \
+		cpu->cpsr = (cpu->cpsr & (0x3FFFFFFF)) | cpsr; \
 	}
 
 #define ADDR_MODE_2_I_TEST (opcode & 0x00000F80)
M src/arm/isa-thumb.c → src/arm/isa-thumb.c 
@@ -18,7 +18,7 @@ cpsr = ARMPSROrUnsafeN(cpsr, ARM_SIGN(D)); \
 		cpsr = ARMPSROrUnsafeZ(cpsr, !(D)); \
 		cpsr = ARMPSROrUnsafeC(cpsr, ARM_CARRY_FROM(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) \

@@ -28,7 +28,7 @@ cpsr = ARMPSROrUnsafeN(cpsr, ARM_SIGN(D)); \
 		cpsr = ARMPSROrUnsafeZ(cpsr, !(D)); \
 		cpsr = ARMPSROrUnsafeC(cpsr, ARM_BORROW_FROM(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) \

@@ -36,7 +36,7 @@ { \
 		ARMPSR cpsr = 0; \
 		cpsr = ARMPSROrUnsafeN(cpsr, ARM_SIGN(D)); \
 		cpsr = ARMPSROrUnsafeZ(cpsr, !(D)); \
-		cpu->cpsr = cpu->cpsr & (0x3FFFFFFF) | cpsr; \
+		cpu->cpsr = (cpu->cpsr & (0x3FFFFFFF)) | cpsr; \
 	}
 
 #define THUMB_ADDITION(D, M, N) \