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

Fix some typos and correct some capitalizations in the log messages. 

Makes the logging look more orderly and less spammy when spitting out things.
This commit is contained in:
Lioncash 2013-03-31 19:10:21 -04:00
parent 45651098f6
commit f432d6038e
48 changed files with 130 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/AudioCommon/Src/WaveFile.cpp
View File

@ -73,7 +73,7 @@ bool WaveFileWriter::Start(const char *filename, unsigned int HLESampleRate)
// We are now at offset 44 // We are now at offset 44
if (file.Tell() != 44) if (file.Tell() != 44)
PanicAlert("wrong offset: %lld", (long long)file.Tell()); PanicAlert("Wrong offset: %lld", (long long)file.Tell());
return true; return true;
} }

2
Source/Core/Common/Src/FileUtil.cpp
View File

@ -723,7 +723,7 @@ std::string &GetUserPath(const unsigned int DirIDX, const std::string &newPath)
if (!newPath.empty()) if (!newPath.empty())
{ {
if(DirIDX != D_WIIROOT_IDX) if(DirIDX != D_WIIROOT_IDX)
PanicAlert("trying to change user path other than wii root"); PanicAlert("Trying to change user path other than Wii root");
if (!File::IsDirectory(newPath)) if (!File::IsDirectory(newPath))
{ {

2
Source/Core/Core/Src/Boot/Boot.cpp
View File

@ -176,7 +176,7 @@ bool CBoot::Load_BS2(const std::string& _rBootROMFilename)
std::string BootRegion = _rBootROMFilename.substr(_rBootROMFilename.find_last_of(DIR_SEP) - 3, 3); std::string BootRegion = _rBootROMFilename.substr(_rBootROMFilename.find_last_of(DIR_SEP) - 3, 3);
if (BootRegion != ipl_region) if (BootRegion != ipl_region)
PanicAlert("%s ipl found in %s directory, the disc may not be recognized", ipl_region.c_str(), BootRegion.c_str()); PanicAlert("%s IPL found in %s directory. The disc may not be recognized", ipl_region.c_str(), BootRegion.c_str());
// Run the descrambler over the encrypted section containing BS1/BS2 // Run the descrambler over the encrypted section containing BS1/BS2
CEXIIPL::Descrambler((u8*)data.data()+0x100, 0x1AFE00); CEXIIPL::Descrambler((u8*)data.data()+0x100, 0x1AFE00);

4
Source/Core/Core/Src/Console.cpp
View File

@ -38,12 +38,12 @@ void Console_Submit(const char *cmd)
CASE1("r") CASE1("r")
{ {
Core::StartTrace(false); Core::StartTrace(false);
INFO_LOG(CONSOLE, "read tracing started."); INFO_LOG(CONSOLE, "Read tracing started.");
} }
CASE1("w") CASE1("w")
{ {
Core::StartTrace(true); Core::StartTrace(true);
INFO_LOG(CONSOLE, "write tracing started."); INFO_LOG(CONSOLE, "Write tracing started.");
} }
CASE("trans") CASE("trans")
{ {

2
Source/Core/Core/Src/CoreParameter.cpp
View File

@ -326,7 +326,7 @@ bool SCoreStartupParameter::AutoSetup(EBootBS2 _BootBS2)
{ {
if (!File::Exists(m_strBootROM)) if (!File::Exists(m_strBootROM))
{ {
WARN_LOG(BOOT, "bootrom file %s not found - using HLE.", m_strBootROM.c_str()); WARN_LOG(BOOT, "Bootrom file %s not found - using HLE.", m_strBootROM.c_str());
bHLE_BS2 = true; bHLE_BS2 = true;
} }
} }

4
Source/Core/Core/Src/HW/AudioInterface.cpp
View File

@ -191,7 +191,7 @@ void Read32(u32& _rReturnValue, const u32 _Address)
break; break;
default: default:
ERROR_LOG(AUDIO_INTERFACE, "unknown read 0x%08x", _Address); ERROR_LOG(AUDIO_INTERFACE, "Unknown read 0x%08x", _Address);
_dbg_assert_msg_(AUDIO_INTERFACE, 0, "AudioInterface - Read from 0x%08x", _Address); _dbg_assert_msg_(AUDIO_INTERFACE, 0, "AudioInterface - Read from 0x%08x", _Address);
_rReturnValue = 0; _rReturnValue = 0;
return; return;
@ -281,7 +281,7 @@ void Write32(const u32 _Value, const u32 _Address)
break; break;
default: default:
ERROR_LOG(AUDIO_INTERFACE, "unknown write %08x @ %08x", _Value, _Address); ERROR_LOG(AUDIO_INTERFACE, "Unknown write %08x @ %08x", _Value, _Address);
_dbg_assert_msg_(AUDIO_INTERFACE,0,"AIS - Write %08x to %08x", _Value, _Address); _dbg_assert_msg_(AUDIO_INTERFACE,0,"AIS - Write %08x to %08x", _Value, _Address);
break; break;
} }

2
Source/Core/Core/Src/HW/DSP.cpp
View File

@ -334,7 +334,7 @@ void Read16(u16& _uReturnValue, const u32 _iAddress)
// ARAM // ARAM
case AR_INFO: case AR_INFO:
//PanicAlert("read %x %x", g_ARAM_Info.Hex,PowerPC::ppcState.pc); //PanicAlert("Read %x %x", g_ARAM_Info.Hex,PowerPC::ppcState.pc);
_uReturnValue = g_ARAM_Info.Hex; _uReturnValue = g_ARAM_Info.Hex;
break; break;

4
Source/Core/Core/Src/HW/DSPLLE/DSPLLE.cpp
View File

@ -270,7 +270,7 @@ void DSPLLE::DSP_WriteMailBoxHigh(bool _CPUMailbox, u16 _uHighMail)
} }
else else
{ {
ERROR_LOG(DSPLLE, "CPU cant write to DSP mailbox"); ERROR_LOG(DSPLLE, "CPU can't write to DSP mailbox");
} }
} }
@ -282,7 +282,7 @@ void DSPLLE::DSP_WriteMailBoxLow(bool _CPUMailbox, u16 _uLowMail)
} }
else else
{ {
ERROR_LOG(DSPLLE, "CPU cant write to DSP mailbox"); ERROR_LOG(DSPLLE, "CPU can't write to DSP mailbox");
} }
} }

2
Source/Core/Core/Src/HW/DSPLLE/DSPLLETools.cpp
View File

@ -43,7 +43,7 @@ bool DumpDSPCode(const u8 *code_be, int size_in_bytes, u32 crc)
} }
else else
{ {
PanicAlert("Cant open file (%s) to dump UCode!!", binFile); PanicAlert("Can't open file (%s) to dump UCode!!", binFile);
return false; return false;
} }

6
Source/Core/Core/Src/HW/DVDInterface.cpp
View File

@ -671,7 +671,7 @@ void ExecuteCommand(UDICR& _DICR)
// Here is the actual Disk Reading // Here is the actual Disk Reading
if (!DVDRead(iDVDOffset, m_DIMAR.Address, m_DILENGTH.Length)) if (!DVDRead(iDVDOffset, m_DIMAR.Address, m_DILENGTH.Length))
{ {
PanicAlertT("Cant read from DVD_Plugin - DVD-Interface: Fatal Error"); PanicAlertT("Can't read from DVD_Plugin - DVD-Interface: Fatal Error");
} }
} }
break; break;
@ -681,7 +681,7 @@ void ExecuteCommand(UDICR& _DICR)
_dbg_assert_(DVDINTERFACE, m_DICMDBUF[2].Hex == m_DILENGTH.Length); _dbg_assert_(DVDINTERFACE, m_DICMDBUF[2].Hex == m_DILENGTH.Length);
_dbg_assert_(DVDINTERFACE, m_DILENGTH.Length == 0x20); _dbg_assert_(DVDINTERFACE, m_DILENGTH.Length == 0x20);
if (!DVDRead(m_DICMDBUF[1].Hex, m_DIMAR.Address, m_DILENGTH.Length)) if (!DVDRead(m_DICMDBUF[1].Hex, m_DIMAR.Address, m_DILENGTH.Length))
PanicAlertT("Cant read from DVD_Plugin - DVD-Interface: Fatal Error"); PanicAlertT("Can't read from DVD_Plugin - DVD-Interface: Fatal Error");
WARN_LOG(DVDINTERFACE, "Read DiscID %08x", Memory::Read_U32(m_DIMAR.Address)); WARN_LOG(DVDINTERFACE, "Read DiscID %08x", Memory::Read_U32(m_DIMAR.Address));
break; break;
@ -712,7 +712,7 @@ void ExecuteCommand(UDICR& _DICR)
/* /*
if (iDVDOffset == 0x84800000) if (iDVDOffset == 0x84800000)
{ {
ERROR_LOG(DVDINTERFACE, "firmware upload"); ERROR_LOG(DVDINTERFACE, "Firmware upload");
} }
else*/ else*/
if ((offset < 0) || ((offset + len) > 0x40) || len > 0x40) if ((offset < 0) || ((offset + len) > 0x40) || len > 0x40)

