From 2ea95f5835956adccaea1e75ae5c553a30c4eee9 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Mon, 13 Nov 2023 18:28:40 +0100 Subject: [PATCH] JitArm64: Use BitSet8 for Arm64GPRCache::FlushCRRegisters There are only 8 CR registers, after all. --- Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.cpp | 6 +++--- Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.cpp index ec9562f46c..fefa08753b 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.cpp +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.cpp @@ -280,7 +280,7 @@ void Arm64GPRCache::FlushRegisters(BitSet32 regs, bool maintain_state, ARM64Reg } } -void Arm64GPRCache::FlushCRRegisters(BitSet32 regs, bool maintain_state, ARM64Reg tmp_reg) +void Arm64GPRCache::FlushCRRegisters(BitSet8 regs, bool maintain_state, ARM64Reg tmp_reg) { for (size_t i = 0; i < GUEST_CR_COUNT; ++i) { @@ -296,8 +296,8 @@ void Arm64GPRCache::FlushCRRegisters(BitSet32 regs, bool maintain_state, ARM64Re void Arm64GPRCache::Flush(FlushMode mode, ARM64Reg tmp_reg) { - FlushRegisters(BitSet32(~0U), mode == FlushMode::MaintainState, tmp_reg); - FlushCRRegisters(BitSet32(~0U), mode == FlushMode::MaintainState, tmp_reg); + FlushRegisters(BitSet32(0xFFFFFFFF), mode == FlushMode::MaintainState, tmp_reg); + FlushCRRegisters(BitSet8(0xFF), mode == FlushMode::MaintainState, tmp_reg); } ARM64Reg Arm64GPRCache::R(const GuestRegInfo& guest_reg) diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.h b/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.h index 01339184ea..fbe1f30134 100644 --- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.h +++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.h @@ -330,7 +330,7 @@ public: FlushRegisters(regs, false, tmp_reg); } - void StoreCRRegisters(BitSet32 regs, Arm64Gen::ARM64Reg tmp_reg = Arm64Gen::ARM64Reg::INVALID_REG) + void StoreCRRegisters(BitSet8 regs, Arm64Gen::ARM64Reg tmp_reg = Arm64Gen::ARM64Reg::INVALID_REG) { FlushCRRegisters(regs, false, tmp_reg); } @@ -365,7 +365,7 @@ private: void BindToRegister(const GuestRegInfo& guest_reg, bool will_read, bool will_write = true); void FlushRegisters(BitSet32 regs, bool maintain_state, Arm64Gen::ARM64Reg tmp_reg); - void FlushCRRegisters(BitSet32 regs, bool maintain_state, Arm64Gen::ARM64Reg tmp_reg); + void FlushCRRegisters(BitSet8 regs, bool maintain_state, Arm64Gen::ARM64Reg tmp_reg); }; class Arm64FPRCache : public Arm64RegCache