From 7139942976fa26900eb7d059e97d4957dff1681c Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Fri, 23 Nov 2018 22:45:13 -0500
Subject: [PATCH] common: Move byte swapping functions to bit_utils.h
These are quite general functions, so they can just be moved into common
instead of recreating a namespace here.
---
src/common/bit_util.h | 23 +++++++++++++++++++
.../skyeye_common/armstate.cpp | 19 ++++++---------
2 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/src/common/bit_util.h b/src/common/bit_util.h
index 31dec21b..4da42e31 100644
--- a/src/common/bit_util.h
+++ b/src/common/bit_util.h
@@ -12,6 +12,7 @@
#include <type_traits>
#include "common/assert.h"
+#include "common/common_types.h"
namespace Dynarmic::Common {
@@ -199,4 +200,26 @@ inline T RotateRight(T value, size_t amount) {
return static_cast<T>((x >> amount) | (x << (BitSize<T>() - amount)));
}
+constexpr u16 Swap16(u16 value) {
+ return static_cast<u16>(u32{value} >> 8 | u32{value} << 8);
+}
+
+constexpr u32 Swap32(u32 value) {
+ return ((value & 0xFF000000U) >> 24) |
+ ((value & 0x00FF0000U) >> 8) |
+ ((value & 0x0000FF00U) << 8) |
+ ((value & 0x000000FFU) << 24);
+}
+
+constexpr u64 Swap64(u64 value) {
+ return ((value & 0xFF00000000000000ULL) >> 56) |
+ ((value & 0x00FF000000000000ULL) >> 40) |
+ ((value & 0x0000FF0000000000ULL) >> 24) |
+ ((value & 0x000000FF00000000ULL) >> 8) |
+ ((value & 0x00000000FF000000ULL) << 8) |
+ ((value & 0x0000000000FF0000ULL) << 24) |
+ ((value & 0x000000000000FF00ULL) << 40) |
+ ((value & 0x00000000000000FFULL) << 56);
+}
+
} // namespace Dynarmic::Common
diff --git a/tests/A32/skyeye_interpreter/skyeye_common/armstate.cpp b/tests/A32/skyeye_interpreter/skyeye_common/armstate.cpp
index 2711892d..f868ea1d 100644
--- a/tests/A32/skyeye_interpreter/skyeye_common/armstate.cpp
+++ b/tests/A32/skyeye_interpreter/skyeye_common/armstate.cpp
@@ -8,15 +8,10 @@
#include <algorithm>
#include "common/assert.h"
+#include "common/bit_util.h"
#include "A32/skyeye_interpreter/skyeye_common/armstate.h"
#include "A32/skyeye_interpreter/skyeye_common/vfp/vfp.h"
-namespace Common {
-inline u16 swap16(u16 data) {return (data >> 8) | (data << 8);}
-inline u32 swap32(u32 data) {return (swap16(data) << 16) | swap16(data >> 16);}
-inline u64 swap64(u64 data) {return ((u64)swap32((u32)data) << 32) | (u64)swap32(data >> 32);}
-}
-
ARMul_State::ARMul_State(PrivilegeMode initial_mode)
{
Reset();
@@ -214,7 +209,7 @@ u16 ARMul_State::ReadMemory16(u32 address) const
u16 data = user_callbacks->MemoryRead16(address);
if (InBigEndianMode())
- data = Common::swap16(data);
+ data = Dynarmic::Common::Swap16(data);
return data;
}
@@ -226,7 +221,7 @@ u32 ARMul_State::ReadMemory32(u32 address) const
u32 data = user_callbacks->MemoryRead32(address);
if (InBigEndianMode())
- data = Common::swap32(data);
+ data = Dynarmic::Common::Swap32(data);
return data;
}
@@ -238,7 +233,7 @@ u64 ARMul_State::ReadMemory64(u32 address) const
u64 data = user_callbacks->MemoryRead64(address);
if (InBigEndianMode())
- data = Common::swap64(data);
+ data = Dynarmic::Common::Swap64(data);
return data;
}
@@ -255,7 +250,7 @@ void ARMul_State::WriteMemory16(u32 address, u16 data)
// CheckMemoryBreakpoint(address, GDBStub::BreakpointType::Write);
if (InBigEndianMode())
- data = Common::swap16(data);
+ data = Dynarmic::Common::Swap16(data);
user_callbacks->MemoryWrite16(address, data);
}
@@ -265,7 +260,7 @@ void ARMul_State::WriteMemory32(u32 address, u32 data)
// CheckMemoryBreakpoint(address, GDBStub::BreakpointType::Write);
if (InBigEndianMode())
- data = Common::swap32(data);
+ data = Dynarmic::Common::Swap32(data);
user_callbacks->MemoryWrite32(address, data);
}
@@ -275,7 +270,7 @@ void ARMul_State::WriteMemory64(u32 address, u64 data)
// CheckMemoryBreakpoint(address, GDBStub::BreakpointType::Write);
if (InBigEndianMode())
- data = Common::swap64(data);
+ data = Dynarmic::Common::Swap64(data);
user_callbacks->MemoryWrite64(address, data);
}