2
Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp
View File

@ -382,7 +382,7 @@ void CEXIETHERNET::MXCommandHandler(u32 data, u32 size)
case BBA_NCRA: case BBA_NCRA:
if (data & NCRA_RESET) if (data & NCRA_RESET)
{ {
DEBUG_LOG(SP1, "software reset"); DEBUG_LOG(SP1, "Software reset");
//MXSoftReset(); //MXSoftReset();
Activate(); Activate();
} }

2
Source/Core/Core/Src/HW/EXI_DeviceGecko.cpp
View File

@ -222,7 +222,7 @@ void CEXIGecko::ImmReadWrite(u32 &_uData, u32 _uSize)
} }
default: default:
ERROR_LOG(EXPANSIONINTERFACE, "Uknown USBGecko command %x", _uData); ERROR_LOG(EXPANSIONINTERFACE, "Unknown USBGecko command %x", _uData);
break; break;
} }
} }

12
Source/Core/Core/Src/HW/ProcessorInterface.cpp
View File

@ -124,28 +124,28 @@ void Read32(u32& _uReturnValue, const u32 _iAddress)
return; return;
case PI_FIFO_BASE: case PI_FIFO_BASE:
DEBUG_LOG(PROCESSORINTERFACE, "read cpu fifo base, value = %08x", Fifo_CPUBase); DEBUG_LOG(PROCESSORINTERFACE, "Read CPU FIFO base, value = %08x", Fifo_CPUBase);
_uReturnValue = Fifo_CPUBase; _uReturnValue = Fifo_CPUBase;
return; return;
case PI_FIFO_END: case PI_FIFO_END:
DEBUG_LOG(PROCESSORINTERFACE, "read cpu fifo end, value = %08x", Fifo_CPUEnd); DEBUG_LOG(PROCESSORINTERFACE, "Read CPU FIFO end, value = %08x", Fifo_CPUEnd);
_uReturnValue = Fifo_CPUEnd; _uReturnValue = Fifo_CPUEnd;
return; return;
case PI_FIFO_WPTR: case PI_FIFO_WPTR:
DEBUG_LOG(PROCESSORINTERFACE, "read writepointer, value = %08x", Fifo_CPUWritePointer); DEBUG_LOG(PROCESSORINTERFACE, "Read writepointer, value = %08x", Fifo_CPUWritePointer);
_uReturnValue = Fifo_CPUWritePointer; //really writes in 32-byte chunks _uReturnValue = Fifo_CPUWritePointer; //really writes in 32-byte chunks
// Monk's gcube does some crazy align trickery here. // Monk's gcube does some crazy align trickery here.
return; return;
case PI_RESET_CODE: case PI_RESET_CODE:
INFO_LOG(PROCESSORINTERFACE, "read reset code, 0x%08x", m_ResetCode); INFO_LOG(PROCESSORINTERFACE, "Read reset code, 0x%08x", m_ResetCode);
_uReturnValue = m_ResetCode; _uReturnValue = m_ResetCode;
return; return;
case PI_FLIPPER_REV: case PI_FLIPPER_REV:
INFO_LOG(PROCESSORINTERFACE, "read flipper rev, 0x%08x", m_FlipperRev); INFO_LOG(PROCESSORINTERFACE, "Read flipper rev, 0x%08x", m_FlipperRev);
_uReturnValue = m_FlipperRev; _uReturnValue = m_FlipperRev;
return; return;
@ -202,7 +202,7 @@ void Write32(const u32 _uValue, const u32 _iAddress)
break; break;
case PI_FLIPPER_UNK: case PI_FLIPPER_UNK:
DEBUG_LOG(PROCESSORINTERFACE, "write %08x to unknown PI reg %08x", _uValue, _iAddress); DEBUG_LOG(PROCESSORINTERFACE, "Write %08x to unknown PI reg %08x", _uValue, _iAddress);
break; break;
default: default:

6
Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.cpp
View File

@ -414,7 +414,7 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength)
log += sprintf(log, "%02x ", ptr(i)); log += sprintf(log, "%02x ", ptr(i));
} }
ptr(0x7f) = ~csum; ptr(0x7f) = ~csum;
DEBUG_LOG(AMBASEBOARDDEBUG, "command send back: %s", logptr); DEBUG_LOG(AMBASEBOARDDEBUG, "Command send back: %s", logptr);
#undef ptr #undef ptr
@ -438,7 +438,7 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength)
// DEFAULT // DEFAULT
default: default:
{ {
ERROR_LOG(SERIALINTERFACE, "unknown SI command (0x%x)", command); ERROR_LOG(SERIALINTERFACE, "Unknown SI command (0x%x)", command);
PanicAlert("SI: Unknown command"); PanicAlert("SI: Unknown command");
iPosition = _iLength; iPosition = _iLength;
} }
@ -460,6 +460,6 @@ bool CSIDevice_AMBaseboard::GetData(u32& _Hi, u32& _Low)
void CSIDevice_AMBaseboard::SendCommand(u32 _Cmd, u8 _Poll) void CSIDevice_AMBaseboard::SendCommand(u32 _Cmd, u8 _Poll)
{ {
ERROR_LOG(SERIALINTERFACE, "unknown direct command (0x%x)", _Cmd); ERROR_LOG(SERIALINTERFACE, "Unknown direct command (0x%x)", _Cmd);
PanicAlert("SI: (GCAM) Unknown direct command"); PanicAlert("SI: (GCAM) Unknown direct command");
} }

4
Source/Core/Core/Src/HW/SI_DeviceGCController.cpp
View File

@ -108,7 +108,7 @@ int CSIDevice_GCController::RunBuffer(u8* _pBuffer, int _iLength)
// DEFAULT // DEFAULT
default: default:
{ {
ERROR_LOG(SERIALINTERFACE, "unknown SI command (0x%x)", command); ERROR_LOG(SERIALINTERFACE, "Unknown SI command (0x%x)", command);
PanicAlert("SI: Unknown command (0x%x)", command); PanicAlert("SI: Unknown command (0x%x)", command);
} }
break; break;
@ -275,7 +275,7 @@ void CSIDevice_GCController::SendCommand(u32 _Cmd, u8 _Poll)
default: default:
{ {
ERROR_LOG(SERIALINTERFACE, "unknown direct command (0x%x)", _Cmd); ERROR_LOG(SERIALINTERFACE, "Unknown direct command (0x%x)", _Cmd);
PanicAlert("SI: Unknown direct command"); PanicAlert("SI: Unknown direct command");
} }
break; break;

4
Source/Core/Core/Src/HW/SI_DeviceGCSteeringWheel.cpp
View File

@ -99,7 +99,7 @@ int CSIDevice_GCSteeringWheel::RunBuffer(u8* _pBuffer, int _iLength)
// DEFAULT // DEFAULT
default: default:
{ {
ERROR_LOG(SERIALINTERFACE, "unknown SI command (0x%x)", command); ERROR_LOG(SERIALINTERFACE, "Unknown SI command (0x%x)", command);
} }
break; break;
} }
@ -297,7 +297,7 @@ void CSIDevice_GCSteeringWheel::SendCommand(u32 _Cmd, u8 _Poll)
default: default:
{ {
ERROR_LOG(SERIALINTERFACE, "unknown direct command (0x%x)", _Cmd); ERROR_LOG(SERIALINTERFACE, "Unknown direct command (0x%x)", _Cmd);
} }
break; break;
} }

4
Source/Core/Core/Src/HW/VideoInterface.cpp
View File

@ -434,7 +434,7 @@ void Read16(u16& _uReturnValue, const u32 _iAddress)
break; break;
default: default:
ERROR_LOG(VIDEOINTERFACE, "(r16) unk reg %x", _iAddress & 0xfff); ERROR_LOG(VIDEOINTERFACE, "(r16) unknown reg %x", _iAddress & 0xfff);
_uReturnValue = 0x0; _uReturnValue = 0x0;
break; break;
} }
@ -686,7 +686,7 @@ void Write16(const u16 _iValue, const u32 _iAddress)
break; break;
default: default:
ERROR_LOG(VIDEOINTERFACE, "(w16) %04x to unk reg %x", _iValue, _iAddress & 0xfff); ERROR_LOG(VIDEOINTERFACE, "(w16) %04x to unknown reg %x", _iValue, _iAddress & 0xfff);
break; break;
} }
} }

2
Source/Core/Core/Src/HW/WII_IPC.cpp
View File

