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

nes-re-sort board list continually with the most recently used one at the top of the list

This commit is contained in:
zeromus 2012-10-17 00:38:28 +00:00
parent 28687957cc
commit 4e079389da
2 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
BizHawk.Emulation/Consoles/Nintendo/NES/BoardSystem.cs
View File

@ -284,6 +284,22 @@ namespace BizHawk.Emulation.Consoles.Nintendo
[AttributeUsage(AttributeTargets.Class)]
public class INESBoardImplPriorityAttribute : Attribute { }
static INESBoard CreateBoardInstance(Type boardType)
{
var board = (INESBoard)Activator.CreateInstance(boardType);
lock (INESBoardImplementors)
{
//put the one we chose at the top of the list, for quicker access in the future
int x = INESBoardImplementors.IndexOf(boardType);
//(swap)
var temp = INESBoardImplementors[0];
INESBoardImplementors[0] = boardType;
INESBoardImplementors[x] = temp;
}
return board;
}
static NES()
{
var highPriority = new List<Type>();
@ -353,23 +369,24 @@ namespace BizHawk.Emulation.Consoles.Nintendo
{
NES nes = new NES();
nes.cart = cart;
foreach (var type in INESBoardImplementors)
{
using (NESBoardBase board = (NESBoardBase)Activator.CreateInstance(type))
lock(INESBoardImplementors)
foreach (var type in INESBoardImplementors)
{
//unif demands that the boards set themselves up with expected legal values based on the board size
//except, i guess, for the rom/chr sizes. go figure.
//so, disable the asserts here
if (origin == EDetectionOrigin.UNIF)
board.DisableConfigAsserts = true;
board.Create(nes);
if (board.Configure(origin))
using (NESBoardBase board = (NESBoardBase)Activator.CreateInstance(type))
{
return type;
//unif demands that the boards set themselves up with expected legal values based on the board size
//except, i guess, for the rom/chr sizes. go figure.
//so, disable the asserts here
if (origin == EDetectionOrigin.UNIF)
board.DisableConfigAsserts = true;
board.Create(nes);
if (board.Configure(origin))
{
return type;
}
}
}
}
return null;
}

2
BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs
View File

@ -598,7 +598,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
LoadWriteLine("END NES rom analysis");
LoadWriteLine("------");
board = (INESBoard)Activator.CreateInstance(boardType);
board = CreateBoardInstance(boardType);
cart = choice;
board.Create(this);