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

cleaner cpu string, a better error message 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1097 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard 2008-11-08 14:28:28 +00:00
parent 8be6beed6a
commit 8684b734e8
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Common/Src/CPUDetect.cpp
View File

@ -183,7 +183,11 @@ void CPUInfo::Detect()
std::string CPUInfo::Summarize() std::string CPUInfo::Summarize()
{ {
std::string sum = StringFromFormat("%s : %i cores. ", cpu_string, num_cores); std::string sum;
if (num_cores == 1)
sum = StringFromFormat("%s, %i core, ", cpu_string, num_cores);
else
sum = StringFromFormat("%s, %i cores, ", cpu_string, num_cores);
if (bSSE) sum += "SSE"; if (bSSE) sum += "SSE";
if (bSSE2) sum += ", SSE2"; if (bSSE2) sum += ", SSE2";
if (bSSE3) sum += ", SSE3"; if (bSSE3) sum += ", SSE3";
@ -191,6 +195,5 @@ std::string CPUInfo::Summarize()
if (bSSE4_1) sum += ", SSE4.1"; if (bSSE4_1) sum += ", SSE4.1";
if (bSSE4_2) sum += ", SSE4.2"; if (bSSE4_2) sum += ", SSE4.2";
if (bLongMode) sum += ", 64-bit support"; if (bLongMode) sum += ", 64-bit support";
sum += " (wrong? report)";
return sum; return sum;
} }

24
Source/Core/Core/Src/HW/Memmap.cpp
View File

@ -1101,14 +1101,22 @@ void SDRUpdated()
u32 CheckDTLB(u32 _Address, XCheckTLBFlag _Flag) u32 CheckDTLB(u32 _Address, XCheckTLBFlag _Flag)
{ {
PanicAlert("TLB: %s unknown memory (0x%08x)\n" if (Core::GetStartupParameter().bWii) {
"This is either the game crashing randomly, or a TLB write." // TLB is never used on Wii (except linux and stuff, but we don't care about that)
"Several games uses the TLB to map memory. This\n" PanicAlert("%s invalid memory region (0x%08x)\n\n"
"function is not supported in Dolphin. " "There is no way to recover from this error,"
"Also, unfortunately there is no way to recover from this error," "so Dolphin will now exit. Sorry!",
"so Dolphin will now exit abruptly. Sorry!", _Flag == FLAG_WRITE ? "Write to" : "Read from", _Address);
_Flag == FLAG_WRITE ? "Write to" : "Read from", _Address); }
else {
PanicAlert("%s invalid memory region (0x%08x)\n\n"
"This is either the game crashing randomly, or a TLB write."
"Several games uses the TLB to map memory. This\n"
"function is not supported in Dolphin. "
"Unfortunately there is no way to recover from this error,"
"so Dolphin will now exit abruptly. Sorry!",
_Flag == FLAG_WRITE ? "Write to" : "Read from", _Address);
}
exit(0); exit(0);
u32 sr = PowerPC::ppcState.sr[EA_SR(_Address)]; u32 sr = PowerPC::ppcState.sr[EA_SR(_Address)];