diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/arm/nce/interpreter_visitor.cpp | 5 | ||||
| -rw-r--r-- | src/core/arm/nce/patcher.cpp | 5 | ||||
| -rw-r--r-- | src/core/internal_network/network_interface.cpp | 17 |
3 files changed, 16 insertions, 11 deletions
diff --git a/src/core/arm/nce/interpreter_visitor.cpp b/src/core/arm/nce/interpreter_visitor.cpp index bbe0289f8e..aa796ed929 100644 --- a/src/core/arm/nce/interpreter_visitor.cpp +++ b/src/core/arm/nce/interpreter_visitor.cpp @@ -1,8 +1,11 @@ +// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later + // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-FileCopyrightText: Copyright 2023 merryhime <https://mary.rs> // SPDX-License-Identifier: GPL-2.0-or-later -#include "common/bit_cast.h" +#include <numeric> #include "core/arm/nce/interpreter_visitor.h" namespace Core { diff --git a/src/core/arm/nce/patcher.cpp b/src/core/arm/nce/patcher.cpp index 9321258ae9..28862c80b9 100644 --- a/src/core/arm/nce/patcher.cpp +++ b/src/core/arm/nce/patcher.cpp @@ -1,8 +1,9 @@ // SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project // SPDX-License-Identifier: GPL-3.0-or-later +#include <numeric> +#include <bit> #include "common/arm64/native_clock.h" -#include "common/bit_cast.h" #include "common/literals.h" #include "core/arm/nce/arm_nce.h" #include "core/arm/nce/guest_context.h" @@ -435,7 +436,7 @@ void Patcher::WriteMsrHandler(ModuleDestLabel module_dest, oaknut::XReg src_reg) void Patcher::WriteCntpctHandler(ModuleDestLabel module_dest, oaknut::XReg dest_reg) { static Common::Arm64::NativeClock clock{}; const auto factor = clock.GetGuestCNTFRQFactor(); - const auto raw_factor = Common::BitCast<std::array<u64, 2>>(factor); + const auto raw_factor = std::bit_cast<std::array<u64, 2>>(factor); const auto use_x2_x3 = dest_reg.index() == 0 || dest_reg.index() == 1; oaknut::XReg scratch0 = use_x2_x3 ? X2 : X0; diff --git a/src/core/internal_network/network_interface.cpp b/src/core/internal_network/network_interface.cpp index 7be9434afe..8e8f099be8 100644 --- a/src/core/internal_network/network_interface.cpp +++ b/src/core/internal_network/network_interface.cpp @@ -5,11 +5,12 @@ #include <fstream> #include <sstream> #include <vector> +#include <numeric> +#include <ranges> +#include <bit> -#include "common/bit_cast.h" #include "common/common_types.h" #include "common/logging/log.h" -#include <ranges> #include "common/settings.h" #include "common/string_util.h" #include "core/internal_network/emu_net_state.h" @@ -123,8 +124,8 @@ std::vector<Network::NetworkInterface> GetAvailableNetworkInterfaces() { // Just use 0 as the gateway address result.emplace_back(Network::NetworkInterface{ .name{ifa->ifa_name}, - .ip_address{Common::BitCast<struct sockaddr_in>(*ifa->ifa_addr).sin_addr}, - .subnet_mask{Common::BitCast<struct sockaddr_in>(*ifa->ifa_netmask).sin_addr}, + .ip_address{std::bit_cast<struct sockaddr_in>(*ifa->ifa_addr).sin_addr}, + .subnet_mask{std::bit_cast<struct sockaddr_in>(*ifa->ifa_netmask).sin_addr}, .gateway{in_addr{.s_addr = 0}} }); #else @@ -139,8 +140,8 @@ std::vector<Network::NetworkInterface> GetAvailableNetworkInterfaces() { gateway_0.s_addr = gateway; result.emplace_back(Network::NetworkInterface{ .name = ifa->ifa_name, - .ip_address = Common::BitCast<struct sockaddr_in>(*ifa->ifa_addr).sin_addr, - .subnet_mask = Common::BitCast<struct sockaddr_in>(*ifa->ifa_netmask).sin_addr, + .ip_address = std::bit_cast<struct sockaddr_in>(*ifa->ifa_addr).sin_addr, + .subnet_mask = std::bit_cast<struct sockaddr_in>(*ifa->ifa_netmask).sin_addr, .gateway = gateway_0 }); continue; @@ -191,8 +192,8 @@ std::vector<Network::NetworkInterface> GetAvailableNetworkInterfaces() { gateway_0.s_addr = gateway; result.emplace_back(Network::NetworkInterface{ .name = ifa->ifa_name, - .ip_address = Common::BitCast<struct sockaddr_in>(*ifa->ifa_addr).sin_addr, - .subnet_mask = Common::BitCast<struct sockaddr_in>(*ifa->ifa_netmask).sin_addr, + .ip_address = std::bit_cast<struct sockaddr_in>(*ifa->ifa_addr).sin_addr, + .subnet_mask = std::bit_cast<struct sockaddr_in>(*ifa->ifa_netmask).sin_addr, .gateway = gateway_0 }); #endif // ANDROID |