@ -194,7 +194,7 @@ void Write32(const u32 _Value, const u32 _Address)
_Value, ctrl.ppc(), ctrl.Y1, ctrl.Y2, ctrl.X1); _Value, ctrl.ppc(), ctrl.Y1, ctrl.Y2, ctrl.X1);
if (ctrl.X1) if (ctrl.X1)
{ {
INFO_LOG(WII_IPC, "new pointer available: %08x", ppc_msg); INFO_LOG(WII_IPC, "New pointer available: %08x", ppc_msg);
// Let the HLE handle the request on it's own time // Let the HLE handle the request on it's own time
WII_IPC_HLE_Interface::EnqRequest(ppc_msg); WII_IPC_HLE_Interface::EnqRequest(ppc_msg);
} }

10
Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
View File

@ -300,7 +300,7 @@ bool Wiimote::Connect()
TCHAR name[128] = {}; TCHAR name[128] = {};
HidD_GetProductString(dev_handle, name, 128); HidD_GetProductString(dev_handle, name, 128);
//ERROR_LOG(WIIMOTE, "product string: %s", TStrToUTF8(name).c_str()); //ERROR_LOG(WIIMOTE, "Product string: %s", TStrToUTF8(name).c_str());
if (!IsValidBluetoothName(TStrToUTF8(name))) if (!IsValidBluetoothName(TStrToUTF8(name)))
{ {
@ -394,7 +394,7 @@ int Wiimote::IORead(u8* buf)
} }
else if (WAIT_FAILED == r) else if (WAIT_FAILED == r)
{ {
WARN_LOG(WIIMOTE, "A wait error occured on reading from wiimote %i.", index + 1); WARN_LOG(WIIMOTE, "A wait error occurred on reading from wiimote %i.", index + 1);
bytes = 0; bytes = 0;
} }
else if (WAIT_OBJECT_0 == r) else if (WAIT_OBJECT_0 == r)
@ -553,8 +553,8 @@ void ProcessWiimotes(bool new_scan, T& callback)
HBLUETOOTH_DEVICE_FIND hFindDevice = Bth_BluetoothFindFirstDevice(&srch, &btdi); HBLUETOOTH_DEVICE_FIND hFindDevice = Bth_BluetoothFindFirstDevice(&srch, &btdi);
while (hFindDevice) while (hFindDevice)
{ {
// btdi.szName is sometimes missings it's content - it's a bt feature.. // btdi.szName is sometimes missing it's content - it's a bt feature..
DEBUG_LOG(WIIMOTE, "authed %i connected %i remembered %i ", DEBUG_LOG(WIIMOTE, "Authenticated %i connected %i remembered %i ",
btdi.fAuthenticated, btdi.fConnected, btdi.fRemembered); btdi.fAuthenticated, btdi.fConnected, btdi.fRemembered);
if (IsValidBluetoothName(UTF16ToUTF8(btdi.szName))) if (IsValidBluetoothName(UTF16ToUTF8(btdi.szName)))
@ -597,7 +597,7 @@ bool AttachWiimote(HANDLE hRadio, const BLUETOOTH_RADIO_INFO& radio_info, BLUETO
{ {
auto const& wm_addr = btdi.Address.rgBytes; auto const& wm_addr = btdi.Address.rgBytes;
NOTICE_LOG(WIIMOTE, "Found wiimote (%02x:%02x:%02x:%02x:%02x:%02x). Enabling HID service.", NOTICE_LOG(WIIMOTE, "Found Wiimote (%02x:%02x:%02x:%02x:%02x:%02x). Enabling HID service.",
wm_addr[0], wm_addr[1], wm_addr[2], wm_addr[3], wm_addr[4], wm_addr[5]); wm_addr[0], wm_addr[1], wm_addr[2], wm_addr[3], wm_addr[4], wm_addr[5]);
#if defined(AUTHENTICATE_WIIMOTES) #if defined(AUTHENTICATE_WIIMOTES)

6
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp
View File

@ -446,15 +446,15 @@ u32 CWII_IPC_HLE_Device_di::ExecuteCommand(u32 _BufferIn, u32 _BufferInSize, u32
// but it seems we don't need to implement anything // but it seems we don't need to implement anything
case 0x95: case 0x95:
case 0x96: case 0x96:
WARN_LOG(WII_IPC_DVD, "unimplemented cmd 0x%08x (Buffer 0x%08x, 0x%x)", WARN_LOG(WII_IPC_DVD, "Unimplemented cmd 0x%08x (Buffer 0x%08x, 0x%x)",
Command, _BufferOut, _BufferOutSize); Command, _BufferOut, _BufferOutSize);
break; break;
default: default:
ERROR_LOG(WII_IPC_DVD, "unknown cmd 0x%08x (Buffer 0x%08x, 0x%x)", ERROR_LOG(WII_IPC_DVD, "Unknown cmd 0x%08x (Buffer 0x%08x, 0x%x)",
Command, _BufferOut, _BufferOutSize); Command, _BufferOut, _BufferOutSize);
PanicAlertT("unknown cmd 0x%08x", Command); PanicAlertT("Unknown cmd 0x%08x", Command);
break; break;
} }

2
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp
View File

@ -376,7 +376,7 @@ u32 CWII_IPC_HLE_Device_sdio_slot0::ExecuteCommand(u32 _BufferIn, u32 _BufferInS
{ {
Memory::Write_U8((u8)buffer[i], req.addr++); Memory::Write_U8((u8)buffer[i], req.addr++);
} }
DEBUG_LOG(WII_IPC_SD, "outbuffer size %i got %i", _rwBufferSize, i); DEBUG_LOG(WII_IPC_SD, "Outbuffer size %i got %i", _rwBufferSize, i);
} }
else else
{ {

14
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
View File

@ -178,7 +178,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::Close(u32 _CommandAddress, bool _bForc
bool CWII_IPC_HLE_Device_usb_oh1_57e_305::IOCtl(u32 _CommandAddress) bool CWII_IPC_HLE_Device_usb_oh1_57e_305::IOCtl(u32 _CommandAddress)
{ {
//ERROR_LOG(WII_IPC_WIIMOTE, "passing ioctl to ioctlv"); //ERROR_LOG(WII_IPC_WIIMOTE, "Passing ioctl to ioctlv");
return IOCtlV(_CommandAddress); //hack return IOCtlV(_CommandAddress); //hack
} }
@ -1823,7 +1823,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::CommandVendorSpecific_FC4F(u8* _Input,
Reply.status = 0x00; Reply.status = 0x00;
INFO_LOG(WII_IPC_WIIMOTE, "Command: CommandVendorSpecific_FC4F: (callstack WUDiRemovePatch)"); INFO_LOG(WII_IPC_WIIMOTE, "Command: CommandVendorSpecific_FC4F: (callstack WUDiRemovePatch)");
INFO_LOG(WII_IPC_WIIMOTE, "input (size 0x%x):", _Size); INFO_LOG(WII_IPC_WIIMOTE, "Input (size 0x%x):", _Size);
Dolphin_Debugger::PrintDataBuffer(LogTypes::WII_IPC_WIIMOTE, _Input, _Size, "Data: "); Dolphin_Debugger::PrintDataBuffer(LogTypes::WII_IPC_WIIMOTE, _Input, _Size, "Data: ");
@ -1836,7 +1836,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::CommandVendorSpecific_FC4C(u8* _Input,
Reply.status = 0x00; Reply.status = 0x00;
INFO_LOG(WII_IPC_WIIMOTE, "Command: CommandVendorSpecific_FC4C:"); INFO_LOG(WII_IPC_WIIMOTE, "Command: CommandVendorSpecific_FC4C:");
INFO_LOG(WII_IPC_WIIMOTE, "input (size 0x%x):", _Size); INFO_LOG(WII_IPC_WIIMOTE, "Input (size 0x%x):", _Size);
Dolphin_Debugger::PrintDataBuffer(LogTypes::WII_IPC_WIIMOTE, _Input, _Size, "Data: "); Dolphin_Debugger::PrintDataBuffer(LogTypes::WII_IPC_WIIMOTE, _Input, _Size, "Data: ");
SendEventCommandComplete(0xFC4C, &Reply, sizeof(hci_status_rp)); SendEventCommandComplete(0xFC4C, &Reply, sizeof(hci_status_rp));
@ -1862,9 +1862,9 @@ CWII_IPC_HLE_WiiMote* CWII_IPC_HLE_Device_usb_oh1_57e_305::AccessWiiMote(const b
return &m_WiiMotes[i]; return &m_WiiMotes[i];
} }
ERROR_LOG(WII_IPC_WIIMOTE,"Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x", ERROR_LOG(WII_IPC_WIIMOTE,"Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x",
_rAddr.b[0], _rAddr.b[1], _rAddr.b[2], _rAddr.b[3], _rAddr.b[4], _rAddr.b[5]); _rAddr.b[0], _rAddr.b[1], _rAddr.b[2], _rAddr.b[3], _rAddr.b[4], _rAddr.b[5]);
PanicAlertT("Cant find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x", PanicAlertT("Can't find WiiMote by bd: %02x:%02x:%02x:%02x:%02x:%02x",
_rAddr.b[0], _rAddr.b[1], _rAddr.b[2], _rAddr.b[3], _rAddr.b[4], _rAddr.b[5]); _rAddr.b[0], _rAddr.b[1], _rAddr.b[2], _rAddr.b[3], _rAddr.b[4], _rAddr.b[5]);
return NULL; return NULL;
} }
@ -1877,8 +1877,8 @@ CWII_IPC_HLE_WiiMote* CWII_IPC_HLE_Device_usb_oh1_57e_305::AccessWiiMote(u16 _Co
return &m_WiiMotes[i]; return &m_WiiMotes[i];
} }
ERROR_LOG(WII_IPC_WIIMOTE, "Cant find WiiMote by connection handle %02x", _ConnectionHandle); ERROR_LOG(WII_IPC_WIIMOTE, "Can't find WiiMote by connection handle %02x", _ConnectionHandle);
PanicAlertT("Cant find WiiMote by connection handle %02x", _ConnectionHandle); PanicAlertT("Can't find WiiMote by connection handle %02x", _ConnectionHandle);
return NULL; return NULL;
} }

6
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp
View File

@ -309,7 +309,7 @@ void CWII_IPC_HLE_WiiMote::ExecuteL2capCmd(u8* _pData, u32 _Size)
break; break;
default: default:
ERROR_LOG(WII_IPC_WIIMOTE, "channel 0x04%x has unknown PSM %x", pHeader->dcid, rChannel.PSM); ERROR_LOG(WII_IPC_WIIMOTE, "Channel 0x04%x has unknown PSM %x", pHeader->dcid, rChannel.PSM);
break; break;
} }
} }
@ -751,8 +751,8 @@ void CWII_IPC_HLE_WiiMote::SDPSendServiceAttributeResponse(u16 cid, u16 Transact
{ {
if (ServiceHandle != 0x10000) if (ServiceHandle != 0x10000)
{ {
ERROR_LOG(WII_IPC_WIIMOTE, "unknown service handle %x" , ServiceHandle); ERROR_LOG(WII_IPC_WIIMOTE, "Unknown service handle %x" , ServiceHandle);
PanicAlert("unknown service handle %x" , ServiceHandle); PanicAlert("Unknown service handle %x" , ServiceHandle);
} }

4
Source/Core/Core/Src/NetPlayServer.cpp
View File

@ -52,7 +52,7 @@ void NetPlayServer::ThreadFunc()
// update pings every so many seconds // update pings every so many seconds
if ((m_ping_timer.GetTimeElapsed() > (10 * 1000)) || m_update_pings) if ((m_ping_timer.GetTimeElapsed() > (10 * 1000)) || m_update_pings)
{ {
//PanicAlertT("sending pings"); //PanicAlertT("Sending pings");
m_ping_key = Common::Timer::GetTimeMs(); m_ping_key = Common::Timer::GetTimeMs();
@ -487,7 +487,7 @@ unsigned int NetPlayServer::OnData(sf::Packet& packet, sf::SocketTCP& socket)
if (m_ping_key == ping_key) if (m_ping_key == ping_key)
{ {
//PanicAlertT("good pong"); //PanicAlertT("Good pong");
player.ping = ping; player.ping = ping;
} }
m_dialog->Update(); m_dialog->Update();

2
Source/Core/Core/Src/PowerPC/Jit64/JitRegCache.cpp
View File

@ -388,7 +388,7 @@ void RegCache::Flush(FlushMode mode)
{ {
if (locks[i]) if (locks[i])
{ {
PanicAlert("Somebody forgot to unlock PPC reg %i.", i); PanicAlert("Someone forgot to unlock PPC reg %i.", i);
} }
if (regs[i].away) if (regs[i].away)
{ {

4
Source/Core/Core/Src/PowerPC/JitCommon/JitBackpatch.cpp
View File

@ -125,7 +125,7 @@ const u8 *TrampolineCache::GetWriteTrampoline(const InstructionInfo &info)
// It's a write. Yay. Remember that we don't have to be super efficient since it's "just" a // It's a write. Yay. Remember that we don't have to be super efficient since it's "just" a
// hardware access - we can take shortcuts. // hardware access - we can take shortcuts.
//if (emAddress == 0xCC008000) //if (emAddress == 0xCC008000)
// PanicAlert("caught a fifo write"); // PanicAlert("Caught a FIFO write");
CMP(32, R(addrReg), Imm32(0xCC008000)); CMP(32, R(addrReg), Imm32(0xCC008000));
FixupBranch skip_fast = J_CC(CC_NE, false); FixupBranch skip_fast = J_CC(CC_NE, false);
MOV(32, R(ABI_PARAM1), R((X64Reg)dataReg)); MOV(32, R(ABI_PARAM1), R((X64Reg)dataReg));
@ -215,7 +215,7 @@ const u8 *Jitx86Base::BackPatch(u8 *codePtr, int accessType, u32 emAddress, void
emitter.CALL((void *)trampoline); emitter.CALL((void *)trampoline);
emitter.NOP((int)info.instructionSize - 3); emitter.NOP((int)info.instructionSize - 3);
if (info.instructionSize < 3) if (info.instructionSize < 3)
PanicAlert("instruction too small"); PanicAlert("Instruction too small");
// We entered here with a BSWAP-ed EAX. We'll have to swap it back. // We entered here with a BSWAP-ed EAX. We'll have to swap it back.
ctx->Rax = Common::swap32((u32)ctx->Rax); ctx->Rax = Common::swap32((u32)ctx->Rax);
return codePtr - 2; return codePtr - 2;

2
Source/Core/Core/Src/PowerPC/JitInterface.cpp
View File

@ -159,7 +159,7 @@ namespace JitInterface
File::IOFile f(filename, "w"); File::IOFile f(filename, "w");
if (!f) if (!f)
{ {
PanicAlert("failed to open %s", filename); PanicAlert("Failed to open %s", filename);
return; return;
} }
fprintf(f.GetHandle(), "origAddr\tblkName\tcost\ttimeCost\tpercent\ttimePercent\tOvAllinBlkTime(ms)\tblkCodeSize\n"); fprintf(f.GetHandle(), "origAddr\tblkName\tcost\ttimeCost\tpercent\ttimePercent\tOvAllinBlkTime(ms)\tblkCodeSize\n");

4
Source/Core/Core/Src/PowerPC/PPCAnalyst.cpp
View File

@ -290,7 +290,7 @@ u32 Flatten(u32 address, int *realsize, BlockStats *st, BlockRegStats *gpa,
int capacity_of_merged_addresses, int& size_of_merged_addresses) int capacity_of_merged_addresses, int& size_of_merged_addresses)
{ {
if (capacity_of_merged_addresses < FUNCTION_FOLLOWING_THRESHOLD) { if (capacity_of_merged_addresses < FUNCTION_FOLLOWING_THRESHOLD) {
PanicAlert("capacity of merged_addresses is too small!"); PanicAlert("Capacity of merged_addresses is too small!");
} }
std::fill_n(merged_addresses, capacity_of_merged_addresses, 0); std::fill_n(merged_addresses, capacity_of_merged_addresses, 0);
merged_addresses[0] = address; merged_addresses[0] = address;
@ -697,7 +697,7 @@ void FindFunctions(u32 startAddr, u32 endAddr, PPCSymbolDB *func_db)
{ {
if (iter->second.address == 4) if (iter->second.address == 4)
{ {
WARN_LOG(OSHLE, "weird function"); WARN_LOG(OSHLE, "Weird function");
continue; continue;
} }
AnalyzeFunction2(&(iter->second)); AnalyzeFunction2(&(iter->second));

4
Source/Core/DiscIO/Src/DiscScrubber.cpp
View File

@ -93,7 +93,7 @@ bool SetupScrub(const char* filename, int block_size)
if (CLUSTER_SIZE % m_BlockSize != 0) if (CLUSTER_SIZE % m_BlockSize != 0)
{ {
ERROR_LOG(DISCIO, "block size %i is not a factor of 0x8000, scrubbing not possible", m_BlockSize); ERROR_LOG(DISCIO, "Block size %i is not a factor of 0x8000, scrubbing not possible", m_BlockSize);
return false; return false;
} }
@ -106,7 +106,7 @@ bool SetupScrub(const char* filename, int block_size)
// Warn if not DVD5 or DVD9 size // Warn if not DVD5 or DVD9 size
if (numClusters != 0x23048 && numClusters != 0x46090) if (numClusters != 0x23048 && numClusters != 0x46090)
WARN_LOG(DISCIO, "%s is not a standard sized wii disc! (%x blocks)", filename, numClusters); WARN_LOG(DISCIO, "%s is not a standard sized Wii disc! (%x blocks)", filename, numClusters);
// Table of free blocks // Table of free blocks
m_FreeTable = new u8[numClusters]; m_FreeTable = new u8[numClusters];

2
Source/Core/DolphinWX/Src/FrameTools.cpp
View File

@ -608,7 +608,7 @@ void CFrame::DoOpen(bool Boot)
if (currentDir != currentDir2) if (currentDir != currentDir2)
{ {
PanicAlertT("Current dir changed from %s to %s after wxFileSelector!", PanicAlertT("Current directory changed from %s to %s after wxFileSelector!",
currentDir.c_str(), currentDir2.c_str()); currentDir.c_str(), currentDir2.c_str());
File::SetCurrentDir(currentDir); File::SetCurrentDir(currentDir);
} }

6
Source/Core/DolphinWX/Src/ISOProperties.cpp
View File

@ -698,13 +698,13 @@ void CISOProperties::ExportDir(const char* _rFullPath, const char* _rExportFolde
{ {
if (!strcmp(fst.at(index[0])->m_FullPath, _rFullPath)) if (!strcmp(fst.at(index[0])->m_FullPath, _rFullPath))
{ {
DEBUG_LOG(DISCIO, "Found the Dir at %u", index[0]); DEBUG_LOG(DISCIO, "Found the directory at %u", index[0]);
index[1] = (u32)fst.at(index[0])->m_FileSize; index[1] = (u32)fst.at(index[0])->m_FileSize;
break; break;
} }
} }
DEBUG_LOG(DISCIO,"Dir found from %u to %u\nextracting to:\n%s",index[0],index[1],_rExportFolder); DEBUG_LOG(DISCIO,"Directory found from %u to %u\nextracting to:\n%s",index[0],index[1],_rExportFolder);
} }
wxString dialogTitle = index[0] ? _("Extracting Directory") : _("Extracting All Files"); wxString dialogTitle = index[0] ? _("Extracting Directory") : _("Extracting All Files");
@ -744,7 +744,7 @@ void CISOProperties::ExportDir(const char* _rFullPath, const char* _rExportFolde
if (!File::IsDirectory(exportName)) if (!File::IsDirectory(exportName))
ERROR_LOG(DISCIO, "%s already exists and is not a directory", exportName); ERROR_LOG(DISCIO, "%s already exists and is not a directory", exportName);
DEBUG_LOG(DISCIO, "folder %s already exists", exportName); DEBUG_LOG(DISCIO, "Folder %s already exists", exportName);
} }
} }
else else

2
Source/Core/DolphinWX/Src/Main.cpp
View File

@ -251,7 +251,7 @@ bool DolphinApp::OnInit()
#ifdef _WIN32 #ifdef _WIN32
if (!wxSetWorkingDirectory(StrToWxStr(File::GetExeDirectory()))) if (!wxSetWorkingDirectory(StrToWxStr(File::GetExeDirectory())))
{ {
INFO_LOG(CONSOLE, "set working directory failed"); INFO_LOG(CONSOLE, "Set working directory failed");
} }
#else #else
//create all necessary directories in user directory //create all necessary directories in user directory

2
Source/Core/DolphinWX/Src/MemcardManager.cpp
View File

@ -552,7 +552,7 @@ void CMemcardManager::CopyDeleteClick(wxCommandEvent& event)
std::string gciFilename; std::string gciFilename;
if (!memoryCard[slot]->GCI_FileName(index, gciFilename)) if (!memoryCard[slot]->GCI_FileName(index, gciFilename))
{ {
PanicAlert("invalid index"); PanicAlert("Invalid index");
return; return;
} }
wxString fileName = wxFileSelector( wxString fileName = wxFileSelector(

14
Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp
View File

@ -94,7 +94,7 @@ void CWiiSaveCrypted::ReadHDR()
} }
if (!fpData_bin.ReadBytes(&_encryptedHeader, HEADER_SZ)) if (!fpData_bin.ReadBytes(&_encryptedHeader, HEADER_SZ))
{ {
PanicAlertT("failed to read header"); PanicAlertT("Failed to read header");
b_valid = false; b_valid = false;
return; return;
} }
@ -105,7 +105,7 @@ void CWiiSaveCrypted::ReadHDR()
if ((_bannerSize < FULL_BNR_MIN) || (_bannerSize > FULL_BNR_MAX) || if ((_bannerSize < FULL_BNR_MIN) || (_bannerSize > FULL_BNR_MAX) ||
(((_bannerSize - BNR_SZ) % ICON_SZ) != 0)) (((_bannerSize - BNR_SZ) % ICON_SZ) != 0))
{ {
PanicAlertT("not a wii save or read failure for file header size %x", _bannerSize); PanicAlertT("Not a Wii save or read failure for file header size %x", _bannerSize);
b_valid = false; b_valid = false;
return; return;
} }
@ -127,7 +127,7 @@ void CWiiSaveCrypted::ReadHDR()
} }
if (!File::Exists(BannerFilePath) || AskYesNoT("%s already exists, overwrite?", BannerFilePath.c_str())) if (!File::Exists(BannerFilePath) || AskYesNoT("%s already exists, overwrite?", BannerFilePath.c_str()))
{ {
INFO_LOG(CONSOLE, "creating file %s", BannerFilePath.c_str()); INFO_LOG(CONSOLE, "Creating file %s", BannerFilePath.c_str());
File::IOFile fpBanner_bin(BannerFilePath, "wb"); File::IOFile fpBanner_bin(BannerFilePath, "wb");
fpBanner_bin.WriteBytes(_header.BNR, _bannerSize); fpBanner_bin.WriteBytes(_header.BNR, _bannerSize);
} }
@ -182,7 +182,7 @@ void CWiiSaveCrypted::ReadBKHDR()
fpData_bin.Seek(HEADER_SZ, SEEK_SET); fpData_bin.Seek(HEADER_SZ, SEEK_SET);
if (!fpData_bin.ReadBytes(&bkhdr, BK_SZ)) if (!fpData_bin.ReadBytes(&bkhdr, BK_SZ))
{ {
PanicAlertT("failed to read bk header"); PanicAlertT("Failed to read bk header");
b_valid = false; b_valid = false;
return; return;
} }
@ -203,7 +203,7 @@ void CWiiSaveCrypted::ReadBKHDR()
if (_sizeOfFiles + FULL_CERT_SZ != _totalSize) if (_sizeOfFiles + FULL_CERT_SZ != _totalSize)
WARN_LOG(CONSOLE, "Size(%x) + cert(%x) does not equal totalsize(%x)", _sizeOfFiles, FULL_CERT_SZ, _totalSize); WARN_LOG(CONSOLE, "Size(%x) + cert(%x) does not equal totalsize(%x)", _sizeOfFiles, FULL_CERT_SZ, _totalSize);
if (m_TitleID != Common::swap64(bkhdr.SaveGameTitle)) if (m_TitleID != Common::swap64(bkhdr.SaveGameTitle))
WARN_LOG(CONSOLE, "encrypted title (%llx) does not match unencrypted title (%llx)", m_TitleID, Common::swap64(bkhdr.SaveGameTitle)); WARN_LOG(CONSOLE, "Encrypted title (%llx) does not match unencrypted title (%llx)", m_TitleID, Common::swap64(bkhdr.SaveGameTitle));
} }
void CWiiSaveCrypted::WriteBKHDR() void CWiiSaveCrypted::WriteBKHDR()
@ -295,7 +295,7 @@ void CWiiSaveCrypted::ImportWiiSaveFiles()
if (!File::Exists(fullFilePath) || AskYesNoT("%s already exists, overwrite?", fullFilePath.c_str())) if (!File::Exists(fullFilePath) || AskYesNoT("%s already exists, overwrite?", fullFilePath.c_str()))
{ {
INFO_LOG(CONSOLE, "creating file %s", fullFilePath.c_str()); INFO_LOG(CONSOLE, "Creating file %s", fullFilePath.c_str());
File::IOFile fpRawSaveFile(fullFilePath, "wb"); File::IOFile fpRawSaveFile(fullFilePath, "wb");
fpRawSaveFile.WriteBytes(_data, _fileSize); fpRawSaveFile.WriteBytes(_data, _fileSize);
@ -372,7 +372,7 @@ void CWiiSaveCrypted::ExportWiiSaveFiles()
memset(__data, 0, _roundedfileSize); memset(__data, 0, _roundedfileSize);
if (!fpRawSaveFile.ReadBytes(__data, _fileSize)) if (!fpRawSaveFile.ReadBytes(__data, _fileSize))
{ {
PanicAlertT("failed to read data from file: %s", FilesList[i].c_str()); PanicAlertT("Failed to read data from file: %s", FilesList[i].c_str());
b_valid = false; b_valid = false;
} }

56
Source/Core/VideoCommon/Src/CommandProcessor.cpp
View File

@ -185,7 +185,7 @@ void Read16(u16& _rReturnValue, const u32 _Address)
_rReturnValue = ReadLow (fifo.CPEnd - fifo.SafeCPReadPointer + fifo.CPWritePointer - fifo.CPBase + 32); _rReturnValue = ReadLow (fifo.CPEnd - fifo.SafeCPReadPointer + fifo.CPWritePointer - fifo.CPBase + 32);
else else
_rReturnValue = ReadLow (fifo.CPReadWriteDistance); _rReturnValue = ReadLow (fifo.CPReadWriteDistance);
DEBUG_LOG(COMMANDPROCESSOR, "read FIFO_RW_DISTANCE_LO : %04x", _rReturnValue); DEBUG_LOG(COMMANDPROCESSOR, "Read FIFO_RW_DISTANCE_LO : %04x", _rReturnValue);
return; return;
case FIFO_RW_DISTANCE_HI: case FIFO_RW_DISTANCE_HI:
if (IsOnThread()) if (IsOnThread())
@ -195,29 +195,29 @@ void Read16(u16& _rReturnValue, const u32 _Address)
_rReturnValue = ReadHigh (fifo.CPEnd - fifo.SafeCPReadPointer + fifo.CPWritePointer - fifo.CPBase + 32); _rReturnValue = ReadHigh (fifo.CPEnd - fifo.SafeCPReadPointer + fifo.CPWritePointer - fifo.CPBase + 32);
else else
_rReturnValue = ReadHigh(fifo.CPReadWriteDistance); _rReturnValue = ReadHigh(fifo.CPReadWriteDistance);
DEBUG_LOG(COMMANDPROCESSOR, "read FIFO_RW_DISTANCE_HI : %04x", _rReturnValue); DEBUG_LOG(COMMANDPROCESSOR, "Read FIFO_RW_DISTANCE_HI : %04x", _rReturnValue);
return; return;
case FIFO_WRITE_POINTER_LO: case FIFO_WRITE_POINTER_LO:
_rReturnValue = ReadLow (fifo.CPWritePointer); _rReturnValue = ReadLow (fifo.CPWritePointer);
DEBUG_LOG(COMMANDPROCESSOR, "read FIFO_WRITE_POINTER_LO : %04x", _rReturnValue); DEBUG_LOG(COMMANDPROCESSOR, "Read FIFO_WRITE_POINTER_LO : %04x", _rReturnValue);
return; return;
case FIFO_WRITE_POINTER_HI: case FIFO_WRITE_POINTER_HI:
_rReturnValue = ReadHigh(fifo.CPWritePointer); _rReturnValue = ReadHigh(fifo.CPWritePointer);
DEBUG_LOG(COMMANDPROCESSOR, "read FIFO_WRITE_POINTER_HI : %04x", _rReturnValue); DEBUG_LOG(COMMANDPROCESSOR, "Read FIFO_WRITE_POINTER_HI : %04x", _rReturnValue);
return; return;
case FIFO_READ_POINTER_LO: case FIFO_READ_POINTER_LO:
if (IsOnThread()) if (IsOnThread())
_rReturnValue = ReadLow (fifo.SafeCPReadPointer); _rReturnValue = ReadLow (fifo.SafeCPReadPointer);
else else
_rReturnValue = ReadLow (fifo.CPReadPointer); _rReturnValue = ReadLow (fifo.CPReadPointer);
DEBUG_LOG(COMMANDPROCESSOR, "read FIFO_READ_POINTER_LO : %04x", _rReturnValue); DEBUG_LOG(COMMANDPROCESSOR, "Read FIFO_READ_POINTER_LO : %04x", _rReturnValue);
return; return;
case FIFO_READ_POINTER_HI: case FIFO_READ_POINTER_HI:
if (IsOnThread()) if (IsOnThread())
_rReturnValue = ReadHigh (fifo.SafeCPReadPointer); _rReturnValue = ReadHigh (fifo.SafeCPReadPointer);
else else
_rReturnValue = ReadHigh (fifo.CPReadPointer); _rReturnValue = ReadHigh (fifo.CPReadPointer);
DEBUG_LOG(COMMANDPROCESSOR, "read FIFO_READ_POINTER_HI : %04x", _rReturnValue); DEBUG_LOG(COMMANDPROCESSOR, "Read FIFO_READ_POINTER_HI : %04x", _rReturnValue);
return; return;
case FIFO_BP_LO: _rReturnValue = ReadLow (fifo.CPBreakpoint); return; case FIFO_BP_LO: _rReturnValue = ReadLow (fifo.CPBreakpoint); return;
@ -326,83 +326,83 @@ void Write16(const u16 _Value, const u32 _Address)
{ {
UCPClearReg tmpCtrl(_Value); UCPClearReg tmpCtrl(_Value);
m_CPClearReg.Hex = tmpCtrl.Hex; m_CPClearReg.Hex = tmpCtrl.Hex;
DEBUG_LOG(COMMANDPROCESSOR,"\t write to CLEAR_REGISTER : %04x", _Value); DEBUG_LOG(COMMANDPROCESSOR,"\t Write to CLEAR_REGISTER : %04x", _Value);
SetCpClearRegister(); SetCpClearRegister();
} }
break; break;
case PERF_SELECT: case PERF_SELECT:
// Seems to select which set of perf registers should be exposed. // Seems to select which set of perf registers should be exposed.
DEBUG_LOG(COMMANDPROCESSOR, "write to PERF_SELECT: %04x", _Value); DEBUG_LOG(COMMANDPROCESSOR, "Write to PERF_SELECT: %04x", _Value);
break; break;
// Fifo Registers // Fifo Registers
case FIFO_TOKEN_REGISTER: case FIFO_TOKEN_REGISTER:
m_tokenReg = _Value; m_tokenReg = _Value;
DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_TOKEN_REGISTER : %04x", _Value); DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_TOKEN_REGISTER : %04x", _Value);
break; break;
case FIFO_BASE_LO: case FIFO_BASE_LO:
WriteLow ((u32 &)fifo.CPBase, _Value & 0xFFE0); WriteLow ((u32 &)fifo.CPBase, _Value & 0xFFE0);
DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_BASE_LO : %04x", _Value); DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_BASE_LO : %04x", _Value);
break; break;
case FIFO_BASE_HI: case FIFO_BASE_HI:
WriteHigh((u32 &)fifo.CPBase, _Value); WriteHigh((u32 &)fifo.CPBase, _Value);
DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_BASE_HI : %04x", _Value); DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_BASE_HI : %04x", _Value);
break; break;
case FIFO_END_LO: case FIFO_END_LO:
WriteLow ((u32 &)fifo.CPEnd, _Value & 0xFFE0); WriteLow ((u32 &)fifo.CPEnd, _Value & 0xFFE0);
DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_END_LO : %04x", _Value); DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_END_LO : %04x", _Value);
break; break;
case FIFO_END_HI: case FIFO_END_HI:
WriteHigh((u32 &)fifo.CPEnd, _Value); WriteHigh((u32 &)fifo.CPEnd, _Value);
DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_END_HI : %04x", _Value); DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_END_HI : %04x", _Value);
break; break;
case FIFO_WRITE_POINTER_LO: case FIFO_WRITE_POINTER_LO:
WriteLow ((u32 &)fifo.CPWritePointer, _Value & 0xFFE0); WriteLow ((u32 &)fifo.CPWritePointer, _Value & 0xFFE0);
DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_WRITE_POINTER_LO : %04x", _Value); DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_WRITE_POINTER_LO : %04x", _Value);
break; break;
case FIFO_WRITE_POINTER_HI: case FIFO_WRITE_POINTER_HI:
WriteHigh((u32 &)fifo.CPWritePointer, _Value); WriteHigh((u32 &)fifo.CPWritePointer, _Value);
DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_WRITE_POINTER_HI : %04x", _Value); DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_WRITE_POINTER_HI : %04x", _Value);
break; break;
case FIFO_READ_POINTER_LO: case FIFO_READ_POINTER_LO:
WriteLow ((u32 &)fifo.CPReadPointer, _Value & 0xFFE0); WriteLow ((u32 &)fifo.CPReadPointer, _Value & 0xFFE0);
DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_READ_POINTER_LO : %04x", _Value); DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_READ_POINTER_LO : %04x", _Value);
break; break;
case FIFO_READ_POINTER_HI: case FIFO_READ_POINTER_HI:
WriteHigh((u32 &)fifo.CPReadPointer, _Value); WriteHigh((u32 &)fifo.CPReadPointer, _Value);
fifo.SafeCPReadPointer = fifo.CPReadPointer; fifo.SafeCPReadPointer = fifo.CPReadPointer;
DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_READ_POINTER_HI : %04x", _Value); DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_READ_POINTER_HI : %04x", _Value);
break; break;
case FIFO_HI_WATERMARK_LO: case FIFO_HI_WATERMARK_LO:
WriteLow ((u32 &)fifo.CPHiWatermark, _Value); WriteLow ((u32 &)fifo.CPHiWatermark, _Value);
DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_HI_WATERMARK_LO : %04x", _Value); DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_HI_WATERMARK_LO : %04x", _Value);
break; break;
case FIFO_HI_WATERMARK_HI: case FIFO_HI_WATERMARK_HI:
WriteHigh((u32 &)fifo.CPHiWatermark, _Value); WriteHigh((u32 &)fifo.CPHiWatermark, _Value);
DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_HI_WATERMARK_HI : %04x", _Value); DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_HI_WATERMARK_HI : %04x", _Value);
break; break;
case FIFO_LO_WATERMARK_LO: case FIFO_LO_WATERMARK_LO:
WriteLow ((u32 &)fifo.CPLoWatermark, _Value); WriteLow ((u32 &)fifo.CPLoWatermark, _Value);
DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_LO_WATERMARK_LO : %04x", _Value); DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_LO_WATERMARK_LO : %04x", _Value);
break; break;
case FIFO_LO_WATERMARK_HI: case FIFO_LO_WATERMARK_HI:
WriteHigh((u32 &)fifo.CPLoWatermark, _Value); WriteHigh((u32 &)fifo.CPLoWatermark, _Value);
DEBUG_LOG(COMMANDPROCESSOR,"\t write to FIFO_LO_WATERMARK_HI : %04x", _Value); DEBUG_LOG(COMMANDPROCESSOR,"\t Write to FIFO_LO_WATERMARK_HI : %04x", _Value);
break; break;
case FIFO_BP_LO: case FIFO_BP_LO:
WriteLow ((u32 &)fifo.CPBreakpoint, _Value & 0xFFE0); WriteLow ((u32 &)fifo.CPBreakpoint, _Value & 0xFFE0);
DEBUG_LOG(COMMANDPROCESSOR,"write to FIFO_BP_LO : %04x", _Value); DEBUG_LOG(COMMANDPROCESSOR,"Write to FIFO_BP_LO : %04x", _Value);
break; break;
case FIFO_BP_HI: case FIFO_BP_HI:
WriteHigh((u32 &)fifo.CPBreakpoint, _Value); WriteHigh((u32 &)fifo.CPBreakpoint, _Value);
DEBUG_LOG(COMMANDPROCESSOR,"write to FIFO_BP_HI : %04x", _Value); DEBUG_LOG(COMMANDPROCESSOR,"Write to FIFO_BP_HI : %04x", _Value);
break; break;
case FIFO_RW_DISTANCE_HI: case FIFO_RW_DISTANCE_HI:
@ -417,11 +417,11 @@ void Write16(const u16 _Value, const u32 _Address)
ResetVideoBuffer(); ResetVideoBuffer();
} }
IncrementCheckContextId(); IncrementCheckContextId();
DEBUG_LOG(COMMANDPROCESSOR,"try to write to FIFO_RW_DISTANCE_HI : %04x", _Value); DEBUG_LOG(COMMANDPROCESSOR,"Try to write to FIFO_RW_DISTANCE_HI : %04x", _Value);
break; break;
case FIFO_RW_DISTANCE_LO: case FIFO_RW_DISTANCE_LO:
WriteLow((u32 &)fifo.CPReadWriteDistance, _Value & 0xFFE0); WriteLow((u32 &)fifo.CPReadWriteDistance, _Value & 0xFFE0);
DEBUG_LOG(COMMANDPROCESSOR,"try to write to FIFO_RW_DISTANCE_LO : %04x", _Value); DEBUG_LOG(COMMANDPROCESSOR,"Try to write to FIFO_RW_DISTANCE_LO : %04x", _Value);
break; break;
default: default:
@ -453,7 +453,7 @@ void STACKALIGN GatherPipeBursted()
RunGpu(); RunGpu();
else else
{ {
// In multibuffer mode is not allowed write in the same fifo attached to the GPU. // In multibuffer mode is not allowed write in the same FIFO attached to the GPU.
// Fix Pokemon XD in DC mode. // Fix Pokemon XD in DC mode.
if((ProcessorInterface::Fifo_CPUEnd == fifo.CPEnd) && (ProcessorInterface::Fifo_CPUBase == fifo.CPBase) if((ProcessorInterface::Fifo_CPUEnd == fifo.CPEnd) && (ProcessorInterface::Fifo_CPUBase == fifo.CPBase)
&& fifo.CPReadWriteDistance > 0) && fifo.CPReadWriteDistance > 0)
@ -469,7 +469,7 @@ void STACKALIGN GatherPipeBursted()
if (IsOnThread()) if (IsOnThread())
SetCpStatus(true); SetCpStatus(true);
// update the fifo-pointer // update the fifo pointer
if (fifo.CPWritePointer >= fifo.CPEnd) if (fifo.CPWritePointer >= fifo.CPEnd)
fifo.CPWritePointer = fifo.CPBase; fifo.CPWritePointer = fifo.CPBase;
else else
@ -481,7 +481,7 @@ void STACKALIGN GatherPipeBursted()
RunGpu(); RunGpu();
_assert_msg_(COMMANDPROCESSOR, fifo.CPReadWriteDistance <= fifo.CPEnd - fifo.CPBase, _assert_msg_(COMMANDPROCESSOR, fifo.CPReadWriteDistance <= fifo.CPEnd - fifo.CPBase,
"FIFO is overflown by GatherPipe !\nCPU thread is too fast!"); "FIFO is overflowed by GatherPipe !\nCPU thread is too fast!");
// check if we are in sync // check if we are in sync
_assert_msg_(COMMANDPROCESSOR, fifo.CPWritePointer == ProcessorInterface::Fifo_CPUWritePointer, "FIFOs linked but out of sync"); _assert_msg_(COMMANDPROCESSOR, fifo.CPWritePointer == ProcessorInterface::Fifo_CPUWritePointer, "FIFOs linked but out of sync");

2
Source/Core/VideoCommon/Src/HiresTextures.cpp
View File

@ -148,7 +148,7 @@ PC_TexFormat GetHiresTex(const char *fileName, unsigned int *pWidth, unsigned in
break; break;
} }
INFO_LOG(VIDEO, "loading custom texture from %s", textureMap[key].c_str()); INFO_LOG(VIDEO, "Loading custom texture from %s", textureMap[key].c_str());
cleanup: cleanup:
SOIL_free_image_data(temp); SOIL_free_image_data(temp);
return returnTex; return returnTex;

2
Source/Core/VideoCommon/Src/VertexLoader.cpp
View File

@ -227,7 +227,7 @@ void VertexLoader::CompileVertexTranslator()
#ifdef USE_JIT #ifdef USE_JIT
if (m_compiledCode) if (m_compiledCode)
PanicAlert("trying to recompile a vtx translator"); PanicAlert("Trying to recompile a vtx translator");
m_compiledCode = GetCodePtr(); m_compiledCode = GetCodePtr();
ABI_EmitPrologue(4); ABI_EmitPrologue(4);

4
Source/Core/VideoCommon/Src/VertexManagerBase.cpp
View File

@ -57,7 +57,7 @@ void VertexManager::PrepareForAdditionalData(int primitive, u32 count, u32 strid
Flush(); Flush();
if(count > IndexGenerator::GetRemainingIndices()) if(count > IndexGenerator::GetRemainingIndices())
ERROR_LOG(VIDEO, "Too less index values. Use 32bit or reset them on flush."); ERROR_LOG(VIDEO, "Too little remaining index values. Use 32-bit or reset them on flush.");
if (count > GetRemainingIndices(primitive)) if (count > GetRemainingIndices(primitive))
ERROR_LOG(VIDEO, "VertexManager: Buffer not large enough for all indices! " ERROR_LOG(VIDEO, "VertexManager: Buffer not large enough for all indices! "
"Increase MAXIBUFFERSIZE or we need primitive breaking after all."); "Increase MAXIBUFFERSIZE or we need primitive breaking after all.");
@ -190,7 +190,7 @@ void VertexManager::Flush()
PixelShaderManager::SetTexDims(i, tentry->nativeW, tentry->nativeH, 0, 0); PixelShaderManager::SetTexDims(i, tentry->nativeW, tentry->nativeH, 0, 0);
} }
else else
ERROR_LOG(VIDEO, "error loading texture"); ERROR_LOG(VIDEO, "Error loading texture");
} }
} }

