Skip to content

Match utRelocate's constructor #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mparisi20 merged 1 commit into from
Aug 17, 2026
Merged

Match utRelocate's constructor #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/lib/BrawlHeaders
Open in desktop
Submodule BrawlHeaders updated 2 files
+10 −0 Brawl/Include/ut/ut_relocate.h
+15 −3 std/Include/vector.h
23 changes: 5 additions & 18 deletions src/sora/ut/ut_relocate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,15 @@
#include <types.h>
#include <ut/ut_relocate.h>

// NONMATCHING regswap
utRelocate::utRelocate(u8* fileBuf, u32 fileSz) {
m_dataStart = nullptr;
m_relStart = nullptr;
m_symtabStart = nullptr;
m_importStart = nullptr;
m_strtabStart = nullptr;
std::memcpy(&m_hdr, fileBuf, sizeof(m_hdr));
if (m_hdr.fileSz != fileSz) {
if (m_hdr.fileSz != fileSz)
OSReport("utRelocate: byte-order mismatch! Please check data format\n");
}

u32 fp = sizeof(m_hdr);
if (m_hdr.dataSz) {
Expand All @@ -36,19 +34,10 @@ utRelocate::utRelocate(u8* fileBuf, u32 fileSz) {
fp += m_hdr.nImports * sizeof(m_importStart[0]);
}

if (fp < m_hdr.fileSz) {
if (fp < m_hdr.fileSz)
m_strtabStart = reinterpret_cast<char*>(fileBuf + fp);
}

if (!m_hdr.isAbsolute) {
// Resolve all internal relocations
for (u32 i = 0; i < m_hdr.nRels; i++) {
u8* datap = m_dataStart;
u32 offset = reinterpret_cast<u32>(datap);
*reinterpret_cast<u32*>(&datap[m_relStart[i]]) += offset;
}
reinterpret_cast<DATHeader*>(fileBuf)->isAbsolute = true;
}
relocate(fileBuf);
}

utRelocate::~utRelocate() { }
Expand All @@ -57,9 +46,8 @@ void* utRelocate::getPublicAddress(const char* symName) const {
const DATSymbol* sym;
for (u32 i = 0; i < m_hdr.nSymbols; i++) {
sym = m_symtabStart;
if (!std::strcmp(m_strtabStart + sym[i].name, symName)) {
if (!std::strcmp(m_strtabStart + sym[i].name, symName))
return m_dataStart + sym[i].offset;
}
}
return nullptr;
}
Expand Down Expand Up @@ -94,9 +82,8 @@ void utRelocate::resolveReference(const utRelocate* other) {
const char* importName = getImportName(i, m_hdr.nImports);
if (importName) {
void* addr = reinterpret_cast<void*>(other->getPublicAddress(importName));
if (!addr) {
if (!addr)
OSReport("utRelocate: not found symbol! ->[%s] \n", importName);
}
locateExtern(importName, addr);
}
}
Expand Down
Loading