[[unlikely]] ASSERT

and other ASSERT usage changes
This commit is contained in:
Minty-Meeo 2022-07-27 23:54:27 -05:00
parent 6361586a04
commit bf079d6d3a
10 changed files with 19 additions and 20 deletions

View File

@ -11,7 +11,7 @@
#define ASSERT_MSG(_t_, _a_, _fmt_, ...) \ #define ASSERT_MSG(_t_, _a_, _fmt_, ...) \
do \ do \
{ \ { \
if (!(_a_)) \ if (!(_a_)) [[unlikely]] \
{ \ { \
if (!PanicYesNoFmtAssert(_t_, \ if (!PanicYesNoFmtAssert(_t_, \
"An error occurred.\n\n" _fmt_ "\n\n" \ "An error occurred.\n\n" _fmt_ "\n\n" \
@ -32,7 +32,7 @@
#define ASSERT(_a_) \ #define ASSERT(_a_) \
do \ do \
{ \ { \
if (!(_a_)) \ if (!(_a_)) [[unlikely]] \
{ \ { \
if (!PanicYesNoFmt("An error occurred.\n\n" \ if (!PanicYesNoFmt("An error occurred.\n\n" \
" Condition: {}\n File: {}\n Line: {}\n Function: {}\n\n" \ " Condition: {}\n File: {}\n Line: {}\n Function: {}\n\n" \

View File

@ -3,7 +3,6 @@
#include "Core/CheatSearch.h" #include "Core/CheatSearch.h"
#include <cassert>
#include <functional> #include <functional>
#include <memory> #include <memory>
#include <optional> #include <optional>
@ -13,6 +12,7 @@
#include <vector> #include <vector>
#include "Common/Align.h" #include "Common/Align.h"
#include "Common/Assert.h"
#include "Common/BitUtils.h" #include "Common/BitUtils.h"
#include "Common/StringUtil.h" #include "Common/StringUtil.h"
@ -94,7 +94,7 @@ std::vector<u8> Cheats::GetValueAsByteVector(const Cheats::SearchValue& value)
case Cheats::DataType::F64: case Cheats::DataType::F64:
return ToByteVector(Common::swap64(Common::BitCast<u64>(std::get<double>(value.m_value)))); return ToByteVector(Common::swap64(Common::BitCast<u64>(std::get<double>(value.m_value))));
default: default:
assert(0); DEBUG_ASSERT(false);
return {}; return {};
} }
} }
@ -412,7 +412,7 @@ MakeCompareFunctionForSpecificValue(Cheats::CompareType op, const T& old_value)
case Cheats::CompareType::GreaterOrEqual: case Cheats::CompareType::GreaterOrEqual:
return [&](const T& new_value) { return new_value >= old_value; }; return [&](const T& new_value) { return new_value >= old_value; };
default: default:
assert(0); DEBUG_ASSERT(false);
return nullptr; return nullptr;
} }
} }
@ -436,7 +436,7 @@ MakeCompareFunctionForLastValue(Cheats::CompareType op)
case Cheats::CompareType::GreaterOrEqual: case Cheats::CompareType::GreaterOrEqual:
return [](const T& new_value, const T& old_value) { return new_value >= old_value; }; return [](const T& new_value, const T& old_value) { return new_value >= old_value; };
default: default:
assert(0); DEBUG_ASSERT(false);
return nullptr; return nullptr;
} }
} }
@ -680,7 +680,7 @@ Cheats::MakeSession(std::vector<MemoryRange> memory_ranges,
return std::make_unique<CheatSearchSession<double>>(std::move(memory_ranges), address_space, return std::make_unique<CheatSearchSession<double>>(std::move(memory_ranges), address_space,
aligned); aligned);
default: default:
assert(0); DEBUG_ASSERT(false);
return nullptr; return nullptr;
} }
} }

View File

@ -666,7 +666,7 @@ void RegisterMMIO(MMIO::Mapping* mmio, u32 base, bool is_wii)
if (state_.DISR.BREAK) if (state_.DISR.BREAK)
{ {
DEBUG_ASSERT(0); DEBUG_ASSERT(false);
} }
UpdateInterrupts(); UpdateInterrupts();

View File

@ -216,13 +216,13 @@ private:
template <> template <>
inline u64 Mapping::Read<u64>(u32 addr) inline u64 Mapping::Read<u64>(u32 addr)
{ {
DEBUG_ASSERT(0); DEBUG_ASSERT(false);
return 0; return 0;
} }
template <> template <>
inline void Mapping::Write(u32 addr, u64 val) inline void Mapping::Write(u32 addr, u64 val)
{ {
DEBUG_ASSERT(0); DEBUG_ASSERT(false);
} }
} // namespace MMIO } // namespace MMIO

