piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Added puts() HLE, WIIMOTE logging section and experimental virtual connection request.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@427 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
masken
2008-09-01 21:29:27 +00:00
parent b1cd01819b
commit 012041bab5
8 changed files with 828 additions and 807 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Binary/win32/WII/shared2/sys/SYSCONF
View File

Binary file not shown.

3
Source/Core/Common/Src/Common.h
View File

@ -193,6 +193,7 @@ class LogTypes
WII_IOB, WII_IOB,
WII_IPC, WII_IPC,
WII_IPC_HLE, WII_IPC_HLE,
WIIMOTE,
NUMBER_OF_LOGS NUMBER_OF_LOGS
}; };
}; };
@ -224,8 +225,10 @@ void Host_UpdateLogDisplay();
#define LOG(_t_, ...) #define LOG(_t_, ...)
#define _dbg_clear_() #define _dbg_clear_()
#ifndef _dbg_assert_
#define _dbg_assert_(_t_, _a_) ; #define _dbg_assert_(_t_, _a_) ;
#define _dbg_assert_msg_(_t_, _a_, _desc_, ...) ; #define _dbg_assert_msg_(_t_, _a_, _desc_, ...) ;
#endif
#define _dbg_update_() ; #define _dbg_update_() ;
#endif #endif

35
Source/Core/Core/Src/HLE/HLE.cpp
View File

@ -50,21 +50,22 @@ static const SPatch OSPatches[] =
{ {
{ "FAKE_TO_SKIP_0", HLE_Misc::UnimplementedFunction }, { "FAKE_TO_SKIP_0", HLE_Misc::UnimplementedFunction },
// speedup // speedup
{ "OSProtectRange", HLE_Misc::UnimplementedFunctionFalse }, { "OSProtectRange", HLE_Misc::UnimplementedFunctionFalse },
// { "THPPlayerGetState", HLE_Misc:THPPlayerGetState }, // { "THPPlayerGetState", HLE_Misc:THPPlayerGetState },
// debug out is very nice ;) // debug out is very nice ;)
{ "OSReport", HLE_OS::HLE_OSReport }, { "OSReport", HLE_OS::HLE_OSReport },
{ "OSPanic", HLE_OS::HLE_OSPanic }, { "OSPanic", HLE_OS::HLE_OSPanic },
{ "vprintf", HLE_OS::HLE_vprintf }, { "vprintf", HLE_OS::HLE_vprintf },
{ "printf", HLE_OS::HLE_printf }, { "printf", HLE_OS::HLE_printf },
{ "puts", HLE_OS::HLE_printf }, //gcc-optimized printf?
// wii only // wii only
{ "SCCheckStatus", HLE_Misc::UnimplementedFunctionFalse }, { "SCCheckStatus", HLE_Misc::UnimplementedFunctionFalse },
{ "__OSInitAudioSystem", HLE_Misc::UnimplementedFunction }, { "__OSInitAudioSystem", HLE_Misc::UnimplementedFunction },
// Super Monkey Ball // Super Monkey Ball
{ ".evil_vec_cosine", HLE_Misc::SMB_EvilVecCosine }, { ".evil_vec_cosine", HLE_Misc::SMB_EvilVecCosine },
{ ".evil_normalize", HLE_Misc::SMB_EvilNormalize }, { ".evil_normalize", HLE_Misc::SMB_EvilNormalize },
@ -74,9 +75,9 @@ static const SPatch OSPatches[] =
{ ".rsqrt_internal_needs_cr1", HLE_Misc::SMB_rsqrt_internal }, { ".rsqrt_internal_needs_cr1", HLE_Misc::SMB_rsqrt_internal },
{ ".atan2", HLE_Misc::SMB_atan2}, { ".atan2", HLE_Misc::SMB_atan2},
// special // special
// { "GXPeekZ", HLE_Misc::GXPeekZ}, // { "GXPeekZ", HLE_Misc::GXPeekZ},
// { "GXPeekARGB", HLE_Misc::GXPeekARGB}, // { "GXPeekARGB", HLE_Misc::GXPeekARGB},
}; };
static const SPatch OSBreakPoints[] = static const SPatch OSBreakPoints[] =
@ -106,7 +107,7 @@ void PatchFunctions()
u32 HLEPatchValue = (1 & 0x3f) << 26; u32 HLEPatchValue = (1 & 0x3f) << 26;
for (size_t addr = symbol->address; addr < symbol->address + symbol->size; addr += 4) for (size_t addr = symbol->address; addr < symbol->address + symbol->size; addr += 4)
Memory::Write_U32(HLEPatchValue | i, addr); Memory::Write_U32(HLEPatchValue | i, addr);
LOG(HLE,"Patching %s %08x", OSPatches[i].m_szPatchName, symbol->address); LOG(HLE,"Patching %s %08x", OSPatches[i].m_szPatchName, symbol->address);
} }
} }
@ -115,12 +116,12 @@ void PatchFunctions()
Symbol *symbol = g_symbolDB.GetSymbolFromName(OSPatches[i].m_szPatchName); Symbol *symbol = g_symbolDB.GetSymbolFromName(OSPatches[i].m_szPatchName);
if (symbol > 0) if (symbol > 0)
{ {
CBreakPoints::AddBreakPoint(symbol->address, false); CBreakPoints::AddBreakPoint(symbol->address, false);
LOG(HLE,"Adding BP to %s %08x", OSBreakPoints[i].m_szPatchName, symbol->address); LOG(HLE,"Adding BP to %s %08x", OSBreakPoints[i].m_szPatchName, symbol->address);
} }
} }
// CBreakPoints::AddBreakPoint(0x8000D3D0, false); // CBreakPoints::AddBreakPoint(0x8000D3D0, false);
} }
void Execute(u32 _CurrentPC, u32 _Instruction) void Execute(u32 _CurrentPC, u32 _Instruction)
@ -135,7 +136,7 @@ void Execute(u32 _CurrentPC, u32 _Instruction)
PanicAlert("HLE system tried to call an undefined HLE function %i.", FunctionIndex); PanicAlert("HLE system tried to call an undefined HLE function %i.", FunctionIndex);
} }
// _dbg_assert_msg_(HLE,NPC == LR, "Broken HLE function (doesn't set NPC)", OSPatches[pos].m_szPatchName); // _dbg_assert_msg_(HLE,NPC == LR, "Broken HLE function (doesn't set NPC)", OSPatches[pos].m_szPatchName);
} }
} }

