Merge pull request #278 from ogamespec/master

User-friendly Debug::Halt
emu-russia · Aug 10, 2023 · cc68053 · cc68053
2 parents bbf412e + 6ff9d07
commit cc68053
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/scripts/pureikyubu.vcxproj b/scripts/pureikyubu.vcxproj
@@ -247,14 +247,13 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -284,14 +283,13 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

diff --git a/src/debug.cpp b/src/debug.cpp
@@ -15,12 +15,22 @@ namespace Debug
 
 		Msgs.AddReport(Channel::Error, true, buf);
 
+		bool any_debugger_present = false;
+
 		if (Debug::gekkoDebug != nullptr) {
 			Debug::gekkoDebug->InvalidateAll();
+			any_debugger_present = true;
 		}
 
 		if (Debug::dspDebug != nullptr) {
 			Debug::dspDebug->InvalidateAll();
+			any_debugger_present = true;
+		}
+
+		if (!any_debugger_present) {
+			UI::Report(
+				Util::StringToWstring(
+					std::string("The emulation is crashed. Details can be viewed in the debugger (Ctrl+D)\n\n" + std::string(buf))).c_str());
 		}
 	}
 

diff --git a/src/gekko.cpp b/src/gekko.cpp
@@ -253,7 +253,8 @@ namespace Gekko
 			}
 
 			if (break_on_DSI) {
-				Halt("Gekko DSI Exception at %08X\n", regs.pc);
+				Halt("Gekko DSI Exception at %08X.%s\n", regs.pc, regs.spr[Gekko::SPR::SDR1] != 0 ? 
+					"\nThe sneaky game uses the vm library, to emulate virtual memory, which is not yet well implemented." : "");
 			}
 		}
 

diff --git a/src/main.h b/src/main.h
@@ -36,7 +36,7 @@ A list of commands can be found in EmuJdi.json
 
 #pragma once
 
-#define EMU_VERSION L"1.3"
+#define EMU_VERSION L"1.4"
 
 void    EMUGetHwConfig(HWConfig* config);