Make Gambatte use new disassembler

This commit is contained in:
alyosha-tas 2017-11-19 10:36:38 -05:00
parent 69170fb110
commit b0095927b6
2 changed files with 4 additions and 5 deletions

View File

@ -1,7 +1,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
using BizHawk.Emulation.Common.Components.Z80GB; using BizHawk.Emulation.Common.Components.LR35902;
namespace BizHawk.Emulation.Cores.Nintendo.Gameboy namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
{ {
@ -17,7 +17,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
public override string Disassemble(MemoryDomain m, uint addr, out int length) public override string Disassemble(MemoryDomain m, uint addr, out int length)
{ {
ushort tmp; ushort tmp;
string ret = NewDisassembler.Disassemble((ushort)addr, a => m.PeekByte(a), out tmp); string ret = LR35902.Disassemble((ushort)addr, a => m.PeekByte(a), out tmp);
length = tmp; length = tmp;
return ret; return ret;
} }

View File

@ -1,7 +1,7 @@
using System; using System;
using BizHawk.Emulation.Common; using BizHawk.Emulation.Common;
using BizHawk.Emulation.Common.Components.Z80GB; using BizHawk.Emulation.Common.Components.LR35902;
namespace BizHawk.Emulation.Cores.Nintendo.Gameboy namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
{ {
@ -19,8 +19,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.Gameboy
Tracer.Put(new TraceInfo Tracer.Put(new TraceInfo
{ {
Disassembly = Disassembly =
NewDisassembler LR35902.Disassemble((ushort)s[1], addr => LibGambatte.gambatte_cpuread(GambatteState, addr), out unused)
.Disassemble((ushort)s[1], addr => LibGambatte.gambatte_cpuread(GambatteState, addr), out unused)
.PadRight(36), .PadRight(36),
RegisterInfo = RegisterInfo =
string.Format( string.Format(