From a4e7e1c4994cc46c4d6c3c38e5eebe61cefb3396 Mon Sep 17 00:00:00 2001 From: Adrian Conlon <98398945+AdrianConlon@users.noreply.github.com> Date: Fri, 26 Jul 2024 09:31:28 +0100 Subject: [PATCH] Some small tidy ups --- M6502/M6502.cs | 7 ------- M6502/M6502Core.cs | 14 +++++++------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/M6502/M6502.cs b/M6502/M6502.cs index 2e0064c..bdfb838 100644 --- a/M6502/M6502.cs +++ b/M6502/M6502.cs @@ -52,14 +52,12 @@ namespace EightBit case 0x42: this.Jam(); break; // *JAM case 0x43: this.IndexedIndirectXRead(); this.SRE(); break; // *SRE (indexed indirect X) - //case 0x44: this.ZeroPageRead(); break; // *NOP (zero page) case 0x47: this.ZeroPageRead(); this.SRE(); break; // *SRE (zero page) case 0x4b: this.ImmediateRead(); this.ASR(); break; // *ASR (immediate) case 0x4f: this.AbsoluteRead(); this.SRE(); break; // *SRE (absolute) case 0x52: this.Jam(); break; // *JAM case 0x53: this.IndirectIndexedYAddress(); this.FixupRead(); this.SRE(); break; // *SRE (indirect indexed Y) - //case 0x54: this.ZeroPageXRead(); break; // *NOP (zero page, X) case 0x57: this.ZeroPageXRead(); this.SRE(); break; // *SRE (zero page, X) case 0x5a: this.SwallowRead(); break; // *NOP (implied) case 0x5b: this.AbsoluteYAddress(); this.FixupRead(); this.SRE(); break; // *SRE (absolute, Y) @@ -83,7 +81,6 @@ namespace EightBit case 0x7f: this.AbsoluteXAddress(); this.FixupRead(); this.RRA(); break; // *RRA (absolute, X) case 0x80: this.ImmediateRead(); break; // *NOP (immediate) - //case 0x82: this.ImmediateRead(); break; // *NOP (immediate) case 0x83: this.IndexedIndirectXAddress(); this.MemoryWrite((byte)(this.A & this.X)); break; // *SAX (indexed indirect X) case 0x87: this.ZeroPageAddress(); this.MemoryWrite((byte)(this.A & this.X)); break; // *SAX (zero page) case 0x89: this.ImmediateRead(); break; // *NOP (immediate) @@ -109,7 +106,6 @@ namespace EightBit case 0xbb: this.AbsoluteYAddress(); this.MaybeFixup(); this.LAS(); break; // *LAS (absolute, Y) case 0xbf: this.AbsoluteYRead(); this.A = this.X = this.Through(); break; // *LAX (absolute, Y) - //case 0xc2: this.ImmediateRead(); break; // *NOP (immediate) case 0xc3: this.IndexedIndirectXRead(); this.DCP(); break; // *DCP (indexed indirect X) case 0xc7: this.ZeroPageRead(); this.DCP(); break; // *DCP (zero page) case 0xcb: this.ImmediateRead(); this.AXS(); break; // *AXS (immediate) @@ -117,14 +113,12 @@ namespace EightBit case 0xd2: this.Jam(); break; // *JAM case 0xd3: this.IndirectIndexedYAddress(); this.FixupRead(); this.DCP(); break; // *DCP (indirect indexed Y) - //case 0xd4: this.ZeroPageXRead(); break; // *NOP (zero page, X) case 0xd7: this.ZeroPageXRead(); this.DCP(); break; // *DCP (zero page, X) case 0xda: this.SwallowRead(); break; // *NOP (implied) case 0xdb: this.AbsoluteYAddress(); this.FixupRead(); this.DCP(); break; // *DCP (absolute, Y) case 0xdc: this.AbsoluteXAddress(); this.MaybeFixupRead(); break; // *NOP (absolute, X) case 0xdf: this.AbsoluteXAddress(); this.FixupRead(); this.DCP(); break; // *DCP (absolute, X) - //case 0xe2: this.ImmediateRead(); break; // *NOP (immediate) case 0xe3: this.IndexedIndirectXRead(); this.ISB(); break; // *ISB (indexed indirect X) case 0xe7: this.ZeroPageRead(); this.ISB(); break; // *ISB (zero page) case 0xeb: this.ImmediateRead(); this.SBC(); break; // *SBC (immediate) @@ -132,7 +126,6 @@ namespace EightBit case 0xf2: this.Jam(); break; // *JAM case 0xf3: this.IndirectIndexedYAddress(); this.FixupRead(); this.ISB(); break; // *ISB (indirect indexed Y) - //case 0xf4: this.ZeroPageXRead(); break; // *NOP (zero page, X) case 0xf7: this.ZeroPageXRead(); this.ISB(); break; // *ISB (zero page, X) case 0xfa: this.SwallowRead(); break; // *NOP (implied) case 0xfb: this.AbsoluteYAddress(); this.FixupRead(); this.ISB(); break; // *ISB (absolute, Y) diff --git a/M6502/M6502Core.cs b/M6502/M6502Core.cs index 67a23d0..1fdfb82 100644 --- a/M6502/M6502Core.cs +++ b/M6502/M6502Core.cs @@ -406,7 +406,7 @@ namespace EightBit case 0x50: this.BranchNot(this.Overflow); break; // BVC (relative) case 0x51: this.IndirectIndexedYRead(); this.EorR(); break; // EOR (indirect indexed Y) - case 0x54: this.ZeroPageXRead(); break; // *NOP (zero page, X) + case 0x54: this.ZeroPageXRead(); break; // *NOP (zero page, X) case 0x55: this.ZeroPageXRead(); this.EorR(); break; // EOR (zero page, X) case 0x56: this.ZeroPageXRead(); this.ModifyWrite(this.LSR()); break; // LSR (zero page, X) case 0x58: this.SwallowRead(); this.ResetFlag(StatusBits.IF); break; // CLI (implied) @@ -434,8 +434,8 @@ namespace EightBit case 0x7d: this.AbsoluteXRead(); this.ADC(); break; // ADC (absolute, X) case 0x7e: this.AbsoluteXAddress(); this.FixupRead(); this.ModifyWrite(this.ROR()); break; // ROR (absolute, X) - case 0x81: this.IndexedIndirectXAddress(); this.MemoryWrite(this.A); break; // STA (indexed indirect X) - case 0x82: this.ImmediateRead(); break; // *NOP (immediate) + case 0x81: this.IndexedIndirectXAddress(); this.MemoryWrite(this.A); break; // STA (indexed indirect X) + case 0x82: this.ImmediateRead(); break; // *NOP (immediate) case 0x84: this.ZeroPageAddress(); this.MemoryWrite(this.Y); break; // STY (zero page) case 0x85: this.ZeroPageAddress(); this.MemoryWrite(this.A); break; // STA (zero page) case 0x86: this.ZeroPageAddress(); this.MemoryWrite(this.X); break; // STX (zero page) @@ -482,7 +482,7 @@ namespace EightBit case 0xc0: this.ImmediateRead(); this.CMP(this.Y); break; // CPY (immediate) case 0xc1: this.IndexedIndirectXRead(); this.CMP(this.A); break; // CMP (indexed indirect X) - case 0xc2: this.ImmediateRead(); break; // *NOP (immediate) + case 0xc2: this.ImmediateRead(); break; // *NOP (immediate) case 0xc4: this.ZeroPageRead(); this.CMP(this.Y); break; // CPY (zero page) case 0xc5: this.ZeroPageRead(); this.CMP(this.A); break; // CMP (zero page) case 0xc6: this.ZeroPageRead(); this.ModifyWrite(this.DEC()); break; // DEC (zero page) @@ -495,7 +495,7 @@ namespace EightBit case 0xd0: this.BranchNot(this.Zero); break; // BNE (relative) case 0xd1: this.IndirectIndexedYRead(); this.CMP(this.A); break; // CMP (indirect indexed Y) - case 0xd4: this.ZeroPageXRead(); break; // *NOP (zero page, X) + case 0xd4: this.ZeroPageXRead(); break; // *NOP (zero page, X) case 0xd5: this.ZeroPageXRead(); this.CMP(this.A); break; // CMP (zero page, X) case 0xd6: this.ZeroPageXRead(); this.ModifyWrite(this.DEC()); break; // DEC (zero page, X) case 0xd8: this.SwallowRead(); this.ResetFlag(StatusBits.DF); break; // CLD (implied) @@ -505,7 +505,7 @@ namespace EightBit case 0xe0: this.ImmediateRead(); this.CMP(this.X); break; // CPX (immediate) case 0xe1: this.IndexedIndirectXRead(); this.SBC(); break; // SBC (indexed indirect X) - case 0xe2: this.ImmediateRead(); break; // *NOP (immediate) + case 0xe2: this.ImmediateRead(); break; // *NOP (immediate) case 0xe4: this.ZeroPageRead(); this.CMP(this.X); break; // CPX (zero page) case 0xe5: this.ZeroPageRead(); this.SBC(); break; // SBC (zero page) case 0xe6: this.ZeroPageRead(); this.ModifyWrite(INC()); break; // INC (zero page) @@ -518,7 +518,7 @@ namespace EightBit case 0xf0: this.Branch(this.Zero); break; // BEQ (relative) case 0xf1: this.IndirectIndexedYRead(); this.SBC(); break; // SBC (indirect indexed Y) - case 0xf4: this.ZeroPageXRead(); break; // *NOP (zero page, X) + case 0xf4: this.ZeroPageXRead(); break; // *NOP (zero page, X) case 0xf5: this.ZeroPageXRead(); this.SBC(); break; // SBC (zero page, X) case 0xf6: this.ZeroPageXRead(); this.ModifyWrite(this.INC()); break; // INC (zero page, X) case 0xf8: this.SwallowRead(); this.SetFlag(StatusBits.DF); break; // SED (implied)