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

ARM: Placate Coverity even more

This commit is contained in:
Vicki Pfau 2025-03-08 02:09:54 -08:00
parent 1bbdbd4482
commit b698d4e317
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -743,11 +743,11 @@ DEFINE_INSTRUCTION_ARM(MRSR, \
cpu->gprs[rd] = cpu->spsr.packed;)
DEFINE_INSTRUCTION_ARM(MSRI,
int c = opcode & 0x00010000;
int f = opcode & 0x00080000;
int rotate = (opcode & 0x00000F00) >> 7;
int32_t operand = ROR(opcode & 0x000000FF, rotate);
int32_t mask = (c ? 0x000000FF : 0) | (f ? 0xFF000000 : 0);
uint32_t c = opcode & 0x00010000;
uint32_t f = opcode & 0x00080000;
uint32_t rotate = (opcode & 0x00000F00) >> 7;
uint32_t operand = ROR(opcode & 0x000000FF, rotate);
uint32_t mask = (c ? 0x000000FF : 0) | (f ? 0xFF000000 : 0);
if (mask & PSR_USER_MASK) {
cpu->cpsr.packed = (cpu->cpsr.packed & ~PSR_USER_MASK) | (operand & PSR_USER_MASK);
}
@ -769,11 +769,11 @@ DEFINE_INSTRUCTION_ARM(MSRI,
})
DEFINE_INSTRUCTION_ARM(MSRRI,
int c = opcode & 0x00010000;
int f = opcode & 0x00080000;
int rotate = (opcode & 0x00000F00) >> 7;
int32_t operand = ROR(opcode & 0x000000FF, rotate);
int32_t mask = (c ? 0x000000FF : 0) | (f ? 0xFF000000 : 0);
uint32_t c = opcode & 0x00010000;
uint32_t f = opcode & 0x00080000;
uint32_t rotate = (opcode & 0x00000F00) >> 7;
uint32_t operand = ROR(opcode & 0x000000FF, rotate);
uint32_t mask = (c ? 0x000000FF : 0) | (f ? 0xFF000000 : 0);
mask &= PSR_USER_MASK | PSR_PRIV_MASK | PSR_STATE_MASK;
cpu->spsr.packed = (cpu->spsr.packed & ~mask) | (operand & mask) | 0x00000010;)