Run clang-format
This commit is contained in:
@@ -7,7 +7,6 @@
|
||||
#include "memory.hpp"
|
||||
|
||||
namespace {
|
||||
|
||||
struct LoadInfo {
|
||||
u32 codeSegSizeAligned;
|
||||
u32 rodataSegSizeAligned;
|
||||
@@ -24,8 +23,7 @@ static inline u32 translateAddr(const u32 off, const u32* addrs, const u32* offs
|
||||
}
|
||||
return addrs[2] + off - offsets[2];
|
||||
}
|
||||
|
||||
}
|
||||
} // namespace
|
||||
|
||||
bool Memory::map3DSX(HB3DSX& hb3dsx, const HB3DSX::Header& header) {
|
||||
const LoadInfo hbInfo = {
|
||||
@@ -164,9 +162,7 @@ bool Memory::map3DSX(HB3DSX& hb3dsx, const HB3DSX::Header& header) {
|
||||
case 0: // 32-bit signed offset
|
||||
std::memcpy(§ionData[0], &data, sizeof(u32));
|
||||
break;
|
||||
default:
|
||||
Helpers::panic("Unsupported relative reloc subtype");
|
||||
return false;
|
||||
default: Helpers::panic("Unsupported relative reloc subtype"); return false;
|
||||
}
|
||||
break;
|
||||
}
|
||||
@@ -262,8 +258,7 @@ std::optional<u32> Memory::load3DSX(const std::filesystem::path& path) {
|
||||
}
|
||||
|
||||
if (hbHeader.headerSize == 0x20 || hbHeader.headerSize == 0x2C) {
|
||||
if (hbHeader.headerSize == 0x2C)
|
||||
{
|
||||
if (hbHeader.headerSize == 0x2C) {
|
||||
hb3dsx.file.seek(8, SEEK_CUR); // skip SMDH info
|
||||
std::tie(success, bytes) = hb3dsx.file.readBytes(&hb3dsx.romFSOffset, 4);
|
||||
if (!success || bytes != 4) {
|
||||
@@ -278,8 +273,7 @@ std::optional<u32> Memory::load3DSX(const std::filesystem::path& path) {
|
||||
}
|
||||
hb3dsx.romFSSize = *fileSize - hb3dsx.romFSOffset;
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
printf("Invalid 3DSX header size\n");
|
||||
return std::nullopt;
|
||||
}
|
||||
@@ -293,9 +287,7 @@ std::optional<u32> Memory::load3DSX(const std::filesystem::path& path) {
|
||||
return HB3DSX::entrypoint;
|
||||
}
|
||||
|
||||
bool HB3DSX::hasRomFs() const {
|
||||
return romFSSize != 0 && romFSOffset != 0;
|
||||
}
|
||||
bool HB3DSX::hasRomFs() const { return romFSSize != 0 && romFSOffset != 0; }
|
||||
|
||||
std::pair<bool, std::size_t> HB3DSX::readRomFSBytes(void* dst, std::size_t offset, std::size_t size) {
|
||||
if (!hasRomFs()) {
|
||||
|
||||
Reference in New Issue
Block a user