From 631fedcd9cf84a457d34e24895137edb849d02ef Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Tue, 21 Apr 2020 16:47:31 -0500
Subject: [PATCH] CP1610 - remove useless null checks on MemoryCallbacks, it is
always not null
---
BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.Execute.cs | 4 ++--
BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.cs | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.Execute.cs b/BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.Execute.cs
index aea67e8e05..bd110c66a2 100644
--- a/BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.Execute.cs
+++ b/BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.Execute.cs
@@ -183,9 +183,9 @@ namespace BizHawk.Emulation.Cores.Components.CP1610
TraceCallback?.Invoke(CP1610State());
- if (MemoryCallbacks != null && MemoryCallbacks.HasExecutes)
+ if (MemoryCallbacks.HasExecutes)
{
- uint flags = (uint)(MemoryCallbackFlags.AccessExecute);
+ uint flags = (uint)MemoryCallbackFlags.AccessExecute;
MemoryCallbacks.CallMemoryCallbacks(RegisterPC, 0, flags, "System Bus");
}
diff --git a/BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.cs b/BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.cs
index 415069591d..f8ae16592b 100644
--- a/BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.cs
+++ b/BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.cs
@@ -34,7 +34,7 @@ namespace BizHawk.Emulation.Cores.Components.CP1610
public ushort ReadMemoryWrapper(ushort addr, bool peek)
{
- if (MemoryCallbacks != null && MemoryCallbacks.HasReads && !peek)
+ if (MemoryCallbacks.HasReads && !peek)
{
uint flags = (uint)(MemoryCallbackFlags.AccessRead);
MemoryCallbacks.CallMemoryCallbacks(addr, 0, flags, "System Bus");
@@ -45,7 +45,7 @@ namespace BizHawk.Emulation.Cores.Components.CP1610
public void WriteMemoryWrapper(ushort addr, ushort value, bool poke)
{
- if (MemoryCallbacks != null && MemoryCallbacks.HasWrites && !poke)
+ if (MemoryCallbacks.HasWrites && !poke)
{
uint flags = (uint)(MemoryCallbackFlags.AccessWrite);
MemoryCallbacks.CallMemoryCallbacks(addr, value, flags, "System Bus");