126
Source/Core/Core/Src/HLE/HLE_OS.cpp
View File

@ -31,22 +31,22 @@ void GetStringVA(std::string& _rOutBuffer);
void HLE_OSPanic() void HLE_OSPanic()
{ {
std::string Error; std::string Error;
GetStringVA(Error); GetStringVA(Error);
PanicAlert("OSPanic: %s", Error.c_str()); PanicAlert("OSPanic: %s", Error.c_str());
LOG(OSREPORT,"(PC=%08x), OSPanic: %s", LR, Error.c_str()); LOG(OSREPORT,"(PC=%08x), OSPanic: %s", LR, Error.c_str());
NPC = LR; NPC = LR;
} }
void HLE_OSReport() void HLE_OSReport()
{ {
std::string ReportMessage; std::string ReportMessage;
GetStringVA(ReportMessage); GetStringVA(ReportMessage);
// PanicAlert("(PC=%08x) OSReport: %s", LR, ReportMessage.c_str()); // PanicAlert("(PC=%08x) OSReport: %s", LR, ReportMessage.c_str());
LOG(OSREPORT,"(PC=%08x) OSReport: %s", LR, ReportMessage.c_str()); LOG(OSREPORT,"(PC=%08x) OSReport: %s", LR, ReportMessage.c_str());
NPC = LR; NPC = LR;
@ -54,77 +54,79 @@ void HLE_OSReport()
void HLE_vprintf() void HLE_vprintf()
{ {
std::string ReportMessage; std::string ReportMessage;
GetStringVA(ReportMessage); GetStringVA(ReportMessage);
LOG(OSREPORT,"(PC=%08x) VPrintf: %s", LR, ReportMessage.c_str()); LOG(OSREPORT,"(PC=%08x) VPrintf: %s", LR, ReportMessage.c_str());
NPC = LR; NPC = LR;
} }
void HLE_printf() void HLE_printf()
{ {
std::string ReportMessage; std::string ReportMessage;
GetStringVA(ReportMessage); GetStringVA(ReportMessage);
LOG(OSREPORT,"(PC=%08x) Printf: %s ", LR, ReportMessage.c_str()); LOG(OSREPORT,"(PC=%08x) Printf: %s ", LR, ReportMessage.c_str());
NPC = LR; NPC = LR;
} }
void GetStringVA(std::string& _rOutBuffer) void GetStringVA(std::string& _rOutBuffer)
{ {
char ArgumentBuffer[256]; char ArgumentBuffer[256];
u32 ParameterCounter = 4; u32 ParameterCounter = 4;
char* pString = (char*)Memory::GetPointer(GPR(3)); char* pString = (char*)Memory::GetPointer(GPR(3));
while(*pString) while(*pString)
{ {
if (*pString == '%') if (*pString == '%')
{ {
char* pArgument = ArgumentBuffer; char* pArgument = ArgumentBuffer;
*pArgument++ = *pString++; *pArgument++ = *pString++;
while(*pString < 'A' || *pString > 'z' || *pString == 'l' || *pString == '-') while(*pString < 'A' || *pString > 'z' || *pString == 'l' || *pString == '-')
*pArgument++ = *pString++; *pArgument++ = *pString++;
*pArgument++ = *pString; *pArgument++ = *pString;
*pArgument = NULL; *pArgument = NULL;
u32 Parameter; u32 Parameter;
if (ParameterCounter > 10) if (ParameterCounter > 10)
{ {
Parameter = Memory::Read_U32(GPR(1) + 0x8 + ((ParameterCounter - 11) * 4)); Parameter = Memory::Read_U32(GPR(1) + 0x8 + ((ParameterCounter - 11) * 4));
} }
else else
{ {
Parameter = GPR(ParameterCounter); Parameter = GPR(ParameterCounter);
} }
ParameterCounter++; ParameterCounter++;
switch(*pString) switch(*pString)
{ {
case 's': case 's':
_rOutBuffer += StringFromFormat(ArgumentBuffer, (char*)Memory::GetPointer(Parameter)); _rOutBuffer += StringFromFormat(ArgumentBuffer, (char*)Memory::GetPointer(Parameter));
break; break;
case 'd': case 'd':
{ {
//u64 Double = Memory::Read_U64(Parameter); //u64 Double = Memory::Read_U64(Parameter);
_rOutBuffer += StringFromFormat(ArgumentBuffer, Parameter); _rOutBuffer += StringFromFormat(ArgumentBuffer, Parameter);
} }
break; break;
default: default:
_rOutBuffer += StringFromFormat(ArgumentBuffer, Parameter); _rOutBuffer += StringFromFormat(ArgumentBuffer, Parameter);
break; break;
} }
pString++; pString++;
} }
else else
{ {
_rOutBuffer += StringFromFormat("%c", *pString); _rOutBuffer += StringFromFormat("%c", *pString);
pString++; pString++;
} }
} }
if(_rOutBuffer[_rOutBuffer.length() - 1] == '\n')
_rOutBuffer.resize(_rOutBuffer.length() - 1);
} }
} }

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

