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

Merge pull request #2910 from Sonicadvance1/aarch64_regcache_fix 

[AArch64] Fix a bug in the register cache.
This commit is contained in:
Markus Wick 2015-08-26 08:31:24 +02:00
parent 43d17cb360 4f5f29a0fb
commit 5716d18d10
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.cpp
View File

@ -281,9 +281,24 @@ ARM64Reg Arm64FPRCache::R(u32 preg, bool only_lower)
switch (reg.GetType()) switch (reg.GetType())
{ {
case REG_REG: // already in a reg case REG_REG: // already in a reg
case REG_LOWER_PAIR:
return reg.GetReg(); return reg.GetReg();
break; break;
case REG_LOWER_PAIR:
{
if (!only_lower)
{
// Load the high 64bits from the file and insert them in to the high 64bits of the host register
ARM64Reg tmp_reg = GetReg();
m_float_emit->LDR(64, INDEX_UNSIGNED, tmp_reg, X29, PPCSTATE_OFF(ps[preg][1]));
m_float_emit->INS(64, reg.GetReg(), 1, tmp_reg, 0);
UnlockRegister(tmp_reg);
// Change it over to a full 128bit register
reg.LoadToReg(reg.GetReg());
}
return reg.GetReg();
}
break;
case REG_NOTLOADED: // Register isn't loaded at /all/ case REG_NOTLOADED: // Register isn't loaded at /all/
{ {
ARM64Reg host_reg = GetReg(); ARM64Reg host_reg = GetReg();