weeemu/weee
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

we load the ELF correctly it seems!

Browse Source
This commit is contained in:
iris
2026-05-11 23:44:19 +02:00
parent 831e03e868
commit 93cab1ee41
11 changed files with 188 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.clang-format
+3 -1
View File
@@ -28,7 +28,9 @@ BreakConstructorInitializers: AfterColon
BreakConstructorInitializersBeforeComma: false BreakConstructorInitializersBeforeComma: false
ColumnLimit: 120 ColumnLimit: 120
ConstructorInitializerAllOnOneLineOrOnePerLine: false ConstructorInitializerAllOnOneLineOrOnePerLine: false
ContinuationIndentWidth: 4 IndentAccessModifiers: false
AccessModifierOffset: 0
ContinuationIndentWidth: 0
IncludeCategories: IncludeCategories:
- Regex: '^<.*' - Regex: '^<.*'
Priority: 1 Priority: 1
.gitignore
+1
View File
@@ -1,2 +1,3 @@
tests/ tests/
build/ build/
.vscode/
CMakeLists.txt
+3 -1
View File
@@ -8,6 +8,7 @@ option(BUILD_SHARED_LIBS OFF)
include_directories(external/ELFIO) include_directories(external/ELFIO)
include_directories(external/capstone/include) include_directories(external/capstone/include)
include_directories(external/cflags/include)
include_directories(external) include_directories(external)
if(WIN32) if(WIN32)
@@ -18,5 +19,6 @@ set(CAPSTONE_ARCHITECTURE_DEFAULT OFF)
set(CAPSTONE_PPC_SUPPORT ON) set(CAPSTONE_PPC_SUPPORT ON)
add_subdirectory(external/capstone) add_subdirectory(external/capstone)
add_executable(weee main.cpp) add_executable(weee main.cpp core/mem.cpp)
target_link_libraries(weee PUBLIC capstone) target_link_libraries(weee PUBLIC capstone)
target_include_directories(weee PUBLIC core)
core/mem.cpp
+34
View File
@@ -0,0 +1,34 @@
#include <cstring>
#include <mem.hpp>
#include <ircolib/log.hpp>
namespace weee::core {
mem::mem() {
mem1.resize(24_mib);
std::fill(mem1.begin(), mem1.end(), 0);
}
void mem::copy(const std::vector<ircolib::u8> &src, const ircolib::u32 offset) {
if (offset + src.size() >= mem1.size())
ircolib::panic("mem::copy outside mem1 range (src @ 0x{:08} for size 0x{:08X})", offset, src.size());
std::println("Copying {} bytes to mem1[{}]", src.size(), offset);
std::copy(src.begin(), src.end(), mem1.begin() + offset);
}
void mem::copy(const ircolib::u8 *src, const ircolib::u32 size, const ircolib::u32 offset) {
if (offset + size >= mem1.size())
ircolib::panic("mem::copy outside mem1 range (src @ 0x{:08} for size 0x{:08X})", offset, size);
std::println("Copying {} bytes to mem1[{}]", size, offset);
memcpy(&mem1[offset], src, size);
}
void mem::set(const ircolib::u8 val, const ircolib::u32 size, const ircolib::u32 offset) {
if (offset + size >= mem1.size())
ircolib::panic("mem::set outside mem1 range (@ 0x{:08} for size 0x{:08X})", offset, size);
std::println("Setting {} bytes to {} from mem1[{}]", size, val, offset);
memset(&mem1[offset], val, size);
}
} // namespace weee::core
core/mem.hpp
+16
View File
@@ -0,0 +1,16 @@
#pragma once
#include <vector>
#include <ircolib/types.hpp>
namespace weee::core {
struct mem {
mem();
void copy(const std::vector<ircolib::u8> &src, const ircolib::u32 offset);
void copy(const ircolib::u8 *src, const ircolib::u32 size, const ircolib::u32 offset);
void set(const ircolib::u8 val, const ircolib::u32 size, const ircolib::u32 offset);
private:
std::vector<ircolib::u8> mem1;
};
} // namespace weee::core
external/ircolib/file.hpp
Vendored
+5 -5
View File
@@ -7,29 +7,29 @@
namespace fs = std::filesystem; namespace fs = std::filesystem;
namespace ircolib { namespace ircolib {
static inline std::vector<u8> ReadFileBinary(const std::string &path) { static inline std::vector<u8> read_file_binary(const std::string &path) {
std::ifstream file(path, std::ios::binary); std::ifstream file(path, std::ios::binary);
return {std::istreambuf_iterator{file}, {}}; return {std::istreambuf_iterator{file}, {}};
} }
static inline void WriteFileBinary(const std::vector<u8> &data, const std::string &path) { static inline void write_file_binary(const std::vector<u8> &data, const std::string &path) {
std::ofstream file(path, std::ios::binary); std::ofstream file(path, std::ios::binary);
std::copy(data.begin(), data.end(), std::ostreambuf_iterator{file}); std::copy(data.begin(), data.end(), std::ostreambuf_iterator{file});
} }
static inline void WriteFileBinary(const u8 *data, const size_t size, const std::string &path) { static inline void write_file_binary(const u8 *data, const size_t size, const std::string &path) {
FILE *out = fopen(path.c_str(), "wb"); FILE *out = fopen(path.c_str(), "wb");
fwrite(data, size, 1, out); fwrite(data, size, 1, out);
fclose(out); fclose(out);
} }
template <size_t Size> template <size_t Size>
static inline void WriteFileBinary(const std::array<u8, Size> &data, const std::string &path) { static inline void write_file_binary(const std::array<u8, Size> &data, const std::string &path) {
std::ofstream file(path, std::ios::binary); std::ofstream file(path, std::ios::binary);
std::copy(data.begin(), data.end(), std::ostreambuf_iterator{file}); std::copy(data.begin(), data.end(), std::ostreambuf_iterator{file});
} }
static inline size_t NextPow2(size_t num) { static inline size_t next_pow2(size_t num) {
// Taken from "Bit Twiddling Hacks" by Sean Anderson: // Taken from "Bit Twiddling Hacks" by Sean Anderson:
// https://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2 // https://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2
--num; --num;
external/ircolib/floats.hpp
Vendored
+12 -12
View File
@@ -1,9 +1,9 @@
#pragma once #pragma once
#include <cmath> #include <cmath>
#include <types.hpp> #include <ircolib/types.hpp>
namespace ircolib { namespace ircolib {
static inline auto roundCeil(float f) { static inline auto round_ceil(float f) {
#ifdef SIMD_SUPPORT #ifdef SIMD_SUPPORT
__m128 t = _mm_set_ss(f); __m128 t = _mm_set_ss(f);
t = _mm_round_ss(t, t, _MM_FROUND_TO_POS_INF); t = _mm_round_ss(t, t, _MM_FROUND_TO_POS_INF);
@@ -13,7 +13,7 @@ static inline auto roundCeil(float f) {
#endif #endif
} }
static inline auto roundCeil(double f) { static inline auto round_ceil(double f) {
#ifdef SIMD_SUPPORT #ifdef SIMD_SUPPORT
__m128d t = _mm_set_sd(f); __m128d t = _mm_set_sd(f);
t = _mm_round_sd(t, t, _MM_FROUND_TO_POS_INF); t = _mm_round_sd(t, t, _MM_FROUND_TO_POS_INF);
@@ -23,7 +23,7 @@ static inline auto roundCeil(double f) {
#endif #endif
} }
static inline auto roundNearest(float f) { static inline auto round_nearest(float f) {
#ifdef SIMD_SUPPORT #ifdef SIMD_SUPPORT
__m128 t = _mm_set_ss(f); __m128 t = _mm_set_ss(f);
t = _mm_round_ss(t, t, _MM_FROUND_TO_NEAREST_INT); t = _mm_round_ss(t, t, _MM_FROUND_TO_NEAREST_INT);
@@ -33,7 +33,7 @@ static inline auto roundNearest(float f) {
#endif #endif
} }
static inline auto roundNearest(double f) { static inline auto round_nearest(double f) {
#ifdef SIMD_SUPPORT #ifdef SIMD_SUPPORT
__m128d t = _mm_set_sd(f); __m128d t = _mm_set_sd(f);
t = _mm_round_sd(t, t, _MM_FROUND_TO_NEAREST_INT); t = _mm_round_sd(t, t, _MM_FROUND_TO_NEAREST_INT);
@@ -43,7 +43,7 @@ static inline auto roundNearest(double f) {
#endif #endif
} }
static inline auto roundCurrent(float f) { static inline auto round_current(float f) {
#ifdef SIMD_SUPPORT #ifdef SIMD_SUPPORT
auto t = _mm_set_ss(f); auto t = _mm_set_ss(f);
t = _mm_round_ss(t, t, _MM_FROUND_CUR_DIRECTION); t = _mm_round_ss(t, t, _MM_FROUND_CUR_DIRECTION);
@@ -53,7 +53,7 @@ static inline auto roundCurrent(float f) {
#endif #endif
} }
static inline auto roundCurrent(double f) { static inline auto round_current(double f) {
#ifdef SIMD_SUPPORT #ifdef SIMD_SUPPORT
auto t = _mm_set_sd(f); auto t = _mm_set_sd(f);
t = _mm_round_sd(t, t, _MM_FROUND_CUR_DIRECTION); t = _mm_round_sd(t, t, _MM_FROUND_CUR_DIRECTION);
@@ -64,7 +64,7 @@ static inline auto roundCurrent(double f) {
} }
static inline auto roundFloor(float f) { static inline auto round_floor(float f) {
#ifdef SIMD_SUPPORT #ifdef SIMD_SUPPORT
__m128 t = _mm_set_ss(f); __m128 t = _mm_set_ss(f);
t = _mm_round_ss(t, t, _MM_FROUND_TO_NEG_INF); t = _mm_round_ss(t, t, _MM_FROUND_TO_NEG_INF);
@@ -74,7 +74,7 @@ static inline auto roundFloor(float f) {
#endif #endif
} }
static inline auto roundFloor(double f) { static inline auto round_floor(double f) {
#ifdef SIMD_SUPPORT #ifdef SIMD_SUPPORT
__m128d t = _mm_set_sd(f); __m128d t = _mm_set_sd(f);
t = _mm_round_sd(t, t, _MM_FROUND_TO_NEG_INF); t = _mm_round_sd(t, t, _MM_FROUND_TO_NEG_INF);
@@ -84,7 +84,7 @@ static inline auto roundFloor(double f) {
#endif #endif
} }
static inline auto roundTrunc(float f) { static inline auto round_trunc(float f) {
#ifdef SIMD_SUPPORT #ifdef SIMD_SUPPORT
__m128 t = _mm_set_ss(f); __m128 t = _mm_set_ss(f);
t = _mm_round_ss(t, t, _MM_FROUND_TO_ZERO); t = _mm_round_ss(t, t, _MM_FROUND_TO_ZERO);
@@ -94,7 +94,7 @@ static inline auto roundTrunc(float f) {
#endif #endif
} }
static inline auto roundTrunc(double f) { static inline auto round_trunc(double f) {
#ifdef SIMD_SUPPORT #ifdef SIMD_SUPPORT
__m128d t = _mm_set_sd(f); __m128d t = _mm_set_sd(f);
t = _mm_round_sd(t, t, _MM_FROUND_TO_ZERO); t = _mm_round_sd(t, t, _MM_FROUND_TO_ZERO);
@@ -103,4 +103,4 @@ static inline auto roundTrunc(double f) {
return trunc(f); return trunc(f);
#endif #endif
} }
} // namespace Util } // namespace ircolib
external/ircolib/log.hpp
Vendored
+10
View File
@@ -0,0 +1,10 @@
#pragma once
#include <print>
namespace ircolib {
template <typename... Args>
void panic(std::format_string<Args...> fmt, Args &&...args) {
std::println(fmt, std::forward<Args>(args)...);
exit(1);
}
} // namespace ircolib
external/ircolib/mem_access.hpp
Vendored
+30 -22
View File
@@ -8,7 +8,7 @@
#include <concepts> #include <concepts>
namespace ircolib { namespace ircolib {
static inline std::vector<u8> IntegralToBuffer(const std::integral auto &val) { static inline std::vector<u8> integral_to_buffer(const std::integral auto &val) {
std::vector<u8> ret{}; std::vector<u8> ret{};
ret.resize(sizeof(val)); ret.resize(sizeof(val));
@@ -17,27 +17,35 @@ static inline std::vector<u8> IntegralToBuffer(const std::integral auto &val) {
return ret; return ret;
} }
static inline constexpr bool IsInsideRange(const std::integral auto &addr, const std::integral auto &start, static inline auto integral_to_slice(const std::integral auto &val) -> std::array<u8, sizeof(val)> {
std::array<u8, sizeof(val)> ret{};
memcpy(ret.data(), &val, sizeof(val));
return ret;
}
static inline constexpr bool is_inside_range(const std::integral auto &addr, const std::integral auto &start,
const std::integral auto &end) { const std::integral auto &end) {
return addr >= start && addr <= end; return addr >= start && addr <= end;
} }
template <typename T> template <typename T>
static constexpr inline T ReadAccess(const u8 *data, const u32 index); static constexpr inline T read_access(const u8 *data, const u32 index);
template <typename T> template <typename T>
static constexpr inline T ReadAccess(const std::vector<u8> &data, const u32 index); static constexpr inline T read_access(const std::vector<u8> &data, const u32 index);
template <typename T, size_t Size> template <typename T, size_t Size>
static constexpr inline T ReadAccess(const std::array<u8, Size> &data, const u32 index); static constexpr inline T read_access(const std::array<u8, Size> &data, const u32 index);
template <typename T> template <typename T>
static constexpr inline void WriteAccess(u8 *data, const u32 index, const T val); static constexpr inline void write_access(u8 *data, const u32 index, const T val);
template <typename T> template <typename T>
static constexpr inline void WriteAccess(std::vector<u8> &data, const u32 index, const T val); static constexpr inline void write_access(std::vector<u8> &data, const u32 index, const T val);
template <typename T, size_t Size> template <typename T, size_t Size>
static constexpr inline void WriteAccess(std::array<u8, Size> &data, const u32 index, const T val); static constexpr inline void write_access(std::array<u8, Size> &data, const u32 index, const T val);
template <> template <>
constexpr inline u64 ReadAccess(const u8 *data, const u32 index) { constexpr inline u64 read_access(const u8 *data, const u32 index) {
u32 hi = *reinterpret_cast<const u32 *>(&data[index + 0]); u32 hi = *reinterpret_cast<const u32 *>(&data[index + 0]);
u32 lo = *reinterpret_cast<const u32 *>(&data[index + 4]); u32 lo = *reinterpret_cast<const u32 *>(&data[index + 4]);
const auto &result = static_cast<u64>(hi) << 32 | static_cast<u64>(lo); const auto &result = static_cast<u64>(hi) << 32 | static_cast<u64>(lo);
@@ -45,36 +53,36 @@ constexpr inline u64 ReadAccess(const u8 *data, const u32 index) {
} }
template <typename T> template <typename T>
static constexpr inline T ReadAccess(const u8 *data, const u32 index) { static constexpr inline T read_access(const u8 *data, const u32 index) {
return *reinterpret_cast<const T *>(&data[index]); return *reinterpret_cast<const T *>(&data[index]);
} }
template <> template <>
constexpr inline u64 ReadAccess(const std::vector<u8> &data, const u32 index) { constexpr inline u64 read_access(const std::vector<u8> &data, const u32 index) {
u32 hi = *reinterpret_cast<const u32 *>(&data[index + 0]); u32 hi = *reinterpret_cast<const u32 *>(&data[index + 0]);
u32 lo = *reinterpret_cast<const u32 *>(&data[index + 4]); u32 lo = *reinterpret_cast<const u32 *>(&data[index + 4]);
return (static_cast<u64>(hi) << 32) | static_cast<u64>(lo); return (static_cast<u64>(hi) << 32) | static_cast<u64>(lo);
} }
template <typename T> template <typename T>
static constexpr inline T ReadAccess(const std::vector<u8> &data, const u32 index) { static constexpr inline T read_access(const std::vector<u8> &data, const u32 index) {
return *reinterpret_cast<const T *>(&data[index]); return *reinterpret_cast<const T *>(&data[index]);
} }
template <size_t Size> template <size_t Size>
constexpr inline u64 ReadAccess(const std::array<u8, Size> &data, const u32 index) { constexpr inline u64 read_access(const std::array<u8, Size> &data, const u32 index) {
u32 hi = *reinterpret_cast<const u32 *>(&data[index + 0]); u32 hi = *reinterpret_cast<const u32 *>(&data[index + 0]);
u32 lo = *reinterpret_cast<const u32 *>(&data[index + 4]); u32 lo = *reinterpret_cast<const u32 *>(&data[index + 4]);
return static_cast<u64>(hi) << 32 | static_cast<u64>(lo); return static_cast<u64>(hi) << 32 | static_cast<u64>(lo);
} }
template <typename T, size_t Size> template <typename T, size_t Size>
static constexpr inline T ReadAccess(const std::array<u8, Size> &data, const u32 index) { static constexpr inline T read_access(const std::array<u8, Size> &data, const u32 index) {
return *reinterpret_cast<const T *>(&data[index]); return *reinterpret_cast<const T *>(&data[index]);
} }
template <size_t Size> template <size_t Size>
constexpr inline void WriteAccess(std::array<u8, Size> &data, const u32 index, const u64 val) { constexpr inline void write_access(std::array<u8, Size> &data, const u32 index, const u64 val) {
const u32 hi = val >> 32; const u32 hi = val >> 32;
const u32 lo = val; const u32 lo = val;
@@ -83,12 +91,12 @@ constexpr inline void WriteAccess(std::array<u8, Size> &data, const u32 index, c
} }
template <typename T, size_t Size> template <typename T, size_t Size>
static constexpr inline void WriteAccess(std::array<u8, Size> &data, const u32 index, const T val) { static constexpr inline void write_access(std::array<u8, Size> &data, const u32 index, const T val) {
*reinterpret_cast<T *>(&data[index]) = val; *reinterpret_cast<T *>(&data[index]) = val;
} }
template <> template <>
constexpr inline void WriteAccess(std::vector<u8> &data, const u32 index, const u64 val) { constexpr inline void write_access(std::vector<u8> &data, const u32 index, const u64 val) {
const u32 hi = val >> 32; const u32 hi = val >> 32;
const u32 lo = val; const u32 lo = val;
@@ -97,12 +105,12 @@ constexpr inline void WriteAccess(std::vector<u8> &data, const u32 index, const
} }
template <typename T> template <typename T>
static constexpr inline void WriteAccess(std::vector<u8> &data, const u32 index, const T val) { static constexpr inline void write_access(std::vector<u8> &data, const u32 index, const T val) {
*reinterpret_cast<T *>(&data[index]) = val; *reinterpret_cast<T *>(&data[index]) = val;
} }
template <> template <>
constexpr inline void WriteAccess(u8 *data, const u32 index, const u64 val) { constexpr inline void write_access(u8 *data, const u32 index, const u64 val) {
const u32 hi = val >> 32; const u32 hi = val >> 32;
const u32 lo = val; const u32 lo = val;
@@ -111,12 +119,12 @@ constexpr inline void WriteAccess(u8 *data, const u32 index, const u64 val) {
} }
template <typename T> template <typename T>
static constexpr inline void WriteAccess(u8 *data, const u32 index, const T val) { static constexpr inline void write_access(u8 *data, const u32 index, const T val) {
*reinterpret_cast<T *>(&data[index]) = val; *reinterpret_cast<T *>(&data[index]) = val;
} }
template <typename T> template <typename T>
static constexpr inline void SwapBuffer(std::vector<u8> &data) { static constexpr inline void swap_buffer(std::vector<u8> &data) {
for (size_t i = 0; i < data.size(); i += sizeof(T)) { for (size_t i = 0; i < data.size(); i += sizeof(T)) {
const T original = *reinterpret_cast<T *>(&data[i]); const T original = *reinterpret_cast<T *>(&data[i]);
*reinterpret_cast<T *>(&data[i]) = std::byteswap(original); *reinterpret_cast<T *>(&data[i]) = std::byteswap(original);
@@ -124,7 +132,7 @@ static constexpr inline void SwapBuffer(std::vector<u8> &data) {
} }
template <typename T, size_t Size> template <typename T, size_t Size>
static constexpr inline void SwapBuffer(std::array<u8, Size> &data) { static constexpr inline void swap_buffer(std::array<u8, Size> &data) {
for (size_t i = 0; i < data.size(); i += sizeof(T)) { for (size_t i = 0; i < data.size(); i += sizeof(T)) {
const T original = *reinterpret_cast<T *>(&data[i]); const T original = *reinterpret_cast<T *>(&data[i]);
*reinterpret_cast<T *>(&data[i]) = std::byteswap(original); *reinterpret_cast<T *>(&data[i]) = std::byteswap(original);
external/ircolib/types.hpp
Vendored
+6 -1
View File
@@ -10,4 +10,9 @@ using s8 = int8_t;
using s16 = int16_t; using s16 = int16_t;
using s32 = int32_t; using s32 = int32_t;
using s64 = int64_t; using s64 = int64_t;
}
} // namespace ircolib
constexpr ircolib::u32 operator""_kib(const unsigned long long v) { return v * 1024; }
constexpr ircolib::u32 operator""_mib(const unsigned long long v) { return v * 1024 * 1024; }
constexpr ircolib::u32 operator""_gib(const unsigned long long v) { return v * 1024 * 1024 * 1024; }
main.cpp
+25 -8
View File
@@ -1,11 +1,19 @@
#include <print> #include <print>
#include <elfio/elfio.hpp> #include <elfio/elfio.hpp>
#include <cflags.hpp>
#include <ircolib/mem_access.hpp> #include <ircolib/mem_access.hpp>
#include "mem.hpp"
int main(int argc, char **argv) { int main(int argc, char **argv) {
ELFIO::elfio reader; ELFIO::elfio reader;
if (!reader.load("tests/application/application.elf"))
return 1; weee::core::mem mem;
cflags::cflags flags;
flags.add_string_callback('\0', "elf", [&](const std::string &v) { reader.load(v); }, "ELF binary to load");
if (!flags.parse(argc, argv))
return -1;
size_t sanity_bss_check_count = 0; size_t sanity_bss_check_count = 0;
@@ -17,12 +25,6 @@ int main(int argc, char **argv) {
if (segment->get_memory_size() == 0) if (segment->get_memory_size() == 0)
continue; continue;
if (segment->get_file_size() == 0) {
sanity_bss_check_count++;
if (sanity_bss_check_count > 1)
std::println("weee does not support multiple .bss segments");
}
const bool exc = segment->get_flags() & ELFIO::PF_X; const bool exc = segment->get_flags() & ELFIO::PF_X;
const bool rd = segment->get_flags() & ELFIO::PF_R; const bool rd = segment->get_flags() & ELFIO::PF_R;
const bool wr = segment->get_flags() & ELFIO::PF_W; const bool wr = segment->get_flags() & ELFIO::PF_W;
@@ -30,6 +32,21 @@ int main(int argc, char **argv) {
std::println("Segment {} {}{}{} @ 0x{:08X} -> 0x{:08X}", segment->get_index(), rd ? 'R' : '_', wr ? 'W' : '_', std::println("Segment {} {}{}{} @ 0x{:08X} -> 0x{:08X}", segment->get_index(), rd ? 'R' : '_', wr ? 'W' : '_',
exc ? 'X' : '_', segment->get_virtual_address(), exc ? 'X' : '_', segment->get_virtual_address(),
segment->get_virtual_address() + segment->get_memory_size() - 1); segment->get_virtual_address() + segment->get_memory_size() - 1);
if (segment->get_file_size() == 0) {
sanity_bss_check_count++;
if (sanity_bss_check_count > 1) {
std::println("weee does not support multiple .bss segments");
return -2;
}
// .bss we zero out
mem.set(0, segment->get_memory_size(), segment->get_virtual_address() & 0x0FFFFFFF);
continue;
}
mem.copy((const ircolib::u8 *)segment->get_data(), segment->get_file_size(),
segment->get_virtual_address() & 0x0FFFFFFF);
} }
return 0; return 0;