From e9965a63ce6a8df6427052b5464f0525c61b65fc Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sat, 25 Feb 2023 22:25:43 -0600 Subject: [PATCH] [nostalgia/tools/pack] Update for GbaPlatSpec for preloader cleanup --- src/nostalgia/tools/pack/pack.hpp | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/nostalgia/tools/pack/pack.hpp b/src/nostalgia/tools/pack/pack.hpp index 390fa335..dd0031d7 100644 --- a/src/nostalgia/tools/pack/pack.hpp +++ b/src/nostalgia/tools/pack/pack.hpp @@ -15,8 +15,6 @@ struct GbaPlatSpec { using PtrType = uint32_t; using size_t = uint32_t; - static constexpr auto PtrSize = 4; - static constexpr auto PtrAlign = 4; static constexpr PtrType RomStart = 0x08000000; [[nodiscard]] @@ -64,27 +62,16 @@ struct GbaPlatSpec { return 8; } - [[nodiscard]] - static constexpr std::size_t alignOf(auto*) noexcept { - return 4; - } - [[nodiscard]] static constexpr std::size_t alignOf(const auto*) noexcept { return 4; } - [[nodiscard]] - static constexpr std::size_t alignOf(const auto &v) noexcept { - ox::AlignmentCatcher c; - oxAssert(model(c.interface(), &v), "Could not get alignment for type"); - return c.biggestAlignment; - } - [[nodiscard]] static constexpr auto correctEndianness(auto v) noexcept { return ox::toLittleEndian(v); } + }; using GbaPreloader = ox::Preloader;