Language: have break point take a wchar_t * string and allow \n in language files
This commit is contained in:
parent
099ac15bd5
commit
d0209b061f
|
@ -185,7 +185,7 @@ void CLog::Log( LPCTSTR Message )
|
|||
|
||||
if (!m_hLogFile.Write(Data,dwRead))
|
||||
{
|
||||
//BreakPoint(__FILE__,__LINE__);
|
||||
//BreakPoint(__FILEW__,__LINE__);
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
@ -916,7 +916,7 @@ const std::wstring & CLanguage::GetString (LanguageStringID StringID)
|
|||
return DefString->second;
|
||||
}
|
||||
#ifdef _DEBUG
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
#endif
|
||||
return m_emptyString;
|
||||
}
|
||||
|
@ -986,7 +986,9 @@ LANG_STR CLanguage::GetNextLangString (void * OpenFile)
|
|||
if (pos == MAX_STRING_LEN - 2) { token = '"'; }
|
||||
}
|
||||
szString[pos++] = 0;
|
||||
return LANG_STR(StringID,stdstr(szString).ToUTF16());
|
||||
stdstr text(szString);
|
||||
text.Replace("\\n","\n");
|
||||
return LANG_STR(StringID,text.ToUTF16());
|
||||
}
|
||||
|
||||
void CLanguage::SetLanguage ( const wchar_t * LanguageName )
|
||||
|
|
|
@ -525,7 +525,7 @@ void CCheats::AddCodeLayers (int CheatNumber, const stdstr &CheatName, HWND hPar
|
|||
|
||||
//Work out text to add
|
||||
char Text[500], Item[500];
|
||||
if (CheatName.length() > (sizeof(Text) - 5)) { g_Notify->BreakPoint(__FILE__,__LINE__); }
|
||||
if (CheatName.length() > (sizeof(Text) - 5)) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
|
||||
strcpy(Text,CheatName.c_str());
|
||||
if (strchr(Text,'\\') > 0) { *strchr(Text,'\\') = 0; }
|
||||
|
||||
|
@ -569,7 +569,7 @@ void CCheats::AddCodeLayers (int CheatNumber, const stdstr &CheatName, HWND hPar
|
|||
|
||||
stdstr CCheats::GetCheatName(int CheatNo, bool AddExtension) const
|
||||
{
|
||||
if (CheatNo > MaxCheats) { g_Notify->BreakPoint(__FILE__,__LINE__); }
|
||||
if (CheatNo > MaxCheats) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
|
||||
stdstr LineEntry = g_Settings->LoadStringIndex(Cheat_Entry,CheatNo);
|
||||
if (LineEntry.length() == 0) { return LineEntry; }
|
||||
|
||||
|
|
|
@ -314,7 +314,7 @@ bool CDumpMemory::DumpMemory ( LPCSTR FileName,DumpFormat Format, DWORD StartPC,
|
|||
}
|
||||
LogFile.SetFlush(false);
|
||||
LogFile.SetTruncateFile(false);
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
#ifdef tofix
|
||||
char Command[200];
|
||||
for (COpcode OpCode(StartPC); OpCode.PC() < EndPC; OpCode.Next())
|
||||
|
|
|
@ -317,7 +317,7 @@ void CDebugMemorySearch::SearchForValue( void )
|
|||
valid = g_MMU->LW_PAddr(Result.PAddr, NewValue);
|
||||
break;
|
||||
default:
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
if (Value == NewValue)
|
||||
|
@ -441,7 +441,7 @@ void CDebugMemorySearch::SearchForUnknown()
|
|||
valid = g_MMU->LW_PAddr(Result.PAddr, NewValue);
|
||||
break;
|
||||
default:
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
switch (Option)
|
||||
|
@ -471,7 +471,7 @@ void CDebugMemorySearch::SearchForUnknown()
|
|||
}
|
||||
break;
|
||||
default:
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
if (UpdateResult)
|
||||
|
@ -492,7 +492,7 @@ void CDebugMemorySearch::SearchForUnknown()
|
|||
|
||||
void CDebugMemorySearch::SearchForText()
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CDebugMemorySearch::Reset ( void )
|
||||
|
@ -572,7 +572,7 @@ bool CDebugMemorySearch::SearchForChanges(SearchMemChangeState SearchType, Memor
|
|||
|
||||
if (SearchType == SearchChangeState_Reset)
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
if (Size == _32Bit) { StartAddress = ((StartAddress + 3) & ~3); }
|
||||
if (Size == _16Bit) { StartAddress = ((StartAddress + 1) & ~1); }
|
||||
|
@ -639,7 +639,7 @@ bool CDebugMemorySearch::SearchForChanges(SearchMemChangeState SearchType, Memor
|
|||
}
|
||||
break;
|
||||
default:
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
return false;
|
||||
|
@ -702,7 +702,7 @@ bool CDebugMemorySearch::SearchForValue (DWORD Value, MemorySize Size, DWORD &St
|
|||
}
|
||||
break;
|
||||
default:
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
if (StartAddress >= 0x10000000)
|
||||
|
@ -752,7 +752,7 @@ bool CDebugMemorySearch::SearchForValue (DWORD Value, MemorySize Size, DWORD &St
|
|||
}
|
||||
break;
|
||||
default:
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
return false;
|
||||
|
|
|
@ -14,7 +14,7 @@ R4300iOp::Func * CInterpreterCPU::m_R4300i_Opcode = NULL;
|
|||
|
||||
void ExecuteInterpreterOps (DWORD /*Cycles*/)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
bool DelaySlotEffectsCompare (DWORD PC, DWORD Reg1, DWORD Reg2) {
|
||||
|
@ -288,7 +288,7 @@ void CInterpreterCPU::ExecuteCPU (void )
|
|||
}
|
||||
break;
|
||||
default:
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
} else {
|
||||
g_Reg->DoTLBReadMiss(R4300iOp::m_NextInstruction == JUMP,PROGRAM_COUNTER);
|
||||
|
@ -395,7 +395,7 @@ void CInterpreterCPU::ExecuteOps ( int Cycles )
|
|||
}
|
||||
break;
|
||||
default:
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
} else {
|
||||
g_Reg->DoTLBReadMiss(R4300iOp::m_NextInstruction == JUMP,PROGRAM_COUNTER);
|
||||
|
|
|
@ -932,7 +932,7 @@ void R4300iOp32::LWR (void) {
|
|||
|
||||
if (!g_MMU->LW_VAddr((Address & ~3),Value))
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
if (bShowTLBMisses())
|
||||
{
|
||||
g_Notify->DisplayError(L"LWR TLB: %X",Address);
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -61,7 +61,7 @@ void CAudio::LenChanged ( void )
|
|||
{
|
||||
if (m_SecondBuff)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
WriteTraceF(TraceAudio,__FUNCTION__ ": Set Timer AI_LEN_REG: %d m_CountsPerByte: %d",g_Reg->AI_LEN_REG,m_CountsPerByte);
|
||||
g_SystemTimer->SetTimer(CSystemTimer::AiTimerInterrupt,g_Reg->AI_LEN_REG * m_CountsPerByte,false);
|
||||
|
@ -107,7 +107,7 @@ void CAudio::InterruptTimerDone ( void )
|
|||
void CAudio::BusyTimerDone ( void )
|
||||
{
|
||||
WriteTraceF(TraceAudio,__FUNCTION__ ": Start (m_SecondBuff = %d)",m_SecondBuff);
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
m_Status &= ~ai_busy;
|
||||
}
|
||||
|
||||
|
|
|
@ -205,9 +205,9 @@ void CDMA::SP_DMA_READ (void) {
|
|||
return;
|
||||
}
|
||||
|
||||
if ((g_Reg->SP_MEM_ADDR_REG & 3) != 0) { g_Notify->BreakPoint(__FILE__,__LINE__); }
|
||||
if ((g_Reg->SP_DRAM_ADDR_REG & 3) != 0) { g_Notify->BreakPoint(__FILE__,__LINE__); }
|
||||
if (((g_Reg->SP_RD_LEN_REG + 1) & 3) != 0) { g_Notify->BreakPoint(__FILE__,__LINE__); }
|
||||
if ((g_Reg->SP_MEM_ADDR_REG & 3) != 0) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
|
||||
if ((g_Reg->SP_DRAM_ADDR_REG & 3) != 0) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
|
||||
if (((g_Reg->SP_RD_LEN_REG + 1) & 3) != 0) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
|
||||
|
||||
memcpy( g_MMU->Dmem() + (g_Reg->SP_MEM_ADDR_REG & 0x1FFF), g_MMU->Rdram() + g_Reg->SP_DRAM_ADDR_REG,
|
||||
g_Reg->SP_RD_LEN_REG + 1 );
|
||||
|
@ -236,9 +236,9 @@ void CDMA::SP_DMA_WRITE (void)
|
|||
return;
|
||||
}
|
||||
|
||||
if ((g_Reg->SP_MEM_ADDR_REG & 3) != 0) { g_Notify->BreakPoint(__FILE__,__LINE__); }
|
||||
if ((g_Reg->SP_DRAM_ADDR_REG & 3) != 0) { g_Notify->BreakPoint(__FILE__,__LINE__); }
|
||||
if (((g_Reg->SP_WR_LEN_REG + 1) & 3) != 0) { g_Notify->BreakPoint(__FILE__,__LINE__); }
|
||||
if ((g_Reg->SP_MEM_ADDR_REG & 3) != 0) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
|
||||
if ((g_Reg->SP_DRAM_ADDR_REG & 3) != 0) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
|
||||
if (((g_Reg->SP_WR_LEN_REG + 1) & 3) != 0) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
|
||||
|
||||
memcpy( g_MMU->Rdram() + g_Reg->SP_DRAM_ADDR_REG, g_MMU->Dmem() + (g_Reg->SP_MEM_ADDR_REG & 0x1FFF),
|
||||
g_Reg->SP_WR_LEN_REG + 1);
|
||||
|
|
|
@ -256,7 +256,7 @@ BOOL CMipsMemoryVM::LW_VAddr ( DWORD VAddr, DWORD & Value )
|
|||
|
||||
// if (LookUpMode == FuncFind_ChangeMemory)
|
||||
// {
|
||||
// g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
// g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
// if ( (Command.Hex >> 16) == 0x7C7C) {
|
||||
// Command.Hex = OrigMem[(Command.Hex & 0xFFFF)].OriginalValue;
|
||||
// }
|
||||
|
@ -283,7 +283,7 @@ BOOL CMipsMemoryVM::LB_PAddr ( DWORD PAddr, BYTE & Value )
|
|||
{
|
||||
return false;
|
||||
}
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -298,7 +298,7 @@ BOOL CMipsMemoryVM::LH_PAddr ( DWORD PAddr, WORD & Value )
|
|||
{
|
||||
return false;
|
||||
}
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -313,7 +313,7 @@ BOOL CMipsMemoryVM::LW_PAddr ( DWORD PAddr, DWORD & Value )
|
|||
{
|
||||
return false;
|
||||
}
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -329,7 +329,7 @@ BOOL CMipsMemoryVM::LD_PAddr ( DWORD PAddr, QWORD & Value )
|
|||
{
|
||||
return false;
|
||||
}
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -383,7 +383,7 @@ BOOL CMipsMemoryVM::SB_PAddr ( DWORD PAddr, BYTE Value )
|
|||
{
|
||||
return false;
|
||||
}
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -398,7 +398,7 @@ BOOL CMipsMemoryVM::SH_PAddr ( DWORD PAddr, WORD Value )
|
|||
{
|
||||
return false;
|
||||
}
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -413,7 +413,7 @@ BOOL CMipsMemoryVM::SW_PAddr ( DWORD PAddr, DWORD Value )
|
|||
{
|
||||
return false;
|
||||
}
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -430,7 +430,7 @@ BOOL CMipsMemoryVM::SD_PAddr ( DWORD PAddr, QWORD Value )
|
|||
{
|
||||
return false;
|
||||
}
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -462,7 +462,7 @@ void CMipsMemoryVM::Compile_LB ( x86Reg Reg, DWORD VAddr, BOOL SignExtend) {
|
|||
{
|
||||
if (!g_System->bUseTlb())
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -518,7 +518,7 @@ void CMipsMemoryVM::Compile_LH ( x86Reg Reg, DWORD VAddr, BOOL SignExtend) {
|
|||
{
|
||||
if (!g_System->bUseTlb())
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -575,7 +575,7 @@ void CMipsMemoryVM::Compile_LW (x86Reg Reg, DWORD VAddr ) {
|
|||
{
|
||||
if (!g_System->bUseTlb())
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -588,7 +588,7 @@ void CMipsMemoryVM::Compile_LW (x86Reg Reg, DWORD VAddr ) {
|
|||
} else {
|
||||
if (!TranslateVaddr(VAddr, PAddr))
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
switch (PAddr & 0xFFF00000) {
|
||||
|
@ -1150,7 +1150,7 @@ void CMipsMemoryVM::Compile_SW_Const ( DWORD Value, DWORD VAddr ) {
|
|||
BeforeCallDirect(m_RegWorkingSet);
|
||||
if (g_System->bFixedAudio())
|
||||
{
|
||||
X86BreakPoint(__FILE__,__LINE__);
|
||||
X86BreakPoint(__FILEW__,__LINE__);
|
||||
MoveConstToX86reg((DWORD)g_Audio,x86_ECX);
|
||||
Call_Direct(AddressOf(&CAudio::LenChanged),"LenChanged");
|
||||
} else {
|
||||
|
@ -1605,7 +1605,7 @@ int CMipsMemoryVM::MemoryFilter( DWORD dwExptCode, void * lpExceptionPointer )
|
|||
{
|
||||
if (dwExptCode != EXCEPTION_ACCESS_VIOLATION)
|
||||
{
|
||||
if (bHaveDebugger()) { g_Notify->BreakPoint(__FILE__,__LINE__); }
|
||||
if (bHaveDebugger()) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
|
||||
return EXCEPTION_EXECUTE_HANDLER;
|
||||
}
|
||||
|
||||
|
@ -1615,7 +1615,7 @@ int CMipsMemoryVM::MemoryFilter( DWORD dwExptCode, void * lpExceptionPointer )
|
|||
DWORD MemAddress = (char *)lpEP->ExceptionRecord->ExceptionInformation[1] - (char *)g_MMU->Rdram();
|
||||
if ((int)(MemAddress) < 0 || MemAddress > 0x1FFFFFFF)
|
||||
{
|
||||
// if (bHaveDebugger()) { g_Notify->BreakPoint(__FILE__,__LINE__); }
|
||||
// if (bHaveDebugger()) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
|
||||
return EXCEPTION_EXECUTE_HANDLER;
|
||||
}
|
||||
|
||||
|
@ -1631,7 +1631,7 @@ int CMipsMemoryVM::MemoryFilter( DWORD dwExptCode, void * lpExceptionPointer )
|
|||
if ((int)Start < 0)
|
||||
{
|
||||
if (bHaveDebugger()) {
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
return EXCEPTION_EXECUTE_HANDLER;
|
||||
}
|
||||
|
@ -1657,7 +1657,7 @@ int CMipsMemoryVM::MemoryFilter( DWORD dwExptCode, void * lpExceptionPointer )
|
|||
g_Recompiler->ClearRecompCode_Phys(Start & ~0xFFF,0x1000,CRecompiler::Remove_ProtectedMem);
|
||||
return EXCEPTION_CONTINUE_EXECUTION;
|
||||
}
|
||||
if (bHaveDebugger()) { g_Notify->BreakPoint(__FILE__,__LINE__); }
|
||||
if (bHaveDebugger()) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
|
||||
return EXCEPTION_EXECUTE_HANDLER;
|
||||
}
|
||||
|
||||
|
@ -1703,7 +1703,7 @@ int CMipsMemoryVM::MemoryFilter( DWORD dwExptCode, void * lpExceptionPointer )
|
|||
case 7: ReadPos += 1; break;
|
||||
case 0x80: ReadPos += 1; break;
|
||||
default:
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
break;
|
||||
case 5: ReadPos += 5; break;
|
||||
|
@ -1723,13 +1723,13 @@ int CMipsMemoryVM::MemoryFilter( DWORD dwExptCode, void * lpExceptionPointer )
|
|||
case 0x86: ReadPos += 5; break;
|
||||
case 0x87: ReadPos += 5; break;
|
||||
default:
|
||||
if (bHaveDebugger()) { g_Notify->BreakPoint(__FILE__,__LINE__); }
|
||||
if (bHaveDebugger()) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
|
||||
return EXCEPTION_EXECUTE_HANDLER;
|
||||
}
|
||||
|
||||
if (Reg == NULL)
|
||||
{
|
||||
if (bHaveDebugger()) { g_Notify->BreakPoint(__FILE__,__LINE__); }
|
||||
if (bHaveDebugger()) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
|
||||
return EXCEPTION_EXECUTE_HANDLER;
|
||||
}
|
||||
|
||||
|
@ -1777,7 +1777,7 @@ int CMipsMemoryVM::MemoryFilter( DWORD dwExptCode, void * lpExceptionPointer )
|
|||
lpEP->ContextRecord->Eip = (DWORD)ReadPos;
|
||||
return EXCEPTION_CONTINUE_EXECUTION;
|
||||
default:
|
||||
if (bHaveDebugger()) { g_Notify->BreakPoint(__FILE__,__LINE__); }
|
||||
if (bHaveDebugger()) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
|
||||
return EXCEPTION_EXECUTE_HANDLER;
|
||||
}
|
||||
break;
|
||||
|
@ -1805,7 +1805,7 @@ int CMipsMemoryVM::MemoryFilter( DWORD dwExptCode, void * lpExceptionPointer )
|
|||
case 0xC7:
|
||||
if (Reg != &lpEP->ContextRecord->Eax)
|
||||
{
|
||||
if (bHaveDebugger()) { g_Notify->BreakPoint(__FILE__,__LINE__); }
|
||||
if (bHaveDebugger()) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
|
||||
return EXCEPTION_EXECUTE_HANDLER;
|
||||
}
|
||||
if (!SH_NonMemory(MemAddress,*(WORD *)ReadPos)) {
|
||||
|
@ -1817,7 +1817,7 @@ int CMipsMemoryVM::MemoryFilter( DWORD dwExptCode, void * lpExceptionPointer )
|
|||
lpEP->ContextRecord->Eip = (DWORD)(ReadPos + 2);
|
||||
return EXCEPTION_CONTINUE_EXECUTION;
|
||||
default:
|
||||
if (bHaveDebugger()) { g_Notify->BreakPoint(__FILE__,__LINE__); }
|
||||
if (bHaveDebugger()) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
|
||||
return EXCEPTION_EXECUTE_HANDLER;
|
||||
}
|
||||
break;
|
||||
|
@ -1863,7 +1863,7 @@ int CMipsMemoryVM::MemoryFilter( DWORD dwExptCode, void * lpExceptionPointer )
|
|||
case 0xC6:
|
||||
if (Reg != &lpEP->ContextRecord->Eax)
|
||||
{
|
||||
if (bHaveDebugger()) { g_Notify->BreakPoint(__FILE__,__LINE__); }
|
||||
if (bHaveDebugger()) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
|
||||
return EXCEPTION_EXECUTE_HANDLER;
|
||||
}
|
||||
if (!SB_NonMemory(MemAddress,*(BYTE *)ReadPos)) {
|
||||
|
@ -1877,7 +1877,7 @@ int CMipsMemoryVM::MemoryFilter( DWORD dwExptCode, void * lpExceptionPointer )
|
|||
case 0xC7:
|
||||
if (Reg != &lpEP->ContextRecord->Eax)
|
||||
{
|
||||
if (bHaveDebugger()) { g_Notify->BreakPoint(__FILE__,__LINE__); }
|
||||
if (bHaveDebugger()) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
|
||||
return EXCEPTION_EXECUTE_HANDLER;
|
||||
}
|
||||
if (!SW_NonMemory(MemAddress,*(DWORD *)ReadPos)) {
|
||||
|
@ -1889,7 +1889,7 @@ int CMipsMemoryVM::MemoryFilter( DWORD dwExptCode, void * lpExceptionPointer )
|
|||
lpEP->ContextRecord->Eip = (DWORD)(ReadPos + 4);
|
||||
return EXCEPTION_CONTINUE_EXECUTION;
|
||||
}
|
||||
if (bHaveDebugger()) { g_Notify->BreakPoint(__FILE__,__LINE__); }
|
||||
if (bHaveDebugger()) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
|
||||
return EXCEPTION_EXECUTE_HANDLER;
|
||||
}
|
||||
|
||||
|
@ -1902,7 +1902,7 @@ int CMipsMemoryVM::LB_NonMemory ( DWORD PAddr, DWORD * Value, BOOL /*SignExtend*
|
|||
}
|
||||
if (PAddr >= 0x10000000 && PAddr < 0x16000000)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
#ifdef tofix
|
||||
if (WrittenToRom) { return FALSE; }
|
||||
if ((PAddr & 2) == 0) { PAddr = (PAddr + 4) ^ 2; }
|
||||
|
@ -1938,7 +1938,7 @@ int CMipsMemoryVM::LH_NonMemory ( DWORD PAddr, DWORD * Value, int/* SignExtend*/
|
|||
|
||||
if (PAddr >= 0x10000000 && PAddr < 0x16000000)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
// switch (PAddr & 0xFFF00000) {
|
||||
// default:
|
||||
|
@ -2152,7 +2152,7 @@ int CMipsMemoryVM::LW_NonMemory ( DWORD PAddr, DWORD * Value ) {
|
|||
mov ToSwap,eax
|
||||
}
|
||||
* Value = ToSwap;*/
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return TRUE;
|
||||
}
|
||||
else if (PAddr < 0x1FC00800)
|
||||
|
@ -2380,7 +2380,7 @@ int CMipsMemoryVM::SW_NonMemory ( DWORD PAddr, DWORD Value ) {
|
|||
try {
|
||||
g_System->RunRSP();
|
||||
} catch (...) {
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
//}
|
||||
break;
|
||||
|
@ -2418,7 +2418,7 @@ int CMipsMemoryVM::SW_NonMemory ( DWORD PAddr, DWORD Value ) {
|
|||
try {
|
||||
g_System->RunRSP();
|
||||
} catch (...) {
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -2680,12 +2680,12 @@ void CMipsMemoryVM::ProtectMemory( DWORD StartVaddr, DWORD EndVaddr )
|
|||
|
||||
//Get Physical Addresses passed
|
||||
DWORD StartPAddr, EndPAddr;
|
||||
if (!TranslateVaddr(StartVaddr,StartPAddr)) { g_Notify->BreakPoint(__FILE__,__LINE__); }
|
||||
if (!TranslateVaddr(EndVaddr,EndPAddr)) { g_Notify->BreakPoint(__FILE__,__LINE__); }
|
||||
if (!TranslateVaddr(StartVaddr,StartPAddr)) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
|
||||
if (!TranslateVaddr(EndVaddr,EndPAddr)) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
|
||||
|
||||
//Get Length of memory being protected
|
||||
int Length = ((EndPAddr + 3) - StartPAddr) & ~3;
|
||||
if (Length < 0) { g_Notify->BreakPoint(__FILE__,__LINE__); }
|
||||
if (Length < 0) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
|
||||
|
||||
//Proect that memory address space
|
||||
DWORD OldProtect;
|
||||
|
@ -2702,12 +2702,12 @@ void CMipsMemoryVM::UnProtectMemory( DWORD StartVaddr, DWORD EndVaddr )
|
|||
|
||||
//Get Physical Addresses passed
|
||||
DWORD StartPAddr, EndPAddr;
|
||||
if (!TranslateVaddr(StartVaddr,StartPAddr)) { g_Notify->BreakPoint(__FILE__,__LINE__); }
|
||||
if (!TranslateVaddr(EndVaddr,EndPAddr)) { g_Notify->BreakPoint(__FILE__,__LINE__); }
|
||||
if (!TranslateVaddr(StartVaddr,StartPAddr)) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
|
||||
if (!TranslateVaddr(EndVaddr,EndPAddr)) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
|
||||
|
||||
//Get Length of memory being protected
|
||||
int Length = ((EndPAddr + 3) - StartPAddr) & ~3;
|
||||
if (Length < 0) { g_Notify->BreakPoint(__FILE__,__LINE__); }
|
||||
if (Length < 0) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
|
||||
|
||||
//Proect that memory address space
|
||||
DWORD OldProtect;
|
||||
|
@ -2923,7 +2923,7 @@ void CMipsMemoryVM::Compile_LW (bool ResultSigned, bool bRecordLLBit)
|
|||
MoveVariableDispToX86Reg((void *)((DWORD)(short)Opcode.offset),String,GetMipsRegMapLo(Opcode.rt),TempReg1,1);
|
||||
if (bRecordLLBit)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
} else {
|
||||
if (IsConst(Opcode.base)) {
|
||||
|
@ -2932,7 +2932,7 @@ void CMipsMemoryVM::Compile_LW (bool ResultSigned, bool bRecordLLBit)
|
|||
Compile_LW(GetMipsRegMapLo(Opcode.rt),Address);
|
||||
if (bRecordLLBit)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
} else {
|
||||
if (g_System->bUseTlb()) {
|
||||
|
@ -3529,7 +3529,7 @@ void CMipsMemoryVM::Compile_SW (bool bCheckLLbit)
|
|||
if (Opcode.base == 29 && g_System->bFastSP()) {
|
||||
if (bCheckLLbit)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
if (IsMapped(Opcode.rt)) { ProtectGPR(Opcode.rt); }
|
||||
TempReg1 = Map_MemoryStack(x86_Any,true);
|
||||
|
@ -3548,7 +3548,7 @@ void CMipsMemoryVM::Compile_SW (bool bCheckLLbit)
|
|||
|
||||
if (bCheckLLbit)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
if (IsConst(Opcode.rt)) {
|
||||
Compile_SW_Const(GetMipsRegLo(Opcode.rt), Address);
|
||||
|
@ -3611,7 +3611,7 @@ void CMipsMemoryVM::Compile_SW (bool bCheckLLbit)
|
|||
} else {
|
||||
if (bCheckLLbit)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
AndConstToX86Reg(TempReg1,0x1FFFFFFF);
|
||||
if (IsConst(Opcode.rt)) {
|
||||
|
@ -3860,7 +3860,7 @@ void CMipsMemoryVM::Compile_StoreInstructClean (x86Reg AddressReg, int Length )
|
|||
{
|
||||
return;
|
||||
}
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
|
||||
/*
|
||||
stdstr_f strLen("%d",Length);
|
||||
|
@ -4208,7 +4208,7 @@ void CMipsMemoryVM::ChangeSpStatus (void)
|
|||
try {
|
||||
g_System->RunRSP();
|
||||
} catch (...) {
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
//}
|
||||
}
|
||||
|
|
|
@ -191,7 +191,7 @@ void CSystemEvents::ExecuteEvents ( void )
|
|||
}
|
||||
break;
|
||||
default:
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -36,7 +36,7 @@ void CSystemTimer::SetTimer ( TimerType Type, DWORD Cycles, bool bRelative )
|
|||
{
|
||||
if (Type >= MaxTimer || Type == UnknownTimer)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return;
|
||||
}
|
||||
UpdateTimers();
|
||||
|
@ -60,7 +60,7 @@ DWORD CSystemTimer::GetTimer ( TimerType Type )
|
|||
{
|
||||
if (Type >= MaxTimer || Type == UnknownTimer)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return 0;
|
||||
}
|
||||
if (!m_TimerDetatils[Type].Active)
|
||||
|
@ -83,7 +83,7 @@ void CSystemTimer::StopTimer ( TimerType Type )
|
|||
{
|
||||
if (Type >= MaxTimer || Type == UnknownTimer)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return;
|
||||
}
|
||||
m_TimerDetatils[Type].Active = false;
|
||||
|
@ -214,7 +214,7 @@ void CSystemTimer::TimerDone (void)
|
|||
try {
|
||||
g_System->RunRSP();
|
||||
} catch (...) {
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
break;
|
||||
case CSystemTimer::RSPTimerDlist:
|
||||
|
@ -231,7 +231,7 @@ void CSystemTimer::TimerDone (void)
|
|||
g_Audio->BusyTimerDone();
|
||||
break;
|
||||
default:
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
//CheckTimer();
|
||||
/*if (Profiling) {
|
||||
|
@ -295,8 +295,8 @@ void CSystemTimer::LoadData ( void * file )
|
|||
unzReadCurrentFile( file,&TimerDetailsSize,sizeof(TimerDetailsSize));
|
||||
unzReadCurrentFile( file,&Entries,sizeof(Entries));
|
||||
|
||||
if (TimerDetailsSize != sizeof(TIMER_DETAILS)) { g_Notify->BreakPoint(__FILE__,__LINE__); return; }
|
||||
if (Entries != sizeof(m_TimerDetatils)/sizeof(m_TimerDetatils[0])) { g_Notify->BreakPoint(__FILE__,__LINE__); return; }
|
||||
if (TimerDetailsSize != sizeof(TIMER_DETAILS)) { g_Notify->BreakPoint(__FILEW__,__LINE__); return; }
|
||||
if (Entries != sizeof(m_TimerDetatils)/sizeof(m_TimerDetatils[0])) { g_Notify->BreakPoint(__FILEW__,__LINE__); return; }
|
||||
|
||||
unzReadCurrentFile(file,(void *)&m_TimerDetatils,sizeof(m_TimerDetatils));
|
||||
unzReadCurrentFile(file,(void *)&m_LastUpdate,sizeof(m_LastUpdate));
|
||||
|
|
|
@ -167,7 +167,7 @@ void CN64System::ExternalEvent ( SystemEvent action )
|
|||
break;
|
||||
default:
|
||||
WriteTraceF(TraceError,__FUNCTION__ ": Unknown event %d",action);
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1082,7 +1082,7 @@ void CN64System::SyncCPU (CN64System * const SecondCPU)
|
|||
}
|
||||
m_LastSuccessSyncPC[0] = m_Reg.m_PROGRAM_COUNTER;
|
||||
// if (PROGRAM_COUNTER == 0x8009BBD8) {
|
||||
// g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
// g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
// }
|
||||
}
|
||||
|
||||
|
@ -1310,7 +1310,7 @@ void CN64System::DumpSyncErrors (CN64System * SecondCPU) {
|
|||
}
|
||||
|
||||
g_Notify->DisplayError(L"Sync Error");
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
// AddEvent(CloseCPU);
|
||||
}
|
||||
|
||||
|
@ -1894,7 +1894,7 @@ bool CN64System::WriteToProtectedMemory (DWORD Address, int length)
|
|||
WriteTraceF(TraceDebug,__FUNCTION__ ": Address: %X Len: %d",Address,length);
|
||||
if (m_Recomp)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
#ifdef tofix
|
||||
return m_Recomp->ClearRecompCode_Phys(Address,length,CRecompiler::Remove_ProtectedMem);
|
||||
#endif
|
||||
|
|
|
@ -23,7 +23,7 @@ CCodeBlock::CCodeBlock(DWORD VAddrEnter, BYTE * RecompPos) :
|
|||
CCodeSection * baseSection = new CCodeSection(this, VAddrEnter, 0, false);
|
||||
if (baseSection == NULL)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
m_Sections.push_back(baseSection);
|
||||
baseSection->AddParent(NULL);
|
||||
|
@ -35,7 +35,7 @@ CCodeBlock::CCodeBlock(DWORD VAddrEnter, BYTE * RecompPos) :
|
|||
m_EnterSection = new CCodeSection(this, VAddrEnter, 1, true);
|
||||
if (m_EnterSection == NULL)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
baseSection->m_ContinueSection = m_EnterSection;
|
||||
|
||||
|
@ -69,7 +69,7 @@ bool CCodeBlock::SetSection ( CCodeSection * & Section, CCodeSection * CurrentSe
|
|||
{
|
||||
if (Section != NULL)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
if (TargetPC >= ((CurrentPC + 0x1000) & 0xFFFFF000))
|
||||
|
@ -86,7 +86,7 @@ bool CCodeBlock::SetSection ( CCodeSection * & Section, CCodeSection * CurrentSe
|
|||
{
|
||||
if (Section != NULL)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
SectionMap::const_iterator itr = m_SectionMap.find(TargetPC);
|
||||
if (itr != m_SectionMap.end())
|
||||
|
@ -101,7 +101,7 @@ bool CCodeBlock::SetSection ( CCodeSection * & Section, CCodeSection * CurrentSe
|
|||
Section = new CCodeSection(this,TargetPC,m_Sections.size(),LinkAllowed);
|
||||
if (Section == NULL)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
m_Sections.push_back(Section);
|
||||
|
@ -123,11 +123,11 @@ bool CCodeBlock::SetSection ( CCodeSection * & Section, CCodeSection * CurrentSe
|
|||
}
|
||||
if (SplitSection == NULL)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
if (SplitSection->m_EndPC == (DWORD)-1)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
if (SplitSection->m_EndPC >= TargetPC)
|
||||
{
|
||||
|
@ -168,7 +168,7 @@ bool CCodeBlock::CreateBlockLinkage ( CCodeSection * EnterSection )
|
|||
if (CurrentSection->m_ContinueSection != NULL &&
|
||||
CurrentSection->m_ContinueSection != itr->second)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
if (CurrentSection->m_ContinueSection == NULL)
|
||||
{
|
||||
|
@ -200,7 +200,7 @@ bool CCodeBlock::CreateBlockLinkage ( CCodeSection * EnterSection )
|
|||
CurrentSection->m_EndPC = TestPC;
|
||||
if (!AnalyzeInstruction(TestPC, TargetPC, ContinuePC, LikelyBranch, IncludeDelaySlot, EndBlock, PermLoop))
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -214,7 +214,7 @@ bool CCodeBlock::CreateBlockLinkage ( CCodeSection * EnterSection )
|
|||
{
|
||||
if (ContinuePC != (DWORD)-1)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
@ -249,13 +249,13 @@ bool CCodeBlock::CreateBlockLinkage ( CCodeSection * EnterSection )
|
|||
CCodeSection * JumpSection = CurrentSection->m_JumpSection;
|
||||
if (!AnalyzeInstruction(JumpSection->m_EnterPC, BranchTargetPC, BranchContinuePC, BranchLikelyBranch, BranchIncludeDelaySlot, BranchEndBlock, BranchPermLoop))
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (BranchLikelyBranch || BranchIncludeDelaySlot || BranchPermLoop)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -271,7 +271,7 @@ bool CCodeBlock::CreateBlockLinkage ( CCodeSection * EnterSection )
|
|||
JumpSection->SetDelaySlot();
|
||||
SetSection(JumpSection->m_JumpSection,JumpSection,TargetPC,true,TestPC);
|
||||
} else {
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
else if (TargetPC != ((DWORD)-1))
|
||||
|
@ -308,7 +308,7 @@ bool CCodeBlock::CreateBlockLinkage ( CCodeSection * EnterSection )
|
|||
}
|
||||
if (CurrentSection == NewSection)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
CurrentSection = NewSection;
|
||||
if (CurrentSection->m_JumpSection != NULL ||
|
||||
|
@ -336,7 +336,7 @@ bool CCodeBlock::CreateBlockLinkage ( CCodeSection * EnterSection )
|
|||
}
|
||||
if (CurrentSection->m_EndPC == (DWORD)-1)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
@ -381,7 +381,7 @@ bool CCodeBlock::AnalyzeInstruction ( DWORD PC, DWORD & TargetPC, DWORD & Contin
|
|||
|
||||
OPCODE Command;
|
||||
if (!g_MMU->LW_VAddr(PC, Command.Hex)) {
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -419,7 +419,7 @@ bool CCodeBlock::AnalyzeInstruction ( DWORD PC, DWORD & TargetPC, DWORD & Contin
|
|||
EndBlock = true;
|
||||
break;
|
||||
default:
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
|
@ -488,7 +488,7 @@ bool CCodeBlock::AnalyzeInstruction ( DWORD PC, DWORD & TargetPC, DWORD & Contin
|
|||
EndBlock = true;
|
||||
break;
|
||||
}
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
|
@ -557,11 +557,11 @@ bool CCodeBlock::AnalyzeInstruction ( DWORD PC, DWORD & TargetPC, DWORD & Contin
|
|||
EndBlock = true;
|
||||
break;
|
||||
default:
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
} else {
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
|
@ -584,7 +584,7 @@ bool CCodeBlock::AnalyzeInstruction ( DWORD PC, DWORD & TargetPC, DWORD & Contin
|
|||
} else {
|
||||
if (TargetPC == PC)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
ContinuePC = PC + 8;
|
||||
IncludeDelaySlot = true;
|
||||
|
@ -595,18 +595,18 @@ bool CCodeBlock::AnalyzeInstruction ( DWORD PC, DWORD & TargetPC, DWORD & Contin
|
|||
TargetPC = PC + ((short)Command.offset << 2) + 4;
|
||||
if (TargetPC == PC)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
ContinuePC = PC + 8;
|
||||
LikelyBranch = true;
|
||||
IncludeDelaySlot = true;
|
||||
break;
|
||||
default:
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
break;
|
||||
|
@ -658,7 +658,7 @@ bool CCodeBlock::AnalyzeInstruction ( DWORD PC, DWORD & TargetPC, DWORD & Contin
|
|||
EndBlock = true;
|
||||
break;
|
||||
}
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
|
@ -675,7 +675,7 @@ bool CCodeBlock::Compile()
|
|||
EnterCodeBlock();
|
||||
|
||||
if (g_SyncSystem) {
|
||||
//if ((DWORD)BlockInfo.CompiledLocation == 0x60A7B73B) { X86BreakPoint(__FILE__,__LINE__); }
|
||||
//if ((DWORD)BlockInfo.CompiledLocation == 0x60A7B73B) { X86BreakPoint(__FILEW__,__LINE__); }
|
||||
//MoveConstToVariable((DWORD)BlockInfo.CompiledLocation,&CurrentBlock,"CurrentBlock");
|
||||
}
|
||||
|
||||
|
|
|
@ -114,7 +114,7 @@ void CCodeSection::CompileExit ( DWORD JumpPC, DWORD TargetPC, CRegInfo &ExitReg
|
|||
sprintf(String,"Exit_%d",m_BlockInfo->m_ExitInfo.size());
|
||||
if (x86Jmp == NULL)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return;
|
||||
}
|
||||
x86Jmp(String,0);
|
||||
|
@ -168,7 +168,7 @@ void CCodeSection::CompileExit ( DWORD JumpPC, DWORD TargetPC, CRegInfo &ExitReg
|
|||
{
|
||||
if (LookUpMode() == FuncFind_ChangeMemory)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
// BYTE * Jump, * Jump2;
|
||||
// if (TargetPC >= 0x80000000 && TargetPC < 0xC0000000) {
|
||||
// DWORD pAddr = TargetPC & 0x1FFFFFFF;
|
||||
|
@ -289,16 +289,16 @@ void CCodeSection::CompileExit ( DWORD JumpPC, DWORD TargetPC, CRegInfo &ExitReg
|
|||
}
|
||||
break;
|
||||
case CExitInfo::ExitResetRecompCode:
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
#ifdef tofix
|
||||
if (m_NextInstruction == JUMP || m_NextInstruction == DELAY_SLOT) {
|
||||
X86BreakPoint(__FILE__,__LINE__);
|
||||
X86BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
if (g_SyncSystem) {
|
||||
MoveConstToX86reg((DWORD)g_BaseSystem,x86_ECX);
|
||||
Call_Direct(AddressOf(&CN64System::SyncSystem), "CN64System::SyncSystem");
|
||||
}
|
||||
X86BreakPoint(__FILE__,__LINE__);
|
||||
X86BreakPoint(__FILEW__,__LINE__);
|
||||
MoveVariableToX86reg(this,"this",x86_ECX);
|
||||
Call_Direct(AddressOf(ResetRecompCode), "ResetRecompCode");
|
||||
#endif
|
||||
|
@ -317,7 +317,7 @@ void CCodeSection::CompileExit ( DWORD JumpPC, DWORD TargetPC, CRegInfo &ExitReg
|
|||
ExitCodeBlock();
|
||||
break;
|
||||
case CExitInfo::TLBWriteMiss:
|
||||
X86BreakPoint(__FILE__,__LINE__);
|
||||
X86BreakPoint(__FILEW__,__LINE__);
|
||||
ExitCodeBlock();
|
||||
break;
|
||||
case CExitInfo::DivByZero:
|
||||
|
@ -337,7 +337,7 @@ void CCodeSection::CompileExit ( DWORD JumpPC, DWORD TargetPC, CRegInfo &ExitReg
|
|||
break;
|
||||
default:
|
||||
WriteTraceF(TraceError,__FUNCTION__ ": how did you want to exit on reason (%d) ???",reason);
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -358,7 +358,7 @@ void CCodeSection::GenerateSectionLinkage (void)
|
|||
|
||||
if ((CompilePC() & 0xFFC) == 0xFFC)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
#ifdef tofix
|
||||
//Handle Fall througth
|
||||
BYTE * Jump = NULL;
|
||||
|
@ -591,7 +591,7 @@ void CCodeSection::GenerateSectionLinkage (void)
|
|||
}
|
||||
if (JumpInfo[i]->TargetPC != TargetSection[i]->m_EnterPC)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
if (TargetSection[i]->m_CompiledLocation == NULL)
|
||||
{
|
||||
|
@ -684,19 +684,19 @@ void CCodeSection::SyncRegState ( const CRegInfo & SyncTo )
|
|||
case CRegInfo::STATE_CONST_64:
|
||||
if (GetMipsReg(i) != SyncTo.GetMipsReg(i))
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
continue;
|
||||
case CRegInfo::STATE_CONST_32_SIGN:
|
||||
if (GetMipsRegLo(i) != SyncTo.GetMipsRegLo(i))
|
||||
{
|
||||
CPU_Message("Value of const is different Reg %d (%s) Value: 0x%08X to 0x%08X",i,CRegName::GPR[i],GetMipsRegLo(i),SyncTo.GetMipsRegLo(i));
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
continue;
|
||||
default:
|
||||
CPU_Message("Unhandled Reg state %d\nin SyncRegState",GetMipsRegState(i));
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
changed = true;
|
||||
|
@ -741,7 +741,7 @@ void CCodeSection::SyncRegState ( const CRegInfo & SyncTo )
|
|||
break;
|
||||
default:
|
||||
CPU_Message("Do something with states in SyncRegState\nSTATE_MAPPED_64\n%d",GetMipsRegState(i));
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
continue;
|
||||
}
|
||||
m_RegWorkingSet.SetMipsRegMapLo(i,Reg);
|
||||
|
@ -779,7 +779,7 @@ void CCodeSection::SyncRegState ( const CRegInfo & SyncTo )
|
|||
CPU_Message("hi %X\nLo %X",GetMipsRegHi(i),GetMipsRegLo(i));
|
||||
default:
|
||||
CPU_Message("Do something with states in SyncRegState\nSTATE_MAPPED_32_SIGN\n%d",GetMipsRegState(i));
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
m_RegWorkingSet.SetMipsRegMapLo(i,Reg);
|
||||
m_RegWorkingSet.SetMipsRegState(i, CRegInfo::STATE_MAPPED_32_SIGN);
|
||||
|
@ -807,7 +807,7 @@ void CCodeSection::SyncRegState ( const CRegInfo & SyncTo )
|
|||
m_RegWorkingSet.SetX86Mapped(GetMipsRegMapLo(i),CRegInfo::NotMapped);
|
||||
} else {
|
||||
CPU_Message("Do something with states in SyncRegState\nSTATE_MAPPED_32_ZERO\n%d",GetMipsRegState(i));
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
break;
|
||||
case CRegInfo::STATE_CONST_32_SIGN:
|
||||
|
@ -815,13 +815,13 @@ void CCodeSection::SyncRegState ( const CRegInfo & SyncTo )
|
|||
{
|
||||
CPU_Message("Sign Problems in SyncRegState\nSTATE_MAPPED_32_ZERO");
|
||||
CPU_Message("%s: %X",CRegName::GPR[i],GetMipsRegLo_S(i));
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
MoveConstToX86reg(GetMipsRegLo(i),Reg);
|
||||
break;
|
||||
default:
|
||||
CPU_Message("Do something with states in SyncRegState\nSTATE_MAPPED_32_ZERO\n%d",GetMipsRegState(i));
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
m_RegWorkingSet.SetMipsRegMapLo(i,Reg);
|
||||
m_RegWorkingSet.SetMipsRegState(i, SyncTo.GetMipsRegState(i));
|
||||
|
@ -831,7 +831,7 @@ void CCodeSection::SyncRegState ( const CRegInfo & SyncTo )
|
|||
break;
|
||||
default:
|
||||
CPU_Message("%d - %d reg: %s (%d)",SyncTo.GetMipsRegState(i),GetMipsRegState(i),CRegName::GPR[i],i);
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
changed = false;
|
||||
}
|
||||
}
|
||||
|
@ -889,7 +889,7 @@ void TestFunc ( void )
|
|||
TestValue += 1;
|
||||
if (TestValue >= 4)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}*/
|
||||
|
||||
|
@ -943,7 +943,7 @@ bool CCodeSection::GenerateX86Code ( DWORD Test )
|
|||
}
|
||||
/*if (m_CompilePC == 0x803245C4)
|
||||
{
|
||||
X86BreakPoint(__FILE__,__LINE__);
|
||||
X86BreakPoint(__FILEW__,__LINE__);
|
||||
//m_RegWorkingSet.UnMap_AllFPRs();
|
||||
}*/
|
||||
|
||||
|
@ -992,7 +992,7 @@ bool CCodeSection::GenerateX86Code ( DWORD Test )
|
|||
|
||||
/*if ((m_CompilePC == 0x80263900) && m_NextInstruction == NORMAL)
|
||||
{
|
||||
X86BreakPoint(__FILE__,__LINE__);
|
||||
X86BreakPoint(__FILEW__,__LINE__);
|
||||
}*/
|
||||
|
||||
/*if ((m_CompilePC >= 0x80325D80 && m_CompilePC <= 0x80325DF0) && m_NextInstruction == NORMAL)
|
||||
|
@ -1007,7 +1007,7 @@ bool CCodeSection::GenerateX86Code ( DWORD Test )
|
|||
}*/
|
||||
/*if ((m_CompilePC == 0x80324E14) && m_NextInstruction == NORMAL)
|
||||
{
|
||||
X86BreakPoint(__FILE__,__LINE__);
|
||||
X86BreakPoint(__FILEW__,__LINE__);
|
||||
}*/
|
||||
|
||||
/*if (m_CompilePC == 0x80324E18 && m_NextInstruction == NORMAL)
|
||||
|
@ -1033,9 +1033,9 @@ bool CCodeSection::GenerateX86Code ( DWORD Test )
|
|||
/* if (m_CompilePC == 0x803245CC && m_NextInstruction == NORMAL)
|
||||
{
|
||||
//m_RegWorkingSet.UnMap_AllFPRs();
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
//X86HardBreakPoint();
|
||||
//X86BreakPoint(__FILE__,__LINE__);
|
||||
//X86BreakPoint(__FILEW__,__LINE__);
|
||||
//m_RegWorkingSet.UnMap_AllFPRs();
|
||||
}*/
|
||||
/*if (m_CompilePC >= 0x80179DC4 && m_CompilePC <= 0x80179DF0 && m_NextInstruction == NORMAL)
|
||||
|
@ -1288,7 +1288,7 @@ bool CCodeSection::GenerateX86Code ( DWORD Test )
|
|||
{
|
||||
if (m_NextInstruction == DO_DELAY_SLOT)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
if (m_NextInstruction == NORMAL)
|
||||
{
|
||||
|
@ -1334,7 +1334,7 @@ bool CCodeSection::GenerateX86Code ( DWORD Test )
|
|||
{
|
||||
if (m_NextInstruction != NORMAL)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
m_CompilePC -= 4;
|
||||
m_Cont.RegSet = m_RegWorkingSet;
|
||||
|
@ -1405,7 +1405,7 @@ void CCodeSection::SwitchParent(CCodeSection * OldParent, CCodeSection * NewPare
|
|||
|
||||
if (!bFoundOldParent)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
m_ParentSection.push_back(NewParent);
|
||||
}
|
||||
|
@ -1519,7 +1519,7 @@ void CCodeSection::UnlinkParent( CCodeSection * Parent, bool ContinueSection )
|
|||
CPU_Message(__FUNCTION__ ": Section %d Parent: %d ContinueSection = %s",m_SectionID,Parent->m_SectionID,ContinueSection?"Yes" :"No");
|
||||
if (Parent->m_ContinueSection == this && Parent->m_JumpSection == this)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
SECTION_LIST::iterator iter = m_ParentSection.begin();
|
||||
|
@ -1557,7 +1557,7 @@ void CCodeSection::UnlinkParent( CCodeSection * Parent, bool ContinueSection )
|
|||
{
|
||||
if (ParentIter->m_CompiledLocation)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
ParentIter->m_ContinueSection = NULL;
|
||||
}
|
||||
|
@ -1566,7 +1566,7 @@ void CCodeSection::UnlinkParent( CCodeSection * Parent, bool ContinueSection )
|
|||
{
|
||||
if (ParentIter->m_CompiledLocation)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
ParentIter->m_JumpSection = NULL;
|
||||
}
|
||||
|
@ -1646,7 +1646,7 @@ bool CCodeSection::InheritParentInfo ( void )
|
|||
CCodeSection * Parent = *(m_ParentSection.begin());
|
||||
if (Parent->m_CompiledLocation == NULL)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
CJumpInfo * JumpInfo = this == Parent->m_ContinueSection ? &Parent->m_Cont : &Parent->m_Jump;
|
||||
|
||||
|
@ -1687,7 +1687,7 @@ bool CCodeSection::InheritParentInfo ( void )
|
|||
size_t NoOfCompiledParents = ParentList.size();
|
||||
if (NoOfCompiledParents == 0)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -1720,7 +1720,7 @@ bool CCodeSection::InheritParentInfo ( void )
|
|||
}
|
||||
if (FirstParent != -1)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
FirstParent = i;
|
||||
}
|
||||
|
@ -1750,17 +1750,17 @@ bool CCodeSection::InheritParentInfo ( void )
|
|||
{
|
||||
if (JumpInfo->RegSet.GetBlockCycleCount() != 0)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
if (JumpInfo->JumpPC != (DWORD)-1)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
} else {
|
||||
UpdateCounters(m_RegWorkingSet,m_EnterPC < JumpInfo->JumpPC,true);
|
||||
if (JumpInfo->JumpPC == (DWORD)-1)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
if (m_EnterPC <= JumpInfo->JumpPC)
|
||||
{
|
||||
|
@ -1844,7 +1844,7 @@ bool CCodeSection::InheritParentInfo ( void )
|
|||
break;
|
||||
default:
|
||||
CPU_Message("Unknown CPU State(%d) in InheritParentInfo",GetMipsRegState(i2));
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
if (IsConst(i2)) {
|
||||
|
@ -1859,7 +1859,7 @@ bool CCodeSection::InheritParentInfo ( void )
|
|||
{
|
||||
Map_GPR_32bit(i2,(GetMipsRegLo(i2) & 0x80000000) != 0,i2);
|
||||
} else {
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
break;
|
||||
case CRegInfo::STATE_MAPPED_32_SIGN:
|
||||
|
@ -1867,7 +1867,7 @@ bool CCodeSection::InheritParentInfo ( void )
|
|||
{
|
||||
Map_GPR_32bit(i2,true,i2);
|
||||
} else {
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
break;
|
||||
case CRegInfo::STATE_UNKNOWN:
|
||||
|
@ -1880,7 +1880,7 @@ bool CCodeSection::InheritParentInfo ( void )
|
|||
break;
|
||||
default:
|
||||
CPU_Message("Unknown CPU State(%d) in InheritParentInfo",RegSet->GetMipsRegState(i2));
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
break;
|
||||
}
|
||||
} else if (Is32Bit(i2) && GetMipsRegLo(i2) != RegSet->GetMipsRegLo(i2)) {
|
||||
|
@ -1955,13 +1955,13 @@ bool CCodeSection::InheritParentInfo ( void )
|
|||
case CRegInfo::STATE_CONST_32_SIGN:
|
||||
if (GetMipsRegLo(i2) != RegSet->GetMipsRegLo(i2))
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
NeedSync = true;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
WriteTraceF(TraceError,__FUNCTION__ ": Unhandled Reg state %d\nin InheritParentInfo",GetMipsRegState(i2));
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
if (NeedSync == false) { continue; }
|
||||
|
@ -1985,7 +1985,7 @@ bool CCodeSection::InheritParentInfo ( void )
|
|||
}
|
||||
//if (m_EnterPC == 0x8031CE44 && m_SectionID == 6)
|
||||
//{
|
||||
// g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
// g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
//}
|
||||
m_RegWorkingSet = JumpInfo->RegSet;
|
||||
if (m_EnterPC < JumpInfo->JumpPC )
|
||||
|
|
|
@ -72,7 +72,7 @@ bool LoopAnalysis::SetupEnterSection ( CCodeSection * Section, bool & bChanged,
|
|||
{
|
||||
bChanged = false;
|
||||
bSkipedSection = false;
|
||||
if (Section->m_ParentSection.empty()) { g_Notify->BreakPoint(__FILE__,__LINE__); return true; }
|
||||
if (Section->m_ParentSection.empty()) { g_Notify->BreakPoint(__FILEW__,__LINE__); return true; }
|
||||
|
||||
CPU_Message(__FUNCTION__ ": Block EnterPC: %X Section ID %d Test: %X Section Test: %X CompiledLocation: %X",m_BlockInfo->VAddrEnter(),Section->m_SectionID,m_Test,Section->m_Test, Section->m_CompiledLocation);
|
||||
|
||||
|
@ -118,7 +118,7 @@ bool LoopAnalysis::SetupEnterSection ( CCodeSection * Section, bool & bChanged,
|
|||
|
||||
if (bFirstParent)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
RegisterMap::iterator itr = m_EnterRegisters.find(Section->m_SectionID);
|
||||
|
@ -169,7 +169,7 @@ bool LoopAnalysis::CheckLoopRegisterUsage( CCodeSection * Section)
|
|||
do {
|
||||
if (!g_MMU->LW_VAddr(m_PC, m_Command.Hex))
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
CPU_Message(" %08X: %s",m_PC,R4300iOpcodeName(m_Command.Hex,m_PC));
|
||||
|
@ -223,7 +223,7 @@ bool LoopAnalysis::CheckLoopRegisterUsage( CCodeSection * Section)
|
|||
case R4300i_SPECIAL_DSRL32: SPECIAL_DSRL32(); break;
|
||||
case R4300i_SPECIAL_DSRA32: SPECIAL_DSRA32(); break;
|
||||
default:
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
#ifdef tofix
|
||||
if (m_Command.Hex == 0x00000001) { break; }
|
||||
g_Notify->DisplayError(L"Unhandled R4300i OpCode in FillSectionInfo 5\n%s",
|
||||
|
@ -243,19 +243,19 @@ bool LoopAnalysis::CheckLoopRegisterUsage( CCodeSection * Section)
|
|||
Section->m_ContinueSection != NULL &&
|
||||
Section->m_Cont.TargetPC != (DWORD)-1)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
if (Section->m_Jump.TargetPC != m_PC + ((short)m_Command.offset << 2) + 4 &&
|
||||
Section->m_JumpSection != NULL &&
|
||||
Section->m_Jump.TargetPC != (DWORD)-1)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
if (m_PC == Section->m_Jump.TargetPC)
|
||||
{
|
||||
if (!DelaySlotEffectsCompare(m_PC,m_Command.rs,0) && !Section->m_Jump.PermLoop)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
@ -268,30 +268,30 @@ bool LoopAnalysis::CheckLoopRegisterUsage( CCodeSection * Section)
|
|||
Section->m_ContinueSection != NULL &&
|
||||
Section->m_Cont.TargetPC != (DWORD)-1)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
if (Section->m_Jump.TargetPC != m_PC + 4 &&
|
||||
Section->m_JumpSection != NULL &&
|
||||
Section->m_Jump.TargetPC != (DWORD)-1)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
/*if (Section->m_Jump.TargetPC != m_PC + ((short)m_Command.offset << 2) + 4)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}*/
|
||||
if (m_PC == m_PC + ((short)m_Command.offset << 2) + 4)
|
||||
{
|
||||
if (!DelaySlotEffectsCompare(m_PC,m_Command.rs,0) && !Section->m_Jump.PermLoop)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
break;
|
||||
case R4300i_REGIMM_BLTZAL:
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
#ifdef tofix
|
||||
m_Reg.GetMipsRegLo(31) = m_PC + 8;
|
||||
m_Reg.SetMipsRegState(31,CRegInfo::STATE_CONST_32_SIGN);
|
||||
|
@ -305,7 +305,7 @@ bool LoopAnalysis::CheckLoopRegisterUsage( CCodeSection * Section)
|
|||
#endif
|
||||
break;
|
||||
case R4300i_REGIMM_BGEZAL:
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
#ifdef tofix
|
||||
m_NextInstruction = DELAY_SLOT;
|
||||
if (m_Reg.IsConst(m_Command.rs))
|
||||
|
@ -343,7 +343,7 @@ bool LoopAnalysis::CheckLoopRegisterUsage( CCodeSection * Section)
|
|||
#endif
|
||||
break;
|
||||
default:
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
#ifdef tofix
|
||||
if (m_Command.Hex == 0x0407000D) { break; }
|
||||
g_Notify->DisplayError(L"Unhandled R4300i OpCode in FillSectionInfo 4\n%s",
|
||||
|
@ -354,7 +354,7 @@ bool LoopAnalysis::CheckLoopRegisterUsage( CCodeSection * Section)
|
|||
}
|
||||
break;
|
||||
case R4300i_JAL:
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
#ifdef tofix
|
||||
m_NextInstruction = DELAY_SLOT;
|
||||
m_Reg.GetMipsRegLo(31) = m_PC + 8;
|
||||
|
@ -372,11 +372,11 @@ bool LoopAnalysis::CheckLoopRegisterUsage( CCodeSection * Section)
|
|||
#ifdef CHECKED_BUILD
|
||||
if (Section->m_Jump.TargetPC != (m_PC & 0xF0000000) + (m_Command.target << 2))
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
if (m_PC == Section->m_Jump.TargetPC && !Section->m_Jump.PermLoop)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
#endif
|
||||
break;
|
||||
|
@ -391,23 +391,23 @@ bool LoopAnalysis::CheckLoopRegisterUsage( CCodeSection * Section)
|
|||
Section->m_ContinueSection != NULL &&
|
||||
Section->m_Cont.TargetPC != (DWORD)-1)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
} else {
|
||||
if (Section->m_Cont.TargetPC != (DWORD)-1)
|
||||
{
|
||||
//g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
//g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
if (Section->m_Jump.TargetPC != m_PC + ((short)m_Command.offset << 2) + 4)
|
||||
{
|
||||
//g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
//g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
if (m_PC == Section->m_Jump.TargetPC)
|
||||
{
|
||||
if (!DelaySlotEffectsCompare(m_PC,m_Command.rs,m_Command.rt) && !Section->m_Jump.PermLoop)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
@ -424,19 +424,19 @@ bool LoopAnalysis::CheckLoopRegisterUsage( CCodeSection * Section)
|
|||
Section->m_ContinueSection != NULL &&
|
||||
Section->m_Cont.TargetPC != (DWORD)-1)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
if (Section->m_Jump.TargetPC != m_PC + ((short)m_Command.offset << 2) + 4 &&
|
||||
Section->m_JumpSection != NULL &&
|
||||
Section->m_Jump.TargetPC != (DWORD)-1)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
if (m_PC == Section->m_Jump.TargetPC)
|
||||
{
|
||||
if (!DelaySlotEffectsCompare(m_PC,m_Command.rs,m_Command.rt) && !Section->m_Jump.PermLoop)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
@ -542,17 +542,17 @@ bool LoopAnalysis::CheckLoopRegisterUsage( CCodeSection * Section)
|
|||
Section->m_ContinueSection != NULL &&
|
||||
Section->m_Cont.TargetPC != (DWORD)-1)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
if (m_PC == m_PC + ((short)m_Command.offset << 2) + 4)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
#ifdef tofix
|
||||
if (!DelaySlotEffectsCompare(m_PC,m_Command.rs,m_Command.rt))
|
||||
{
|
||||
if (!Section->m_Jump.PermLoop)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
@ -567,15 +567,15 @@ bool LoopAnalysis::CheckLoopRegisterUsage( CCodeSection * Section)
|
|||
Section->m_ContinueSection != NULL &&
|
||||
Section->m_Cont.TargetPC != (DWORD)-1)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
if (Section->m_Jump.TargetPC != m_PC + ((short)m_Command.offset << 2) + 4)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
if (m_PC == Section->m_Jump.TargetPC)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
#ifdef tofix
|
||||
if (!DelaySlotEffectsCompare(m_PC,m_Command.rs,m_Command.rt)) {
|
||||
Section->m_Jump.PermLoop = true;
|
||||
|
@ -610,21 +610,21 @@ bool LoopAnalysis::CheckLoopRegisterUsage( CCodeSection * Section)
|
|||
Section->m_ContinueSection != NULL &&
|
||||
Section->m_Cont.TargetPC != (DWORD)-1)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
if (Section->m_Jump.TargetPC != m_PC + 4)
|
||||
{
|
||||
//g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
//g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
/*if (Section->m_Jump.TargetPC != m_PC + ((short)m_Command.offset << 2) + 4)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}*/
|
||||
if (m_PC == m_PC + ((short)m_Command.offset << 2) + 4)
|
||||
{
|
||||
if (!DelaySlotEffectsCompare(m_PC,m_Command.rs,m_Command.rt) && !Section->m_Jump.PermLoop)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
@ -699,7 +699,7 @@ bool LoopAnalysis::CheckLoopRegisterUsage( CCodeSection * Section)
|
|||
{
|
||||
if (m_NextInstruction != NORMAL && m_NextInstruction != END_BLOCK)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
m_NextInstruction = END_BLOCK;
|
||||
SetJumpRegSet(Section,m_Reg);
|
||||
|
@ -713,7 +713,7 @@ bool LoopAnalysis::CheckLoopRegisterUsage( CCodeSection * Section)
|
|||
m_PC += 4;
|
||||
if ((m_PC & 0xFFFFF000) != (m_EnterSection->m_EnterPC & 0xFFFFF000))
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
break;
|
||||
case LIKELY_DELAY_SLOT:
|
||||
|
@ -731,7 +731,7 @@ bool LoopAnalysis::CheckLoopRegisterUsage( CCodeSection * Section)
|
|||
m_NextInstruction = END_BLOCK;
|
||||
break;
|
||||
case LIKELY_DELAY_SLOT_DONE:
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
if (Section->m_CompiledLocation)
|
||||
{
|
||||
} else {
|
||||
|
@ -752,9 +752,9 @@ bool LoopAnalysis::CheckLoopRegisterUsage( CCodeSection * Section)
|
|||
if ((m_PC & 0xFFFFF000) != (m_EnterSection->m_EnterPC & 0xFFFFF000)) {
|
||||
if (m_NextInstruction != END_BLOCK && m_NextInstruction != NORMAL)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
} while (m_NextInstruction != END_BLOCK);
|
||||
|
||||
|
@ -780,7 +780,7 @@ bool LoopAnalysis::SyncRegState ( CRegInfo & RegSet, const CRegInfo& SyncReg )
|
|||
RegSet.SetMipsRegState(x,CRegInfo::STATE_MODIFIED);
|
||||
bChanged = true;
|
||||
} else if (RegSet.IsConst(x) && RegSet.Is64Bit(x) && RegSet.GetMipsReg_S(x) != SyncReg.GetMipsReg_S(x)) {
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
return bChanged;
|
||||
|
@ -872,7 +872,7 @@ void LoopAnalysis::SPECIAL_SRAV ( void )
|
|||
|
||||
void LoopAnalysis::SPECIAL_JR ( void )
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
#ifdef tofix
|
||||
if (m_Reg.IsConst(m_Command.rs)) {
|
||||
Section->m_Jump.TargetPC = m_Reg.GetMipsRegLo(m_Command.rs);
|
||||
|
@ -885,7 +885,7 @@ void LoopAnalysis::SPECIAL_JR ( void )
|
|||
|
||||
void LoopAnalysis::SPECIAL_JALR ( void )
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
#ifdef tofix
|
||||
m_Reg.GetMipsRegLo(m_Command.rd) = m_PC + 8;
|
||||
m_Reg.SetMipsRegState(m_Command.rd,CRegInfo::STATE_CONST_32_SIGN);
|
||||
|
@ -904,12 +904,12 @@ void LoopAnalysis::SPECIAL_SYSCALL ( CCodeSection * Section )
|
|||
if (Section->m_ContinueSection != NULL &&
|
||||
Section->m_Cont.TargetPC != (DWORD)-1)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
if (Section->m_JumpSection != NULL &&
|
||||
Section->m_Jump.TargetPC != (DWORD)-1)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
#else
|
||||
Section = Section;
|
||||
|
@ -924,12 +924,12 @@ void LoopAnalysis::SPECIAL_BREAK ( CCodeSection * Section )
|
|||
if (Section->m_ContinueSection != NULL &&
|
||||
Section->m_Cont.TargetPC != (DWORD)-1)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
if (Section->m_JumpSection != NULL &&
|
||||
Section->m_Jump.TargetPC != (DWORD)-1)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
#else
|
||||
Section = Section;
|
||||
|
|
|
@ -148,7 +148,7 @@ void CRecompiler::RecompilerMain_VirtualTable ( void )
|
|||
|
||||
void CRecompiler::RecompilerMain_VirtualTable_validate ( void )
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
/* PCCompiledFunc_TABLE * m_FunctionTable = m_Functions.GetFunctionTable();
|
||||
|
||||
while(!m_EndEmulation)
|
||||
|
@ -159,7 +159,7 @@ void CRecompiler::RecompilerMain_VirtualTable_validate ( void )
|
|||
//Find Block on hash table
|
||||
if (Info == NULL)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
#ifdef tofix
|
||||
if (!g_TLB->ValidVaddr(PROGRAM_COUNTER))
|
||||
{
|
||||
|
@ -219,7 +219,7 @@ void CRecompiler::RecompilerMain_VirtualTable_validate ( void )
|
|||
continue;
|
||||
}
|
||||
}
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
#ifdef tofix
|
||||
if (!g_TLB->ValidVaddr(PROGRAM_COUNTER))
|
||||
{
|
||||
|
@ -367,7 +367,7 @@ void CRecompiler::RecompilerMain_Lookup( void )
|
|||
{
|
||||
/*if (bUseTlb())
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
#ifdef tofix
|
||||
if (!g_TLB->TranslateVaddr(PROGRAM_COUNTER, Addr))
|
||||
{
|
||||
|
@ -480,7 +480,7 @@ void CRecompiler::RecompilerMain_Lookup( void )
|
|||
continue;
|
||||
}
|
||||
}
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
#ifdef tofix
|
||||
if (Profiling && IndvidualBlock) {
|
||||
static DWORD ProfAddress = 0;
|
||||
|
@ -655,7 +655,7 @@ void CRecompiler::RecompilerMain_Lookup_validate_TLB( void )
|
|||
info = JumpTable()[PhysicalAddr >> 2];
|
||||
if (info != NULL)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
info = NULL;
|
||||
}
|
||||
continue;
|
||||
|
@ -707,7 +707,7 @@ void CRecompiler::ResetRecompCode( bool bAllocate )
|
|||
|
||||
void CRecompiler::RecompilerMain_ChangeMemory ( void )
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
#ifdef tofix
|
||||
DWORD Value, Addr;
|
||||
BYTE * Block;
|
||||
|
@ -921,7 +921,7 @@ void CRecompiler::ClearRecompCode_Phys(DWORD Address, int length, REMOVE_REASON
|
|||
int ClearLen = ((length + 3) & ~3);
|
||||
if (Address + ClearLen > g_System->RdramSize())
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
ClearLen = g_System->RdramSize() - Address;
|
||||
}
|
||||
WriteTraceF(TraceRecompiler,__FUNCTION__ ": Reseting Jump Table, Addr: %X len: %d",Address,ClearLen);
|
||||
|
@ -961,7 +961,7 @@ void CRecompiler::ClearRecompCode_Virt(DWORD Address, int length,REMOVE_REASON R
|
|||
|
||||
if (DataLeft > 0)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
@ -975,7 +975,7 @@ void CRecompiler::ClearRecompCode_Virt(DWORD Address, int length,REMOVE_REASON R
|
|||
}
|
||||
break;
|
||||
default:
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -983,7 +983,7 @@ void CRecompiler::ResetMemoryStackPos( void )
|
|||
{
|
||||
if (g_MMU == NULL)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return;
|
||||
}
|
||||
if (m_Registers.m_GPR[29].UW[0] == 0)
|
||||
|
@ -998,6 +998,6 @@ void CRecompiler::ResetMemoryStackPos( void )
|
|||
m_MemoryStack = (DWORD)(g_MMU->Rdram() + pAddr);
|
||||
} else {
|
||||
WriteTraceF(TraceError,__FUNCTION__ ": Failed to translate SP address (%s)",m_Registers.m_GPR[29].UW[0]);
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -161,7 +161,7 @@ void CRecompilerOps::Compile_Branch (CRecompilerOps::BranchFunction CompareFunc,
|
|||
{
|
||||
if (m_Section->m_Jump.LinkLocation != NULL || m_Section->m_Jump.LinkLocation2 != NULL)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
MoveConstToVariable(m_Section->m_Jump.TargetPC,&R4300iOp::m_JumpToLocation,"R4300iOp::m_JumpToLocation");
|
||||
}
|
||||
|
@ -169,7 +169,7 @@ void CRecompilerOps::Compile_Branch (CRecompilerOps::BranchFunction CompareFunc,
|
|||
{
|
||||
if (m_Section->m_Cont.LinkLocation != NULL || m_Section->m_Cont.LinkLocation2 != NULL)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
MoveConstToVariable(m_Section->m_Cont.TargetPC,&R4300iOp::m_JumpToLocation,"R4300iOp::m_JumpToLocation");
|
||||
}
|
||||
|
@ -177,7 +177,7 @@ void CRecompilerOps::Compile_Branch (CRecompilerOps::BranchFunction CompareFunc,
|
|||
if (m_Section->m_Jump.LinkLocation != NULL || m_Section->m_Jump.LinkLocation2 != NULL)
|
||||
{
|
||||
JmpLabel8("DoDelaySlot",0);
|
||||
if (DelayLinkLocation != NULL) { g_Notify->BreakPoint(__FILE__,__LINE__); }
|
||||
if (DelayLinkLocation != NULL) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
|
||||
DelayLinkLocation = (BYTE *)(m_RecompPos - 1);
|
||||
|
||||
CPU_Message(" ");
|
||||
|
@ -193,7 +193,7 @@ void CRecompilerOps::Compile_Branch (CRecompilerOps::BranchFunction CompareFunc,
|
|||
if (m_Section->m_Cont.LinkLocation != NULL || m_Section->m_Cont.LinkLocation2 != NULL)
|
||||
{
|
||||
JmpLabel8("DoDelaySlot",0);
|
||||
if (DelayLinkLocation != NULL) { g_Notify->BreakPoint(__FILE__,__LINE__); }
|
||||
if (DelayLinkLocation != NULL) { g_Notify->BreakPoint(__FILEW__,__LINE__); }
|
||||
DelayLinkLocation = (BYTE *)(m_RecompPos - 1);
|
||||
|
||||
CPU_Message(" ");
|
||||
|
@ -317,15 +317,15 @@ void CRecompilerOps::Compile_BranchLikely (BranchFunction CompareFunc, BOOL Link
|
|||
} else {
|
||||
if (m_Section->m_Jump.JumpPC != m_CompilePC)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
if (m_Section->m_Cont.JumpPC != m_CompilePC)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
if (m_Section->m_Cont.TargetPC != m_CompilePC + 8)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
if (m_Section->m_JumpSection != NULL) {
|
||||
|
@ -360,7 +360,7 @@ void CRecompilerOps::Compile_BranchLikely (BranchFunction CompareFunc, BOOL Link
|
|||
{
|
||||
if (m_Section->m_Jump.LinkLocation != NULL)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -380,7 +380,7 @@ void CRecompilerOps::Compile_BranchLikely (BranchFunction CompareFunc, BOOL Link
|
|||
CPU_Message(" ");
|
||||
CPU_Message(" %s:",m_Section->m_Cont.BranchLabel.c_str());
|
||||
} else if (!m_Section->m_Cont.FallThrough) {
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
if (m_Section->m_Cont.LinkLocation != NULL) {
|
||||
|
@ -407,7 +407,7 @@ void CRecompilerOps::Compile_BranchLikely (BranchFunction CompareFunc, BOOL Link
|
|||
{
|
||||
if (m_Section->m_Jump.LinkLocation != NULL)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
m_Section->GenerateSectionLinkage();
|
||||
m_NextInstruction = END_BLOCK;
|
||||
|
@ -1214,7 +1214,7 @@ void CRecompilerOps::BLTZ_Compare (void) {
|
|||
void CRecompilerOps::BGEZ_Compare (void) {
|
||||
if (IsConst(m_Opcode.rs)) {
|
||||
if (Is64Bit(m_Opcode.rs)) {
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
CRecompilerOps::UnknownOpcode();
|
||||
} else if (IsSigned(m_Opcode.rs)) {
|
||||
if (GetMipsRegLo_S(m_Opcode.rs) >= 0) {
|
||||
|
@ -1393,7 +1393,7 @@ void CRecompilerOps::JAL (void) {
|
|||
}
|
||||
m_NextInstruction = END_BLOCK;
|
||||
} else {
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
@ -4012,7 +4012,7 @@ void CRecompilerOps::COP0_MT (void) {
|
|||
SetJump8(Jump,m_RecompPos);
|
||||
|
||||
//TestConstToX86Reg(STATUS_FR,OldStatusReg);
|
||||
//BreakPoint(__FILE__,__LINE__); //m_Section->CompileExit(m_CompilePC+4,m_RegWorkingSet,ExitResetRecompCode,FALSE,JneLabel32);
|
||||
//BreakPoint(__FILEW__,__LINE__); //m_Section->CompileExit(m_CompilePC+4,m_RegWorkingSet,ExitResetRecompCode,FALSE,JneLabel32);
|
||||
BeforeCallDirect(m_RegWorkingSet);
|
||||
MoveConstToX86reg((DWORD)g_Reg,x86_ECX);
|
||||
Call_Direct(AddressOf(&CRegisters::CheckInterrupts),"CRegisters::CheckInterrupts");
|
||||
|
|
|
@ -79,7 +79,7 @@ CRegInfo& CRegInfo::operator=(const CRegInfo& right)
|
|||
#ifdef _DEBUG
|
||||
if (*this != right)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
#endif
|
||||
return *this;
|
||||
|
@ -517,7 +517,7 @@ CRegInfo::x86Reg CRegInfo::Map_MemoryStack ( x86Reg Reg, bool bMapRegister, bool
|
|||
if (Reg == x86_Unknown)
|
||||
{
|
||||
g_Notify->DisplayError(L"Map_MemoryStack\n\nOut of registers");
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
SetX86Mapped(Reg,CRegInfo::Stack_Mapped);
|
||||
CPU_Message(" regcache: allocate %s as Memory Stack",x86_Name(Reg));
|
||||
|
@ -554,7 +554,7 @@ void CRegInfo::Map_GPR_32bit (int MipsReg, bool SignValue, int MipsRegToLoad)
|
|||
x86Reg Reg;
|
||||
if (MipsReg == 0)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -563,7 +563,7 @@ void CRegInfo::Map_GPR_32bit (int MipsReg, bool SignValue, int MipsRegToLoad)
|
|||
Reg = FreeX86Reg();
|
||||
if (Reg < 0) {
|
||||
if (bHaveDebugger()) { g_Notify->DisplayError(L"Map_GPR_32bit\n\nOut of registers"); }
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return;
|
||||
}
|
||||
CPU_Message(" regcache: allocate %s to %s",x86_Name(Reg),CRegName::GPR[MipsReg]);
|
||||
|
@ -643,7 +643,7 @@ void CRegInfo::Map_GPR_64bit ( int MipsReg, int MipsRegToLoad)
|
|||
x86Hi = FreeX86Reg();
|
||||
if (x86Hi == x86_Unknown)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return;
|
||||
}
|
||||
SetX86Protected(x86Hi,TRUE);
|
||||
|
@ -730,7 +730,7 @@ CX86Ops::x86Reg CRegInfo::Map_TempReg (CX86Ops::x86Reg Reg, int MipsReg, BOOL Lo
|
|||
if (Reg == x86_Unknown)
|
||||
{
|
||||
WriteTrace(TraceError,__FUNCTION__ ": Failed to find a free register");
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return x86_Unknown;
|
||||
}
|
||||
}
|
||||
|
@ -747,7 +747,7 @@ CX86Ops::x86Reg CRegInfo::Map_TempReg (CX86Ops::x86Reg Reg, int MipsReg, BOOL Lo
|
|||
Reg = Free8BitX86Reg();
|
||||
if (Reg < 0) {
|
||||
WriteTrace(TraceError,__FUNCTION__ ": Failed to find a free 8 bit register");
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return x86_Unknown;
|
||||
}
|
||||
}
|
||||
|
@ -755,7 +755,7 @@ CX86Ops::x86Reg CRegInfo::Map_TempReg (CX86Ops::x86Reg Reg, int MipsReg, BOOL Lo
|
|||
if (GetX86Protected(Reg))
|
||||
{
|
||||
WriteTrace(TraceError,__FUNCTION__ ": Register is protected");
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return x86_Unknown;
|
||||
}
|
||||
|
||||
|
@ -1256,7 +1256,7 @@ void CRegInfo::WriteBackRegisters ()
|
|||
break;
|
||||
default:
|
||||
CPU_Message(__FUNCTION__ ": Unknown State: %d reg %d (%s)",GetMipsRegState(count),count,CRegName::GPR[count])
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -67,7 +67,7 @@ void CCodeSection::UnlinkParent( CCodeSection * Parent, bool AllowDelete, bool C
|
|||
// {
|
||||
// if (!ContinueSection && Parent->ContinueSection == this)
|
||||
// {
|
||||
// g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
// g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
// }
|
||||
// }
|
||||
if (ContinueSection && Parent->ContinueSection == this)
|
||||
|
@ -78,7 +78,7 @@ void CCodeSection::UnlinkParent( CCodeSection * Parent, bool AllowDelete, bool C
|
|||
// {
|
||||
// if (ContinueSection && Parent->JumpSection == this)
|
||||
// {
|
||||
// g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
// g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
// }
|
||||
// }
|
||||
if (!ContinueSection && Parent->JumpSection == this)
|
||||
|
@ -117,7 +117,7 @@ CCodeSection::~CCodeSection ( void )
|
|||
ContinueSection->UnlinkParent(this, true, true);
|
||||
if (ContinueSection)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
ContinueSection = NULL;
|
||||
}
|
||||
|
@ -126,7 +126,7 @@ CCodeSection::~CCodeSection ( void )
|
|||
JumpSection->UnlinkParent(this, true, false);
|
||||
if (JumpSection)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
JumpSection = NULL;
|
||||
}
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -77,7 +77,7 @@ protected:
|
|||
static void AndVariableDispToX86Reg ( void * Variable, const char * VariableName, x86Reg Reg, x86Reg AddrReg, Multipler Multiply);
|
||||
static void AndX86RegToX86Reg ( x86Reg Destination, x86Reg Source );
|
||||
static void X86HardBreakPoint ( void );
|
||||
static void X86BreakPoint ( LPCSTR FileName, int LineNumber );
|
||||
static void X86BreakPoint ( const wchar_t * FileName, int LineNumber );
|
||||
static void Call_Direct ( void * FunctAddress, const char * FunctName );
|
||||
static void Call_Indirect ( void * FunctAddress, const char * FunctName );
|
||||
static void CompConstToVariable ( DWORD Const, void * Variable, const char * VariableName );
|
||||
|
@ -297,7 +297,7 @@ protected:
|
|||
static void SetJump8(BYTE * Loc, BYTE * JumpLoc);
|
||||
|
||||
private:
|
||||
static void BreakPointNotification (const char * const FileName, const int LineNumber);
|
||||
static void BreakPointNotification (const wchar_t * const FileName, const int LineNumber);
|
||||
static char m_fpupop[2][2];
|
||||
};
|
||||
|
||||
|
|
|
@ -147,7 +147,7 @@ void CControl_Plugin::UpdateKeys (void)
|
|||
if (!m_Controllers[cont]->m_RawData) {
|
||||
GetKeys(cont,&m_Controllers[cont]->m_Buttons);
|
||||
} else {
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
if (ReadController) { ReadController(-1, NULL); }
|
||||
|
|
|
@ -122,7 +122,7 @@ bool CSettingTypeApplication::Load ( int /*Index*/, bool & Value ) const
|
|||
Value = dwValue != 0;
|
||||
}
|
||||
} else {
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
if (!bRes && m_DefaultSetting != Default_None)
|
||||
|
@ -144,7 +144,7 @@ bool CSettingTypeApplication::Load ( int /*Index*/, ULONG & Value ) const
|
|||
{
|
||||
bRes = m_SettingsIniFile->GetNumber(SectionName(),m_KeyNameIdex.c_str(),Value,Value);
|
||||
} else {
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
if (!bRes && m_DefaultSetting != Default_None)
|
||||
{
|
||||
|
@ -170,7 +170,7 @@ bool CSettingTypeApplication::Load ( int Index, stdstr & Value ) const
|
|||
{
|
||||
bRes = m_SettingsIniFile ? m_SettingsIniFile->GetString(SectionName(),m_KeyNameIdex.c_str(),m_DefaultStr,Value) : false;
|
||||
} else {
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
if (!bRes)
|
||||
{
|
||||
|
@ -226,7 +226,7 @@ void CSettingTypeApplication::Save ( int /*Index*/, bool Value )
|
|||
{
|
||||
m_SettingsIniFile->SaveNumber(SectionName(),m_KeyNameIdex.c_str(),Value);
|
||||
} else {
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -236,7 +236,7 @@ void CSettingTypeApplication::Save ( int /*Index*/, ULONG Value )
|
|||
{
|
||||
m_SettingsIniFile->SaveNumber(SectionName(),m_KeyNameIdex.c_str(),Value);
|
||||
} else {
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -246,7 +246,7 @@ void CSettingTypeApplication::Save ( int /*Index*/, const stdstr & Value )
|
|||
{
|
||||
m_SettingsIniFile->SaveString(SectionName(),m_KeyNameIdex.c_str(),Value.c_str());
|
||||
} else {
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -256,7 +256,7 @@ void CSettingTypeApplication::Save ( int /*Index*/, const char * Value )
|
|||
{
|
||||
m_SettingsIniFile->SaveString(SectionName(),m_KeyNameIdex.c_str(),Value);
|
||||
} else {
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -281,6 +281,6 @@ void CSettingTypeApplication::Delete( int /*Index*/ )
|
|||
{
|
||||
m_SettingsIniFile->SaveString(SectionName(),m_KeyNameIdex.c_str(),NULL);
|
||||
} else {
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -72,18 +72,18 @@ LPCSTR CSettingTypeCheats::SectionName ( void ) const
|
|||
|
||||
void CSettingTypeCheats::UpdateSettings ( void * )
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}*/
|
||||
|
||||
bool CSettingTypeCheats::Load ( int /*Index*/, bool & /*Value*/ ) const
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CSettingTypeCheats::Load ( int /*Index*/, ULONG & /*Value*/ ) const
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -100,28 +100,28 @@ bool CSettingTypeCheats::Load ( int Index, stdstr & Value ) const
|
|||
//return the default values
|
||||
void CSettingTypeCheats::LoadDefault ( int /*Index*/, bool & /*Value*/ ) const
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeCheats::LoadDefault ( int /*Index*/, ULONG & /*Value*/ ) const
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeCheats::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
//Update the settings
|
||||
void CSettingTypeCheats::Save ( int /*Index*/, bool /*Value*/ )
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeCheats::Save ( int /*Index*/, ULONG /*Value*/ )
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeCheats::Save ( int Index, const stdstr & Value )
|
||||
|
|
|
@ -47,7 +47,7 @@ bool CSettingTypeGameIndex::Load ( int Index, bool & Value ) const
|
|||
|
||||
bool CSettingTypeGameIndex::Load ( int /*Index*/, ULONG & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -66,12 +66,12 @@ void CSettingTypeGameIndex::LoadDefault ( int Index, bool & Value ) const
|
|||
|
||||
void CSettingTypeGameIndex::LoadDefault ( int /*Index*/, ULONG & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeGameIndex::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
//Update the settings
|
||||
|
@ -89,7 +89,7 @@ void CSettingTypeGameIndex::Save ( int Index, ULONG Value )
|
|||
|
||||
void CSettingTypeGameIndex::Save ( int /*Index*/, const stdstr & /*Value*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeGameIndex::Save ( int Index, const char * Value )
|
||||
|
|
|
@ -28,7 +28,7 @@ CSettingTypeRDBCpuType::~CSettingTypeRDBCpuType()
|
|||
|
||||
bool CSettingTypeRDBCpuType::Load ( int /*Index*/, bool & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -51,21 +51,21 @@ bool CSettingTypeRDBCpuType::Load ( int Index, ULONG & Value ) const
|
|||
LoadDefault(Index,Value);
|
||||
return false;
|
||||
}
|
||||
else { Notify().BreakPoint(__FILE__,__LINE__); }
|
||||
else { Notify().BreakPoint(__FILEW__,__LINE__); }
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool CSettingTypeRDBCpuType::Load ( int /*Index*/, stdstr & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
//return the default values
|
||||
void CSettingTypeRDBCpuType::LoadDefault ( int /*Index*/, bool & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeRDBCpuType::LoadDefault ( int /*Index*/, ULONG & Value ) const
|
||||
|
@ -83,13 +83,13 @@ void CSettingTypeRDBCpuType::LoadDefault ( int /*Index*/, ULONG & Value ) const
|
|||
|
||||
void CSettingTypeRDBCpuType::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
//Update the settings
|
||||
void CSettingTypeRDBCpuType::Save ( int /*Index*/, bool /*Value*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeRDBCpuType::Save ( int /*Index*/, ULONG Value )
|
||||
|
@ -102,19 +102,19 @@ void CSettingTypeRDBCpuType::Save ( int /*Index*/, ULONG Value )
|
|||
case CPU_Recompiler: strValue = "Recompiler"; break;
|
||||
case CPU_SyncCores: strValue = "SyncCores"; break;
|
||||
default:
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),strValue.c_str());
|
||||
}
|
||||
|
||||
void CSettingTypeRDBCpuType::Save ( int /*Index*/, const stdstr & /*Value*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeRDBCpuType::Save ( int /*Index*/, const char * /*Value*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeRDBCpuType::Delete( int /*Index*/ )
|
||||
|
|
|
@ -44,20 +44,20 @@ bool CSettingTypeRDBOnOff::Load ( int Index, bool & Value ) const
|
|||
LoadDefault(Index,Value);
|
||||
return false;
|
||||
}
|
||||
else { Notify().BreakPoint(__FILE__,__LINE__); }
|
||||
else { Notify().BreakPoint(__FILEW__,__LINE__); }
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool CSettingTypeRDBOnOff::Load ( int /*Index*/, ULONG & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CSettingTypeRDBOnOff::Load ( int /*Index*/, stdstr & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -77,12 +77,12 @@ void CSettingTypeRDBOnOff::LoadDefault ( int /*Index*/, bool & Value ) const
|
|||
|
||||
void CSettingTypeRDBOnOff::LoadDefault ( int /*Index*/, ULONG & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeRDBOnOff::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
|
||||
|
@ -94,17 +94,17 @@ void CSettingTypeRDBOnOff::Save ( int /*Index*/, bool Value )
|
|||
|
||||
void CSettingTypeRDBOnOff::Save ( int /*Index*/, ULONG /*Value*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeRDBOnOff::Save ( int /*Index*/, const stdstr & /*Value*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeRDBOnOff::Save ( int /*Index*/, const char * /*Value*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeRDBOnOff::Delete( int /*Index*/ )
|
||||
|
|
|
@ -30,7 +30,7 @@ CSettingTypeRDBRDRamSize::~CSettingTypeRDBRDRamSize()
|
|||
|
||||
bool CSettingTypeRDBRDRamSize::Load ( int /*Index*/, bool & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -52,14 +52,14 @@ bool CSettingTypeRDBRDRamSize::Load ( int Index, ULONG & Value ) const
|
|||
|
||||
bool CSettingTypeRDBRDRamSize::Load ( int /*Index*/, stdstr & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
//return the default values
|
||||
void CSettingTypeRDBRDRamSize::LoadDefault ( int /*Index*/, bool & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeRDBRDRamSize::LoadDefault ( int /*Index*/, ULONG & Value ) const
|
||||
|
@ -69,13 +69,13 @@ void CSettingTypeRDBRDRamSize::LoadDefault ( int /*Index*/, ULONG & Value ) con
|
|||
|
||||
void CSettingTypeRDBRDRamSize::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
//Update the settings
|
||||
void CSettingTypeRDBRDRamSize::Save ( int /*Index*/, bool /*Value*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeRDBRDRamSize::Save ( int /*Index*/, ULONG Value )
|
||||
|
@ -85,12 +85,12 @@ void CSettingTypeRDBRDRamSize::Save ( int /*Index*/, ULONG Value )
|
|||
|
||||
void CSettingTypeRDBRDRamSize::Save ( int /*Index*/, const stdstr & /*Value*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeRDBRDRamSize::Save ( int /*Index*/, const char * /*Value*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeRDBRDRamSize::Delete( int /*Index*/ )
|
||||
|
|
|
@ -28,7 +28,7 @@ CSettingTypeRDBSaveChip::CSettingTypeRDBSaveChip(LPCSTR Name, int DefaultValue )
|
|||
|
||||
bool CSettingTypeRDBSaveChip::Load ( int /*Index*/, bool & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -53,7 +53,7 @@ bool CSettingTypeRDBSaveChip::Load ( int Index, ULONG & Value ) const
|
|||
LoadDefault(Index,Value);
|
||||
return false;
|
||||
} else {
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
return true;
|
||||
|
@ -61,14 +61,14 @@ bool CSettingTypeRDBSaveChip::Load ( int Index, ULONG & Value ) const
|
|||
|
||||
bool CSettingTypeRDBSaveChip::Load ( int /*Index*/, stdstr & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
//return the default values
|
||||
void CSettingTypeRDBSaveChip::LoadDefault ( int /*Index*/, bool & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeRDBSaveChip::LoadDefault ( int /*Index*/, ULONG & Value ) const
|
||||
|
@ -86,13 +86,13 @@ void CSettingTypeRDBSaveChip::LoadDefault ( int /*Index*/, ULONG & Value ) cons
|
|||
|
||||
void CSettingTypeRDBSaveChip::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
//Update the settings
|
||||
void CSettingTypeRDBSaveChip::Save ( int /*Index*/, bool /*Value*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeRDBSaveChip::Save ( int /*Index*/, ULONG Value )
|
||||
|
@ -105,18 +105,18 @@ void CSettingTypeRDBSaveChip::Save ( int /*Index*/, ULONG Value )
|
|||
case SaveChip_Sram: m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),"Sram"); break;
|
||||
case SaveChip_FlashRam: m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),"FlashRam"); break;
|
||||
default:
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
|
||||
void CSettingTypeRDBSaveChip::Save ( int /*Index*/, const stdstr & /*Value*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeRDBSaveChip::Save ( int /*Index*/, const char * /*Value*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeRDBSaveChip::Delete( int /*Index*/ )
|
||||
|
|
|
@ -54,13 +54,13 @@ bool CSettingTypeRDBYesNo::Load ( int Index, bool & Value ) const
|
|||
|
||||
bool CSettingTypeRDBYesNo::Load ( int /*Index*/, ULONG & /*Value*/ ) const
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CSettingTypeRDBYesNo::Load ( int /*Index*/, stdstr & /*Value*/ ) const
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -80,12 +80,12 @@ void CSettingTypeRDBYesNo::LoadDefault ( int /*Index*/, bool & Value ) const
|
|||
|
||||
void CSettingTypeRDBYesNo::LoadDefault ( int /*Index*/, ULONG & /*Value*/ ) const
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeRDBYesNo::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
|
||||
|
@ -102,12 +102,12 @@ void CSettingTypeRDBYesNo::Save ( int /*Index*/, ULONG Value )
|
|||
|
||||
void CSettingTypeRDBYesNo::Save ( int /*Index*/, const stdstr & /*Value*/ )
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeRDBYesNo::Save ( int /*Index*/, const char * /*Value*/ )
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeRDBYesNo::Delete( int /*Index*/ )
|
||||
|
|
|
@ -30,27 +30,27 @@ bool CSettingTypeRelativePath::Load ( int /*Index*/, stdstr & value ) const
|
|||
//return the default values
|
||||
void CSettingTypeRelativePath::LoadDefault ( int /*Index*/, bool & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeRelativePath::LoadDefault ( int /*Index*/, ULONG & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeRelativePath::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeRelativePath::Save ( int /*Index*/, bool /*Value*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeRelativePath::Save ( int /*Index*/, ULONG /*Value*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeRelativePath::Save ( int /*Index*/, const stdstr & Value )
|
||||
|
@ -65,5 +65,5 @@ void CSettingTypeRelativePath::Save ( int /*Index*/, const char * Value )
|
|||
|
||||
void CSettingTypeRelativePath::Delete ( int /*Index*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
|
|
@ -197,7 +197,7 @@ void CSettingTypeRomDatabase::Save ( int /*Index*/, bool Value )
|
|||
}
|
||||
if (m_DeleteOnDefault)
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
if (m_GlideSetting)
|
||||
{
|
||||
|
|
|
@ -46,13 +46,13 @@ CSettingTypeRomDatabaseIndex::~CSettingTypeRomDatabaseIndex()
|
|||
|
||||
bool CSettingTypeRomDatabaseIndex::Load ( int /*Index*/, bool & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CSettingTypeRomDatabaseIndex::Load ( int /*Index*/, ULONG & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -82,22 +82,22 @@ void CSettingTypeRomDatabaseIndex::LoadDefault ( int Index, stdstr & Value ) con
|
|||
|
||||
void CSettingTypeRomDatabaseIndex::Save ( int /*Index*/, bool /*Value*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeRomDatabaseIndex::Save ( int /*Index*/, ULONG /*Value*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeRomDatabaseIndex::Save ( int /*Index*/, const stdstr & /*Value*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeRomDatabaseIndex::Save ( int /*Index*/, const char * /*Value*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeRomDatabaseIndex::Delete ( int /*Index*/ )
|
||||
|
|
|
@ -27,13 +27,13 @@ CSettingTypeSelectedDirectory::~CSettingTypeSelectedDirectory()
|
|||
|
||||
bool CSettingTypeSelectedDirectory::Load ( int /*Index*/, bool & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CSettingTypeSelectedDirectory::Load ( int /*Index*/, ULONG & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -46,33 +46,33 @@ bool CSettingTypeSelectedDirectory::Load ( int /*Index*/, stdstr & Value ) const
|
|||
//return the default values
|
||||
void CSettingTypeSelectedDirectory::LoadDefault ( int /*Index*/, bool & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeSelectedDirectory::LoadDefault ( int /*Index*/, ULONG & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeSelectedDirectory::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
//Update the settings
|
||||
void CSettingTypeSelectedDirectory::Save ( int /*Index*/, bool /*Value*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeSelectedDirectory::Save ( int /*Index*/, ULONG /*Value*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeSelectedDirectory::Save ( int /*Index*/, const stdstr & /*Value*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeSelectedDirectory::Save ( int /*Index*/, const char * Value )
|
||||
|
@ -83,5 +83,5 @@ void CSettingTypeSelectedDirectory::Save ( int /*Index*/, const char * Value )
|
|||
|
||||
void CSettingTypeSelectedDirectory::Delete( int /*Index*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
|
|
@ -28,30 +28,30 @@ bool CSettingTypeTempBool::Load ( int /*Index*/, bool & Value ) const
|
|||
|
||||
bool CSettingTypeTempBool::Load ( int /*Index*/, ULONG & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CSettingTypeTempBool::Load ( int /*Index*/, stdstr & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
//return the default values
|
||||
void CSettingTypeTempBool::LoadDefault ( int /*Index*/, bool & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeTempBool::LoadDefault ( int /*Index*/, ULONG & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeTempBool::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeTempBool::Save ( int /*Index*/, bool Value )
|
||||
|
@ -61,20 +61,20 @@ void CSettingTypeTempBool::Save ( int /*Index*/, bool Value )
|
|||
|
||||
void CSettingTypeTempBool::Save ( int /*Index*/, ULONG /*Value*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeTempBool::Save ( int /*Index*/, const stdstr & /*Value*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeTempBool::Save ( int /*Index*/, const char * /*Value*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeTempBool::Delete( int /*Index*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
|
|
@ -22,7 +22,7 @@ CSettingTypeTempNumber::~CSettingTypeTempNumber ( void )
|
|||
|
||||
bool CSettingTypeTempNumber::Load ( int /*Index*/, bool & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -34,29 +34,29 @@ bool CSettingTypeTempNumber::Load ( int /*Index*/, ULONG & Value ) const
|
|||
|
||||
bool CSettingTypeTempNumber::Load ( int /*Index*/, stdstr & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
//return the default values
|
||||
void CSettingTypeTempNumber::LoadDefault ( int /*Index*/, bool & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeTempNumber::LoadDefault ( int /*Index*/, ULONG & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeTempNumber::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeTempNumber::Save ( int /*Index*/, bool /*Value*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeTempNumber::Save ( int /*Index*/, ULONG Value )
|
||||
|
@ -66,15 +66,15 @@ void CSettingTypeTempNumber::Save ( int /*Index*/, ULONG Value )
|
|||
|
||||
void CSettingTypeTempNumber::Save ( int /*Index*/, const stdstr & /*Value*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeTempNumber::Save ( int /*Index*/, const char * /*Value*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeTempNumber::Delete( int /*Index*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
|
|
@ -23,13 +23,13 @@ CSettingTypeTempString::~CSettingTypeTempString ( void )
|
|||
|
||||
bool CSettingTypeTempString::Load ( int /*Index*/, bool & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CSettingTypeTempString::Load ( int /*Index*/, ULONG & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -42,27 +42,27 @@ bool CSettingTypeTempString::Load ( int /*Index*/, stdstr & Value ) const
|
|||
//return the default values
|
||||
void CSettingTypeTempString::LoadDefault ( int /*Index*/, bool & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeTempString::LoadDefault ( int /*Index*/, ULONG & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeTempString::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeTempString::Save ( int /*Index*/, bool /*Value*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeTempString::Save ( int /*Index*/, ULONG /*Value*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettingTypeTempString::Save ( int /*Index*/, const stdstr & Value )
|
||||
|
@ -77,5 +77,5 @@ void CSettingTypeTempString::Save ( int /*Index*/, const char * Value )
|
|||
|
||||
void CSettingTypeTempString::Delete( int /*Index*/ )
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
|
|
@ -396,7 +396,7 @@ void CSettings::RegisterSetting ( CSettings * _this, SettingID ID, SettingID Def
|
|||
case SettingType_ConstValue:
|
||||
if (DataType != Data_DWORD)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return;
|
||||
}
|
||||
_this->AddHandler(ID,new CSettingTypeTempNumber(Value));
|
||||
|
@ -404,7 +404,7 @@ void CSettings::RegisterSetting ( CSettings * _this, SettingID ID, SettingID Def
|
|||
case SettingType_ConstString:
|
||||
if (DataType != Data_String)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return;
|
||||
}
|
||||
_this->AddHandler(ID,new CSettingTypeTempString(DefaultStr));
|
||||
|
@ -430,7 +430,7 @@ void CSettings::RegisterSetting ( CSettings * _this, SettingID ID, SettingID Def
|
|||
}
|
||||
break;
|
||||
default:
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
break;
|
||||
case SettingType_GameSetting:
|
||||
|
@ -458,7 +458,7 @@ void CSettings::RegisterSetting ( CSettings * _this, SettingID ID, SettingID Def
|
|||
}
|
||||
break;
|
||||
default:
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
@ -482,7 +482,7 @@ void CSettings::RegisterSetting ( CSettings * _this, SettingID ID, SettingID Def
|
|||
}
|
||||
break;
|
||||
default:
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
break;
|
||||
case SettingType_RdbSetting:
|
||||
|
@ -500,11 +500,11 @@ void CSettings::RegisterSetting ( CSettings * _this, SettingID ID, SettingID Def
|
|||
}
|
||||
break;
|
||||
default:
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -538,7 +538,7 @@ bool CSettings::LoadBool ( SettingID Type, bool & Value )
|
|||
}
|
||||
if (FindInfo->second->IndexBasedSetting())
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
} else {
|
||||
return FindInfo->second->Load(0,Value);
|
||||
}
|
||||
|
@ -565,7 +565,7 @@ bool CSettings::LoadBoolIndex( SettingID Type, int index , bool & Value )
|
|||
{
|
||||
return FindInfo->second->Load(index,Value);
|
||||
} else {
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
@ -588,7 +588,7 @@ bool CSettings::LoadDword ( SettingID Type, DWORD & Value)
|
|||
}
|
||||
if (FindInfo->second->IndexBasedSetting())
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
} else {
|
||||
return FindInfo->second->Load(0,Value);
|
||||
}
|
||||
|
@ -615,7 +615,7 @@ bool CSettings::LoadDwordIndex( SettingID Type, int index, DWORD & Value)
|
|||
{
|
||||
return FindInfo->second->Load(index,Value);
|
||||
} else {
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
@ -638,7 +638,7 @@ bool CSettings::LoadString ( SettingID Type, stdstr & Value )
|
|||
}
|
||||
if (FindInfo->second->IndexBasedSetting())
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
} else {
|
||||
return FindInfo->second->Load(0,Value);
|
||||
}
|
||||
|
@ -657,7 +657,7 @@ bool CSettings::LoadString ( SettingID Type, char * Buffer, int BufferSize )
|
|||
bool bRes = false;
|
||||
if (FindInfo->second->IndexBasedSetting())
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
} else {
|
||||
stdstr Value;
|
||||
bRes = FindInfo->second->Load(0,Value);
|
||||
|
@ -691,14 +691,14 @@ bool CSettings::LoadStringIndex ( SettingID Type, int index, stdstr & Value )
|
|||
{
|
||||
return FindInfo->second->Load(index,Value);
|
||||
} else {
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
bool CSettings::LoadStringIndex ( SettingID /*Type*/, int /*index*/, char * /*Buffer*/, int /*BufferSize*/ )
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
@ -720,7 +720,7 @@ void CSettings::LoadDefaultBool ( SettingID Type, bool & Value )
|
|||
} else {
|
||||
if (FindInfo->second->IndexBasedSetting())
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
} else {
|
||||
FindInfo->second->LoadDefault(0,Value);
|
||||
}
|
||||
|
@ -729,13 +729,13 @@ void CSettings::LoadDefaultBool ( SettingID Type, bool & Value )
|
|||
|
||||
bool CSettings::LoadDefaultBoolIndex ( SettingID /*Type*/, int /*index*/ )
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
void CSettings::LoadDefaultBoolIndex ( SettingID /*Type*/, int /*index*/, bool & /*Value*/ )
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
DWORD CSettings::LoadDefaultDword ( SettingID Type )
|
||||
|
@ -755,7 +755,7 @@ void CSettings::LoadDefaultDword ( SettingID Type, DWORD & Value)
|
|||
} else {
|
||||
if (FindInfo->second->IndexBasedSetting())
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
} else {
|
||||
FindInfo->second->LoadDefault(0,Value);
|
||||
}
|
||||
|
@ -764,13 +764,13 @@ void CSettings::LoadDefaultDword ( SettingID Type, DWORD & Value)
|
|||
|
||||
DWORD CSettings::LoadDefaultDwordIndex ( SettingID /*Type*/, int /*index*/ )
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
void CSettings::LoadDefaultDwordIndex ( SettingID /*Type*/, int /*index*/, DWORD & /*Value*/)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
stdstr CSettings::LoadDefaultString ( SettingID Type )
|
||||
|
@ -790,7 +790,7 @@ void CSettings::LoadDefaultString ( SettingID Type, stdstr & Value )
|
|||
} else {
|
||||
if (FindInfo->second->IndexBasedSetting())
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
} else {
|
||||
FindInfo->second->LoadDefault(0,Value);
|
||||
}
|
||||
|
@ -799,23 +799,23 @@ void CSettings::LoadDefaultString ( SettingID Type, stdstr & Value )
|
|||
|
||||
void CSettings::LoadDefaultString ( SettingID /*Type*/, char * /*Buffer*/, int /*BufferSize*/ )
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
stdstr CSettings::LoadDefaultStringIndex ( SettingID /*Type*/, int /*index*/ )
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
return false;
|
||||
}
|
||||
|
||||
void CSettings::LoadDefaultStringIndex ( SettingID /*Type*/, int /*index*/, stdstr & /*Value*/ )
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettings::LoadDefaultStringIndex ( SettingID /*Type*/, int /*index*/, char * /*Buffer*/, int /*BufferSize*/ )
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
|
||||
void CSettings::SaveBool ( SettingID Type, bool Value )
|
||||
|
@ -829,7 +829,7 @@ void CSettings::SaveBool ( SettingID Type, bool Value )
|
|||
}
|
||||
if (FindInfo->second->IndexBasedSetting())
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
} else {
|
||||
FindInfo->second->Save(0,Value);
|
||||
}
|
||||
|
@ -849,7 +849,7 @@ void CSettings::SaveBoolIndex( SettingID Type, int index, bool Value )
|
|||
{
|
||||
FindInfo->second->Save(index,Value);
|
||||
} else {
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
NotifyCallBacks(Type);
|
||||
}
|
||||
|
@ -865,7 +865,7 @@ void CSettings::SaveDword ( SettingID Type, DWORD Value )
|
|||
}
|
||||
if (FindInfo->second->IndexBasedSetting())
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
} else {
|
||||
FindInfo->second->Save(0,Value);
|
||||
}
|
||||
|
@ -885,7 +885,7 @@ void CSettings::SaveDwordIndex ( SettingID Type, int index, DWORD Value )
|
|||
{
|
||||
FindInfo->second->Save(index,Value);
|
||||
} else {
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
NotifyCallBacks(Type);
|
||||
}
|
||||
|
@ -901,7 +901,7 @@ void CSettings::SaveString ( SettingID Type, const stdstr & Value )
|
|||
}
|
||||
if (FindInfo->second->IndexBasedSetting())
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
} else {
|
||||
FindInfo->second->Save(0,Value);
|
||||
}
|
||||
|
@ -918,7 +918,7 @@ void CSettings::SaveString ( SettingID Type, const char * Buffer )
|
|||
}
|
||||
if (FindInfo->second->IndexBasedSetting())
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
} else {
|
||||
FindInfo->second->Save(0,Buffer);
|
||||
}
|
||||
|
@ -937,7 +937,7 @@ void CSettings::SaveStringIndex( SettingID Type, int index, const char * Buffer
|
|||
{
|
||||
FindInfo->second->Save(index,Buffer);
|
||||
} else {
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
NotifyCallBacks(Type);
|
||||
}
|
||||
|
@ -957,7 +957,7 @@ void CSettings::DeleteSetting( SettingID Type )
|
|||
}
|
||||
if (FindInfo->second->IndexBasedSetting())
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
} else {
|
||||
FindInfo->second->Delete(0);
|
||||
}
|
||||
|
@ -976,7 +976,7 @@ void CSettings::DeleteSettingIndex( SettingID Type, int index )
|
|||
{
|
||||
FindInfo->second->Delete(index);
|
||||
} else {
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
NotifyCallBacks(Type);
|
||||
}
|
||||
|
@ -1021,7 +1021,7 @@ void CSettings::SettingTypeChanged( SettingType Type )
|
|||
void CSettings::UnknownSetting (SettingID /*Type*/)
|
||||
{
|
||||
#ifdef _DEBUG
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -1105,6 +1105,6 @@ void CSettings::UnregisterChangeCB(SettingID Type,void * Data, SettingChangedFun
|
|||
|
||||
if (!bRemoved)
|
||||
{
|
||||
g_Notify->BreakPoint(__FILE__,__LINE__);
|
||||
g_Notify->BreakPoint(__FILEW__,__LINE__);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -475,7 +475,7 @@ void CMainGui::SetStatusText (int Panel,const wchar_t * Text)
|
|||
static wchar_t Message[2][500];
|
||||
if (Panel >= 2)
|
||||
{
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
return;
|
||||
}
|
||||
wchar_t * Msg = Message[Panel];
|
||||
|
@ -809,7 +809,7 @@ DWORD CALLBACK CMainGui::MainGui_Proc (HWND hWnd, DWORD uMsg, DWORD wParam, DWOR
|
|||
CMainGui * _this = (CMainGui *)GetProp((HWND)hWnd, "Class");
|
||||
if (_this->m_ResetInfo != NULL)
|
||||
{
|
||||
Notify().BreakPoint(__FILE__, __LINE__);
|
||||
Notify().BreakPoint(__FILEW__, __LINE__);
|
||||
}
|
||||
_this->m_ResetInfo = (RESET_PLUGIN *)lParam;
|
||||
_this->m_ResetPlugins = true;
|
||||
|
|
|
@ -531,7 +531,7 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI
|
|||
}
|
||||
|
||||
/*stdstr CMainMenu::ShortCutString(MSC_MAP & ShortCuts, int MenuID, CMenuShortCutKey::ACCESS_MODE AccessLevel) {
|
||||
Notify().BreakPoint(__FILE__,__LINE__);
|
||||
Notify().BreakPoint(__FILEW__,__LINE__);
|
||||
MSC_MAP::iterator MenuItem = ShortCuts.find(MenuID);
|
||||
if (MenuItem == ShortCuts.end()) { return ""; }
|
||||
|
||||
|
|
|
@ -299,11 +299,11 @@ bool CNotification::ProcessGuiMessages ( void ) const
|
|||
return m_hWnd->ProcessGuiMessages();
|
||||
}
|
||||
|
||||
void CNotification::BreakPoint ( const char * File, const int LineNumber )
|
||||
void CNotification::BreakPoint ( const wchar_t * FileName, const int LineNumber )
|
||||
{
|
||||
if (g_Settings->LoadBool(Debugger_Enabled))
|
||||
{
|
||||
DisplayError(L"Break point found at\n%s\n%d",File, LineNumber);
|
||||
DisplayError(L"Break point found at\n%s\n%d",FileName, LineNumber);
|
||||
if (IsDebuggerPresent() != 0)
|
||||
{
|
||||
DebugBreak();
|
||||
|
|
|
@ -54,7 +54,7 @@ public:
|
|||
void ShowRomBrowser ( void );
|
||||
void MakeWindowOnTop ( bool OnTop );
|
||||
void BringToTop ( void );
|
||||
void BreakPoint ( const char * File, const int LineNumber);
|
||||
void BreakPoint ( const wchar_t * FileName, const int LineNumber);
|
||||
bool ProcessGuiMessages ( void ) const;
|
||||
void ChangeFullScreen ( void ) const;
|
||||
void SetGfxPlugin ( CGfxPlugin * Plugin );
|
||||
|
|
Loading…
Reference in New Issue