Merge pull request #6438 from lioncash/assert

Assert: Uppercase assertion macros
dolphin-emu · Mar 16, 2018 · 9f4d512 · 9f4d512
2 parents 1259370 + 50a476c
commit 9f4d512
Show file tree

Hide file tree

Showing 135 changed files with 719 additions and 741 deletions.
diff --git a/Source/Core/AudioCommon/OpenSLESStream.cpp b/Source/Core/AudioCommon/OpenSLESStream.cpp
@@ -46,7 +46,7 @@ static void bqPlayerCallback(SLAndroidSimpleBufferQueueItf bq, void* context)
   // Comment from sample code:
   // the most likely other result is SL_RESULT_BUFFER_INSUFFICIENT,
   // which for this code example would indicate a programming error
-  _assert_msg_(AUDIO, SL_RESULT_SUCCESS == result, "Couldn't enqueue audio stream.");
+  ASSERT_MSG(AUDIO, SL_RESULT_SUCCESS == result, "Couldn't enqueue audio stream.");
 }
 
 bool OpenSLESStream::Init()

diff --git a/Source/Core/Common/Arm64Emitter.cpp b/Source/Core/Common/Arm64Emitter.cpp
diff --git a/Source/Core/Common/Arm64Emitter.h b/Source/Core/Common/Arm64Emitter.h
@@ -490,7 +490,7 @@ class ArithOption
       return (m_shifttype << 22) | (m_shift << 10);
       break;
     default:
-      _dbg_assert_msg_(DYNA_REC, false, "Invalid type in GetData");
+      DEBUG_ASSERT_MSG(DYNA_REC, false, "Invalid type in GetData");
       break;
     }
     return 0;
@@ -846,7 +846,7 @@ class ARM64XEmitter
   template <class P>
   void MOVP2R(ARM64Reg Rd, P* ptr)
   {
-    _assert_msg_(DYNA_REC, Is64Bit(Rd), "Can't store pointers in 32-bit registers");
+    ASSERT_MSG(DYNA_REC, Is64Bit(Rd), "Can't store pointers in 32-bit registers");
     MOVI2R(Rd, (uintptr_t)ptr);
   }
 

diff --git a/Source/Core/Common/Assert.h b/Source/Core/Common/Assert.h
@@ -10,29 +10,29 @@
 #include "Common/MsgHandler.h"
 
 #ifdef _WIN32
-#define _assert_msg_(_t_, _a_, _fmt_, ...)                                                         \
+#define ASSERT_MSG(_t_, _a_, _fmt_, ...)                                                           \
   if (!(_a_))                                                                                      \
   {                                                                                                \
     if (!PanicYesNo(_fmt_ "\n\nIgnore and continue?", __VA_ARGS__))                                \
       Crash();                                                                                     \
   }
 
-#define _dbg_assert_msg_(_t_, _a_, _msg_, ...)                                                     \
+#define DEBUG_ASSERT_MSG(_t_, _a_, _msg_, ...)                                                     \
   if (MAX_LOGLEVEL >= LogTypes::LOG_LEVELS::LDEBUG && !(_a_))                                      \
   {                                                                                                \
     ERROR_LOG(_t_, _msg_, __VA_ARGS__);                                                            \
     if (!PanicYesNo(_msg_, __VA_ARGS__))                                                           \
       Crash();                                                                                     \
   }
 #else
