ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CoreInventory tweaks 

When constructing a core using ConstructorInfo.Invoke, any exceptions thrown by the core are packaged inside TargetInvocationExceptions.  This has no value to us -- the fact that reflection is used is an implementation detail, and it breaks checking specific exceptions for specific information.  Accordingly, consumers have to deal with e.InnerException checks.  Fix this up so that we only expose the actual exception thrown.

In addition, undo a bad change in 6225e7854b that made the entirety of CoreInventory nonfunctional.
This commit is contained in:
nattthebear 2020-12-20 09:00:37 -05:00
parent 7bb5506ba8
commit 374f646f75
1 changed files with 37 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/BizHawk.Emulation.Cores/CoreInventory.cs
View File

@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Runtime.ExceptionServices;
using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores
@ -89,26 +90,23 @@ namespace BizHawk.Emulation.Cores
}
}
/// <summary>
/// Instantiate an emulator core
/// </summary>
public IEmulator Create(ICoreInventoryParameters cip)
private IEmulator CreateUsingCoreLoadParameters(ICoreInventoryParameters cip)
{
if (_useCoreLoadParameters)
{
var paramType = typeof(CoreLoadParameters<,>).MakeGenericType(SettingsType, SyncSettingsType);
// TODO: clean this up
dynamic param = Activator.CreateInstance(paramType);
param.Comm = cip.Comm;
param.Game = cip.Game;
param.Settings = cip.FetchSettings(Type, SettingsType);
param.SyncSettings = cip.FetchSyncSettings(Type, SyncSettingsType);
param.Roms = cip.Roms;
param.Discs = cip.Discs;
param.DeterministicEmulationRequested = cip.DeterministicEmulationRequested;
return (IEmulator)CTor.Invoke(new object[] { param });
}
var paramType = typeof(CoreLoadParameters<,>).MakeGenericType(SettingsType, SyncSettingsType);
// TODO: clean this up
dynamic param = Activator.CreateInstance(paramType);
param.Comm = cip.Comm;
param.Game = cip.Game;
param.Settings = (dynamic)cip.FetchSettings(Type, SettingsType);
param.SyncSettings = (dynamic)cip.FetchSyncSettings(Type, SyncSettingsType);
param.Roms = cip.Roms;
param.Discs = cip.Discs;
param.DeterministicEmulationRequested = cip.DeterministicEmulationRequested;
return (IEmulator)CTor.Invoke(new object[] { param });
}
private IEmulator CreateUsingLegacyConstructorParameters(ICoreInventoryParameters cip)
{
// cores using the old constructor parameters can only take a single rom, so assume that here
object[] o = new object[_paramMap.Count];
Bp(o, "comm", cip.Comm);
@ -122,6 +120,27 @@ namespace BizHawk.Emulation.Cores
return (IEmulator)CTor.Invoke(o);
}
/// <summary>
/// Instantiate an emulator core
/// </summary>
public IEmulator Create(ICoreInventoryParameters cip)
{
try
{
return _useCoreLoadParameters
? CreateUsingCoreLoadParameters(cip)
: CreateUsingLegacyConstructorParameters(cip);
}
catch (TargetInvocationException e)
{
// When an exception occurs inside ConstructorInfo.Invoke,
// we always want to expose the exception the core actually threw,
// and not the implementation detail that reflected construction was used.
ExceptionDispatchInfo.Capture(e.InnerException).Throw();
throw; // Needed only for flow analysis -- CSC doesn't know that ExceptionDispatchInfo.Throw() never returns
}
}
}
public IEnumerable<Core> GetCores(string system)