diff --git a/src/backend/x64/a32_emit_x64.h b/src/backend/x64/a32_emit_x64.h index 51211196..8e157dcd 100644 --- a/src/backend/x64/a32_emit_x64.h +++ b/src/backend/x64/a32_emit_x64.h @@ -34,10 +34,10 @@ public: ~A32EmitX64() override; /** - * Emit host machine code for a basic block with intermediate representation `ir`. - * @note ir is modified. + * Emit host machine code for a basic block with intermediate representation `block`. + * @note block is modified. */ - BlockDescriptor Emit(IR::Block& ir); + BlockDescriptor Emit(IR::Block& block); void ClearCache() override; diff --git a/src/backend/x64/a64_emit_x64.h b/src/backend/x64/a64_emit_x64.h index 53620467..a0f02dac 100644 --- a/src/backend/x64/a64_emit_x64.h +++ b/src/backend/x64/a64_emit_x64.h @@ -37,10 +37,10 @@ public: ~A64EmitX64() override; /** - * Emit host machine code for a basic block with intermediate representation `ir`. - * @note ir is modified. + * Emit host machine code for a basic block with intermediate representation `block`. + * @note block is modified. */ - BlockDescriptor Emit(IR::Block& ir); + BlockDescriptor Emit(IR::Block& block); void ClearCache() override; diff --git a/src/backend/x64/a64_jitstate.h b/src/backend/x64/a64_jitstate.h index 5a5e93fb..b9e909d5 100644 --- a/src/backend/x64/a64_jitstate.h +++ b/src/backend/x64/a64_jitstate.h @@ -76,8 +76,8 @@ struct A64JitState { u32 fpcr = 0; u32 GetFpcr() const; u32 GetFpsr() const; - void SetFpcr(u32 new_fpcr); - void SetFpsr(u32 new_fpcr); + void SetFpcr(u32 value); + void SetFpsr(u32 value); u64 GetUniqueHash() const noexcept; }; diff --git a/src/backend/x64/emit_x64.cpp b/src/backend/x64/emit_x64.cpp index 67de853d..abfff99d 100644 --- a/src/backend/x64/emit_x64.cpp +++ b/src/backend/x64/emit_x64.cpp @@ -315,30 +315,30 @@ void EmitX64::EmitTerminal(IR::Terminal terminal, IR::LocationDescriptor initial }); } -void EmitX64::Patch(const IR::LocationDescriptor& desc, CodePtr bb) { +void EmitX64::Patch(const IR::LocationDescriptor& target_desc, CodePtr target_code_ptr) { const CodePtr save_code_ptr = code.getCurr(); - const PatchInformation& patch_info = patch_information[desc]; + const PatchInformation& patch_info = patch_information[target_desc]; for (CodePtr location : patch_info.jg) { code.SetCodePtr(location); - EmitPatchJg(desc, bb); + EmitPatchJg(target_desc, target_code_ptr); } for (CodePtr location : patch_info.jmp) { code.SetCodePtr(location); - EmitPatchJmp(desc, bb); + EmitPatchJmp(target_desc, target_code_ptr); } for (CodePtr location : patch_info.mov_rcx) { code.SetCodePtr(location); - EmitPatchMovRcx(bb); + EmitPatchMovRcx(target_code_ptr); } code.SetCodePtr(save_code_ptr); } -void EmitX64::Unpatch(const IR::LocationDescriptor& desc) { - Patch(desc, nullptr); +void EmitX64::Unpatch(const IR::LocationDescriptor& target_desc) { + Patch(target_desc, nullptr); } void EmitX64::ClearCache() { diff --git a/src/backend/x64/reg_alloc.h b/src/backend/x64/reg_alloc.h index ffe5264a..982bc7d2 100644 --- a/src/backend/x64/reg_alloc.h +++ b/src/backend/x64/reg_alloc.h @@ -143,7 +143,7 @@ private: void DefineValueImpl(IR::Inst* def_inst, HostLoc host_loc); void DefineValueImpl(IR::Inst* def_inst, const IR::Value& use_inst); - HostLoc LoadImmediate(IR::Value imm, HostLoc reg); + HostLoc LoadImmediate(IR::Value imm, HostLoc host_loc); void Move(HostLoc to, HostLoc from); void CopyToScratch(size_t bit_width, HostLoc to, HostLoc from); void Exchange(HostLoc a, HostLoc b); diff --git a/src/frontend/A32/location_descriptor.cpp b/src/frontend/A32/location_descriptor.cpp index d4dbcbce..08391a27 100644 --- a/src/frontend/A32/location_descriptor.cpp +++ b/src/frontend/A32/location_descriptor.cpp @@ -10,12 +10,12 @@ namespace Dynarmic::A32 { -std::ostream& operator<<(std::ostream& o, const LocationDescriptor& loc) { +std::ostream& operator<<(std::ostream& o, const LocationDescriptor& descriptor) { o << fmt::format("{{{:08x},{},{},{:08x}}}", - loc.PC(), - loc.TFlag() ? "T" : "!T", - loc.EFlag() ? "E" : "!E", - loc.FPSCR().Value()); + descriptor.PC(), + descriptor.TFlag() ? "T" : "!T", + descriptor.EFlag() ? "E" : "!E", + descriptor.FPSCR().Value()); return o; } diff --git a/src/frontend/A64/location_descriptor.cpp b/src/frontend/A64/location_descriptor.cpp index 077537b5..60999fbf 100644 --- a/src/frontend/A64/location_descriptor.cpp +++ b/src/frontend/A64/location_descriptor.cpp @@ -11,8 +11,8 @@ namespace Dynarmic::A64 { -std::ostream& operator<<(std::ostream& o, const LocationDescriptor& loc) { - o << fmt::format("{{{}, {}}}", loc.PC(), loc.FPCR().Value()); +std::ostream& operator<<(std::ostream& o, const LocationDescriptor& descriptor) { + o << fmt::format("{{{}, {}}}", descriptor.PC(), descriptor.FPCR().Value()); return o; } diff --git a/src/frontend/A64/translate/impl/impl.h b/src/frontend/A64/translate/impl/impl.h index 4c12aa21..3798f118 100644 --- a/src/frontend/A64/translate/impl/impl.h +++ b/src/frontend/A64/translate/impl/impl.h @@ -43,7 +43,7 @@ struct TranslatorVisitor final { u64 wmask, tmask; }; - std::optional DecodeBitMasks(bool N, Imm<6> immr, Imm<6> imms, bool immediate); + std::optional DecodeBitMasks(bool immN, Imm<6> imms, Imm<6> immr, bool immediate); u64 AdvSIMDExpandImm(bool op, Imm<4> cmode, Imm<8> imm8); IR::UAny I(size_t bitsize, u64 value);