Common: Remove src/common/logging/log.*

src/common/assert.h

@@ -4,10 +4,9 @@
 
 #pragma once
 
+#include <cstdio>
 #include <cstdlib>
 
-#include "common/logging/log.h"
-
 // For asserts we'd like to keep all the junk executed when an assert happens away from the
 // important code in the function. One way of doing this is to put all the relevant code inside a
 // lambda and force the compiler to not inline it. Unfortunately, MSVC seems to have no syntax to
@@ -28,13 +27,13 @@ static void assert_noinline_call(const Fn& fn) {
 
 #define ASSERT(_a_) \
     do if (!(_a_)) { assert_noinline_call([] { \
-        LOG_CRITICAL(Debug, "Assertion Failed!"); \
+        fprintf(stderr, "Assertion Failed!\n" #_a_); \
         throw ""; \
     }); } while (0)
 
 #define ASSERT_MSG(_a_, ...) \
     do if (!(_a_)) { assert_noinline_call([&] { \
-        LOG_CRITICAL(Debug, "Assertion Failed!\n" __VA_ARGS__); \
+        fprintf(stderr, "Assertion Failed!\n" #_a_ "\n" __VA_ARGS__); \
         throw ""; \
     }); } while (0)
 

src/common/logging/log.cpp

@@ -1,21 +0,0 @@
-/* This file is part of the dynarmic project.
- * Copyright (c) 2016 MerryMage
- * This software may be used and distributed according to the terms of the GNU
- * General Public License version 2 or any later version.
- */
-
-#include <cstdarg>
-#include <cstdio>
-
-#include "common/logging/log.h"
-
-namespace Log {
-
-void LogMessage(Class log_class, Level log_level, const char* filename, unsigned int line_nr, const char* function, const char* format, ...) {
-    va_list args;
-    va_start(args, format);
-    vprintf(format, args);
-    va_end(args);
-}
-
-} // namespace Log

src/common/logging/log.h

@@ -1,69 +0,0 @@
-// Copyright 2014 Citra Emulator Project
-// Licensed under GPLv2 or any later version
-// Refer to the license.txt file included.
-
-#pragma once
-
-#include "common/common_types.h"
-
-namespace Log {
-
-/// Specifies the severity or level of detail of the log message.
-enum class Level : u8 {
-    Trace,    ///< Extremely detailed and repetitive debugging information that is likely to
-    ///  pollute logs.
-            Debug,    ///< Less detailed debugging information.
-    Info,     ///< Status information from important points during execution.
-    Warning,  ///< Minor or potential problems found during execution of a task.
-    Error,    ///< Major problems found during execution of a task that prevent it from being
-    ///  completed.
-            Critical, ///< Major problems during execution that threathen the stability of the entire
-    ///  application.
-
-    Count ///< Total number of logging levels
-};
-
-typedef u8 ClassType;
-
-/**
- * Specifies the sub-system that generated the log message.
- *
- * @note If you add a new entry here, also add a corresponding one to `ALL_LOG_CLASSES` in backend.cpp.
- */
-enum class Class : ClassType {
-    Log,
-    Common,
-    Common_Memory,
-    Core_ARM11,
-    Debug,
-    Count ///< Total number of logging classes
-};
-
-/// Logs a message to the global logger.
-void LogMessage(Class log_class, Level log_level,
-                const char* filename, unsigned int line_nr, const char* function,
-#ifdef _MSC_VER
-        _Printf_format_string_
-#endif
-                const char* format, ...)
-#if defined(__GNUC__) && !defined(__clang__)
-        __attribute__((format(gnu_printf, 6, 7)))
-#endif
-;
-
-} // namespace Log
-
-#define LOG_GENERIC(log_class, log_level, ...) \
-    ::Log::LogMessage(log_class, log_level, __FILE__, __LINE__, __func__, __VA_ARGS__)
-
-#ifdef _DEBUG
-#define LOG_TRACE(   log_class, ...) LOG_GENERIC(::Log::Class::log_class, ::Log::Level::Trace,    __VA_ARGS__)
-#else
-#define LOG_TRACE(   log_class, ...) (void(0))
-#endif
-
-#define LOG_DEBUG(   log_class, ...) LOG_GENERIC(::Log::Class::log_class, ::Log::Level::Debug,    __VA_ARGS__)
-#define LOG_INFO(    log_class, ...) LOG_GENERIC(::Log::Class::log_class, ::Log::Level::Info,     __VA_ARGS__)
-#define LOG_WARNING( log_class, ...) LOG_GENERIC(::Log::Class::log_class, ::Log::Level::Warning,  __VA_ARGS__)
-#define LOG_ERROR(   log_class, ...) LOG_GENERIC(::Log::Class::log_class, ::Log::Level::Error,    __VA_ARGS__)
-#define LOG_CRITICAL(log_class, ...) LOG_GENERIC(::Log::Class::log_class, ::Log::Level::Critical, __VA_ARGS__)

src/common/memory_util.cpp

@@ -2,8 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-
-#include "common/logging/log.h"
+#include "common/assert.h"
 #include "common/memory_util.h"
 
 #ifdef _WIN32
@@ -80,7 +79,7 @@ void* AllocateExecutableMemory(size_t size, bool low)
     {
         ptr = nullptr;
 #endif
-        LOG_ERROR(Common_Memory, "Failed to allocate executable memory");
+        ASSERT_MSG(false, "Failed to allocate executable memory");
     }
 #if !defined(_WIN32) && defined(ARCHITECTURE_X64) && !defined(MAP_32BIT)
     else
@@ -95,7 +94,7 @@ void* AllocateExecutableMemory(size_t size, bool low)
 
 #if EMU_ARCH_BITS == 64
     if ((u64)ptr >= 0x80000000 && low == true)
-        LOG_ERROR(Common_Memory, "Executable memory ended up above 2GB!");
+        ASSERT_MSG(false, "Executable memory ended up above 2GB!");
 #endif
 
     return ptr;
@@ -114,7 +113,7 @@ void* AllocateMemoryPages(size_t size)
 #endif
 
     if (ptr == nullptr)
-        LOG_ERROR(Common_Memory, "Failed to allocate raw memory");
+        ASSERT_MSG(false, "Failed to allocate raw memory");
 
     return ptr;
 }
@@ -129,12 +128,12 @@ void* AllocateAlignedMemory(size_t size,size_t alignment)
     ptr = memalign(alignment, size);
 #else
     if (posix_memalign(&ptr, alignment, size) != 0)
-        LOG_ERROR(Common_Memory, "Failed to allocate aligned memory");
+        ASSERT_MSG(false, "Failed to allocate aligned memory");
 #endif
 #endif
 
     if (ptr == nullptr)
-        LOG_ERROR(Common_Memory, "Failed to allocate aligned memory");
+        ASSERT_MSG(false, "Failed to allocate aligned memory");
 
     return ptr;
 }
@@ -145,7 +144,7 @@ void FreeMemoryPages(void* ptr, size_t size)
     {
 #ifdef _WIN32
         if (!VirtualFree(ptr, 0, MEM_RELEASE))
-            LOG_ERROR(Common_Memory, "FreeMemoryPages failed!\n%s", GetLastErrorMsg());
+            ASSERT_MSG(false, "FreeMemoryPages failed!\n%s", GetLastErrorMsg());
 #else
         munmap(ptr, size);
 #endif
@@ -169,7 +168,7 @@ void WriteProtectMemory(void* ptr, size_t size, bool allowExecute)
 #ifdef _WIN32
     DWORD oldValue;
     if (!VirtualProtect(ptr, size, allowExecute ? PAGE_EXECUTE_READ : PAGE_READONLY, &oldValue))
-        LOG_ERROR(Common_Memory, "WriteProtectMemory failed!\n%s", GetLastErrorMsg());
+        ASSERT_MSG(false, "WriteProtectMemory failed!\n%s", GetLastErrorMsg());
 #else
     mprotect(ptr, size, allowExecute ? (PROT_READ | PROT_EXEC) : PROT_READ);
 #endif
@@ -180,7 +179,7 @@ void UnWriteProtectMemory(void* ptr, size_t size, bool allowExecute)
 #ifdef _WIN32
     DWORD oldValue;
     if (!VirtualProtect(ptr, size, allowExecute ? PAGE_EXECUTE_READWRITE : PAGE_READWRITE, &oldValue))
-        LOG_ERROR(Common_Memory, "UnWriteProtectMemory failed!\n%s", GetLastErrorMsg());
+        ASSERT_MSG(false, "UnWriteProtectMemory failed!\n%s", GetLastErrorMsg());
 #else
     mprotect(ptr, size, allowExecute ? (PROT_READ | PROT_WRITE | PROT_EXEC) : PROT_WRITE | PROT_READ);
 #endif

src/common/x64/emitter.cpp

@@ -19,7 +19,6 @@
 #include <cstring>
 
 #include "common/assert.h"
-#include "common/logging/log.h"
 #include "common/memory_util.h"
 
 #include "abi.h"
@@ -1316,7 +1315,7 @@ void XEmitter::XOR (int bits, const OpArg& a1, const OpArg& a2) {CheckFlags(); W
 void XEmitter::MOV (int bits, const OpArg& a1, const OpArg& a2)
 {
     if (a1.IsSimpleReg() && a2.IsSimpleReg() && a1.GetSimpleReg() == a2.GetSimpleReg())
-        LOG_ERROR(Common, "Redundant MOV @ %p - bug in JIT?", code);
+        ASSERT_MSG(false, "Redundant MOV @ %p - bug in JIT?", code);
     WriteNormalOp(this, bits, nrmMOV, a1, a2);
 }
 void XEmitter::TEST(int bits, const OpArg& a1, const OpArg& a2) {CheckFlags(); WriteNormalOp(this, bits, nrmTEST, a1, a2);}