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

cellGame: improve logging

This commit is contained in:
Megamouse 2021-07-01 20:37:24 +02:00
parent 8f8605ab2f
commit 161fa95066
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rpcs3/Emu/Cell/Modules/cellGame.cpp
View File

@ -191,7 +191,7 @@ error_code cellHddGameCheck(ppu_thread& ppu, u32 version, vm::cptr<char> dirName
const auto cat = psf::get_string(sfo, "CATEGORY", "");
if (cat != "HG")
{
return CELL_GAMEDATA_ERROR_BROKEN;
return { CELL_GAMEDATA_ERROR_BROKEN, fmt::format("CATEGORY='%s'", cat) };
}
}
@ -588,13 +588,13 @@ error_code cellGameDataCheck(u32 type, vm::cptr<char> dirName, vm::ptr<CellGameC
auto [sfo, psf_error] = psf::load(vfs::get(dir + "/PARAM.SFO"));
if (psf::get_string(sfo, "CATEGORY") != [&]()
if (const std::string_view cat = psf::get_string(sfo, "CATEGORY"); [&]()
{
switch (type)
{
case CELL_GAME_GAMETYPE_HDD: return "HG"sv;
case CELL_GAME_GAMETYPE_GAMEDATA: return "GD"sv;
case CELL_GAME_GAMETYPE_DISC: return "DG"sv;
case CELL_GAME_GAMETYPE_HDD: return cat != "HG"sv;
case CELL_GAME_GAMETYPE_GAMEDATA: return cat != "GD"sv;
case CELL_GAME_GAMETYPE_DISC: return cat != "DG"sv;
default: fmt::throw_exception("Unreachable");
}
}())
@ -602,7 +602,7 @@ error_code cellGameDataCheck(u32 type, vm::cptr<char> dirName, vm::ptr<CellGameC
if (psf_error != psf::error::stream)
{
init.cancel();
return {CELL_GAME_ERROR_BROKEN, psf_error};
return {CELL_GAME_ERROR_BROKEN, fmt::format("psf::error='%s', type='%d' CATEGORY='%s'", psf_error, type, cat)};
}
}