From e140491fa9108f3b456bd108a2f5a707458868da Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sun, 21 Apr 2024 16:19:10 +0200 Subject: [PATCH 1/2] Arm64Emitter: Fix incorrect assert category --- Source/Core/Common/Arm64Emitter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Common/Arm64Emitter.cpp b/Source/Core/Common/Arm64Emitter.cpp index f769edc2f3..2bc056f8e3 100644 --- a/Source/Core/Common/Arm64Emitter.cpp +++ b/Source/Core/Common/Arm64Emitter.cpp @@ -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; From de338317834f08590d59df5c27392f109322d29f Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sun, 21 Apr 2024 16:20:59 +0200 Subject: [PATCH 2/2] Arm64Emitter: Fix shadowed variable A lambda at the end of ARM64XEmitter::ParallelMoves named its parameter `move`. --- Source/Core/Common/Arm64Emitter.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Source/Core/Common/Arm64Emitter.cpp b/Source/Core/Common/Arm64Emitter.cpp index 2bc056f8e3..3831bff96f 100644 --- a/Source/Core/Common/Arm64Emitter.cpp +++ b/Source/Core/Common/Arm64Emitter.cpp @@ -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; }