Merge remote-tracking branch 'dolphin-emu/master' into gameinis

4 files changed, 44 insertions, 75 deletions

diff --git a/Source/Core/Common/Logging/ConsoleListenerNix.cpp b/Source/Core/Common/Logging/ConsoleListenerNix.cpp
index dd64ca314e..6d01fbf706 100644
--- a/Source/Core/Common/Logging/ConsoleListenerNix.cpp
+++ b/Source/Core/Common/Logging/ConsoleListenerNix.cpp
@@ -4,7 +4,12 @@
 
 #include <cstdio>
 
+#ifndef _WIN32
+#include <unistd.h>
+#endif
+
 #include "Common/Logging/ConsoleListener.h"
+#include "Common/Logging/Log.h"
 
 ConsoleListener::ConsoleListener()
 {
diff --git a/Source/Core/Common/Logging/Log.h b/Source/Core/Common/Logging/Log.h
index 23fd6fca10..24a4aa8884 100644
--- a/Source/Core/Common/Logging/Log.h
+++ b/Source/Core/Common/Logging/Log.h
@@ -17,7 +17,6 @@ enum LOG_TYPE
 	COMMON,
 	CONSOLE,
 	DISCIO,
-	FILEMON,
 	DSPHLE,
 	DSPLLE,
 	DSP_MAIL,
@@ -25,20 +24,22 @@ enum LOG_TYPE
 	DVDINTERFACE,
 	DYNA_REC,
 	EXPANSIONINTERFACE,
+	FILEMON,
 	GDB_STUB,
-	POWERPC,
 	GPFIFO,
-	OSHLE,
+	HOST_GPU,
 	MASTER_LOG,
 	MEMMAP,
 	MEMCARD_MANAGER,
+	NETPLAY,
+	OSHLE,
 	OSREPORT,
 	PAD,
-	PROCESSORINTERFACE,
 	PIXELENGINE,
+	PROCESSORINTERFACE,
+	POWERPC,
 	SERIALINTERFACE,
 	SP1,
-	STREAMINGINTERFACE,
 	VIDEO,
 	VIDEOINTERFACE,
 	WII_IPC,
@@ -48,13 +49,12 @@ enum LOG_TYPE
 	WII_IPC_HID,
 	WII_IPC_HLE,
 	WII_IPC_NET,
-	WII_IPC_WC24,
-	WII_IPC_SSL,
 	WII_IPC_SD,
+	WII_IPC_SSL,
 	WII_IPC_STM,
+	WII_IPC_WC24,
 	WII_IPC_WIIMOTE,
 	WIIMOTE,
-	NETPLAY,
 
 	NUMBER_OF_LOGS // Must be last
 };
