drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 6 Activity

[nostalgia/tools/pack] Add PtrSize to GbaPlatSpec

Browse Source
This commit is contained in:
Gary Talent 2022-12-17 13:41:59 -06:00
parent b506c5defb
commit 0d040ad752
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/nostalgia/tools/pack/pack.cpp
View File

@ -149,11 +149,11 @@ static ox::Error preloadObj(core::TypeStore *ts, ox::FileSystem *romFs, GbaPrelo
oxRequireM(obj, ox::readClaw(ts, buff)); oxRequireM(obj, ox::readClaw(ts, buff));
if (obj.type()->preloadable) { if (obj.type()->preloadable) {
// preload // preload
oxReturnError(pl->startAlloc(ox::sizeOf<GbaPlatSpec>(&obj))); oxRequire(a, pl->startAlloc(ox::sizeOf<GbaPlatSpec>(&obj)));
auto err = ox::preload<GbaPlatSpec, decltype(obj)>(pl, &obj); const auto err = ox::preload<GbaPlatSpec, decltype(obj)>(pl, &obj);
oxReturnError(pl->endAlloc()); oxReturnError(pl->endAlloc());
oxReturnError(err); oxReturnError(err);
const core::PreloadPtr p{.preloadAddr = 0}; const core::PreloadPtr p{.preloadAddr = static_cast<uint32_t>(a)};
oxReturnError(ox::writeMC(&p).moveTo(&buff)); oxReturnError(ox::writeMC(&p).moveTo(&buff));
} else { } else {
// strip the Claw header (it is not needed after preloading) and write back out to dest fs // strip the Claw header (it is not needed after preloading) and write back out to dest fs

1
src/nostalgia/tools/pack/pack.hpp
View File

@ -14,6 +14,7 @@ struct GbaPlatSpec {
using PtrType = uint32_t; using PtrType = uint32_t;
using size_t = uint32_t; using size_t = uint32_t;
static constexpr auto PtrSize = 4;
static constexpr auto PtrAlign = 4; static constexpr auto PtrAlign = 4;
static constexpr PtrType RomStart = 0x08000000; static constexpr PtrType RomStart = 0x08000000;