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

Debugger - clean up some code

This commit is contained in:
adelikat 2015-02-06 00:56:54 +00:00
parent 8427a9db7e
commit 133723e50f
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs
View File

@ -39,7 +39,7 @@ namespace BizHawk.Client.EmuHawk
{ {
DisassemblerView.BlazingFast = true; DisassemblerView.BlazingFast = true;
DisassemblerView.ItemCount = 0; DisassemblerView.ItemCount = 0;
currentDisassemblerAddress = PC; currentDisassemblerAddress = (uint)PCRegister.Value;
Disassemble(); Disassemble();
DisassemblerView.Refresh(); DisassemblerView.Refresh();
DisassemblerView.BlazingFast = false; DisassemblerView.BlazingFast = false;
@ -88,7 +88,7 @@ namespace BizHawk.Client.EmuHawk
{ {
if (DisassemblyLines.Any() && index < DisassemblyLines.Count) if (DisassemblyLines.Any() && index < DisassemblyLines.Count)
{ {
if (DisassemblyLines[index].Address == PC) if (DisassemblyLines[index].Address == (uint)PCRegister.Value)
{ {
color = Color.LightCyan; color = Color.LightCyan;
} }

9
BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.IToolForm.cs
View File

@ -26,13 +26,6 @@ namespace BizHawk.Client.EmuHawk
get { return Debuggable.GetCpuFlagsAndRegisters()[Disassembler.PCRegisterName]; } get { return Debuggable.GetCpuFlagsAndRegisters()[Disassembler.PCRegisterName]; }
} }
// TODO: get rid of me
private uint PC
{
// TODO: is this okay for N64?
get { return (uint)Debuggable.GetCpuFlagsAndRegisters()[Disassembler.PCRegisterName].Value; }
}
#region Implementation checking #region Implementation checking
private bool CanUseMemoryCallbacks private bool CanUseMemoryCallbacks
@ -67,7 +60,7 @@ namespace BizHawk.Client.EmuHawk
try try
{ {
var pc = PC; var pc = (uint)PCRegister.Value;
return true; return true;
} }
catch (NotImplementedException) catch (NotImplementedException)