From 941bdb7daaf1f4e27aa2d61b392ed59a085b9eac Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Wed, 29 Apr 2020 17:25:37 -0500
Subject: [PATCH] remove unused code in MOS6502X
---
.../CPUs/MOS 6502X/Disassembler.cs | 7 ----
.../CPUs/MOS 6502X/MOS6502X.cs | 39 -------------------
2 files changed, 46 deletions(-)
diff --git a/BizHawk.Emulation.Cores/CPUs/MOS 6502X/Disassembler.cs b/BizHawk.Emulation.Cores/CPUs/MOS 6502X/Disassembler.cs
index 929c2a6108..481e663637 100644
--- a/BizHawk.Emulation.Cores/CPUs/MOS 6502X/Disassembler.cs
+++ b/BizHawk.Emulation.Cores/CPUs/MOS 6502X/Disassembler.cs
@@ -6,13 +6,6 @@ namespace BizHawk.Emulation.Cores.Components.M6502
{
public partial class MOS6502X<TLink> : IDisassemblable
{
- private static ushort peeker_word(ushort address, Func<ushort, byte> peeker)
- {
- byte l = peeker(address);
- byte h = peeker(++address);
- return (ushort)((h << 8) | l);
- }
-
public string Disassemble(ushort pc, out int bytesToAdvance)
{
return MOS6502X.Disassemble(pc, out bytesToAdvance, _link.PeekMemory);
diff --git a/BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502X.cs b/BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502X.cs
index f6cefb42de..7f26cc1f35 100644
--- a/BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502X.cs
+++ b/BizHawk.Emulation.Cores/CPUs/MOS 6502X/MOS6502X.cs
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
-using System.IO;
using BizHawk.Common;
using BizHawk.Emulation.Common;
@@ -20,7 +19,6 @@ namespace BizHawk.Emulation.Cores.Components.M6502
public bool BCD_Enabled = true;
public bool debug = false;
- public bool throw_unhandled;
public void Reset()
{
@@ -150,12 +148,6 @@ namespace BizHawk.Emulation.Cores.Components.M6502
public const ushort BRKVector = 0xFFFE;
public const ushort IRQVector = 0xFFFE;
- enum ExceptionType
- {
- BRK, NMI, IRQ
- }
-
-
// ==== CPU State ====
public byte A;
@@ -199,9 +191,6 @@ namespace BizHawk.Emulation.Cores.Components.M6502
ser.EndSection();
}
- public void SaveStateBinary(BinaryWriter writer) { SyncState(Serializer.CreateBinaryWriter(writer)); }
- public void LoadStateBinary(BinaryReader reader) { SyncState(Serializer.CreateBinaryReader(reader)); }
-
// ==== End State ====
/// <summary>Carry Flag</summary>
@@ -262,34 +251,6 @@ namespace BizHawk.Emulation.Cores.Components.M6502
public long TotalExecutedCycles;
- public ushort ReadWord(ushort address)
- {
- byte l = _link.ReadMemory(address);
- byte h = _link.ReadMemory(++address);
- return (ushort)((h << 8) | l);
- }
-
- public ushort PeekWord(ushort address)
- {
- byte l = _link.PeekMemory(address);
- byte h = _link.PeekMemory(++address);
- return (ushort)((h << 8) | l);
- }
-
- private void WriteWord(ushort address, ushort value)
- {
- byte l = (byte)(value & 0xFF);
- byte h = (byte)(value >> 8);
- _link.WriteMemory(address, l);
- _link.WriteMemory(++address, h);
- }
-
- private ushort ReadWordPageWrap(ushort address)
- {
- ushort highAddress = (ushort)((address & 0xFF00) + ((address + 1) & 0xFF));
- return (ushort)(_link.ReadMemory(address) | (_link.ReadMemory(highAddress) << 8));
- }
-
// SO pin
public void SetOverflow()
{