diff --git a/BizHawk.Emulation/BizHawk.Emulation.csproj b/BizHawk.Emulation/BizHawk.Emulation.csproj index 27650cbee4..a3e5a58ef3 100644 --- a/BizHawk.Emulation/BizHawk.Emulation.csproj +++ b/BizHawk.Emulation/BizHawk.Emulation.csproj @@ -50,7 +50,7 @@ pdbonly true bin\Release\ - TRACE + TRACE;VS2010 prompt 4 x86 diff --git a/BizHawk.Emulation/BizHawk.Emulation_v4.5.csproj b/BizHawk.Emulation/BizHawk.Emulation_v4.5.csproj index b738a00be0..f75e5d963e 100644 --- a/BizHawk.Emulation/BizHawk.Emulation_v4.5.csproj +++ b/BizHawk.Emulation/BizHawk.Emulation_v4.5.csproj @@ -51,7 +51,7 @@ pdbonly true bin\Release\ - TRACE + TRACE;VS2012 prompt 4 x86 diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/Core.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/Core.cs index dc00ed397c..5a4cb02aba 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/Core.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/Core.cs @@ -301,7 +301,9 @@ namespace BizHawk.Emulation.Consoles.Nintendo static ByteBuffer cpu_sequence_PAL = new ByteBuffer(new byte[]{4,3,3,3,3,4,3,3,3,3,4,3,3,3,3,4,3,3,3,3,4,3,3,3,3,4,3,3,3,3,4,3,3,3,3,4,3,3,3,3}); public int cpu_step, cpu_stepcounter, cpu_deadcounter; +#if VS2012 [MethodImpl(MethodImplOptions.AggressiveInlining)] +#endif protected void RunCpuOne() { cpu_stepcounter++; @@ -336,7 +338,9 @@ namespace BizHawk.Emulation.Consoles.Nintendo } } +#if VS2012 [MethodImpl(MethodImplOptions.AggressiveInlining)] +#endif public byte ReadReg(int addr) { switch (addr) diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.cs index dfc7c30380..454be4bf78 100644 --- a/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.cs +++ b/BizHawk.Emulation/Consoles/Nintendo/NES/PPU.cs @@ -144,7 +144,9 @@ namespace BizHawk.Emulation.Consoles.Nintendo idleSynch = true; } +#if VS2012 [MethodImpl(MethodImplOptions.AggressiveInlining)] +#endif void TriggerNMI() { nes.cpu.NMI = true; @@ -165,7 +167,9 @@ namespace BizHawk.Emulation.Consoles.Nintendo } } +#if VS2012 [MethodImpl(MethodImplOptions.AggressiveInlining)] +#endif void runppu(int x) { //run one ppu cycle at a time so we can interact with the ppu and clockPPU at high granularity