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

NES - some small speed optimizations

This commit is contained in:
adelikat 2012-08-04 01:47:54 +00:00
parent 3eff778b98
commit fba6e64c58
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
BizHawk.Emulation/Consoles/Nintendo/NES/Core.cs
View File

@ -130,16 +130,11 @@ namespace BizHawk.Emulation.Consoles.Nintendo
cpu.ExecuteOne(); cpu.ExecuteOne();
} }
if (SoundOn) apu.RunOne(); //THIS ISNT SAFE!!!!!!!!! SOUND MUST ALWAYS RUN!!!! apu.RunOne();
ppu.PostCpuInstructionOne(); ppu.PostCpuInstructionOne();
} }
} }
public byte ReadPPUReg(int addr)
{
return ppu.ReadReg(addr);
}
public byte ReadReg(int addr) public byte ReadReg(int addr)
{ {
switch (addr) switch (addr)
@ -163,11 +158,6 @@ namespace BizHawk.Emulation.Consoles.Nintendo
return 0xFF; return 0xFF;
} }
void WritePPUReg(int addr, byte val)
{
ppu.WriteReg(addr, val);
}
void WriteReg(int addr, byte val) void WriteReg(int addr, byte val)
{ {
switch (addr) switch (addr)
@ -254,7 +244,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
else if (addr < 0x1000) ret = ram[addr - 0x0800]; else if (addr < 0x1000) ret = ram[addr - 0x0800];
else if (addr < 0x1800) ret = ram[addr - 0x1000]; else if (addr < 0x1800) ret = ram[addr - 0x1000];
else if (addr < 0x2000) ret = ram[addr - 0x1800]; else if (addr < 0x2000) ret = ram[addr - 0x1800];
else if (addr < 0x4000) ret = ReadPPUReg(addr & 7); else if (addr < 0x4000) ret = ppu.ReadReg(addr & 7);
else if (addr < 0x4020) ret = ReadReg(addr); //we're not rebasing the register just to keep register names canonical else if (addr < 0x4020) ret = ReadReg(addr); //we're not rebasing the register just to keep register names canonical
else if (addr < 0x6000) ret = board.ReadEXP(addr - 0x4000); else if (addr < 0x6000) ret = board.ReadEXP(addr - 0x4000);
else ret = board.ReadWRAM(addr - 0x6000); else ret = board.ReadWRAM(addr - 0x6000);
@ -277,7 +267,7 @@ namespace BizHawk.Emulation.Consoles.Nintendo
else if (addr < 0x1000) ram[addr - 0x0800] = value; else if (addr < 0x1000) ram[addr - 0x0800] = value;
else if (addr < 0x1800) ram[addr - 0x1000] = value; else if (addr < 0x1800) ram[addr - 0x1000] = value;
else if (addr < 0x2000) ram[addr - 0x1800] = value; else if (addr < 0x2000) ram[addr - 0x1800] = value;
else if (addr < 0x4000) WritePPUReg(addr & 7, value); else if (addr < 0x4000) ppu.WriteReg(addr & 7, value);
else if (addr < 0x4020) WriteReg(addr, value); //we're not rebasing the register just to keep register names canonical else if (addr < 0x4020) WriteReg(addr, value); //we're not rebasing the register just to keep register names canonical
else if (addr < 0x6000) board.WriteEXP(addr - 0x4000, value); else if (addr < 0x6000) board.WriteEXP(addr - 0x4000, value);
else if (addr < 0x8000) board.WriteWRAM(addr - 0x6000, value); else if (addr < 0x8000) board.WriteWRAM(addr - 0x6000, value);