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 #12732 from JosJuice/arm64emitter-assert-category 

Arm64Emitter: Fix incorrect assert category (and a shadowed variable)
This commit is contained in:
Jordan Woyak 2024-04-21 14:40:49 -05:00 committed by GitHub
parent a89336001a de33831783
commit 71de5c58b5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Core/Common/Arm64Emitter.cpp
View File

@ -1809,16 +1809,16 @@ void ARM64XEmitter::ParallelMoves(RegisterMove* begin, RegisterMove* end,
{
bool removed_moves_during_this_loop_iteration = false;
RegisterMove* move = end;
while (move != begin)
RegisterMove* current_move = end;
while (current_move != begin)
{
RegisterMove* prev_move = move;
--move;
if ((*source_gpr_usages)[DecodeReg(move->dst)] == 0)
RegisterMove* prev_move = current_move;
--current_move;
if ((*source_gpr_usages)[DecodeReg(current_move->dst)] == 0)
{
MOV(move->dst, move->src);
(*source_gpr_usages)[DecodeReg(move->src)]--;
std::move(prev_move, end, move);
MOV(current_move->dst, current_move->src);
(*source_gpr_usages)[DecodeReg(current_move->src)]--;
std::move(prev_move, end, current_move);
--end;
removed_moves_during_this_loop_iteration = true;
}
@ -1832,7 +1832,7 @@ void ARM64XEmitter::ParallelMoves(RegisterMove* begin, RegisterMove* end,
while ((*source_gpr_usages)[temp_reg] != 0)
{
++temp_reg;
ASSERT_MSG(COMMON, temp_reg != temp_reg_end, "Out of registers");
ASSERT_MSG(DYNA_REC, temp_reg != temp_reg_end, "Out of registers");
}
const ARM64Reg src = begin->src;