Xargon/Duckstation
1
0
Fork 0
mirror of https://github.com/RetroDECK/Duckstation.git synced 2024-12-02 10:35:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CPU/AArch64: Use scratch register for unfitting intermediate values

Browse source 
Should fix crashes with icache emulation enabled.
This commit is contained in:
Connor McLaughlin 2020-12-13 00:36:07 +10:00
parent abb0a1987d
commit 7e5410fc44
1 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/core/cpu_recompiler_code_generator_aarch64.cpp
View file

@ -428,7 +428,8 @@ void CodeGenerator::EmitAdd(HostReg to_reg, HostReg from_reg, const Value& value
} }
// need a temporary // need a temporary
Value temp_value = m_register_cache.AllocateScratch(value.size); Assert(from_reg != RSCRATCH);
Value temp_value(Value::FromHostReg(&m_register_cache, RSCRATCH, value.size));
if (value.size < RegSize_64) if (value.size < RegSize_64)
m_emit->Mov(GetHostReg32(temp_value.host_reg), constant_value); m_emit->Mov(GetHostReg32(temp_value.host_reg), constant_value);
else else
@ -484,7 +485,8 @@ void CodeGenerator::EmitSub(HostReg to_reg, HostReg from_reg, const Value& value
} }
// need a temporary // need a temporary
Value temp_value = m_register_cache.AllocateScratch(value.size); Assert(from_reg != RSCRATCH);
Value temp_value(Value::FromHostReg(&m_register_cache, RSCRATCH, value.size));
if (value.size < RegSize_64) if (value.size < RegSize_64)
m_emit->Mov(GetHostReg32(temp_value.host_reg), constant_value); m_emit->Mov(GetHostReg32(temp_value.host_reg), constant_value);
else else
@ -535,7 +537,8 @@ void CodeGenerator::EmitCmp(HostReg to_reg, const Value& value)
} }
// need a temporary // need a temporary
Value temp_value = m_register_cache.AllocateScratch(value.size); Assert(to_reg != RSCRATCH);
Value temp_value(Value::FromHostReg(&m_register_cache, RSCRATCH, value.size));
if (value.size < RegSize_64) if (value.size < RegSize_64)
m_emit->Mov(GetHostReg32(temp_value.host_reg), constant_value); m_emit->Mov(GetHostReg32(temp_value.host_reg), constant_value);
else else
@ -577,9 +580,14 @@ void CodeGenerator::EmitDiv(HostReg to_reg_quotient, HostReg to_reg_remainder, H
Value quotient_value; Value quotient_value;
if (to_reg_quotient == HostReg_Count) if (to_reg_quotient == HostReg_Count)
quotient_value = m_register_cache.AllocateScratch(size); {
Assert(to_reg_quotient != RSCRATCH);
quotient_value = Value::FromHostReg(&m_register_cache, RSCRATCH, size);
}
else else
{
quotient_value.SetHostReg(&m_register_cache, to_reg_quotient, size); quotient_value.SetHostReg(&m_register_cache, to_reg_quotient, size);
}
if (signed_divide) if (signed_divide)
{ {
@ -775,7 +783,8 @@ void CodeGenerator::EmitAnd(HostReg to_reg, HostReg from_reg, const Value& value
} }
// need a temporary // need a temporary
Value temp_value = m_register_cache.AllocateScratch(value.size); Assert(from_reg != RSCRATCH);
Value temp_value(Value::FromHostReg(&m_register_cache, RSCRATCH, value.size));
if (value.size < RegSize_64) if (value.size < RegSize_64)
m_emit->Mov(GetHostReg32(temp_value.host_reg), s64(value.constant_value)); m_emit->Mov(GetHostReg32(temp_value.host_reg), s64(value.constant_value));
else else
@ -810,7 +819,8 @@ void CodeGenerator::EmitOr(HostReg to_reg, HostReg from_reg, const Value& value)
} }
// need a temporary // need a temporary
Value temp_value = m_register_cache.AllocateScratch(value.size); Assert(from_reg != RSCRATCH);
Value temp_value(Value::FromHostReg(&m_register_cache, RSCRATCH, value.size));
if (value.size < RegSize_64) if (value.size < RegSize_64)
m_emit->Mov(GetHostReg32(temp_value.host_reg), s64(value.constant_value)); m_emit->Mov(GetHostReg32(temp_value.host_reg), s64(value.constant_value));
else else
@ -845,7 +855,8 @@ void CodeGenerator::EmitXor(HostReg to_reg, HostReg from_reg, const Value& value
} }
// need a temporary // need a temporary
Value temp_value = m_register_cache.AllocateScratch(value.size); Assert(from_reg != RSCRATCH);
Value temp_value(Value::FromHostReg(&m_register_cache, RSCRATCH, value.size));
if (value.size < RegSize_64) if (value.size < RegSize_64)
m_emit->Mov(GetHostReg32(temp_value.host_reg), s64(value.constant_value)); m_emit->Mov(GetHostReg32(temp_value.host_reg), s64(value.constant_value));
else else
@ -880,7 +891,8 @@ void CodeGenerator::EmitTest(HostReg to_reg, const Value& value)
} }
// need a temporary // need a temporary
Value temp_value = m_register_cache.AllocateScratch(value.size); Assert(to_reg != RSCRATCH);
Value temp_value(Value::FromHostReg(&m_register_cache, RSCRATCH, value.size));
if (value.size < RegSize_64) if (value.size < RegSize_64)
m_emit->Mov(GetHostReg32(temp_value.host_reg), s64(value.constant_value)); m_emit->Mov(GetHostReg32(temp_value.host_reg), s64(value.constant_value));
else else
@ -1855,9 +1867,8 @@ void CodeGenerator::EmitBranch(const void* address, bool allow_scratch)
Assert(allow_scratch); Assert(allow_scratch);
Value temp = m_register_cache.AllocateScratch(RegSize_64); m_emit->Mov(GetHostReg64(RSCRATCH), reinterpret_cast<uintptr_t>(address));
m_emit->Mov(GetHostReg64(temp), reinterpret_cast<uintptr_t>(address)); m_emit->br(GetHostReg64(RSCRATCH));
m_emit->br(GetHostReg64(temp));
} }
void CodeGenerator::EmitBranch(LabelType* label) void CodeGenerator::EmitBranch(LabelType* label)