diff options
| author | Lioncash <mathew1800@gmail.com> | 2020-12-02 13:17:27 -0500 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2020-12-02 13:38:33 -0500 |
| commit | 139d4fc76e4ddf45179ca5ec5e42c52ef513ea4d (patch) | |
| tree | a639ad5dfd8a1b85eb32d408e2068dce9f41ce00 /Source/Core/Common | |
| parent | 5abae61a8c7e0e4ac03bb8d3031793037e87fdd3 (diff) | |
General: Convert PanicAlerts over to fmt equivalent
Converts lingering panic alert calls over to the fmt-capable ones.
Diffstat (limited to 'Source/Core/Common')
| -rw-r--r-- | Source/Core/Common/ChunkFile.h | 7 | ||||
| -rw-r--r-- | Source/Core/Common/GL/GLInterface/WGL.cpp | 16 | ||||
| -rw-r--r-- | Source/Core/Common/MemArena.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/Common/MemoryUtil.cpp | 22 | ||||
| -rw-r--r-- | Source/Core/Common/TraversalClient.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/Common/x64Emitter.cpp | 36 |
6 files changed, 47 insertions, 40 deletions
diff --git a/Source/Core/Common/ChunkFile.h b/Source/Core/Common/ChunkFile.h index 84ded0259d..10f276e595 100644 --- a/Source/Core/Common/ChunkFile.h +++ b/Source/Core/Common/ChunkFile.h @@ -267,9 +267,10 @@ public: if (mode == PointerWrap::MODE_READ && cookie != arbitraryNumber) { - PanicAlertT("Error: After \"%s\", found %d (0x%X) instead of save marker %d (0x%X). Aborting " - "savestate load...", - prevName.c_str(), cookie, cookie, arbitraryNumber, arbitraryNumber); + PanicAlertFmtT( + "Error: After \"{0}\", found {1} ({2:#x}) instead of save marker {3} ({4:#x}). Aborting " + "savestate load...", + prevName, cookie, cookie, arbitraryNumber, arbitraryNumber); mode = PointerWrap::MODE_MEASURE; } } diff --git a/Source/Core/Common/GL/GLInterface/WGL.cpp b/Source/Core/Common/GL/GLInterface/WGL.cpp index cf30dcf5e3..33d30c0a71 100644 --- a/Source/Core/Common/GL/GLInterface/WGL.cpp +++ b/Source/Core/Common/GL/GLInterface/WGL.cpp @@ -277,27 +277,27 @@ bool GLContextWGL::Initialize(const WindowSystemInfo& wsi, bool stereo, bool cor m_dc = GetDC(m_window_handle); if (!m_dc) { - PanicAlert("(1) Can't create an OpenGL Device context. Fail."); + PanicAlertFmt("(1) Can't create an OpenGL Device context. Fail."); return false; } - int pixel_format = ChoosePixelFormat(m_dc, &pfd); - if (!pixel_format) + const int pixel_format = ChoosePixelFormat(m_dc, &pfd); + if (pixel_format == 0) { - PanicAlert("(2) Can't find a suitable PixelFormat."); + PanicAlertFmt("(2) Can't find a suitable PixelFormat."); return false; } if (!SetPixelFormat(m_dc, pixel_format, &pfd)) { - PanicAlert("(3) Can't set the PixelFormat."); + PanicAlertFmt("(3) Can't set the PixelFormat."); return false; } m_rc = wglCreateContext(m_dc); if (!m_rc) { - PanicAlert("(4) Can't create an OpenGL rendering context."); + PanicAlertFmt("(4) Can't create an OpenGL rendering context."); return false; } @@ -310,7 +310,7 @@ bool GLContextWGL::Initialize(const WindowSystemInfo& wsi, bool stereo, bool cor // This is because we need an active context to use wglCreateContextAttribsARB. if (!wglMakeCurrent(m_dc, m_rc)) { - PanicAlert("(5) Can't make dummy WGL context current."); + PanicAlertFmt("(5) Can't make dummy WGL context current."); return false; } @@ -324,7 +324,7 @@ bool GLContextWGL::Initialize(const WindowSystemInfo& wsi, bool stereo, bool cor // context. If we didn't get a core context, the caller expects that the context is not current. if (!wglMakeCurrent(m_dc, nullptr)) { - PanicAlert("(6) Failed to switch out temporary context"); + PanicAlertFmt("(6) Failed to switch out temporary context"); return false; } diff --git a/Source/Core/Common/MemArena.cpp b/Source/Core/Common/MemArena.cpp index 48f9b678e7..f27c4ccaf6 100644 --- a/Source/Core/Common/MemArena.cpp +++ b/Source/Core/Common/MemArena.cpp @@ -145,7 +145,7 @@ u8* MemArena::FindMemoryBase() u8* base = static_cast<u8*>(VirtualAlloc(nullptr, memory_size, MEM_RESERVE, PAGE_READWRITE)); if (!base) { - PanicAlert("Failed to map enough memory space: %s", GetLastErrorString().c_str()); + PanicAlertFmt("Failed to map enough memory space: {}", GetLastErrorString()); return nullptr; } VirtualFree(base, 0, MEM_RELEASE); @@ -162,7 +162,7 @@ u8* MemArena::FindMemoryBase() void* base = mmap(nullptr, memory_size, PROT_NONE, flags, -1, 0); if (base == MAP_FAILED) { - PanicAlert("Failed to map enough memory space: %s", LastStrerrorString().c_str()); + PanicAlertFmt("Failed to map enough memory space: {}", LastStrerrorString()); return nullptr; } munmap(base, memory_size); diff --git a/Source/Core/Common/MemoryUtil.cpp b/Source/Core/Common/MemoryUtil.cpp index 909c12fa90..ca9fa64185 100644 --- a/Source/Core/Common/MemoryUtil.cpp +++ b/Source/Core/Common/MemoryUtil.cpp @@ -46,7 +46,7 @@ void* AllocateExecutableMemory(size_t size) #endif if (ptr == nullptr) - PanicAlert("Failed to allocate executable memory"); + PanicAlertFmt("Failed to allocate executable memory"); return ptr; } @@ -63,7 +63,7 @@ void* AllocateMemoryPages(size_t size) #endif if (ptr == nullptr) - PanicAlert("Failed to allocate raw memory"); + PanicAlertFmt("Failed to allocate raw memory"); return ptr; } @@ -79,7 +79,7 @@ void* AllocateAlignedMemory(size_t size, size_t alignment) #endif if (ptr == nullptr) - PanicAlert("Failed to allocate aligned memory"); + PanicAlertFmt("Failed to allocate aligned memory"); return ptr; } @@ -90,10 +90,10 @@ void FreeMemoryPages(void* ptr, size_t size) { #ifdef _WIN32 if (!VirtualFree(ptr, 0, MEM_RELEASE)) - PanicAlert("FreeMemoryPages failed!\nVirtualFree: %s", GetLastErrorString().c_str()); + PanicAlertFmt("FreeMemoryPages failed!\nVirtualFree: {}", GetLastErrorString()); #else if (munmap(ptr, size) != 0) - PanicAlert("FreeMemoryPages failed!\nmunmap: %s", LastStrerrorString().c_str()); + PanicAlertFmt("FreeMemoryPages failed!\nmunmap: {}", LastStrerrorString()); #endif } } @@ -115,10 +115,10 @@ void ReadProtectMemory(void* ptr, size_t size) #ifdef _WIN32 DWORD oldValue; if (!VirtualProtect(ptr, size, PAGE_NOACCESS, &oldValue)) - PanicAlert("ReadProtectMemory failed!\nVirtualProtect: %s", GetLastErrorString().c_str()); + PanicAlertFmt("ReadProtectMemory failed!\nVirtualProtect: {}", GetLastErrorString()); #else if (mprotect(ptr, size, PROT_NONE) != 0) - PanicAlert("ReadProtectMemory failed!\nmprotect: %s", LastStrerrorString().c_str()); + PanicAlertFmt("ReadProtectMemory failed!\nmprotect: {}", LastStrerrorString()); #endif } @@ -127,10 +127,10 @@ void WriteProtectMemory(void* ptr, size_t size, bool allowExecute) #ifdef _WIN32 DWORD oldValue; if (!VirtualProtect(ptr, size, allowExecute ? PAGE_EXECUTE_READ : PAGE_READONLY, &oldValue)) - PanicAlert("WriteProtectMemory failed!\nVirtualProtect: %s", GetLastErrorString().c_str()); + PanicAlertFmt("WriteProtectMemory failed!\nVirtualProtect: {}", GetLastErrorString()); #else if (mprotect(ptr, size, allowExecute ? (PROT_READ | PROT_EXEC) : PROT_READ) != 0) - PanicAlert("WriteProtectMemory failed!\nmprotect: %s", LastStrerrorString().c_str()); + PanicAlertFmt("WriteProtectMemory failed!\nmprotect: {}", LastStrerrorString()); #endif } @@ -139,12 +139,12 @@ void UnWriteProtectMemory(void* ptr, size_t size, bool allowExecute) #ifdef _WIN32 DWORD oldValue; if (!VirtualProtect(ptr, size, allowExecute ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE, &oldValue)) - PanicAlert("UnWriteProtectMemory failed!\nVirtualProtect: %s", GetLastErrorString().c_str()); + PanicAlertFmt("UnWriteProtectMemory failed!\nVirtualProtect: {}", GetLastErrorString()); #else if (mprotect(ptr, size, allowExecute ? (PROT_READ | PROT_WRITE | PROT_EXEC) : PROT_WRITE | PROT_READ) != 0) { - PanicAlert("UnWriteProtectMemory failed!\nmprotect: %s", LastStrerrorString().c_str()); + PanicAlertFmt("UnWriteProtectMemory failed!\nmprotect: {}", LastStrerrorString()); } #endif } diff --git a/Source/Core/Common/TraversalClient.cpp b/Source/Core/Common/TraversalClient.cpp index e55d853a42..071bccbc1c 100644 --- a/Source/Core/Common/TraversalClient.cpp +++ b/Source/Core/Common/TraversalClient.cpp @@ -77,7 +77,7 @@ void TraversalClient::ConnectToClient(const std::string& host) { if (host.size() > sizeof(TraversalHostId)) { - PanicAlert("host too long"); + PanicAlertFmt("Host too long"); return; } TraversalPacket packet = {}; diff --git a/Source/Core/Common/x64Emitter.cpp b/Source/Core/Common/x64Emitter.cpp index 0be7ad481e..25811974a4 100644 --- a/Source/Core/Common/x64Emitter.cpp +++ b/Source/Core/Common/x64Emitter.cpp @@ -1028,14 +1028,14 @@ void XEmitter::TZCNT(int bits, X64Reg dest, const OpArg& src) { CheckFlags(); if (!cpu_info.bBMI1) - PanicAlert("Trying to use BMI1 on a system that doesn't support it. Bad programmer."); + PanicAlertFmt("Trying to use BMI1 on a system that doesn't support it. Bad programmer."); WriteBitSearchType(bits, dest, src, 0xBC, true); } void XEmitter::LZCNT(int bits, X64Reg dest, const OpArg& src) { CheckFlags(); if (!cpu_info.bLZCNT) - PanicAlert("Trying to use LZCNT on a system that doesn't support it. Bad programmer."); + PanicAlertFmt("Trying to use LZCNT on a system that doesn't support it. Bad programmer."); WriteBitSearchType(bits, dest, src, 0xBD, true); } @@ -1880,7 +1880,7 @@ void XEmitter::WriteAVXOp(u8 opPrefix, u16 op, X64Reg regOp1, X64Reg regOp2, con int W, int extrabytes) { if (!cpu_info.bAVX) - PanicAlert("Trying to use AVX on a system that doesn't support it. Bad programmer."); + PanicAlertFmt("Trying to use AVX on a system that doesn't support it. Bad programmer."); WriteVEXOp(opPrefix, op, regOp1, regOp2, arg, W, extrabytes); } @@ -1888,14 +1888,17 @@ void XEmitter::WriteAVXOp4(u8 opPrefix, u16 op, X64Reg regOp1, X64Reg regOp2, co X64Reg regOp3, int W) { if (!cpu_info.bAVX) - PanicAlert("Trying to use AVX on a system that doesn't support it. Bad programmer."); + PanicAlertFmt("Trying to use AVX on a system that doesn't support it. Bad programmer."); WriteVEXOp4(opPrefix, op, regOp1, regOp2, arg, regOp3, W); } void XEmitter::WriteFMA3Op(u8 op, X64Reg regOp1, X64Reg regOp2, const OpArg& arg, int W) { if (!cpu_info.bFMA) - PanicAlert("Trying to use FMA3 on a system that doesn't support it. Computer is v. f'n madd."); + { + PanicAlertFmt( + "Trying to use FMA3 on a system that doesn't support it. Computer is v. f'n madd."); + } WriteVEXOp(0x66, 0x3800 | op, regOp1, regOp2, arg, W); } @@ -1903,7 +1906,10 @@ void XEmitter::WriteFMA4Op(u8 op, X64Reg dest, X64Reg regOp1, X64Reg regOp2, con int W) { if (!cpu_info.bFMA4) - PanicAlert("Trying to use FMA4 on a system that doesn't support it. Computer is v. f'n madd."); + { + PanicAlertFmt( + "Trying to use FMA4 on a system that doesn't support it. Computer is v. f'n madd."); + } WriteVEXOp4(0x66, 0x3A00 | op, dest, regOp1, arg, regOp2, W); } @@ -1911,10 +1917,10 @@ void XEmitter::WriteBMIOp(int size, u8 opPrefix, u16 op, X64Reg regOp1, X64Reg r const OpArg& arg, int extrabytes) { if (arg.IsImm()) - PanicAlert("BMI1/2 instructions don't support immediate operands."); + PanicAlertFmt("BMI1/2 instructions don't support immediate operands."); if (size != 32 && size != 64) - PanicAlert("BMI1/2 instructions only support 32-bit and 64-bit modes!"); - int W = size == 64; + PanicAlertFmt("BMI1/2 instructions only support 32-bit and 64-bit modes!"); + const int W = size == 64; WriteVEXOp(opPrefix, op, regOp1, regOp2, arg, W, extrabytes); } @@ -1923,7 +1929,7 @@ void XEmitter::WriteBMI1Op(int size, u8 opPrefix, u16 op, X64Reg regOp1, X64Reg { CheckFlags(); if (!cpu_info.bBMI1) - PanicAlert("Trying to use BMI1 on a system that doesn't support it. Bad programmer."); + PanicAlertFmt("Trying to use BMI1 on a system that doesn't support it. Bad programmer."); WriteBMIOp(size, opPrefix, op, regOp1, regOp2, arg, extrabytes); } @@ -1931,7 +1937,7 @@ void XEmitter::WriteBMI2Op(int size, u8 opPrefix, u16 op, X64Reg regOp1, X64Reg const OpArg& arg, int extrabytes) { if (!cpu_info.bBMI2) - PanicAlert("Trying to use BMI2 on a system that doesn't support it. Bad programmer."); + PanicAlertFmt("Trying to use BMI2 on a system that doesn't support it. Bad programmer."); WriteBMIOp(size, opPrefix, op, regOp1, regOp2, arg, extrabytes); } @@ -2580,7 +2586,7 @@ void XEmitter::PSLLDQ(X64Reg reg, int shift) void XEmitter::PSRAW(X64Reg reg, int shift) { if (reg > 7) - PanicAlert("The PSRAW-emitter does not support regs above 7"); + PanicAlertFmt("The PSRAW-emitter does not support regs above 7"); Write8(0x66); Write8(0x0f); Write8(0x71); @@ -2592,7 +2598,7 @@ void XEmitter::PSRAW(X64Reg reg, int shift) void XEmitter::PSRAD(X64Reg reg, int shift) { if (reg > 7) - PanicAlert("The PSRAD-emitter does not support regs above 7"); + PanicAlertFmt("The PSRAD-emitter does not support regs above 7"); Write8(0x66); Write8(0x0f); Write8(0x72); @@ -2603,14 +2609,14 @@ void XEmitter::PSRAD(X64Reg reg, int shift) void XEmitter::WriteSSSE3Op(u8 opPrefix, u16 op, X64Reg regOp, const OpArg& arg, int extrabytes) { if (!cpu_info.bSSSE3) - PanicAlert("Trying to use SSSE3 on a system that doesn't support it. Bad programmer."); + PanicAlertFmt("Trying to use SSSE3 on a system that doesn't support it. Bad programmer."); WriteSSEOp(opPrefix, op, regOp, arg, extrabytes); } void XEmitter::WriteSSE41Op(u8 opPrefix, u16 op, X64Reg regOp, const OpArg& arg, int extrabytes) { if (!cpu_info.bSSE4_1) - PanicAlert("Trying to use SSE4.1 on a system that doesn't support it. Bad programmer."); + PanicAlertFmt("Trying to use SSE4.1 on a system that doesn't support it. Bad programmer."); WriteSSEOp(opPrefix, op, regOp, arg, extrabytes); } |
