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

Move TraceHeader out of CoreComm and into ITracer and TraceBuffer

This commit is contained in:
adelikat 2014-12-05 00:10:48 +00:00
parent 309088211c
commit a91de9ad9c
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.EmuHawk/tools/TraceLogger.cs
View File

@ -126,7 +126,7 @@ namespace BizHawk.Client.EmuHawk
if (Global.Emulator.CpuTraceAvailable()) if (Global.Emulator.CpuTraceAvailable())
{ {
ClearList(); ClearList();
TraceView.Columns[0].Text = Global.Emulator.CoreComm.TraceHeader; TraceView.Columns[0].Text = Tracer.Header;
} }
else else
{ {

2
BizHawk.Emulation.Common/CoreComms.cs
View File

@ -27,8 +27,6 @@ namespace BizHawk.Emulation.Common
public int ScreenLogicalOffsetX, ScreenLogicalOffsetY; public int ScreenLogicalOffsetX, ScreenLogicalOffsetY;
public string TraceHeader = "Instructions";
// size hint to a/v out resizer. this probably belongs in VideoProvider? but it's somewhat different than VirtualWidth... // size hint to a/v out resizer. this probably belongs in VideoProvider? but it's somewhat different than VirtualWidth...
public int NominalWidth = 640; public int NominalWidth = 640;
public int NominalHeight = 480; public int NominalHeight = 480;

7
BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/Meteor.cs
View File

@ -48,12 +48,15 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
public GBA(CoreComm comm, byte[] file) public GBA(CoreComm comm, byte[] file)
{ {
ServiceProvider = new BasicServiceProvider(this); ServiceProvider = new BasicServiceProvider(this);
Tracer = new TraceBuffer(); Tracer = new TraceBuffer
{
Header = " -Addr--- -Opcode- -Instruction------------------- -R0----- -R1----- -R2----- -R3----- -R4----- -R5----- -R6----- -R7----- -R8----- -R9----- -R10---- -R11---- -R12---- -R13(SP) -R14(LR) -R15(PC) -CPSR--- -SPSR---"
};
CoreComm = comm; CoreComm = comm;
comm.VsyncNum = 262144; comm.VsyncNum = 262144;
comm.VsyncDen = 4389; comm.VsyncDen = 4389;
comm.TraceHeader = " -Addr--- -Opcode- -Instruction------------------- -R0----- -R1----- -R2----- -R3----- -R4----- -R5----- -R6----- -R7----- -R8----- -R9----- -R10---- -R11---- -R12---- -R13(SP) -R14(LR) -R15(PC) -CPSR--- -SPSR---";
comm.NominalWidth = 240; comm.NominalWidth = 240;
comm.NominalHeight = 160; comm.NominalHeight = 160;