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

Rough in some code for BizInvoke in mono

This commit is contained in:
nattthebear 2016-02-20 11:54:44 -05:00
parent 787711389a
commit 1c4c5fb4a3
3 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Emulation.Common/BizHawk.Emulation.Common.csproj
View File

@ -65,8 +65,8 @@
<Compile Include="Base Implementations\TraceBuffer.cs" /> <Compile Include="Base Implementations\TraceBuffer.cs" />
<Compile Include="BinaryQuickSerializer.cs" /> <Compile Include="BinaryQuickSerializer.cs" />
<Compile Include="BizInvoke\BizInvoker.cs" /> <Compile Include="BizInvoke\BizInvoker.cs" />
<Compile Include="BizInvoke\DynamicLibraryImportResolver.cs" />
<Compile Include="BizInvoke\IImportResolver.cs" /> <Compile Include="BizInvoke\IImportResolver.cs" />
<Compile Include="BizInvoke\Win32LibraryImportResolver.cs" />
<Compile Include="CodeDataLog.cs" /> <Compile Include="CodeDataLog.cs" />
<Compile Include="CoreAttributes.cs" /> <Compile Include="CoreAttributes.cs" />
<Compile Include="CoreComms.cs" /> <Compile Include="CoreComms.cs" />

32
BizHawk.Emulation.Common/BizInvoke/Win32LibraryImportResolver.cs → BizHawk.Emulation.Common/BizInvoke/DynamicLibraryImportResolver.cs
View File

@ -6,27 +6,40 @@ using System.Runtime.InteropServices;
namespace BizHawk.Emulation.Common.BizInvoke namespace BizHawk.Emulation.Common.BizInvoke
{ {
public class Win32LibraryImportResolver : IImportResolver, IDisposable public class DynamicLibraryImportResolver : IImportResolver, IDisposable
{ {
private IntPtr _p; private IntPtr _p;
public Win32LibraryImportResolver(string dllName) public DynamicLibraryImportResolver(string dllName)
{ {
#if !MONO
_p = Win32.LoadLibrary(dllName); _p = Win32.LoadLibrary(dllName);
#else
// TODO: how can we read name remaps out of app.confg <dllmap> ?
_p = Libdl.dlopen(dllName, Libdl.RTLD_NOW);
#endif
if (_p == IntPtr.Zero) if (_p == IntPtr.Zero)
throw new InvalidOperationException("LoadLibrary returned NULL"); throw new InvalidOperationException("LoadLibrary returned NULL");
} }
public IntPtr Resolve(string entryPoint) public IntPtr Resolve(string entryPoint)
{ {
#if !MONO
return Win32.GetProcAddress(_p, entryPoint); return Win32.GetProcAddress(_p, entryPoint);
#else
return Libdl.dlsym(_p, entryPoint);
#endif
} }
private void Free() private void Free()
{ {
if (_p != IntPtr.Zero) if (_p != IntPtr.Zero)
{ {
#if !MONO
Win32.FreeLibrary(_p); Win32.FreeLibrary(_p);
#else
Libdl.dlclose(_p);
#endif
_p = IntPtr.Zero; _p = IntPtr.Zero;
} }
} }
@ -37,11 +50,12 @@ namespace BizHawk.Emulation.Common.BizInvoke
GC.SuppressFinalize(this); GC.SuppressFinalize(this);
} }
~Win32LibraryImportResolver() ~DynamicLibraryImportResolver()
{ {
Free(); Free();
} }
#if !MONO
private static class Win32 private static class Win32
{ {
[DllImport("kernel32.dll")] [DllImport("kernel32.dll")]
@ -51,5 +65,17 @@ namespace BizHawk.Emulation.Common.BizInvoke
[DllImport("kernel32.dll")] [DllImport("kernel32.dll")]
public static extern bool FreeLibrary(IntPtr hModule); public static extern bool FreeLibrary(IntPtr hModule);
} }
#else
private static class Libdl
{
[DllImport("libdl.so")]
public static extern IntPtr dlopen(string filename, int flags);
[DllImport("libdl.so")]
public static extern IntPtr dlsym(IntPtr handle, string symbol);
[DllImport("libdl.so")]
public static extern int dlclose(IntPtr handle);
public const int RTLD_NOW = 2;
}
#endif
} }
} }

4
BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.cs
View File

@ -28,12 +28,12 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES
IStatable, IDebuggable, ISettable<QuickNES.QuickNESSettings, QuickNES.QuickNESSyncSettings>, Cores.Nintendo.NES.INESPPUViewable IStatable, IDebuggable, ISettable<QuickNES.QuickNESSettings, QuickNES.QuickNESSyncSettings>, Cores.Nintendo.NES.INESPPUViewable
{ {
static readonly LibQuickNES QN; static readonly LibQuickNES QN;
static readonly Win32LibraryImportResolver Resolver; static readonly DynamicLibraryImportResolver Resolver;
static QuickNES() static QuickNES()
{ {
Resolver = new Win32LibraryImportResolver(LibQuickNES.dllname); Resolver = new DynamicLibraryImportResolver(LibQuickNES.dllname);
QN = BizInvoker.GetInvoker<LibQuickNES>(Resolver); QN = BizInvoker.GetInvoker<LibQuickNES>(Resolver);
} }