2
Source/Core/VideoCommon/Src/VertexShaderManager.cpp
View File

@ -455,7 +455,7 @@ void VertexShaderManager::SetConstants()
break; break;
default: default:
ERROR_LOG(VIDEO, "unknown projection type: %d", xfregs.projection.type); ERROR_LOG(VIDEO, "Unknown projection type: %d", xfregs.projection.type);
} }
PRIM_LOG("Projection: %f %f %f %f %f %f\n", rawProjection[0], rawProjection[1], rawProjection[2], rawProjection[3], rawProjection[4], rawProjection[5]); PRIM_LOG("Projection: %f %f %f %f %f %f\n", rawProjection[0], rawProjection[1], rawProjection[2], rawProjection[3], rawProjection[4], rawProjection[5]);

2
Source/Plugins/Plugin_VideoDX11/Src/PSTextureEncoder.cpp
View File

@ -1351,7 +1351,7 @@ bool PSTextureEncoder::InitDynamicMode()
var = reflect->GetVariableByName("g_generator"); var = reflect->GetVariableByName("g_generator");
m_generatorSlot = var->GetInterfaceSlot(0); m_generatorSlot = var->GetInterfaceSlot(0);
INFO_LOG(VIDEO, "fetch slot %d, scaledFetch slot %d, intensity slot %d, generator slot %d", INFO_LOG(VIDEO, "Fetch slot %d, scaledFetch slot %d, intensity slot %d, generator slot %d",
m_fetchSlot, m_scaledFetchSlot, m_intensitySlot, m_generatorSlot); m_fetchSlot, m_scaledFetchSlot, m_intensitySlot, m_generatorSlot);
// Class instances will be created at the time they are used // Class instances will be created at the time they are used

