Explorar o código

Merge pull request #1362 from MerryMage/dynarmic

externals: Update dynarmic to 171d116
Mat M %!s(int64=7) %!d(string=hai) anos
pai
achega
1e35d8fa8f
Modificáronse 2 ficheiros con 13 adicións e 1 borrados
  1. 1 1
      externals/dynarmic
  2. 12 0
      src/core/arm/dynarmic/arm_dynarmic.cpp

+ 1 - 1
externals/dynarmic

@@ -1 +1 @@
-Subproject commit 959446573f3adfcba173ef4b0011a4a280f18eba
+Subproject commit 171d11659d760a4d4674d3a90698fe31ea407e2e

+ 12 - 0
src/core/arm/dynarmic/arm_dynarmic.cpp

@@ -12,6 +12,7 @@
 #include "core/core.h"
 #include "core/core_cpu.h"
 #include "core/core_timing.h"
+#include "core/gdbstub/gdbstub.h"
 #include "core/hle/kernel/process.h"
 #include "core/hle/kernel/svc.h"
 #include "core/memory.h"
@@ -79,6 +80,17 @@ public:
         case Dynarmic::A64::Exception::SendEventLocal:
         case Dynarmic::A64::Exception::Yield:
             return;
+        case Dynarmic::A64::Exception::Breakpoint:
+            if (GDBStub::IsServerEnabled()) {
+                parent.jit->HaltExecution();
+                parent.SetPC(pc);
+                Kernel::Thread* thread = Kernel::GetCurrentThread();
+                parent.SaveContext(thread->context);
+                GDBStub::Break();
+                GDBStub::SendTrap(thread, 5);
+                return;
+            }
+            [[fallthrough]];
         default:
             ASSERT_MSG(false, "ExceptionRaised(exception = {}, pc = {:X})",
                        static_cast<std::size_t>(exception), pc);