create a memory callback based IInputCallbacks system that can be used by any core, wire it up to the mGBA core

This commit is contained in:
adelikat 2020-04-10 08:51:53 -05:00
parent 7e5fdf9142
commit 62f3214ce2
3 changed files with 90 additions and 3 deletions

View File

@ -0,0 +1,86 @@
using System;
using System.Collections;
using System.Collections.Generic;
namespace BizHawk.Emulation.Common
{
/// <summary>
/// An implementation of <seealso cref="IInputCallbackSystem"/> that is implementation using only methods
/// from <seealso cref="IDebuggable"/>,
/// Useful for ported cores that have these hooks but no input callback hook,
/// This allows for an input callback implementation without the need for additional APIs
/// </summary>
/// <seealso cref="IInputCallbackSystem"/>
/// <seealso cref="IDebuggable"/>
public class MemoryBasedInputCallbackSystem : IInputCallbackSystem
{
private readonly List<Action> _inputCallbacks = new List<Action>();
public MemoryBasedInputCallbackSystem(IDebuggable debuggableCore, string scope, IEnumerable<uint> addresses)
{
if (addresses == null)
{
throw new ArgumentException($"{nameof(addresses)} cannot be null.");
}
if (!debuggableCore.MemoryCallbacksAvailable())
{
throw new InvalidOperationException("Memory callbacks are required");
}
foreach (var address in addresses)
{
var callback = new MemoryCallback(
scope,
MemoryCallbackType.Read,
"InputCallback" + address,
MemoryCallback,
address,
null);
debuggableCore.MemoryCallbacks.Add(callback);
}
}
private void MemoryCallback(uint address, uint value, uint flags)
{
foreach (var action in _inputCallbacks)
{
action.Invoke();
}
}
public IEnumerator<Action> GetEnumerator() => _inputCallbacks.GetEnumerator();
IEnumerator IEnumerable.GetEnumerator() => _inputCallbacks.GetEnumerator();
public void Add(Action item) => _inputCallbacks.Add(item);
public void Clear()
{
_inputCallbacks.Clear();
}
public bool Contains(Action item) => _inputCallbacks.Contains(item);
public void CopyTo(Action[] array, int arrayIndex) => _inputCallbacks.CopyTo(array, arrayIndex);
public bool Remove(Action item) => _inputCallbacks.Remove(item);
public int Count => _inputCallbacks.Count;
public bool IsReadOnly => false;
public void Call()
{
throw new InvalidOperationException("This implementation does not require being called directly");
}
public void RemoveAll(IEnumerable<Action> actions)
{
foreach (var action in actions)
{
Remove(action);
}
}
}
}

View File

@ -1,5 +1,4 @@
using System;
using BizHawk.Emulation.Common;
using BizHawk.Emulation.Common;
namespace BizHawk.Emulation.Cores.Nintendo.GBA
{
@ -9,6 +8,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
public bool IsLagFrame { get; set; }
[FeatureNotImplemented]
public IInputCallbackSystem InputCallbacks => throw new NotImplementedException();
public IInputCallbackSystem InputCallbacks { get; private set; }
}
}

View File

@ -67,6 +67,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
LibmGBA.BizDestroy(Core);
throw;
}
InputCallbacks = new MemoryBasedInputCallbackSystem(this, "System Bus", new [] { 0x4000130u });
}
public IEmulatorServiceProvider ServiceProvider { get; }