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

[keel] Make PreloadPtr 64 bit

Browse Source
This commit is contained in:
Gary Talent 2023-04-01 19:51:31 -05:00
parent 2a8f7e074f
commit b56d3692d0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/keel/media.cpp
View File

@ -119,7 +119,7 @@ ox::Result<std::size_t> getPreloadAddr(keel::Context *ctx, ox::CRStringView path
oxRequire(buff, static_cast<ox::MemFS*>(ctx->rom.get())->directAccess(path)); oxRequire(buff, static_cast<ox::MemFS*>(ctx->rom.get())->directAccess(path));
PreloadPtr p; PreloadPtr p;
oxReturnError(ox::readMC(buff, stat.size, &p)); oxReturnError(ox::readMC(buff, stat.size, &p));
return p.preloadAddr + ctx->preloadSectionOffset; return static_cast<std::size_t>(p.preloadAddr) + ctx->preloadSectionOffset;
} }
ox::Result<std::size_t> getPreloadAddr(keel::Context *ctx, const ox::FileAddress &file) noexcept { ox::Result<std::size_t> getPreloadAddr(keel::Context *ctx, const ox::FileAddress &file) noexcept {
@ -127,7 +127,7 @@ ox::Result<std::size_t> getPreloadAddr(keel::Context *ctx, const ox::FileAddress
oxRequire(buff, static_cast<ox::MemFS*>(ctx->rom.get())->directAccess(file)); oxRequire(buff, static_cast<ox::MemFS*>(ctx->rom.get())->directAccess(file));
PreloadPtr p; PreloadPtr p;
oxReturnError(ox::readMC(buff, stat.size, &p)); oxReturnError(ox::readMC(buff, stat.size, &p));
return p.preloadAddr + ctx->preloadSectionOffset; return static_cast<std::size_t>(p.preloadAddr) + ctx->preloadSectionOffset;
} }
} }

8
src/keel/media.hpp
View File

@ -21,8 +21,8 @@ namespace keel {
// data. // data.
struct PreloadPtr { struct PreloadPtr {
static constexpr auto TypeName = "net.drinkingtea.keel.PreloadPtr"; static constexpr auto TypeName = "net.drinkingtea.keel.PreloadPtr";
static constexpr auto TypeVersion = 1; static constexpr auto TypeVersion = 2;
uint32_t preloadAddr = 0; uint64_t preloadAddr = 0;
}; };
oxModelBegin(PreloadPtr) oxModelBegin(PreloadPtr)
@ -97,8 +97,8 @@ ox::Error buildUuidMap(Context *ctx) noexcept;
template<typename T> template<typename T>
ox::Result<keel::AssetRef<T>> readObj( ox::Result<keel::AssetRef<T>> readObj(
[[maybe_unused]] keel::Context *ctx, keel::Context *ctx,
[[maybe_unused]] ox::CRStringView assetId, ox::CRStringView assetId,
[[maybe_unused]] bool forceLoad = false) noexcept { [[maybe_unused]] bool forceLoad = false) noexcept {
#ifndef OX_BARE_METAL #ifndef OX_BARE_METAL
return readObjFile<T>(ctx, assetId, forceLoad); return readObjFile<T>(ctx, assetId, forceLoad);