From 59d76294c9f92aab97ea4fb46d011a31e1f4a731 Mon Sep 17 00:00:00 2001
From: Morilli <35152647+Morilli@users.noreply.github.com>
Date: Fri, 3 Dec 2021 22:15:08 +0100
Subject: [PATCH] Close #2958

---
 .../Consoles/Sega/gpgx64/GPGX.IDebuggable.cs  | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.IDebuggable.cs b/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.IDebuggable.cs
index 594f4b52ce..c89dfc6577 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.IDebuggable.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Sega/gpgx64/GPGX.IDebuggable.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
-
+using BizHawk.Common;
 using BizHawk.Emulation.Common;
 
 namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
@@ -14,17 +14,20 @@ namespace BizHawk.Emulation.Cores.Consoles.Sega.gpgx
 
 			int n = Core.gpgx_getregs(regs);
 			if (n > regs.Length)
-				throw new InvalidOperationException("A buffer overrun has occured!");
+					throw new InvalidOperationException("A buffer overrun has occured!");
 			var ret = new Dictionary<string, RegisterValue>();
-			for (int i = 0; i < n; i++)
+			using (_elf.EnterExit())
 			{
-				// el hacko
-				string name = Marshal.PtrToStringAnsi(regs[i].Name);
-				byte size = 32;
-				if (name.Contains("68K SR") || name.StartsWith("Z80"))
-					size = 16;
+				for (int i = 0; i < n; i++)
+				{
+					// el hacko
+					string name = Marshal.PtrToStringAnsi(regs[i].Name);
+					byte size = 32;
+					if (name.Contains("68K SR") || name.StartsWith("Z80"))
+						size = 16;
 
-				ret[name] = new RegisterValue((ulong)regs[i].Value, size);
+					ret[name] = new RegisterValue((ulong)regs[i].Value, size);
+				}
 			}
 
 			return ret;