File diff suppressed because it is too large Load Diff

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

@ -113,12 +113,9 @@ struct SL2CAP_CommandConfigurationResponse // 0x05
#endif #endif
#define USB_HLE_LOG DSPHLE
CWII_IPC_HLE_WiiMote::CWII_IPC_HLE_WiiMote(CWII_IPC_HLE_Device_usb_oh1_57e_305* _pHost, int _Number) CWII_IPC_HLE_WiiMote::CWII_IPC_HLE_WiiMote(CWII_IPC_HLE_Device_usb_oh1_57e_305* _pHost, int _Number)
: m_Name("Nintendo RVL-CNT-01") : m_Name("Nintendo RVL-CNT-01")
, m_pHost(_pHost) , m_pHost(_pHost)
{ {
m_BD.b[0] = 0x11; m_BD.b[0] = 0x11;
m_BD.b[1] = 0x02; m_BD.b[1] = 0x02;
@ -147,7 +144,7 @@ void CWII_IPC_HLE_WiiMote::SendACLFrame(u8* _pData, u32 _Size)
{ {
// dump raw data // dump raw data
{ {
LOG(USB_HLE_LOG, "SendToDevice: 0x%x", GetConnectionHandle()); LOG(WIIMOTE, "SendToDevice: 0x%x", GetConnectionHandle());
std::string Temp; std::string Temp;
for (u32 j=0; j<_Size; j++) for (u32 j=0; j<_Size; j++)
{ {
@ -155,7 +152,7 @@ void CWII_IPC_HLE_WiiMote::SendACLFrame(u8* _pData, u32 _Size)
sprintf(Buffer, "%02x ", _pData[j]); sprintf(Buffer, "%02x ", _pData[j]);
Temp.append(Buffer); Temp.append(Buffer);
} }
LOG(USB_HLE_LOG, " Data: %s", Temp.c_str()); LOG(WIIMOTE, " Data: %s", Temp.c_str());
} }
// parse the command // parse the command
@ -166,7 +163,7 @@ void CWII_IPC_HLE_WiiMote::SendACLFrame(u8* _pData, u32 _Size)
switch (pHeader->CID) switch (pHeader->CID)
{ {
case 0x0001: case 0x0001:
LOG(USB_HLE_LOG, "L2Cap-SendFrame: SignalChannel (0x%04x)", pHeader->CID); LOG(WIIMOTE, "L2Cap-SendFrame: SignalChannel (0x%04x)", pHeader->CID);
SignalChannel(pData, DataSize); SignalChannel(pData, DataSize);
break; break;
@ -192,9 +189,9 @@ void CWII_IPC_HLE_WiiMote::SendCommandToACL(u8 _Ident, u8 _Code, u8 _CommandLeng
memcpy(&DataFrame[Offset], _pCommandData, _CommandLength); memcpy(&DataFrame[Offset], _pCommandData, _CommandLength);
LOG(USB_HLE_LOG, " SendCommandToACL (answer)"); LOG(WIIMOTE, " SendCommandToACL (answer)");
LOG(USB_HLE_LOG, " Ident: 0x%02x", _Ident); LOG(WIIMOTE, " Ident: 0x%02x", _Ident);
LOG(USB_HLE_LOG, " Code: 0x%02x", _Code); LOG(WIIMOTE, " Code: 0x%02x", _Code);
// send .... // send ....
m_pHost->SendACLFrame(GetConnectionHandle(), DataFrame, pHeader->Length + sizeof(SL2CAP_Header)); m_pHost->SendACLFrame(GetConnectionHandle(), DataFrame, pHeader->Length + sizeof(SL2CAP_Header));
@ -227,7 +224,7 @@ void CWII_IPC_HLE_WiiMote::SignalChannel(u8* _pData, u32 _Size)
default: default:
PanicAlert("SignalChannel %x",pCommand->code); PanicAlert("SignalChannel %x",pCommand->code);
LOG(USB_HLE_LOG, " Unknown Command-Code (0x%02x)", pCommand->code); LOG(WIIMOTE, " Unknown Command-Code (0x%02x)", pCommand->code);
return; return;
} }
@ -245,11 +242,11 @@ void CWII_IPC_HLE_WiiMote::CommandConnectionReq(u8 _Ident, u8* _pData, u32 _Size
rChannel.SCID = pCommandConnectionReq->scid; rChannel.SCID = pCommandConnectionReq->scid;
rChannel.DCID = pCommandConnectionReq->scid; rChannel.DCID = pCommandConnectionReq->scid;
LOG(USB_HLE_LOG, " CommandConnectionReq"); LOG(WIIMOTE, " CommandConnectionReq");
LOG(USB_HLE_LOG, " Ident: 0x%02x", _Ident); LOG(WIIMOTE, " Ident: 0x%02x", _Ident);
LOG(USB_HLE_LOG, " PSM: 0x%04x", rChannel.PSM); LOG(WIIMOTE, " PSM: 0x%04x", rChannel.PSM);
LOG(USB_HLE_LOG, " SCID: 0x%04x", rChannel.SCID); LOG(WIIMOTE, " SCID: 0x%04x", rChannel.SCID);
LOG(USB_HLE_LOG, " DCID: 0x%04x", rChannel.DCID); LOG(WIIMOTE, " DCID: 0x%04x", rChannel.DCID);
// response // response
SL2CAP_ConnectionResponse Rsp; SL2CAP_ConnectionResponse Rsp;
@ -266,16 +263,16 @@ void CWII_IPC_HLE_WiiMote::CommandCofigurationReq(u8 _Ident, u8* _pData, u32 _Si
u32 Offset = 0; u32 Offset = 0;
SL2CAP_CommandConfigurationReq* pCommandConfigReq = (SL2CAP_CommandConfigurationReq*)_pData; SL2CAP_CommandConfigurationReq* pCommandConfigReq = (SL2CAP_CommandConfigurationReq*)_pData;
_dbg_assert_(USB_HLE_LOG, pCommandConfigReq->flags == 0x00); // 1 means that the options are send in multi-packets _dbg_assert_(WIIMOTE, pCommandConfigReq->flags == 0x00); // 1 means that the options are send in multi-packets
_dbg_assert_(USB_HLE_LOG, DoesChannelExist(pCommandConfigReq->dcid)); _dbg_assert_(WIIMOTE, DoesChannelExist(pCommandConfigReq->dcid));
SChannel& rChanel = m_Channel[pCommandConfigReq->dcid]; SChannel& rChanel = m_Channel[pCommandConfigReq->dcid];
LOG(USB_HLE_LOG, " CommandCofigurationReq"); LOG(WIIMOTE, " CommandCofigurationReq");
LOG(USB_HLE_LOG, " Ident: 0x%02x", _Ident); LOG(WIIMOTE, " Ident: 0x%02x", _Ident);
LOG(USB_HLE_LOG, " DCID: 0x%04x", pCommandConfigReq->dcid); LOG(WIIMOTE, " DCID: 0x%04x", pCommandConfigReq->dcid);
LOG(USB_HLE_LOG, " Flags: 0x%04x", pCommandConfigReq->flags); LOG(WIIMOTE, " Flags: 0x%04x", pCommandConfigReq->flags);
Offset += sizeof(SL2CAP_CommandConfigurationReq); Offset += sizeof(SL2CAP_CommandConfigurationReq);
@ -301,24 +298,24 @@ void CWII_IPC_HLE_WiiMote::CommandCofigurationReq(u8 _Ident, u8* _pData, u32 _Si
{ {
case 0x01: case 0x01:
{ {
_dbg_assert_(USB_HLE_LOG, pOptions->length == 2); _dbg_assert_(WIIMOTE, pOptions->length == 2);
SL2CAP_OptionsMTU* pMTU = (SL2CAP_OptionsMTU*)&_pData[Offset]; SL2CAP_OptionsMTU* pMTU = (SL2CAP_OptionsMTU*)&_pData[Offset];
rChanel.MTU = pMTU->MTU; rChanel.MTU = pMTU->MTU;
LOG(USB_HLE_LOG, " Config MTU: 0x%04x", pMTU->MTU); LOG(WIIMOTE, " Config MTU: 0x%04x", pMTU->MTU);
} }
break; break;
case 0x02: case 0x02:
{ {
_dbg_assert_(USB_HLE_LOG, pOptions->length == 2); _dbg_assert_(WIIMOTE, pOptions->length == 2);
SL2CAP_OptionsFlushTimeOut* pFlushTimeOut = (SL2CAP_OptionsFlushTimeOut*)&_pData[Offset]; SL2CAP_OptionsFlushTimeOut* pFlushTimeOut = (SL2CAP_OptionsFlushTimeOut*)&_pData[Offset];
rChanel.FlushTimeOut = pFlushTimeOut->TimeOut; rChanel.FlushTimeOut = pFlushTimeOut->TimeOut;
LOG(USB_HLE_LOG, " Config FlushTimeOut: 0x%04x", pFlushTimeOut->TimeOut); LOG(WIIMOTE, " Config FlushTimeOut: 0x%04x", pFlushTimeOut->TimeOut);
} }
break; break;
default: default:
_dbg_assert_msg_(USB_HLE_LOG, 0, "Unknown Option: 0x%02x", pOptions->type); _dbg_assert_msg_(WIIMOTE, 0, "Unknown Option: 0x%02x", pOptions->type);
break; break;
} }
@ -328,7 +325,7 @@ void CWII_IPC_HLE_WiiMote::CommandCofigurationReq(u8 _Ident, u8* _pData, u32 _Si
memcpy(&TempBuffer[RespLen], pOptions, OptionSize); memcpy(&TempBuffer[RespLen], pOptions, OptionSize);
RespLen += OptionSize; RespLen += OptionSize;
} }
SendCommandToACL(_Ident, L2CAP_CONF_RSP, RespLen, TempBuffer); SendCommandToACL(_Ident, L2CAP_CONF_RSP, RespLen, TempBuffer);
} }

18
Source/Core/Core/Src/LogManager.cpp
View File

@ -87,15 +87,15 @@ void LogManager::Init()
m_Log[LogTypes::MASTER_LOG] = new CDebugger_Log("*", "Master Log"); m_Log[LogTypes::MASTER_LOG] = new CDebugger_Log("*", "Master Log");
m_Log[LogTypes::BOOT] = new CDebugger_Log("BOOT", "Boot"); m_Log[LogTypes::BOOT] = new CDebugger_Log("BOOT", "Boot");
m_Log[LogTypes::PIXELENGINE] = new CDebugger_Log("PE", "PixelEngine"); m_Log[LogTypes::PIXELENGINE] = new CDebugger_Log("PE", "PixelEngine");
m_Log[LogTypes::COMMANDPROCESSOR] = new CDebugger_Log("CP", "CommandProc"); m_Log[LogTypes::COMMANDPROCESSOR] = new CDebugger_Log("CP", "CommandProc");
m_Log[LogTypes::VIDEOINTERFACE] = new CDebugger_Log("VI", "VideoInt"); m_Log[LogTypes::VIDEOINTERFACE] = new CDebugger_Log("VI", "VideoInt");
m_Log[LogTypes::SERIALINTERFACE] = new CDebugger_Log("SI", "SerialInt"); m_Log[LogTypes::SERIALINTERFACE] = new CDebugger_Log("SI", "SerialInt");
m_Log[LogTypes::PERIPHERALINTERFACE]= new CDebugger_Log("PI", "PeripheralInt"); m_Log[LogTypes::PERIPHERALINTERFACE]= new CDebugger_Log("PI", "PeripheralInt");
m_Log[LogTypes::MEMMAP] = new CDebugger_Log("MI", "MI & memmap"); m_Log[LogTypes::MEMMAP] = new CDebugger_Log("MI", "MI & memmap");
m_Log[LogTypes::STREAMINGINTERFACE] = new CDebugger_Log("Stream", "StreamingInt"); m_Log[LogTypes::STREAMINGINTERFACE] = new CDebugger_Log("Stream", "StreamingInt");
m_Log[LogTypes::DSPINTERFACE] = new CDebugger_Log("DSP", "DSPInterface"); m_Log[LogTypes::DSPINTERFACE] = new CDebugger_Log("DSP", "DSPInterface");
m_Log[LogTypes::DVDINTERFACE] = new CDebugger_Log("DVD", "DVDInterface"); m_Log[LogTypes::DVDINTERFACE] = new CDebugger_Log("DVD", "DVDInterface");
m_Log[LogTypes::GPFIFO] = new CDebugger_Log("GP", "GPFifo"); m_Log[LogTypes::GPFIFO] = new CDebugger_Log("GP", "GPFifo");
m_Log[LogTypes::EXPANSIONINTERFACE] = new CDebugger_Log("EXI", "ExpansionInt."); m_Log[LogTypes::EXPANSIONINTERFACE] = new CDebugger_Log("EXI", "ExpansionInt.");
m_Log[LogTypes::AUDIO_INTERFACE] = new CDebugger_Log("AI", "AudioInt."); m_Log[LogTypes::AUDIO_INTERFACE] = new CDebugger_Log("AI", "AudioInt.");
m_Log[LogTypes::GEKKO] = new CDebugger_Log("GEKKO", "IBM CPU"); m_Log[LogTypes::GEKKO] = new CDebugger_Log("GEKKO", "IBM CPU");
@ -109,8 +109,8 @@ void LogManager::Init()
m_Log[LogTypes::WII_IOB] = new CDebugger_Log("WII_IOB", "WII IO Bridge"); m_Log[LogTypes::WII_IOB] = new CDebugger_Log("WII_IOB", "WII IO Bridge");
m_Log[LogTypes::WII_IPC] = new CDebugger_Log("WII_IPC", "WII IPC"); m_Log[LogTypes::WII_IPC] = new CDebugger_Log("WII_IPC", "WII IPC");
m_Log[LogTypes::WII_IPC_HLE] = new CDebugger_Log("WII_IPC_HLE", "WII IPC HLE"); m_Log[LogTypes::WII_IPC_HLE] = new CDebugger_Log("WII_IPC_HLE", "WII IPC HLE");
m_Log[LogTypes::WIIMOTE] = new CDebugger_Log("WIIMOTE", "WIIMOTE");
for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; i++) for (int i = 0; i < LogTypes::NUMBER_OF_LOGS; i++)
{ {
m_Log[i]->Init(); m_Log[i]->Init();

252
Source/Core/VideoCommon/VideoCommon.vcproj
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?> <?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="8,00"
Name="VideoCommon" Name="VideoCommon"
ProjectGUID="{E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}" ProjectGUID="{E5D1F0C0-AA07-4841-A4EB-4CF4DAA6B0FA}"
RootNamespace="VideoCommon" RootNamespace="VideoCommon"
@ -44,7 +44,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../../Core/Common/Src;../../PluginSpecs" AdditionalIncludeDirectories="../../Core/Common/Src;../../PluginSpecs"
PreprocessorDefinitions="WIN32;_DEBUG;_LIB" PreprocessorDefinitions="WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="1" RuntimeLibrary="1"
@ -82,6 +82,130 @@
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../Core/Common/Src;../../PluginSpecs"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
RuntimeLibrary="0"
BufferSecurityCheck="false"
UsePrecompiledHeader="0"
WarningLevel="3"
WarnAsError="false"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="DebugFast|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../Core/Common/Src;../../PluginSpecs"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_DEPRECATE"
RuntimeLibrary="0"
BufferSecurityCheck="false"
UsePrecompiledHeader="0"
WarningLevel="3"
WarnAsError="false"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration <Configuration
Name="Debug|x64" Name="Debug|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)" OutputDirectory="$(PlatformName)\$(ConfigurationName)"
@ -147,68 +271,6 @@
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../Core/Common/Src;../../PluginSpecs"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
RuntimeLibrary="0"
BufferSecurityCheck="false"
UsePrecompiledHeader="0"
WarningLevel="3"
WarnAsError="false"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration <Configuration
Name="Release|x64" Name="Release|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)" OutputDirectory="$(PlatformName)\$(ConfigurationName)"
@ -272,68 +334,6 @@
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
/> />
</Configuration> </Configuration>
<Configuration
Name="DebugFast|Win32"
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
CharacterSet="1"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../Core/Common/Src;../../PluginSpecs"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
RuntimeLibrary="0"
BufferSecurityCheck="false"
UsePrecompiledHeader="0"
WarningLevel="3"
WarnAsError="false"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration <Configuration
Name="DebugFast|x64" Name="DebugFast|x64"
OutputDirectory="$(PlatformName)\$(ConfigurationName)" OutputDirectory="$(PlatformName)\$(ConfigurationName)"