From 17b24f299f1cfea4668d50714b61bdfac047b848 Mon Sep 17 00:00:00 2001 From: zilmar Date: Wed, 9 Dec 2015 22:37:58 +1100 Subject: [PATCH] [Project64] Get Breakpoint to use char * instead of wchar_t * for filename --- .../Multilanguage/LanguageClass.cpp | 2 +- .../N64System/Interpreter/InterpreterCPU.cpp | 6 +- .../N64System/Interpreter/InterpreterOps.cpp | 44 +- .../Interpreter/InterpreterOps32.cpp | 2 +- .../Project64-core/N64System/Mips/Audio.cpp | 4 +- Source/Project64-core/N64System/Mips/Dma.cpp | 12 +- .../N64System/Mips/MemoryVirtualMem.cpp | 94 ++--- .../N64System/Mips/SystemEvents.cpp | 2 +- .../N64System/Mips/SystemTiming.cpp | 14 +- Source/Project64-core/N64System/N64Class.cpp | 10 +- .../N64System/ProfilingClass.cpp | 4 +- .../N64System/Recompiler/CodeBlock.cpp | 50 +-- .../N64System/Recompiler/CodeSection.cpp | 74 ++-- .../N64System/Recompiler/LoopAnalysis.cpp | 92 ++--- .../N64System/Recompiler/RecompilerClass.cpp | 24 +- .../N64System/Recompiler/RecompilerOps.cpp | 24 +- .../N64System/Recompiler/RegInfo.cpp | 18 +- .../N64System/Recompiler/SectionInfo.cpp | 8 +- .../N64System/Recompiler/X86ops.cpp | 375 +++++++++--------- .../N64System/Recompiler/X86ops.h | 4 +- Source/Project64-core/Notification.h | 2 +- .../Plugins/ControllerPlugin.cpp | 12 +- .../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 +- .../Project64-core/Settings/SettingsClass.cpp | 78 ++-- .../Debugger/Debugger-MemoryDump.cpp | 2 +- .../Debugger/Debugger-MemorySearch.cpp | 16 +- .../Project64/UserInterface/CheatClassUI.cpp | 4 +- Source/Project64/UserInterface/GuiClass.cpp | 4 +- .../UserInterface/NotificationClass.cpp | 8 +- .../UserInterface/NotificationClass.h | 2 +- 44 files changed, 601 insertions(+), 604 deletions(-) diff --git a/Source/Project64-core/Multilanguage/LanguageClass.cpp b/Source/Project64-core/Multilanguage/LanguageClass.cpp index ea65fd394..61a3dba95 100644 --- a/Source/Project64-core/Multilanguage/LanguageClass.cpp +++ b/Source/Project64-core/Multilanguage/LanguageClass.cpp @@ -601,7 +601,7 @@ const std::wstring & CLanguage::GetString(LanguageStringID StringID) return DefString->second; } #ifdef _DEBUG - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); #endif return m_emptyString; } diff --git a/Source/Project64-core/N64System/Interpreter/InterpreterCPU.cpp b/Source/Project64-core/N64System/Interpreter/InterpreterCPU.cpp index f5750b9d1..3957d3420 100644 --- a/Source/Project64-core/N64System/Interpreter/InterpreterCPU.cpp +++ b/Source/Project64-core/N64System/Interpreter/InterpreterCPU.cpp @@ -23,7 +23,7 @@ R4300iOp::Func * CInterpreterCPU::m_R4300i_Opcode = NULL; void ExecuteInterpreterOps(uint32_t /*Cycles*/) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } bool DelaySlotEffectsCompare(uint32_t PC, uint32_t Reg1, uint32_t Reg2) @@ -344,7 +344,7 @@ void CInterpreterCPU::ExecuteCPU() } break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } } @@ -447,7 +447,7 @@ void CInterpreterCPU::ExecuteOps(int32_t Cycles) } break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } else diff --git a/Source/Project64-core/N64System/Interpreter/InterpreterOps.cpp b/Source/Project64-core/N64System/Interpreter/InterpreterOps.cpp index ef1c82f89..ef6c1c833 100644 --- a/Source/Project64-core/N64System/Interpreter/InterpreterOps.cpp +++ b/Source/Project64-core/N64System/Interpreter/InterpreterOps.cpp @@ -1018,7 +1018,7 @@ void R4300iOp::LDL() if (!g_MMU->LD_VAddr((Address & ~7), Value)) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); if (bShowTLBMisses()) { g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str()); @@ -1045,7 +1045,7 @@ void R4300iOp::LDR() if (!g_MMU->LD_VAddr((Address & ~7), Value)) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); if (bShowTLBMisses()) { g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str()); @@ -1104,7 +1104,7 @@ void R4300iOp::LWL() if (!g_MMU->LW_VAddr((Address & ~3), Value)) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); if (bShowTLBMisses()) { g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str()); @@ -1190,7 +1190,7 @@ void R4300iOp::LWR() if (!g_MMU->LW_VAddr((Address & ~3), Value)) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); if (bShowTLBMisses()) { g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str()); @@ -1231,7 +1231,7 @@ void R4300iOp::SB() { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (bShowTLBMisses()) { @@ -1251,7 +1251,7 @@ void R4300iOp::SH() { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (bShowTLBMisses()) { @@ -1271,7 +1271,7 @@ void R4300iOp::SWL() { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (bShowTLBMisses()) { @@ -1287,7 +1287,7 @@ void R4300iOp::SWL() { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (bShowTLBMisses()) { @@ -1311,7 +1311,7 @@ void R4300iOp::SW() { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (bShowTLBMisses()) { @@ -1342,7 +1342,7 @@ void R4300iOp::SDL() { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (bShowTLBMisses()) { @@ -1358,7 +1358,7 @@ void R4300iOp::SDL() { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (bShowTLBMisses()) { @@ -1390,7 +1390,7 @@ void R4300iOp::SDR() { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (bShowTLBMisses()) { @@ -1406,7 +1406,7 @@ void R4300iOp::SDR() { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (bShowTLBMisses()) { @@ -1426,7 +1426,7 @@ void R4300iOp::SWR() { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (bShowTLBMisses()) { @@ -1442,7 +1442,7 @@ void R4300iOp::SWR() { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (bShowTLBMisses()) { @@ -1513,7 +1513,7 @@ void R4300iOp::SC() { if (!g_MMU->SW_VAddr(Address, _GPR[m_Opcode.rt].UW[0])) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); if (bShowTLBMisses()) { g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str()); @@ -1534,7 +1534,7 @@ void R4300iOp::LD() { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (bShowTLBMisses()) { @@ -1563,7 +1563,7 @@ void R4300iOp::LDC1() { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (bShowTLBMisses()) { @@ -1585,7 +1585,7 @@ void R4300iOp::SWC1() { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (bShowTLBMisses()) { @@ -1607,7 +1607,7 @@ void R4300iOp::SDC1() { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (bShowTLBMisses()) { @@ -1627,7 +1627,7 @@ void R4300iOp::SD() { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (bShowTLBMisses()) { @@ -2835,7 +2835,7 @@ void R4300iOp::UnknownOpcode() R4300iOpcodeName(m_Opcode.Hex, (*_PROGRAM_COUNTER))).ToUTF16().c_str()); g_System->m_EndEmulation = true; - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); #ifdef tofix if (HaveDebugger && !inFullScreen) { diff --git a/Source/Project64-core/N64System/Interpreter/InterpreterOps32.cpp b/Source/Project64-core/N64System/Interpreter/InterpreterOps32.cpp index 39d744105..15fe9f463 100644 --- a/Source/Project64-core/N64System/Interpreter/InterpreterOps32.cpp +++ b/Source/Project64-core/N64System/Interpreter/InterpreterOps32.cpp @@ -1021,7 +1021,7 @@ void R4300iOp32::LWR() if (!g_MMU->LW_VAddr((Address & ~3), Value)) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); if (bShowTLBMisses()) { g_Notify->DisplayError(stdstr_f(__FUNCTION__ " TLB: %X", Address).ToUTF16().c_str()); diff --git a/Source/Project64-core/N64System/Mips/Audio.cpp b/Source/Project64-core/N64System/Mips/Audio.cpp index 216d1a8a5..57260785c 100644 --- a/Source/Project64-core/N64System/Mips/Audio.cpp +++ b/Source/Project64-core/N64System/Mips/Audio.cpp @@ -79,7 +79,7 @@ void CAudio::LenChanged() } else { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } } @@ -124,7 +124,7 @@ void CAudio::InterruptTimerDone() void CAudio::BusyTimerDone() { WriteTraceF(TraceAudio, __FUNCTION__ ": Start (m_SecondBuff = %d)", m_SecondBuff); - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); m_Status &= ~ai_busy; } diff --git a/Source/Project64-core/N64System/Mips/Dma.cpp b/Source/Project64-core/N64System/Mips/Dma.cpp index e27d94454..f8619979d 100644 --- a/Source/Project64-core/N64System/Mips/Dma.cpp +++ b/Source/Project64-core/N64System/Mips/Dma.cpp @@ -319,15 +319,15 @@ void CDMA::SP_DMA_READ() if ((g_Reg->SP_MEM_ADDR_REG & 3) != 0) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if ((g_Reg->SP_DRAM_ADDR_REG & 3) != 0) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (((g_Reg->SP_RD_LEN_REG + 1) & 3) != 0) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } memcpy(g_MMU->Dmem() + (g_Reg->SP_MEM_ADDR_REG & 0x1FFF), g_MMU->Rdram() + g_Reg->SP_DRAM_ADDR_REG, @@ -359,16 +359,16 @@ void CDMA::SP_DMA_WRITE() if ((g_Reg->SP_MEM_ADDR_REG & 3) != 0) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if ((g_Reg->SP_DRAM_ADDR_REG & 3) != 0) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (((g_Reg->SP_WR_LEN_REG + 1) & 3) != 0) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } memcpy(g_MMU->Rdram() + g_Reg->SP_DRAM_ADDR_REG, g_MMU->Dmem() + (g_Reg->SP_MEM_ADDR_REG & 0x1FFF), diff --git a/Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp b/Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp index 4c56381c2..f02cd5ab6 100644 --- a/Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp +++ b/Source/Project64-core/N64System/Mips/MemoryVirtualMem.cpp @@ -328,7 +328,7 @@ bool CMipsMemoryVM::LW_VAddr(uint32_t VAddr, uint32_t& Value) // if (LookUpMode == FuncFind_ChangeMemory) // { - // g_Notify->BreakPoint(__FILEW__,__LINE__); + // g_Notify->BreakPoint(__FILE__, __LINE__); // if ( (Command.Hex >> 16) == 0x7C7C) // { // Command.Hex = OrigMem[(Command.Hex & 0xFFFF)].OriginalValue; @@ -362,7 +362,7 @@ bool CMipsMemoryVM::LB_PAddr(uint32_t PAddr, uint8_t& Value) return false; } - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } @@ -379,7 +379,7 @@ bool CMipsMemoryVM::LH_PAddr(uint32_t PAddr, uint16_t& Value) return false; } - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } @@ -396,7 +396,7 @@ bool CMipsMemoryVM::LW_PAddr(uint32_t PAddr, uint32_t& Value) return false; } - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } @@ -414,7 +414,7 @@ bool CMipsMemoryVM::LD_PAddr(uint32_t PAddr, uint64_t& Value) return false; } - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } @@ -486,7 +486,7 @@ bool CMipsMemoryVM::SB_PAddr(uint32_t PAddr, uint8_t Value) return false; } - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } @@ -503,7 +503,7 @@ bool CMipsMemoryVM::SH_PAddr(uint32_t PAddr, uint16_t Value) return false; } - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } @@ -520,7 +520,7 @@ bool CMipsMemoryVM::SW_PAddr(uint32_t PAddr, uint32_t Value) return false; } - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } @@ -538,7 +538,7 @@ bool CMipsMemoryVM::SD_PAddr(uint32_t PAddr, uint64_t Value) return false; } - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } @@ -577,7 +577,7 @@ void CMipsMemoryVM::Compile_LB(x86Reg Reg, uint32_t VAddr, bool SignExtend) { if (!g_System->bUseTlb()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return; } @@ -648,7 +648,7 @@ void CMipsMemoryVM::Compile_LH(x86Reg Reg, uint32_t VAddr, bool SignExtend) { if (!g_System->bUseTlb()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return; } @@ -720,7 +720,7 @@ void CMipsMemoryVM::Compile_LW(x86Reg Reg, uint32_t VAddr) { if (!g_System->bUseTlb()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return; } @@ -735,7 +735,7 @@ void CMipsMemoryVM::Compile_LW(x86Reg Reg, uint32_t VAddr) { if (!TranslateVaddr(VAddr, PAddr)) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (PAddr & 0xFFF00000) @@ -1452,7 +1452,7 @@ void CMipsMemoryVM::Compile_SW_Const(uint32_t Value, uint32_t VAddr) BeforeCallDirect(m_RegWorkingSet); if (g_System->bFixedAudio()) { - X86BreakPoint(__FILEW__, __LINE__); + X86BreakPoint(__FILE__, __LINE__); MoveConstToX86reg((uint32_t)g_Audio, x86_ECX); Call_Direct(AddressOf(&CAudio::LenChanged), "LenChanged"); } @@ -2018,7 +2018,7 @@ int32_t CMipsMemoryVM::MemoryFilter(uint32_t dwExptCode, void * lpExceptionPoint { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } return EXCEPTION_EXECUTE_HANDLER; } @@ -2031,7 +2031,7 @@ int32_t CMipsMemoryVM::MemoryFilter(uint32_t dwExptCode, void * lpExceptionPoint { // if (bHaveDebugger()) // { - // g_Notify->BreakPoint(__FILEW__,__LINE__); + // g_Notify->BreakPoint(__FILE__, __LINE__); // } return EXCEPTION_EXECUTE_HANDLER; } @@ -2048,7 +2048,7 @@ int32_t CMipsMemoryVM::MemoryFilter(uint32_t dwExptCode, void * lpExceptionPoint { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } return EXCEPTION_EXECUTE_HANDLER; } @@ -2082,7 +2082,7 @@ int32_t CMipsMemoryVM::MemoryFilter(uint32_t dwExptCode, void * lpExceptionPoint } if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } return EXCEPTION_EXECUTE_HANDLER; } @@ -2143,7 +2143,7 @@ int32_t CMipsMemoryVM::MemoryFilter(uint32_t dwExptCode, void * lpExceptionPoint case 7: ReadPos += 1; break; case 0x80: ReadPos += 1; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } break; case 5: ReadPos += 5; break; @@ -2165,7 +2165,7 @@ int32_t CMipsMemoryVM::MemoryFilter(uint32_t dwExptCode, void * lpExceptionPoint default: if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } return EXCEPTION_EXECUTE_HANDLER; } @@ -2174,7 +2174,7 @@ int32_t CMipsMemoryVM::MemoryFilter(uint32_t dwExptCode, void * lpExceptionPoint { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } return EXCEPTION_EXECUTE_HANDLER; } @@ -2235,7 +2235,7 @@ int32_t CMipsMemoryVM::MemoryFilter(uint32_t dwExptCode, void * lpExceptionPoint default: if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } return EXCEPTION_EXECUTE_HANDLER; } @@ -2271,7 +2271,7 @@ int32_t CMipsMemoryVM::MemoryFilter(uint32_t dwExptCode, void * lpExceptionPoint { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } return EXCEPTION_EXECUTE_HANDLER; } @@ -2287,7 +2287,7 @@ int32_t CMipsMemoryVM::MemoryFilter(uint32_t dwExptCode, void * lpExceptionPoint default: if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } return EXCEPTION_EXECUTE_HANDLER; } @@ -2344,7 +2344,7 @@ int32_t CMipsMemoryVM::MemoryFilter(uint32_t dwExptCode, void * lpExceptionPoint { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } return EXCEPTION_EXECUTE_HANDLER; } @@ -2363,7 +2363,7 @@ int32_t CMipsMemoryVM::MemoryFilter(uint32_t dwExptCode, void * lpExceptionPoint { if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } return EXCEPTION_EXECUTE_HANDLER; } @@ -2380,10 +2380,10 @@ int32_t CMipsMemoryVM::MemoryFilter(uint32_t dwExptCode, void * lpExceptionPoint } if (bHaveDebugger()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } #else - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); #endif return EXCEPTION_EXECUTE_HANDLER; } @@ -2398,7 +2398,7 @@ bool CMipsMemoryVM::LB_NonMemory(uint32_t PAddr, uint32_t* Value, bool /*SignExt if (PAddr >= 0x10000000 && PAddr < 0x16000000) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); #ifdef tofix if (WrittenToRom) { @@ -2450,7 +2450,7 @@ bool CMipsMemoryVM::LH_NonMemory(uint32_t PAddr, uint32_t* Value, bool/* SignExt if (PAddr >= 0x10000000 && PAddr < 0x16000000) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } // switch (PAddr & 0xFFF00000) // { @@ -2697,7 +2697,7 @@ bool CMipsMemoryVM::LW_NonMemory(uint32_t PAddr, uint32_t* Value) { /* *Value = *(uint32_t *)(&PifRom[PAddr - 0x1FC00000]); *Value = swap32by8(*Value); */ - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return true; } else if (PAddr < 0x1FC00800) @@ -3017,7 +3017,7 @@ bool CMipsMemoryVM::SW_NonMemory(uint32_t PAddr, uint32_t Value) } catch (...) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } //} break; @@ -3080,7 +3080,7 @@ bool CMipsMemoryVM::SW_NonMemory(uint32_t PAddr, uint32_t Value) } catch (...) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } } @@ -3465,18 +3465,18 @@ void CMipsMemoryVM::ProtectMemory(uint32_t StartVaddr, uint32_t EndVaddr) uint32_t StartPAddr, EndPAddr; if (!TranslateVaddr(StartVaddr, StartPAddr)) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (!TranslateVaddr(EndVaddr, EndPAddr)) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } //Get Length of memory being protected int32_t Length = ((EndPAddr + 3) - StartPAddr) & ~3; if (Length < 0) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } //Protect that memory address space @@ -3496,18 +3496,18 @@ void CMipsMemoryVM::UnProtectMemory(uint32_t StartVaddr, uint32_t EndVaddr) uint32_t StartPAddr, EndPAddr; if (!TranslateVaddr(StartVaddr, StartPAddr)) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (!TranslateVaddr(EndVaddr, EndPAddr)) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } //Get Length of memory being protected int32_t Length = ((EndPAddr + 3) - StartPAddr) & ~3; if (Length < 0) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } //Protect that memory address space @@ -3786,7 +3786,7 @@ void CMipsMemoryVM::Compile_LW(bool ResultSigned, bool bRecordLLBit) MoveVariableDispToX86Reg((void *)((uint32_t)(int16_t)Opcode.offset), String, GetMipsRegMapLo(Opcode.rt), TempReg1, 1); if (bRecordLLBit) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } else @@ -3798,7 +3798,7 @@ void CMipsMemoryVM::Compile_LW(bool ResultSigned, bool bRecordLLBit) Compile_LW(GetMipsRegMapLo(Opcode.rt), Address); if (bRecordLLBit) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } else @@ -4606,7 +4606,7 @@ void CMipsMemoryVM::Compile_SW(bool bCheckLLbit) { if (bCheckLLbit) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (IsMapped(Opcode.rt)) { @@ -4636,7 +4636,7 @@ void CMipsMemoryVM::Compile_SW(bool bCheckLLbit) if (bCheckLLbit) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (IsConst(Opcode.rt)) { @@ -4722,7 +4722,7 @@ void CMipsMemoryVM::Compile_SW(bool bCheckLLbit) { if (bCheckLLbit) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } AndConstToX86Reg(TempReg1, 0x1FFFFFFF); if (IsConst(Opcode.rt)) @@ -5033,7 +5033,7 @@ void CMipsMemoryVM::Compile_StoreInstructClean(x86Reg AddressReg, int32_t Length { return; } - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); /* stdstr_f strLen("%d",Length); @@ -5439,7 +5439,7 @@ void CMipsMemoryVM::RdramChanged(CMipsMemoryVM * _this) if (new_size > 0xFFFFFFFFul) { // should be unreachable because: size_t new_size = g_Settings->(uint32_t) - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } // ...However, FFFFFFFF also is a limit to RCP addressing, so we care. _this->m_AllocatedRdramSize = (uint32_t)new_size; } @@ -5566,7 +5566,7 @@ void CMipsMemoryVM::ChangeSpStatus() } catch (...) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } //} } diff --git a/Source/Project64-core/N64System/Mips/SystemEvents.cpp b/Source/Project64-core/N64System/Mips/SystemEvents.cpp index 308021e1e..eef98b815 100644 --- a/Source/Project64-core/N64System/Mips/SystemEvents.cpp +++ b/Source/Project64-core/N64System/Mips/SystemEvents.cpp @@ -209,7 +209,7 @@ void CSystemEvents::ExecuteEvents() } break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); break; } } diff --git a/Source/Project64-core/N64System/Mips/SystemTiming.cpp b/Source/Project64-core/N64System/Mips/SystemTiming.cpp index 5f733a6ce..eb9b8f56d 100644 --- a/Source/Project64-core/N64System/Mips/SystemTiming.cpp +++ b/Source/Project64-core/N64System/Mips/SystemTiming.cpp @@ -42,7 +42,7 @@ void CSystemTimer::SetTimer ( TimerType Type, uint32_t Cycles, bool bRelative ) { if (Type >= MaxTimer || Type == UnknownTimer) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return; } UpdateTimers(); @@ -70,7 +70,7 @@ uint32_t CSystemTimer::GetTimer ( TimerType Type ) { if (Type >= MaxTimer || Type == UnknownTimer) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return 0; } if (!m_TimerDetatils[Type].Active) @@ -93,7 +93,7 @@ void CSystemTimer::StopTimer ( TimerType Type ) { if (Type >= MaxTimer || Type == UnknownTimer) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return; } m_TimerDetatils[Type].Active = false; @@ -230,7 +230,7 @@ void CSystemTimer::TimerDone() } catch (...) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } break; case CSystemTimer::RSPTimerDlist: @@ -247,7 +247,7 @@ void CSystemTimer::TimerDone() g_Audio->BusyTimerDone(); break; default: - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } //CheckTimer(); /*if (Profiling) @@ -320,12 +320,12 @@ void CSystemTimer::LoadData ( void * file ) if (TimerDetailsSize != sizeof(TIMER_DETAILS)) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return; } if (Entries != sizeof(m_TimerDetatils)/sizeof(m_TimerDetatils[0])) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return; } diff --git a/Source/Project64-core/N64System/N64Class.cpp b/Source/Project64-core/N64System/N64Class.cpp index 8a3592e8c..13d18855f 100644 --- a/Source/Project64-core/N64System/N64Class.cpp +++ b/Source/Project64-core/N64System/N64Class.cpp @@ -181,7 +181,7 @@ void CN64System::ExternalEvent(SystemEvent action) break; default: WriteTraceF(TraceError, __FUNCTION__ ": Unknown event %d", action); - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } @@ -304,7 +304,7 @@ void CN64System::StartEmulation2(bool NewThread) { if (g_Plugins->SyncWindow() == NULL) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } g_Notify->DisplayMessage(5, L"Copy Plugins"); g_Plugins->CopyPlugins(g_Settings->LoadStringVal(Directory_PluginSync)); @@ -986,7 +986,7 @@ void CN64System::SyncCPU(CN64System * const SecondCPU) } m_LastSuccessSyncPC[0] = m_Reg.m_PROGRAM_COUNTER; // if (PROGRAM_COUNTER == 0x8009BBD8) { - // g_Notify->BreakPoint(__FILEW__,__LINE__); + // g_Notify->BreakPoint(__FILE__, __LINE__); // } } @@ -1233,7 +1233,7 @@ void CN64System::DumpSyncErrors(CN64System * SecondCPU) } g_Notify->DisplayError(L"Sync Error"); - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } bool CN64System::SaveState() @@ -1915,7 +1915,7 @@ bool CN64System::WriteToProtectedMemory(uint32_t Address, int length) WriteTraceF(TraceDebug, __FUNCTION__ ": Address: %X Len: %d", Address, length); if (m_Recomp) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); #ifdef tofix return m_Recomp->ClearRecompCode_Phys(Address, length, CRecompiler::Remove_ProtectedMem); #endif diff --git a/Source/Project64-core/N64System/ProfilingClass.cpp b/Source/Project64-core/N64System/ProfilingClass.cpp index a9a7550e4..7e0a83e24 100644 --- a/Source/Project64-core/N64System/ProfilingClass.cpp +++ b/Source/Project64-core/N64System/ProfilingClass.cpp @@ -40,7 +40,7 @@ SPECIAL_TIMERS CProfiling::StartTimer(SPECIAL_TIMERS Address) m_StartTimeHi = HiValue; m_StartTimeLo = LoValue; #else - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); #endif return OldTimerAddr; } @@ -59,7 +59,7 @@ SPECIAL_TIMERS CProfiling::StopTimer() { popad } #else - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); #endif __int64 StopTime = ((unsigned __int64)HiValue << 32) + (unsigned __int64)LoValue; diff --git a/Source/Project64-core/N64System/Recompiler/CodeBlock.cpp b/Source/Project64-core/N64System/Recompiler/CodeBlock.cpp index 6238f7e32..cd7f87dd0 100644 --- a/Source/Project64-core/N64System/Recompiler/CodeBlock.cpp +++ b/Source/Project64-core/N64System/Recompiler/CodeBlock.cpp @@ -29,7 +29,7 @@ CCodeBlock::CCodeBlock(uint32_t VAddrEnter, uint8_t * RecompPos) : CCodeSection * baseSection = new CCodeSection(this, VAddrEnter, 0, false); if (baseSection == NULL) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } m_Sections.push_back(baseSection); baseSection->AddParent(NULL); @@ -41,7 +41,7 @@ CCodeBlock::CCodeBlock(uint32_t VAddrEnter, uint8_t * RecompPos) : m_EnterSection = new CCodeSection(this, VAddrEnter, 1, true); if (m_EnterSection == NULL) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } baseSection->m_ContinueSection = m_EnterSection; @@ -77,7 +77,7 @@ bool CCodeBlock::SetSection ( CCodeSection * & Section, CCodeSection * CurrentSe { if (Section != NULL) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (TargetPC >= ((CurrentPC + 0x1000) & 0xFFFFF000)) @@ -94,7 +94,7 @@ bool CCodeBlock::SetSection ( CCodeSection * & Section, CCodeSection * CurrentSe { if (Section != NULL) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } SectionMap::const_iterator itr = m_SectionMap.find(TargetPC); if (itr != m_SectionMap.end()) @@ -109,7 +109,7 @@ bool CCodeBlock::SetSection ( CCodeSection * & Section, CCodeSection * CurrentSe Section = new CCodeSection(this,TargetPC,m_Sections.size(),LinkAllowed); if (Section == NULL) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } m_Sections.push_back(Section); @@ -131,11 +131,11 @@ bool CCodeBlock::SetSection ( CCodeSection * & Section, CCodeSection * CurrentSe } if (SplitSection == NULL) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (SplitSection->m_EndPC == (uint32_t)-1) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (SplitSection->m_EndPC >= TargetPC) { @@ -176,7 +176,7 @@ bool CCodeBlock::CreateBlockLinkage ( CCodeSection * EnterSection ) if (CurrentSection->m_ContinueSection != NULL && CurrentSection->m_ContinueSection != itr->second) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (CurrentSection->m_ContinueSection == NULL) { @@ -210,7 +210,7 @@ bool CCodeBlock::CreateBlockLinkage ( CCodeSection * EnterSection ) CurrentSection->m_EndPC = TestPC; if (!AnalyzeInstruction(TestPC, TargetPC, ContinuePC, LikelyBranch, IncludeDelaySlot, EndBlock, PermLoop)) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } @@ -224,7 +224,7 @@ bool CCodeBlock::CreateBlockLinkage ( CCodeSection * EnterSection ) { if (ContinuePC != (uint32_t)-1) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } continue; } @@ -259,13 +259,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(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } if (BranchLikelyBranch || BranchIncludeDelaySlot || BranchPermLoop) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } @@ -285,7 +285,7 @@ bool CCodeBlock::CreateBlockLinkage ( CCodeSection * EnterSection ) } else { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } else if (TargetPC != ((uint32_t)-1)) @@ -322,7 +322,7 @@ bool CCodeBlock::CreateBlockLinkage ( CCodeSection * EnterSection ) } if (CurrentSection == NewSection) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } CurrentSection = NewSection; if (CurrentSection->m_JumpSection != NULL || @@ -353,7 +353,7 @@ bool CCodeBlock::CreateBlockLinkage ( CCodeSection * EnterSection ) } if (CurrentSection->m_EndPC == (uint32_t)-1) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } return true; } @@ -405,7 +405,7 @@ bool CCodeBlock::AnalyzeInstruction ( uint32_t PC, uint32_t & TargetPC, uint32_t OPCODE Command; if (!g_MMU->LW_VAddr(PC, Command.Hex)) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } @@ -443,7 +443,7 @@ bool CCodeBlock::AnalyzeInstruction ( uint32_t PC, uint32_t & TargetPC, uint32_t EndBlock = true; break; default: - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } break; @@ -518,7 +518,7 @@ bool CCodeBlock::AnalyzeInstruction ( uint32_t PC, uint32_t & TargetPC, uint32_t EndBlock = true; break; } - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } break; @@ -592,13 +592,13 @@ bool CCodeBlock::AnalyzeInstruction ( uint32_t PC, uint32_t & TargetPC, uint32_t EndBlock = true; break; default: - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } } else { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } break; @@ -624,7 +624,7 @@ bool CCodeBlock::AnalyzeInstruction ( uint32_t PC, uint32_t & TargetPC, uint32_t { if (TargetPC == PC) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } ContinuePC = PC + 8; IncludeDelaySlot = true; @@ -635,18 +635,18 @@ bool CCodeBlock::AnalyzeInstruction ( uint32_t PC, uint32_t & TargetPC, uint32_t TargetPC = PC + ((int16_t)Command.offset << 2) + 4; if (TargetPC == PC) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } ContinuePC = PC + 8; LikelyBranch = true; IncludeDelaySlot = true; break; default: - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } break; default: - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } break; @@ -698,7 +698,7 @@ bool CCodeBlock::AnalyzeInstruction ( uint32_t PC, uint32_t & TargetPC, uint32_t EndBlock = true; break; } - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } return true; diff --git a/Source/Project64-core/N64System/Recompiler/CodeSection.cpp b/Source/Project64-core/N64System/Recompiler/CodeSection.cpp index 1c9765b8b..a8fca5557 100644 --- a/Source/Project64-core/N64System/Recompiler/CodeSection.cpp +++ b/Source/Project64-core/N64System/Recompiler/CodeSection.cpp @@ -137,7 +137,7 @@ void CCodeSection::CompileExit(uint32_t JumpPC, uint32_t TargetPC, CRegInfo &Exi sprintf(String, "Exit_%d", m_BlockInfo->m_ExitInfo.size()); if (x86Jmp == NULL) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return; } x86Jmp(String, 0); @@ -196,7 +196,7 @@ void CCodeSection::CompileExit(uint32_t JumpPC, uint32_t TargetPC, CRegInfo &Exi { if (LookUpMode() == FuncFind_ChangeMemory) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); // uint8_t * Jump, * Jump2; // if (TargetPC >= 0x80000000 && TargetPC < 0xC0000000) { // uint32_t pAddr = TargetPC & 0x1FFFFFFF; @@ -326,7 +326,7 @@ void CCodeSection::CompileExit(uint32_t JumpPC, uint32_t TargetPC, CRegInfo &Exi } break; case CExitInfo::ExitResetRecompCode: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); #ifdef tofix if (m_NextInstruction == JUMP || m_NextInstruction == DELAY_SLOT) { @@ -357,7 +357,7 @@ void CCodeSection::CompileExit(uint32_t JumpPC, uint32_t TargetPC, CRegInfo &Exi ExitCodeBlock(); break; case CExitInfo::TLBWriteMiss: - X86BreakPoint(__FILEW__, __LINE__); + X86BreakPoint(__FILE__, __LINE__); ExitCodeBlock(); break; case CExitInfo::DivByZero: @@ -378,7 +378,7 @@ void CCodeSection::CompileExit(uint32_t JumpPC, uint32_t TargetPC, CRegInfo &Exi break; default: WriteTraceF(TraceError, __FUNCTION__ ": how did you want to exit on reason (%d) ???", reason); - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } @@ -399,7 +399,7 @@ void CCodeSection::GenerateSectionLinkage() if ((CompilePC() & 0xFFC) == 0xFFC) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); #ifdef tofix //Handle Fall througth uint8_t * Jump = NULL; @@ -673,7 +673,7 @@ void CCodeSection::GenerateSectionLinkage() } if (JumpInfo[i]->TargetPC != TargetSection[i]->m_EnterPC) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (TargetSection[i]->m_CompiledLocation == NULL) { @@ -780,19 +780,19 @@ void CCodeSection::SyncRegState(const CRegInfo & SyncTo) case CRegInfo::STATE_CONST_64: if (GetMipsReg(i) != SyncTo.GetMipsReg(i)) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } continue; default: CPU_Message("Unhandled Reg state %d\nin SyncRegState", GetMipsRegState(i)); - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } changed = true; @@ -839,7 +839,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); continue; } m_RegWorkingSet.SetMipsRegMapLo(i, Reg); @@ -879,7 +879,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } m_RegWorkingSet.SetMipsRegMapLo(i, Reg); m_RegWorkingSet.SetMipsRegState(i, CRegInfo::STATE_MAPPED_32_SIGN); @@ -910,7 +910,7 @@ void CCodeSection::SyncRegState(const CRegInfo & SyncTo) else { CPU_Message("Do something with states in SyncRegState\nSTATE_MAPPED_32_ZERO\n%d", GetMipsRegState(i)); - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } break; case CRegInfo::STATE_CONST_32_SIGN: @@ -918,13 +918,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } m_RegWorkingSet.SetMipsRegMapLo(i, Reg); m_RegWorkingSet.SetMipsRegState(i, SyncTo.GetMipsRegState(i)); @@ -934,7 +934,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); changed = false; } } @@ -995,7 +995,7 @@ void TestFunc() TestValue += 1; if (TestValue >= 4) { -g_Notify->BreakPoint(__FILEW__,__LINE__); +g_Notify->BreakPoint(__FILE__, __LINE__); } }*/ @@ -1142,7 +1142,7 @@ bool CCodeSection::GenerateX86Code(uint32_t Test) /* if (m_CompilePC == 0x803245CC && m_NextInstruction == NORMAL) { //m_RegWorkingSet.UnMap_AllFPRs(); - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); //X86HardBreakPoint(); //X86BreakPoint(__FILEW__,__LINE__); //m_RegWorkingSet.UnMap_AllFPRs(); @@ -1411,7 +1411,7 @@ bool CCodeSection::GenerateX86Code(uint32_t Test) { if (m_NextInstruction == DO_DELAY_SLOT) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (m_NextInstruction == NORMAL) { @@ -1462,7 +1462,7 @@ bool CCodeSection::GenerateX86Code(uint32_t Test) { if (m_NextInstruction != NORMAL) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } m_CompilePC -= 4; m_Cont.RegSet = m_RegWorkingSet; @@ -1541,7 +1541,7 @@ void CCodeSection::SwitchParent(CCodeSection * OldParent, CCodeSection * NewPare if (!bFoundOldParent) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } m_ParentSection.push_back(NewParent); } @@ -1661,7 +1661,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } SECTION_LIST::iterator iter = m_ParentSection.begin(); @@ -1701,7 +1701,7 @@ void CCodeSection::UnlinkParent(CCodeSection * Parent, bool ContinueSection) { if (ParentIter->m_CompiledLocation) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } ParentIter->m_ContinueSection = NULL; } @@ -1710,7 +1710,7 @@ void CCodeSection::UnlinkParent(CCodeSection * Parent, bool ContinueSection) { if (ParentIter->m_CompiledLocation) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } ParentIter->m_JumpSection = NULL; } @@ -1794,7 +1794,7 @@ bool CCodeSection::InheritParentInfo() CCodeSection * Parent = *(m_ParentSection.begin()); if (Parent->m_CompiledLocation == NULL) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } CJumpInfo * JumpInfo = this == Parent->m_ContinueSection ? &Parent->m_Cont : &Parent->m_Jump; @@ -1840,7 +1840,7 @@ bool CCodeSection::InheritParentInfo() size_t NoOfCompiledParents = ParentList.size(); if (NoOfCompiledParents == 0) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } @@ -1876,7 +1876,7 @@ bool CCodeSection::InheritParentInfo() } if (FirstParent != -1) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } FirstParent = i; } @@ -1908,11 +1908,11 @@ bool CCodeSection::InheritParentInfo() { if (JumpInfo->RegSet.GetBlockCycleCount() != 0) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (JumpInfo->JumpPC != (uint32_t)-1) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } else @@ -1920,7 +1920,7 @@ bool CCodeSection::InheritParentInfo() UpdateCounters(m_RegWorkingSet, m_EnterPC < JumpInfo->JumpPC, true); if (JumpInfo->JumpPC == (uint32_t)-1) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (m_EnterPC <= JumpInfo->JumpPC) { @@ -2010,7 +2010,7 @@ bool CCodeSection::InheritParentInfo() break; default: CPU_Message("Unknown CPU State(%d) in InheritParentInfo", GetMipsRegState(i2)); - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } if (IsConst(i2)) { @@ -2028,7 +2028,7 @@ bool CCodeSection::InheritParentInfo() } else { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } break; case CRegInfo::STATE_MAPPED_32_SIGN: @@ -2038,7 +2038,7 @@ bool CCodeSection::InheritParentInfo() } else { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } break; case CRegInfo::STATE_UNKNOWN: @@ -2053,7 +2053,7 @@ bool CCodeSection::InheritParentInfo() break; default: CPU_Message("Unknown CPU State(%d) in InheritParentInfo", RegSet->GetMipsRegState(i2)); - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); break; } } @@ -2140,13 +2140,13 @@ bool CCodeSection::InheritParentInfo() case CRegInfo::STATE_CONST_32_SIGN: if (GetMipsRegLo(i2) != RegSet->GetMipsRegLo(i2)) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); NeedSync = true; } break; default: WriteTraceF(TraceError, __FUNCTION__ ": Unhandled Reg state %d\nin InheritParentInfo", GetMipsRegState(i2)); - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } if (NeedSync == false) { continue; } @@ -2172,7 +2172,7 @@ bool CCodeSection::InheritParentInfo() } //if (m_EnterPC == 0x8031CE44 && m_SectionID == 6) //{ - // g_Notify->BreakPoint(__FILEW__,__LINE__); + // g_Notify->BreakPoint(__FILE__, __LINE__); //} m_RegWorkingSet = JumpInfo->RegSet; if (m_EnterPC < JumpInfo->JumpPC) diff --git a/Source/Project64-core/N64System/Recompiler/LoopAnalysis.cpp b/Source/Project64-core/N64System/Recompiler/LoopAnalysis.cpp index 599716495..b09dd5676 100644 --- a/Source/Project64-core/N64System/Recompiler/LoopAnalysis.cpp +++ b/Source/Project64-core/N64System/Recompiler/LoopAnalysis.cpp @@ -79,7 +79,7 @@ bool LoopAnalysis::SetupEnterSection(CCodeSection * Section, bool & bChanged, bo { bChanged = false; bSkipedSection = false; - if (Section->m_ParentSection.empty()) { g_Notify->BreakPoint(__FILEW__, __LINE__); return true; } + if (Section->m_ParentSection.empty()) { g_Notify->BreakPoint(__FILE__, __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); @@ -128,7 +128,7 @@ bool LoopAnalysis::SetupEnterSection(CCodeSection * Section, bool & bChanged, bo if (bFirstParent) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } RegisterMap::iterator itr = m_EnterRegisters.find(Section->m_SectionID); @@ -182,7 +182,7 @@ bool LoopAnalysis::CheckLoopRegisterUsage(CCodeSection * Section) { if (!g_MMU->LW_VAddr(m_PC, m_Command.Hex)) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } CPU_Message(" %08X: %s", m_PC, R4300iOpcodeName(m_Command.Hex, m_PC)); @@ -238,7 +238,7 @@ bool LoopAnalysis::CheckLoopRegisterUsage(CCodeSection * Section) case R4300i_SPECIAL_DSRL32: SPECIAL_DSRL32(); break; case R4300i_SPECIAL_DSRA32: SPECIAL_DSRA32(); break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); #ifdef tofix if (m_Command.Hex == 0x00000001) { break; } g_Notify->DisplayError(L"Unhandled R4300i OpCode in FillSectionInfo 5\n%s", @@ -259,19 +259,19 @@ bool LoopAnalysis::CheckLoopRegisterUsage(CCodeSection * Section) Section->m_ContinueSection != NULL && Section->m_Cont.TargetPC != (uint32_t)-1) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (Section->m_Jump.TargetPC != m_PC + ((int16_t)m_Command.offset << 2) + 4 && Section->m_JumpSection != NULL && Section->m_Jump.TargetPC != (uint32_t)-1) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (m_PC == Section->m_Jump.TargetPC) { if (!DelaySlotEffectsCompare(m_PC, m_Command.rs, 0) && !Section->m_Jump.PermLoop) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } #endif @@ -284,30 +284,30 @@ bool LoopAnalysis::CheckLoopRegisterUsage(CCodeSection * Section) Section->m_ContinueSection != NULL && Section->m_Cont.TargetPC != (uint32_t)-1) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (Section->m_Jump.TargetPC != m_PC + 4 && Section->m_JumpSection != NULL && Section->m_Jump.TargetPC != (uint32_t)-1) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } /*if (Section->m_Jump.TargetPC != m_PC + ((int16_t)m_Command.offset << 2) + 4) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); }*/ if (m_PC == m_PC + ((int16_t)m_Command.offset << 2) + 4) { if (!DelaySlotEffectsCompare(m_PC, m_Command.rs, 0) && !Section->m_Jump.PermLoop) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } #endif break; case R4300i_REGIMM_BLTZAL: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); #ifdef tofix m_Reg.GetMipsRegLo(31) = m_PC + 8; m_Reg.SetMipsRegState(31,CRegInfo::STATE_CONST_32_SIGN); @@ -323,7 +323,7 @@ bool LoopAnalysis::CheckLoopRegisterUsage(CCodeSection * Section) #endif break; case R4300i_REGIMM_BGEZAL: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); #ifdef tofix m_NextInstruction = DELAY_SLOT; if (m_Reg.IsConst(m_Command.rs)) @@ -365,7 +365,7 @@ bool LoopAnalysis::CheckLoopRegisterUsage(CCodeSection * Section) #endif break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); #ifdef tofix if (m_Command.Hex == 0x0407000D) { break; } g_Notify->DisplayError(L"Unhandled R4300i OpCode in FillSectionInfo 4\n%s", @@ -376,7 +376,7 @@ bool LoopAnalysis::CheckLoopRegisterUsage(CCodeSection * Section) } break; case R4300i_JAL: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); #ifdef tofix m_NextInstruction = DELAY_SLOT; m_Reg.GetMipsRegLo(31) = m_PC + 8; @@ -396,11 +396,11 @@ bool LoopAnalysis::CheckLoopRegisterUsage(CCodeSection * Section) #ifdef CHECKED_BUILD if (Section->m_Jump.TargetPC != (m_PC & 0xF0000000) + (m_Command.target << 2)) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (m_PC == Section->m_Jump.TargetPC && !Section->m_Jump.PermLoop) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } #endif break; @@ -415,25 +415,25 @@ bool LoopAnalysis::CheckLoopRegisterUsage(CCodeSection * Section) Section->m_ContinueSection != NULL && Section->m_Cont.TargetPC != (uint32_t)-1) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } else { if (Section->m_Cont.TargetPC != (uint32_t)-1) { - //g_Notify->BreakPoint(__FILEW__,__LINE__); + //g_Notify->BreakPoint(__FILE__, __LINE__); } } if (Section->m_Jump.TargetPC != m_PC + ((int16_t)m_Command.offset << 2) + 4) { - //g_Notify->BreakPoint(__FILEW__,__LINE__); + //g_Notify->BreakPoint(__FILE__, __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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } #endif @@ -450,19 +450,19 @@ bool LoopAnalysis::CheckLoopRegisterUsage(CCodeSection * Section) Section->m_ContinueSection != NULL && Section->m_Cont.TargetPC != (uint32_t)-1) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (Section->m_Jump.TargetPC != m_PC + ((int16_t)m_Command.offset << 2) + 4 && Section->m_JumpSection != NULL && Section->m_Jump.TargetPC != (uint32_t)-1) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } #endif @@ -577,17 +577,17 @@ bool LoopAnalysis::CheckLoopRegisterUsage(CCodeSection * Section) Section->m_ContinueSection != NULL && Section->m_Cont.TargetPC != (uint32_t)-1) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (m_PC == m_PC + ((int16_t)m_Command.offset << 2) + 4) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); #ifdef tofix if (!DelaySlotEffectsCompare(m_PC,m_Command.rs,m_Command.rt)) { if (!Section->m_Jump.PermLoop) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } #endif @@ -602,15 +602,15 @@ bool LoopAnalysis::CheckLoopRegisterUsage(CCodeSection * Section) Section->m_ContinueSection != NULL && Section->m_Cont.TargetPC != (uint32_t)-1) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (Section->m_Jump.TargetPC != m_PC + ((int16_t)m_Command.offset << 2) + 4) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (m_PC == Section->m_Jump.TargetPC) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); #ifdef tofix if (!DelaySlotEffectsCompare(m_PC,m_Command.rs,m_Command.rt)) { Section->m_Jump.PermLoop = true; @@ -644,21 +644,21 @@ bool LoopAnalysis::CheckLoopRegisterUsage(CCodeSection * Section) Section->m_ContinueSection != NULL && Section->m_Cont.TargetPC != (uint32_t)-1) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (Section->m_Jump.TargetPC != m_PC + 4) { - //g_Notify->BreakPoint(__FILEW__,__LINE__); + //g_Notify->BreakPoint(__FILE__, __LINE__); } /*if (Section->m_Jump.TargetPC != m_PC + ((int16_t)m_Command.offset << 2) + 4) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); }*/ if (m_PC == m_PC + ((int16_t)m_Command.offset << 2) + 4) { if (!DelaySlotEffectsCompare(m_PC, m_Command.rs, m_Command.rt) && !Section->m_Jump.PermLoop) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } #endif @@ -738,7 +738,7 @@ bool LoopAnalysis::CheckLoopRegisterUsage(CCodeSection * Section) { if (m_NextInstruction != NORMAL && m_NextInstruction != END_BLOCK) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } m_NextInstruction = END_BLOCK; SetJumpRegSet(Section, m_Reg); @@ -754,7 +754,7 @@ bool LoopAnalysis::CheckLoopRegisterUsage(CCodeSection * Section) m_PC += 4; if ((m_PC & 0xFFFFF000) != (m_EnterSection->m_EnterPC & 0xFFFFF000)) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } break; case LIKELY_DELAY_SLOT: @@ -772,7 +772,7 @@ bool LoopAnalysis::CheckLoopRegisterUsage(CCodeSection * Section) m_NextInstruction = END_BLOCK; break; case LIKELY_DELAY_SLOT_DONE: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); if (Section->m_CompiledLocation) { } @@ -796,9 +796,9 @@ bool LoopAnalysis::CheckLoopRegisterUsage(CCodeSection * Section) { if (m_NextInstruction != END_BLOCK && m_NextInstruction != NORMAL) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } while (m_NextInstruction != END_BLOCK); @@ -826,7 +826,7 @@ bool LoopAnalysis::SyncRegState(CRegInfo & RegSet, const CRegInfo& SyncReg) } else if (RegSet.IsConst(x) && RegSet.Is64Bit(x) && RegSet.GetMipsReg_S(x) != SyncReg.GetMipsReg_S(x)) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } return bChanged; @@ -932,7 +932,7 @@ void LoopAnalysis::SPECIAL_SRAV() void LoopAnalysis::SPECIAL_JR() { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); #ifdef tofix if (m_Reg.IsConst(m_Command.rs)) { @@ -948,7 +948,7 @@ void LoopAnalysis::SPECIAL_JR() void LoopAnalysis::SPECIAL_JALR() { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); #ifdef tofix m_Reg.GetMipsRegLo(m_Command.rd) = m_PC + 8; m_Reg.SetMipsRegState(m_Command.rd,CRegInfo::STATE_CONST_32_SIGN); @@ -969,12 +969,12 @@ void LoopAnalysis::SPECIAL_SYSCALL(CCodeSection * Section) if (Section->m_ContinueSection != NULL && Section->m_Cont.TargetPC != (uint32_t)-1) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (Section->m_JumpSection != NULL && Section->m_Jump.TargetPC != (uint32_t)-1) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } #else Section = Section; @@ -989,12 +989,12 @@ void LoopAnalysis::SPECIAL_BREAK(CCodeSection * Section) if (Section->m_ContinueSection != NULL && Section->m_Cont.TargetPC != (uint32_t)-1) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (Section->m_JumpSection != NULL && Section->m_Jump.TargetPC != (uint32_t)-1) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } #else Section = Section; diff --git a/Source/Project64-core/N64System/Recompiler/RecompilerClass.cpp b/Source/Project64-core/N64System/Recompiler/RecompilerClass.cpp index 323423ce8..6e85655aa 100644 --- a/Source/Project64-core/N64System/Recompiler/RecompilerClass.cpp +++ b/Source/Project64-core/N64System/Recompiler/RecompilerClass.cpp @@ -163,7 +163,7 @@ void CRecompiler::RecompilerMain_VirtualTable() void CRecompiler::RecompilerMain_VirtualTable_validate() { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); /* PCCompiledFunc_TABLE * m_FunctionTable = m_Functions.GetFunctionTable(); while(!m_EndEmulation) @@ -174,7 +174,7 @@ void CRecompiler::RecompilerMain_VirtualTable_validate() //Find Block on hash table if (Info == NULL) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); #ifdef tofix if (!g_TLB->ValidVaddr(PROGRAM_COUNTER)) { @@ -234,7 +234,7 @@ void CRecompiler::RecompilerMain_VirtualTable_validate() continue; } } - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); #ifdef tofix if (!g_TLB->ValidVaddr(PROGRAM_COUNTER)) { @@ -383,7 +383,7 @@ void CRecompiler::RecompilerMain_Lookup() { /*if (bUseTlb()) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); #ifdef tofix if (!g_TLB->TranslateVaddr(PROGRAM_COUNTER, Addr)) { @@ -496,7 +496,7 @@ void CRecompiler::RecompilerMain_Lookup() continue; } } - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); #ifdef tofix if (Profiling && IndvidualBlock) { static uint32_t ProfAddress = 0; @@ -681,7 +681,7 @@ void CRecompiler::RecompilerMain_Lookup_validate_TLB() info = JumpTable()[PhysicalAddr >> 2]; if (info != NULL) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); info = NULL; } continue; @@ -735,7 +735,7 @@ void CRecompiler::ResetRecompCode(bool bAllocate) void CRecompiler::RecompilerMain_ChangeMemory() { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); #ifdef tofix uint32_t Value, Addr; uint8_t * Block; @@ -978,7 +978,7 @@ void CRecompiler::ClearRecompCode_Phys(uint32_t Address, int length, REMOVE_REAS int ClearLen = ((length + 3) & ~3); if (Address + ClearLen > g_System->RdramSize()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); ClearLen = g_System->RdramSize() - Address; } WriteTraceF(TraceRecompiler, __FUNCTION__ ": Reseting Jump Table, Addr: %X len: %d", Address, ClearLen); @@ -1020,7 +1020,7 @@ void CRecompiler::ClearRecompCode_Virt(uint32_t Address, int length, REMOVE_REAS if (DataLeft > 0) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } break; @@ -1034,7 +1034,7 @@ void CRecompiler::ClearRecompCode_Virt(uint32_t Address, int length, REMOVE_REAS } break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } @@ -1042,7 +1042,7 @@ void CRecompiler::ResetMemoryStackPos() { if (g_MMU == NULL) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return; } if (m_Registers.m_GPR[29].UW[0] == 0) @@ -1059,6 +1059,6 @@ void CRecompiler::ResetMemoryStackPos() else { WriteTraceF(TraceError, __FUNCTION__ ": Failed to translate SP address (%s)", m_Registers.m_GPR[29].UW[0]); - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } diff --git a/Source/Project64-core/N64System/Recompiler/RecompilerOps.cpp b/Source/Project64-core/N64System/Recompiler/RecompilerOps.cpp index 023e8af6a..4eae420f4 100644 --- a/Source/Project64-core/N64System/Recompiler/RecompilerOps.cpp +++ b/Source/Project64-core/N64System/Recompiler/RecompilerOps.cpp @@ -194,7 +194,7 @@ void CRecompilerOps::Compile_Branch(CRecompilerOps::BranchFunction CompareFunc, { if (m_Section->m_Jump.LinkLocation != NULL || m_Section->m_Jump.LinkLocation2 != NULL) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } MoveConstToVariable(m_Section->m_Jump.TargetPC, &R4300iOp::m_JumpToLocation, "R4300iOp::m_JumpToLocation"); } @@ -202,7 +202,7 @@ void CRecompilerOps::Compile_Branch(CRecompilerOps::BranchFunction CompareFunc, { if (m_Section->m_Cont.LinkLocation != NULL || m_Section->m_Cont.LinkLocation2 != NULL) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } MoveConstToVariable(m_Section->m_Cont.TargetPC, &R4300iOp::m_JumpToLocation, "R4300iOp::m_JumpToLocation"); } @@ -210,7 +210,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(__FILEW__, __LINE__); } + if (DelayLinkLocation != NULL) { g_Notify->BreakPoint(__FILE__, __LINE__); } DelayLinkLocation = (uint8_t *)(m_RecompPos - 1); CPU_Message(" "); @@ -227,7 +227,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(__FILEW__, __LINE__); } + if (DelayLinkLocation != NULL) { g_Notify->BreakPoint(__FILE__, __LINE__); } DelayLinkLocation = (uint8_t *)(m_RecompPos - 1); CPU_Message(" "); @@ -380,15 +380,15 @@ void CRecompilerOps::Compile_BranchLikely(BranchFunction CompareFunc, bool Link) { if (m_Section->m_Jump.JumpPC != m_CompilePC) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (m_Section->m_Cont.JumpPC != m_CompilePC) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (m_Section->m_Cont.TargetPC != m_CompilePC + 8) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } @@ -434,7 +434,7 @@ void CRecompilerOps::Compile_BranchLikely(BranchFunction CompareFunc, bool Link) { if (m_Section->m_Jump.LinkLocation != NULL) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } @@ -458,7 +458,7 @@ void CRecompilerOps::Compile_BranchLikely(BranchFunction CompareFunc, bool Link) } else if (!m_Section->m_Cont.FallThrough) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (m_Section->m_Cont.LinkLocation != NULL) @@ -491,7 +491,7 @@ void CRecompilerOps::Compile_BranchLikely(BranchFunction CompareFunc, bool Link) { if (m_Section->m_Jump.LinkLocation != NULL) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } m_Section->GenerateSectionLinkage(); m_NextInstruction = END_BLOCK; @@ -1628,7 +1628,7 @@ void CRecompilerOps::BGEZ_Compare() { if (Is64Bit(m_Opcode.rs)) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); CRecompilerOps::UnknownOpcode(); } else if (IsSigned(m_Opcode.rs)) @@ -1871,7 +1871,7 @@ void CRecompilerOps::JAL() } else { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } return; } diff --git a/Source/Project64-core/N64System/Recompiler/RegInfo.cpp b/Source/Project64-core/N64System/Recompiler/RegInfo.cpp index 8456a3bd9..a60a4963f 100644 --- a/Source/Project64-core/N64System/Recompiler/RegInfo.cpp +++ b/Source/Project64-core/N64System/Recompiler/RegInfo.cpp @@ -84,7 +84,7 @@ CRegInfo& CRegInfo::operator=(const CRegInfo& right) #ifdef _DEBUG if (*this != right) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } #endif return *this; @@ -573,7 +573,7 @@ CRegInfo::x86Reg CRegInfo::Map_MemoryStack(x86Reg Reg, bool bMapRegister, bool L if (Reg == x86_Unknown) { g_Notify->DisplayError(L"Map_MemoryStack\n\nOut of registers"); - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } SetX86Mapped(Reg, CRegInfo::Stack_Mapped); CPU_Message(" regcache: allocate %s as Memory Stack", x86_Name(Reg)); @@ -612,7 +612,7 @@ void CRegInfo::Map_GPR_32bit(int32_t MipsReg, bool SignValue, int32_t MipsRegToL x86Reg Reg; if (MipsReg == 0) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return; } @@ -622,7 +622,7 @@ void CRegInfo::Map_GPR_32bit(int32_t MipsReg, bool SignValue, int32_t MipsRegToL if (Reg < 0) { if (bHaveDebugger()) { g_Notify->DisplayError(L"Map_GPR_32bit\n\nOut of registers"); } - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return; } CPU_Message(" regcache: allocate %s to %s", x86_Name(Reg), CRegName::GPR[MipsReg]); @@ -715,7 +715,7 @@ void CRegInfo::Map_GPR_64bit(int32_t MipsReg, int32_t MipsRegToLoad) x86Hi = FreeX86Reg(); if (x86Hi == x86_Unknown) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return; } SetX86Protected(x86Hi, true); @@ -827,7 +827,7 @@ CX86Ops::x86Reg CRegInfo::Map_TempReg(CX86Ops::x86Reg Reg, int32_t MipsReg, bool if (Reg == x86_Unknown) { WriteTrace(TraceError, __FUNCTION__ ": Failed to find a free register"); - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return x86_Unknown; } } @@ -845,7 +845,7 @@ CX86Ops::x86Reg CRegInfo::Map_TempReg(CX86Ops::x86Reg Reg, int32_t MipsReg, bool if (Reg < 0) { WriteTrace(TraceError, __FUNCTION__ ": Failed to find a free 8 bit register"); - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return x86_Unknown; } } @@ -855,7 +855,7 @@ CX86Ops::x86Reg CRegInfo::Map_TempReg(CX86Ops::x86Reg Reg, int32_t MipsReg, bool if (GetX86Protected(Reg)) { WriteTrace(TraceError, __FUNCTION__ ": Register is protected"); - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return x86_Unknown; } @@ -1436,7 +1436,7 @@ void CRegInfo::WriteBackRegisters() break; default: CPU_Message(__FUNCTION__ ": Unknown State: %d reg %d (%s)", GetMipsRegState(count), count, CRegName::GPR[count]); - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } } diff --git a/Source/Project64-core/N64System/Recompiler/SectionInfo.cpp b/Source/Project64-core/N64System/Recompiler/SectionInfo.cpp index 3c13afa18..1cf8952bb 100644 --- a/Source/Project64-core/N64System/Recompiler/SectionInfo.cpp +++ b/Source/Project64-core/N64System/Recompiler/SectionInfo.cpp @@ -69,7 +69,7 @@ void CCodeSection::UnlinkParent( CCodeSection * Parent, bool AllowDelete, bool C // { // if (!ContinueSection && Parent->ContinueSection == this) // { - // g_Notify->BreakPoint(__FILEW__,__LINE__); + // g_Notify->BreakPoint(__FILE__, __LINE__); // } // } if (ContinueSection && Parent->ContinueSection == this) @@ -80,7 +80,7 @@ void CCodeSection::UnlinkParent( CCodeSection * Parent, bool AllowDelete, bool C // { // if (ContinueSection && Parent->JumpSection == this) // { - // g_Notify->BreakPoint(__FILEW__,__LINE__); + // g_Notify->BreakPoint(__FILE__, __LINE__); // } // } if (!ContinueSection && Parent->JumpSection == this) @@ -119,7 +119,7 @@ CCodeSection::~CCodeSection() ContinueSection->UnlinkParent(this, true, true); if (ContinueSection) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } ContinueSection = NULL; } @@ -128,7 +128,7 @@ CCodeSection::~CCodeSection() JumpSection->UnlinkParent(this, true, false); if (JumpSection) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } JumpSection = NULL; } diff --git a/Source/Project64-core/N64System/Recompiler/X86ops.cpp b/Source/Project64-core/N64System/Recompiler/X86ops.cpp index a94fb453f..7c3c3be89 100644 --- a/Source/Project64-core/N64System/Recompiler/X86ops.cpp +++ b/Source/Project64-core/N64System/Recompiler/X86ops.cpp @@ -195,7 +195,7 @@ void CX86Ops::AndX86RegToX86Reg(x86Reg Destination, x86Reg Source) PUTDST16(m_RecompPos, 0xC021 + (Destination * 0x100) + (Source * 0x800)); } -void CX86Ops::BreakPointNotification(const wchar_t * const FileName, const int LineNumber) +void CX86Ops::BreakPointNotification(const char * FileName, int32_t LineNumber) { g_Notify->BreakPoint(FileName, LineNumber); } @@ -206,14 +206,11 @@ void CX86Ops::X86HardBreakPoint() PUTDST8(m_RecompPos, 0xCC); } -void CX86Ops::X86BreakPoint(const wchar_t * FileName, int LineNumber) +void CX86Ops::X86BreakPoint(const char * FileName, int LineNumber) { - stdstr file_name; - file_name.FromUTF16(FileName); - Pushad(); PushImm32(stdstr_f("%d", LineNumber).c_str(), LineNumber); - PushImm32(file_name.c_str(), (uint32_t)FileName); + PushImm32(FileName, (uint32_t)FileName); Call_Direct(BreakPointNotification, "BreakPointNotification"); AddConstToX86Reg(x86_ESP, 8); Popad(); @@ -310,7 +307,7 @@ void CX86Ops::CompX86RegToX86Reg(x86Reg Destination, x86Reg Source) case x86_ESP: x86Command = 0x043B; break; case x86_EBP: x86Command = 0x053B; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (Destination) { @@ -341,7 +338,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } @@ -358,7 +355,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } @@ -376,7 +373,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } @@ -395,7 +392,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } @@ -414,7 +411,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } @@ -543,7 +540,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } @@ -677,7 +674,7 @@ void CX86Ops::LeaRegReg2(x86Reg RegDest, x86Reg RegSrc, x86Reg RegSrc2, Multiple if (RegSrc2 == x86_ESP || RegSrc2 == x86_EBP) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return; } PUTDST8(m_RecompPos, 0x8D); @@ -705,7 +702,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (x86SourceReg) { @@ -718,7 +715,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST16(m_RecompPos, x86Command); PUTDST32(m_RecompPos, offset); @@ -736,7 +733,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (x86SourceReg) { @@ -749,7 +746,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST16(m_RecompPos, x86Command); PUTDST8(m_RecompPos, offset); @@ -770,7 +767,7 @@ void CX86Ops::MoveConstByteToN64Mem(uint8_t Const, x86Reg AddrReg) case x86_ESP: PUTDST16(m_RecompPos, 0x84C6); break; case x86_EBP: PUTDST16(m_RecompPos, 0x85C6); break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST32(m_RecompPos, g_MMU->Rdram()); PUTDST8(m_RecompPos, Const); @@ -799,7 +796,7 @@ void CX86Ops::MoveConstHalfToN64Mem(uint16_t Const, x86Reg AddrReg) case x86_ESP: PUTDST16(m_RecompPos, 0x84C7); break; case x86_EBP: PUTDST16(m_RecompPos, 0x85C7); break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST32(m_RecompPos, g_MMU->Rdram()); PUTDST16(m_RecompPos, Const); @@ -832,7 +829,7 @@ void CX86Ops::MoveConstHalfToX86regPointer(uint16_t Const, x86Reg AddrReg1, x86R case x86_ESI: Param = 0x06; break; case x86_EDI: Param = 0x07; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (AddrReg2) @@ -846,7 +843,7 @@ void CX86Ops::MoveConstHalfToX86regPointer(uint16_t Const, x86Reg AddrReg1, x86R case x86_ESP: Param += 0x20; break; case x86_EBP: Param += 0x28; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST8(m_RecompPos, Param); PUTDST16(m_RecompPos, Const); @@ -866,7 +863,7 @@ void CX86Ops::MoveConstToMemoryDisp(uint32_t Const, x86Reg AddrReg, uint32_t Dis case x86_ESP: PUTDST16(m_RecompPos, 0x84C7); break; case x86_EBP: PUTDST16(m_RecompPos, 0x85C7); break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST32(m_RecompPos, Disp); PUTDST32(m_RecompPos, Const); @@ -886,7 +883,7 @@ void CX86Ops::MoveConstToN64Mem(uint32_t Const, x86Reg AddrReg) case x86_ESP: PUTDST16(m_RecompPos, 0x84C7); break; case x86_EBP: PUTDST16(m_RecompPos, 0x85C7); break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST32(m_RecompPos, g_MMU->Rdram()); PUTDST32(m_RecompPos, Const); @@ -906,7 +903,7 @@ void CX86Ops::MoveConstToN64MemDisp(uint32_t Const, x86Reg AddrReg, uint8_t Disp case x86_ESP: PUTDST16(m_RecompPos, 0x84C7); break; case x86_EBP: PUTDST16(m_RecompPos, 0x85C7); break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST32(m_RecompPos, g_MMU->Rdram() + Disp); PUTDST32(m_RecompPos, Const); @@ -958,7 +955,7 @@ void CX86Ops::MoveConstByteToX86regPointer(uint8_t Const, x86Reg AddrReg1, x86Re case x86_ESI: Param = 0x06; break; case x86_EDI: Param = 0x07; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (AddrReg2) @@ -972,7 +969,7 @@ void CX86Ops::MoveConstByteToX86regPointer(uint8_t Const, x86Reg AddrReg1, x86Re case x86_ESP: Param += 0x20; break; case x86_EBP: Param += 0x28; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST8(m_RecompPos, Param); PUTDST8(m_RecompPos, Const); @@ -994,7 +991,7 @@ void CX86Ops::MoveConstToX86regPointer(uint32_t Const, x86Reg AddrReg1, x86Reg A case x86_ESI: Param = 0x06; break; case x86_EDI: Param = 0x07; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (AddrReg2) { @@ -1007,7 +1004,7 @@ void CX86Ops::MoveConstToX86regPointer(uint32_t Const, x86Reg AddrReg1, x86Reg A case x86_ESP: Param += 0x20; break; case x86_EBP: Param += 0x28; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST8(m_RecompPos, Param); PUTDST32(m_RecompPos, Const); @@ -1029,7 +1026,7 @@ void CX86Ops::MoveN64MemDispToX86reg(x86Reg reg, x86Reg AddrReg, uint8_t Disp) case x86_ESP: x86Command = 0x048B; break; case x86_EBP: x86Command = 0x058B; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (reg) { @@ -1063,7 +1060,7 @@ void CX86Ops::MoveN64MemToX86reg(x86Reg reg, x86Reg AddrReg) case x86_ESP: x86Command = 0x048B; break; case x86_EBP: x86Command = 0x058B; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (reg) { @@ -1096,7 +1093,7 @@ void CX86Ops::MoveN64MemToX86regByte(x86Reg reg, x86Reg AddrReg) case x86_ESP: x86Command = 0x048A; break; case x86_EBP: x86Command = 0x058A; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (reg) { @@ -1108,7 +1105,7 @@ void CX86Ops::MoveN64MemToX86regByte(x86Reg reg, x86Reg AddrReg) /* case x86_EDI: x86Command += 0xB800; break; */ /* case x86_ESP: case x86_EBP: */ default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); break; } PUTDST16(m_RecompPos, x86Command); @@ -1133,7 +1130,7 @@ void CX86Ops::MoveN64MemToX86regHalf(x86Reg reg, x86Reg AddrReg) case x86_ESP: x86Command = 0x048B; break; case x86_EBP: x86Command = 0x058B; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (reg) { @@ -1168,7 +1165,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (AddrReg1) @@ -1180,7 +1177,7 @@ void CX86Ops::MoveSxByteX86regPointerToX86reg(x86Reg AddrReg1, x86Reg AddrReg2, case x86_ESI: Param = 0x06; break; case x86_EDI: Param = 0x07; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (AddrReg2) @@ -1194,7 +1191,7 @@ void CX86Ops::MoveSxByteX86regPointerToX86reg(x86Reg AddrReg1, x86Reg AddrReg2, case x86_ESP: Param += 0x20; break; case x86_EBP: Param += 0x28; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST8(m_RecompPos, Param); } @@ -1217,7 +1214,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (AddrReg1) @@ -1229,7 +1226,7 @@ void CX86Ops::MoveSxHalfX86regPointerToX86reg(x86Reg AddrReg1, x86Reg AddrReg2, case x86_ESI: Param = 0x06; break; case x86_EDI: Param = 0x07; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (AddrReg2) @@ -1243,7 +1240,7 @@ void CX86Ops::MoveSxHalfX86regPointerToX86reg(x86Reg AddrReg1, x86Reg AddrReg2, case x86_ESP: Param += 0x20; break; case x86_EBP: Param += 0x28; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST8(m_RecompPos, Param); } @@ -1264,7 +1261,7 @@ void CX86Ops::MoveSxN64MemToX86regByte(x86Reg reg, x86Reg AddrReg) case x86_ESP: x86Command = 0x04BE; break; case x86_EBP: x86Command = 0x05BE; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (reg) { @@ -1277,7 +1274,7 @@ void CX86Ops::MoveSxN64MemToX86regByte(x86Reg reg, x86Reg AddrReg) case x86_ESP: x86Command += 0xA000; break; case x86_EBP: x86Command += 0xA800; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); break; } PUTDST8(m_RecompPos, 0x0f); @@ -1302,7 +1299,7 @@ void CX86Ops::MoveSxN64MemToX86regHalf(x86Reg reg, x86Reg AddrReg) case x86_ESP: x86Command = 0x04BF; break; case x86_EBP: x86Command = 0x05BF; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (reg) { @@ -1338,7 +1335,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST32(m_RecompPos, Variable); } @@ -1360,7 +1357,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST32(m_RecompPos, Variable); } @@ -1379,7 +1376,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST32(m_RecompPos, Variable); } @@ -1402,7 +1399,7 @@ void CX86Ops::MoveVariableDispToX86Reg(void *Variable, const char * VariableName case x86_ESP: PUTDST8(m_RecompPos, 0x24); break; case x86_EBP: PUTDST8(m_RecompPos, 0x2C); break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } /* put in shifter 2(01), 4(10), 8(11) */ @@ -1413,7 +1410,7 @@ void CX86Ops::MoveVariableDispToX86Reg(void *Variable, const char * VariableName case 4: x = 0x80; break; case 8: x = 0xC0; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } /* format xx|000000 */ @@ -1428,7 +1425,7 @@ void CX86Ops::MoveVariableDispToX86Reg(void *Variable, const char * VariableName case x86_ESP: PUTDST8(m_RecompPos, 0x25 | x); break; case x86_EBP: PUTDST8(m_RecompPos, 0x2D | x); break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST32(m_RecompPos, Variable); @@ -1445,7 +1442,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST32(m_RecompPos, Variable); } @@ -1466,7 +1463,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST32(m_RecompPos, Variable); } @@ -1486,7 +1483,7 @@ void CX86Ops::MoveX86regByteToN64Mem(x86Reg reg, x86Reg AddrReg) case x86_ESI: x86Command = 0x0688; break; case x86_EDI: x86Command = 0x0788; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (reg) @@ -1496,7 +1493,7 @@ void CX86Ops::MoveX86regByteToN64Mem(x86Reg reg, x86Reg AddrReg) case x86_ECX: x86Command += 0x8800; break; case x86_EDX: x86Command += 0x9000; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST16(m_RecompPos, x86Command); PUTDST32(m_RecompPos, g_MMU->Rdram()); @@ -1513,7 +1510,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST32(m_RecompPos, Variable); } @@ -1535,7 +1532,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (AddrReg1) @@ -1547,7 +1544,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (AddrReg2) @@ -1561,7 +1558,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST8(m_RecompPos, Param); } @@ -1584,7 +1581,7 @@ void CX86Ops::MoveX86regHalfToN64Mem(x86Reg reg, x86Reg AddrReg) case x86_ESP: x86Command = 0x0489; break; case x86_EBP: x86Command = 0x0589; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (reg) { @@ -1597,7 +1594,7 @@ void CX86Ops::MoveX86regHalfToN64Mem(x86Reg reg, x86Reg AddrReg) case x86_ESP: x86Command += 0xA000; break; case x86_EBP: x86Command += 0xA800; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST16(m_RecompPos, x86Command); PUTDST32(m_RecompPos, g_MMU->Rdram()); @@ -1618,7 +1615,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST32(m_RecompPos, Variable); } @@ -1641,7 +1638,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (AddrReg1) @@ -1653,7 +1650,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (AddrReg2) @@ -1667,7 +1664,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST8(m_RecompPos, Param); } @@ -1687,7 +1684,7 @@ void CX86Ops::MoveX86PointerToX86reg(x86Reg reg, x86Reg X86Pointer) case x86_ESI: x86Command = 0x068B; break; case x86_EDI: x86Command = 0x078B; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (reg) @@ -1701,7 +1698,7 @@ void CX86Ops::MoveX86PointerToX86reg(x86Reg reg, x86Reg X86Pointer) case x86_ESP: x86Command += 0x2000; break; case x86_EBP: x86Command += 0x2800; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST16(m_RecompPos, x86Command); } @@ -1721,7 +1718,7 @@ void CX86Ops::MoveX86PointerToX86regDisp(x86Reg reg, x86Reg X86Pointer, uint8_t case x86_ESI: x86Command = 0x468B; break; case x86_EDI: x86Command = 0x478B; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (reg) @@ -1735,7 +1732,7 @@ void CX86Ops::MoveX86PointerToX86regDisp(x86Reg reg, x86Reg X86Pointer, uint8_t case x86_ESP: x86Command += 0x2000; break; case x86_EBP: x86Command += 0x2800; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST16(m_RecompPos, x86Command); PUTDST8(m_RecompPos, Disp); @@ -1758,7 +1755,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (AddrReg1) @@ -1770,7 +1767,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (AddrReg2) @@ -1784,7 +1781,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST8(m_RecompPos, Param); } @@ -1806,7 +1803,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (AddrReg1) @@ -1818,7 +1815,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (AddrReg2) @@ -1832,7 +1829,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST8(m_RecompPos, Param); PUTDST8(m_RecompPos, offset); @@ -1854,7 +1851,7 @@ void CX86Ops::MoveX86regToMemory(x86Reg reg, x86Reg AddrReg, uint32_t Disp) case x86_ESP: x86Command = 0x0489; break; case x86_EBP: x86Command = 0x0589; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (reg) { @@ -1867,7 +1864,7 @@ void CX86Ops::MoveX86regToMemory(x86Reg reg, x86Reg AddrReg, uint32_t Disp) case x86_ESP: x86Command += 0xA000; break; case x86_EBP: x86Command += 0xA800; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST16(m_RecompPos, x86Command); PUTDST32(m_RecompPos, Disp); @@ -1889,7 +1886,7 @@ void CX86Ops::MoveX86regToN64Mem(x86Reg reg, x86Reg AddrReg) case x86_ESP: x86Command = 0x0489; break; case x86_EBP: x86Command = 0x0589; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (reg) { @@ -1902,7 +1899,7 @@ void CX86Ops::MoveX86regToN64Mem(x86Reg reg, x86Reg AddrReg) case x86_ESP: x86Command += 0xA000; break; case x86_EBP: x86Command += 0xA800; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST16(m_RecompPos, x86Command); PUTDST32(m_RecompPos, g_MMU->Rdram()); @@ -1924,7 +1921,7 @@ void CX86Ops::MoveX86regToN64MemDisp(x86Reg reg, x86Reg AddrReg, uint8_t Disp) case x86_ESP: x86Command = 0x0489; break; case x86_EBP: x86Command = 0x0589; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (reg) { @@ -1937,7 +1934,7 @@ void CX86Ops::MoveX86regToN64MemDisp(x86Reg reg, x86Reg AddrReg, uint8_t Disp) case x86_ESP: x86Command += 0xA000; break; case x86_EBP: x86Command += 0xA800; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST16(m_RecompPos, x86Command); PUTDST32(m_RecompPos, g_MMU->Rdram() + Disp); @@ -1957,7 +1954,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST32(m_RecompPos, Variable); } @@ -1983,7 +1980,7 @@ void CX86Ops::MoveX86RegToX86Reg(x86Reg Source, x86Reg Destination) case x86_ESP: x86Command = 0x0489; break; case x86_EBP: x86Command = 0x0589; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (Source) @@ -1997,7 +1994,7 @@ void CX86Ops::MoveX86RegToX86Reg(x86Reg Source, x86Reg Destination) case x86_ESP: x86Command += 0xE000; break; case x86_EBP: x86Command += 0xE800; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST16(m_RecompPos, x86Command); } @@ -2017,7 +2014,7 @@ void CX86Ops::MoveX86regToX86Pointer(x86Reg reg, x86Reg X86Pointer) case x86_ESI: x86Command = 0x0689; break; case x86_EDI: x86Command = 0x0789; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (reg) @@ -2031,7 +2028,7 @@ void CX86Ops::MoveX86regToX86Pointer(x86Reg reg, x86Reg X86Pointer) case x86_ESP: x86Command += 0x2000; break; case x86_EBP: x86Command += 0x2800; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST16(m_RecompPos, x86Command); } @@ -2053,7 +2050,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (AddrReg1) @@ -2065,7 +2062,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (AddrReg2) @@ -2079,7 +2076,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST8(m_RecompPos, Param); } @@ -2102,7 +2099,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (AddrReg1) @@ -2114,7 +2111,7 @@ void CX86Ops::MoveZxByteX86regPointerToX86reg(x86Reg AddrReg1, x86Reg AddrReg2, case x86_ESI: Param = 0x06; break; case x86_EDI: Param = 0x07; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (AddrReg2) @@ -2128,7 +2125,7 @@ void CX86Ops::MoveZxByteX86regPointerToX86reg(x86Reg AddrReg1, x86Reg AddrReg2, case x86_ESP: Param += 0x20; break; case x86_EBP: Param += 0x28; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST8(m_RecompPos, Param); } @@ -2151,7 +2148,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (AddrReg1) @@ -2163,7 +2160,7 @@ void CX86Ops::MoveZxHalfX86regPointerToX86reg(x86Reg AddrReg1, x86Reg AddrReg2, case x86_ESI: Param = 0x06; break; case x86_EDI: Param = 0x07; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (AddrReg2) @@ -2177,7 +2174,7 @@ void CX86Ops::MoveZxHalfX86regPointerToX86reg(x86Reg AddrReg1, x86Reg AddrReg2, case x86_ESP: Param += 0x20; break; case x86_EBP: Param += 0x28; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST8(m_RecompPos, Param); } @@ -2198,7 +2195,7 @@ void CX86Ops::MoveZxN64MemToX86regByte(x86Reg reg, x86Reg AddrReg) case x86_ESP: x86Command = 0x04B6; break; case x86_EBP: x86Command = 0x05B6; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (reg) { @@ -2211,7 +2208,7 @@ void CX86Ops::MoveZxN64MemToX86regByte(x86Reg reg, x86Reg AddrReg) case x86_ESP: x86Command += 0xA000; break; case x86_EBP: x86Command += 0xA800; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); break; } PUTDST8(m_RecompPos, 0x0f); @@ -2236,7 +2233,7 @@ void CX86Ops::MoveZxN64MemToX86regHalf(x86Reg reg, x86Reg AddrReg) case x86_ESP: x86Command = 0x04B7; break; case x86_EBP: x86Command = 0x05B7; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (reg) { @@ -2249,7 +2246,7 @@ void CX86Ops::MoveZxN64MemToX86regHalf(x86Reg reg, x86Reg AddrReg) case x86_ESP: x86Command += 0xA000; break; case x86_EBP: x86Command += 0xA800; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST8(m_RecompPos, 0x0f); @@ -2274,7 +2271,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST32(m_RecompPos, Variable); } @@ -2296,7 +2293,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST32(m_RecompPos, Variable); } @@ -2315,7 +2312,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } @@ -2333,7 +2330,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } @@ -2360,7 +2357,7 @@ void CX86Ops::OrConstToX86Reg(uint32_t Const, x86Reg reg) case x86_ESP: PUTDST16(m_RecompPos, 0xCC81); break; case x86_EBP: PUTDST16(m_RecompPos, 0xCD81); break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST32(m_RecompPos, Const); } @@ -2377,7 +2374,7 @@ void CX86Ops::OrConstToX86Reg(uint32_t Const, x86Reg reg) case x86_ESP: PUTDST16(m_RecompPos, 0xCC83); break; case x86_EBP: PUTDST16(m_RecompPos, 0xCD83); break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST8(m_RecompPos, Const); } @@ -2397,7 +2394,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST32(m_RecompPos, Variable); } @@ -2416,7 +2413,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST32(m_RecompPos, Variable); } @@ -2437,7 +2434,7 @@ void CX86Ops::OrX86RegToX86Reg(x86Reg Destination, x86Reg Source) case x86_ESP: x86Command = 0x040B; break; case x86_EBP: x86Command = 0x050B; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (Destination) { @@ -2450,7 +2447,7 @@ void CX86Ops::OrX86RegToX86Reg(x86Reg Destination, x86Reg Source) case x86_ESP: x86Command += 0xE000; break; case x86_EBP: x86Command += 0xE800; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST16(m_RecompPos, x86Command); } @@ -2482,7 +2479,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } @@ -2501,7 +2498,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } @@ -2533,7 +2530,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } @@ -2556,7 +2553,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } @@ -2571,7 +2568,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } @@ -2594,7 +2591,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } @@ -2617,7 +2614,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } @@ -2640,7 +2637,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } @@ -2655,7 +2652,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } @@ -2677,7 +2674,7 @@ void CX86Ops::ShiftLeftDouble(x86Reg Destination, x86Reg Source) case x86_ESP: s |= 0x04; break; case x86_EBP: s |= 0x05; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (Source) @@ -2691,7 +2688,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST8(m_RecompPos, s); @@ -2715,7 +2712,7 @@ void CX86Ops::ShiftLeftDoubleImmed(x86Reg Destination, x86Reg Source, uint8_t Im case x86_ESP: s |= 0x04; break; case x86_EBP: s |= 0x05; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (Source) @@ -2729,7 +2726,7 @@ void CX86Ops::ShiftLeftDoubleImmed(x86Reg Destination, x86Reg Source, uint8_t Im case x86_ESP: s |= 0x04 << 3; break; case x86_EBP: s |= 0x05 << 3; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST8(m_RecompPos, s); @@ -2750,7 +2747,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } @@ -2768,7 +2765,7 @@ void CX86Ops::ShiftLeftSignImmed(x86Reg reg, uint8_t Immediate) case x86_ESP: PUTDST16(m_RecompPos, 0xE4C1); break; case x86_EBP: PUTDST16(m_RecompPos, 0xE5C1); break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST8(m_RecompPos, Immediate); } @@ -2787,7 +2784,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } @@ -2805,7 +2802,7 @@ void CX86Ops::ShiftRightSignImmed(x86Reg reg, uint8_t Immediate) case x86_ESP: PUTDST16(m_RecompPos, 0xFCC1); break; case x86_EBP: PUTDST16(m_RecompPos, 0xFDC1); break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST8(m_RecompPos, Immediate); } @@ -2824,7 +2821,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } @@ -2846,7 +2843,7 @@ void CX86Ops::ShiftRightDouble(x86Reg Destination, x86Reg Source) case x86_ESP: s |= 0x04; break; case x86_EBP: s |= 0x05; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (Source) @@ -2860,7 +2857,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST8(m_RecompPos, s); @@ -2884,7 +2881,7 @@ void CX86Ops::ShiftRightDoubleImmed(x86Reg Destination, x86Reg Source, uint8_t I case x86_ESP: s |= 0x04; break; case x86_EBP: s |= 0x05; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (Source) @@ -2898,7 +2895,7 @@ void CX86Ops::ShiftRightDoubleImmed(x86Reg Destination, x86Reg Source, uint8_t I case x86_ESP: s |= 0x04 << 3; break; case x86_EBP: s |= 0x05 << 3; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST8(m_RecompPos, s); @@ -2919,7 +2916,7 @@ void CX86Ops::ShiftRightUnsignImmed(x86Reg reg, uint8_t Immediate) case x86_ESP: PUTDST16(m_RecompPos, 0xECC1); break; case x86_EBP: PUTDST16(m_RecompPos, 0xEDC1); break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST8(m_RecompPos, Immediate); } @@ -2940,7 +2937,7 @@ void CX86Ops::SbbConstFromX86Reg(x86Reg reg, uint32_t Const) case x86_ESP: PUTDST16(m_RecompPos, 0xDC81); break; case x86_EBP: PUTDST16(m_RecompPos, 0xDD81); break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST32(m_RecompPos, Const); } @@ -2957,7 +2954,7 @@ void CX86Ops::SbbConstFromX86Reg(x86Reg reg, uint32_t Const) case x86_ESP: PUTDST16(m_RecompPos, 0xDC83); break; case x86_EBP: PUTDST16(m_RecompPos, 0xDD83); break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST8(m_RecompPos, Const); } @@ -2977,7 +2974,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST32(m_RecompPos, Variable); } @@ -2997,7 +2994,7 @@ void CX86Ops::SbbX86RegToX86Reg(x86Reg Destination, x86Reg Source) case x86_ESP: x86Command = 0x041B; break; case x86_EBP: x86Command = 0x051B; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (Destination) { @@ -3010,7 +3007,7 @@ void CX86Ops::SbbX86RegToX86Reg(x86Reg Destination, x86Reg Source) case x86_ESP: x86Command += 0xE000; break; case x86_EBP: x86Command += 0xE800; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST16(m_RecompPos, x86Command); } @@ -3040,7 +3037,7 @@ void CX86Ops::SubConstFromX86Reg(x86Reg reg, uint32_t Const) case x86_ESP: PUTDST16(m_RecompPos, 0xEC81); break; case x86_EBP: PUTDST16(m_RecompPos, 0xED81); break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST32(m_RecompPos, Const); } @@ -3057,7 +3054,7 @@ void CX86Ops::SubConstFromX86Reg(x86Reg reg, uint32_t Const) case x86_ESP: PUTDST16(m_RecompPos, 0xEC83); break; case x86_EBP: PUTDST16(m_RecompPos, 0xED83); break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST8(m_RecompPos, Const); } @@ -3078,7 +3075,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST32(m_RecompPos, Variable); } @@ -3099,7 +3096,7 @@ void CX86Ops::SubX86RegToX86Reg(x86Reg Destination, x86Reg Source) case x86_ESP: x86Command = 0x042B; break; case x86_EBP: x86Command = 0x052B; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (Destination) @@ -3113,7 +3110,7 @@ void CX86Ops::SubX86RegToX86Reg(x86Reg Destination, x86Reg Source) case x86_ESP: x86Command += 0xE000; break; case x86_EBP: x86Command += 0xE800; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST16(m_RecompPos, x86Command); } @@ -3133,7 +3130,7 @@ void CX86Ops::TestConstToX86Reg(uint32_t Const, x86Reg reg) case x86_ESP: PUTDST16(m_RecompPos, 0xC4F7); break; case x86_EBP: PUTDST16(m_RecompPos, 0xC5F7); break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST32(m_RecompPos, Const); } @@ -3161,7 +3158,7 @@ void CX86Ops::TestX86RegToX86Reg(x86Reg Destination, x86Reg Source) case x86_ESP: x86Command = 0x0485; break; case x86_EBP: x86Command = 0x0585; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (Destination) { @@ -3174,7 +3171,7 @@ void CX86Ops::TestX86RegToX86Reg(x86Reg Destination, x86Reg Source) case x86_ESP: x86Command += 0xE000; break; case x86_EBP: x86Command += 0xE800; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST16(m_RecompPos, x86Command); } @@ -3195,7 +3192,7 @@ void CX86Ops::XorConstToX86Reg(x86Reg reg, uint32_t Const) case x86_ESP: PUTDST16(m_RecompPos, 0xF481); break; case x86_EBP: PUTDST16(m_RecompPos, 0xF581); break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST32(m_RecompPos, Const); } @@ -3212,7 +3209,7 @@ void CX86Ops::XorConstToX86Reg(x86Reg reg, uint32_t Const) case x86_ESP: PUTDST16(m_RecompPos, 0xF483); break; case x86_EBP: PUTDST16(m_RecompPos, 0xF583); break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST8(m_RecompPos, Const); } @@ -3235,7 +3232,7 @@ void CX86Ops::XorX86RegToX86Reg(x86Reg Source, x86Reg Destination) case x86_ESP: x86Command = 0x0431; break; case x86_EBP: x86Command = 0x0531; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (Destination) { @@ -3248,7 +3245,7 @@ void CX86Ops::XorX86RegToX86Reg(x86Reg Source, x86Reg Destination) case x86_ESP: x86Command += 0xE000; break; case x86_EBP: x86Command += 0xE800; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST16(m_RecompPos, x86Command); } @@ -3268,7 +3265,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST32(m_RecompPos, Variable); } @@ -3298,7 +3295,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); break; } } @@ -3322,7 +3319,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); break; } } @@ -3340,7 +3337,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); break; } } @@ -3360,7 +3357,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); break; } } @@ -3386,7 +3383,7 @@ void CX86Ops::fpuComDwordRegPointer(x86Reg x86Pointer, bool Pop) case x86_ESI: x86Command = 0x16D8; break; case x86_EDI: x86Command = 0x17D8; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (Pop) @@ -3418,7 +3415,7 @@ void CX86Ops::fpuComQwordRegPointer(x86Reg x86Pointer, bool Pop) case x86_ESI: x86Command = 0x16DC; break; case x86_EDI: x86Command = 0x17DC; break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (Pop) @@ -3445,7 +3442,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); break; } } @@ -3469,7 +3466,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); break; } } @@ -3493,7 +3490,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); break; } } @@ -3512,7 +3509,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); break; } } @@ -3531,7 +3528,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); break; } } @@ -3550,7 +3547,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); break; } } @@ -3569,7 +3566,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); break; } } @@ -3617,7 +3614,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } @@ -3635,7 +3632,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST32(m_RecompPos, g_MMU->Rdram()); } @@ -3654,7 +3651,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST32(m_RecompPos, g_MMU->Rdram()); } @@ -3681,7 +3678,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } @@ -3707,7 +3704,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } @@ -3733,7 +3730,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } @@ -3751,7 +3748,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST32(m_RecompPos, g_MMU->Rdram()); } @@ -3771,7 +3768,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); break; } } @@ -3795,7 +3792,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); break; } } @@ -3819,7 +3816,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); break; } } @@ -3838,7 +3835,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); break; } } @@ -3857,7 +3854,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); break; } } @@ -3922,7 +3919,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST8(m_RecompPos, pop ? (Command + 0x8) : Command); @@ -3949,7 +3946,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST32(m_RecompPos, g_MMU->Rdram()); @@ -3989,7 +3986,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST8(m_RecompPos, pop ? (Command + 0x8) : Command); @@ -4009,7 +4006,7 @@ void CX86Ops::fpuStoreIntegerQword(int * StackPos, void *Variable, const char * if (!pop) { - X86BreakPoint(__FILEW__, __LINE__); + X86BreakPoint(__FILE__, __LINE__); } } @@ -4034,7 +4031,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST8(m_RecompPos, pop ? (Command + 0x8) : Command); @@ -4062,7 +4059,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } PUTDST8(m_RecompPos, pop ? (Command + 0x8) : Command); @@ -4093,7 +4090,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); break; } } @@ -4123,7 +4120,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); break; } } @@ -4148,7 +4145,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); break; } } @@ -4166,7 +4163,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(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); break; } } @@ -4183,7 +4180,7 @@ const char * CX86Ops::x86_Name(x86Reg Reg) case x86_EBP: return "ebp"; case x86_ESP: return "esp"; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } return "???"; } @@ -4200,7 +4197,7 @@ const char * CX86Ops::x86_ByteName(x86Reg Reg) case x86_CH: return "ch"; case x86_DH: return "dh"; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } return "???"; } @@ -4218,7 +4215,7 @@ const char * CX86Ops::x86_HalfName(x86Reg Reg) case x86_EBP: return "bp"; case x86_ESP: return "sp"; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } return "???"; } @@ -4236,7 +4233,7 @@ const char * CX86Ops::fpu_Name(x86FpuValues Reg) case x86_ST6: return "ST(6)"; case x86_ST7: return "ST(7)"; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } return "???"; } @@ -4269,13 +4266,13 @@ void CX86Ops::SetJump8(uint8_t * Loc, uint8_t * JumpLoc) { if (Loc == NULL || JumpLoc == NULL) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return; } uint32_t diffrence = (uint32_t)(((uint32_t)JumpLoc) - (((uint32_t)(Loc)) + 1)); if (diffrence > 255) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } *Loc = (uint8_t)diffrence; } diff --git a/Source/Project64-core/N64System/Recompiler/X86ops.h b/Source/Project64-core/N64System/Recompiler/X86ops.h index 8bb6f9382..c6c5d6101 100644 --- a/Source/Project64-core/N64System/Recompiler/X86ops.h +++ b/Source/Project64-core/N64System/Recompiler/X86ops.h @@ -79,7 +79,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(); - static void X86BreakPoint(const wchar_t * FileName, int32_t LineNumber); + static void X86BreakPoint(const char * FileName, int32_t LineNumber); static void Call_Direct(void * FunctAddress, const char * FunctName); static void Call_Indirect(void * FunctAddress, const char * FunctName); static void CompConstToVariable(uint32_t Const, void * Variable, const char * VariableName); @@ -297,7 +297,7 @@ protected: static void SetJump8(uint8_t * Loc, uint8_t * JumpLoc); private: - static void BreakPointNotification(const wchar_t * const FileName, const int32_t LineNumber); + static void BreakPointNotification(const char * FileName, int32_t LineNumber); static char m_fpupop[2][2]; }; diff --git a/Source/Project64-core/Notification.h b/Source/Project64-core/Notification.h index 1c3445ce8..760e89d7c 100644 --- a/Source/Project64-core/Notification.h +++ b/Source/Project64-core/Notification.h @@ -24,7 +24,7 @@ public: // Ask a Yes/No Question to the user, yes = true, no = false virtual bool AskYesNoQuestion(const wchar_t * Question) const = 0; - virtual void BreakPoint(const wchar_t * FileName, int LineNumber) = 0; + virtual void BreakPoint(const char * FileName, int32_t LineNumber) = 0; virtual void AppInitDone(void) = 0; virtual bool ProcessGuiMessages(void) const = 0; diff --git a/Source/Project64-core/Plugins/ControllerPlugin.cpp b/Source/Project64-core/Plugins/ControllerPlugin.cpp index 01240c51f..2ecabf1a4 100644 --- a/Source/Project64-core/Plugins/ControllerPlugin.cpp +++ b/Source/Project64-core/Plugins/ControllerPlugin.cpp @@ -90,8 +90,8 @@ bool CControl_Plugin::Initiate(CN64System * System, RenderWindow * Window) //Get Function from DLL void(__cdecl *InitiateControllers_1_0)(HWND hMainWindow, CONTROL Controls[4]); InitiateControllers_1_0 = (void(__cdecl *)(HWND, CONTROL *))GetProcAddress((HMODULE)m_hDll, "InitiateControllers"); - if (InitiateControllers_1_0 == NULL) { return false; } - InitiateControllers_1_0((HWND)Window->GetWindowHandle(), m_PluginControllers); + if (InitiateControllers_1_0 == NULL) { return false; } + InitiateControllers_1_0((HWND)Window->GetWindowHandle(), m_PluginControllers); m_Initialized = true; } else if (m_PluginInfo.Version == 0x0101) @@ -100,7 +100,7 @@ bool CControl_Plugin::Initiate(CN64System * System, RenderWindow * Window) void(__cdecl *InitiateControllers_1_1)(CONTROL_INFO ControlInfo); InitiateControllers_1_1 = (void(__cdecl *)(CONTROL_INFO))GetProcAddress((HMODULE)m_hDll, "InitiateControllers"); if (InitiateControllers_1_1 == NULL) { return false; } - + InitiateControllers_1_1(ControlInfo); m_Initialized = true; } @@ -109,7 +109,7 @@ bool CControl_Plugin::Initiate(CN64System * System, RenderWindow * Window) //Get Function from DLL void(__cdecl *InitiateControllers_1_2)(CONTROL_INFO * ControlInfo); InitiateControllers_1_2 = (void(__cdecl *)(CONTROL_INFO *))GetProcAddress((HMODULE)m_hDll, "InitiateControllers"); - if (InitiateControllers_1_2 == NULL) { return false; } + if (InitiateControllers_1_2 == NULL) { return false; } InitiateControllers_1_2(&ControlInfo); m_Initialized = true; @@ -154,7 +154,7 @@ void CControl_Plugin::UpdateKeys(void) } else { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } if (ReadController) { ReadController(-1, NULL); } @@ -181,4 +181,4 @@ CCONTROL::CCONTROL(int32_t &Present, int32_t &RawData, int32_t &PlugType) : m_Present(Present), m_RawData(RawData), m_PlugType(PlugType) { m_Buttons.Value = 0; -} +} diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-Application.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-Application.cpp index ba655d8ba..2f4a4965d 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-Application.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-Application.cpp @@ -122,7 +122,7 @@ bool CSettingTypeApplication::Load ( int /*Index*/, bool & Value ) const Value = dwValue != 0; } } else { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (!bRes && m_DefaultSetting != Default_None) @@ -144,7 +144,7 @@ bool CSettingTypeApplication::Load ( int /*Index*/, uint32_t & Value ) const { bRes = m_SettingsIniFile->GetNumber(SectionName(),m_KeyNameIdex.c_str(),Value,Value); } else { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __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(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __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(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } @@ -236,7 +236,7 @@ void CSettingTypeApplication::Save ( int /*Index*/, uint32_t Value ) { m_SettingsIniFile->SaveNumber(SectionName(),m_KeyNameIdex.c_str(),Value); } else { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __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(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __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(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } @@ -281,6 +281,6 @@ void CSettingTypeApplication::Delete( int /*Index*/ ) { m_SettingsIniFile->SaveString(SectionName(),m_KeyNameIdex.c_str(),NULL); } else { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-Cheats.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-Cheats.cpp index 4cf52eec0..85cba3966 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-Cheats.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-Cheats.cpp @@ -73,18 +73,18 @@ return ""; void CSettingTypeCheats::UpdateSettings ( void * ) { -g_Notify->BreakPoint(__FILEW__,__LINE__); +g_Notify->BreakPoint(__FILE__, __LINE__); }*/ bool CSettingTypeCheats::Load ( int /*Index*/, bool & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } bool CSettingTypeCheats::Load ( int /*Index*/, uint32_t & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } @@ -101,28 +101,28 @@ bool CSettingTypeCheats::Load ( int Index, stdstr & Value ) const //return the default values void CSettingTypeCheats::LoadDefault ( int /*Index*/, bool & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeCheats::LoadDefault ( int /*Index*/, uint32_t & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeCheats::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } //Update the settings void CSettingTypeCheats::Save ( int /*Index*/, bool /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeCheats::Save ( int /*Index*/, uint32_t /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeCheats::Save ( int Index, const stdstr & Value ) diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-GameSettingIndex.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-GameSettingIndex.cpp index 557cffb47..3f42fa8e8 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-GameSettingIndex.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-GameSettingIndex.cpp @@ -46,7 +46,7 @@ bool CSettingTypeGameIndex::Load ( int Index, bool & Value ) const bool CSettingTypeGameIndex::Load ( int /*Index*/, uint32_t & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } @@ -65,12 +65,12 @@ void CSettingTypeGameIndex::LoadDefault ( int Index, bool & Value ) const void CSettingTypeGameIndex::LoadDefault ( int /*Index*/, uint32_t & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeGameIndex::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } //Update the settings @@ -88,7 +88,7 @@ void CSettingTypeGameIndex::Save(int Index, uint32_t Value) void CSettingTypeGameIndex::Save ( int /*Index*/, const stdstr & /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeGameIndex::Save ( int Index, const char * Value ) diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-RDBCpuType.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-RDBCpuType.cpp index eb17c3747..8c5cb491a 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-RDBCpuType.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-RDBCpuType.cpp @@ -29,7 +29,7 @@ CSettingTypeRDBCpuType::~CSettingTypeRDBCpuType() bool CSettingTypeRDBCpuType::Load ( int /*Index*/, bool & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } @@ -52,21 +52,21 @@ bool CSettingTypeRDBCpuType::Load ( int Index, uint32_t & Value ) const LoadDefault(Index,Value); return false; } - else { g_Notify->BreakPoint(__FILEW__,__LINE__); } + else { g_Notify->BreakPoint(__FILE__, __LINE__); } return true; } bool CSettingTypeRDBCpuType::Load ( int /*Index*/, stdstr & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } //return the default values void CSettingTypeRDBCpuType::LoadDefault ( int /*Index*/, bool & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeRDBCpuType::LoadDefault ( int /*Index*/, uint32_t & Value ) const @@ -84,13 +84,13 @@ void CSettingTypeRDBCpuType::LoadDefault ( int /*Index*/, uint32_t & Value ) co void CSettingTypeRDBCpuType::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } //Update the settings void CSettingTypeRDBCpuType::Save ( int /*Index*/, bool /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeRDBCpuType::Save ( int /*Index*/, uint32_t Value ) @@ -102,19 +102,19 @@ void CSettingTypeRDBCpuType::Save ( int /*Index*/, uint32_t Value ) case CPU_Recompiler: strValue = "Recompiler"; break; case CPU_SyncCores: strValue = "SyncCores"; break; default: - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } m_SettingsIniFile->SaveString(m_SectionIdent->c_str(),m_KeyName.c_str(),strValue.c_str()); } void CSettingTypeRDBCpuType::Save ( int /*Index*/, const stdstr & /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeRDBCpuType::Save ( int /*Index*/, const char * /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeRDBCpuType::Delete( int /*Index*/ ) diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-RDBOnOff.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-RDBOnOff.cpp index 19f7aaf17..1462230ac 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-RDBOnOff.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-RDBOnOff.cpp @@ -44,20 +44,20 @@ bool CSettingTypeRDBOnOff::Load ( int Index, bool & Value ) const LoadDefault(Index,Value); return false; } - else { g_Notify->BreakPoint(__FILEW__,__LINE__); } + else { g_Notify->BreakPoint(__FILE__, __LINE__); } return true; } bool CSettingTypeRDBOnOff::Load ( int /*Index*/, uint32_t & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } bool CSettingTypeRDBOnOff::Load ( int /*Index*/, stdstr & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } @@ -77,12 +77,12 @@ void CSettingTypeRDBOnOff::LoadDefault ( int /*Index*/, bool & Value ) const void CSettingTypeRDBOnOff::LoadDefault ( int /*Index*/, uint32_t & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeRDBOnOff::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } //Update the settings @@ -93,17 +93,17 @@ void CSettingTypeRDBOnOff::Save ( int /*Index*/, bool Value ) void CSettingTypeRDBOnOff::Save ( int /*Index*/, uint32_t /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeRDBOnOff::Save ( int /*Index*/, const stdstr & /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeRDBOnOff::Save ( int /*Index*/, const char * /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeRDBOnOff::Delete( int /*Index*/ ) diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-RDBRamSize.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-RDBRamSize.cpp index 43d60b4c8..3577cb1bc 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-RDBRamSize.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-RDBRamSize.cpp @@ -30,7 +30,7 @@ CSettingTypeRDBRDRamSize::~CSettingTypeRDBRDRamSize() bool CSettingTypeRDBRDRamSize::Load ( int /*Index*/, bool & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } @@ -52,14 +52,14 @@ bool CSettingTypeRDBRDRamSize::Load ( int Index, uint32_t & Value ) const bool CSettingTypeRDBRDRamSize::Load ( int /*Index*/, stdstr & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } //return the default values void CSettingTypeRDBRDRamSize::LoadDefault ( int /*Index*/, bool & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeRDBRDRamSize::LoadDefault ( int /*Index*/, uint32_t & Value ) const @@ -69,13 +69,13 @@ void CSettingTypeRDBRDRamSize::LoadDefault ( int /*Index*/, uint32_t & Value ) void CSettingTypeRDBRDRamSize::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } //Update the settings void CSettingTypeRDBRDRamSize::Save ( int /*Index*/, bool /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeRDBRDRamSize::Save ( int /*Index*/, uint32_t Value ) @@ -85,12 +85,12 @@ void CSettingTypeRDBRDRamSize::Save ( int /*Index*/, uint32_t Value ) void CSettingTypeRDBRDRamSize::Save ( int /*Index*/, const stdstr & /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeRDBRDRamSize::Save ( int /*Index*/, const char * /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeRDBRDRamSize::Delete( int /*Index*/ ) diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-RDBSaveChip.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-RDBSaveChip.cpp index b434957a0..75de85156 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-RDBSaveChip.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-RDBSaveChip.cpp @@ -29,7 +29,7 @@ CSettingTypeRDBSaveChip::~CSettingTypeRDBSaveChip() bool CSettingTypeRDBSaveChip::Load ( int /*Index*/, bool & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } @@ -54,7 +54,7 @@ bool CSettingTypeRDBSaveChip::Load ( int Index, uint32_t & Value ) const LoadDefault(Index,Value); return false; } else { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } return true; @@ -62,14 +62,14 @@ bool CSettingTypeRDBSaveChip::Load ( int Index, uint32_t & Value ) const bool CSettingTypeRDBSaveChip::Load ( int /*Index*/, stdstr & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } //return the default values void CSettingTypeRDBSaveChip::LoadDefault ( int /*Index*/, bool & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeRDBSaveChip::LoadDefault ( int /*Index*/, uint32_t & Value ) const @@ -87,13 +87,13 @@ void CSettingTypeRDBSaveChip::LoadDefault ( int /*Index*/, uint32_t & Value ) c void CSettingTypeRDBSaveChip::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } //Update the settings void CSettingTypeRDBSaveChip::Save ( int /*Index*/, bool /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeRDBSaveChip::Save ( int /*Index*/, uint32_t Value ) @@ -106,18 +106,18 @@ void CSettingTypeRDBSaveChip::Save ( int /*Index*/, uint32_t 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: - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } void CSettingTypeRDBSaveChip::Save ( int /*Index*/, const stdstr & /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeRDBSaveChip::Save ( int /*Index*/, const char * /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeRDBSaveChip::Delete( int /*Index*/ ) diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-RDBYesNo.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-RDBYesNo.cpp index d877a838d..24d1832d7 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-RDBYesNo.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-RDBYesNo.cpp @@ -62,13 +62,13 @@ bool CSettingTypeRDBYesNo::Load ( int Index, bool & Value ) const bool CSettingTypeRDBYesNo::Load ( int /*Index*/, uint32_t & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } bool CSettingTypeRDBYesNo::Load ( int /*Index*/, stdstr & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } @@ -88,12 +88,12 @@ void CSettingTypeRDBYesNo::LoadDefault ( int /*Index*/, bool & Value ) const void CSettingTypeRDBYesNo::LoadDefault ( int /*Index*/, uint32_t & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeRDBYesNo::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } //Update the settings @@ -109,12 +109,12 @@ void CSettingTypeRDBYesNo::Save ( int /*Index*/, uint32_t Value ) void CSettingTypeRDBYesNo::Save ( int /*Index*/, const stdstr & /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeRDBYesNo::Save ( int /*Index*/, const char * /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeRDBYesNo::Delete( int /*Index*/ ) diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-RelativePath.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-RelativePath.cpp index d91a35187..03f789ab0 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-RelativePath.cpp +++ b/Source/Project64-core/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 { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeRelativePath::LoadDefault ( int /*Index*/, uint32_t & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeRelativePath::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeRelativePath::Save ( int /*Index*/, bool /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeRelativePath::Save ( int /*Index*/, uint32_t /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __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*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabase.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabase.cpp index 1f9fee913..dbd95b041 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabase.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabase.cpp @@ -195,7 +195,7 @@ void CSettingTypeRomDatabase::Save ( int /*Index*/, bool Value ) } if (m_DeleteOnDefault) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (m_GlideSetting) { diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabaseIndex.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabaseIndex.cpp index 302184c9c..fe7797232 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabaseIndex.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-RomDatabaseIndex.cpp @@ -46,13 +46,13 @@ CSettingTypeRomDatabaseIndex::~CSettingTypeRomDatabaseIndex() bool CSettingTypeRomDatabaseIndex::Load ( int /*Index*/, bool & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } bool CSettingTypeRomDatabaseIndex::Load ( int /*Index*/, uint32_t & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } @@ -82,22 +82,22 @@ void CSettingTypeRomDatabaseIndex::LoadDefault ( int Index, stdstr & Value ) con void CSettingTypeRomDatabaseIndex::Save ( int /*Index*/, bool /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeRomDatabaseIndex::Save ( int /*Index*/, uint32_t /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeRomDatabaseIndex::Save ( int /*Index*/, const stdstr & /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeRomDatabaseIndex::Save ( int /*Index*/, const char * /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeRomDatabaseIndex::Delete ( int /*Index*/ ) diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-SelectedDirectory.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-SelectedDirectory.cpp index 12a4fcb19..e0920612b 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-SelectedDirectory.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-SelectedDirectory.cpp @@ -25,13 +25,13 @@ CSettingTypeSelectedDirectory::~CSettingTypeSelectedDirectory() bool CSettingTypeSelectedDirectory::Load ( int /*Index*/, bool & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } bool CSettingTypeSelectedDirectory::Load ( int /*Index*/, uint32_t & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } @@ -44,33 +44,33 @@ bool CSettingTypeSelectedDirectory::Load ( int /*Index*/, stdstr & Value ) const //return the default values void CSettingTypeSelectedDirectory::LoadDefault ( int /*Index*/, bool & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeSelectedDirectory::LoadDefault ( int /*Index*/, uint32_t & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeSelectedDirectory::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } //Update the settings void CSettingTypeSelectedDirectory::Save ( int /*Index*/, bool /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeSelectedDirectory::Save ( int /*Index*/, uint32_t /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeSelectedDirectory::Save ( int /*Index*/, const stdstr & /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeSelectedDirectory::Save ( int /*Index*/, const char * Value ) @@ -81,5 +81,5 @@ void CSettingTypeSelectedDirectory::Save ( int /*Index*/, const char * Value ) void CSettingTypeSelectedDirectory::Delete( int /*Index*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-TempBool.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-TempBool.cpp index cd27a200a..70a8b4728 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-TempBool.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-TempBool.cpp @@ -28,30 +28,30 @@ bool CSettingTypeTempBool::Load ( int /*Index*/, bool & Value ) const bool CSettingTypeTempBool::Load ( int /*Index*/, uint32_t & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } bool CSettingTypeTempBool::Load ( int /*Index*/, stdstr & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } //return the default values void CSettingTypeTempBool::LoadDefault ( int /*Index*/, bool & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeTempBool::LoadDefault ( int /*Index*/, uint32_t & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeTempBool::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeTempBool::Save ( int /*Index*/, bool Value ) @@ -61,20 +61,20 @@ void CSettingTypeTempBool::Save ( int /*Index*/, bool Value ) void CSettingTypeTempBool::Save ( int /*Index*/, uint32_t /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeTempBool::Save ( int /*Index*/, const stdstr & /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeTempBool::Save ( int /*Index*/, const char * /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeTempBool::Delete( int /*Index*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-TempNumber.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-TempNumber.cpp index f04640564..35796870a 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-TempNumber.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-TempNumber.cpp @@ -22,7 +22,7 @@ CSettingTypeTempNumber::~CSettingTypeTempNumber ( void ) bool CSettingTypeTempNumber::Load ( int /*Index*/, bool & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return true; } @@ -34,29 +34,29 @@ bool CSettingTypeTempNumber::Load ( int /*Index*/, uint32_t & Value ) const bool CSettingTypeTempNumber::Load ( int /*Index*/, stdstr & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } //return the default values void CSettingTypeTempNumber::LoadDefault ( int /*Index*/, bool & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeTempNumber::LoadDefault ( int /*Index*/, uint32_t & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeTempNumber::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeTempNumber::Save ( int /*Index*/, bool /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeTempNumber::Save ( int /*Index*/, uint32_t Value ) @@ -66,15 +66,15 @@ void CSettingTypeTempNumber::Save ( int /*Index*/, uint32_t Value ) void CSettingTypeTempNumber::Save ( int /*Index*/, const stdstr & /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeTempNumber::Save ( int /*Index*/, const char * /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeTempNumber::Delete( int /*Index*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } diff --git a/Source/Project64-core/Settings/SettingType/SettingsType-TempString.cpp b/Source/Project64-core/Settings/SettingType/SettingsType-TempString.cpp index b0e536c43..51a56124a 100644 --- a/Source/Project64-core/Settings/SettingType/SettingsType-TempString.cpp +++ b/Source/Project64-core/Settings/SettingType/SettingsType-TempString.cpp @@ -22,13 +22,13 @@ CSettingTypeTempString::~CSettingTypeTempString ( void ) bool CSettingTypeTempString::Load ( int /*Index*/, bool & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } bool CSettingTypeTempString::Load ( int /*Index*/, uint32_t & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } @@ -41,27 +41,27 @@ bool CSettingTypeTempString::Load ( int /*Index*/, stdstr & Value ) const //return the default values void CSettingTypeTempString::LoadDefault ( int /*Index*/, bool & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeTempString::LoadDefault ( int /*Index*/, uint32_t & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeTempString::LoadDefault ( int /*Index*/, stdstr & /*Value*/ ) const { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeTempString::Save ( int /*Index*/, bool /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeTempString::Save ( int /*Index*/, uint32_t /*Value*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettingTypeTempString::Save ( int /*Index*/, const stdstr & Value ) @@ -76,5 +76,5 @@ void CSettingTypeTempString::Save ( int /*Index*/, const char * Value ) void CSettingTypeTempString::Delete( int /*Index*/ ) { - g_Notify->BreakPoint(__FILEW__,__LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } diff --git a/Source/Project64-core/Settings/SettingsClass.cpp b/Source/Project64-core/Settings/SettingsClass.cpp index 62050a0e7..89797d716 100644 --- a/Source/Project64-core/Settings/SettingsClass.cpp +++ b/Source/Project64-core/Settings/SettingsClass.cpp @@ -110,7 +110,7 @@ void CSettings::AddHowToHandleSetting() AddHandler(Setting_ApplicationName, new CSettingTypeTempString("")); AddHandler(Setting_UseFromRegistry, new CSettingTypeApplication("Settings", "Use Registry", (uint32_t)false)); AddHandler(Setting_RdbEditor, new CSettingTypeApplication("", "Rdb Editor", false)); - AddHandler(Setting_CN64TimeCritical,new CSettingTypeApplication("","CN64TimeCritical",false)); + AddHandler(Setting_CN64TimeCritical, new CSettingTypeApplication("", "CN64TimeCritical", false)); AddHandler(Setting_PluginPageFirst, new CSettingTypeApplication("", "Plugin Page First", false)); AddHandler(Setting_DisableScrSaver, new CSettingTypeApplication("", "Disable Screen Saver", (uint32_t)true)); AddHandler(Setting_AutoSleep, new CSettingTypeApplication("", "Auto Sleep", (uint32_t)true)); @@ -439,7 +439,7 @@ void CSettings::RegisterSetting(CSettings * _this, SettingID ID, SettingID Defau case SettingType_ConstValue: if (DataType != Data_DWORD) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return; } _this->AddHandler(ID, new CSettingTypeTempNumber(Value)); @@ -447,7 +447,7 @@ void CSettings::RegisterSetting(CSettings * _this, SettingID ID, SettingID Defau case SettingType_ConstString: if (DataType != Data_String) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return; } _this->AddHandler(ID, new CSettingTypeTempString(DefaultStr)); @@ -477,7 +477,7 @@ void CSettings::RegisterSetting(CSettings * _this, SettingID ID, SettingID Defau } break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } break; case SettingType_GameSetting: @@ -509,7 +509,7 @@ void CSettings::RegisterSetting(CSettings * _this, SettingID ID, SettingID Defau } break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } break; @@ -537,7 +537,7 @@ void CSettings::RegisterSetting(CSettings * _this, SettingID ID, SettingID Defau } break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } break; case SettingType_RdbSetting: @@ -557,11 +557,11 @@ void CSettings::RegisterSetting(CSettings * _this, SettingID ID, SettingID Defau } break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } @@ -595,7 +595,7 @@ bool CSettings::LoadBool(SettingID Type, bool & Value) } if (FindInfo->second->IndexBasedSetting()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } else { @@ -626,7 +626,7 @@ bool CSettings::LoadBoolIndex(SettingID Type, int index, bool & Value) } else { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } return false; } @@ -649,7 +649,7 @@ bool CSettings::LoadDword(SettingID Type, uint32_t & Value) } if (FindInfo->second->IndexBasedSetting()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } else { @@ -680,7 +680,7 @@ bool CSettings::LoadDwordIndex(SettingID Type, int index, uint32_t & Value) } else { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } return false; } @@ -703,7 +703,7 @@ bool CSettings::LoadStringVal(SettingID Type, stdstr & Value) } if (FindInfo->second->IndexBasedSetting()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } else { @@ -724,7 +724,7 @@ bool CSettings::LoadStringVal(SettingID Type, char * Buffer, int BufferSize) bool bRes = false; if (FindInfo->second->IndexBasedSetting()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } else { @@ -762,14 +762,14 @@ bool CSettings::LoadStringIndex(SettingID Type, int index, stdstr & Value) } else { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } return false; } bool CSettings::LoadStringIndex(SettingID /*Type*/, int /*index*/, char * /*Buffer*/, int /*BufferSize*/) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } @@ -793,7 +793,7 @@ void CSettings::LoadDefaultBool(SettingID Type, bool & Value) { if (FindInfo->second->IndexBasedSetting()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } else { @@ -804,13 +804,13 @@ void CSettings::LoadDefaultBool(SettingID Type, bool & Value) bool CSettings::LoadDefaultBoolIndex(SettingID /*Type*/, int /*index*/) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } void CSettings::LoadDefaultBoolIndex(SettingID /*Type*/, int /*index*/, bool & /*Value*/) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } uint32_t CSettings::LoadDefaultDword(SettingID Type) @@ -832,7 +832,7 @@ void CSettings::LoadDefaultDword(SettingID Type, uint32_t & Value) { if (FindInfo->second->IndexBasedSetting()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } else { @@ -843,13 +843,13 @@ void CSettings::LoadDefaultDword(SettingID Type, uint32_t & Value) uint32_t CSettings::LoadDefaultDwordIndex(SettingID /*Type*/, int /*index*/) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } void CSettings::LoadDefaultDwordIndex(SettingID /*Type*/, int /*index*/, uint32_t & /*Value*/) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } stdstr CSettings::LoadDefaultString(SettingID Type) @@ -871,7 +871,7 @@ void CSettings::LoadDefaultString(SettingID Type, stdstr & Value) { if (FindInfo->second->IndexBasedSetting()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } else { @@ -882,23 +882,23 @@ void CSettings::LoadDefaultString(SettingID Type, stdstr & Value) void CSettings::LoadDefaultString(SettingID /*Type*/, char * /*Buffer*/, int /*BufferSize*/) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } stdstr CSettings::LoadDefaultStringIndex(SettingID /*Type*/, int /*index*/) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return false; } void CSettings::LoadDefaultStringIndex(SettingID /*Type*/, int /*index*/, stdstr & /*Value*/) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettings::LoadDefaultStringIndex(SettingID /*Type*/, int /*index*/, char * /*Buffer*/, int /*BufferSize*/) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CSettings::SaveBool(SettingID Type, bool Value) @@ -912,7 +912,7 @@ void CSettings::SaveBool(SettingID Type, bool Value) } if (FindInfo->second->IndexBasedSetting()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } else { @@ -936,7 +936,7 @@ void CSettings::SaveBoolIndex(SettingID Type, int index, bool Value) } else { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } NotifyCallBacks(Type); } @@ -952,7 +952,7 @@ void CSettings::SaveDword(SettingID Type, uint32_t Value) } if (FindInfo->second->IndexBasedSetting()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } else { @@ -976,7 +976,7 @@ void CSettings::SaveDwordIndex(SettingID Type, int index, uint32_t Value) } else { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } NotifyCallBacks(Type); } @@ -992,7 +992,7 @@ void CSettings::SaveString(SettingID Type, const stdstr & Value) } if (FindInfo->second->IndexBasedSetting()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } else { @@ -1011,7 +1011,7 @@ void CSettings::SaveString(SettingID Type, const char * Buffer) } if (FindInfo->second->IndexBasedSetting()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } else { @@ -1034,7 +1034,7 @@ void CSettings::SaveStringIndex(SettingID Type, int index, const char * Buffer) } else { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } NotifyCallBacks(Type); } @@ -1054,7 +1054,7 @@ void CSettings::DeleteSetting(SettingID Type) } if (FindInfo->second->IndexBasedSetting()) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } else { @@ -1077,7 +1077,7 @@ void CSettings::DeleteSettingIndex(SettingID Type, int index) } else { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } NotifyCallBacks(Type); } @@ -1120,7 +1120,7 @@ void CSettings::SettingTypeChanged(SettingType Type) void CSettings::UnknownSetting(SettingID /*Type*/) { #ifdef _DEBUG - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); #endif } @@ -1211,6 +1211,6 @@ void CSettings::UnregisterChangeCB(SettingID Type, void * Data, SettingChangedFu if (!bRemoved) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } -} +} \ No newline at end of file diff --git a/Source/Project64/N64System/Debugger/Debugger-MemoryDump.cpp b/Source/Project64/N64System/Debugger/Debugger-MemoryDump.cpp index 5303e7e3d..ce28b7116 100644 --- a/Source/Project64/N64System/Debugger/Debugger-MemoryDump.cpp +++ b/Source/Project64/N64System/Debugger/Debugger-MemoryDump.cpp @@ -137,7 +137,7 @@ bool CDumpMemory::DumpMemory(LPCSTR FileName, DumpFormat Format, DWORD StartPC, } LogFile.SetFlush(false); LogFile.SetTruncateFile(false); - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); #ifdef tofix char Command[200]; for (COpcode OpCode(StartPC); OpCode.PC() < EndPC; OpCode.Next()) diff --git a/Source/Project64/N64System/Debugger/Debugger-MemorySearch.cpp b/Source/Project64/N64System/Debugger/Debugger-MemorySearch.cpp index 07f553a77..9b9499c00 100644 --- a/Source/Project64/N64System/Debugger/Debugger-MemorySearch.cpp +++ b/Source/Project64/N64System/Debugger/Debugger-MemorySearch.cpp @@ -329,7 +329,7 @@ void CDebugMemorySearch::SearchForValue(void) valid = g_MMU->LW_PAddr(Result.PAddr, NewValue); break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (Value == NewValue) @@ -464,7 +464,7 @@ void CDebugMemorySearch::SearchForUnknown() valid = g_MMU->LW_PAddr(Result.PAddr, NewValue); break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } switch (Option) @@ -494,7 +494,7 @@ void CDebugMemorySearch::SearchForUnknown() } break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (UpdateResult) @@ -517,7 +517,7 @@ void CDebugMemorySearch::SearchForUnknown() void CDebugMemorySearch::SearchForText() { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } void CDebugMemorySearch::Reset(void) @@ -597,7 +597,7 @@ bool CDebugMemorySearch::SearchForChanges(SearchMemChangeState SearchType, Memor if (SearchType == SearchChangeState_Reset) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } if (Size == _32Bit) { StartAddress = ((StartAddress + 3) & ~3); } if (Size == _16Bit) { StartAddress = ((StartAddress + 1) & ~1); } @@ -664,7 +664,7 @@ bool CDebugMemorySearch::SearchForChanges(SearchMemChangeState SearchType, Memor } break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } return false; @@ -733,7 +733,7 @@ bool CDebugMemorySearch::SearchForValue(DWORD Value, MemorySize Size, DWORD &Sta } break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } if (StartAddress >= 0x10000000) @@ -783,7 +783,7 @@ bool CDebugMemorySearch::SearchForValue(DWORD Value, MemorySize Size, DWORD &Sta } break; default: - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } } return false; diff --git a/Source/Project64/UserInterface/CheatClassUI.cpp b/Source/Project64/UserInterface/CheatClassUI.cpp index 2ce2b9585..1e7c7fe80 100644 --- a/Source/Project64/UserInterface/CheatClassUI.cpp +++ b/Source/Project64/UserInterface/CheatClassUI.cpp @@ -44,7 +44,7 @@ void CCheatsUI::AddCodeLayers(int CheatNumber, const stdstr &CheatName, HWND hPa //Work out text to add char Text[500], Item[500]; - if (CheatName.length() > (sizeof(Text) - 5)) { g_Notify->BreakPoint(__FILEW__, __LINE__); } + if (CheatName.length() > (sizeof(Text) - 5)) { g_Notify->BreakPoint(__FILE__, __LINE__); } strcpy(Text, CheatName.c_str()); if (strchr(Text, '\\') > 0) { *strchr(Text, '\\') = 0; } @@ -1133,7 +1133,7 @@ void CCheatsUI::MenuSetText(HMENU hMenu, int MenuPos, const wchar_t * Title, con stdstr CCheatsUI::GetCheatName(int CheatNo, bool AddExtension) const { - if (CheatNo > CCheats::MaxCheats) { g_Notify->BreakPoint(__FILEW__, __LINE__); } + if (CheatNo > CCheats::MaxCheats) { g_Notify->BreakPoint(__FILE__, __LINE__); } stdstr LineEntry = g_Settings->LoadStringIndex(Cheat_Entry, CheatNo); if (LineEntry.length() == 0) { return LineEntry; } diff --git a/Source/Project64/UserInterface/GuiClass.cpp b/Source/Project64/UserInterface/GuiClass.cpp index addbfb161..36c135368 100644 --- a/Source/Project64/UserInterface/GuiClass.cpp +++ b/Source/Project64/UserInterface/GuiClass.cpp @@ -599,7 +599,7 @@ void CMainGui::SetStatusText(int Panel, const wchar_t * Text) static wchar_t Message[2][500]; if (Panel >= 2) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); return; } wchar_t * Msg = Message[Panel]; @@ -946,7 +946,7 @@ LRESULT CALLBACK CMainGui::MainGui_Proc(HWND hWnd, DWORD uMsg, DWORD wParam, DWO CMainGui * _this = (CMainGui *)GetProp(hWnd, "Class"); if (_this->m_ResetInfo != NULL) { - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); } _this->m_ResetInfo = (RESET_PLUGIN *)lParam; _this->m_ResetPlugins = true; diff --git a/Source/Project64/UserInterface/NotificationClass.cpp b/Source/Project64/UserInterface/NotificationClass.cpp index 833e682e7..fde362635 100644 --- a/Source/Project64/UserInterface/NotificationClass.cpp +++ b/Source/Project64/UserInterface/NotificationClass.cpp @@ -205,7 +205,7 @@ void CNotificationImp::RefreshMenu(void) #if defined(WINDOWS_UI) m_hWnd->RefreshMenu(); #else - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); #endif } @@ -233,7 +233,7 @@ void CNotificationImp::BringToTop(void) #if defined(WINDOWS_UI) m_hWnd->BringToTop(); #else - g_Notify->BreakPoint(__FILEW__, __LINE__); + g_Notify->BreakPoint(__FILE__, __LINE__); #endif } @@ -250,11 +250,11 @@ bool CNotificationImp::ProcessGuiMessages(void) const return m_hWnd->ProcessGuiMessages(); } -void CNotificationImp::BreakPoint(const wchar_t * FileName, int LineNumber) +void CNotificationImp::BreakPoint(const char * FileName, int LineNumber) { if (g_Settings->LoadBool(Debugger_Enabled)) { - DisplayError(stdstr_f("Break point found at\n%ws\n%d", FileName, LineNumber).ToUTF16().c_str()); + DisplayError(stdstr_f("Break point found at\n%s\n%d", FileName, LineNumber).ToUTF16().c_str()); if (IsDebuggerPresent() != 0) { DebugBreak(); diff --git a/Source/Project64/UserInterface/NotificationClass.h b/Source/Project64/UserInterface/NotificationClass.h index 7efe7dc10..5bbf3e3dc 100644 --- a/Source/Project64/UserInterface/NotificationClass.h +++ b/Source/Project64/UserInterface/NotificationClass.h @@ -43,7 +43,7 @@ public: // Ask a Yes/No Question to the user, yes = true, no = false virtual bool AskYesNoQuestion(const wchar_t * Question) const; - virtual void BreakPoint(const wchar_t * FileName, int LineNumber); + virtual void BreakPoint(const char * FileName, int32_t LineNumber); void SetWindowCaption(const wchar_t * Caption);