From fbbfea8e8e536800a6a911eb90cecdd1f343f9e3 Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Fri, 5 Aug 2022 21:10:17 -0700 Subject: Replace Common::BitCast with std::bit_cast --- .../UnitTests/Core/PowerPC/JitArm64/ConvertSingleDouble.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'Source/UnitTests/Core/PowerPC/JitArm64/ConvertSingleDouble.cpp') diff --git a/Source/UnitTests/Core/PowerPC/JitArm64/ConvertSingleDouble.cpp b/Source/UnitTests/Core/PowerPC/JitArm64/ConvertSingleDouble.cpp index 588a1622ef..0c138a957c 100644 --- a/Source/UnitTests/Core/PowerPC/JitArm64/ConvertSingleDouble.cpp +++ b/Source/UnitTests/Core/PowerPC/JitArm64/ConvertSingleDouble.cpp @@ -3,8 +3,9 @@ #include +#include + #include "Common/Arm64Emitter.h" -#include "Common/BitUtils.h" #include "Common/CommonTypes.h" #include "Common/FPURoundMode.h" #include "Common/ScopeGuard.h" @@ -53,13 +54,13 @@ public: gpr.Lock(ARM64Reg::W30); fpr.Lock(ARM64Reg::Q0, ARM64Reg::Q1); - convert_single_to_double_lower = Common::BitCast(GetCodePtr()); + convert_single_to_double_lower = std::bit_cast(GetCodePtr()); m_float_emit.INS(32, ARM64Reg::S0, 0, ARM64Reg::W0); ConvertSingleToDoubleLower(0, ARM64Reg::D0, ARM64Reg::S0, ARM64Reg::Q1); m_float_emit.UMOV(64, ARM64Reg::X0, ARM64Reg::D0, 0); RET(); - convert_single_to_double_pair = Common::BitCast (*)(u32, u32)>(GetCodePtr()); + convert_single_to_double_pair = std::bit_cast (*)(u32, u32)>(GetCodePtr()); m_float_emit.INS(32, ARM64Reg::D0, 0, ARM64Reg::W0); m_float_emit.INS(32, ARM64Reg::D0, 1, ARM64Reg::W1); ConvertSingleToDoublePair(0, ARM64Reg::Q0, ARM64Reg::D0, ARM64Reg::Q1); @@ -67,13 +68,13 @@ public: m_float_emit.UMOV(64, ARM64Reg::X1, ARM64Reg::Q0, 1); RET(); - convert_double_to_single_lower = Common::BitCast(GetCodePtr()); + convert_double_to_single_lower = std::bit_cast(GetCodePtr()); m_float_emit.INS(64, ARM64Reg::D0, 0, ARM64Reg::X0); ConvertDoubleToSingleLower(0, ARM64Reg::S0, ARM64Reg::D0); m_float_emit.UMOV(32, ARM64Reg::W0, ARM64Reg::S0, 0); RET(); - convert_double_to_single_pair = Common::BitCast (*)(u64, u64)>(GetCodePtr()); + convert_double_to_single_pair = std::bit_cast (*)(u64, u64)>(GetCodePtr()); m_float_emit.INS(64, ARM64Reg::Q0, 0, ARM64Reg::X0); m_float_emit.INS(64, ARM64Reg::Q0, 1, ARM64Reg::X1); ConvertDoubleToSinglePair(0, ARM64Reg::D0, ARM64Reg::Q0); -- cgit v1.2.3