From 888d7fed6a8cd4047470ecb4e2a5ad1a8eb7a84b Mon Sep 17 00:00:00 2001
From: feos <feos-theos@yandex.ru>
Date: Sun, 14 Aug 2016 22:59:07 +0300
Subject: [PATCH] tracer: set some padding
---
.../CPUs/MOS 6502X/MOS6502X.cs | 22 +++++++++----------
.../Consoles/Nintendo/GBA/VBANext.cs | 2 +-
.../Nintendo/QuickNES/QuickNES.ITraceable.cs | 4 ++--
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502X.cs b/BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502X.cs
index dcc99a146f..6816398f6f 100644
--- a/BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502X.cs
+++ b/BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502X.cs
@@ -53,10 +53,10 @@ namespace BizHawk.Emulation.Cores.Components.M6502
return new TraceInfo
{
Disassembly = string.Format(
- "{0:X4} {1:X2} {2} ",
+ "{0:X4}: {1:X2} {2} ",
PC,
PeekMemory(PC),
- disassemble ? Disassemble(PC, out notused) : "---"),
+ disassemble ? Disassemble(PC, out notused) : "---").PadRight(26),
RegisterInfo = string.Format(
"A:{0:X2} X:{1:X2} Y:{2:X2} P:{3:X2} SP:{4:X2} Cy:{5} {6}{7}{8}{9}{10}{11}{12}{13}",
A,
@@ -65,15 +65,15 @@ namespace BizHawk.Emulation.Cores.Components.M6502
P,
S,
TotalExecutedCycles,
- FlagN ? "N" : "",
- FlagV ? "V" : "",
- FlagT ? "T" : "",
- FlagB ? "B" : "",
- FlagD ? "D" : "",
- FlagI ? "I" : "",
- FlagZ ? "Z" : "",
- FlagC ? "C" : "",
- !RDY ? "R" : "")
+ FlagN ? "N" : "n",
+ FlagV ? "V" : "v",
+ FlagT ? "T" : "t",
+ FlagB ? "B" : "b",
+ FlagD ? "D" : "d",
+ FlagI ? "I" : "i",
+ FlagZ ? "Z" : "z",
+ FlagC ? "C" : "c",
+ !RDY ? "R" : "r")
};
}
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.cs
index d497fd0a62..0e291735d7 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBA/VBANext.cs
@@ -164,7 +164,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBA
{
return new TraceInfo
{
- Disassembly = string.Format("{0:X8} {1}", opcode, Darm.DisassembleStuff(addr, opcode)),
+ Disassembly = string.Format("{0:X8} {1}", opcode, Darm.DisassembleStuff(addr, opcode)).PadRight(26),
RegisterInfo = regs.TraceString()
};
}
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.ITraceable.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.ITraceable.cs
index 080ffc6067..829cc6c841 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.ITraceable.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/QuickNES/QuickNES.ITraceable.cs
@@ -31,9 +31,9 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.QuickNES
Tracer.Put(new TraceInfo
{
- Disassembly = string.Format("{0:X4} {1}", pc, opcodeStr).PadRight(26),
+ Disassembly = string.Format("{0:X4}: {1}", pc, opcodeStr).PadRight(26),
RegisterInfo = string.Format(
- "SP:{0:X2} A:{1:X2} P:{2:X2} X:{3:X2} Y:{4:X2}",
+ "A:{1:X2} X:{3:X2} Y:{4:X2} P:{2:X2} SP:{0:X2}",
sp,
a,
p,