2
Source/Plugins/Plugin_VideoDX11/Src/PerfQuery.cpp
View File

@ -36,7 +36,7 @@ void PerfQuery::EnableQuery(PerfQueryGroup type)
{ {
// TODO // TODO
FlushOne(); FlushOne();
ERROR_LOG(VIDEO, "flushed query buffer early!"); ERROR_LOG(VIDEO, "Flushed query buffer early!");
} }
// start query // start query

2
Source/Plugins/Plugin_VideoDX9/Src/NativeVertexFormat.cpp
View File

@ -187,7 +187,7 @@ void D3DVertexFormat::SetupVertexPointers()
if (d3d_decl) if (d3d_decl)
DX9::D3D::SetVertexDeclaration(d3d_decl); DX9::D3D::SetVertexDeclaration(d3d_decl);
else else
ERROR_LOG(VIDEO, "invalid d3d decl"); ERROR_LOG(VIDEO, "Invalid D3D decl");
} }
} // namespace DX9 } // namespace DX9

2
Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
View File

@ -353,7 +353,7 @@ void VertexManager::vFlush()
PixelShaderManager::SetTexDims(i, tentry->native_width, tentry->native_height, 0, 0); PixelShaderManager::SetTexDims(i, tentry->native_width, tentry->native_height, 0, 0);
} }
else else
ERROR_LOG(VIDEO, "error loading texture"); ERROR_LOG(VIDEO, "Error loading texture");
} }
} }

