From 7c9c5af6d495d6ac60b5cb59b8e0cd9a17318e9a Mon Sep 17 00:00:00 2001 From: Ian C Date: Mon, 27 Feb 2012 22:31:00 +0000 Subject: Rolled test memory and devices into machine. --- .../Noddybox.Emulation.EightBit.Z80.Test.csproj | 3 +- native/Noddybox.Emulation.EightBit.Z80.Test/README | 9 ++++ .../TestDevice.cs | 37 --------------- .../TestMachine.cs | 55 ++++++++++++++++++++++ .../TestMemory.cs | 39 --------------- 5 files changed, 65 insertions(+), 78 deletions(-) delete mode 100644 native/Noddybox.Emulation.EightBit.Z80.Test/TestDevice.cs create mode 100644 native/Noddybox.Emulation.EightBit.Z80.Test/TestMachine.cs delete mode 100644 native/Noddybox.Emulation.EightBit.Z80.Test/TestMemory.cs diff --git a/native/Noddybox.Emulation.EightBit.Z80.Test/Noddybox.Emulation.EightBit.Z80.Test.csproj b/native/Noddybox.Emulation.EightBit.Z80.Test/Noddybox.Emulation.EightBit.Z80.Test.csproj index 4744ad0..a162641 100644 --- a/native/Noddybox.Emulation.EightBit.Z80.Test/Noddybox.Emulation.EightBit.Z80.Test.csproj +++ b/native/Noddybox.Emulation.EightBit.Z80.Test/Noddybox.Emulation.EightBit.Z80.Test.csproj @@ -45,8 +45,7 @@ - - + diff --git a/native/Noddybox.Emulation.EightBit.Z80.Test/README b/native/Noddybox.Emulation.EightBit.Z80.Test/README index ecb4c18..d260441 100644 --- a/native/Noddybox.Emulation.EightBit.Z80.Test/README +++ b/native/Noddybox.Emulation.EightBit.Z80.Test/README @@ -1,3 +1,12 @@ +************************************* +THESE TESTS ARE BASED ON THE +TESTS FROM THE FUSE EMULATOR +http://fuse-emulator.sourceforge.net/ + +ANY MISTAKES ARE MINE +************************************* + + File formats ============ diff --git a/native/Noddybox.Emulation.EightBit.Z80.Test/TestDevice.cs b/native/Noddybox.Emulation.EightBit.Z80.Test/TestDevice.cs deleted file mode 100644 index fb24552..0000000 --- a/native/Noddybox.Emulation.EightBit.Z80.Test/TestDevice.cs +++ /dev/null @@ -1,37 +0,0 @@ -// This file is part of the Noddybox.Emulation C# suite. -// -// Noddybox.Emulation is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// Noddybox.Emulation is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with Noddybox.Emulation. If not, see . -// -// Copyright (c) 2012 Ian Cowburn -// -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Noddybox.Emulation.EightBit.Z80.Test -{ - class TestDevice : IDevice - { - public byte Read(ushort device) - { - return 0x00; - } - - public void Write(ushort device, byte value) - { - // Nothing - } - } -} diff --git a/native/Noddybox.Emulation.EightBit.Z80.Test/TestMachine.cs b/native/Noddybox.Emulation.EightBit.Z80.Test/TestMachine.cs new file mode 100644 index 0000000..4b74d9f --- /dev/null +++ b/native/Noddybox.Emulation.EightBit.Z80.Test/TestMachine.cs @@ -0,0 +1,55 @@ +// This file is part of the Noddybox.Emulation C# suite. +// +// Noddybox.Emulation is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Noddybox.Emulation is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Noddybox.Emulation. If not, see . +// +// Copyright (c) 2012 Ian Cowburn +// +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace Noddybox.Emulation.EightBit.Z80.Test +{ + class TestMachine : IMemory, IDevice + { + private readonly byte[] mem = new byte[0x10000]; + private readonly Z80Cpu z80 = new Z80Cpu(); + private readonly Clock clock = new Clock(100000, 50); + + byte IMemory.Read(ushort address) + { + return mem[address]; + } + + void IMemory.Write(ushort address, byte value) + { + mem[address] = value; + } + + byte IDevice.Read(ushort device) + { + return 0; + } + + void IDevice.Write(ushort device, byte value) + { + // Nothing + } + + public TestMachine() + { + } + } +} diff --git a/native/Noddybox.Emulation.EightBit.Z80.Test/TestMemory.cs b/native/Noddybox.Emulation.EightBit.Z80.Test/TestMemory.cs deleted file mode 100644 index 0cf1e4a..0000000 --- a/native/Noddybox.Emulation.EightBit.Z80.Test/TestMemory.cs +++ /dev/null @@ -1,39 +0,0 @@ -// This file is part of the Noddybox.Emulation C# suite. -// -// Noddybox.Emulation is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// Noddybox.Emulation is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with Noddybox.Emulation. If not, see . -// -// Copyright (c) 2012 Ian Cowburn -// -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Noddybox.Emulation.EightBit.Z80.Test -{ - class TestMemory : IMemory - { - private readonly byte[] mem = new byte[0x10000]; - - public byte Read(ushort address) - { - return mem[address]; - } - - public void Write(ushort address, byte value) - { - mem[address] = value; - } - } -} -- cgit v1.2.3