From 5dac0660e163c501f2ec6f0e2b078e988ac5c27e Mon Sep 17 00:00:00 2001 From: goyuken Date: Sun, 9 Feb 2014 05:49:05 +0000 Subject: [PATCH] PCE: disassembler enhancements --- BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280.cs | 2 +- BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280.cs b/BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280.cs index 130b6cbf01..67f84e2994 100644 --- a/BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280.cs +++ b/BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280.cs @@ -387,7 +387,7 @@ namespace BizHawk.Emulation.Cores.Components.H6280 public string State() { int notused; - string a = string.Format("{0:X4} {1:X2} {2} ", PC, ReadMemory(PC), Disassemble(PC, out notused)).PadRight(41); + string a = string.Format("{3:X2}:{0:X4} {1:X2} {2} ", PC, ReadMemory(PC), Disassemble(PC, out notused), MPR[PC>>13]).PadRight(41); string b = string.Format("A:{0:X2} X:{1:X2} Y:{2:X2} P:{3:X2} SP:{4:X2} Cy:{5}", A, X, Y, P, S, TotalExecutedCycles); string val = a + b + " "; if (FlagN) val = val + "N"; diff --git a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs index a53da572ac..a5de0b9811 100644 --- a/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs +++ b/BizHawk.Emulation.Cores/Consoles/PC Engine/PCEngine.cs @@ -159,6 +159,8 @@ namespace BizHawk.Emulation.Cores.PCEngine Cpu.WriteMemory21 = WriteMemorySF2; RomData = rom; RomLength = RomData.Length; + // user request: current value of the SF2MapperLatch on the tracelogger + Cpu.Logger = (s) => CoreComm.Tracer.Put(string.Format("{0:X1}:{1}", SF2MapperLatch, s)); } else {