summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon/OpcodeDecoding.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2014-11-05 02:22:33 -0500
committerLioncash <mathew1800@gmail.com>2014-11-05 02:30:48 -0500
commit884ec2ed13bd47c188317a9b91b8af20876d9919 (patch)
treef35156fde31ae0c362e49642c0de5cced069b0b9 /Source/Core/VideoCommon/OpcodeDecoding.cpp
parenta66b34cfc6732ee32c1fca67e07828dd380ee38e (diff)
Host: Kill off Host_SysMessage
Equivalent facilities already exist.
Diffstat (limited to 'Source/Core/VideoCommon/OpcodeDecoding.cpp')
-rw-r--r--Source/Core/VideoCommon/OpcodeDecoding.cpp64
1 files changed, 30 insertions, 34 deletions
diff --git a/Source/Core/VideoCommon/OpcodeDecoding.cpp b/Source/Core/VideoCommon/OpcodeDecoding.cpp
index 1bb5fae940..1f71bd051b 100644
--- a/Source/Core/VideoCommon/OpcodeDecoding.cpp
+++ b/Source/Core/VideoCommon/OpcodeDecoding.cpp
@@ -89,43 +89,39 @@ static void InterpretDisplayListPreprocess(u32 address, u32 size)
static void UnknownOpcode(u8 cmd_byte, void *buffer, bool preprocess)
{
// TODO(Omega): Maybe dump FIFO to file on this error
- std::string temp = StringFromFormat(
- "GFX FIFO: Unknown Opcode (0x%x @ %p, preprocessing=%s).\n"
- "This means one of the following:\n"
- "* The emulated GPU got desynced, disabling dual core can help\n"
- "* Command stream corrupted by some spurious memory bug\n"
- "* This really is an unknown opcode (unlikely)\n"
- "* Some other sort of bug\n\n"
- "Dolphin will now likely crash or hang. Enjoy." ,
- cmd_byte,
- buffer,
- preprocess ? "yes" : "no");
- Host_SysMessage(temp.c_str());
- INFO_LOG(VIDEO, "%s", temp.c_str());
+ PanicAlert(
+ "GFX FIFO: Unknown Opcode (0x%x @ %p, preprocessing=%s).\n"
+ "This means one of the following:\n"
+ "* The emulated GPU got desynced, disabling dual core can help\n"
+ "* Command stream corrupted by some spurious memory bug\n"
+ "* This really is an unknown opcode (unlikely)\n"
+ "* Some other sort of bug\n\n"
+ "Dolphin will now likely crash or hang. Enjoy." ,
+ cmd_byte,
+ buffer,
+ preprocess ? "yes" : "no");
+
{
SCPFifoStruct &fifo = CommandProcessor::fifo;
- std::string tmp = StringFromFormat(
- "Illegal command %02x\n"
- "CPBase: 0x%08x\n"
- "CPEnd: 0x%08x\n"
- "CPHiWatermark: 0x%08x\n"
- "CPLoWatermark: 0x%08x\n"
- "CPReadWriteDistance: 0x%08x\n"
- "CPWritePointer: 0x%08x\n"
- "CPReadPointer: 0x%08x\n"
- "CPBreakpoint: 0x%08x\n"
- "bFF_GPReadEnable: %s\n"
- "bFF_BPEnable: %s\n"
- "bFF_BPInt: %s\n"
- "bFF_Breakpoint: %s\n"
- ,cmd_byte, fifo.CPBase, fifo.CPEnd, fifo.CPHiWatermark, fifo.CPLoWatermark, fifo.CPReadWriteDistance
- ,fifo.CPWritePointer, fifo.CPReadPointer, fifo.CPBreakpoint, fifo.bFF_GPReadEnable ? "true" : "false"
- ,fifo.bFF_BPEnable ? "true" : "false" ,fifo.bFF_BPInt ? "true" : "false"
- ,fifo.bFF_Breakpoint ? "true" : "false");
-
- Host_SysMessage(tmp.c_str());
- INFO_LOG(VIDEO, "%s", tmp.c_str());
+ PanicAlert(
+ "Illegal command %02x\n"
+ "CPBase: 0x%08x\n"
+ "CPEnd: 0x%08x\n"
+ "CPHiWatermark: 0x%08x\n"
+ "CPLoWatermark: 0x%08x\n"
+ "CPReadWriteDistance: 0x%08x\n"
+ "CPWritePointer: 0x%08x\n"
+ "CPReadPointer: 0x%08x\n"
+ "CPBreakpoint: 0x%08x\n"
+ "bFF_GPReadEnable: %s\n"
+ "bFF_BPEnable: %s\n"
+ "bFF_BPInt: %s\n"
+ "bFF_Breakpoint: %s\n"
+ ,cmd_byte, fifo.CPBase, fifo.CPEnd, fifo.CPHiWatermark, fifo.CPLoWatermark, fifo.CPReadWriteDistance
+ ,fifo.CPWritePointer, fifo.CPReadPointer, fifo.CPBreakpoint, fifo.bFF_GPReadEnable ? "true" : "false"
+ ,fifo.bFF_BPEnable ? "true" : "false" ,fifo.bFF_BPInt ? "true" : "false"
+ ,fifo.bFF_Breakpoint ? "true" : "false");
}
}