2
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
View File

@ -147,7 +147,7 @@ void OpenGL_ReportARBProgramError()
{ {
GLint loc = 0; GLint loc = 0;
glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &loc); glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &loc);
ERROR_LOG(VIDEO, "program error at %d: ", loc); ERROR_LOG(VIDEO, "Program error at %d: ", loc);
ERROR_LOG(VIDEO, "%s", (char*)pstr); ERROR_LOG(VIDEO, "%s", (char*)pstr);
ERROR_LOG(VIDEO, "\n"); ERROR_LOG(VIDEO, "\n");
} }

2
Source/Plugins/Plugin_VideoOGL/Src/PerfQuery.cpp
View File

@ -30,7 +30,7 @@ void PerfQuery::EnableQuery(PerfQueryGroup type)
if (ARRAYSIZE(m_query_buffer) == m_query_count) if (ARRAYSIZE(m_query_buffer) == m_query_count)
{ {
FlushOne(); FlushOne();
//ERROR_LOG(VIDEO, "flushed query buffer early!"); //ERROR_LOG(VIDEO, "Flushed query buffer early!");
} }
// start query // start query

2
Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp
View File

@ -165,7 +165,7 @@ void ApplyShader()
std::string code; std::string code;
std::string path = File::GetUserPath(D_SHADERS_IDX) + g_ActiveConfig.sPostProcessingShader + ".txt"; std::string path = File::GetUserPath(D_SHADERS_IDX) + g_ActiveConfig.sPostProcessingShader + ".txt";
if(!File::ReadFileToString(true, path.c_str(), code)) { if(!File::ReadFileToString(true, path.c_str(), code)) {
ERROR_LOG(VIDEO, "post-processing shader not found: %s", path.c_str()); ERROR_LOG(VIDEO, "Post-processing shader not found: %s", path.c_str());
return; return;
} }