-#define _assert_msg_(_t_, _a_, _fmt_, ...)                                                         \
+#define ASSERT_MSG(_t_, _a_, _fmt_, ...)                                                           \
   if (!(_a_))                                                                                      \
   {                                                                                                \
     if (!PanicYesNo(_fmt_, ##__VA_ARGS__))                                                         \
       Crash();                                                                                     \
   }
 
-#define _dbg_assert_msg_(_t_, _a_, _msg_, ...)                                                     \
+#define DEBUG_ASSERT_MSG(_t_, _a_, _msg_, ...)                                                     \
   if (MAX_LOGLEVEL >= LogTypes::LOG_LEVELS::LDEBUG && !(_a_))                                      \
   {                                                                                                \
     ERROR_LOG(_t_, _msg_, ##__VA_ARGS__);                                                          \
@@ -41,11 +41,11 @@
   }
 #endif
 
-#define _assert_(_a_)                                                                              \
-  _assert_msg_(MASTER_LOG, _a_,                                                                    \
-               _trans("An error occurred.\n\n  Line: %d\n  File: %s\n\nIgnore and continue?"),     \
-               __LINE__, __FILE__)
+#define ASSERT(_a_)                                                                                \
+  ASSERT_MSG(MASTER_LOG, _a_,                                                                      \
+             _trans("An error occurred.\n\n  Line: %d\n  File: %s\n\nIgnore and continue?"),       \
+             __LINE__, __FILE__)
 
-#define _dbg_assert_(_t_, _a_)                                                                     \
+#define DEBUG_ASSERT(_t_, _a_)                                                                     \
   if (MAX_LOGLEVEL >= LogTypes::LOG_LEVELS::LDEBUG)                                                \
-  _assert_(_a_)
+  ASSERT(_a_)
diff --git a/Source/Core/Common/ChunkFile.h b/Source/Core/Common/ChunkFile.h
@@ -285,7 +285,7 @@ class PointerWrap
       break;
 
     case MODE_VERIFY:
-      _dbg_assert_msg_(COMMON, !memcmp(data, *ptr, size),
+      DEBUG_ASSERT_MSG(COMMON, !memcmp(data, *ptr, size),
                        "Savestate verification failure: buf %p != %p (size %u).\n", data, *ptr,
                        size);
       break;

diff --git a/Source/Core/Common/CodeBlock.h b/Source/Core/Common/CodeBlock.h
@@ -67,7 +67,7 @@ class CodeBlock : public T
   // Call this when shutting down. Don't rely on the destructor, even though it'll do the job.
   void FreeCodeSpace()
   {
-    _assert_(!m_is_child);
+    ASSERT(!m_is_child);
     Common::FreeMemoryPages(region, total_region_size);
     region = nullptr;
     region_size = 0;
@@ -87,7 +87,7 @@ class CodeBlock : public T
   void ResetCodePtr() { T::SetCodePtr(region); }
   size_t GetSpaceLeft() const
   {
-    _assert_(static_cast<size_t>(T::GetCodePtr() - region) < region_size);
+    ASSERT(static_cast<size_t>(T::GetCodePtr() - region) < region_size);
     return region_size - (T::GetCodePtr() - region);
   }
 
@@ -100,7 +100,7 @@ class CodeBlock : public T
   bool HasChildren() const { return region_size != total_region_size; }
   u8* AllocChildCodeSpace(size_t child_size)
   {
-    _assert_msg_(DYNA_REG, child_size < GetSpaceLeft(), "Insufficient space for child allocation.");
+    ASSERT_MSG(DYNA_REG, child_size < GetSpaceLeft(), "Insufficient space for child allocation.");
     u8* child_region = region + region_size - child_size;
     region_size -= child_size;
     return child_region;

diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp
@@ -715,7 +715,7 @@ std::string GetSysDirectory()
   sysDir = GetExeDirectory() + DIR_SEP + SYSDATA_DIR;
 #elif defined ANDROID
   sysDir = s_android_sys_directory;
-  _assert_msg_(COMMON, !sysDir.empty(), "Sys directory has not been set");
+  ASSERT_MSG(COMMON, !sysDir.empty(), "Sys directory has not been set");
 #else
   sysDir = SYSDATA_DIR;
 #endif

diff --git a/Source/Core/Common/SysConf.cpp b/Source/Core/Common/SysConf.cpp
@@ -31,7 +31,7 @@ static size_t GetNonArrayEntrySize(SysConf::Entry::Type type)
   case SysConf::Entry::Type::LongLong:
     return 8;
   default:
-    _assert_(false);
+    ASSERT(false);
     return 0;
   }
 }

diff --git a/Source/Core/Common/SysConf.h b/Source/Core/Common/SysConf.h
@@ -55,7 +55,7 @@ class SysConf final
     template <typename T>
     void SetData(T value)
     {
-      _assert_(sizeof(value) == bytes.size());
+      ASSERT(sizeof(value) == bytes.size());
       std::memcpy(bytes.data(), &value, bytes.size());
     }