Change a few more log types.

Common/FixedSizeQueue.h

@@ -149,7 +149,7 @@ public:
 		p.Do(size);
 		if (size != N)
 		{
-			ERROR_LOG(HLE, "Savestate failure: Incompatible queue size.");
+			ERROR_LOG(COMMON, "Savestate failure: Incompatible queue size.");
 			return;
 		}
 		p.DoArray<T>(storage_, N);

Common/LogManager.cpp

@@ -68,7 +68,7 @@ static const LogNameTableEntry logTable[] = {
 	{LogTypes::SCEKERNEL  ,"KERNEL",  "sceKernel*"},
 	{LogTypes::SCEMODULE  ,"MODULE",  "sceKernelModule"},
 	{LogTypes::SCENET     ,"NET",     "sceNet*"},
-	{LogTypes::SCERTC     ,"SCERTC",  "sceRtco"},
+	{LogTypes::SCERTC     ,"SCERTC",  "sceRtc"},
 	{LogTypes::SCESAS     ,"SCESAS",  "sceSas"},
 	{LogTypes::SCEUTILITY ,"UTIL",    "sceUtility"},
 

Core/HLE/sceKernel.cpp

@@ -23,14 +23,15 @@
 #include "Core/MIPS/MIPSInt.h"
 
 #include "Common/LogManager.h"
-#include "../FileSystems/FileSystem.h"
-#include "../FileSystems/MetaFileSystem.h"
-#include "../PSPLoaders.h"
-#include "../../Core/CoreTiming.h"
-#include "../../Core/SaveState.h"
-#include "../../Core/System.h"
-#include "../../GPU/GPUInterface.h"
-#include "../../GPU/GPUState.h"
+#include "Core/FileSystems/FileSystem.h"
+#include "Core/FileSystems/MetaFileSystem.h"
+#include "Core/PSPLoaders.h"
+#include "Core/CoreTiming.h"
+#include "Core/Reporting.h"
+#include "Core/SaveState.h"
+#include "Core/System.h"
+#include "GPU/GPUInterface.h"
+#include "GPU/GPUState.h"
 
 #include "util/random/rng.h"
 
@@ -422,8 +423,7 @@ SceUID KernelObjectPool::Create(KernelObject *obj, int rangeBottom, int rangeTop
 		}
 	}
 
-	// WTF?
-	_dbg_assert_(HLE, 0);
+	ERROR_LOG_REPORT(SCEKERNEL, "Unable to allocate kernel object, too many objects slots in use.");
 	return 0;
 }
 

Core/System.cpp

