From 444d1b21821094ff55261d90ba5c9f6335da0a66 Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Sat, 28 Sep 2024 17:49:48 +1000 Subject: [PATCH] Avoid exceptions in `AxisValue` implementations (resolves #4057) see #4056 only in Release config, because cores really shouldn't be using undeclared axes and I'd like to be able to catch that --- .../controllers/AutofireController.cs | 7 ++++++- .../controllers/StickyControllers.cs | 16 ++++++++++++---- .../inputAdapters/BitwiseAdapters.cs | 15 +++++++++++++-- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/src/BizHawk.Client.Common/controllers/AutofireController.cs b/src/BizHawk.Client.Common/controllers/AutofireController.cs index 58af852252..affc7ddb7b 100644 --- a/src/BizHawk.Client.Common/controllers/AutofireController.cs +++ b/src/BizHawk.Client.Common/controllers/AutofireController.cs @@ -41,7 +41,12 @@ namespace BizHawk.Client.Common _buttonStarts.Clear(); } - public int AxisValue(string name) => Definition.Axes[name].Neutral; + public int AxisValue(string name) +#if DEBUG + => Definition.Axes[name].Neutral; // throw if no such axis +#else + => Definition.Axes.TryGetValue(name, out var axisSpec) ? axisSpec.Neutral : default; +#endif public IReadOnlyCollection<(string Name, int Strength)> GetHapticsSnapshot() => Array.Empty<(string, int)>(); diff --git a/src/BizHawk.Client.Common/controllers/StickyControllers.cs b/src/BizHawk.Client.Common/controllers/StickyControllers.cs index 0d8bf2eac7..6baef48d69 100644 --- a/src/BizHawk.Client.Common/controllers/StickyControllers.cs +++ b/src/BizHawk.Client.Common/controllers/StickyControllers.cs @@ -25,9 +25,13 @@ namespace BizHawk.Client.Common } public int AxisValue(string name) - { - return _axisHolds.TryGetValue(name, out int axisValue) ? axisValue : Definition.Axes[name].Neutral; - } + => _axisHolds.TryGetValue(name, out int axisValue) + ? axisValue +#if DEBUG + : Definition.Axes[name].Neutral; // throw if no such axis +#else + : Definition.Axes.TryGetValue(name, out var axisSpec) ? axisSpec.Neutral : default; +#endif public IReadOnlyCollection<(string Name, int Strength)> GetHapticsSnapshot() => throw new NotSupportedException(); public void SetHapticChannelStrength(string name, int strength) => throw new NotSupportedException(); @@ -113,7 +117,11 @@ namespace BizHawk.Client.Common public int AxisValue(string name) => _axisPatterns.TryGetValue(name, out var pattern) ? pattern.PeekNextValue() - : Definition.Axes[name].Neutral; +#if DEBUG + : Definition.Axes[name].Neutral; // throw if no such axis +#else + : Definition.Axes.TryGetValue(name, out var axisSpec) ? axisSpec.Neutral : default; +#endif public IReadOnlyCollection<(string Name, int Strength)> GetHapticsSnapshot() => throw new NotSupportedException(); public void SetHapticChannelStrength(string name, int strength) => throw new NotSupportedException(); diff --git a/src/BizHawk.Client.Common/inputAdapters/BitwiseAdapters.cs b/src/BizHawk.Client.Common/inputAdapters/BitwiseAdapters.cs index e4d628aa70..348c85b501 100644 --- a/src/BizHawk.Client.Common/inputAdapters/BitwiseAdapters.cs +++ b/src/BizHawk.Client.Common/inputAdapters/BitwiseAdapters.cs @@ -51,7 +51,11 @@ namespace BizHawk.Client.Common { int sourceAxisValue = Source.AxisValue(name); int sourceXorAxisValue = SourceXor.AxisValue(name); - int neutral = Definition.Axes[name].Neutral; +#if DEBUG + var neutral = Definition.Axes[name].Neutral; // throw if no such axis +#else + var neutral = Definition.Axes.TryGetValue(name, out var axisSpec) ? axisSpec.Neutral : default; +#endif if (sourceAxisValue == neutral) { @@ -82,7 +86,14 @@ namespace BizHawk.Client.Common public int AxisValue(string name) { int sourceValue = Source.AxisValue(name); - return sourceValue != Source.Definition.Axes[name].Neutral ? sourceValue : SourceOr.AxisValue(name); +#if DEBUG + var neutralValue = Source.Definition.Axes[name].Neutral; // throw if no such axis +#else + var neutralValue = Source.Definition.Axes.TryGetValue(name, out var axisSpec) ? axisSpec.Neutral : default; +#endif + return sourceValue != neutralValue + ? sourceValue + : SourceOr.AxisValue(name); } public IReadOnlyCollection<(string Name, int Strength)> GetHapticsSnapshot() => Source.GetHapticsSnapshot();