From e8a69b57f13a758b7d6b69485788b1585f3d24a5 Mon Sep 17 00:00:00 2001 From: Jonathan Campbell Date: Mon, 19 Feb 2018 09:12:40 -0800 Subject: [PATCH] VS2015: Fix CPU reset code NOT to do restart_program hack even in dynamic core. In Windows, seems to work reliably so far. C++ exceptions seem to work with dynamic core so far in Windows 32-bit. --- src/hardware/memory.cpp | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/hardware/memory.cpp b/src/hardware/memory.cpp index 749168dc0..81c1f3e75 100644 --- a/src/hardware/memory.cpp +++ b/src/hardware/memory.cpp @@ -1295,16 +1295,6 @@ void On_Software_CPU_Reset() { return; }; -#if C_DYNAMIC_X86 - /* this technique is NOT reliable when running the dynamic core! */ - if (cpudecoder == &CPU_Core_Dyn_X86_Run) { - LOG_MSG("Using traditional DOSBox re-exec, C++ exception method is not compatible with dynamic core\n"); - control->startup_params.insert(control->startup_params.begin(),control->cmdline->GetFileName()); - restart_program(control->startup_params); - return; - } -#endif - throw int(3); /* does not return */ }