From f7ec6df924a45e466aec7ebc71705e869905a259 Mon Sep 17 00:00:00 2001 From: irisz64 Date: Tue, 22 Jul 2025 16:07:00 +0200 Subject: [PATCH] use a little more c++20/23 features --- src/backend/core/JIT.cpp | 2 +- src/backend/core/Mem.cpp | 36 +++++----- src/backend/core/mmio/PI.cpp | 4 +- src/utils/MemoryHelpers.hpp | 132 ++++++++++++++++++++--------------- src/utils/byteswap.hpp | 8 --- 5 files changed, 97 insertions(+), 85 deletions(-) delete mode 100644 src/utils/byteswap.hpp diff --git a/src/backend/core/JIT.cpp b/src/backend/core/JIT.cpp index 387deef7..1fc5c547 100644 --- a/src/backend/core/JIT.cpp +++ b/src/backend/core/JIT.cpp @@ -118,7 +118,7 @@ int JIT::Step() { if((instrEndsBlock = InstrEndsBlock(instruction))) continue; - /*u32 bswapped = bswap(instruction); + /*u32 bswapped = std::byteswap(instruction); auto count = cs_disasm(disassemblerMips, reinterpret_cast(&bswapped), 4, blockPC, 0, &insn); if (count > 0) { diff --git a/src/backend/core/Mem.cpp b/src/backend/core/Mem.cpp index f27e6f03..2d06c1b1 100644 --- a/src/backend/core/Mem.cpp +++ b/src/backend/core/Mem.cpp @@ -150,7 +150,7 @@ void Mem::LoadROM(const bool isArchive, const std::string &filename) { buf = OpenROM(filename, sizeAdjusted); } - endianness = bswap(*reinterpret_cast(buf.data())); + endianness = std::byteswap(Util::ReadAccess(buf, 0)); Util::SwapN64Rom(buf, endianness); std::ranges::copy(buf, rom.cart.begin()); @@ -159,15 +159,15 @@ void Mem::LoadROM(const bool isArchive, const std::string &filename) { } memcpy(rom.gameNameCart, rom.header.imageName, sizeof(rom.header.imageName)); - rom.header.clockRate = bswap(rom.header.clockRate); - rom.header.programCounter = bswap(rom.header.programCounter); - rom.header.release = bswap(rom.header.release); - rom.header.crc1 = bswap(rom.header.crc1); - rom.header.crc2 = bswap(rom.header.crc2); - rom.header.unknown = bswap(rom.header.unknown); - rom.header.unknown2 = bswap(rom.header.unknown2); - rom.header.manufacturerId = bswap(rom.header.manufacturerId); - rom.header.cartridgeId = bswap(rom.header.cartridgeId); + rom.header.clockRate = std::byteswap(rom.header.clockRate); + rom.header.programCounter = std::byteswap(rom.header.programCounter); + rom.header.release = std::byteswap(rom.header.release); + rom.header.crc1 = std::byteswap(rom.header.crc1); + rom.header.crc2 = std::byteswap(rom.header.crc2); + rom.header.unknown = std::byteswap(rom.header.unknown); + rom.header.unknown2 = std::byteswap(rom.header.unknown2); + rom.header.manufacturerId = std::byteswap(rom.header.manufacturerId); + rom.header.cartridgeId = std::byteswap(rom.header.cartridgeId); rom.code[0] = rom.header.manufacturerId & 0xFF; rom.code[1] = (rom.header.cartridgeId >> 8) & 0xFF; @@ -180,7 +180,7 @@ void Mem::LoadROM(const bool isArchive, const std::string &filename) { const u32 checksum = Util::crc32(0, &rom.cart[0x40], 0x9c0); SetROMCIC(checksum, rom); - endianness = bswap(*reinterpret_cast(rom.cart.data())); + endianness = std::byteswap(Util::ReadAccess(rom.cart, 0)); Util::SwapN64Rom(rom.cart, endianness); rom.pal = IsROMPAL(); } @@ -244,7 +244,7 @@ u16 Mem::Read(Registers ®s, const u32 paddr) { case PIF_ROM_REGION: return Util::ReadAccess(si.pif.bootrom, HALF_ADDRESS(paddr) - PIF_ROM_REGION_START); case PIF_RAM_REGION: - return bswap(Util::ReadAccess(si.pif.ram, paddr - PIF_RAM_REGION_START)); + return std::byteswap(Util::ReadAccess(si.pif.ram, paddr - PIF_RAM_REGION_START)); case 0x00800000 ... 0x03EFFFFF: case 0x04200000 ... 0x042FFFFF: case 0x04900000 ... 0x04FFFFFF: @@ -275,7 +275,7 @@ u32 Mem::Read(Registers ®s, const u32 paddr) { case PIF_ROM_REGION: return Util::ReadAccess(si.pif.bootrom, paddr - PIF_ROM_REGION_START); case PIF_RAM_REGION: - return bswap(Util::ReadAccess(si.pif.ram, paddr - PIF_RAM_REGION_START)); + return std::byteswap(Util::ReadAccess(si.pif.ram, paddr - PIF_RAM_REGION_START)); case 0x00800000 ... 0x03FFFFFF: case 0x04200000 ... 0x042FFFFF: case 0x04900000 ... 0x04FFFFFF: @@ -306,7 +306,7 @@ u64 Mem::Read(Registers ®s, const u32 paddr) { case PIF_ROM_REGION: return Util::ReadAccess(si.pif.bootrom, paddr - PIF_ROM_REGION_START); case PIF_RAM_REGION: - return bswap(Util::ReadAccess(si.pif.ram, paddr - PIF_RAM_REGION_START)); + return std::byteswap(Util::ReadAccess(si.pif.ram, paddr - PIF_RAM_REGION_START)); case 0x00800000 ... 0x03EFFFFF: case 0x04200000 ... 0x042FFFFF: case 0x04900000 ... 0x04FFFFFF: @@ -343,7 +343,7 @@ void Mem::WriteInterpreter(Registers ®s, u32 paddr, u32 val) { case PIF_RAM_REGION: val = val << (8 * (3 - (paddr & 3))); paddr = (paddr - PIF_RAM_REGION_START) & ~3; - Util::WriteAccess(si.pif.ram, paddr, bswap(val)); + Util::WriteAccess(si.pif.ram, paddr, std::byteswap(val)); si.pif.ProcessCommands(*this); break; case 0x00800000 ... 0x03EFFFFF: @@ -398,7 +398,7 @@ void Mem::WriteInterpreter(Registers ®s, u32 paddr, u32 val) { case PIF_RAM_REGION: val = val << (16 * !(paddr & 2)); paddr &= ~3; - Util::WriteAccess(si.pif.ram, paddr - PIF_RAM_REGION_START, bswap(val)); + Util::WriteAccess(si.pif.ram, paddr - PIF_RAM_REGION_START, std::byteswap(val)); si.pif.ProcessCommands(*this); break; case 0x00800000 ... 0x03EFFFFF: @@ -450,7 +450,7 @@ void Mem::WriteInterpreter(Registers ®s, const u32 paddr, const u32 val) mmio.Write(paddr, val); break; case PIF_RAM_REGION: - Util::WriteAccess(si.pif.ram, paddr - PIF_RAM_REGION_START, bswap(val)); + Util::WriteAccess(si.pif.ram, paddr - PIF_RAM_REGION_START, std::byteswap(val)); si.pif.ProcessCommands(*this); break; case 0x00800000 ... 0x03EFFFFF: @@ -511,7 +511,7 @@ void Mem::WriteInterpreter(const Registers ®s, const u32 paddr, u64 val) { case MMIO_REGION: panic("MMIO Write!"); case PIF_RAM_REGION: - Util::WriteAccess(si.pif.ram, paddr - PIF_RAM_REGION_START, bswap(val)); + Util::WriteAccess(si.pif.ram, paddr - PIF_RAM_REGION_START, std::byteswap(val)); si.pif.ProcessCommands(*this); break; case 0x00800000 ... 0x03EFFFFF: diff --git a/src/backend/core/mmio/PI.cpp b/src/backend/core/mmio/PI.cpp index fd65bb4b..2dd4c905 100644 --- a/src/backend/core/mmio/PI.cpp +++ b/src/backend/core/mmio/PI.cpp @@ -253,7 +253,7 @@ auto PI::BusRead(u32 addr) -> u32 { if (index > mem.rom.cart.size() - 3) { // -3 because we're reading an entire word switch (addr) { case REGION_CART_ISVIEWER_BUFFER: - return bswap(Util::ReadAccess(mem.isviewer, addr - SREGION_CART_ISVIEWER_BUFFER)); + return std::byteswap(Util::ReadAccess(mem.isviewer, addr - SREGION_CART_ISVIEWER_BUFFER)); case CART_ISVIEWER_FLUSH: panic("Read from ISViewer flush!"); default: @@ -306,7 +306,7 @@ void PI::BusWrite(u32 addr, u32 val) { case REGION_PI_ROM: switch (addr) { case REGION_CART_ISVIEWER_BUFFER: - Util::WriteAccess(mem.isviewer, addr - SREGION_CART_ISVIEWER_BUFFER, bswap(val)); + Util::WriteAccess(mem.isviewer, addr - SREGION_CART_ISVIEWER_BUFFER, std::byteswap(val)); break; case CART_ISVIEWER_FLUSH: { diff --git a/src/utils/MemoryHelpers.hpp b/src/utils/MemoryHelpers.hpp index 5a8ad0a6..bf118367 100644 --- a/src/utils/MemoryHelpers.hpp +++ b/src/utils/MemoryHelpers.hpp @@ -2,101 +2,121 @@ #include #include #include -#include +#include #include #include +#include namespace Util { -template -static FORCE_INLINE std::vector IntegralToBuffer(const T &val) { +static FORCE_INLINE std::vector IntegralToBuffer(const std::integral auto &val) { std::vector ret{}; - ret.resize(sizeof(T)); + ret.resize(sizeof(val)); - memcpy(ret.data(), &val, sizeof(T)); + memcpy(ret.data(), &val, sizeof(val)); return ret; } +template +static constexpr FORCE_INLINE T ReadAccess(const u8 *data, const u32 index); +template +static constexpr FORCE_INLINE T ReadAccess(const std::vector &data, const u32 index); +template +static constexpr FORCE_INLINE T ReadAccess(const std::array &data, const u32 index); + +template +static constexpr FORCE_INLINE void WriteAccess(u8 *data, const u32 index, const T val); +template +static constexpr FORCE_INLINE void WriteAccess(std::vector &data, const u32 index, const T val); +template +static constexpr FORCE_INLINE void WriteAccess(std::array &data, const u32 index, const T val); + +template <> +constexpr FORCE_INLINE u64 ReadAccess(const u8 *data, const u32 index) { + u32 hi = *reinterpret_cast(&data[index + 0]); + u32 lo = *reinterpret_cast(&data[index + 4]); + const auto& result = static_cast(hi) << 32 | static_cast(lo); + return result; +} + template static constexpr FORCE_INLINE T ReadAccess(const u8 *data, const u32 index) { - if constexpr (sizeof(T) == 8) { - u32 hi = *reinterpret_cast(&data[index + 0]); - u32 lo = *reinterpret_cast(&data[index + 4]); - const T result = static_cast(hi) << 32 | static_cast(lo); - return result; - } else { - return *reinterpret_cast(&data[index]); - } + return *reinterpret_cast(&data[index]); +} + +template <> +constexpr FORCE_INLINE u64 ReadAccess(const std::vector &data, const u32 index) { + u32 hi = *reinterpret_cast(&data[index + 0]); + u32 lo = *reinterpret_cast(&data[index + 4]); + const u64& result = (static_cast(hi) << 32) | static_cast(lo); + return result; } template static constexpr FORCE_INLINE T ReadAccess(const std::vector &data, const u32 index) { - if constexpr (sizeof(T) == 8) { - u32 hi = *reinterpret_cast(&data[index + 0]); - u32 lo = *reinterpret_cast(&data[index + 4]); - const T result = (static_cast(hi) << 32) | static_cast(lo); - return result; - } else { - return *reinterpret_cast(&data[index]); - } + return *reinterpret_cast(&data[index]); +} + +template +constexpr FORCE_INLINE u64 ReadAccess(const std::array &data, const u32 index) { + u32 hi = *reinterpret_cast(&data[index + 0]); + u32 lo = *reinterpret_cast(&data[index + 4]); + const u64& result = static_cast(hi) << 32 | static_cast(lo); + return result; } template static constexpr FORCE_INLINE T ReadAccess(const std::array &data, const u32 index) { - if constexpr (sizeof(T) == 8) { - u32 hi = *reinterpret_cast(&data[index + 0]); - u32 lo = *reinterpret_cast(&data[index + 4]); - const T result = static_cast(hi) << 32 | static_cast(lo); - return result; - } else { - return *reinterpret_cast(&data[index]); - } + return *reinterpret_cast(&data[index]); +} + +template +constexpr FORCE_INLINE void WriteAccess(std::array &data, const u32 index, const u64& val) { + const u32 hi = val >> 32; + const u32 lo = val; + + *reinterpret_cast(&data[index + 0]) = hi; + *reinterpret_cast(&data[index + 4]) = lo; } template static constexpr FORCE_INLINE void WriteAccess(std::array &data, const u32 index, const T val) { - if constexpr (sizeof(T) == 8) { - const u32 hi = val >> 32; - const u32 lo = val; + *reinterpret_cast(&data[index]) = val; +} - *reinterpret_cast(&data[index + 0]) = hi; - *reinterpret_cast(&data[index + 4]) = lo; - } else { - *reinterpret_cast(&data[index]) = val; - } +template <> +constexpr FORCE_INLINE void WriteAccess(std::vector &data, const u32 index, const u64 val) { + const u32 hi = val >> 32; + const u32 lo = val; + + *reinterpret_cast(&data[index + 0]) = hi; + *reinterpret_cast(&data[index + 4]) = lo; } template static constexpr FORCE_INLINE void WriteAccess(std::vector &data, const u32 index, const T val) { - if constexpr (sizeof(T) == 8) { - const u32 hi = val >> 32; - const u32 lo = val; + *reinterpret_cast(&data[index]) = val; +} - *reinterpret_cast(&data[index + 0]) = hi; - *reinterpret_cast(&data[index + 4]) = lo; - } else { - *reinterpret_cast(&data[index]) = val; - } +template <> +constexpr FORCE_INLINE void WriteAccess(u8 *data, const u32 index, const u64 val) { + const u32 hi = val >> 32; + const u32 lo = val; + + *reinterpret_cast(&data[index + 0]) = hi; + *reinterpret_cast(&data[index + 4]) = lo; } template static constexpr FORCE_INLINE void WriteAccess(u8 *data, const u32 index, const T val) { - if constexpr (sizeof(T) == 8) { - const u32 hi = val >> 32; - const u32 lo = val; - - *reinterpret_cast(&data[index + 0]) = hi; - *reinterpret_cast(&data[index + 4]) = lo; - } else { - *reinterpret_cast(&data[index]) = val; - } + *reinterpret_cast(&data[index]) = val; } template static constexpr FORCE_INLINE void SwapBuffer(std::vector &data) { for (size_t i = 0; i < data.size(); i += sizeof(T)) { const T original = *reinterpret_cast(&data[i]); - *reinterpret_cast(&data[i]) = bswap(original); + *reinterpret_cast(&data[i]) = std::byteswap(original); } } @@ -104,7 +124,7 @@ template static constexpr FORCE_INLINE void SwapBuffer(std::array &data) { for (size_t i = 0; i < data.size(); i += sizeof(T)) { const T original = *reinterpret_cast(&data[i]); - *reinterpret_cast(&data[i]) = bswap(original); + *reinterpret_cast(&data[i]) = std::byteswap(original); } } diff --git a/src/utils/byteswap.hpp b/src/utils/byteswap.hpp deleted file mode 100644 index 8117f971..00000000 --- a/src/utils/byteswap.hpp +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once -#include -#include - -template -static constexpr T bswap(const T x) { - return std::byteswap(x); -} \ No newline at end of file