Skip to content

Commit

Permalink
Refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
@rui314
rui314 committed Jul 18, 2024
1 parent 5b7ae06 commit 14d525c
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 96 deletions.
150 changes: 56 additions & 94 deletions common/integers.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,122 +46,84 @@ typedef int16_t i16;
typedef int32_t i32;
typedef int64_t i64;

template <typename T>
static inline T bswap(T val) {
switch (sizeof(T)) {
case 2: return __builtin_bswap16(val);
case 4: return __builtin_bswap32(val);
case 8: return __builtin_bswap64(val);
default: __builtin_unreachable();
}
}

template <typename T, int SIZE = sizeof(T)>
class LittleEndian {
template <typename T, std::endian endian, int size = sizeof(T)>
class Integer {
public:
LittleEndian() = default;
LittleEndian(T x) { *this = x; }
Integer() = default;
Integer(T x) { *this = x; }

operator T() const {
if constexpr (SIZE == 3) {
return (val[2] << 16) | (val[1] << 8) | val[0];
if (size == 3) {
if (endian == std::endian::little)
return (val[2] << 16) | (val[1] << 8) | val[0];
else
return (val[0] << 16) | (val[1] << 8) | val[2];
} else {
static_assert(sizeof(T) == SIZE);
T x;
memcpy(&x, val, sizeof(T));
if constexpr (std::endian::native == std::endian::big)
memcpy(&x, val, size);
if (endian != std::endian::native)
x = bswap(x);
return x;
}
}

LittleEndian &operator=(T x) {
if constexpr (SIZE == 3) {
val[2] = x >> 16;
val[1] = x >> 8;
val[0] = x;
Integer &operator=(T x) {
if (size == 3) {
if (endian == std::endian::little) {
val[0] = x;
val[1] = x >> 8;
val[2] = x >> 16;
} else {
val[0] = x >> 16;
val[1] = x >> 8;
val[2] = x;
}
} else {
static_assert(sizeof(T) == SIZE);
if constexpr (std::endian::native == std::endian::big)
if (endian != std::endian::native)
x = bswap(x);
memcpy(val, &x, sizeof(T));
memcpy(val, &x, size);
}
return *this;
}

LittleEndian &operator++() { return *this = *this + 1; }
LittleEndian operator++(int) { return ++*this - 1; }
LittleEndian &operator--() { return *this = *this - 1; }
LittleEndian operator--(int) { return --*this + 1; }
LittleEndian &operator+=(T x) { return *this = *this + x; }
LittleEndian &operator-=(T x) { return *this = *this - x; }
LittleEndian &operator&=(T x) { return *this = *this & x; }
LittleEndian &operator|=(T x) { return *this = *this | x; }
Integer &operator++() { return *this = *this + 1; }
Integer operator++(int) { return ++*this - 1; }
Integer &operator--() { return *this = *this - 1; }
Integer operator--(int) { return --*this + 1; }
Integer &operator+=(T x) { return *this = *this + x; }
Integer &operator-=(T x) { return *this = *this - x; }
Integer &operator&=(T x) { return *this = *this & x; }
Integer &operator|=(T x) { return *this = *this | x; }

private:
u8 val[SIZE];
};

template <typename T, int SIZE = sizeof(T)>
class BigEndian {
public:
BigEndian() = default;
BigEndian(T x) { *this = x; }

operator T() const {
if constexpr (SIZE == 3) {
return (val[0] << 16) | (val[1] << 8) | val[2];
} else {
static_assert(sizeof(T) == SIZE);
T x;
memcpy(&x, val, sizeof(T));
if constexpr (std::endian::native == std::endian::little)
x = bswap(x);
return x;
static T bswap(T x) {
switch (size) {
case 2: return __builtin_bswap16(x);
case 4: return __builtin_bswap32(x);
case 8: return __builtin_bswap64(x);
default: __builtin_unreachable();
}
}

BigEndian &operator=(T x) {
if constexpr (SIZE == 3) {
val[0] = x >> 16;
val[1] = x >> 8;
val[2] = x;
} else {
static_assert(sizeof(T) == SIZE);
if constexpr (std::endian::native == std::endian::little)
x = bswap(x);
memcpy(val, &x, sizeof(T));
}
return *this;
}
u8 val[size];
};;

BigEndian &operator++() { return *this = *this + 1; }
BigEndian operator++(int) { return ++*this - 1; }
BigEndian &operator--() { return *this = *this - 1; }
BigEndian operator--(int) { return --*this + 1; }
BigEndian &operator+=(T x) { return *this = *this + x; }
BigEndian &operator-=(T x) { return *this = *this - x; }
BigEndian &operator&=(T x) { return *this = *this & x; }
BigEndian &operator|=(T x) { return *this = *this | x; }
using il16 = Integer<i16, std::endian::little>;
using il32 = Integer<i32, std::endian::little>;
using il64 = Integer<i64, std::endian::little>;

private:
u8 val[SIZE];
};

using il16 = LittleEndian<i16>;
using il32 = LittleEndian<i32>;
using il64 = LittleEndian<i64>;
using ul16 = LittleEndian<u16>;
using ul24 = LittleEndian<u32, 3>;
using ul32 = LittleEndian<u32>;
using ul64 = LittleEndian<u64>;

using ib16 = BigEndian<i16>;
using ib32 = BigEndian<i32>;
using ib64 = BigEndian<i64>;
using ub16 = BigEndian<u16>;
using ub24 = BigEndian<u32, 3>;
using ub32 = BigEndian<u32>;
using ub64 = BigEndian<u64>;
using ul16 = Integer<u16, std::endian::little>;
using ul24 = Integer<u32, std::endian::little, 3>;
using ul32 = Integer<u32, std::endian::little>;
using ul64 = Integer<u64, std::endian::little>;

using ib16 = Integer<i16, std::endian::big>;
using ib32 = Integer<i32, std::endian::big>;
using ib64 = Integer<i64, std::endian::big>;

using ub16 = Integer<u16, std::endian::big>;
using ub24 = Integer<u32, std::endian::big, 3>;
using ub32 = Integer<u32, std::endian::big>;
using ub64 = Integer<u64, std::endian::big>;

} // namespace mold
4 changes: 2 additions & 2 deletions elf/arch-arm32.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ void Thunk<E>::copy_buf(Context<E> &ctx) {
// TLS trampoline code. ARM32's TLSDESC is designed so that this
// common piece of code is factored out from object files to reduce
// output size. Since no one provide, the linker has to synthesize it.
static ul32 hdr[] = {
static const ul32 hdr[] = {
0xe08e'0000, // add r0, lr, r0
0xe590'1004, // ldr r1, [r0, #4]
0xe12f'ff11, // bx r1
Expand All @@ -675,7 +675,7 @@ void Thunk<E>::copy_buf(Context<E> &ctx) {

// This is a range extension and mode switch thunk.
// It has two entry points: +0 for Thumb and +4 for ARM.
const u8 entry[] = {
static const u8 entry[] = {
// .thumb
0x78, 0x47, // bx pc # jumps to 1f
0xc0, 0x46, // nop
Expand Down

0 comments on commit 14d525c

Please sign in to comment.