From fdcbe6924b240b418c7da14c201b3ad6c0fe64d5 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Wed, 29 Apr 2020 17:43:46 -0500
Subject: [PATCH] use inline out insome places
---
BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.Execute.cs | 4 +---
BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280.cs | 4 +---
BizHawk.Emulation.Cores/CPUs/Intel8048/I8048.cs | 4 +---
BizHawk.Emulation.Cores/CPUs/LR35902/LR35902.cs | 4 +---
BizHawk.Emulation.Cores/CPUs/MC6800/MC6800.cs | 4 +---
BizHawk.Emulation.Cores/CPUs/MC6809/MC6809.cs | 4 +---
6 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.Execute.cs b/BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.Execute.cs
index bd110c66a2..51621374cd 100644
--- a/BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.Execute.cs
+++ b/BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.Execute.cs
@@ -20,11 +20,9 @@ namespace BizHawk.Emulation.Cores.Components.CP1610
public TraceInfo CP1610State(bool disassemble = true)
{
- int notused;
-
return new TraceInfo
{
- Disassembly = $"{RegisterPC - 1:X4}: {opcode:X2} {(disassemble ? Disassemble((ushort)(RegisterPC - 1), out notused) : "---")} ".PadRight(26),
+ Disassembly = $"{RegisterPC - 1:X4}: {opcode:X2} {(disassemble ? Disassemble((ushort)(RegisterPC - 1), out _) : "---")} ".PadRight(26),
RegisterInfo = string.Join(" ",
new[]
{
diff --git a/BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280.cs b/BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280.cs
index 155b1ce839..4f211585b4 100644
--- a/BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280.cs
+++ b/BizHawk.Emulation.Cores/CPUs/HuC6280/HuC6280.cs
@@ -372,11 +372,9 @@ namespace BizHawk.Emulation.Cores.Components.H6280
public TraceInfo State()
{
- int notused;
-
return new TraceInfo
{
- Disassembly = $"{MPR[PC >> 13]:X2}:{PC:X4}: {ReadMemory(PC):X2} {Disassemble(PC, out notused)} ".PadRight(30),
+ Disassembly = $"{MPR[PC >> 13]:X2}:{PC:X4}: {ReadMemory(PC):X2} {Disassemble(PC, out _)} ".PadRight(30),
RegisterInfo = string.Join(" ",
$"A:{A:X2}",
$"X:{X:X2}",
diff --git a/BizHawk.Emulation.Cores/CPUs/Intel8048/I8048.cs b/BizHawk.Emulation.Cores/CPUs/Intel8048/I8048.cs
index 041b35ca00..60d520b362 100644
--- a/BizHawk.Emulation.Cores/CPUs/Intel8048/I8048.cs
+++ b/BizHawk.Emulation.Cores/CPUs/Intel8048/I8048.cs
@@ -522,11 +522,9 @@ namespace BizHawk.Emulation.Cores.Components.I8048
public TraceInfo State(bool disassemble = true)
{
- ushort notused;
-
return new TraceInfo
{
- Disassembly = $"{(disassemble ? Disassemble(Regs[PC], ReadMemory, out notused) : "---")} ".PadRight(50),
+ Disassembly = $"{(disassemble ? Disassemble(Regs[PC], ReadMemory, out _) : "---")} ".PadRight(50),
RegisterInfo = string.Format(
"A:{0:X2} R0:{1:X2} R1:{2:X2} R2:{3:X2} R3:{4:X2} R4:{5:X2} R5:{6:X2} R6:{7:X2} R7:{8:X2} PSW:{9:X4} Cy:{10} LY:{11} {12}{13}{14}{15}{16}{17}{18}{19}{20}{21}{22}",
Regs[A],
diff --git a/BizHawk.Emulation.Cores/CPUs/LR35902/LR35902.cs b/BizHawk.Emulation.Cores/CPUs/LR35902/LR35902.cs
index 80d6091a26..08b1e6c82e 100644
--- a/BizHawk.Emulation.Cores/CPUs/LR35902/LR35902.cs
+++ b/BizHawk.Emulation.Cores/CPUs/LR35902/LR35902.cs
@@ -637,11 +637,9 @@ namespace BizHawk.Emulation.Cores.Components.LR35902
public TraceInfo State(bool disassemble = true)
{
- ushort notused;
-
return new TraceInfo
{
- Disassembly = $"{(disassemble ? Disassemble(RegPC, ReadMemory, out notused) : "---")} ".PadRight(40),
+ Disassembly = $"{(disassemble ? Disassemble(RegPC, ReadMemory, out _) : "---")} ".PadRight(40),
RegisterInfo = string.Join(" ",
$"A:{Regs[A]:X2}",
$"F:{Regs[F]:X2}",
diff --git a/BizHawk.Emulation.Cores/CPUs/MC6800/MC6800.cs b/BizHawk.Emulation.Cores/CPUs/MC6800/MC6800.cs
index 03ca30dce3..25140a1f59 100644
--- a/BizHawk.Emulation.Cores/CPUs/MC6800/MC6800.cs
+++ b/BizHawk.Emulation.Cores/CPUs/MC6800/MC6800.cs
@@ -502,11 +502,9 @@ namespace BizHawk.Emulation.Cores.Components.MC6800
public TraceInfo State(bool disassemble = true)
{
- ushort notused;
-
return new TraceInfo
{
- Disassembly = $"{(disassemble ? Disassemble(Regs[PC], ReadMemory, out notused) : "---")} ".PadRight(50),
+ Disassembly = $"{(disassemble ? Disassemble(Regs[PC], ReadMemory, out _) : "---")} ".PadRight(50),
RegisterInfo = string.Format(
"A:{0:X2} B:{1:X2} X:{2:X4} SP:{3:X4} CC:{4:X2} Cy:{5} {6}{7}{8}{9}{10}{11}",
Regs[A],
diff --git a/BizHawk.Emulation.Cores/CPUs/MC6809/MC6809.cs b/BizHawk.Emulation.Cores/CPUs/MC6809/MC6809.cs
index 29cc653441..e7c9b46484 100644
--- a/BizHawk.Emulation.Cores/CPUs/MC6809/MC6809.cs
+++ b/BizHawk.Emulation.Cores/CPUs/MC6809/MC6809.cs
@@ -640,11 +640,9 @@ namespace BizHawk.Emulation.Cores.Components.MC6809
public TraceInfo State(bool disassemble = true)
{
- ushort notused;
-
return new TraceInfo
{
- Disassembly = $"{(disassemble ? Disassemble(Regs[PC], ReadMemory, out notused) : "---")} ".PadRight(50),
+ Disassembly = $"{(disassemble ? Disassemble(Regs[PC], ReadMemory, out _) : "---")} ".PadRight(50),
RegisterInfo = string.Format(
"A:{0:X2} B:{1:X2} X:{2:X4} Y:{3:X4} US:{4:X4} SP:{5:X4} DP:{6:X2} CC:{7:X2} Cy:{8} {9}{10}{11}{12}{13}{14}{15}{16}",
Regs[A],