piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-24 14:49:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12732 from JosJuice/arm64emitter-assert-category

Browse Source 
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
1 changed files with 9 additions and 9 deletions
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; bool removed_moves_during_this_loop_iteration = false;
RegisterMove* move = end; RegisterMove* current_move = end;
while (move != begin) while (current_move != begin)
{ {
RegisterMove* prev_move = move; RegisterMove* prev_move = current_move;
--move; --current_move;
if ((*source_gpr_usages)[DecodeReg(move->dst)] == 0) if ((*source_gpr_usages)[DecodeReg(current_move->dst)] == 0)
{ {
MOV(move->dst, move->src); MOV(current_move->dst, current_move->src);
(*source_gpr_usages)[DecodeReg(move->src)]--; (*source_gpr_usages)[DecodeReg(current_move->src)]--;
std::move(prev_move, end, move); std::move(prev_move, end, current_move);
--end; --end;
removed_moves_during_this_loop_iteration = true; 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) while ((*source_gpr_usages)[temp_reg] != 0)
{ {
++temp_reg; ++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; const ARM64Reg src = begin->src;