8
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
View File

@ -181,7 +181,7 @@ int GetNumMSAASamples(int MSAAMode)
if(samples <= g_ogl_config.max_samples) return samples; if(samples <= g_ogl_config.max_samples) return samples;
ERROR_LOG(VIDEO, "MSAA Bug: %d samples selected, but only %d supported by gpu.", samples, g_ogl_config.max_samples); ERROR_LOG(VIDEO, "MSAA Bug: %d samples selected, but only %d supported by GPU.", samples, g_ogl_config.max_samples);
return g_ogl_config.max_samples; return g_ogl_config.max_samples;
} }
@ -205,7 +205,7 @@ int GetNumMSAACoverageSamples(int MSAAMode)
} }
if(g_ogl_config.bSupportCoverageMSAA || samples == 0) return samples; if(g_ogl_config.bSupportCoverageMSAA || samples == 0) return samples;
ERROR_LOG(VIDEO, "MSAA Bug: CSAA selected, but not supported by gpu."); ERROR_LOG(VIDEO, "MSAA Bug: CSAA selected, but not supported by GPU.");
return 0; return 0;
} }
@ -215,7 +215,7 @@ void ApplySSAASettings() {
glEnable(GL_SAMPLE_SHADING_ARB); glEnable(GL_SAMPLE_SHADING_ARB);
glMinSampleShadingARB(s_MSAASamples); glMinSampleShadingARB(s_MSAASamples);
} else { } else {
ERROR_LOG(VIDEO, "MSAA Bug: SSAA selected, but not supported by gpu."); ERROR_LOG(VIDEO, "MSAA Bug: SSAA selected, but not supported by GPU.");
} }
} else if(g_ogl_config.bSupportSampleShading) { } else if(g_ogl_config.bSupportSampleShading) {
glDisable(GL_SAMPLE_SHADING_ARB); glDisable(GL_SAMPLE_SHADING_ARB);
@ -320,7 +320,7 @@ Renderer::Renderer()
!strcmp(g_ogl_config.gl_version, "3.0 Mesa 9.1.1") ) !strcmp(g_ogl_config.gl_version, "3.0 Mesa 9.1.1") )
)) { )) {
g_Config.backend_info.bSupportsGLSLUBO = false; g_Config.backend_info.bSupportsGLSLUBO = false;
ERROR_LOG(VIDEO, "buggy driver detected. Disable UBO"); ERROR_LOG(VIDEO, "Buggy driver detected. Disable UBO");
} }
UpdateActiveConfig(); UpdateActiveConfig();

