From 62858c8c140a281cc5145ca1b81b1aeffbb5015a Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Sat, 10 Dec 2011 18:42:49 -0800
Subject: [PATCH] Small logging changes. Pause core if Jit64 tries to compile
 at 0.

---
 Source/Core/Core/Src/HLE/HLE_OS.cpp        |  7 ++++---
 Source/Core/Core/Src/HW/Memmap.cpp         | 17 +++++++----------
 Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp |  5 ++++-
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/Source/Core/Core/Src/HLE/HLE_OS.cpp b/Source/Core/Core/Src/HLE/HLE_OS.cpp
index eebff67ece..3ced001268 100644
--- a/Source/Core/Core/Src/HLE/HLE_OS.cpp
+++ b/Source/Core/Core/Src/HLE/HLE_OS.cpp
@@ -69,9 +69,10 @@ void GetStringVA(std::string& _rOutBuffer, u32 strReg)
 	char ArgumentBuffer[256];
 	u32 ParameterCounter = 4;    
 	u32 FloatingParameterCounter = 1;
-	char* pString = (char*)Memory::GetPointer(GPR(strReg));
-	if (!pString) {
-		//PanicAlert("Invalid GetStringVA call");
+	char *pString = (char*)Memory::GetPointer(GPR(strReg));
+	if (!pString)
+	{
+		ERROR_LOG(OSREPORT, "r%i invalid", strReg);
 		return;
 	}
 
diff --git a/Source/Core/Core/Src/HW/Memmap.cpp b/Source/Core/Core/Src/HW/Memmap.cpp
index a0631a0fa3..980b080761 100644
--- a/Source/Core/Core/Src/HW/Memmap.cpp
+++ b/Source/Core/Core/Src/HW/Memmap.cpp
@@ -641,7 +641,7 @@ u8 *GetPointer(const u32 _Address)
 			_dbg_assert_msg_(MEMMAP, 0, "GetPointer from IO Bridge doesnt work");
 		case 0xc8:
 			// EFB. We don't want to return a pointer here since we have no memory mapped for it.
-			return 0;
+			break;
 
 		default:
 			return m_pPhysicalRAM + (_Address & RAM_MASK);
@@ -653,25 +653,22 @@ u8 *GetPointer(const u32 _Address)
 		if (SConfig::GetInstance().m_LocalCoreStartupParameter.bWii)
 			return m_pPhysicalEXRAM + (_Address & EXRAM_MASK);
 		else
-			return 0;
+			break;
 
 	case 0xe:
 		if (_Address < (0xE0000000 + L1_CACHE_SIZE))
 			return GetCachePtr() + (_Address & L1_CACHE_MASK);
 		else
-			return 0;
+			break;
 
 	default:
 		if (bFakeVMEM)
 			return m_pVirtualFakeVMEM + (_Address & FAKEVMEM_MASK);
-		else
-		{
-			if (!Core::g_CoreStartupParameter.bMMU &&
-				!PanicYesNoT("Unknown pointer %#08x\nContinue?", _Address))
-				Crash();
-			return 0;
-		}
 	}
+
+	ERROR_LOG(MEMMAP, "Unknown Pointer %#8x PC %#8x LR %#8x", _Address, PC, LR);
+
+	return NULL;
 }
 
 
diff --git a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp
index f9fd3c4635..0d31893b53 100644
--- a/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp
+++ b/Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp
@@ -418,7 +418,10 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc
 	}
 
 	if (em_address == 0)
-		PanicAlert("ERROR : Trying to compile at 0. LR=%08x", LR);
+	{
+		Core::SetState(Core::CORE_PAUSE);
+		PanicAlert("ERROR: Compiling at 0. LR=%08x CTR=%08x", LR, CTR);
+	}
 
 	if (Core::g_CoreStartupParameter.bMMU && (em_address & JIT_ICACHE_VMEM_BIT))
 	{