@@ -255,7 +255,7 @@ void Core_UpdateState(CoreState newState) {
 }
 
 bool PSP_Init(const CoreParameter &coreParam, std::string *error_string) {
-	INFO_LOG(HLE, "PPSSPP %s", PPSSPP_GIT_VERSION);
+	INFO_LOG(BOOT, "PPSSPP %s", PPSSPP_GIT_VERSION);
 
 	coreParameter = coreParam;
 	coreParameter.errorString = "";

GPU/GLES/GLES_GPU.cpp

@@ -1163,7 +1163,7 @@ void GLES_GPU::ExecuteOp(u32 op, u32 diff) {
 	case GE_CMD_ALPHATEST:
 #ifndef USING_GLES2
 		if (((data >> 16) & 0xFF) != 0xFF && (data & 7) > 1)
-			WARN_LOG_REPORT_ONCE(alphatestmask, HLE, "Unsupported alphatest mask: %02x", (data >> 16) & 0xFF);
+			WARN_LOG_REPORT_ONCE(alphatestmask, G3D, "Unsupported alphatest mask: %02x", (data >> 16) & 0xFF);
 		// Intentional fallthrough.
 #endif
 

GPU/GLES/TextureCache.cpp

@@ -194,10 +194,10 @@ inline void AttachFramebufferInvalid(T &entry, VirtualFramebuffer *framebuffer)
 inline void TextureCache::AttachFramebuffer(TexCacheEntry *entry, u32 address, VirtualFramebuffer *framebuffer, bool exactMatch) {
 	// If they match exactly, it's non-CLUT and from the top left.
 	if (exactMatch) {
-		DEBUG_LOG(HLE, "Render to texture detected at %08x!", address);
+		DEBUG_LOG(G3D, "Render to texture detected at %08x!", address);
 		if (!entry->framebuffer || entry->invalidHint == -1) {
 			if (entry->format != framebuffer->format) {
-				WARN_LOG_REPORT_ONCE(diffFormat1, HLE, "Render to texture with different formats %d != %d", entry->format, framebuffer->format);
+				WARN_LOG_REPORT_ONCE(diffFormat1, G3D, "Render to texture with different formats %d != %d", entry->format, framebuffer->format);
 				// If it already has one, let's hope that one is correct.
 				// Affected game list : Kurohyou 2, Evangelion Jo
 				AttachFramebufferInvalid(entry, framebuffer);
@@ -215,12 +215,12 @@ inline void TextureCache::AttachFramebuffer(TexCacheEntry *entry, u32 address, V
 		// Is it at least the right stride?
 		if (framebuffer->fb_stride == entry->bufw && compatFormat) {
 			if (framebuffer->format != entry->format) {
-				WARN_LOG_REPORT_ONCE(diffFormat2, HLE, "Render to texture with different formats %d != %d at %08x", entry->format, framebuffer->format, address);
+				WARN_LOG_REPORT_ONCE(diffFormat2, G3D, "Render to texture with different formats %d != %d at %08x", entry->format, framebuffer->format, address);
 				// TODO: Use an FBO to translate the palette?
 				// Affected game List : DBZ VS Tag , 3rd birthday 
 				AttachFramebufferValid(entry, framebuffer);
 			} else if ((entry->addr - address) / entry->bufw < framebuffer->height) {
-				WARN_LOG_REPORT_ONCE(subarea, HLE, "Render to area containing texture at %08x", address);
+				WARN_LOG_REPORT_ONCE(subarea, G3D, "Render to area containing texture at %08x", address);
 				// TODO: Keep track of the y offset.
 				// Affected game List : God of War Ghost of Sparta , God of War Chains of Olympus
 				AttachFramebufferInvalid(entry, framebuffer);
@@ -960,7 +960,7 @@ bool SetDebugTexture() {
 	bool changed = false;
 	if (((gpuStats.numFlips / highlightFrames) % mostTextures) == numTextures) {
 		if (gpuStats.numFlips % highlightFrames == 0) {
-			NOTICE_LOG(HLE, "Highlighting texture # %d / %d", numTextures, mostTextures);
+			NOTICE_LOG(G3D, "Highlighting texture # %d / %d", numTextures, mostTextures);
 		}
 		static const u32 solidTextureData[] = {0x99AA99FF};
 
@@ -1185,7 +1185,7 @@ void TextureCache::SetTexture() {
 	}
 
 	if ((bufw == 0 || (gstate.texbufwidth[0] & 0xf800) != 0) && texaddr >= PSP_GetUserMemoryBase()) {
-		ERROR_LOG_REPORT(HLE, "Texture with unexpected bufw (full=%d)", gstate.texbufwidth[0] & 0xffff);
+		ERROR_LOG_REPORT(G3D, "Texture with unexpected bufw (full=%d)", gstate.texbufwidth[0] & 0xffff);
 	}
 
 	// We have to decode it, let's setup the cache entry first.

GPU/GLES/TransformPipeline.cpp

@@ -947,7 +947,7 @@ void TransformDrawEngine::DecodeVerts() {
 
 	// Sanity check
 	if (indexGen.Prim() < 0) {
-		ERROR_LOG(HLE, "DecodeVerts: Failed to deduce prim: %i", indexGen.Prim());
+		ERROR_LOG(G3D, "DecodeVerts: Failed to deduce prim: %i", indexGen.Prim());
 		// Force to points (0)
 		indexGen.AddPrim(GE_PRIM_POINTS, 0);
 	}
@@ -1024,7 +1024,7 @@ void TransformDrawEngine::DecimateTrackedVertexArrays() {
 		char *ptr = buffer;
 		ptr += dec->second->ToString(ptr);
 //		*ptr++ = '\n';
-		NOTICE_LOG(HLE, buffer);
+		NOTICE_LOG(G3D, buffer);
 	}
 #endif
 }

GPU/GPUCommon.cpp

@@ -493,7 +493,7 @@ void GPUCommon::SlowRunLoop(DisplayList &list)
 			char temp[256];
 			u32 prev = Memory::ReadUnchecked_U32(list.pc - 4);
 			GeDisassembleOp(list.pc, op, prev, temp);
-			NOTICE_LOG(HLE, "%s", temp);
+			NOTICE_LOG(G3D, "%s", temp);
 		}
 		gstate.cmdmem[cmd] = op;
 
@@ -606,7 +606,7 @@ void GPUCommon::ProcessDLQueueInternal() {
 
 	// Seems to be correct behaviour to process the list anyway?
 	if (startingTicks < busyTicks) {
-		DEBUG_LOG(HLE, "Can't execute a list yet, still busy for %lld ticks", busyTicks - startingTicks);
+		DEBUG_LOG(G3D, "Can't execute a list yet, still busy for %lld ticks", busyTicks - startingTicks);
 		//return;
 	}
 

Windows/OpenGLBase.cpp

@@ -83,7 +83,7 @@ void DebugCallbackARB(GLenum source, GLenum type, GLuint id, GLenum severity,
 	FILE *outFile = (FILE*)userParam;
 	char finalMessage[256];
 	FormatDebugOutputARB(finalMessage, 256, source, type, id, severity, message);
-	ERROR_LOG(HLE, "GL: %s", finalMessage);
+	ERROR_LOG(G3D, "GL: %s", finalMessage);
 }
 
 bool GL_Init(HWND window, std::string *error_message) {

Windows/XinputDevice.cpp

@@ -95,7 +95,7 @@ static const unsigned int xinput_ctrl_map_size = sizeof(xinput_ctrl_map) / sizeo
 
 XinputDevice::XinputDevice() {
 	if (LoadXInputDLL() != 0) {
-		ERROR_LOG(HLE, "Failed to load XInput! DLL missing");
+		ERROR_LOG(SCECTRL, "Failed to load XInput! DLL missing");
 	}
 	ZeroMemory( &this->prevState, sizeof(this->prevState) );
 	this->check_delay = 0;