6
Source/Plugins/Plugin_VideoOGL/Src/StreamBuffer.cpp
View File

@ -141,7 +141,7 @@ size_t StreamBuffer::Upload ( u8* data, size_t size )
memcpy(pointer, data, size); memcpy(pointer, data, size);
glUnmapBuffer(m_buffertype); glUnmapBuffer(m_buffertype);
} else { } else {
ERROR_LOG(VIDEO, "buffer mapping failed"); ERROR_LOG(VIDEO, "Buffer mapping failed");
} }
break; break;
case PINNED_MEMORY: case PINNED_MEMORY:
@ -192,7 +192,7 @@ void StreamBuffer::Init()
// on error, switch to another backend. some old catalyst seems to have broken pinned memory support // on error, switch to another backend. some old catalyst seems to have broken pinned memory support
if(glGetError() != GL_NO_ERROR) { if(glGetError() != GL_NO_ERROR) {
ERROR_LOG(VIDEO, "pinned memory detected, but not working. Please report this: %s, %s, %s", g_ogl_config.gl_vendor, g_ogl_config.gl_renderer, g_ogl_config.gl_version); ERROR_LOG(VIDEO, "Pinned memory detected, but not working. Please report this: %s, %s, %s", g_ogl_config.gl_vendor, g_ogl_config.gl_renderer, g_ogl_config.gl_version);
Shutdown(); Shutdown();
m_uploadtype = MAP_AND_SYNC; m_uploadtype = MAP_AND_SYNC;
Init(); Init();
@ -204,7 +204,7 @@ void StreamBuffer::Init()
pointer = (u8*)glMapBuffer(m_buffertype, GL_WRITE_ONLY); pointer = (u8*)glMapBuffer(m_buffertype, GL_WRITE_ONLY);
glUnmapBuffer(m_buffertype); glUnmapBuffer(m_buffertype);
if(!pointer) if(!pointer)
ERROR_LOG(VIDEO, "buffer allocation failed"); ERROR_LOG(VIDEO, "Buffer allocation failed");
case STREAM_DETECT: case STREAM_DETECT:
case DETECT_MASK: // Just to shutup warnings case DETECT_MASK: // Just to shutup warnings