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

Merge pull request #628 from radioactiveman/master 

Fix a few compiler warnings
This commit is contained in:
zeromus 2023-01-30 16:53:26 -06:00 committed by GitHub
parent c9a4d9c4b8 ef3f285f95
commit 5bcfd2f022
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
desmume/src/arm_instructions.cpp
View File

@ -2419,7 +2419,7 @@ TEMPLATE static u32 FASTCALL OP_UMLAL_S(const u32 i)
cpu->R[REG_POS(i,12)] += tmp;
cpu->CPSR.bits.N = BIT31(cpu->R[REG_POS(i,16)]);
cpu->CPSR.bits.Z = (cpu->R[REG_POS(i,16)]==0) & (cpu->R[REG_POS(i,12)]==0);
cpu->CPSR.bits.Z = (cpu->R[REG_POS(i,16)]==0) && (cpu->R[REG_POS(i,12)]==0);
MUL_UMxxL_END(3);
}
@ -2479,7 +2479,7 @@ TEMPLATE static u32 FASTCALL OP_SMULL_S(const u32 i)
cpu->R[REG_POS(i,16)] = (u32)(res>>32);
cpu->CPSR.bits.N = BIT31(cpu->R[REG_POS(i,16)]);
cpu->CPSR.bits.Z = (cpu->R[REG_POS(i,16)]==0) & (cpu->R[REG_POS(i,12)]==0);
cpu->CPSR.bits.Z = (cpu->R[REG_POS(i,16)]==0) && (cpu->R[REG_POS(i,12)]==0);
MUL_SMxxL_END(2);
}
@ -2494,7 +2494,7 @@ TEMPLATE static u32 FASTCALL OP_SMLAL_S(const u32 i)
cpu->R[REG_POS(i,12)] += tmp;
cpu->CPSR.bits.N = BIT31(cpu->R[REG_POS(i,16)]);
cpu->CPSR.bits.Z = (cpu->R[REG_POS(i,16)]==0) & (cpu->R[REG_POS(i,12)]==0);
cpu->CPSR.bits.Z = (cpu->R[REG_POS(i,16)]==0) && (cpu->R[REG_POS(i,12)]==0);
MUL_SMxxL_END(3);
}