@@ -98,41 +98,3 @@ void GenericLog(LogTypes::LOG_LEVELS level, LogTypes::LOG_TYPE type,
 #define NOTICE_LOG(t,...) do { GENERIC_LOG(LogTypes::t, LogTypes::LNOTICE, __VA_ARGS__) } while (0)
 #define INFO_LOG(t,...) do { GENERIC_LOG(LogTypes::t, LogTypes::LINFO, __VA_ARGS__) } while (0)
 #define DEBUG_LOG(t,...) do { GENERIC_LOG(LogTypes::t, LogTypes::LDEBUG, __VA_ARGS__) } while (0)
-
-#ifdef _WIN32
-#define _dbg_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 _dbg_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(); \
-	}
-#endif
-
-#ifdef _WIN32
-#define _assert_msg_(_t_, _a_, _fmt_, ...) \
-	if (!(_a_)) {\
-		if (!PanicYesNo(_fmt_, __VA_ARGS__)) \
-			Crash(); \
-	}
-#else // not win32
-#define _assert_msg_(_t_, _a_, _fmt_, ...) \
-	if (!(_a_)) {\
-		if (!PanicYesNo(_fmt_, ##__VA_ARGS__)) \
-			Crash(); \
-	}
-#endif // WIN32
-
-#define _assert_(_a_) \
-	_assert_msg_(MASTER_LOG, _a_, "Error...\n\n  Line: %d\n  File: %s\n  Time: %s\n\nIgnore and continue?", \
-	             __LINE__, __FILE__, __TIME__)
-
-#define _dbg_assert_(_t_, _a_) \
-	if (MAX_LOGLEVEL >= LogTypes::LOG_LEVELS::LDEBUG) \
-		_assert_(_a_)
diff --git a/Source/Core/Common/Logging/LogManager.cpp b/Source/Core/Common/Logging/LogManager.cpp
index 29b88f168e..5d5e4db771 100644
--- a/Source/Core/Common/Logging/LogManager.cpp
+++ b/Source/Core/Common/Logging/LogManager.cpp
@@ -35,53 +35,53 @@ LogManager *LogManager::m_logManager = nullptr;
 
 LogManager::LogManager()
 {
-	// create log files
-	m_Log[LogTypes::MASTER_LOG]         = new LogContainer("*",               "Master Log");
+	// create log containers
+	m_Log[LogTypes::ACTIONREPLAY]       = new LogContainer("ActionReplay",    "ActionReplay");
+	m_Log[LogTypes::AUDIO]              = new LogContainer("Audio",           "Audio Emulator");
+	m_Log[LogTypes::AUDIO_INTERFACE]    = new LogContainer("AI",              "Audio Interface (AI)");
 	m_Log[LogTypes::BOOT]               = new LogContainer("BOOT",            "Boot");
+	m_Log[LogTypes::COMMANDPROCESSOR]   = new LogContainer("CP",              "CommandProc");
 	m_Log[LogTypes::COMMON]             = new LogContainer("COMMON",          "Common");
+	m_Log[LogTypes::CONSOLE]            = new LogContainer("CONSOLE",         "Dolphin Console");
 	m_Log[LogTypes::DISCIO]             = new LogContainer("DIO",             "Disc IO");
+	m_Log[LogTypes::DSPHLE]             = new LogContainer("DSPHLE",          "DSP HLE");
+	m_Log[LogTypes::DSPLLE]             = new LogContainer("DSPLLE",          "DSP LLE");
+	m_Log[LogTypes::DSP_MAIL]           = new LogContainer("DSPMails",        "DSP Mails");
+	m_Log[LogTypes::DSPINTERFACE]       = new LogContainer("DSP",             "DSPInterface");
+	m_Log[LogTypes::DVDINTERFACE]       = new LogContainer("DVD",             "DVD Interface");
+	m_Log[LogTypes::DYNA_REC]           = new LogContainer("JIT",             "Dynamic Recompiler");
+	m_Log[LogTypes::EXPANSIONINTERFACE] = new LogContainer("EXI",             "Expansion Interface");
 	m_Log[LogTypes::FILEMON]            = new LogContainer("FileMon",         "File Monitor");
+	m_Log[LogTypes::GDB_STUB]           = new LogContainer("GDB_STUB",        "GDB Stub");
+	m_Log[LogTypes::GPFIFO]             = new LogContainer("GP",              "GPFifo");
+	m_Log[LogTypes::HOST_GPU]           = new LogContainer("Host GPU",        "Host GPU");
+	m_Log[LogTypes::MASTER_LOG]         = new LogContainer("*",               "Master Log");
+	m_Log[LogTypes::MEMCARD_MANAGER]    = new LogContainer("MemCard Manager", "MemCard Manager");
+	m_Log[LogTypes::MEMMAP]             = new LogContainer("MI",              "MI & memmap");
+	m_Log[LogTypes::NETPLAY]            = new LogContainer("NETPLAY",         "Netplay");
+	m_Log[LogTypes::OSHLE]              = new LogContainer("HLE",             "HLE");
+	m_Log[LogTypes::OSREPORT]           = new LogContainer("OSREPORT",        "OSReport");
 	m_Log[LogTypes::PAD]                = new LogContainer("PAD",             "Pad");
 	m_Log[LogTypes::PIXELENGINE]        = new LogContainer("PE",              "PixelEngine");
-	m_Log[LogTypes::COMMANDPROCESSOR]   = new LogContainer("CP",              "CommandProc");
-	m_Log[LogTypes::VIDEOINTERFACE]     = new LogContainer("VI",              "VideoInt");
-	m_Log[LogTypes::SERIALINTERFACE]    = new LogContainer("SI",              "SerialInt");
 	m_Log[LogTypes::PROCESSORINTERFACE] = new LogContainer("PI",              "ProcessorInt");
-	m_Log[LogTypes::MEMMAP]             = new LogContainer("MI",              "MI & memmap");
-	m_Log[LogTypes::SP1]                = new LogContainer("SP1",             "Serial Port 1");
-	m_Log[LogTypes::STREAMINGINTERFACE] = new LogContainer("Stream",          "StreamingInt");
-	m_Log[LogTypes::DSPINTERFACE]       = new LogContainer("DSP",             "DSPInterface");
-	m_Log[LogTypes::DVDINTERFACE]       = new LogContainer("DVD",             "DVDInterface");
-	m_Log[LogTypes::GPFIFO]             = new LogContainer("GP",              "GPFifo");
-	m_Log[LogTypes::EXPANSIONINTERFACE] = new LogContainer("EXI",             "ExpansionInt");
-	m_Log[LogTypes::GDB_STUB]           = new LogContainer("GDB_STUB",        "GDB Stub");
-	m_Log[LogTypes::AUDIO_INTERFACE]    = new LogContainer("AI",              "AudioInt");
 	m_Log[LogTypes::POWERPC]            = new LogContainer("PowerPC",         "IBM CPU");
-	m_Log[LogTypes::OSHLE]              = new LogContainer("HLE",             "HLE");
-	m_Log[LogTypes::DSPHLE]             = new LogContainer("DSPHLE",          "DSP HLE");
-	m_Log[LogTypes::DSPLLE]             = new LogContainer("DSPLLE",          "DSP LLE");
-	m_Log[LogTypes::DSP_MAIL]           = new LogContainer("DSPMails",        "DSP Mails");
+	m_Log[LogTypes::SERIALINTERFACE]    = new LogContainer("SI",              "Serial Interface (SI)");
+	m_Log[LogTypes::SP1]                = new LogContainer("SP1",             "Serial Port 1");
 	m_Log[LogTypes::VIDEO]              = new LogContainer("Video",           "Video Backend");
-	m_Log[LogTypes::AUDIO]              = new LogContainer("Audio",           "Audio Emulator");
-	m_Log[LogTypes::DYNA_REC]           = new LogContainer("JIT",             "Dynamic Recompiler");
-	m_Log[LogTypes::CONSOLE]            = new LogContainer("CONSOLE",         "Dolphin Console");
-	m_Log[LogTypes::OSREPORT]           = new LogContainer("OSREPORT",        "OSReport");
+	m_Log[LogTypes::VIDEOINTERFACE]     = new LogContainer("VI",              "Video Interface (VI)");
 	m_Log[LogTypes::WIIMOTE]            = new LogContainer("Wiimote",         "Wiimote");
 	m_Log[LogTypes::WII_IPC]            = new LogContainer("WII_IPC",         "WII IPC");
-	m_Log[LogTypes::WII_IPC_HID]        = new LogContainer("WII_IPC_HID",     "WII IPC HID");
-	m_Log[LogTypes::WII_IPC_HLE]        = new LogContainer("WII_IPC_HLE",     "WII IPC HLE");
 	m_Log[LogTypes::WII_IPC_DVD]        = new LogContainer("WII_IPC_DVD",     "WII IPC DVD");
 	m_Log[LogTypes::WII_IPC_ES]         = new LogContainer("WII_IPC_ES",      "WII IPC ES");
 	m_Log[LogTypes::WII_IPC_FILEIO]     = new LogContainer("WII_IPC_FILEIO",  "WII IPC FILEIO");
+	m_Log[LogTypes::WII_IPC_HID]        = new LogContainer("WII_IPC_HID",     "WII IPC HID");
+	m_Log[LogTypes::WII_IPC_HLE]        = new LogContainer("WII_IPC_HLE",     "WII IPC HLE");
 	m_Log[LogTypes::WII_IPC_SD]         = new LogContainer("WII_IPC_SD",      "WII IPC SD");
+	m_Log[LogTypes::WII_IPC_SSL]        = new LogContainer("WII_IPC_SSL",     "WII IPC SSL");
 	m_Log[LogTypes::WII_IPC_STM]        = new LogContainer("WII_IPC_STM",     "WII IPC STM");
 	m_Log[LogTypes::WII_IPC_NET]        = new LogContainer("WII_IPC_NET",     "WII IPC NET");
 	m_Log[LogTypes::WII_IPC_WC24]       = new LogContainer("WII_IPC_WC24",    "WII IPC WC24");
-	m_Log[LogTypes::WII_IPC_SSL]        = new LogContainer("WII_IPC_SSL",     "WII IPC SSL");
 	m_Log[LogTypes::WII_IPC_WIIMOTE]    = new LogContainer("WII_IPC_WIIMOTE", "WII IPC WIIMOTE");
-	m_Log[LogTypes::ACTIONREPLAY]       = new LogContainer("ActionReplay",    "ActionReplay");
-	m_Log[LogTypes::MEMCARD_MANAGER]    = new LogContainer("MemCard Manager", "MemCard Manager");
-	m_Log[LogTypes::NETPLAY]            = new LogContainer("NETPLAY",         "Netplay");
 
 	m_fileLog = new FileLogListener(File::GetUserPath(F_MAINLOG_IDX));
 	m_consoleLog = new ConsoleListener();
diff --git a/Source/Core/Common/Logging/LogManager.h b/Source/Core/Common/Logging/LogManager.h
index c03610ae02..e48f05e928 100644
--- a/Source/Core/Common/Logging/LogManager.h
+++ b/Source/Core/Common/Logging/LogManager.h
@@ -10,7 +10,9 @@
 #include <set>
 #include <string>
 
-#include "Common/Common.h"
+#include "Common/CommonTypes.h"
+#include "Common/NonCopyable.h"
+#include "Common/Logging/Log.h"
 
 #define MAX_MESSAGES 8000
 #define MAX_MSGLEN  1024