Improve error message when core does not implement mem callbacks

TASEmulators · Apr 7, 2023 · 6e77c73 · 6e77c73
1 parent fbe1f9b
commit 6e77c73
Showing 1 changed file with 11 additions and 15 deletions.
diff --git a/src/BizHawk.Client.Common/lua/LuaHelperLibs/EventsLuaLibrary.cs b/src/BizHawk.Client.Common/lua/LuaHelperLibs/EventsLuaLibrary.cs
@@ -29,15 +29,11 @@ public EventsLuaLibrary(ILuaLibraries luaLibsImpl, ApiContainer apiContainer, Ac
 
 		public override string Name => "event";
 
-		private void LogMemoryCallbacksNotImplemented()
-		{
-			Log($"{Emulator.Attributes().CoreName} does not implement memory callbacks");
-		}
+		private void LogMemoryCallbacksNotImplemented(bool isWildcard)
+			=> Log($"{Emulator.Attributes().CoreName} does not implement {(isWildcard ? "wildcard " : string.Empty)}memory callbacks");
 
-		private void LogMemoryExecuteCallbacksNotImplemented()
-		{
-			Log($"{Emulator.Attributes().CoreName} does not implement memory execute callbacks");
-		}
+		private void LogMemoryExecuteCallbacksNotImplemented(bool isWildcard)
+			=> Log($"{Emulator.Attributes().CoreName} does not implement {(isWildcard ? "wildcard " : string.Empty)}memory execute callbacks");
 
 		private void LogScopeNotAvailable(string scope)
 		{
@@ -136,11 +132,11 @@ public string OnBusExec(
 			}
 			catch (NotImplementedException)
 			{
-				LogMemoryExecuteCallbacksNotImplemented();
+				LogMemoryExecuteCallbacksNotImplemented(isWildcard: false);
 				return Guid.Empty.ToString();
 			}
 
-			LogMemoryExecuteCallbacksNotImplemented();
+			LogMemoryExecuteCallbacksNotImplemented(isWildcard: false);
 			return Guid.Empty.ToString();
 		}
 
@@ -190,7 +186,7 @@ public string OnBusExecAny(
 			{
 				// fall through
 			}
-			LogMemoryExecuteCallbacksNotImplemented();
+			LogMemoryExecuteCallbacksNotImplemented(isWildcard: true);
 			return Guid.Empty.ToString();
 		}
 
@@ -232,11 +228,11 @@ public string OnBusRead(
 			}
 			catch (NotImplementedException)
 			{
-				LogMemoryCallbacksNotImplemented();
+				LogMemoryCallbacksNotImplemented(isWildcard: address is null);
 				return Guid.Empty.ToString();
 			}
 
-			LogMemoryCallbacksNotImplemented();
+			LogMemoryCallbacksNotImplemented(isWildcard: address is null);
 			return Guid.Empty.ToString();
 		}
 
@@ -278,11 +274,11 @@ public string OnBusWrite(
 			}
 			catch (NotImplementedException)
 			{
-				LogMemoryCallbacksNotImplemented();
+				LogMemoryCallbacksNotImplemented(isWildcard: address is null);
 				return Guid.Empty.ToString();
 			}
 
-			LogMemoryCallbacksNotImplemented();
+			LogMemoryCallbacksNotImplemented(isWildcard: address is null);
 			return Guid.Empty.ToString();
 		}