Merge large parts of nakeee's "Soap" branch into trunk, after fixing a few crash bugs in FileUtil.cpp.

Not really anything interesting, just some better comments, some slightly more portable/cleaner code in places.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2459 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Core/Common/Src/Log.h

@@ -0,0 +1,147 @@
+// Copyright (C) 2003-2008 Dolphin Project.
+
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, version 2.0.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License 2.0 for more details.
+
+// A copy of the GPL 2.0 should have been included with the program.
+// If not, see http://www.gnu.org/licenses/
+
+// Official SVN repository and contact information can be found at
+// http://code.google.com/p/dolphin-emu/
+
+#ifndef _LOG_H
+#define _LOG_H
+
+namespace LogTypes
+{
+
+enum LOG_TYPE {
+	ACTIONREPLAY,
+	AUDIO,
+	AUDIO_INTERFACE,
+	BOOT,
+	COMMANDPROCESSOR,
+	COMMON,
+	CONSOLE,
+	DSPHLE,
+	DSPINTERFACE,
+	DVDINTERFACE,
+	DYNA_REC,
+	EXPANSIONINTERFACE,
+	GEKKO,
+	GPFIFO,
+	HLE,
+	MASTER_LOG,
+	MEMMAP,
+	OSREPORT,
+	PERIPHERALINTERFACE,
+	PIXELENGINE,
+	SERIALINTERFACE,
+	STREAMINGINTERFACE,
+	VIDEO,
+	VIDEOINTERFACE,
+	WII_IOB,
+	WII_IPC,
+	WII_IPC_DVD,
+	WII_IPC_ES,
+	WII_IPC_FILEIO,
+	WII_IPC_HLE,
+	WII_IPC_NET,
+	WII_IPC_SD,
+	WII_IPC_WIIMOTE,
+	
+	NUMBER_OF_LOGS // Must be last
+};
+
+enum LOG_LEVELS {
+	LERROR,   // Bad errors - that still don't deserve a PanicAlert.
+	LWARNING, // Something is suspicious.
+	LINFO,    // General information.
+	LDEBUG,   // Strictly for detailed debugging - might make things slow.
+};
+
+}  // namespace
+
+
+#ifdef LOGGING
+
+extern void __Log(int logNumber, const char* text, ...);
+extern void __Logv(int log, int v, const char *format, ...);
+
+#ifdef _WIN32
+
+#define LOG(t, ...)       __Log(LogTypes::t, __VA_ARGS__);
+#define LOGV(t, v, ...)   __Log(LogTypes::t + (v)*100, __VA_ARGS__);
+#define LOGP(t, ...)      __Log(t, __VA_ARGS__);
+#define LOGVP(t, v, ...)  __Log(t + (v)*100, __VA_ARGS__);
+#define ERROR_LOG(t, ...) {LOGV(t, LogTypes::LERROR, __VA_ARGS__)}
+#define WARN_LOG(t, ...)  {LOGV(t, LogTypes::LINFO, __VA_ARGS__)}
+#define INFO_LOG(t, ...)  {LOGV(t, LogTypes::LWARNING, __VA_ARGS__)}
+#define DEBUG_LOG(t ,...) {LOGV(t, LogTypes::LDEBUG, __VA_ARGS__)}
+
+#else
+
+#define LOG(t, ...)      __Log(LogTypes::t, ##__VA_ARGS__);
+#define LOGV(t,v, ...)   __Log(LogTypes::t + (v)*100, ##__VA_ARGS__);
+#define LOGP(t, ...)     __Log(t, ##__VA_ARGS__);
+#define LOGVP(t,v, ...)  __Log(t + (v)*100, ##__VA_ARGS__);
+#define ERROR_LOG(t,...) {LOGV(t, LogTypes::LERROR, ##__VA_ARGS__)}
+#define WARN_LOG(t,...)  {LOGV(t, LogTypes::LINFO, ##__VA_ARGS__)}
+#define INFO_LOG(t,...)  {LOGV(t, LogTypes::LWARNING, ##__VA_ARGS__)}
+#define DEBUG_LOG(t,...) {LOGV(t, LogTypes::LDEBUG, ##__VA_ARGS__)}
+
+#endif // WIN32
+
+#define _dbg_assert_(_t_, _a_) \
+	if (!(_a_)) {\
+		LOG(_t_, "Error...\n\n  Line: %d\n  File: %s\n  Time: %s\n\nIgnore and continue?", \
+					   __LINE__, __FILE__, __TIME__); \
+		if (!PanicYesNo("*** Assertion (see log)***\n")) {Crash();} \
+	}
+#define _dbg_assert_msg_(_t_, _a_, ...)\
+	if (!(_a_)) {\
+		LOG(_t_, __VA_ARGS__); \
+		if (!PanicYesNo(__VA_ARGS__)) {Crash();} \
+	}
+#define _dbg_update_() Host_UpdateLogDisplay();
+
+#else
+
+#define LOG(_t_, ...)
+#define LOGV(_t_, _v_, ...)
+#define LOGP(_t_, ...)
+#define LOGVP(_t_, _v_, ...)
+
+#define _dbg_clear_()
+#define _dbg_update_() ;
+
+#ifndef _dbg_assert_
+#define _dbg_assert_(_t_, _a_) ;
+#define _dbg_assert_msg_(_t_, _a_, _desc_, ...) ;
+#endif
+
+#define ERROR_LOG(t, ...) ;
+#define WARN_LOG(t, ...)  ;
+#define INFO_LOG(t ,...)  ; 
+#define DEBUG_LOG(t, ...) ;
+
+#endif
+
+#ifdef _WIN32
+#define _assert_(_a_) _dbg_assert_(MASTER_LOG, _a_)
+#define _assert_msg_(_t_, _a_, _fmt_, ...)\
+	if (!(_a_)) {\
+		if (!PanicYesNo(_fmt_, __VA_ARGS__)) {Crash();} \
+	}
+#else
+#define _assert_(a)
+#define _assert_msg_(...)
+#endif
+
+#endif // LOG_H