From d0209b061fee51510cb36872131392ebf9d190e6 Mon Sep 17 00:00:00 2001 From: zilmar Date: Thu, 12 Mar 2015 06:50:30 +1100 Subject: [PATCH] Language: have break point take a wchar_t * string and allow \n in language files --- Source/Common/Log Class.cpp | 2 +- .../Multilanguage/Language Class.cpp | 6 +- Source/Project64/N64 System/Cheat Class.cpp | 4 +- .../Debugger/Debugger - Memory Dump.cpp | 2 +- .../Debugger/Debugger - Memory Search.cpp | 16 +- .../Interpreter/Interpreter CPU.cpp | 6 +- .../Interpreter/Interpreter Ops 32.cpp | 2 +- .../Interpreter/Interpreter Ops.cpp | 354 ++++++++--------- Source/Project64/N64 System/Mips/Audio.cpp | 4 +- Source/Project64/N64 System/Mips/Dma.cpp | 12 +- .../N64 System/Mips/Memory Virtual Mem.cpp | 90 ++--- .../N64 System/Mips/System Events.cpp | 2 +- .../N64 System/Mips/System Timing.cpp | 14 +- Source/Project64/N64 System/N64 Class.cpp | 8 +- .../N64 System/Recompiler/Code Block.cpp | 52 +-- .../N64 System/Recompiler/Code Section.cpp | 86 ++-- .../N64 System/Recompiler/Loop Analysis.cpp | 92 ++--- .../Recompiler/Recompiler Class.cpp | 24 +- .../N64 System/Recompiler/Recompiler Ops.cpp | 26 +- .../N64 System/Recompiler/Reg Info.cpp | 18 +- .../N64 System/Recompiler/Section Info.cpp | 8 +- .../N64 System/Recompiler/X86ops.cpp | 375 +++++++++--------- .../Project64/N64 System/Recompiler/X86ops.h | 4 +- .../Project64/Plugins/Controller Plugin.cpp | 2 +- .../SettingType/SettingsType-Application.cpp | 16 +- .../SettingType/SettingsType-Cheats.cpp | 16 +- .../SettingsType-GameSettingIndex.cpp | 8 +- .../SettingType/SettingsType-RDBCpuType.cpp | 18 +- .../SettingType/SettingsType-RDBOnOff.cpp | 16 +- .../SettingType/SettingsType-RDBRamSize.cpp | 14 +- .../SettingType/SettingsType-RDBSaveChip.cpp | 18 +- .../SettingType/SettingsType-RDBYesNo.cpp | 12 +- .../SettingType/SettingsType-RelativePath.cpp | 12 +- .../SettingType/SettingsType-RomDatabase.cpp | 2 +- .../SettingsType-RomDatabaseIndex.cpp | 12 +- .../SettingsType-SelectedDirectory.cpp | 18 +- .../SettingType/SettingsType-TempBool.cpp | 18 +- .../SettingType/SettingsType-TempNumber.cpp | 18 +- .../SettingType/SettingsType-TempString.cpp | 16 +- Source/Project64/Settings/Settings Class.cpp | 74 ++-- Source/Project64/User Interface/Gui Class.cpp | 4 +- .../User Interface/Main Menu Class.cpp | 2 +- .../User Interface/Notification Class.cpp | 4 +- .../User Interface/Notification Class.h | 2 +- 44 files changed, 757 insertions(+), 752 deletions(-) diff --git a/Source/Common/Log Class.cpp b/Source/Common/Log Class.cpp index 6e6aff76b..0c5d34cc4 100644 --- a/Source/Common/Log Class.cpp +++ b/Source/Common/Log Class.cpp @@ -185,7 +185,7 @@ void CLog::Log( LPCTSTR Message ) if (!m_hLogFile.Write(Data,dwRead)) { - //BreakPoint(__FILE__,__LINE__); + //BreakPoint(__FILEW__,__LINE__); break; } diff --git a/Source/Project64/Multilanguage/Language Class.cpp b/Source/Project64/Multilanguage/Language Class.cpp index 84a9c27ec..58e0b1553 100644 --- a/Source/Project64/Multilanguage/Language Class.cpp +++ b/Source/Project64/Multilanguage/Language Class.cpp @@ -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 ) diff --git a/Source/Project64/N64 System/Cheat Class.cpp b/Source/Project64/N64 System/Cheat Class.cpp index 1ef3de18a..9a3d0bab9 100644 --- a/Source/Project64/N64 System/Cheat Class.cpp +++ b/Source/Project64/N64 System/Cheat Class.cpp @@ -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; } diff --git a/Source/Project64/N64 System/Debugger/Debugger - Memory Dump.cpp b/Source/Project64/N64 System/Debugger/Debugger - Memory Dump.cpp index d7d65e61b..8c10f1d61 100644 --- a/Source/Project64/N64 System/Debugger/Debugger - Memory Dump.cpp +++ b/Source/Project64/N64 System/Debugger/Debugger - Memory Dump.cpp @@ -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()) diff --git a/Source/Project64/N64 System/Debugger/Debugger - Memory Search.cpp b/Source/Project64/N64 System/Debugger/Debugger - Memory Search.cpp index a7082ed71..2092e5640 100644 --- a/Source/Project64/N64 System/Debugger/Debugger - Memory Search.cpp +++ b/Source/Project64/N64 System/Debugger/Debugger - Memory Search.cpp @@ -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; diff --git a/Source/Project64/N64 System/Interpreter/Interpreter CPU.cpp b/Source/Project64/N64 System/Interpreter/Interpreter CPU.cpp index 35bfbd6dd..b98c24d15 100644 --- a/Source/Project64/N64 System/Interpreter/Interpreter CPU.cpp +++ b/Source/Project64/N64 System/Interpreter/Interpreter CPU.cpp @@ -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); diff --git a/Source/Project64/N64 System/Interpreter/Interpreter Ops 32.cpp b/Source/Project64/N64 System/Interpreter/Interpreter Ops 32.cpp index 55b4e8b5f..ece419ef8 100644 --- a/Source/Project64/N64 System/Interpreter/Interpreter Ops 32.cpp +++ b/Source/Project64/N64 System/Interpreter/Interpreter Ops 32.cpp @@ -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); diff --git a/Source/Project64/N64 System/Interpreter/Interpreter Ops.cpp b/Source/Project64/N64 System/Interpreter/Interpreter Ops.cpp index 639325889..45087b455 100644 --- a/Source/Project64/N64 System/Interpreter/Interpreter Ops.cpp +++ b/Source/Project64/N64 System/Interpreter/Interpreter Ops.cpp @@ -62,54 +62,54 @@ const int R4300iOp::LWR_SHIFT[4] = { 24, 16 ,8, 0 }; m_JumpToLocation = (*_PROGRAM_COUNTER);\ return; -void R4300iOp::SPECIAL (void) +void R4300iOp::SPECIAL (void) { Jump_Special[ m_Opcode.funct ](); } -void R4300iOp::REGIMM (void) +void R4300iOp::REGIMM (void) { Jump_Regimm[ m_Opcode.rt ](); } -void R4300iOp::COP0 (void) +void R4300iOp::COP0 (void) { Jump_CoP0[ m_Opcode.rs ](); } -void R4300iOp::COP0_CO (void) +void R4300iOp::COP0_CO (void) { Jump_CoP0_Function[ m_Opcode.funct ](); } -void R4300iOp::COP1 (void) +void R4300iOp::COP1 (void) { Jump_CoP1[ m_Opcode.fmt ](); } -void R4300iOp::COP1_BC (void) +void R4300iOp::COP1_BC (void) { Jump_CoP1_BC[ m_Opcode.ft ](); } -void R4300iOp::COP1_S (void) +void R4300iOp::COP1_S (void) { _controlfp(*_RoundingModel,_MCW_RC); Jump_CoP1_S[ m_Opcode.funct ](); } -void R4300iOp::COP1_D (void) +void R4300iOp::COP1_D (void) { _controlfp(*_RoundingModel,_MCW_RC); Jump_CoP1_D[ m_Opcode.funct ](); } -void R4300iOp::COP1_W (void) +void R4300iOp::COP1_W (void) { Jump_CoP1_W[ m_Opcode.funct ](); } -void R4300iOp::COP1_L (void) +void R4300iOp::COP1_L (void) { Jump_CoP1_L[ m_Opcode.funct ](); } @@ -717,7 +717,7 @@ void TestInterpreterJump (DWORD PC, DWORD TargetPC, int Reg1, int Reg2) } /************************* Opcode functions *************************/ -void R4300iOp::J (void) +void R4300iOp::J (void) { m_NextInstruction = DELAY_SLOT; m_JumpToLocation = ((*_PROGRAM_COUNTER) & 0xF0000000) + (m_Opcode.target << 2); @@ -727,7 +727,7 @@ void R4300iOp::J (void) } } -void R4300iOp::JAL (void) +void R4300iOp::JAL (void) { m_NextInstruction = DELAY_SLOT; m_JumpToLocation = ((*_PROGRAM_COUNTER) & 0xF0000000) + (m_Opcode.target << 2); @@ -739,7 +739,7 @@ void R4300iOp::JAL (void) } } -void R4300iOp::BEQ (void) +void R4300iOp::BEQ (void) { m_NextInstruction = DELAY_SLOT; if (_GPR[m_Opcode.rs].DW == _GPR[m_Opcode.rt].DW) { @@ -756,7 +756,7 @@ void R4300iOp::BEQ (void) } } -void R4300iOp::BNE (void) +void R4300iOp::BNE (void) { m_NextInstruction = DELAY_SLOT; if (_GPR[m_Opcode.rs].DW != _GPR[m_Opcode.rt].DW) { @@ -773,7 +773,7 @@ void R4300iOp::BNE (void) } } -void R4300iOp::BLEZ (void) +void R4300iOp::BLEZ (void) { m_NextInstruction = DELAY_SLOT; if (_GPR[m_Opcode.rs].DW <= 0) { @@ -790,7 +790,7 @@ void R4300iOp::BLEZ (void) } } -void R4300iOp::BGTZ (void) +void R4300iOp::BGTZ (void) { m_NextInstruction = DELAY_SLOT; if (_GPR[m_Opcode.rs].DW > 0) { @@ -807,7 +807,7 @@ void R4300iOp::BGTZ (void) } } -void R4300iOp::ADDI (void) +void R4300iOp::ADDI (void) { #ifdef Interpreter_StackTest if (m_Opcode.rs == 29 && m_Opcode.rt == 29) { @@ -822,7 +822,7 @@ void R4300iOp::ADDI (void) #endif } -void R4300iOp::ADDIU (void) +void R4300iOp::ADDIU (void) { #ifdef Interpreter_StackTest if (m_Opcode.rs == 29 && m_Opcode.rt == 29) { @@ -837,7 +837,7 @@ void R4300iOp::ADDIU (void) #endif } -void R4300iOp::SLTI (void) +void R4300iOp::SLTI (void) { if (_GPR[m_Opcode.rs].DW < (__int64)((short)m_Opcode.immediate)) { _GPR[m_Opcode.rt].DW = 1; @@ -846,7 +846,7 @@ void R4300iOp::SLTI (void) } } -void R4300iOp::SLTIU (void) +void R4300iOp::SLTIU (void) { int imm32 = (short)m_Opcode.immediate; __int64 imm64; @@ -855,22 +855,22 @@ void R4300iOp::SLTIU (void) _GPR[m_Opcode.rt].DW = _GPR[m_Opcode.rs].UDW < (unsigned __int64)imm64?1:0; } -void R4300iOp::ANDI (void) +void R4300iOp::ANDI (void) { _GPR[m_Opcode.rt].DW = _GPR[m_Opcode.rs].DW & m_Opcode.immediate; } -void R4300iOp::ORI (void) +void R4300iOp::ORI (void) { _GPR[m_Opcode.rt].DW = _GPR[m_Opcode.rs].DW | m_Opcode.immediate; } -void R4300iOp::XORI (void) +void R4300iOp::XORI (void) { _GPR[m_Opcode.rt].DW = _GPR[m_Opcode.rs].DW ^ m_Opcode.immediate; } -void R4300iOp::LUI (void) +void R4300iOp::LUI (void) { _GPR[m_Opcode.rt].DW = (long)((short)m_Opcode.offset << 16); #ifdef Interpreter_StackTest @@ -880,7 +880,7 @@ void R4300iOp::LUI (void) #endif } -void R4300iOp::BEQL (void) +void R4300iOp::BEQL (void) { if (_GPR[m_Opcode.rs].DW == _GPR[m_Opcode.rt].DW) { m_NextInstruction = DELAY_SLOT; @@ -898,7 +898,7 @@ void R4300iOp::BEQL (void) } } -void R4300iOp::BNEL (void) +void R4300iOp::BNEL (void) { if (_GPR[m_Opcode.rs].DW != _GPR[m_Opcode.rt].DW) { m_NextInstruction = DELAY_SLOT; @@ -916,7 +916,7 @@ void R4300iOp::BNEL (void) } } -void R4300iOp::BLEZL (void) +void R4300iOp::BLEZL (void) { if (_GPR[m_Opcode.rs].DW <= 0) { m_NextInstruction = DELAY_SLOT; @@ -934,7 +934,7 @@ void R4300iOp::BLEZL (void) } } -void R4300iOp::BGTZL (void) +void R4300iOp::BGTZL (void) { if (_GPR[m_Opcode.rs].DW > 0) { m_NextInstruction = DELAY_SLOT; @@ -952,7 +952,7 @@ void R4300iOp::BGTZL (void) } } -void R4300iOp::DADDIU (void) +void R4300iOp::DADDIU (void) { _GPR[m_Opcode.rt].DW = _GPR[m_Opcode.rs].DW + (__int64)((short)m_Opcode.immediate); } @@ -961,7 +961,7 @@ QWORD LDL_MASK[8] = { 0,0xFF,0xFFFF,0xFFFFFF,0xFFFFFFFF,0xFFFFFFFFFF, 0xFFFFFFFFFFFF, 0xFFFFFFFFFFFFFF }; int LDL_SHIFT[8] = { 0, 8, 16, 24, 32, 40, 48, 56 }; -void R4300iOp::LDL (void) +void R4300iOp::LDL (void) { DWORD Offset, Address; QWORD Value; @@ -971,7 +971,7 @@ void R4300iOp::LDL (void) if (!g_MMU->LD_VAddr((Address & ~7),Value)) { - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); if (bShowTLBMisses()) { g_Notify->DisplayError(L"LDL TLB: %X",Address); @@ -988,7 +988,7 @@ QWORD LDR_MASK[8] = { 0xFFFFFFFFFFFFFF00, 0xFFFFFFFFFFFF0000, 0xFF00000000000000, 0 }; int LDR_SHIFT[8] = { 56, 48, 40, 32, 24, 16, 8, 0 }; -void R4300iOp::LDR (void) +void R4300iOp::LDR (void) { DWORD Offset, Address; QWORD Value; @@ -998,7 +998,7 @@ void R4300iOp::LDR (void) if (!g_MMU->LD_VAddr((Address & ~7),Value)) { - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); if (bShowTLBMisses()) { g_Notify->DisplayError(L"LDR TLB: %X",Address); @@ -1011,7 +1011,7 @@ void R4300iOp::LDR (void) } -void R4300iOp::LB (void) +void R4300iOp::LB (void) { DWORD Address = _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset; if (!g_MMU->LB_VAddr(Address,_GPR[m_Opcode.rt].UB[0])) { @@ -1024,7 +1024,7 @@ void R4300iOp::LB (void) } } -void R4300iOp::LH (void) +void R4300iOp::LH (void) { DWORD Address = _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset; if ((Address & 1) != 0) { ADDRESS_ERROR_EXCEPTION(Address,TRUE); } @@ -1038,7 +1038,7 @@ void R4300iOp::LH (void) } } -void R4300iOp::LWL (void) +void R4300iOp::LWL (void) { DWORD Offset, Address, Value; @@ -1047,7 +1047,7 @@ void R4300iOp::LWL (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"LWL TLB: %X",Address); @@ -1059,7 +1059,7 @@ void R4300iOp::LWL (void) _GPR[m_Opcode.rt].DW += (int)(Value << LWL_SHIFT[Offset]); } -void R4300iOp::LW (void) +void R4300iOp::LW (void) { DWORD Address = _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset; if ((Address & 3) != 0) { ADDRESS_ERROR_EXCEPTION(Address,TRUE); } @@ -1079,7 +1079,7 @@ void R4300iOp::LW (void) } } -void R4300iOp::LBU (void) +void R4300iOp::LBU (void) { DWORD Address = _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset; if (!g_MMU->LB_VAddr(Address,_GPR[m_Opcode.rt].UB[0])) { @@ -1092,7 +1092,7 @@ void R4300iOp::LBU (void) } } -void R4300iOp::LHU (void) +void R4300iOp::LHU (void) { DWORD Address = _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset; if ((Address & 1) != 0) { ADDRESS_ERROR_EXCEPTION(Address,TRUE); } @@ -1106,7 +1106,7 @@ void R4300iOp::LHU (void) } } -void R4300iOp::LWR (void) +void R4300iOp::LWR (void) { DWORD Offset, Address, Value; @@ -1115,7 +1115,7 @@ void R4300iOp::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); @@ -1127,7 +1127,7 @@ void R4300iOp::LWR (void) _GPR[m_Opcode.rt].DW += (int)(Value >> LWR_SHIFT[Offset]); } -void R4300iOp::LWU (void) +void R4300iOp::LWU (void) { DWORD Address = _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset; if ((Address & 3) != 0) { ADDRESS_ERROR_EXCEPTION(Address,TRUE); } @@ -1148,7 +1148,7 @@ void R4300iOp::SB (void) if (!g_MMU->SB_VAddr(Address,_GPR[m_Opcode.rt].UB[0])) { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } if (bShowTLBMisses()) { @@ -1157,7 +1157,7 @@ void R4300iOp::SB (void) } } -void R4300iOp::SH (void) +void R4300iOp::SH (void) { DWORD Address = _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset; if ((Address & 1) != 0) { ADDRESS_ERROR_EXCEPTION(Address,FALSE); } @@ -1165,7 +1165,7 @@ void R4300iOp::SH (void) { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } if (bShowTLBMisses()) { @@ -1174,7 +1174,7 @@ void R4300iOp::SH (void) } } -void R4300iOp::SWL (void) +void R4300iOp::SWL (void) { DWORD Offset, Address, Value; @@ -1185,7 +1185,7 @@ void R4300iOp::SWL (void) { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } if (bShowTLBMisses()) { @@ -1201,7 +1201,7 @@ void R4300iOp::SWL (void) { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } if (bShowTLBMisses()) { @@ -1211,7 +1211,7 @@ void R4300iOp::SWL (void) } -void R4300iOp::SW (void) +void R4300iOp::SW (void) { DWORD Address = _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset; if ((Address & 3) != 0) { ADDRESS_ERROR_EXCEPTION(Address,FALSE); } @@ -1223,7 +1223,7 @@ void R4300iOp::SW (void) { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } if (bShowTLBMisses()) { @@ -1242,7 +1242,7 @@ QWORD SDL_MASK[8] = { 0,0xFF00000000000000, }; int SDL_SHIFT[8] = { 0, 8, 16, 24, 32, 40, 48, 56 }; -void R4300iOp::SDL (void) +void R4300iOp::SDL (void) { DWORD Offset, Address; QWORD Value; @@ -1254,7 +1254,7 @@ void R4300iOp::SDL (void) { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } if (bShowTLBMisses()) { @@ -1270,7 +1270,7 @@ void R4300iOp::SDL (void) { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } if (bShowTLBMisses()) { @@ -1290,7 +1290,7 @@ QWORD SDR_MASK[8] = { 0x00FFFFFFFFFFFFFF, }; int SDR_SHIFT[8] = { 56,48,40,32,24,16,8,0 }; -void R4300iOp::SDR (void) +void R4300iOp::SDR (void) { DWORD Offset, Address; QWORD Value; @@ -1302,7 +1302,7 @@ void R4300iOp::SDR (void) { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } if (bShowTLBMisses()) { @@ -1318,7 +1318,7 @@ void R4300iOp::SDR (void) { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } if (bShowTLBMisses()) { @@ -1327,7 +1327,7 @@ void R4300iOp::SDR (void) } } -void R4300iOp::SWR (void) +void R4300iOp::SWR (void) { DWORD Offset, Address, Value; @@ -1338,7 +1338,7 @@ void R4300iOp::SWR (void) { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } if (bShowTLBMisses()) { @@ -1354,7 +1354,7 @@ void R4300iOp::SWR (void) { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } if (bShowTLBMisses()) { @@ -1401,7 +1401,7 @@ void R4300iOp::LWC1 (void) } } -void R4300iOp::SC (void) +void R4300iOp::SC (void) { DWORD Address = _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset; if ((Address & 3) != 0) { ADDRESS_ERROR_EXCEPTION(Address,FALSE); } @@ -1410,7 +1410,7 @@ void R4300iOp::SC (void) { if (!g_MMU->SW_VAddr(Address,_GPR[m_Opcode.rt].UW[0])) { - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); if (bShowTLBMisses()) { g_Notify->DisplayError(L"SC TLB: %X",Address); @@ -1420,7 +1420,7 @@ void R4300iOp::SC (void) _GPR[m_Opcode.rt].UW[0] = (*_LLBit); } -void R4300iOp::LD (void) +void R4300iOp::LD (void) { DWORD Address = _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset; if ((Address & 7) != 0) { ADDRESS_ERROR_EXCEPTION(Address,TRUE); } @@ -1428,7 +1428,7 @@ void R4300iOp::LD (void) { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } if (bShowTLBMisses()) { @@ -1444,7 +1444,7 @@ void R4300iOp::LD (void) } -void R4300iOp::LDC1 (void) +void R4300iOp::LDC1 (void) { DWORD Address = _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset; @@ -1454,7 +1454,7 @@ void R4300iOp::LDC1 (void) { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } if (bShowTLBMisses()) { @@ -1463,7 +1463,7 @@ void R4300iOp::LDC1 (void) } } -void R4300iOp::SWC1 (void) +void R4300iOp::SWC1 (void) { DWORD Address = _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset; TEST_COP1_USABLE_EXCEPTION @@ -1473,7 +1473,7 @@ void R4300iOp::SWC1 (void) { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } if (bShowTLBMisses()) { @@ -1482,7 +1482,7 @@ void R4300iOp::SWC1 (void) } } -void R4300iOp::SDC1 (void) +void R4300iOp::SDC1 (void) { DWORD Address = _GPR[m_Opcode.base].UW[0] + (short)m_Opcode.offset; @@ -1492,7 +1492,7 @@ void R4300iOp::SDC1 (void) { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } if (bShowTLBMisses()) { @@ -1509,7 +1509,7 @@ void R4300iOp::SD (void) { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } if (bShowTLBMisses()) { @@ -1518,44 +1518,44 @@ void R4300iOp::SD (void) } } /********************** R4300i OpCodes: Special **********************/ -void R4300iOp::SPECIAL_SLL (void) +void R4300iOp::SPECIAL_SLL (void) { _GPR[m_Opcode.rd].DW = (_GPR[m_Opcode.rt].W[0] << m_Opcode.sa); } -void R4300iOp::SPECIAL_SRL (void) +void R4300iOp::SPECIAL_SRL (void) { _GPR[m_Opcode.rd].DW = (int)(_GPR[m_Opcode.rt].UW[0] >> m_Opcode.sa); } -void R4300iOp::SPECIAL_SRA (void) +void R4300iOp::SPECIAL_SRA (void) { _GPR[m_Opcode.rd].DW = (_GPR[m_Opcode.rt].W[0] >> m_Opcode.sa); } -void R4300iOp::SPECIAL_SLLV (void) +void R4300iOp::SPECIAL_SLLV (void) { _GPR[m_Opcode.rd].DW = (_GPR[m_Opcode.rt].W[0] << (_GPR[m_Opcode.rs].UW[0] & 0x1F)); } -void R4300iOp::SPECIAL_SRLV (void) +void R4300iOp::SPECIAL_SRLV (void) { _GPR[m_Opcode.rd].DW = (int)(_GPR[m_Opcode.rt].UW[0] >> (_GPR[m_Opcode.rs].UW[0] & 0x1F)); } -void R4300iOp::SPECIAL_SRAV (void) +void R4300iOp::SPECIAL_SRAV (void) { _GPR[m_Opcode.rd].DW = (_GPR[m_Opcode.rt].W[0] >> (_GPR[m_Opcode.rs].UW[0] & 0x1F)); } -void R4300iOp::SPECIAL_JR (void) +void R4300iOp::SPECIAL_JR (void) { m_NextInstruction = DELAY_SLOT; m_JumpToLocation = _GPR[m_Opcode.rs].UW[0]; m_TestTimer = TRUE; } -void R4300iOp::SPECIAL_JALR (void) +void R4300iOp::SPECIAL_JALR (void) { m_NextInstruction = DELAY_SLOT; m_JumpToLocation = _GPR[m_Opcode.rs].UW[0]; @@ -1563,74 +1563,74 @@ void R4300iOp::SPECIAL_JALR (void) m_TestTimer = TRUE; } -void R4300iOp::SPECIAL_SYSCALL (void) +void R4300iOp::SPECIAL_SYSCALL (void) { g_Reg->DoSysCallException(m_NextInstruction == JUMP); m_NextInstruction = JUMP; m_JumpToLocation = (*_PROGRAM_COUNTER); } -void R4300iOp::SPECIAL_BREAK (void) +void R4300iOp::SPECIAL_BREAK (void) { g_Reg->DoBreakException(m_NextInstruction == JUMP); m_NextInstruction = JUMP; m_JumpToLocation = (*_PROGRAM_COUNTER); } -void R4300iOp::SPECIAL_SYNC (void) +void R4300iOp::SPECIAL_SYNC (void) { } -void R4300iOp::SPECIAL_MFHI (void) +void R4300iOp::SPECIAL_MFHI (void) { _GPR[m_Opcode.rd].DW = _RegHI->DW; } -void R4300iOp::SPECIAL_MTHI (void) +void R4300iOp::SPECIAL_MTHI (void) { _RegHI->DW = _GPR[m_Opcode.rs].DW; } -void R4300iOp::SPECIAL_MFLO (void) +void R4300iOp::SPECIAL_MFLO (void) { _GPR[m_Opcode.rd].DW = _RegLO->DW; } -void R4300iOp::SPECIAL_MTLO (void) +void R4300iOp::SPECIAL_MTLO (void) { _RegLO->DW = _GPR[m_Opcode.rs].DW; } -void R4300iOp::SPECIAL_DSLLV (void) +void R4300iOp::SPECIAL_DSLLV (void) { _GPR[m_Opcode.rd].DW = _GPR[m_Opcode.rt].DW << (_GPR[m_Opcode.rs].UW[0] & 0x3F); } -void R4300iOp::SPECIAL_DSRLV (void) +void R4300iOp::SPECIAL_DSRLV (void) { _GPR[m_Opcode.rd].UDW = _GPR[m_Opcode.rt].UDW >> (_GPR[m_Opcode.rs].UW[0] & 0x3F); } -void R4300iOp::SPECIAL_DSRAV (void) +void R4300iOp::SPECIAL_DSRAV (void) { _GPR[m_Opcode.rd].DW = _GPR[m_Opcode.rt].DW >> (_GPR[m_Opcode.rs].UW[0] & 0x3F); } -void R4300iOp::SPECIAL_MULT (void) +void R4300iOp::SPECIAL_MULT (void) { _RegHI->DW = (__int64)(_GPR[m_Opcode.rs].W[0]) * (__int64)(_GPR[m_Opcode.rt].W[0]); _RegLO->DW = _RegHI->W[0]; _RegHI->DW = _RegHI->W[1]; } -void R4300iOp::SPECIAL_MULTU (void) +void R4300iOp::SPECIAL_MULTU (void) { _RegHI->DW = (unsigned __int64)(_GPR[m_Opcode.rs].UW[0]) * (unsigned __int64)(_GPR[m_Opcode.rt].UW[0]); _RegLO->DW = _RegHI->W[0]; _RegHI->DW = _RegHI->W[1]; } -void R4300iOp::SPECIAL_DIV (void) +void R4300iOp::SPECIAL_DIV (void) { if ( _GPR[m_Opcode.rt].UDW != 0 ) { _RegLO->DW = _GPR[m_Opcode.rs].W[0] / _GPR[m_Opcode.rt].W[0]; @@ -1655,7 +1655,7 @@ void R4300iOp::SPECIAL_DIVU (void) } } -void R4300iOp::SPECIAL_DMULT (void) +void R4300iOp::SPECIAL_DMULT (void) { MIPS_DWORD Tmp[3]; @@ -1683,7 +1683,7 @@ void R4300iOp::SPECIAL_DMULTU (void) _RegHI->UDW += (QWORD)Tmp[0].UW[1] + (QWORD)Tmp[1].UW[1] + Tmp[2].UW[1]; } -void R4300iOp::SPECIAL_DDIV (void) +void R4300iOp::SPECIAL_DDIV (void) { if ( _GPR[m_Opcode.rt].UDW != 0 ) { _RegLO->DW = _GPR[m_Opcode.rs].DW / _GPR[m_Opcode.rt].DW; @@ -1696,7 +1696,7 @@ void R4300iOp::SPECIAL_DDIV (void) } } -void R4300iOp::SPECIAL_DDIVU (void) +void R4300iOp::SPECIAL_DDIVU (void) { if ( _GPR[m_Opcode.rt].UDW != 0 ) { _RegLO->UDW = _GPR[m_Opcode.rs].UDW / _GPR[m_Opcode.rt].UDW; @@ -1709,32 +1709,32 @@ void R4300iOp::SPECIAL_DDIVU (void) } } -void R4300iOp::SPECIAL_ADD (void) +void R4300iOp::SPECIAL_ADD (void) { _GPR[m_Opcode.rd].DW = _GPR[m_Opcode.rs].W[0] + _GPR[m_Opcode.rt].W[0]; } -void R4300iOp::SPECIAL_ADDU (void) +void R4300iOp::SPECIAL_ADDU (void) { _GPR[m_Opcode.rd].DW = _GPR[m_Opcode.rs].W[0] + _GPR[m_Opcode.rt].W[0]; } -void R4300iOp::SPECIAL_SUB (void) +void R4300iOp::SPECIAL_SUB (void) { _GPR[m_Opcode.rd].DW = _GPR[m_Opcode.rs].W[0] - _GPR[m_Opcode.rt].W[0]; } -void R4300iOp::SPECIAL_SUBU (void) +void R4300iOp::SPECIAL_SUBU (void) { _GPR[m_Opcode.rd].DW = _GPR[m_Opcode.rs].W[0] - _GPR[m_Opcode.rt].W[0]; } -void R4300iOp::SPECIAL_AND (void) +void R4300iOp::SPECIAL_AND (void) { _GPR[m_Opcode.rd].DW = _GPR[m_Opcode.rs].DW & _GPR[m_Opcode.rt].DW; } -void R4300iOp::SPECIAL_OR (void) +void R4300iOp::SPECIAL_OR (void) { _GPR[m_Opcode.rd].DW = _GPR[m_Opcode.rs].DW | _GPR[m_Opcode.rt].DW; #ifdef Interpreter_StackTest @@ -1744,17 +1744,17 @@ void R4300iOp::SPECIAL_OR (void) #endif } -void R4300iOp::SPECIAL_XOR (void) +void R4300iOp::SPECIAL_XOR (void) { _GPR[m_Opcode.rd].DW = _GPR[m_Opcode.rs].DW ^ _GPR[m_Opcode.rt].DW; } -void R4300iOp::SPECIAL_NOR (void) +void R4300iOp::SPECIAL_NOR (void) { _GPR[m_Opcode.rd].DW = ~(_GPR[m_Opcode.rs].DW | _GPR[m_Opcode.rt].DW); } -void R4300iOp::SPECIAL_SLT (void) +void R4300iOp::SPECIAL_SLT (void) { if (_GPR[m_Opcode.rs].DW < _GPR[m_Opcode.rt].DW) { _GPR[m_Opcode.rd].DW = 1; @@ -1763,7 +1763,7 @@ void R4300iOp::SPECIAL_SLT (void) } } -void R4300iOp::SPECIAL_SLTU (void) +void R4300iOp::SPECIAL_SLTU (void) { if (_GPR[m_Opcode.rs].UDW < _GPR[m_Opcode.rt].UDW) { _GPR[m_Opcode.rd].DW = 1; @@ -1772,27 +1772,27 @@ void R4300iOp::SPECIAL_SLTU (void) } } -void R4300iOp::SPECIAL_DADD (void) +void R4300iOp::SPECIAL_DADD (void) { _GPR[m_Opcode.rd].DW = _GPR[m_Opcode.rs].DW + _GPR[m_Opcode.rt].DW; } -void R4300iOp::SPECIAL_DADDU (void) +void R4300iOp::SPECIAL_DADDU (void) { _GPR[m_Opcode.rd].DW = _GPR[m_Opcode.rs].DW + _GPR[m_Opcode.rt].DW; } -void R4300iOp::SPECIAL_DSUB (void) +void R4300iOp::SPECIAL_DSUB (void) { _GPR[m_Opcode.rd].DW = _GPR[m_Opcode.rs].DW - _GPR[m_Opcode.rt].DW; } -void R4300iOp::SPECIAL_DSUBU (void) +void R4300iOp::SPECIAL_DSUBU (void) { _GPR[m_Opcode.rd].DW = _GPR[m_Opcode.rs].DW - _GPR[m_Opcode.rt].DW; } -void R4300iOp::SPECIAL_TEQ (void) +void R4300iOp::SPECIAL_TEQ (void) { if (_GPR[m_Opcode.rs].DW == _GPR[m_Opcode.rt].DW && bHaveDebugger()) { @@ -1800,38 +1800,38 @@ void R4300iOp::SPECIAL_TEQ (void) } } -void R4300iOp::SPECIAL_DSLL (void) +void R4300iOp::SPECIAL_DSLL (void) { _GPR[m_Opcode.rd].DW = (_GPR[m_Opcode.rt].DW << m_Opcode.sa); } -void R4300iOp::SPECIAL_DSRL (void) +void R4300iOp::SPECIAL_DSRL (void) { _GPR[m_Opcode.rd].UDW = (_GPR[m_Opcode.rt].UDW >> m_Opcode.sa); } -void R4300iOp::SPECIAL_DSRA (void) +void R4300iOp::SPECIAL_DSRA (void) { _GPR[m_Opcode.rd].DW = (_GPR[m_Opcode.rt].DW >> m_Opcode.sa); } -void R4300iOp::SPECIAL_DSLL32 (void) +void R4300iOp::SPECIAL_DSLL32 (void) { _GPR[m_Opcode.rd].DW = (_GPR[m_Opcode.rt].DW << (m_Opcode.sa + 32)); } -void R4300iOp::SPECIAL_DSRL32 (void) +void R4300iOp::SPECIAL_DSRL32 (void) { _GPR[m_Opcode.rd].UDW = (_GPR[m_Opcode.rt].UDW >> (m_Opcode.sa + 32)); } -void R4300iOp::SPECIAL_DSRA32 (void) +void R4300iOp::SPECIAL_DSRA32 (void) { _GPR[m_Opcode.rd].DW = (_GPR[m_Opcode.rt].DW >> (m_Opcode.sa + 32)); } /********************** R4300i OpCodes: RegImm **********************/ -void R4300iOp::REGIMM_BLTZ (void) +void R4300iOp::REGIMM_BLTZ (void) { m_NextInstruction = DELAY_SLOT; if (_GPR[m_Opcode.rs].DW < 0) { @@ -1848,7 +1848,7 @@ void R4300iOp::REGIMM_BLTZ (void) } } -void R4300iOp::REGIMM_BGEZ (void) +void R4300iOp::REGIMM_BGEZ (void) { m_NextInstruction = DELAY_SLOT; if (_GPR[m_Opcode.rs].DW >= 0) { @@ -1865,7 +1865,7 @@ void R4300iOp::REGIMM_BGEZ (void) } } -void R4300iOp::REGIMM_BLTZL (void) +void R4300iOp::REGIMM_BLTZL (void) { if (_GPR[m_Opcode.rs].DW < 0) { m_NextInstruction = DELAY_SLOT; @@ -1883,7 +1883,7 @@ void R4300iOp::REGIMM_BLTZL (void) } } -void R4300iOp::REGIMM_BGEZL (void) +void R4300iOp::REGIMM_BGEZL (void) { if (_GPR[m_Opcode.rs].DW >= 0) { m_NextInstruction = DELAY_SLOT; @@ -1901,7 +1901,7 @@ void R4300iOp::REGIMM_BGEZL (void) } } -void R4300iOp::REGIMM_BLTZAL (void) +void R4300iOp::REGIMM_BLTZAL (void) { m_NextInstruction = DELAY_SLOT; if (_GPR[m_Opcode.rs].DW < 0) { @@ -1919,7 +1919,7 @@ void R4300iOp::REGIMM_BLTZAL (void) _GPR[31].DW= (long)((*_PROGRAM_COUNTER) + 8); } -void R4300iOp::REGIMM_BGEZAL (void) +void R4300iOp::REGIMM_BGEZAL (void) { m_NextInstruction = DELAY_SLOT; if (_GPR[m_Opcode.rs].DW >= 0) { @@ -1951,7 +1951,7 @@ void R4300iOp::COP0_MF (void) _GPR[m_Opcode.rt].DW = (int)_CP0[m_Opcode.rd]; } -void R4300iOp::COP0_MT (void) +void R4300iOp::COP0_MT (void) { if (LogOptions.LogCP0changes) { @@ -2021,31 +2021,31 @@ void R4300iOp::COP0_MT (void) } /************************** COP0 CO functions ***********************/ -void R4300iOp::COP0_CO_TLBR (void) +void R4300iOp::COP0_CO_TLBR (void) { if (!g_System->bUseTlb()) { return; } g_TLB->ReadEntry(); } -void R4300iOp::COP0_CO_TLBWI (void) +void R4300iOp::COP0_CO_TLBWI (void) { if (!g_System->bUseTlb()) { return; } g_TLB->WriteEntry(g_Reg->INDEX_REGISTER & 0x1F,FALSE); } -void R4300iOp::COP0_CO_TLBWR (void) +void R4300iOp::COP0_CO_TLBWR (void) { if (!g_System->bUseTlb()) { return; } g_TLB->WriteEntry(g_Reg->RANDOM_REGISTER & 0x1F,true); } -void R4300iOp::COP0_CO_TLBP (void) +void R4300iOp::COP0_CO_TLBP (void) { if (!g_System->bUseTlb()) { return; } g_TLB->Probe(); } -void R4300iOp::COP0_CO_ERET (void) +void R4300iOp::COP0_CO_ERET (void) { m_NextInstruction = JUMP; if ((g_Reg->STATUS_REGISTER & STATUS_ERL) != 0) { @@ -2061,19 +2061,19 @@ void R4300iOp::COP0_CO_ERET (void) } /************************** COP1 functions **************************/ -void R4300iOp::COP1_MF (void) +void R4300iOp::COP1_MF (void) { TEST_COP1_USABLE_EXCEPTION _GPR[m_Opcode.rt].DW = *(int *)_FPR_S[m_Opcode.fs]; } -void R4300iOp::COP1_DMF (void) +void R4300iOp::COP1_DMF (void) { TEST_COP1_USABLE_EXCEPTION _GPR[m_Opcode.rt].DW = *(__int64 *)_FPR_D[m_Opcode.fs]; } -void R4300iOp::COP1_CF (void) +void R4300iOp::COP1_CF (void) { TEST_COP1_USABLE_EXCEPTION if (m_Opcode.fs != 31 && m_Opcode.fs != 0) @@ -2084,19 +2084,19 @@ void R4300iOp::COP1_CF (void) _GPR[m_Opcode.rt].DW = (int)_FPCR[m_Opcode.fs]; } -void R4300iOp::COP1_MT (void) +void R4300iOp::COP1_MT (void) { TEST_COP1_USABLE_EXCEPTION *(int *)_FPR_S[m_Opcode.fs] = _GPR[m_Opcode.rt].W[0]; } -void R4300iOp::COP1_DMT (void) +void R4300iOp::COP1_DMT (void) { TEST_COP1_USABLE_EXCEPTION *(__int64 *)_FPR_D[m_Opcode.fs] = _GPR[m_Opcode.rt].DW; } -void R4300iOp::COP1_CT (void) +void R4300iOp::COP1_CT (void) { TEST_COP1_USABLE_EXCEPTION if (m_Opcode.fs == 31) { @@ -2113,7 +2113,7 @@ void R4300iOp::COP1_CT (void) } /************************* COP1: BC1 functions ***********************/ -void R4300iOp::COP1_BCF (void) +void R4300iOp::COP1_BCF (void) { TEST_COP1_USABLE_EXCEPTION m_NextInstruction = DELAY_SLOT; @@ -2124,7 +2124,7 @@ void R4300iOp::COP1_BCF (void) } } -void R4300iOp::COP1_BCT (void) +void R4300iOp::COP1_BCT (void) { TEST_COP1_USABLE_EXCEPTION m_NextInstruction = DELAY_SLOT; @@ -2135,7 +2135,7 @@ void R4300iOp::COP1_BCT (void) } } -void R4300iOp::COP1_BCFL (void) +void R4300iOp::COP1_BCFL (void) { TEST_COP1_USABLE_EXCEPTION if ((_FPCR[31] & FPCSR_C) == 0) { @@ -2147,7 +2147,7 @@ void R4300iOp::COP1_BCFL (void) } } -void R4300iOp::COP1_BCTL (void) +void R4300iOp::COP1_BCTL (void) { TEST_COP1_USABLE_EXCEPTION if ((_FPCR[31] & FPCSR_C) != 0) { @@ -2177,35 +2177,35 @@ __inline void Float_RoundToInteger64( __int64 * Dest, float * Source ) { } } -void R4300iOp::COP1_S_ADD (void) +void R4300iOp::COP1_S_ADD (void) { TEST_COP1_USABLE_EXCEPTION _controlfp(*_RoundingModel,_MCW_RC); *(float *)_FPR_S[m_Opcode.fd] = (*(float *)_FPR_S[m_Opcode.fs] + *(float *)_FPR_S[m_Opcode.ft]); } -void R4300iOp::COP1_S_SUB (void) +void R4300iOp::COP1_S_SUB (void) { TEST_COP1_USABLE_EXCEPTION _controlfp(*_RoundingModel,_MCW_RC); *(float *)_FPR_S[m_Opcode.fd] = (*(float *)_FPR_S[m_Opcode.fs] - *(float *)_FPR_S[m_Opcode.ft]); } -void R4300iOp::COP1_S_MUL (void) +void R4300iOp::COP1_S_MUL (void) { TEST_COP1_USABLE_EXCEPTION _controlfp(*_RoundingModel,_MCW_RC); *(float *)_FPR_S[m_Opcode.fd] = (*(float *)_FPR_S[m_Opcode.fs] * *(float *)_FPR_S[m_Opcode.ft]); } -void R4300iOp::COP1_S_DIV (void) +void R4300iOp::COP1_S_DIV (void) { TEST_COP1_USABLE_EXCEPTION _controlfp(*_RoundingModel,_MCW_RC); *(float *)_FPR_S[m_Opcode.fd] = (*(float *)_FPR_S[m_Opcode.fs] / *(float *)_FPR_S[m_Opcode.ft]); } -void R4300iOp::COP1_S_SQRT (void) +void R4300iOp::COP1_S_SQRT (void) { TEST_COP1_USABLE_EXCEPTION _controlfp(*_RoundingModel,_MCW_RC); @@ -2223,98 +2223,98 @@ void R4300iOp::COP1_S_SQRT (void) } } -void R4300iOp::COP1_S_ABS (void) +void R4300iOp::COP1_S_ABS (void) { TEST_COP1_USABLE_EXCEPTION _controlfp(*_RoundingModel,_MCW_RC); *(float *)_FPR_S[m_Opcode.fd] = (float)fabs(*(float *)_FPR_S[m_Opcode.fs]); } -void R4300iOp::COP1_S_MOV (void) +void R4300iOp::COP1_S_MOV (void) { TEST_COP1_USABLE_EXCEPTION _controlfp(*_RoundingModel,_MCW_RC); *(float *)_FPR_S[m_Opcode.fd] = *(float *)_FPR_S[m_Opcode.fs]; } -void R4300iOp::COP1_S_NEG (void) +void R4300iOp::COP1_S_NEG (void) { TEST_COP1_USABLE_EXCEPTION _controlfp(*_RoundingModel,_MCW_RC); *(float *)_FPR_S[m_Opcode.fd] = (*(float *)_FPR_S[m_Opcode.fs] * -1.0f); } -void R4300iOp::COP1_S_TRUNC_L (void) +void R4300iOp::COP1_S_TRUNC_L (void) { TEST_COP1_USABLE_EXCEPTION _controlfp(_RC_CHOP,_MCW_RC); Float_RoundToInteger64(&*(__int64 *)_FPR_D[m_Opcode.fd],&*(float *)_FPR_S[m_Opcode.fs]); } -void R4300iOp::COP1_S_CEIL_L (void) +void R4300iOp::COP1_S_CEIL_L (void) { //added by Witten TEST_COP1_USABLE_EXCEPTION _controlfp(_RC_UP,_MCW_RC); Float_RoundToInteger64(&*(__int64 *)_FPR_D[m_Opcode.fd],&*(float *)_FPR_S[m_Opcode.fs]); } -void R4300iOp::COP1_S_FLOOR_L (void) +void R4300iOp::COP1_S_FLOOR_L (void) { //added by Witten TEST_COP1_USABLE_EXCEPTION _controlfp(_RC_DOWN,_MCW_RC); Float_RoundToInteger64(&*(__int64 *)_FPR_D[m_Opcode.fd],&*(float *)_FPR_S[m_Opcode.fs]); } -void R4300iOp::COP1_S_ROUND_W (void) +void R4300iOp::COP1_S_ROUND_W (void) { TEST_COP1_USABLE_EXCEPTION _controlfp(_RC_NEAR,_MCW_RC); Float_RoundToInteger32(&*(int *)_FPR_S[m_Opcode.fd],&*(float *)_FPR_S[m_Opcode.fs]); } -void R4300iOp::COP1_S_TRUNC_W (void) +void R4300iOp::COP1_S_TRUNC_W (void) { TEST_COP1_USABLE_EXCEPTION _controlfp(_RC_CHOP,_MCW_RC); Float_RoundToInteger32(&*(int *)_FPR_S[m_Opcode.fd],&*(float *)_FPR_S[m_Opcode.fs]); } -void R4300iOp::COP1_S_CEIL_W (void) +void R4300iOp::COP1_S_CEIL_W (void) { //added by Witten TEST_COP1_USABLE_EXCEPTION _controlfp(_RC_UP,_MCW_RC); Float_RoundToInteger32(&*(int *)_FPR_S[m_Opcode.fd],&*(float *)_FPR_S[m_Opcode.fs]); } -void R4300iOp::COP1_S_FLOOR_W (void) +void R4300iOp::COP1_S_FLOOR_W (void) { TEST_COP1_USABLE_EXCEPTION _controlfp(_RC_DOWN,_MCW_RC); Float_RoundToInteger32(&*(int *)_FPR_S[m_Opcode.fd],&*(float *)_FPR_S[m_Opcode.fs]); } -void R4300iOp::COP1_S_CVT_D (void) +void R4300iOp::COP1_S_CVT_D (void) { TEST_COP1_USABLE_EXCEPTION _controlfp(*_RoundingModel,_MCW_RC); *(double *)_FPR_D[m_Opcode.fd] = (double)(*(float *)_FPR_S[m_Opcode.fs]); } -void R4300iOp::COP1_S_CVT_W (void) +void R4300iOp::COP1_S_CVT_W (void) { TEST_COP1_USABLE_EXCEPTION _controlfp(*_RoundingModel,_MCW_RC); Float_RoundToInteger32(&*(int *)_FPR_S[m_Opcode.fd],&*(float *)_FPR_S[m_Opcode.fs]); } -void R4300iOp::COP1_S_CVT_L (void) +void R4300iOp::COP1_S_CVT_L (void) { TEST_COP1_USABLE_EXCEPTION _controlfp(*_RoundingModel,_MCW_RC); Float_RoundToInteger64(&*(__int64 *)_FPR_D[m_Opcode.fd],&*(float *)_FPR_S[m_Opcode.fs]); } -void R4300iOp::COP1_S_CMP (void) +void R4300iOp::COP1_S_CMP (void) { int less, equal, unorded, condition; float Temp0, Temp1; @@ -2370,105 +2370,105 @@ __inline void Double_RoundToInteger64( unsigned __int64 * Dest, double * Source } } -void R4300iOp::COP1_D_ADD (void) +void R4300iOp::COP1_D_ADD (void) { TEST_COP1_USABLE_EXCEPTION _controlfp(*_RoundingModel,_MCW_RC); *(double *)_FPR_D[m_Opcode.fd] = *(double *)_FPR_D[m_Opcode.fs] + *(double *)_FPR_D[m_Opcode.ft]; } -void R4300iOp::COP1_D_SUB (void) +void R4300iOp::COP1_D_SUB (void) { TEST_COP1_USABLE_EXCEPTION _controlfp(*_RoundingModel,_MCW_RC); *(double *)_FPR_D[m_Opcode.fd] = *(double *)_FPR_D[m_Opcode.fs] - *(double *)_FPR_D[m_Opcode.ft]; } -void R4300iOp::COP1_D_MUL (void) +void R4300iOp::COP1_D_MUL (void) { TEST_COP1_USABLE_EXCEPTION _controlfp(*_RoundingModel,_MCW_RC); *(double *)_FPR_D[m_Opcode.fd] = *(double *)_FPR_D[m_Opcode.fs] * *(double *)_FPR_D[m_Opcode.ft]; } -void R4300iOp::COP1_D_DIV (void) +void R4300iOp::COP1_D_DIV (void) { TEST_COP1_USABLE_EXCEPTION _controlfp(*_RoundingModel,_MCW_RC); *(double *)_FPR_D[m_Opcode.fd] = *(double *)_FPR_D[m_Opcode.fs] / *(double *)_FPR_D[m_Opcode.ft]; } -void R4300iOp::COP1_D_SQRT (void) +void R4300iOp::COP1_D_SQRT (void) { TEST_COP1_USABLE_EXCEPTION _controlfp(*_RoundingModel,_MCW_RC); *(double *)_FPR_D[m_Opcode.fd] = (double)sqrt(*(double *)_FPR_D[m_Opcode.fs]); } -void R4300iOp::COP1_D_ABS (void) +void R4300iOp::COP1_D_ABS (void) { TEST_COP1_USABLE_EXCEPTION _controlfp(*_RoundingModel,_MCW_RC); *(double *)_FPR_D[m_Opcode.fd] = fabs(*(double *)_FPR_D[m_Opcode.fs]); } -void R4300iOp::COP1_D_MOV (void) +void R4300iOp::COP1_D_MOV (void) { TEST_COP1_USABLE_EXCEPTION _controlfp(*_RoundingModel,_MCW_RC); *(__int64 *)_FPR_D[m_Opcode.fd] = *(__int64 *)_FPR_D[m_Opcode.fs]; } -void R4300iOp::COP1_D_NEG (void) +void R4300iOp::COP1_D_NEG (void) { TEST_COP1_USABLE_EXCEPTION _controlfp(*_RoundingModel,_MCW_RC); *(double *)_FPR_D[m_Opcode.fd] = (*(double *)_FPR_D[m_Opcode.fs] * -1.0); } -void R4300iOp::COP1_D_TRUNC_L (void) +void R4300iOp::COP1_D_TRUNC_L (void) { //added by Witten TEST_COP1_USABLE_EXCEPTION _controlfp(RC_CHOP,_MCW_RC); Double_RoundToInteger64(&*(QWORD *)_FPR_S[m_Opcode.fd],&*(double *)_FPR_D[m_Opcode.fs] ); } -void R4300iOp::COP1_D_CEIL_L (void) +void R4300iOp::COP1_D_CEIL_L (void) { //added by Witten TEST_COP1_USABLE_EXCEPTION _controlfp(RC_UP,_MCW_RC); Double_RoundToInteger64(&*(QWORD *)_FPR_S[m_Opcode.fd],&*(double *)_FPR_D[m_Opcode.fs] ); } -void R4300iOp::COP1_D_FLOOR_L (void) +void R4300iOp::COP1_D_FLOOR_L (void) { //added by Witten TEST_COP1_USABLE_EXCEPTION _controlfp(_RC_DOWN,_MCW_RC); Double_RoundToInteger64(&*(QWORD *)_FPR_D[m_Opcode.fd],&*(double *)_FPR_S[m_Opcode.fs]); } -void R4300iOp::COP1_D_ROUND_W (void) +void R4300iOp::COP1_D_ROUND_W (void) { TEST_COP1_USABLE_EXCEPTION _controlfp(_RC_NEAR,_MCW_RC); Double_RoundToInteger32(&*(DWORD *)_FPR_S[m_Opcode.fd],&*(double *)_FPR_D[m_Opcode.fs] ); } -void R4300iOp::COP1_D_TRUNC_W (void) +void R4300iOp::COP1_D_TRUNC_W (void) { TEST_COP1_USABLE_EXCEPTION _controlfp(RC_CHOP,_MCW_RC); Double_RoundToInteger32(&*(DWORD *)_FPR_S[m_Opcode.fd],&*(double *)_FPR_D[m_Opcode.fs] ); } -void R4300iOp::COP1_D_CEIL_W (void) +void R4300iOp::COP1_D_CEIL_W (void) { //added by Witten TEST_COP1_USABLE_EXCEPTION _controlfp(RC_UP,_MCW_RC); Double_RoundToInteger32(&*(DWORD *)_FPR_S[m_Opcode.fd],&*(double *)_FPR_D[m_Opcode.fs] ); } -void R4300iOp::COP1_D_FLOOR_W (void) +void R4300iOp::COP1_D_FLOOR_W (void) { //added by Witten TEST_COP1_USABLE_EXCEPTION _controlfp(_RC_DOWN,_MCW_RC); @@ -2535,14 +2535,14 @@ void R4300iOp::COP1_D_CMP (void) } /************************** COP1: W functions ************************/ -void R4300iOp::COP1_W_CVT_S (void) +void R4300iOp::COP1_W_CVT_S (void) { TEST_COP1_USABLE_EXCEPTION _controlfp(*_RoundingModel,_MCW_RC); *(float *)_FPR_S[m_Opcode.fd] = (float)*(int *)_FPR_S[m_Opcode.fs]; } -void R4300iOp::COP1_W_CVT_D (void) +void R4300iOp::COP1_W_CVT_D (void) { TEST_COP1_USABLE_EXCEPTION _controlfp(*_RoundingModel,_MCW_RC); @@ -2550,14 +2550,14 @@ void R4300iOp::COP1_W_CVT_D (void) } /************************** COP1: L functions ************************/ -void R4300iOp::COP1_L_CVT_S (void) +void R4300iOp::COP1_L_CVT_S (void) { TEST_COP1_USABLE_EXCEPTION _controlfp(*_RoundingModel,_MCW_RC); *(float *)_FPR_S[m_Opcode.fd] = (float)*(__int64 *)_FPR_D[m_Opcode.fs]; } -void R4300iOp::COP1_L_CVT_D (void) +void R4300iOp::COP1_L_CVT_D (void) { TEST_COP1_USABLE_EXCEPTION _controlfp(*_RoundingModel,_MCW_RC); @@ -2571,7 +2571,7 @@ void R4300iOp::UnknownOpcode (void) R4300iOpcodeName(m_Opcode.Hex,(*_PROGRAM_COUNTER))); g_System->m_EndEmulation = true; - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); #ifdef tofix if (HaveDebugger && !inFullScreen) { int response; diff --git a/Source/Project64/N64 System/Mips/Audio.cpp b/Source/Project64/N64 System/Mips/Audio.cpp index 45b8d8a49..984bd3215 100644 --- a/Source/Project64/N64 System/Mips/Audio.cpp +++ b/Source/Project64/N64 System/Mips/Audio.cpp @@ -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; } diff --git a/Source/Project64/N64 System/Mips/Dma.cpp b/Source/Project64/N64 System/Mips/Dma.cpp index bd2037461..bdbdfa212 100644 --- a/Source/Project64/N64 System/Mips/Dma.cpp +++ b/Source/Project64/N64 System/Mips/Dma.cpp @@ -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); diff --git a/Source/Project64/N64 System/Mips/Memory Virtual Mem.cpp b/Source/Project64/N64 System/Mips/Memory Virtual Mem.cpp index 4a2860cde..2d182dc87 100644 --- a/Source/Project64/N64 System/Mips/Memory Virtual Mem.cpp +++ b/Source/Project64/N64 System/Mips/Memory Virtual Mem.cpp @@ -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__); } //} } diff --git a/Source/Project64/N64 System/Mips/System Events.cpp b/Source/Project64/N64 System/Mips/System Events.cpp index 42a4de7f8..73be96607 100644 --- a/Source/Project64/N64 System/Mips/System Events.cpp +++ b/Source/Project64/N64 System/Mips/System Events.cpp @@ -191,7 +191,7 @@ void CSystemEvents::ExecuteEvents ( void ) } break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); break; } } diff --git a/Source/Project64/N64 System/Mips/System Timing.cpp b/Source/Project64/N64 System/Mips/System Timing.cpp index 6a54bd85a..2a16c8fd9 100644 --- a/Source/Project64/N64 System/Mips/System Timing.cpp +++ b/Source/Project64/N64 System/Mips/System Timing.cpp @@ -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)); diff --git a/Source/Project64/N64 System/N64 Class.cpp b/Source/Project64/N64 System/N64 Class.cpp index 80f513b74..7686e4da4 100644 --- a/Source/Project64/N64 System/N64 Class.cpp +++ b/Source/Project64/N64 System/N64 Class.cpp @@ -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 diff --git a/Source/Project64/N64 System/Recompiler/Code Block.cpp b/Source/Project64/N64 System/Recompiler/Code Block.cpp index fc96aaeb3..0f3442fcb 100644 --- a/Source/Project64/N64 System/Recompiler/Code Block.cpp +++ b/Source/Project64/N64 System/Recompiler/Code Block.cpp @@ -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"); } diff --git a/Source/Project64/N64 System/Recompiler/Code Section.cpp b/Source/Project64/N64 System/Recompiler/Code Section.cpp index 6e6832cd0..17bac5041 100644 --- a/Source/Project64/N64 System/Recompiler/Code Section.cpp +++ b/Source/Project64/N64 System/Recompiler/Code Section.cpp @@ -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 ) diff --git a/Source/Project64/N64 System/Recompiler/Loop Analysis.cpp b/Source/Project64/N64 System/Recompiler/Loop Analysis.cpp index 1828f7e51..5d47c5fed 100644 --- a/Source/Project64/N64 System/Recompiler/Loop Analysis.cpp +++ b/Source/Project64/N64 System/Recompiler/Loop Analysis.cpp @@ -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; diff --git a/Source/Project64/N64 System/Recompiler/Recompiler Class.cpp b/Source/Project64/N64 System/Recompiler/Recompiler Class.cpp index 757b6d183..9dc1730b0 100644 --- a/Source/Project64/N64 System/Recompiler/Recompiler Class.cpp +++ b/Source/Project64/N64 System/Recompiler/Recompiler Class.cpp @@ -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__); } } diff --git a/Source/Project64/N64 System/Recompiler/Recompiler Ops.cpp b/Source/Project64/N64 System/Recompiler/Recompiler Ops.cpp index ab2aaf7e2..077ac0c08 100644 --- a/Source/Project64/N64 System/Recompiler/Recompiler Ops.cpp +++ b/Source/Project64/N64 System/Recompiler/Recompiler Ops.cpp @@ -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"); diff --git a/Source/Project64/N64 System/Recompiler/Reg Info.cpp b/Source/Project64/N64 System/Recompiler/Reg Info.cpp index dcb827266..4f48633f7 100644 --- a/Source/Project64/N64 System/Recompiler/Reg Info.cpp +++ b/Source/Project64/N64 System/Recompiler/Reg Info.cpp @@ -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__); } } } diff --git a/Source/Project64/N64 System/Recompiler/Section Info.cpp b/Source/Project64/N64 System/Recompiler/Section Info.cpp index 3b3874bc9..f43c05102 100644 --- a/Source/Project64/N64 System/Recompiler/Section Info.cpp +++ b/Source/Project64/N64 System/Recompiler/Section Info.cpp @@ -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; } diff --git a/Source/Project64/N64 System/Recompiler/X86ops.cpp b/Source/Project64/N64 System/Recompiler/X86ops.cpp index 4fe4de543..fce4210f4 100644 --- a/Source/Project64/N64 System/Recompiler/X86ops.cpp +++ b/Source/Project64/N64 System/Recompiler/X86ops.cpp @@ -163,7 +163,7 @@ void CX86Ops::AndX86RegToX86Reg(x86Reg Destination, x86Reg Source) { PUTDST16(m_RecompPos,0xC021 + (Destination * 0x100) + (Source * 0x800)); } -void CX86Ops::BreakPointNotification (const char * const FileName, const int LineNumber) +void CX86Ops::BreakPointNotification (const wchar_t * const FileName, const int LineNumber) { g_Notify->BreakPoint(FileName,LineNumber); } @@ -174,11 +174,14 @@ void CX86Ops::X86HardBreakPoint (void) PUTDST8(m_RecompPos,0xCC); } -void CX86Ops::X86BreakPoint (LPCSTR FileName, int LineNumber) +void CX86Ops::X86BreakPoint (const wchar_t * FileName, int LineNumber) { + stdstr file_name; + file_name.FromUTF16(FileName); + Pushad(); PushImm32(stdstr_f("%d",LineNumber).c_str(),LineNumber); - PushImm32(FileName,(DWORD)FileName); + PushImm32(file_name.c_str(),(DWORD)FileName); Call_Direct(BreakPointNotification,"BreakPointNotification"); AddConstToX86Reg(x86_ESP, 8); Popad(); @@ -262,7 +265,7 @@ void CX86Ops::CompX86RegToX86Reg(x86Reg Destination, x86Reg Source) { case x86_ESP: x86Command = 0x043B; break; case x86_EBP: x86Command = 0x053B; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (Destination) { case x86_EAX: x86Command += 0xC000; break; @@ -290,7 +293,7 @@ void CX86Ops::DecX86reg(x86Reg reg) { case x86_ESP: PUTDST8 (m_RecompPos,0x4C); break; case x86_EBP: PUTDST8 (m_RecompPos,0x4D); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } } @@ -305,7 +308,7 @@ void CX86Ops::DivX86reg(x86Reg reg) { case x86_ESP: PUTDST16(m_RecompPos,0xf4F7); break; case x86_EBP: PUTDST16(m_RecompPos,0xf5F7); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } } @@ -320,7 +323,7 @@ void CX86Ops::idivX86reg(x86Reg reg) { case x86_ESP: PUTDST16(m_RecompPos,0xfcF7); break; case x86_EBP: PUTDST16(m_RecompPos,0xfdF7); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } } @@ -336,7 +339,7 @@ void CX86Ops::imulX86reg(x86Reg reg) { case x86_ESP: PUTDST16(m_RecompPos,0xECF7); break; case x86_EBP: PUTDST16(m_RecompPos,0xEDF7); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } } @@ -352,7 +355,7 @@ void CX86Ops::IncX86reg(x86Reg reg) { case x86_ESP: PUTDST8 (m_RecompPos,0x44); break; case x86_EBP: PUTDST8 (m_RecompPos,0x45); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } } @@ -463,7 +466,7 @@ void CX86Ops::JmpDirectReg( x86Reg reg ) { case x86_ESI: PUTDST16(m_RecompPos,0xE6ff); break; case x86_EDI: PUTDST16(m_RecompPos,0xE7ff); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } } @@ -486,12 +489,12 @@ void CX86Ops::JmpIndirectReg( x86Reg reg ) { case x86_ESP: PUTDST8(m_RecompPos,0xff); PUTDST16(m_RecompPos,0x2434); - /* g_Notify->BreakPoint(__FILE__,__LINE__); */ + /* g_Notify->BreakPoint(__FILEW__,__LINE__); */ break; case x86_EBP: PUTDST8(m_RecompPos,0xff); PUTDST16(m_RecompPos,0x0065); - /* g_Notify->BreakPoint(__FILE__,__LINE__); */ + /* g_Notify->BreakPoint(__FILEW__,__LINE__); */ break; } } @@ -585,7 +588,7 @@ void CX86Ops::LeaRegReg2(x86Reg RegDest, x86Reg RegSrc, x86Reg RegSrc2, Multiple if (RegSrc2 == x86_ESP || RegSrc2 == x86_EBP) { - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); return; } PUTDST8(m_RecompPos,0x8D); @@ -610,7 +613,7 @@ void CX86Ops::LeaSourceAndOffset(x86Reg x86DestReg, x86Reg x86SourceReg, int off case x86_ESP: x86Command = 0xA08D; break; case x86_EBP: x86Command = 0xA88D; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (x86SourceReg) { case x86_EAX: x86Command += 0x0000; break; @@ -622,7 +625,7 @@ void CX86Ops::LeaSourceAndOffset(x86Reg x86DestReg, x86Reg x86SourceReg, int off case x86_ESP: x86Command += 0x0400; break; case x86_EBP: x86Command += 0x0500; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST16(m_RecompPos,x86Command); PUTDST32(m_RecompPos,offset); @@ -637,7 +640,7 @@ void CX86Ops::LeaSourceAndOffset(x86Reg x86DestReg, x86Reg x86SourceReg, int off case x86_ESP: x86Command = 0x608D; break; case x86_EBP: x86Command = 0x688D; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (x86SourceReg) { case x86_EAX: x86Command += 0x0000; break; @@ -649,7 +652,7 @@ void CX86Ops::LeaSourceAndOffset(x86Reg x86DestReg, x86Reg x86SourceReg, int off case x86_ESP: x86Command += 0x0400; break; case x86_EBP: x86Command += 0x0500; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST16(m_RecompPos,x86Command); PUTDST8(m_RecompPos,offset); @@ -668,7 +671,7 @@ void CX86Ops::MoveConstByteToN64Mem(BYTE Const, x86Reg AddrReg) { case x86_ESP: PUTDST16(m_RecompPos,0x84C6); break; case x86_EBP: PUTDST16(m_RecompPos,0x85C6); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST32(m_RecompPos,g_MMU->Rdram()); PUTDST8(m_RecompPos,Const); @@ -694,7 +697,7 @@ void CX86Ops::MoveConstHalfToN64Mem(WORD Const, x86Reg AddrReg) { case x86_ESP: PUTDST16(m_RecompPos,0x84C7); break; case x86_EBP: PUTDST16(m_RecompPos,0x85C7); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST32(m_RecompPos,g_MMU->Rdram()); PUTDST16(m_RecompPos,Const); @@ -724,7 +727,7 @@ void CX86Ops::MoveConstHalfToX86regPointer(WORD Const, x86Reg AddrReg1, x86Reg A case x86_ESI: Param = 0x06; break; case x86_EDI: Param = 0x07; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (AddrReg2) { @@ -737,7 +740,7 @@ void CX86Ops::MoveConstHalfToX86regPointer(WORD Const, x86Reg AddrReg1, x86Reg A case x86_ESP: Param += 0x20; break; case x86_EBP: Param += 0x28; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST8(m_RecompPos,Param); PUTDST16(m_RecompPos,Const); @@ -755,7 +758,7 @@ void CX86Ops::MoveConstToMemoryDisp (DWORD Const, x86Reg AddrReg, DWORD Disp) { case x86_ESP: PUTDST16(m_RecompPos,0x84C7); break; case x86_EBP: PUTDST16(m_RecompPos,0x85C7); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST32(m_RecompPos,Disp); PUTDST32(m_RecompPos,Const); @@ -773,7 +776,7 @@ void CX86Ops::MoveConstToN64Mem(DWORD Const, x86Reg AddrReg) { case x86_ESP: PUTDST16(m_RecompPos,0x84C7); break; case x86_EBP: PUTDST16(m_RecompPos,0x85C7); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST32(m_RecompPos,g_MMU->Rdram()); PUTDST32(m_RecompPos,Const); @@ -791,7 +794,7 @@ void CX86Ops::MoveConstToN64MemDisp (DWORD Const, x86Reg AddrReg, BYTE Disp) { case x86_ESP: PUTDST16(m_RecompPos,0x84C7); break; case x86_EBP: PUTDST16(m_RecompPos,0x85C7); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST32(m_RecompPos,g_MMU->Rdram() + Disp); PUTDST32(m_RecompPos,Const); @@ -838,7 +841,7 @@ void CX86Ops::MoveConstByteToX86regPointer(BYTE Const, x86Reg AddrReg1, x86Reg A case x86_ESI: Param = 0x06; break; case x86_EDI: Param = 0x07; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (AddrReg2) { @@ -851,7 +854,7 @@ void CX86Ops::MoveConstByteToX86regPointer(BYTE Const, x86Reg AddrReg1, x86Reg A case x86_ESP: Param += 0x20; break; case x86_EBP: Param += 0x28; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST8(m_RecompPos,Param); PUTDST8(m_RecompPos,Const); @@ -872,7 +875,7 @@ void CX86Ops::MoveConstToX86regPointer(DWORD Const, x86Reg AddrReg1, x86Reg Addr case x86_ESI: Param = 0x06; break; case x86_EDI: Param = 0x07; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (AddrReg2) { @@ -885,7 +888,7 @@ void CX86Ops::MoveConstToX86regPointer(DWORD Const, x86Reg AddrReg1, x86Reg Addr case x86_ESP: Param += 0x20; break; case x86_EBP: Param += 0x28; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST8(m_RecompPos,Param); PUTDST32(m_RecompPos,Const); @@ -905,7 +908,7 @@ void CX86Ops::MoveN64MemDispToX86reg(x86Reg reg, x86Reg AddrReg, BYTE Disp) { case x86_ESP: x86Command = 0x048B; break; case x86_EBP: x86Command = 0x058B; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (reg) { case x86_EAX: x86Command += 0x8000; break; @@ -936,7 +939,7 @@ void CX86Ops::MoveN64MemToX86reg(x86Reg reg, x86Reg AddrReg) { case x86_ESP: x86Command = 0x048B; break; case x86_EBP: x86Command = 0x058B; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (reg) { case x86_EAX: x86Command += 0x8000; break; @@ -966,7 +969,7 @@ void CX86Ops::MoveN64MemToX86regByte(x86Reg reg, x86Reg AddrReg) { case x86_ESP: x86Command = 0x048A; break; case x86_EBP: x86Command = 0x058A; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (reg) { case x86_EAX: x86Command += 0x8000; break; @@ -977,7 +980,7 @@ void CX86Ops::MoveN64MemToX86regByte(x86Reg reg, x86Reg AddrReg) { /* case x86_EDI: x86Command += 0xB800; break; */ /* case x86_ESP: case x86_EBP: */ default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); break; } PUTDST16(m_RecompPos,x86Command); @@ -1000,7 +1003,7 @@ void CX86Ops::MoveN64MemToX86regHalf(x86Reg reg, x86Reg AddrReg) { case x86_ESP: x86Command = 0x048B; break; case x86_EBP: x86Command = 0x058B; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (reg) { case x86_EAX: x86Command += 0x8000; break; @@ -1032,7 +1035,7 @@ void CX86Ops::MoveSxByteX86regPointerToX86reg(x86Reg AddrReg1, x86Reg AddrReg2, case x86_ESP: PUTDST8(m_RecompPos,0x24); break; case x86_EBP: PUTDST8(m_RecompPos,0x2C); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (AddrReg1) { @@ -1043,7 +1046,7 @@ void CX86Ops::MoveSxByteX86regPointerToX86reg(x86Reg AddrReg1, x86Reg AddrReg2, case x86_ESI: Param = 0x06; break; case x86_EDI: Param = 0x07; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (AddrReg2) { @@ -1056,7 +1059,7 @@ void CX86Ops::MoveSxByteX86regPointerToX86reg(x86Reg AddrReg1, x86Reg AddrReg2, case x86_ESP: Param += 0x20; break; case x86_EBP: Param += 0x28; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST8(m_RecompPos,Param); } @@ -1077,7 +1080,7 @@ void CX86Ops::MoveSxHalfX86regPointerToX86reg(x86Reg AddrReg1, x86Reg AddrReg2, case x86_ESP: PUTDST8(m_RecompPos,0x24); break; case x86_EBP: PUTDST8(m_RecompPos,0x2C); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (AddrReg1) { @@ -1088,7 +1091,7 @@ void CX86Ops::MoveSxHalfX86regPointerToX86reg(x86Reg AddrReg1, x86Reg AddrReg2, case x86_ESI: Param = 0x06; break; case x86_EDI: Param = 0x07; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (AddrReg2) { @@ -1101,7 +1104,7 @@ void CX86Ops::MoveSxHalfX86regPointerToX86reg(x86Reg AddrReg1, x86Reg AddrReg2, case x86_ESP: Param += 0x20; break; case x86_EBP: Param += 0x28; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST8(m_RecompPos,Param); } @@ -1120,7 +1123,7 @@ void CX86Ops::MoveSxN64MemToX86regByte(x86Reg reg, x86Reg AddrReg) { case x86_ESP: x86Command = 0x04BE; break; case x86_EBP: x86Command = 0x05BE; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (reg) { case x86_EAX: x86Command += 0x8000; break; @@ -1132,7 +1135,7 @@ void CX86Ops::MoveSxN64MemToX86regByte(x86Reg reg, x86Reg AddrReg) { case x86_ESP: x86Command += 0xA000; break; case x86_EBP: x86Command += 0xA800; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); break; } PUTDST8(m_RecompPos,0x0f); @@ -1155,7 +1158,7 @@ void CX86Ops::MoveSxN64MemToX86regHalf(x86Reg reg, x86Reg AddrReg) { case x86_ESP: x86Command = 0x04BF; break; case x86_EBP: x86Command = 0x05BF; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (reg) { case x86_EAX: x86Command += 0x8000; break; @@ -1188,7 +1191,7 @@ void CX86Ops::MoveSxVariableToX86regByte(void *Variable, const char * VariableNa case x86_ESP: PUTDST8(m_RecompPos,0x25); break; case x86_EBP: PUTDST8(m_RecompPos,0x2D); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST32(m_RecompPos,Variable); } @@ -1208,7 +1211,7 @@ void CX86Ops::MoveSxVariableToX86regHalf(void *Variable, const char * VariableNa case x86_ESP: PUTDST8(m_RecompPos,0x25); break; case x86_EBP: PUTDST8(m_RecompPos,0x2D); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST32(m_RecompPos,Variable); } @@ -1225,7 +1228,7 @@ void CX86Ops::MoveVariableToX86reg(void *Variable, const char * VariableName, x8 case x86_ESP: PUTDST16(m_RecompPos,0x258B); break; case x86_EBP: PUTDST16(m_RecompPos,0x2D8B); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST32(m_RecompPos,Variable); } @@ -1254,7 +1257,7 @@ void CX86Ops::MoveVariableDispToX86Reg(void *Variable, const char * VariableName case 4: x = 0x80; break; case 8: x = 0xC0; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } /* format xx|000000 */ @@ -1280,7 +1283,7 @@ void CX86Ops::MoveVariableToX86regByte(void *Variable, const char * VariableName case x86_ECX: PUTDST16(m_RecompPos,0x0D8A); break; case x86_EDX: PUTDST16(m_RecompPos,0x158A); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST32(m_RecompPos,Variable); } @@ -1298,7 +1301,7 @@ void CX86Ops::MoveVariableToX86regHalf(void *Variable, const char * VariableName case x86_ESP: PUTDST16(m_RecompPos,0x258B); break; case x86_EBP: PUTDST16(m_RecompPos,0x2D8B); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST32(m_RecompPos,Variable); } @@ -1316,7 +1319,7 @@ void CX86Ops::MoveX86regByteToN64Mem(x86Reg reg, x86Reg AddrReg) { case x86_ESI: x86Command = 0x0688; break; case x86_EDI: x86Command = 0x0788; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (reg) { case x86_EAX: x86Command += 0x8000; break; @@ -1324,7 +1327,7 @@ void CX86Ops::MoveX86regByteToN64Mem(x86Reg reg, x86Reg AddrReg) { case x86_ECX: x86Command += 0x8800; break; case x86_EDX: x86Command += 0x9000; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST16(m_RecompPos,x86Command); PUTDST32(m_RecompPos,g_MMU->Rdram()); @@ -1338,7 +1341,7 @@ void CX86Ops::MoveX86regByteToVariable(x86Reg reg, void * Variable, const char * case x86_ECX: PUTDST16(m_RecompPos,0x0D88); break; case x86_EDX: PUTDST16(m_RecompPos,0x1588); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST32(m_RecompPos,Variable); } @@ -1358,7 +1361,7 @@ void CX86Ops::MoveX86regByteToX86regPointer(x86Reg reg, x86Reg AddrReg1, x86Reg case x86_ESP: PUTDST16(m_RecompPos,0x2488); break; case x86_EBP: PUTDST16(m_RecompPos,0x2C88); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (AddrReg1) { @@ -1369,7 +1372,7 @@ void CX86Ops::MoveX86regByteToX86regPointer(x86Reg reg, x86Reg AddrReg1, x86Reg case x86_ESI: Param = 0x06; break; case x86_EDI: Param = 0x07; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (AddrReg2) { @@ -1382,7 +1385,7 @@ void CX86Ops::MoveX86regByteToX86regPointer(x86Reg reg, x86Reg AddrReg1, x86Reg case x86_ESP: Param += 0x20; break; case x86_EBP: Param += 0x28; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST8(m_RecompPos,Param); } @@ -1403,7 +1406,7 @@ void CX86Ops::MoveX86regHalfToN64Mem(x86Reg reg, x86Reg AddrReg) { case x86_ESP: x86Command = 0x0489; break; case x86_EBP: x86Command = 0x0589; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (reg) { case x86_EAX: x86Command += 0x8000; break; @@ -1415,7 +1418,7 @@ void CX86Ops::MoveX86regHalfToN64Mem(x86Reg reg, x86Reg AddrReg) { case x86_ESP: x86Command += 0xA000; break; case x86_EBP: x86Command += 0xA800; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST16(m_RecompPos,x86Command); PUTDST32(m_RecompPos,g_MMU->Rdram()); @@ -1434,7 +1437,7 @@ void CX86Ops::MoveX86regHalfToVariable(x86Reg reg, void * Variable, const char * case x86_ESP: PUTDST16(m_RecompPos,0x2589); break; case x86_EBP: PUTDST16(m_RecompPos,0x2D89); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST32(m_RecompPos,Variable); } @@ -1455,7 +1458,7 @@ void CX86Ops::MoveX86regHalfToX86regPointer(x86Reg reg, x86Reg AddrReg1, x86Reg case x86_ESP: PUTDST16(m_RecompPos,0x2489); break; case x86_EBP: PUTDST16(m_RecompPos,0x2C89); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (AddrReg1) { @@ -1466,7 +1469,7 @@ void CX86Ops::MoveX86regHalfToX86regPointer(x86Reg reg, x86Reg AddrReg1, x86Reg case x86_ESI: Param = 0x06; break; case x86_EDI: Param = 0x07; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (AddrReg2) { @@ -1479,7 +1482,7 @@ void CX86Ops::MoveX86regHalfToX86regPointer(x86Reg reg, x86Reg AddrReg1, x86Reg case x86_ESP: Param += 0x20; break; case x86_EBP: Param += 0x28; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST8(m_RecompPos,Param); } @@ -1497,7 +1500,7 @@ void CX86Ops::MoveX86PointerToX86reg(x86Reg reg, x86Reg X86Pointer) { case x86_ESI: x86Command = 0x068B; break; case x86_EDI: x86Command = 0x078B; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (reg) { @@ -1510,7 +1513,7 @@ void CX86Ops::MoveX86PointerToX86reg(x86Reg reg, x86Reg X86Pointer) { case x86_ESP: x86Command += 0x2000; break; case x86_EBP: x86Command += 0x2800; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST16(m_RecompPos,x86Command); } @@ -1528,7 +1531,7 @@ void CX86Ops::MoveX86PointerToX86regDisp(x86Reg reg, x86Reg X86Pointer, BYTE Dis case x86_ESI: x86Command = 0x468B; break; case x86_EDI: x86Command = 0x478B; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (reg) { @@ -1541,7 +1544,7 @@ void CX86Ops::MoveX86PointerToX86regDisp(x86Reg reg, x86Reg X86Pointer, BYTE Dis case x86_ESP: x86Command += 0x2000; break; case x86_EBP: x86Command += 0x2800; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST16(m_RecompPos,x86Command); PUTDST8(m_RecompPos,Disp); @@ -1562,7 +1565,7 @@ void CX86Ops::MoveX86regPointerToX86reg(x86Reg AddrReg1, x86Reg AddrReg2, x86Reg case x86_ESP: PUTDST16(m_RecompPos,0x248B); break; case x86_EBP: PUTDST16(m_RecompPos,0x2C8B); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (AddrReg1) { @@ -1573,7 +1576,7 @@ void CX86Ops::MoveX86regPointerToX86reg(x86Reg AddrReg1, x86Reg AddrReg2, x86Reg case x86_ESI: Param = 0x06; break; case x86_EDI: Param = 0x07; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (AddrReg2) { @@ -1586,7 +1589,7 @@ void CX86Ops::MoveX86regPointerToX86reg(x86Reg AddrReg1, x86Reg AddrReg2, x86Reg case x86_ESP: Param += 0x20; break; case x86_EBP: Param += 0x28; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST8(m_RecompPos,Param); } @@ -1606,7 +1609,7 @@ void CX86Ops::MoveX86regPointerToX86regDisp8(x86Reg AddrReg1, x86Reg AddrReg2, x case x86_ESP: PUTDST16(m_RecompPos,0x648B); break; case x86_EBP: PUTDST16(m_RecompPos,0x6C8B); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (AddrReg1) { @@ -1617,7 +1620,7 @@ void CX86Ops::MoveX86regPointerToX86regDisp8(x86Reg AddrReg1, x86Reg AddrReg2, x case x86_ESI: Param = 0x06; break; case x86_EDI: Param = 0x07; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (AddrReg2) { @@ -1630,7 +1633,7 @@ void CX86Ops::MoveX86regPointerToX86regDisp8(x86Reg AddrReg1, x86Reg AddrReg2, x case x86_ESP: Param += 0x20; break; case x86_EBP: Param += 0x28; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST8(m_RecompPos,Param); PUTDST8(m_RecompPos,offset); @@ -1650,7 +1653,7 @@ void CX86Ops::MoveX86regToMemory(x86Reg reg, x86Reg AddrReg, DWORD Disp) { case x86_ESP: x86Command = 0x0489; break; case x86_EBP: x86Command = 0x0589; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (reg) { case x86_EAX: x86Command += 0x8000; break; @@ -1662,7 +1665,7 @@ void CX86Ops::MoveX86regToMemory(x86Reg reg, x86Reg AddrReg, DWORD Disp) { case x86_ESP: x86Command += 0xA000; break; case x86_EBP: x86Command += 0xA800; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST16(m_RecompPos,x86Command); PUTDST32(m_RecompPos,Disp); @@ -1682,7 +1685,7 @@ void CX86Ops::MoveX86regToN64Mem(x86Reg reg, x86Reg AddrReg) { case x86_ESP: x86Command = 0x0489; break; case x86_EBP: x86Command = 0x0589; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (reg) { case x86_EAX: x86Command += 0x8000; break; @@ -1694,7 +1697,7 @@ void CX86Ops::MoveX86regToN64Mem(x86Reg reg, x86Reg AddrReg) { case x86_ESP: x86Command += 0xA000; break; case x86_EBP: x86Command += 0xA800; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST16(m_RecompPos,x86Command); PUTDST32(m_RecompPos,g_MMU->Rdram()); @@ -1714,7 +1717,7 @@ void CX86Ops::MoveX86regToN64MemDisp(x86Reg reg, x86Reg AddrReg, BYTE Disp) { case x86_ESP: x86Command = 0x0489; break; case x86_EBP: x86Command = 0x0589; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (reg) { case x86_EAX: x86Command += 0x8000; break; @@ -1726,7 +1729,7 @@ void CX86Ops::MoveX86regToN64MemDisp(x86Reg reg, x86Reg AddrReg, BYTE Disp) { case x86_ESP: x86Command += 0xA000; break; case x86_EBP: x86Command += 0xA800; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST16(m_RecompPos,x86Command); PUTDST32(m_RecompPos,g_MMU->Rdram()+Disp); @@ -1744,7 +1747,7 @@ void CX86Ops::MoveX86regToVariable(x86Reg reg, void * Variable, const char * Var case x86_ESP: PUTDST16(m_RecompPos,0x2589); break; case x86_EBP: PUTDST16(m_RecompPos,0x2D89); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST32(m_RecompPos,Variable); } @@ -1768,7 +1771,7 @@ void CX86Ops::MoveX86RegToX86Reg(x86Reg Source, x86Reg Destination) { case x86_ESP: x86Command = 0x0489; break; case x86_EBP: x86Command = 0x0589; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (Source) { @@ -1781,7 +1784,7 @@ void CX86Ops::MoveX86RegToX86Reg(x86Reg Source, x86Reg Destination) { case x86_ESP: x86Command += 0xE000; break; case x86_EBP: x86Command += 0xE800; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST16(m_RecompPos,x86Command); } @@ -1799,7 +1802,7 @@ void CX86Ops::MoveX86regToX86Pointer(x86Reg reg, x86Reg X86Pointer) { case x86_ESI: x86Command = 0x0689; break; case x86_EDI: x86Command = 0x0789; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (reg) { @@ -1812,7 +1815,7 @@ void CX86Ops::MoveX86regToX86Pointer(x86Reg reg, x86Reg X86Pointer) { case x86_ESP: x86Command += 0x2000; break; case x86_EBP: x86Command += 0x2800; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST16(m_RecompPos,x86Command); } @@ -1832,7 +1835,7 @@ void CX86Ops::MoveX86regToX86regPointer(x86Reg reg, x86Reg AddrReg1, x86Reg Addr case x86_ESP: PUTDST16(m_RecompPos,0x2489); break; case x86_EBP: PUTDST16(m_RecompPos,0x2C89); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (AddrReg1) { @@ -1843,7 +1846,7 @@ void CX86Ops::MoveX86regToX86regPointer(x86Reg reg, x86Reg AddrReg1, x86Reg Addr case x86_ESI: Param = 0x06; break; case x86_EDI: Param = 0x07; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (AddrReg2) { @@ -1856,7 +1859,7 @@ void CX86Ops::MoveX86regToX86regPointer(x86Reg reg, x86Reg AddrReg1, x86Reg Addr case x86_ESP: Param += 0x20; break; case x86_EBP: Param += 0x28; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST8(m_RecompPos,Param); } @@ -1877,7 +1880,7 @@ void CX86Ops::MoveZxByteX86regPointerToX86reg(x86Reg AddrReg1, x86Reg AddrReg2, case x86_ESP: PUTDST8(m_RecompPos,0x24); break; case x86_EBP: PUTDST8(m_RecompPos,0x2C); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (AddrReg1) { @@ -1888,7 +1891,7 @@ void CX86Ops::MoveZxByteX86regPointerToX86reg(x86Reg AddrReg1, x86Reg AddrReg2, case x86_ESI: Param = 0x06; break; case x86_EDI: Param = 0x07; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (AddrReg2) { @@ -1901,7 +1904,7 @@ void CX86Ops::MoveZxByteX86regPointerToX86reg(x86Reg AddrReg1, x86Reg AddrReg2, case x86_ESP: Param += 0x20; break; case x86_EBP: Param += 0x28; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST8(m_RecompPos,Param); } @@ -1922,7 +1925,7 @@ void CX86Ops::MoveZxHalfX86regPointerToX86reg(x86Reg AddrReg1, x86Reg AddrReg2, case x86_ESP: PUTDST8(m_RecompPos,0x24); break; case x86_EBP: PUTDST8(m_RecompPos,0x2C); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (AddrReg1) { @@ -1933,7 +1936,7 @@ void CX86Ops::MoveZxHalfX86regPointerToX86reg(x86Reg AddrReg1, x86Reg AddrReg2, case x86_ESI: Param = 0x06; break; case x86_EDI: Param = 0x07; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (AddrReg2) { @@ -1946,7 +1949,7 @@ void CX86Ops::MoveZxHalfX86regPointerToX86reg(x86Reg AddrReg1, x86Reg AddrReg2, case x86_ESP: Param += 0x20; break; case x86_EBP: Param += 0x28; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST8(m_RecompPos,Param); } @@ -1965,7 +1968,7 @@ void CX86Ops::MoveZxN64MemToX86regByte(x86Reg reg, x86Reg AddrReg) { case x86_ESP: x86Command = 0x04B6; break; case x86_EBP: x86Command = 0x05B6; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (reg) { case x86_EAX: x86Command += 0x8000; break; @@ -1977,7 +1980,7 @@ void CX86Ops::MoveZxN64MemToX86regByte(x86Reg reg, x86Reg AddrReg) { case x86_ESP: x86Command += 0xA000; break; case x86_EBP: x86Command += 0xA800; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); break; } PUTDST8(m_RecompPos,0x0f); @@ -2000,7 +2003,7 @@ void CX86Ops::MoveZxN64MemToX86regHalf(x86Reg reg, x86Reg AddrReg) { case x86_ESP: x86Command = 0x04B7; break; case x86_EBP: x86Command = 0x05B7; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (reg) { case x86_EAX: x86Command += 0x8000; break; @@ -2012,7 +2015,7 @@ void CX86Ops::MoveZxN64MemToX86regHalf(x86Reg reg, x86Reg AddrReg) { case x86_ESP: x86Command += 0xA000; break; case x86_EBP: x86Command += 0xA800; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST8(m_RecompPos, 0x0f); @@ -2035,7 +2038,7 @@ void CX86Ops::MoveZxVariableToX86regByte(void *Variable, const char * VariableNa case x86_ESP: PUTDST8(m_RecompPos,0x25); break; case x86_EBP: PUTDST8(m_RecompPos,0x2D); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST32(m_RecompPos,Variable); } @@ -2055,7 +2058,7 @@ void CX86Ops::MoveZxVariableToX86regHalf(void *Variable, const char * VariableNa case x86_ESP: PUTDST8(m_RecompPos,0x25); break; case x86_EBP: PUTDST8(m_RecompPos,0x2D); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST32(m_RecompPos,Variable); } @@ -2072,7 +2075,7 @@ void CX86Ops::MulX86reg(x86Reg reg) { case x86_ESP: PUTDST16(m_RecompPos,0xE4F7); break; case x86_EBP: PUTDST16(m_RecompPos,0xE5F7); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } } @@ -2088,7 +2091,7 @@ void CX86Ops::NotX86Reg(x86Reg reg) { case x86_ESP: PUTDST16(m_RecompPos,0xD4F7); break; case x86_EBP: PUTDST16(m_RecompPos,0xD5F7); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } } @@ -2112,7 +2115,7 @@ void CX86Ops::OrConstToX86Reg(DWORD Const, x86Reg reg) { case x86_ESP: PUTDST16(m_RecompPos,0xCC81); break; case x86_EBP: PUTDST16(m_RecompPos,0xCD81); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST32(m_RecompPos, Const); } else { @@ -2126,7 +2129,7 @@ void CX86Ops::OrConstToX86Reg(DWORD Const, x86Reg reg) { case x86_ESP: PUTDST16(m_RecompPos,0xCC83); break; case x86_EBP: PUTDST16(m_RecompPos,0xCD83); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST8(m_RecompPos, Const); } @@ -2144,7 +2147,7 @@ void CX86Ops::OrVariableToX86Reg(void * Variable, const char * VariableName, x86 case x86_ESP: PUTDST16(m_RecompPos,0x250B); break; case x86_EBP: PUTDST16(m_RecompPos,0x2D0B); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST32(m_RecompPos,Variable); } @@ -2161,7 +2164,7 @@ void CX86Ops::OrX86RegToVariable(void * Variable, const char * VariableName, x86 case x86_ESP: PUTDST16(m_RecompPos,0x2509); break; case x86_EBP: PUTDST16(m_RecompPos,0x2D09); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST32(m_RecompPos,Variable); } @@ -2180,7 +2183,7 @@ void CX86Ops::OrX86RegToX86Reg(x86Reg Destination, x86Reg Source) { case x86_ESP: x86Command = 0x040B; break; case x86_EBP: x86Command = 0x050B; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (Destination) { case x86_EAX: x86Command += 0xC000; break; @@ -2192,7 +2195,7 @@ void CX86Ops::OrX86RegToX86Reg(x86Reg Destination, x86Reg Source) { case x86_ESP: x86Command += 0xE000; break; case x86_EBP: x86Command += 0xE800; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST16(m_RecompPos,x86Command); } @@ -2220,7 +2223,7 @@ void CX86Ops::Push(x86Reg reg) { case x86_ESP: PUTDST8(m_RecompPos, 0x54); break; case x86_EBP: PUTDST8(m_RecompPos, 0x55); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } } @@ -2237,7 +2240,7 @@ void CX86Ops::Pop(x86Reg reg) { case x86_ESP: PUTDST8(m_RecompPos, 0x5C); break; case x86_EBP: PUTDST8(m_RecompPos, 0x5D); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } } @@ -2266,7 +2269,7 @@ void CX86Ops::Seta(x86Reg reg) { case x86_ECX: PUTDST8(m_RecompPos,0xC1); break; case x86_EDX: PUTDST8(m_RecompPos,0xC2); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } } @@ -2286,7 +2289,7 @@ void CX86Ops::Setae(x86Reg reg) { case x86_ECX: PUTDST8(m_RecompPos,0xC1); break; case x86_EDX: PUTDST8(m_RecompPos,0xC2); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } } @@ -2299,7 +2302,7 @@ void CX86Ops::Setb(x86Reg reg) { case x86_ECX: PUTDST8(m_RecompPos,0xC1); break; case x86_EDX: PUTDST8(m_RecompPos,0xC2); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } } @@ -2319,7 +2322,7 @@ void CX86Ops::Setg(x86Reg reg) { case x86_ECX: PUTDST8(m_RecompPos,0xC1); break; case x86_EDX: PUTDST8(m_RecompPos,0xC2); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } } @@ -2339,7 +2342,7 @@ void CX86Ops::Setl(x86Reg reg) { case x86_ECX: PUTDST8(m_RecompPos,0xC1); break; case x86_EDX: PUTDST8(m_RecompPos,0xC2); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } } @@ -2360,7 +2363,7 @@ void CX86Ops::Setz(x86Reg reg) { case x86_ECX: PUTDST8(m_RecompPos,0xC1); break; case x86_EDX: PUTDST8(m_RecompPos,0xC2); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } } @@ -2373,7 +2376,7 @@ void CX86Ops::Setnz(x86Reg reg) { case x86_ECX: PUTDST8(m_RecompPos,0xC1); break; case x86_EDX: PUTDST8(m_RecompPos,0xC2); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } } @@ -2393,7 +2396,7 @@ void CX86Ops::ShiftLeftDouble(x86Reg Destination, x86Reg Source) { case x86_ESP: s |= 0x04; break; case x86_EBP: s |= 0x05; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (Source) { @@ -2406,7 +2409,7 @@ void CX86Ops::ShiftLeftDouble(x86Reg Destination, x86Reg Source) { case x86_ESP: s |= 0x04 << 3; break; case x86_EBP: s |= 0x05 << 3; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST8(m_RecompPos,s); @@ -2428,7 +2431,7 @@ void CX86Ops::ShiftLeftDoubleImmed(x86Reg Destination, x86Reg Source, BYTE Immed case x86_ESP: s |= 0x04; break; case x86_EBP: s |= 0x05; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (Source) { @@ -2441,7 +2444,7 @@ void CX86Ops::ShiftLeftDoubleImmed(x86Reg Destination, x86Reg Source, BYTE Immed case x86_ESP: s |= 0x04 << 3; break; case x86_EBP: s |= 0x05 << 3; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST8(m_RecompPos,s); @@ -2460,7 +2463,7 @@ void CX86Ops::ShiftLeftSign(x86Reg reg) { case x86_ESP: PUTDST16(m_RecompPos,0xE4D3); break; case x86_EBP: PUTDST16(m_RecompPos,0xE5D3); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } } @@ -2476,7 +2479,7 @@ void CX86Ops::ShiftLeftSignImmed(x86Reg reg, BYTE Immediate) { case x86_ESP: PUTDST16(m_RecompPos,0xE4C1); break; case x86_EBP: PUTDST16(m_RecompPos,0xE5C1); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST8(m_RecompPos,Immediate); } @@ -2493,7 +2496,7 @@ void CX86Ops::ShiftRightSign(x86Reg reg) { case x86_ESP: PUTDST16(m_RecompPos,0xFCD3); break; case x86_EBP: PUTDST16(m_RecompPos,0xFDD3); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } } @@ -2509,7 +2512,7 @@ void CX86Ops::ShiftRightSignImmed(x86Reg reg, BYTE Immediate) { case x86_ESP: PUTDST16(m_RecompPos,0xFCC1); break; case x86_EBP: PUTDST16(m_RecompPos,0xFDC1); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST8(m_RecompPos,Immediate); } @@ -2526,7 +2529,7 @@ void CX86Ops::ShiftRightUnsign(x86Reg reg) { case x86_ESP: PUTDST16(m_RecompPos,0xECD3); break; case x86_EBP: PUTDST16(m_RecompPos,0xEDD3); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } } @@ -2546,7 +2549,7 @@ void CX86Ops::ShiftRightDouble(x86Reg Destination, x86Reg Source) { case x86_ESP: s |= 0x04; break; case x86_EBP: s |= 0x05; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (Source) { @@ -2559,7 +2562,7 @@ void CX86Ops::ShiftRightDouble(x86Reg Destination, x86Reg Source) { case x86_ESP: s |= 0x04 << 3; break; case x86_EBP: s |= 0x05 << 3; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST8(m_RecompPos,s); @@ -2581,7 +2584,7 @@ void CX86Ops::ShiftRightDoubleImmed(x86Reg Destination, x86Reg Source, BYTE Imme case x86_ESP: s |= 0x04; break; case x86_EBP: s |= 0x05; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (Source) { @@ -2594,7 +2597,7 @@ void CX86Ops::ShiftRightDoubleImmed(x86Reg Destination, x86Reg Source, BYTE Imme case x86_ESP: s |= 0x04 << 3; break; case x86_EBP: s |= 0x05 << 3; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST8(m_RecompPos,s); @@ -2613,7 +2616,7 @@ void CX86Ops::ShiftRightUnsignImmed(x86Reg reg, BYTE Immediate) { case x86_ESP: PUTDST16(m_RecompPos,0xECC1); break; case x86_EBP: PUTDST16(m_RecompPos,0xEDC1); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST8(m_RecompPos,Immediate); } @@ -2631,7 +2634,7 @@ void CX86Ops::SbbConstFromX86Reg (x86Reg reg, DWORD Const) { case x86_ESP: PUTDST16(m_RecompPos,0xDC81); break; case x86_EBP: PUTDST16(m_RecompPos,0xDD81); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST32(m_RecompPos, Const); } else { @@ -2645,7 +2648,7 @@ void CX86Ops::SbbConstFromX86Reg (x86Reg reg, DWORD Const) { case x86_ESP: PUTDST16(m_RecompPos,0xDC83); break; case x86_EBP: PUTDST16(m_RecompPos,0xDD83); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST8(m_RecompPos, Const); } @@ -2663,7 +2666,7 @@ void CX86Ops::SbbVariableFromX86reg(x86Reg reg, void * Variable, const char * Va case x86_ESP: PUTDST16(m_RecompPos,0x251B); break; case x86_EBP: PUTDST16(m_RecompPos,0x2D1B); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST32(m_RecompPos,Variable); } @@ -2681,7 +2684,7 @@ void CX86Ops::SbbX86RegToX86Reg(x86Reg Destination, x86Reg Source) { case x86_ESP: x86Command = 0x041B; break; case x86_EBP: x86Command = 0x051B; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (Destination) { case x86_EAX: x86Command += 0xC000; break; @@ -2693,7 +2696,7 @@ void CX86Ops::SbbX86RegToX86Reg(x86Reg Destination, x86Reg Source) { case x86_ESP: x86Command += 0xE000; break; case x86_EBP: x86Command += 0xE800; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST16(m_RecompPos,x86Command); } @@ -2718,7 +2721,7 @@ void CX86Ops::SubConstFromX86Reg (x86Reg reg, DWORD Const) { case x86_ESP: PUTDST16(m_RecompPos,0xEC81); break; case x86_EBP: PUTDST16(m_RecompPos,0xED81); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST32(m_RecompPos, Const); } else { @@ -2732,7 +2735,7 @@ void CX86Ops::SubConstFromX86Reg (x86Reg reg, DWORD Const) { case x86_ESP: PUTDST16(m_RecompPos,0xEC83); break; case x86_EBP: PUTDST16(m_RecompPos,0xED83); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST8(m_RecompPos, Const); } @@ -2750,7 +2753,7 @@ void CX86Ops::SubVariableFromX86reg(x86Reg reg, void * Variable, const char * Va case x86_ESP: PUTDST16(m_RecompPos,0x252B); break; case x86_EBP: PUTDST16(m_RecompPos,0x2D2B); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST32(m_RecompPos,Variable); } @@ -2768,7 +2771,7 @@ void CX86Ops::SubX86RegToX86Reg(x86Reg Destination, x86Reg Source) { case x86_ESP: x86Command = 0x042B; break; case x86_EBP: x86Command = 0x052B; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (Destination) { case x86_EAX: x86Command += 0xC000; break; @@ -2780,7 +2783,7 @@ void CX86Ops::SubX86RegToX86Reg(x86Reg Destination, x86Reg Source) { case x86_ESP: x86Command += 0xE000; break; case x86_EBP: x86Command += 0xE800; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST16(m_RecompPos,x86Command); } @@ -2798,7 +2801,7 @@ void CX86Ops::TestConstToX86Reg(DWORD Const, x86Reg reg) { case x86_ESP: PUTDST16(m_RecompPos,0xC4F7); break; case x86_EBP: PUTDST16(m_RecompPos,0xC5F7); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST32(m_RecompPos,Const); } @@ -2823,7 +2826,7 @@ void CX86Ops::TestX86RegToX86Reg(x86Reg Destination, x86Reg Source) { case x86_ESP: x86Command = 0x0485; break; case x86_EBP: x86Command = 0x0585; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (Destination) { case x86_EAX: x86Command += 0xC000; break; @@ -2835,7 +2838,7 @@ void CX86Ops::TestX86RegToX86Reg(x86Reg Destination, x86Reg Source) { case x86_ESP: x86Command += 0xE000; break; case x86_EBP: x86Command += 0xE800; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST16(m_RecompPos,x86Command); } @@ -2853,7 +2856,7 @@ void CX86Ops::XorConstToX86Reg(x86Reg reg, DWORD Const) { case x86_ESP: PUTDST16(m_RecompPos,0xF481); break; case x86_EBP: PUTDST16(m_RecompPos,0xF581); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST32(m_RecompPos, Const); } else { @@ -2867,7 +2870,7 @@ void CX86Ops::XorConstToX86Reg(x86Reg reg, DWORD Const) { case x86_ESP: PUTDST16(m_RecompPos,0xF483); break; case x86_EBP: PUTDST16(m_RecompPos,0xF583); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST8(m_RecompPos, Const); } @@ -2888,7 +2891,7 @@ void CX86Ops::XorX86RegToX86Reg(x86Reg Source, x86Reg Destination) { case x86_ESP: x86Command = 0x0431; break; case x86_EBP: x86Command = 0x0531; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } switch (Destination) { case x86_EAX: x86Command += 0xC000; break; @@ -2900,7 +2903,7 @@ void CX86Ops::XorX86RegToX86Reg(x86Reg Source, x86Reg Destination) { case x86_ESP: x86Command += 0xE000; break; case x86_EBP: x86Command += 0xE800; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST16(m_RecompPos,x86Command); } @@ -2917,7 +2920,7 @@ void CX86Ops::XorVariableToX86reg(void *Variable, const char * VariableName, x86 case x86_ESP: PUTDST16(m_RecompPos,0x2533); break; case x86_EBP: PUTDST16(m_RecompPos,0x2D33); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST32(m_RecompPos,Variable); } @@ -2943,7 +2946,7 @@ void CX86Ops::fpuAddDwordRegPointer(x86Reg x86Pointer) { case x86_ESI: PUTDST16(m_RecompPos,0x06D8); break; case x86_EDI: PUTDST16(m_RecompPos,0x07D8); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); break; } } @@ -2964,7 +2967,7 @@ void CX86Ops::fpuAddQwordRegPointer(x86Reg x86Pointer) { case x86_ESI: PUTDST16(m_RecompPos,0x06DC); break; case x86_EDI: PUTDST16(m_RecompPos,0x07DC); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); break; } } @@ -2981,7 +2984,7 @@ void CX86Ops::fpuAddReg(x86FpuValues x86reg) { case x86_ST6: PUTDST16(m_RecompPos,0xC6D8); break; case x86_ST7: PUTDST16(m_RecompPos,0xC7D8); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); break; } } @@ -2999,7 +3002,7 @@ void CX86Ops::fpuAddRegPop(int * StackPos, x86FpuValues reg) { case x86_ST6: PUTDST16(m_RecompPos,0xC6DE); break; case x86_ST7: PUTDST16(m_RecompPos,0xC7DE); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); break; } } @@ -3022,7 +3025,7 @@ void CX86Ops::fpuComDwordRegPointer(x86Reg x86Pointer, BOOL Pop) { case x86_ESI: x86Command = 0x16D8; break; case x86_EDI: x86Command = 0x17D8; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } if (Pop) { x86Command |= 0x0800; } PUTDST16(m_RecompPos,x86Command); @@ -3046,7 +3049,7 @@ void CX86Ops::fpuComQwordRegPointer(x86Reg x86Pointer, BOOL Pop) { case x86_ESI: x86Command = 0x16DC; break; case x86_EDI: x86Command = 0x17DC; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } if (Pop) { x86Command |= 0x0800; } PUTDST16(m_RecompPos,x86Command); @@ -3066,7 +3069,7 @@ void CX86Ops::fpuComReg(x86FpuValues x86reg, BOOL Pop) { case x86_ST6: PUTDST16(m_RecompPos,0xD6D8|s); break; case x86_ST7: PUTDST16(m_RecompPos,0xD7D8|s); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); break; } } @@ -3087,7 +3090,7 @@ void CX86Ops::fpuDivDwordRegPointer(x86Reg x86Pointer) { case x86_ESI: PUTDST16(m_RecompPos,0x36D8); break; case x86_EDI: PUTDST16(m_RecompPos,0x37D8); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); break; } } @@ -3108,7 +3111,7 @@ void CX86Ops::fpuDivQwordRegPointer(x86Reg x86Pointer) { case x86_ESI: PUTDST16(m_RecompPos,0x36DC); break; case x86_EDI: PUTDST16(m_RecompPos,0x37DC); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); break; } } @@ -3125,7 +3128,7 @@ void CX86Ops::fpuDivReg(x86FpuValues Reg) { case x86_ST6: PUTDST16(m_RecompPos,0xF6D8); break; case x86_ST7: PUTDST16(m_RecompPos,0xF7D8); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); break; } } @@ -3142,7 +3145,7 @@ void CX86Ops::fpuDivRegPop(x86FpuValues reg) { case x86_ST6: PUTDST16(m_RecompPos,0xFEDE); break; case x86_ST7: PUTDST16(m_RecompPos,0xFFDE); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); break; } } @@ -3159,7 +3162,7 @@ void CX86Ops::fpuExchange(x86FpuValues Reg) { case x86_ST6: PUTDST16(m_RecompPos,0xCED9); break; case x86_ST7: PUTDST16(m_RecompPos,0xCFD9); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); break; } } @@ -3176,7 +3179,7 @@ void CX86Ops::fpuFree(x86FpuValues Reg) { case x86_ST6: PUTDST16(m_RecompPos,0xC6DD); break; case x86_ST7: PUTDST16(m_RecompPos,0xC7DD); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); break; } } @@ -3218,7 +3221,7 @@ void CX86Ops::fpuLoadDwordFromX86Reg(int * StackPos, x86Reg x86reg) { case x86_ESI: PUTDST8(m_RecompPos,0x06); break; case x86_EDI: PUTDST8(m_RecompPos,0x07); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } } @@ -3234,7 +3237,7 @@ void CX86Ops::fpuLoadDwordFromN64Mem(int * StackPos,x86Reg x86reg) { case x86_EDI: PUTDST16(m_RecompPos,0x87D9); break; case x86_EBP: PUTDST16(m_RecompPos,0x85D9); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST32(m_RecompPos,g_MMU->Rdram()); } @@ -3251,7 +3254,7 @@ void CX86Ops::fpuLoadInt32bFromN64Mem(int * StackPos,x86Reg x86reg) { case x86_EDI: PUTDST16(m_RecompPos,0x87DB); break; case x86_EBP: PUTDST16(m_RecompPos,0x85DB); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST32(m_RecompPos,g_MMU->Rdram()); } @@ -3275,7 +3278,7 @@ void CX86Ops::fpuLoadIntegerDwordFromX86Reg(int * StackPos,x86Reg x86reg) { case x86_ESI: PUTDST8(m_RecompPos,0x06); break; case x86_EDI: PUTDST8(m_RecompPos,0x07); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } } @@ -3298,7 +3301,7 @@ void CX86Ops::fpuLoadIntegerQwordFromX86Reg(int * StackPos,x86Reg x86reg) { case x86_ESI: PUTDST8(m_RecompPos,0x2E); break; case x86_EDI: PUTDST8(m_RecompPos,0x2F); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } } @@ -3321,7 +3324,7 @@ void CX86Ops::fpuLoadQwordFromX86Reg(int * StackPos, x86Reg x86reg) { case x86_ESI: PUTDST8(m_RecompPos,0x06); break; case x86_EDI: PUTDST8(m_RecompPos,0x07); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } } @@ -3337,7 +3340,7 @@ void CX86Ops::fpuLoadQwordFromN64Mem(int * StackPos,x86Reg x86reg) { case x86_EDI: PUTDST16(m_RecompPos,0x87DD); break; case x86_EBP: PUTDST16(m_RecompPos,0x85DD); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST32(m_RecompPos,g_MMU->Rdram()); } @@ -3355,7 +3358,7 @@ void CX86Ops::fpuLoadReg(int * StackPos,x86FpuValues Reg) { case x86_ST6: PUTDST16(m_RecompPos,0xC6D9); break; case x86_ST7: PUTDST16(m_RecompPos,0xC7D9); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); break; } } @@ -3376,7 +3379,7 @@ void CX86Ops::fpuMulDwordRegPointer(x86Reg x86Pointer) { case x86_ESI: PUTDST16(m_RecompPos,0x0ED8); break; case x86_EDI: PUTDST16(m_RecompPos,0x0FD8); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); break; } } @@ -3397,7 +3400,7 @@ void CX86Ops::fpuMulQwordRegPointer(x86Reg x86Pointer) { case x86_ESI: PUTDST16(m_RecompPos,0x0EDC); break; case x86_EDI: PUTDST16(m_RecompPos,0x0FDC); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); break; } } @@ -3414,7 +3417,7 @@ void CX86Ops::fpuMulReg(x86FpuValues x86reg) { case x86_ST6: PUTDST16(m_RecompPos,0xCED8); break; case x86_ST7: PUTDST16(m_RecompPos,0xCFD8); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); break; } } @@ -3431,7 +3434,7 @@ void CX86Ops::fpuMulRegPop(x86FpuValues x86reg) { case x86_ST6: PUTDST16(m_RecompPos,0xCEDE); break; case x86_ST7: PUTDST16(m_RecompPos,0xCFDE); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); break; } } @@ -3479,7 +3482,7 @@ void CX86Ops::fpuStoreDwordFromX86Reg(int * StackPos,x86Reg x86reg, BOOL pop) { case x86_ESI: Command = 0x16; break; case x86_EDI: Command = 0x17; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST8(m_RecompPos, (pop == FALSE) ? Command : (Command + 0x8)); } @@ -3499,7 +3502,7 @@ void CX86Ops::fpuStoreDwordToN64Mem(int * StackPos,x86Reg x86reg, BOOL Pop) { case x86_EDI: PUTDST16(m_RecompPos,0x97D9|s); break; case x86_EBP: PUTDST16(m_RecompPos,0x95D9|s); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST32(m_RecompPos,g_MMU->Rdram()); } @@ -3526,7 +3529,7 @@ void CX86Ops::fpuStoreIntegerDwordFromX86Reg(int * StackPos,x86Reg x86reg, BOOL case x86_ESI: Command = 0x16; break; case x86_EDI: Command = 0x17; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST8(m_RecompPos, (pop == FALSE) ? Command : (Command + 0x8)); } @@ -3536,7 +3539,7 @@ void CX86Ops::fpuStoreIntegerQword(int * StackPos,void *Variable, const char * V if (pop) { *StackPos = (*StackPos + 1) & 7; } PUTDST16(m_RecompPos, (pop == FALSE) ? 0x35DF : 0x3DDF); PUTDST32(m_RecompPos,Variable); - if (!pop) { X86BreakPoint(__FILE__,__LINE__); } + if (!pop) { X86BreakPoint(__FILEW__,__LINE__); } } void CX86Ops::fpuStoreIntegerQwordFromX86Reg(int * StackPos, x86Reg x86reg, BOOL pop) { @@ -3554,7 +3557,7 @@ void CX86Ops::fpuStoreIntegerQwordFromX86Reg(int * StackPos, x86Reg x86reg, BOOL case x86_ESI: Command = 0x36; break; case x86_EDI: Command = 0x37; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST8(m_RecompPos, (pop == FALSE) ? Command : (Command + 0x8)); } @@ -3574,7 +3577,7 @@ void CX86Ops::fpuStoreQwordFromX86Reg(int * StackPos, x86Reg x86reg, BOOL pop) { case x86_ESI: Command = 0x16; break; case x86_EDI: Command = 0x17; break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } PUTDST8(m_RecompPos, (pop == FALSE) ? Command : (Command + 0x8)); } @@ -3600,7 +3603,7 @@ void CX86Ops::fpuSubDwordRegPointer(x86Reg x86Pointer) { case x86_ESI: PUTDST16(m_RecompPos,0x26D8); break; case x86_EDI: PUTDST16(m_RecompPos,0x27D8); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); break; } } @@ -3627,7 +3630,7 @@ void CX86Ops::fpuSubQwordRegPointer(x86Reg x86Pointer) { case x86_ESI: PUTDST16(m_RecompPos,0x26DC); break; case x86_EDI: PUTDST16(m_RecompPos,0x27DC); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); break; } } @@ -3650,7 +3653,7 @@ void CX86Ops::fpuSubReg(x86FpuValues x86reg) { case x86_ST6: PUTDST16(m_RecompPos,0xE6D8); break; case x86_ST7: PUTDST16(m_RecompPos,0xE7D8); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); break; } } @@ -3667,7 +3670,7 @@ void CX86Ops::fpuSubRegPop(x86FpuValues x86reg) { case x86_ST6: PUTDST16(m_RecompPos,0xEEDE); break; case x86_ST7: PUTDST16(m_RecompPos,0xEFDE); break; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); break; } } @@ -3683,7 +3686,7 @@ const char * CX86Ops::x86_Name ( x86Reg Reg ) { case x86_EBP: return "ebp"; case x86_ESP: return "esp"; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } return "???"; } @@ -3699,7 +3702,7 @@ const char * CX86Ops::x86_ByteName ( x86Reg Reg ) { case x86_CH: return "ch"; case x86_DH: return "dh"; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } return "???"; } @@ -3715,7 +3718,7 @@ const char * CX86Ops::x86_HalfName ( x86Reg Reg ) { case x86_EBP: return "bp"; case x86_ESP: return "sp"; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } return "???"; } @@ -3731,7 +3734,7 @@ const char * CX86Ops::fpu_Name ( x86FpuValues Reg ) { case x86_ST6: return "ST(6)"; case x86_ST7: return "ST(7)"; default: - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } return "???"; } @@ -3764,13 +3767,13 @@ void CX86Ops::SetJump8(BYTE * Loc, BYTE * JumpLoc) { if (Loc == NULL || JumpLoc == NULL) { - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); return; } DWORD diffrence = (DWORD)(((DWORD)JumpLoc) - (((DWORD)(Loc)) + 1)); if (diffrence > 255) { - g_Notify->BreakPoint(__FILE__,__LINE__); + g_Notify->BreakPoint(__FILEW__,__LINE__); } *Loc = (BYTE )diffrence; } diff --git a/Source/Project64/N64 System/Recompiler/X86ops.h b/Source/Project64/N64 System/Recompiler/X86ops.h index ed73f1683..ced3ff94a 100644 --- a/Source/Project64/N64 System/Recompiler/X86ops.h +++ b/Source/Project64/N64 System/Recompiler/X86ops.h @@ -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]; }; diff --git a/Source/Project64/Plugins/Controller Plugin.cpp b/Source/Project64/Plugins/Controller Plugin.cpp index 6db425018..2907b602c 100644 --- a/Source/Project64/Plugins/Controller Plugin.cpp +++ b/Source/Project64/Plugins/Controller Plugin.cpp @@ -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); } diff --git a/Source/Project64/Settings/SettingType/SettingsType-Application.cpp b/Source/Project64/Settings/SettingType/SettingsType-Application.cpp index a51e51875..f41bfc841 100644 --- a/Source/Project64/Settings/SettingType/SettingsType-Application.cpp +++ b/Source/Project64/Settings/SettingType/SettingsType-Application.cpp @@ -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__); } } diff --git a/Source/Project64/Settings/SettingType/SettingsType-Cheats.cpp b/Source/Project64/Settings/SettingType/SettingsType-Cheats.cpp index 1f282ce73..3f05d41cc 100644 --- a/Source/Project64/Settings/SettingType/SettingsType-Cheats.cpp +++ b/Source/Project64/Settings/SettingType/SettingsType-Cheats.cpp @@ -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 ) diff --git a/Source/Project64/Settings/SettingType/SettingsType-GameSettingIndex.cpp b/Source/Project64/Settings/SettingType/SettingsType-GameSettingIndex.cpp index 6d5a96ba6..787b90a49 100644 --- a/Source/Project64/Settings/SettingType/SettingsType-GameSettingIndex.cpp +++ b/Source/Project64/Settings/SettingType/SettingsType-GameSettingIndex.cpp @@ -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 ) diff --git a/Source/Project64/Settings/SettingType/SettingsType-RDBCpuType.cpp b/Source/Project64/Settings/SettingType/SettingsType-RDBCpuType.cpp index 0ed216a03..80e7f5e9e 100644 --- a/Source/Project64/Settings/SettingType/SettingsType-RDBCpuType.cpp +++ b/Source/Project64/Settings/SettingType/SettingsType-RDBCpuType.cpp @@ -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*/ ) diff --git a/Source/Project64/Settings/SettingType/SettingsType-RDBOnOff.cpp b/Source/Project64/Settings/SettingType/SettingsType-RDBOnOff.cpp index d33b714a7..b8bd5b687 100644 --- a/Source/Project64/Settings/SettingType/SettingsType-RDBOnOff.cpp +++ b/Source/Project64/Settings/SettingType/SettingsType-RDBOnOff.cpp @@ -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*/ ) diff --git a/Source/Project64/Settings/SettingType/SettingsType-RDBRamSize.cpp b/Source/Project64/Settings/SettingType/SettingsType-RDBRamSize.cpp index 00f3e7e19..8fd1c0b42 100644 --- a/Source/Project64/Settings/SettingType/SettingsType-RDBRamSize.cpp +++ b/Source/Project64/Settings/SettingType/SettingsType-RDBRamSize.cpp @@ -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*/ ) diff --git a/Source/Project64/Settings/SettingType/SettingsType-RDBSaveChip.cpp b/Source/Project64/Settings/SettingType/SettingsType-RDBSaveChip.cpp index 0a28e9b97..590869192 100644 --- a/Source/Project64/Settings/SettingType/SettingsType-RDBSaveChip.cpp +++ b/Source/Project64/Settings/SettingType/SettingsType-RDBSaveChip.cpp @@ -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*/ ) diff --git a/Source/Project64/Settings/SettingType/SettingsType-RDBYesNo.cpp b/Source/Project64/Settings/SettingType/SettingsType-RDBYesNo.cpp index eedabed04..f8f81d2d1 100644 --- a/Source/Project64/Settings/SettingType/SettingsType-RDBYesNo.cpp +++ b/Source/Project64/Settings/SettingType/SettingsType-RDBYesNo.cpp @@ -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*/ ) diff --git a/Source/Project64/Settings/SettingType/SettingsType-RelativePath.cpp b/Source/Project64/Settings/SettingType/SettingsType-RelativePath.cpp index 1eafaf028..0ce607ba3 100644 --- a/Source/Project64/Settings/SettingType/SettingsType-RelativePath.cpp +++ b/Source/Project64/Settings/SettingType/SettingsType-RelativePath.cpp @@ -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__); } diff --git a/Source/Project64/Settings/SettingType/SettingsType-RomDatabase.cpp b/Source/Project64/Settings/SettingType/SettingsType-RomDatabase.cpp index 2a0fa4a68..184bab4b7 100644 --- a/Source/Project64/Settings/SettingType/SettingsType-RomDatabase.cpp +++ b/Source/Project64/Settings/SettingType/SettingsType-RomDatabase.cpp @@ -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) { diff --git a/Source/Project64/Settings/SettingType/SettingsType-RomDatabaseIndex.cpp b/Source/Project64/Settings/SettingType/SettingsType-RomDatabaseIndex.cpp index 9b5ff31b9..9ad30a40b 100644 --- a/Source/Project64/Settings/SettingType/SettingsType-RomDatabaseIndex.cpp +++ b/Source/Project64/Settings/SettingType/SettingsType-RomDatabaseIndex.cpp @@ -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*/ ) diff --git a/Source/Project64/Settings/SettingType/SettingsType-SelectedDirectory.cpp b/Source/Project64/Settings/SettingType/SettingsType-SelectedDirectory.cpp index 28ecd3098..d08bc1ca0 100644 --- a/Source/Project64/Settings/SettingType/SettingsType-SelectedDirectory.cpp +++ b/Source/Project64/Settings/SettingType/SettingsType-SelectedDirectory.cpp @@ -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__); } diff --git a/Source/Project64/Settings/SettingType/SettingsType-TempBool.cpp b/Source/Project64/Settings/SettingType/SettingsType-TempBool.cpp index 9fbeee682..46ee982dc 100644 --- a/Source/Project64/Settings/SettingType/SettingsType-TempBool.cpp +++ b/Source/Project64/Settings/SettingType/SettingsType-TempBool.cpp @@ -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__); } diff --git a/Source/Project64/Settings/SettingType/SettingsType-TempNumber.cpp b/Source/Project64/Settings/SettingType/SettingsType-TempNumber.cpp index 3f82c429d..77a1a43af 100644 --- a/Source/Project64/Settings/SettingType/SettingsType-TempNumber.cpp +++ b/Source/Project64/Settings/SettingType/SettingsType-TempNumber.cpp @@ -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__); } diff --git a/Source/Project64/Settings/SettingType/SettingsType-TempString.cpp b/Source/Project64/Settings/SettingType/SettingsType-TempString.cpp index 6e69df2ac..0e93bf547 100644 --- a/Source/Project64/Settings/SettingType/SettingsType-TempString.cpp +++ b/Source/Project64/Settings/SettingType/SettingsType-TempString.cpp @@ -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__); } diff --git a/Source/Project64/Settings/Settings Class.cpp b/Source/Project64/Settings/Settings Class.cpp index e291a3cf9..2459132bb 100644 --- a/Source/Project64/Settings/Settings Class.cpp +++ b/Source/Project64/Settings/Settings Class.cpp @@ -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__); } } diff --git a/Source/Project64/User Interface/Gui Class.cpp b/Source/Project64/User Interface/Gui Class.cpp index df07c6d50..4fabe21e8 100644 --- a/Source/Project64/User Interface/Gui Class.cpp +++ b/Source/Project64/User Interface/Gui Class.cpp @@ -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; diff --git a/Source/Project64/User Interface/Main Menu Class.cpp b/Source/Project64/User Interface/Main Menu Class.cpp index 7be707aec..04adca6b0 100644 --- a/Source/Project64/User Interface/Main Menu Class.cpp +++ b/Source/Project64/User Interface/Main Menu Class.cpp @@ -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 ""; } diff --git a/Source/Project64/User Interface/Notification Class.cpp b/Source/Project64/User Interface/Notification Class.cpp index 119842a4e..ba41100ce 100644 --- a/Source/Project64/User Interface/Notification Class.cpp +++ b/Source/Project64/User Interface/Notification Class.cpp @@ -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(); diff --git a/Source/Project64/User Interface/Notification Class.h b/Source/Project64/User Interface/Notification Class.h index 8531a8f03..8a7a2faf0 100644 --- a/Source/Project64/User Interface/Notification Class.h +++ b/Source/Project64/User Interface/Notification Class.h @@ -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 );