RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-04-05 06:26:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

EXCEPTION() macro usage, sceNpTrophy improved

Browse source
This commit is contained in:
Nekotekina 2015-07-02 04:54:36 +03:00
parent 6f1e76198a
commit 32d3d1fbe5
32 changed files with 477 additions and 609 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Utilities/Thread.cpp
View file

@ -1097,7 +1097,7 @@ void _se_translator(unsigned int u, EXCEPTION_POINTERS* pExp)
if (u == EXCEPTION_ACCESS_VIOLATION && (u32)addr64 == addr64)
{
throw fmt::format("Access violation %s location 0x%llx", is_writing ? "writing" : "reading", addr64);
throw EXCEPTION("Access violation %s location 0x%llx", is_writing ? "writing" : "reading", addr64);
}
}
@ -1146,7 +1146,7 @@ void signal_handler(int sig, siginfo_t* info, void* uct)
}
// TODO: this may be wrong
throw fmt::format("Access violation %s location 0x%llx", is_writing ? "writing" : "reading", addr64);
throw EXCEPTION("Access violation %s location 0x%llx", is_writing ? "writing" : "reading", addr64);
}
// else some fatal error
@ -1297,11 +1297,11 @@ void thread_t::start(std::function<std::string()> name, std::function<void()> fu
func();
}
catch (const char* e)
catch (const char* e) // obsolete
{
error(e);
}
catch (const std::string& e)
catch (const std::string& e) // obsolete
{
error(e.c_str());
}

2
Utilities/rPlatform.cpp
View file

@ -35,7 +35,7 @@ void rImage::SaveFile(const std::string& name, rImageType type)
}
else
{
throw std::string("unsupported type");
throw EXCEPTION("unsupported type");
}
}

2
Utilities/rTime.cpp
View file

@ -133,7 +133,7 @@ wxDateTime::TimeZone convertTZ(rDateTime::rTimeZone tz)
case rDateTime::UTC:
return wxDateTime::UTC;
default:
throw std::string("WRONG DATETIME");
throw EXCEPTION("WRONG DATETIME");
}
}