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

Debugger - clean up and reorg some disassembler code

This commit is contained in:
adelikat 2014-12-20 15:56:01 +00:00
parent b1f9480790
commit 7d3a7005cb
3 changed files with 68 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BizHawk.Client.EmuHawk/BizHawk.Client.EmuHawk.csproj
View File

@ -653,6 +653,10 @@
<Compile Include="tools\Debugger\GenericDebugger.Designer.cs">
<DependentUpon>GenericDebugger.cs</DependentUpon>
</Compile>
<Compile Include="tools\Debugger\GenericDebugger.Disassembler.cs">
<DependentUpon>GenericDebugger.cs</DependentUpon>
<SubType>Form</SubType>
</Compile>
<Compile Include="tools\Debugger\GenericDebugger.IControlMainform.cs">
<DependentUpon>GenericDebugger.cs</DependentUpon>
<SubType>Form</SubType>

58
BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.Disassembler.cs Normal file
View File

@ -0,0 +1,58 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace BizHawk.Client.EmuHawk
{
public partial class GenericDebugger
{
private class DisasmOp
{
public DisasmOp(int s, string m)
{
Size = s;
Mnemonic = m;
}
public int Size { get; private set; }
public string Mnemonic { get; private set; }
}
private const int ADDR_MAX = 0xFFFF; // TODO: this isn't a constant, calculate it off bus size
private const int DISASM_LINE_COUNT = 100;
private readonly List<DisasmOp> DisassemblyLines = new List<DisasmOp>();
private void UpdateDisassembler()
{
// Always show a window's worth of instructions (if possible)
if (CanDisassemble)
{
DisassemblerView.BlazingFast = true;
Disassemble(DISASM_LINE_COUNT);
DisassemblerView.ensureVisible(0xFFFF);
DisassemblerView.ensureVisible(PC);
DisassemblerView.Refresh();
DisassemblerView.BlazingFast = false;
}
}
private void Disassemble(int line_count)
{
DisassemblyLines.Clear();
int a = PC;
for (int i = 0; i < line_count; ++i)
{
int advance;
string line = Disassembler.Disassemble(MemoryDomains.SystemBus, (ushort)a, out advance);
DisassemblyLines.Add(new DisasmOp(advance, line));
a += advance;
if (a > ADDR_MAX)
{
break;
}
}
}
}
}

60
BizHawk.Client.EmuHawk/tools/Debugger/GenericDebugger.cs
View File

@ -54,18 +54,18 @@ namespace BizHawk.Client.EmuHawk
text = "";
if (column == 0)
{
if (addr <= index && index < addr + lines.Count)
if (PC <= index && index < PC + DisassemblyLines.Count)
{
int a = addr;
for (int i = 0; i < index - addr; ++i)
a += lines[i].size;
int a = PC;
for (int i = 0; i < index - PC; ++i)
a += DisassemblyLines[i].Size;
text = string.Format("{0:X4}", a);
}
}
else if (column == 1)
{
if (addr <= index && index < addr + lines.Count)
text = lines[index - addr].mnemonic;
if (PC <= index && index < PC + DisassemblyLines.Count)
text = DisassemblyLines[index - PC].Mnemonic;
}
}
@ -203,54 +203,6 @@ namespace BizHawk.Client.EmuHawk
Owner = Global.Config.RamSearchSettings.FloatingWindow ? null : GlobalWin.MainForm;
}
#region Disassembler TODO refacotor
private readonly List<DisasmOp> lines = new List<DisasmOp>();
private struct DisasmOp
{
public readonly int size;
public readonly string mnemonic;
public DisasmOp(int s, string m) { size = s; mnemonic = m; }
}
private int addr;
private const int ADDR_MAX = 0xFFFF; // TODO: this isn't a constant, calculate it off bus size
private const int DISASM_LINE_COUNT = 100;
private void UpdateDisassembler()
{
// Always show a window's worth of instructions (if possible)
if (CanDisassemble)
{
addr = PC;
DisassemblerView.BlazingFast = true;
Disasm(DISASM_LINE_COUNT);
DisassemblerView.ensureVisible(0xFFFF);
DisassemblerView.ensureVisible(PC);
DisassemblerView.Refresh();
DisassemblerView.BlazingFast = false;
}
}
private void Disasm(int line_count)
{
lines.Clear();
int a = addr;
for (int i = 0; i < line_count; ++i)
{
int advance;
string line = Disassembler.Disassemble(MemoryDomains.SystemBus, (ushort)a, out advance);
lines.Add(new DisasmOp(advance, line));
a += advance;
if (a > ADDR_MAX) break;
}
}
#endregion
#region Menu Items
#region File