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

arm dynarec: apply mask to mem write8 and write16 value operand 

Compilers do not cast the operand, which results in u8 handlers being
called with an u32 value.
This commit is contained in:
Flyinghead 2024-03-14 13:21:10 +01:00
parent 3ffb09ec72
commit 6115a918b2
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
core/rec-ARM/rec_arm.cpp
View File

@ -1136,7 +1136,11 @@ bool Arm32Assembler::writeMemImmediate(RuntimeBlockInfo* block, shil_opcode* op,
if (optp == SZ_64F)
die("SZ_64F not supported");
Mov(r0, op->rs1._imm);
if (optp == SZ_32F)
if (optp == SZ_8)
Uxtb(r1, rs2);
else if (optp == SZ_16)
Uxth(r1, rs2);
else if (optp == SZ_32F)
Vmov(r1, rs2f);
else if (!rs2.Is(r1))
Mov(r1, rs2);
@ -2472,12 +2476,17 @@ void Arm32Assembler::genMainLoop()
continue;
const void *v;
if (i == 0)
if (i == 0 && s != 3 && s != 4) {
v = fn;
}
else
{
v = GetCursorAddress<const void *>();
Mov(r0, Register(i));
if (s == 3)
Uxtb(r1, r1);
else if (s == 4)
Uxth(r1, r1);
jump(fn);
}