Leverage new bswap functions to the fullest
This commit is contained in:
@@ -10,10 +10,10 @@ namespace Util {
|
||||
template <bool toBE = false>
|
||||
FORCE_INLINE void SwapN64Rom(std::vector<u8> &rom, u32 endianness) {
|
||||
u8 altByteShift = 0;
|
||||
if ((endianness >> 24) != 0x80) {
|
||||
if (endianness >> 24 != 0x80) {
|
||||
if ((endianness & 0xFF) != 0x80) {
|
||||
if (((endianness >> 16) & 0xff) != 0x80) {
|
||||
Util::panic("TODO: Unrecognized rom endianness. Ideally, this should be more robust");
|
||||
if ((endianness >> 16 & 0xff) != 0x80) {
|
||||
panic("TODO: Unrecognized rom endianness. Ideally, this should be more robust");
|
||||
} else {
|
||||
altByteShift = 12;
|
||||
}
|
||||
@@ -28,17 +28,17 @@ FORCE_INLINE void SwapN64Rom(std::vector<u8> &rom, u32 endianness) {
|
||||
|
||||
switch (endianness) {
|
||||
case V64:
|
||||
SwapBuffer16(rom);
|
||||
SwapBuffer<u16>(rom);
|
||||
if constexpr (!toBE)
|
||||
SwapBuffer32(rom);
|
||||
SwapBuffer<u32>(rom);
|
||||
break;
|
||||
case N64:
|
||||
if constexpr (toBE)
|
||||
SwapBuffer32(rom);
|
||||
SwapBuffer<u32>(rom);
|
||||
break;
|
||||
case Z64:
|
||||
if constexpr (!toBE)
|
||||
SwapBuffer32(rom);
|
||||
SwapBuffer<u32>(rom);
|
||||
break;
|
||||
default:
|
||||
panic("Unrecognized rom format! Make sure this is a valid Nintendo 64 ROM dump!");
|
||||
|
||||
Reference in New Issue
Block a user