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

arm64: support for 64b immediate memory reads

This commit is contained in:
Flyinghead 2019-09-27 14:40:47 +02:00
parent ae4f378747
commit 419785b929
1 changed files with 59 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
core/rec-ARM64/rec_arm64.cpp
View File

@ -1885,37 +1885,51 @@ private:
void* ptr = _vmem_write_const(addr, isram, size > 4 ? 4 : size); void* ptr = _vmem_write_const(addr, isram, size > 4 ? 4 : size);
Register reg2; Register reg2;
if (op.rs2.is_imm()) if (size != 8)
{ {
Mov(w0, op.rs2._imm); if (op.rs2.is_imm())
reg2 = w0; {
Mov(w1, op.rs2._imm);
reg2 = w1;
}
else if (regalloc.IsAllocg(op.rs2))
{
reg2 = regalloc.MapRegister(op.rs2);
}
else if (regalloc.IsAllocf(op.rs2))
{
Fmov(w1, regalloc.MapVRegister(op.rs2));
reg2 = w1;
}
else
die("Invalid rs2 param");
} }
else if (regalloc.IsAllocg(op.rs2))
{
reg2 = regalloc.MapRegister(op.rs2);
}
else if (regalloc.IsAllocf(op.rs2))
{
Fmov(w0, regalloc.MapVRegister(op.rs2));
reg2 = w0;
}
else
die("Invalid rs2 param");
if (isram) if (isram)
{ {
Ldr(x1, reinterpret_cast<uintptr_t>(ptr)); Ldr(x0, reinterpret_cast<uintptr_t>(ptr));
switch (size) switch (size)
{ {
case 1: case 1:
Strb(reg2, MemOperand(x1)); Strb(reg2, MemOperand(x0));
break; break;
case 2: case 2:
Strh(reg2, MemOperand(x1)); Strh(reg2, MemOperand(x0));
break; break;
case 4: case 4:
Str(reg2, MemOperand(x1)); Str(reg2, MemOperand(x0));
break;
case 8:
#ifdef EXPLODE_SPANS
verify(op.rs2.count() == 2 && regalloc.IsAllocf(op.rs2, 0) && regalloc.IsAllocf(op.rs2, 1));
Str(regalloc.MapVRegister(op.rs2, 0), MemOperand(x1));
Str(regalloc.MapVRegister(op.rs2, 1), MemOperand(x1, 4));
#else
shil_param_to_host_reg(op.rs2, x1);
Str(x1, MemOperand(x0));
#endif
break; break;
default: default:
@ -1926,26 +1940,40 @@ private:
else else
{ {
// Not RAM // Not RAM
Mov(w1, reg2);
Mov(w0, addr); Mov(w0, addr);
if (size == 8)
switch(size)
{ {
case 1: // Need to call the handler twice
shil_param_to_host_reg(op.rs2, x1);
GenCallRuntime((void (*)())ptr); GenCallRuntime((void (*)())ptr);
break;
case 2: Mov(w0, addr + 4);
shil_param_to_host_reg(op.rs2, x1);
Lsr(x1, x1, 32);
GenCallRuntime((void (*)())ptr); GenCallRuntime((void (*)())ptr);
break; }
else
{
Mov(w1, reg2);
case 4: switch(size)
GenCallRuntime((void (*)())ptr); {
break; case 1:
GenCallRuntime((void (*)())ptr);
break;
case 8: case 2:
die("SZ_64F not supported"); GenCallRuntime((void (*)())ptr);
break; break;
case 4:
GenCallRuntime((void (*)())ptr);
break;
default:
die("Invalid size");
break;
}
} }
} }