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

Memory callback system - simplify and remove now unused methods

This commit is contained in:
adelikat 2019-11-05 20:01:58 -06:00
parent 558171d949
commit 40ac534f51
2 changed files with 31 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
BizHawk.Emulation.Common/Base Implementations/ControllerDefinition.cs
View File

@ -186,14 +186,9 @@ namespace BizHawk.Emulation.Common
public int PlayerNumber(string buttonName)
{
var match = PlayerRegex.Match(buttonName);
if (match.Success)
{
return int.Parse(match.Groups[1].Value);
}
else
{
return 0;
}
return match.Success
? int.Parse(match.Groups[1].Value)
: 0;
}
private static readonly Regex PlayerRegex = new Regex("^P(\\d+) ");

74
BizHawk.Emulation.Common/Base Implementations/MemoryCallbackSystem.cs
View File

@ -33,9 +33,6 @@ namespace BizHawk.Emulation.Common
private readonly ObservableCollection<IMemoryCallback> _writes = new ObservableCollection<IMemoryCallback>();
private readonly ObservableCollection<IMemoryCallback> _execs = new ObservableCollection<IMemoryCallback>();
private bool _hasReads;
private bool _hasWrites;
private bool _hasExecutes;
private bool _hasAny;
public bool ExecuteCallbacksAvailable { get; }
@ -81,56 +78,41 @@ namespace BizHawk.Emulation.Common
public void CallMemoryCallbacks(uint addr, uint value, uint flags, string scope)
{
if (!_hasAny) return;
if (_hasReads)
if (!_hasAny)
{
if((flags & (uint)MemoryCallbackFlags.AccessRead)!=0)
return;
}
if (HasReads)
{
if ((flags & (uint) MemoryCallbackFlags.AccessRead) != 0)
{
Call(_reads, addr, value, flags, scope);
}
}
if (_hasWrites)
if (HasWrites)
{
if((flags & (uint)MemoryCallbackFlags.AccessWrite)!=0)
if ((flags & (uint) MemoryCallbackFlags.AccessWrite) != 0)
{
Call(_writes, addr, value, flags, scope);
}
}
if (_hasExecutes)
if (HasExecutes)
{
if((flags & (uint)MemoryCallbackFlags.AccessExecute)!=0)
if ((flags & (uint) MemoryCallbackFlags.AccessExecute) != 0)
{
Call(_execs, addr, value, flags, scope);
}
}
}
public void CallReads(uint addr, uint value, uint flags, string scope)
{
if (_hasReads)
{
Call(_reads, addr, value, flags, scope);
}
}
public bool HasReads { get; private set; }
public void CallWrites(uint addr, uint value, uint flags, string scope)
{
if (_hasWrites)
{
Call(_writes, addr, value, flags, scope);
}
}
public bool HasWrites { get; private set; }
public void CallExecutes(uint addr, uint value, uint flags, string scope)
{
if (_hasExecutes)
{
Call(_execs, addr, value, flags, scope);
}
}
public bool HasReads => _hasReads;
public bool HasWrites => _hasWrites;
public bool HasExecutes => _hasExecutes;
public bool HasExecutes { get; private set; }
public bool HasReadsForScope(string scope)
{
@ -149,16 +131,16 @@ namespace BizHawk.Emulation.Common
private bool UpdateHasVariables()
{
bool hadReads = _hasReads;
bool hadWrites = _hasWrites;
bool hadExecutes = _hasExecutes;
bool hadReads = HasReads;
bool hadWrites = HasWrites;
bool hadExecutes = HasExecutes;
_hasReads = _reads.Count > 0;
_hasWrites = _writes.Count > 0;
_hasExecutes = _execs.Count > 0;
_hasAny = _hasReads || _hasWrites || _hasExecutes;
HasReads = _reads.Count > 0;
HasWrites = _writes.Count > 0;
HasExecutes = _execs.Count > 0;
_hasAny = HasReads || HasWrites || HasExecutes;
return (_hasReads != hadReads || _hasWrites != hadWrites || _hasExecutes != hadExecutes);
return (HasReads != hadReads || HasWrites != hadWrites || HasExecutes != hadExecutes);
}
private int RemoveInternal(MemoryCallbackDelegate action)