View File

@ -319,7 +319,7 @@ bool Jit64::BackPatch(SContext* ctx)
*ptr = Common::swap64(static_cast<u64>(*ptr)); *ptr = Common::swap64(static_cast<u64>(*ptr));
break; break;
default: default:
DEBUG_ASSERT(0); DEBUG_ASSERT(false);
break; break;
} }
} }

View File

@ -558,7 +558,7 @@ std::optional<ReadResult<u32>> HostTryReadInstruction(const Core::CPUThreadGuard
} }
} }
ASSERT(0); ASSERT(false);
return std::nullopt; return std::nullopt;
} }
@ -679,7 +679,7 @@ static std::optional<ReadResult<T>> HostTryReadUX(const Core::CPUThreadGuard& gu
} }
} }
ASSERT(0); ASSERT(false);
return std::nullopt; return std::nullopt;
} }
@ -900,7 +900,7 @@ static std::optional<WriteResult> HostTryWriteUX(const Core::CPUThreadGuard& gua
return WriteResult(true); return WriteResult(true);
} }
ASSERT(0); ASSERT(false);
return std::nullopt; return std::nullopt;
} }
@ -1051,7 +1051,7 @@ bool HostIsRAMAddress(const Core::CPUThreadGuard& guard, u32 address, RequestedA
return IsRAMAddress<XCheckTLBFlag::NoException>(memory, address, true); return IsRAMAddress<XCheckTLBFlag::NoException>(memory, address, true);
} }
ASSERT(0); ASSERT(false);
return false; return false;
} }
@ -1078,7 +1078,7 @@ bool HostIsInstructionRAMAddress(const Core::CPUThreadGuard& guard, u32 address,
return IsRAMAddress<XCheckTLBFlag::OpcodeNoException>(memory, address, true); return IsRAMAddress<XCheckTLBFlag::OpcodeNoException>(memory, address, true);
} }
ASSERT(0); ASSERT(false);
return false; return false;
} }

View File

@ -3,7 +3,6 @@
#include "DolphinQt/CheatSearchWidget.h" #include "DolphinQt/CheatSearchWidget.h"
#include <cassert>
#include <functional> #include <functional>
#include <optional> #include <optional>
#include <string> #include <string>

View File

@ -401,7 +401,7 @@ static QString GetFormatDescription(Memcard::SavefileFormat format)
case Memcard::SavefileFormat::SAV: case Memcard::SavefileFormat::SAV:
return QObject::tr("Datel MaxDrive/Pro files"); return QObject::tr("Datel MaxDrive/Pro files");
default: default:
ASSERT(0); ASSERT(false);
return QObject::tr("Native GCI File"); return QObject::tr("Native GCI File");
} }
} }

View File

@ -70,7 +70,7 @@ static void GenerateLightShader(ShaderCode& object, const LightingUidData& uid_d
swizzle_components, LIGHT_COL_PARAMS(index, swizzle)); swizzle_components, LIGHT_COL_PARAMS(index, swizzle));
break; break;
default: default:
ASSERT(0); ASSERT(false);
} }
object.Write("\n"); object.Write("\n");

View File

@ -1088,7 +1088,7 @@ std::string GenerateDecodingShader(TextureFormat format, std::optional<TLUTForma
ss << "#define TEXEL_BUFFER_FORMAT_R32G32 1\n"; ss << "#define TEXEL_BUFFER_FORMAT_R32G32 1\n";
break; break;
case NUM_TEXEL_BUFFER_FORMATS: case NUM_TEXEL_BUFFER_FORMATS:
ASSERT(0); ASSERT(false);
break; break;
} }