From 026527380d1d4c97e41d7247ee13c3a7d8ecaff6 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.noreply.github.com>
Date: Thu, 15 Nov 2018 05:00:48 -0500
Subject: [PATCH] gbhawk CDL - fiddle with it a bit, ignore writes to rom
---
.../CPUs/LR35902/LR35902.cs | 23 ++++++++-------
.../CPUs/LR35902/Operations.cs | 6 ++--
.../Nintendo/GBHawk/GBHawk.ICodeDataLog.cs | 29 +++++++++++--------
.../Nintendo/GBHawk/Mappers/MapperBase.cs | 10 +++----
.../Nintendo/GBHawk/Mappers/Mapper_Camera.cs | 2 +-
.../Nintendo/GBHawk/Mappers/Mapper_Default.cs | 2 +-
.../Nintendo/GBHawk/Mappers/Mapper_HuC1.cs | 2 +-
.../Nintendo/GBHawk/Mappers/Mapper_HuC3.cs | 2 +-
.../Nintendo/GBHawk/Mappers/Mapper_MBC1.cs | 2 +-
.../GBHawk/Mappers/Mapper_MBC1_Multi.cs | 2 +-
.../Nintendo/GBHawk/Mappers/Mapper_MBC2.cs | 2 +-
.../Nintendo/GBHawk/Mappers/Mapper_MBC3.cs | 2 +-
.../Nintendo/GBHawk/Mappers/Mapper_MBC5.cs | 2 +-
.../Nintendo/GBHawk/Mappers/Mapper_MBC6.cs | 2 +-
.../Nintendo/GBHawk/Mappers/Mapper_MBC7.cs | 2 +-
.../Nintendo/GBHawk/Mappers/Mapper_MMM01.cs | 2 +-
.../GBHawk/Mappers/Mapper_RockMan8.cs | 2 +-
.../GBHawk/Mappers/Mapper_Sachen_MMC1.cs | 2 +-
.../GBHawk/Mappers/Mapper_Sachen_MMC2.cs | 2 +-
.../Nintendo/GBHawk/Mappers/Mapper_TAMA5.cs | 2 +-
.../GBHawk/Mappers/Mapper_WisdomTree.cs | 2 +-
21 files changed, 54 insertions(+), 48 deletions(-)
diff --git a/BizHawk.Emulation.Cores/CPUs/LR35902/LR35902.cs b/BizHawk.Emulation.Cores/CPUs/LR35902/LR35902.cs
index ab747aa687..12c13662aa 100644
--- a/BizHawk.Emulation.Cores/CPUs/LR35902/LR35902.cs
+++ b/BizHawk.Emulation.Cores/CPUs/LR35902/LR35902.cs
@@ -109,15 +109,16 @@ namespace BizHawk.Emulation.Common.Components.LR35902
}
//a little CDL related stuff
- public delegate void DoCDLCallbackType(ushort addr, LR35902.eCDLog_Flags flags);
+ public delegate void DoCDLCallbackType(ushort addr, LR35902.eCDLogMemFlags flags);
public DoCDLCallbackType CDLCallback;
- public enum eCDLog_Flags
+ public enum eCDLogMemFlags
{
- eCDLog_Flags_ExecFirst = 1,
- eCDLog_Flags_ExecOperand = 2,
- eCDLog_Flags_Data = 4,
+ FetchFirst = 1,
+ FetchOperand = 2,
+ Data = 4,
+ Write = 8
};
// Execute instructions
@@ -160,7 +161,7 @@ namespace BizHawk.Emulation.Common.Components.LR35902
{
if (OnExecFetch != null) OnExecFetch(RegPC);
if (TraceCallback != null && !CB_prefix) TraceCallback(State());
- if (CDLCallback != null) CDLCallback(RegPC, eCDLog_Flags.eCDLog_Flags_ExecFirst);
+ if (CDLCallback != null) CDLCallback(RegPC, eCDLogMemFlags.FetchFirst);
FetchInstruction(ReadMemory(RegPC++));
}
instr_pntr = 0;
@@ -346,7 +347,7 @@ namespace BizHawk.Emulation.Common.Components.LR35902
{
if (OnExecFetch != null) OnExecFetch(RegPC);
if (TraceCallback != null && !CB_prefix) TraceCallback(State());
- if (CDLCallback != null) CDLCallback(RegPC, eCDLog_Flags.eCDLog_Flags_ExecFirst);
+ if (CDLCallback != null) CDLCallback(RegPC, eCDLogMemFlags.FetchFirst);
RegPC++;
FetchInstruction(ReadMemory(RegPC));
@@ -366,7 +367,7 @@ namespace BizHawk.Emulation.Common.Components.LR35902
{
if (OnExecFetch != null) OnExecFetch(RegPC);
if (TraceCallback != null && !CB_prefix) TraceCallback(State());
- if (CDLCallback != null) CDLCallback(RegPC, eCDLog_Flags.eCDLog_Flags_ExecFirst);
+ if (CDLCallback != null) CDLCallback(RegPC, eCDLogMemFlags.FetchFirst);
if (Halt_bug_3)
{
@@ -431,7 +432,7 @@ namespace BizHawk.Emulation.Common.Components.LR35902
stopped = false;
if (OnExecFetch != null) OnExecFetch(RegPC);
if (TraceCallback != null && !CB_prefix) TraceCallback(State());
- if (CDLCallback != null) CDLCallback(RegPC, eCDLog_Flags.eCDLog_Flags_ExecFirst);
+ if (CDLCallback != null) CDLCallback(RegPC, eCDLogMemFlags.FetchFirst);
FetchInstruction(ReadMemory(RegPC++));
instr_pntr = 0;
@@ -461,7 +462,7 @@ namespace BizHawk.Emulation.Common.Components.LR35902
stopped = false;
if (OnExecFetch != null) OnExecFetch(RegPC);
if (TraceCallback != null && !CB_prefix) TraceCallback(State());
- if (CDLCallback != null) CDLCallback(RegPC, eCDLog_Flags.eCDLog_Flags_ExecFirst);
+ if (CDLCallback != null) CDLCallback(RegPC, eCDLogMemFlags.FetchFirst);
FetchInstruction(ReadMemory(RegPC++));
instr_pntr = 0;
@@ -489,7 +490,7 @@ namespace BizHawk.Emulation.Common.Components.LR35902
case OP_G:
if (OnExecFetch != null) OnExecFetch(RegPC);
if (TraceCallback != null) TraceCallback(State());
- if (CDLCallback != null) CDLCallback(RegPC, eCDLog_Flags.eCDLog_Flags_ExecFirst);
+ if (CDLCallback != null) CDLCallback(RegPC, eCDLogMemFlags.FetchFirst);
FetchInstruction(ReadMemory(RegPC)); // note no increment
diff --git a/BizHawk.Emulation.Cores/CPUs/LR35902/Operations.cs b/BizHawk.Emulation.Cores/CPUs/LR35902/Operations.cs
index 1cbded15b3..e317416265 100644
--- a/BizHawk.Emulation.Cores/CPUs/LR35902/Operations.cs
+++ b/BizHawk.Emulation.Cores/CPUs/LR35902/Operations.cs
@@ -10,8 +10,8 @@ namespace BizHawk.Emulation.Common.Components.LR35902
ushort addr = (ushort)(Regs[src_l] | (Regs[src_h]) << 8);
if (CDLCallback != null)
{
- if (src_l == PCl) CDLCallback(addr, eCDLog_Flags.eCDLog_Flags_ExecOperand);
- else CDLCallback(addr, eCDLog_Flags.eCDLog_Flags_Data);
+ if (src_l == PCl) CDLCallback(addr, eCDLogMemFlags.FetchOperand);
+ else CDLCallback(addr, eCDLogMemFlags.Data);
}
Regs[dest] = ReadMemory(addr);
}
@@ -25,7 +25,7 @@ namespace BizHawk.Emulation.Common.Components.LR35902
public void Write_Func(ushort dest_l, ushort dest_h, ushort src)
{
ushort addr = (ushort)(Regs[dest_l] | (Regs[dest_h]) << 8);
- if (CDLCallback != null) CDLCallback(addr, eCDLog_Flags.eCDLog_Flags_Data);
+ if (CDLCallback != null) CDLCallback(addr, eCDLogMemFlags.Write | eCDLogMemFlags.Data);
WriteMemory(addr, (byte)Regs[src]);
}
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.ICodeDataLog.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.ICodeDataLog.cs
index 051aa995ee..005cca7eef 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.ICodeDataLog.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.ICodeDataLog.cs
@@ -16,7 +16,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
_cdl = cdl;
if (cdl == null)
this.cpu.CDLCallback = null;
- else this.cpu.CDLCallback = DoCDL;
+ else this.cpu.CDLCallback = CDLCpuCallback;
}
public void NewCDL(ICodeDataLog cdl)
@@ -40,16 +40,21 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
{
}
- public void DoCDL2(LR35902.eCDLog_Flags flags, string type, int cdladdr)
+ public void SetCDL(LR35902.eCDLogMemFlags flags, string type, int cdladdr)
{
if (type == null) return;
+ byte val = (byte)flags;
_cdl[type][cdladdr] |= (byte)flags;
}
- public void DoCDL(ushort addr, LR35902.eCDLog_Flags flags)
+ void CDLCpuCallback(ushort addr, LR35902.eCDLogMemFlags flags)
{
- MemoryCallbacks.CallReads(addr, "System Bus");
- addr_access = addr;
+ if (addr < 0x8000)
+ {
+ //don't record writes to the ROM, it's just noisy
+ //NOTE: in principle a mapper could mount a useful resource here, but I doubt it)
+ if ((flags & LR35902.eCDLogMemFlags.Write) != 0) return;
+ }
if (ppu.DMA_start)
{
@@ -68,11 +73,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
}
else if ((addr >= 0xE000) && (addr < 0xF000))
{
- DoCDL2(flags, "WRAM", addr - 0xE000);
+ SetCDL(flags, "WRAM", addr - 0xE000);
}
else if ((addr >= 0xF000) && (addr < 0xFE00))
{
- DoCDL2(flags, "WRAM", (RAM_Bank * 0x1000) + (addr - 0xF000));
+ SetCDL(flags, "WRAM", (RAM_Bank * 0x1000) + (addr - 0xF000));
}
else if ((addr >= 0xFE00) && (addr < 0xFEA0) && ppu.DMA_OAM_access)
{
@@ -84,7 +89,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
}
else if ((addr >= 0xFF80))
{
- DoCDL2(flags, "HRAM", addr - 0xFF80);
+ SetCDL(flags, "HRAM", addr - 0xFF80);
}
}
@@ -143,15 +148,15 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
}
else if (addr < 0xE000)
{
- DoCDL2(flags, "WRAM", (RAM_Bank * 0x1000) + (addr - 0xD000));
+ SetCDL(flags, "WRAM", (RAM_Bank * 0x1000) + (addr - 0xD000));
}
else if (addr < 0xF000)
{
- DoCDL2(flags, "WRAM", addr - 0xE000);
+ SetCDL(flags, "WRAM", addr - 0xE000);
}
else if (addr < 0xFE00)
{
- DoCDL2(flags, "WRAM", (RAM_Bank * 0x1000) + (addr - 0xF000));
+ SetCDL(flags, "WRAM", (RAM_Bank * 0x1000) + (addr - 0xF000));
}
else if (addr < 0xFEA0)
{
@@ -167,7 +172,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
}
else if (addr < 0xFFFF)
{
- DoCDL2(flags, "HRAM", addr - 0xFF80);
+ SetCDL(flags, "HRAM", addr - 0xFF80);
}
else
{
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/MapperBase.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/MapperBase.cs
index d813ec52fa..73e70d1bb6 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/MapperBase.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/MapperBase.cs
@@ -47,18 +47,18 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
{
}
- public virtual void MapCDL(ushort addr, LR35902.eCDLog_Flags flags)
+ public virtual void MapCDL(ushort addr, LR35902.eCDLogMemFlags flags)
{
}
- protected void SetCDLROM(LR35902.eCDLog_Flags flags, int cdladdr)
+ protected void SetCDLROM(LR35902.eCDLogMemFlags flags, int cdladdr)
{
- Core.DoCDL2(flags, "ROM", cdladdr);
+ Core.SetCDL(flags, "ROM", cdladdr);
}
- protected void SetCDLRAM(LR35902.eCDLog_Flags flags, int cdladdr)
+ protected void SetCDLRAM(LR35902.eCDLogMemFlags flags, int cdladdr)
{
- Core.DoCDL2(flags, "CartRAM", cdladdr);
+ Core.SetCDL(flags, "CartRAM", cdladdr);
}
}
}
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Camera.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Camera.cs
index d5e0be860c..918851e48f 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Camera.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Camera.cs
@@ -33,7 +33,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
}
}
- public override void MapCDL(ushort addr, LR35902.eCDLog_Flags flags)
+ public override void MapCDL(ushort addr, LR35902.eCDLogMemFlags flags)
{
if (addr < 0x8000)
{
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Default.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Default.cs
index 77a73c0602..3914d1ef91 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Default.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Default.cs
@@ -33,7 +33,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
}
}
- public override void MapCDL(ushort addr, LR35902.eCDLog_Flags flags)
+ public override void MapCDL(ushort addr, LR35902.eCDLogMemFlags flags)
{
if (addr < 0x8000)
{
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_HuC1.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_HuC1.cs
index 61f015b5a1..453c83237b 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_HuC1.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_HuC1.cs
@@ -77,7 +77,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
}
}
- public override void MapCDL(ushort addr, LR35902.eCDLog_Flags flags)
+ public override void MapCDL(ushort addr, LR35902.eCDLogMemFlags flags)
{
if (addr < 0x4000)
{
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_HuC3.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_HuC3.cs
index 0c16a29779..dab71a0b4b 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_HuC3.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_HuC3.cs
@@ -33,7 +33,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
}
}
- public override void MapCDL(ushort addr, LR35902.eCDLog_Flags flags)
+ public override void MapCDL(ushort addr, LR35902.eCDLogMemFlags flags)
{
if (addr < 0x8000)
{
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC1.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC1.cs
index e2b280ddff..c294059501 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC1.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC1.cs
@@ -74,7 +74,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
}
}
- public override void MapCDL(ushort addr, LR35902.eCDLog_Flags flags)
+ public override void MapCDL(ushort addr, LR35902.eCDLogMemFlags flags)
{
if (addr < 0x4000)
{
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC1_Multi.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC1_Multi.cs
index 8a01891cb3..06f64f781a 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC1_Multi.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC1_Multi.cs
@@ -70,7 +70,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
}
}
- public override void MapCDL(ushort addr, LR35902.eCDLog_Flags flags)
+ public override void MapCDL(ushort addr, LR35902.eCDLogMemFlags flags)
{
if (addr < 0x4000)
{
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC2.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC2.cs
index 51537b6cbc..e18a829d62 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC2.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC2.cs
@@ -46,7 +46,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
}
}
- public override void MapCDL(ushort addr, LR35902.eCDLog_Flags flags)
+ public override void MapCDL(ushort addr, LR35902.eCDLogMemFlags flags)
{
if (addr < 0x4000)
{
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC3.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC3.cs
index 8d77992172..840bc5ba37 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC3.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC3.cs
@@ -89,7 +89,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
}
}
- public override void MapCDL(ushort addr, LR35902.eCDLog_Flags flags)
+ public override void MapCDL(ushort addr, LR35902.eCDLogMemFlags flags)
{
if (addr < 0x4000)
{
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC5.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC5.cs
index 72fb7d2808..46c8878502 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC5.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC5.cs
@@ -65,7 +65,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
}
}
- public override void MapCDL(ushort addr, LR35902.eCDLog_Flags flags)
+ public override void MapCDL(ushort addr, LR35902.eCDLogMemFlags flags)
{
if (addr < 0x4000)
{
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC6.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC6.cs
index 84ce6bbba2..436e811c51 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC6.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC6.cs
@@ -33,7 +33,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
}
}
- public override void MapCDL(ushort addr, LR35902.eCDLog_Flags flags)
+ public override void MapCDL(ushort addr, LR35902.eCDLogMemFlags flags)
{
if (addr < 0x8000)
{
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC7.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC7.cs
index 52d4c62ccc..1e733479de 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC7.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MBC7.cs
@@ -83,7 +83,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
}
}
- public override void MapCDL(ushort addr, LR35902.eCDLog_Flags flags)
+ public override void MapCDL(ushort addr, LR35902.eCDLogMemFlags flags)
{
if (addr < 0x4000)
{
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MMM01.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MMM01.cs
index 5e6364a082..18f485bc63 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MMM01.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_MMM01.cs
@@ -33,7 +33,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
}
}
- public override void MapCDL(ushort addr, LR35902.eCDLog_Flags flags)
+ public override void MapCDL(ushort addr, LR35902.eCDLogMemFlags flags)
{
if (addr < 0x8000)
{
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_RockMan8.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_RockMan8.cs
index 845074051d..e50d297e3d 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_RockMan8.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_RockMan8.cs
@@ -39,7 +39,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
}
}
- public override void MapCDL(ushort addr, LR35902.eCDLog_Flags flags)
+ public override void MapCDL(ushort addr, LR35902.eCDLogMemFlags flags)
{
if (addr < 0x4000)
{
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Sachen_MMC1.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Sachen_MMC1.cs
index c568a099e6..57af41fd0a 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Sachen_MMC1.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Sachen_MMC1.cs
@@ -71,7 +71,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
}
}
- public override void MapCDL(ushort addr, LR35902.eCDLog_Flags flags)
+ public override void MapCDL(ushort addr, LR35902.eCDLogMemFlags flags)
{
if (addr < 0x4000)
{
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Sachen_MMC2.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Sachen_MMC2.cs
index 3b0512f61e..d63f4b47a5 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Sachen_MMC2.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_Sachen_MMC2.cs
@@ -74,7 +74,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
}
}
- public override void MapCDL(ushort addr, LR35902.eCDLog_Flags flags)
+ public override void MapCDL(ushort addr, LR35902.eCDLogMemFlags flags)
{
if (addr < 0x4000)
{
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_TAMA5.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_TAMA5.cs
index 2bbf751e71..64239c64da 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_TAMA5.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_TAMA5.cs
@@ -33,7 +33,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
}
}
- public override void MapCDL(ushort addr, LR35902.eCDLog_Flags flags)
+ public override void MapCDL(ushort addr, LR35902.eCDLogMemFlags flags)
{
if (addr < 0x8000)
{
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_WisdomTree.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_WisdomTree.cs
index 18566457a5..9d1889f007 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_WisdomTree.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/Mappers/Mapper_WisdomTree.cs
@@ -34,7 +34,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
}
}
- public override void MapCDL(ushort addr, LR35902.eCDLog_Flags flags)
+ public override void MapCDL(ushort addr, LR35902.eCDLogMemFlags flags)
{
if (addr < 0x8000)
{