From dc97977576797b3453734a1c865da3824ed9c03a Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 11 Apr 2019 18:26:10 -0400 Subject: [PATCH] ir_opt/a32_get_set_elimination_pass: Mark local variables as const where applicable Makes our intended immutable state slightly more explicit. --- src/ir_opt/a32_get_set_elimination_pass.cpp | 35 +++++++++++---------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/src/ir_opt/a32_get_set_elimination_pass.cpp b/src/ir_opt/a32_get_set_elimination_pass.cpp index 2ef8dc6c..8399d403 100644 --- a/src/ir_opt/a32_get_set_elimination_pass.cpp +++ b/src/ir_opt/a32_get_set_elimination_pass.cpp @@ -56,48 +56,49 @@ void A32GetSetElimination(IR::Block& block) { for (auto inst = block.begin(); inst != block.end(); ++inst) { switch (inst->GetOpcode()) { case IR::Opcode::A32SetRegister: { - A32::Reg reg = inst->GetArg(0).GetA32RegRef(); - if (reg == A32::Reg::PC) + const A32::Reg reg = inst->GetArg(0).GetA32RegRef(); + if (reg == A32::Reg::PC) { break; - size_t reg_index = static_cast(reg); + } + const auto reg_index = static_cast(reg); do_set(reg_info[reg_index], inst->GetArg(1), inst); break; } case IR::Opcode::A32GetRegister: { - A32::Reg reg = inst->GetArg(0).GetA32RegRef(); + const A32::Reg reg = inst->GetArg(0).GetA32RegRef(); ASSERT(reg != A32::Reg::PC); - size_t reg_index = static_cast(reg); + const size_t reg_index = static_cast(reg); do_get(reg_info[reg_index], inst); break; } case IR::Opcode::A32SetExtendedRegister32: { - A32::ExtReg reg = inst->GetArg(0).GetA32ExtRegRef(); - size_t reg_index = A32::RegNumber(reg); + const A32::ExtReg reg = inst->GetArg(0).GetA32ExtRegRef(); + const size_t reg_index = A32::RegNumber(reg); do_set(ext_reg_singles_info[reg_index], inst->GetArg(1), inst); - size_t doubles_reg_index = reg_index / 2; + const size_t doubles_reg_index = reg_index / 2; if (doubles_reg_index < ext_reg_doubles_info.size()) { ext_reg_doubles_info[doubles_reg_index] = {}; } break; } case IR::Opcode::A32GetExtendedRegister32: { - A32::ExtReg reg = inst->GetArg(0).GetA32ExtRegRef(); - size_t reg_index = A32::RegNumber(reg); + const A32::ExtReg reg = inst->GetArg(0).GetA32ExtRegRef(); + const size_t reg_index = A32::RegNumber(reg); do_get(ext_reg_singles_info[reg_index], inst); - size_t doubles_reg_index = reg_index / 2; + const size_t doubles_reg_index = reg_index / 2; if (doubles_reg_index < ext_reg_doubles_info.size()) { ext_reg_doubles_info[doubles_reg_index] = {}; } break; } case IR::Opcode::A32SetExtendedRegister64: { - A32::ExtReg reg = inst->GetArg(0).GetA32ExtRegRef(); - size_t reg_index = A32::RegNumber(reg); + const A32::ExtReg reg = inst->GetArg(0).GetA32ExtRegRef(); + const size_t reg_index = A32::RegNumber(reg); do_set(ext_reg_doubles_info[reg_index], inst->GetArg(1), inst); - size_t singles_reg_index = reg_index * 2; + const size_t singles_reg_index = reg_index * 2; if (singles_reg_index < ext_reg_singles_info.size()) { ext_reg_singles_info[singles_reg_index] = {}; ext_reg_singles_info[singles_reg_index+1] = {}; @@ -105,11 +106,11 @@ void A32GetSetElimination(IR::Block& block) { break; } case IR::Opcode::A32GetExtendedRegister64: { - A32::ExtReg reg = inst->GetArg(0).GetA32ExtRegRef(); - size_t reg_index = A32::RegNumber(reg); + const A32::ExtReg reg = inst->GetArg(0).GetA32ExtRegRef(); + const size_t reg_index = A32::RegNumber(reg); do_get(ext_reg_doubles_info[reg_index], inst); - size_t singles_reg_index = reg_index * 2; + const size_t singles_reg_index = reg_index * 2; if (singles_reg_index < ext_reg_singles_info.size()) { ext_reg_singles_info[singles_reg_index] = {}; ext_reg_singles_info[singles_reg_index+1] = {};