ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12366 from AdmiralCurtiss/exi-ipl-fixes 

HW/CEXIIPL: Various fixes.
This commit is contained in:
Mai 2023-12-10 09:12:18 -05:00 committed by GitHub
parent c23febe947 8194b53166
commit f249e414ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/Core/Core/HW/EXI/EXI_DeviceIPL.cpp
View File

@ -111,8 +111,9 @@ CEXIIPL::CEXIIPL(Core::System& system) : IEXIDevice(system)
{ {
// Descramble the encrypted section (contains BS1 and BS2) // Descramble the encrypted section (contains BS1 and BS2)
Descrambler(&m_rom[0x100], 0x1afe00); Descrambler(&m_rom[0x100], 0x1afe00);
// yay for null-terminated strings
const std::string_view name{reinterpret_cast<char*>(m_rom.get())}; const std::string_view name{reinterpret_cast<char*>(m_rom.get()),
strnlen(reinterpret_cast<char*>(m_rom.get()), 0x100)};
INFO_LOG_FMT(BOOT, "Loaded bootrom: {}", name); INFO_LOG_FMT(BOOT, "Loaded bootrom: {}", name);
} }
else else
@ -159,13 +160,18 @@ void CEXIIPL::DoState(PointerWrap& p)
bool CEXIIPL::LoadFileToIPL(const std::string& filename, u32 offset) bool CEXIIPL::LoadFileToIPL(const std::string& filename, u32 offset)
{ {
if (offset >= ROM_SIZE)
return false;
File::IOFile stream(filename, "rb"); File::IOFile stream(filename, "rb");
if (!stream) if (!stream)
return false; return false;
u64 filesize = stream.GetSize(); const u64 filesize = stream.GetSize();
if (offset >= filesize)
return false;
if (!stream.ReadBytes(&m_rom[offset], filesize)) if (!stream.ReadBytes(&m_rom[offset], std::min<u64>(filesize, ROM_SIZE) - offset))
return false; return false;
m_fonts_loaded = true; m_fonts_loaded = true;
@ -234,8 +240,11 @@ void CEXIIPL::LoadFontFile(const std::string& filename, u32 offset)
INFO_LOG_FMT(BOOT, "Found IPL dump, loading {} font from {}", INFO_LOG_FMT(BOOT, "Found IPL dump, loading {} font from {}",
(offset == 0x1aff00) ? "Shift JIS" : "Windows-1252", ipl_rom_path); (offset == 0x1aff00) ? "Shift JIS" : "Windows-1252", ipl_rom_path);
stream.Seek(offset, File::SeekOrigin::Begin); if (!stream.Seek(offset, File::SeekOrigin::Begin) || !stream.ReadBytes(&m_rom[offset], fontsize))
stream.ReadBytes(&m_rom[offset], fontsize); {
WARN_LOG_FMT(BOOT, "Failed to read font from IPL dump.");
return;
}
m_fonts_loaded = true; m_fonts_loaded = true;
} }