diff --git a/AxibugEmuOnline.Client/Assets/Plugins/Core.dll b/AxibugEmuOnline.Client/Assets/Plugins/Core.dll new file mode 100644 index 0000000..0f42ed5 Binary files /dev/null and b/AxibugEmuOnline.Client/Assets/Plugins/Core.dll differ diff --git a/AxibugEmuOnline.Client/Assets/Plugins/NoSugarNet.ClientCore.Standard2.dll.meta b/AxibugEmuOnline.Client/Assets/Plugins/Core.dll.meta similarity index 93% rename from AxibugEmuOnline.Client/Assets/Plugins/NoSugarNet.ClientCore.Standard2.dll.meta rename to AxibugEmuOnline.Client/Assets/Plugins/Core.dll.meta index dbe316c..698e108 100644 --- a/AxibugEmuOnline.Client/Assets/Plugins/NoSugarNet.ClientCore.Standard2.dll.meta +++ b/AxibugEmuOnline.Client/Assets/Plugins/Core.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 208c5b5b9ca9139418ec61b89a1516ed +guid: 986b9dc19d701a94abe3e4d4b80a70ae PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/AxibugEmuOnline.Client/Assets/Plugins/HaoYueNet.ServerNetwork.Standard2.dll b/AxibugEmuOnline.Client/Assets/Plugins/HaoYueNet.ServerNetwork.Standard2.dll deleted file mode 100644 index f525fd2..0000000 Binary files a/AxibugEmuOnline.Client/Assets/Plugins/HaoYueNet.ServerNetwork.Standard2.dll and /dev/null differ diff --git a/AxibugEmuOnline.Client/Assets/Plugins/HaoYueNet.ServerNetwork.Standard2.dll.meta b/AxibugEmuOnline.Client/Assets/Plugins/HaoYueNet.ServerNetwork.Standard2.dll.meta deleted file mode 100644 index 07f0863..0000000 --- a/AxibugEmuOnline.Client/Assets/Plugins/HaoYueNet.ServerNetwork.Standard2.dll.meta +++ /dev/null @@ -1,33 +0,0 @@ -fileFormatVersion: 2 -guid: bba3137572a9a52478aa945ce387a192 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 0 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - - first: - Windows Store Apps: WindowsStoreApps - second: - enabled: 0 - settings: - CPU: AnyCPU - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Plugins/NoSugarNet.ClientCore.Standard2.dll b/AxibugEmuOnline.Client/Assets/Plugins/NoSugarNet.ClientCore.Standard2.dll deleted file mode 100644 index 58d737f..0000000 Binary files a/AxibugEmuOnline.Client/Assets/Plugins/NoSugarNet.ClientCore.Standard2.dll and /dev/null differ diff --git a/AxibugEmuOnline.Client/Assets/Plugins/NoSugarNet.DataHelper.dll b/AxibugEmuOnline.Client/Assets/Plugins/NoSugarNet.DataHelper.dll deleted file mode 100644 index 46e3832..0000000 Binary files a/AxibugEmuOnline.Client/Assets/Plugins/NoSugarNet.DataHelper.dll and /dev/null differ diff --git a/AxibugEmuOnline.Client/Assets/Plugins/SevenZipSharp.dll b/AxibugEmuOnline.Client/Assets/Plugins/SevenZipSharp.dll new file mode 100644 index 0000000..f588f8a Binary files /dev/null and b/AxibugEmuOnline.Client/Assets/Plugins/SevenZipSharp.dll differ diff --git a/AxibugEmuOnline.Client/Assets/Plugins/NoSugarNet.DataHelper.dll.meta b/AxibugEmuOnline.Client/Assets/Plugins/SevenZipSharp.dll.meta similarity index 93% rename from AxibugEmuOnline.Client/Assets/Plugins/NoSugarNet.DataHelper.dll.meta rename to AxibugEmuOnline.Client/Assets/Plugins/SevenZipSharp.dll.meta index 2b3ed26..3031b1e 100644 --- a/AxibugEmuOnline.Client/Assets/Plugins/NoSugarNet.DataHelper.dll.meta +++ b/AxibugEmuOnline.Client/Assets/Plugins/SevenZipSharp.dll.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1d83e3c67ee8b794c97b5876ece7a16e +guid: cda51a5b513e24a4db500829511ef182 PluginImporter: externalObjects: {} serializedVersion: 2 diff --git a/AxibugEmuOnline.Client/Assets/Resources/Kirby.nes b/AxibugEmuOnline.Client/Assets/Resources/Kirby.nes new file mode 100644 index 0000000..f2ac915 Binary files /dev/null and b/AxibugEmuOnline.Client/Assets/Resources/Kirby.nes differ diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Controller.meta b/AxibugEmuOnline.Client/Assets/Resources/Kirby.nes.meta similarity index 67% rename from AxibugEmuOnline.Client/Assets/Runtime/Controller.meta rename to AxibugEmuOnline.Client/Assets/Resources/Kirby.nes.meta index 52daa48..994e771 100644 --- a/AxibugEmuOnline.Client/Assets/Runtime/Controller.meta +++ b/AxibugEmuOnline.Client/Assets/Resources/Kirby.nes.meta @@ -1,6 +1,5 @@ fileFormatVersion: 2 -guid: 87f4900ceb2e3b24caa8eec8df6b34e7 -folderAsset: yes +guid: dee4e4661b99068439cc932db923d849 DefaultImporter: externalObjects: {} userData: diff --git a/AxibugEmuOnline.Client/Assets/Resources/Kirby.sav b/AxibugEmuOnline.Client/Assets/Resources/Kirby.sav new file mode 100644 index 0000000..6d17cf9 Binary files /dev/null and b/AxibugEmuOnline.Client/Assets/Resources/Kirby.sav differ diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Core.meta b/AxibugEmuOnline.Client/Assets/Resources/Kirby.sav.meta similarity index 67% rename from AxibugEmuOnline.Client/Assets/Runtime/Core.meta rename to AxibugEmuOnline.Client/Assets/Resources/Kirby.sav.meta index 62ce764..037f21d 100644 --- a/AxibugEmuOnline.Client/Assets/Runtime/Core.meta +++ b/AxibugEmuOnline.Client/Assets/Resources/Kirby.sav.meta @@ -1,6 +1,5 @@ fileFormatVersion: 2 -guid: 2f857291907b21142bc251146119762c -folderAsset: yes +guid: 4664d2ef3d138e141b308c242abd4327 DefaultImporter: externalObjects: {} userData: diff --git a/AxibugEmuOnline.Client/Assets/Resources/MetalSladerGlory.nes b/AxibugEmuOnline.Client/Assets/Resources/MetalSladerGlory.nes new file mode 100644 index 0000000..b8ad10f Binary files /dev/null and b/AxibugEmuOnline.Client/Assets/Resources/MetalSladerGlory.nes differ diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Input.meta b/AxibugEmuOnline.Client/Assets/Resources/MetalSladerGlory.nes.meta similarity index 67% rename from AxibugEmuOnline.Client/Assets/Runtime/Input.meta rename to AxibugEmuOnline.Client/Assets/Resources/MetalSladerGlory.nes.meta index 9b5bc16..1d431f9 100644 --- a/AxibugEmuOnline.Client/Assets/Runtime/Input.meta +++ b/AxibugEmuOnline.Client/Assets/Resources/MetalSladerGlory.nes.meta @@ -1,6 +1,5 @@ fileFormatVersion: 2 -guid: 1d2ce2c96b7d7ad4cb099e5ce0ea885d -folderAsset: yes +guid: 23a003aef20e19f4d8c45acd32012718 DefaultImporter: externalObjects: {} userData: diff --git a/AxibugEmuOnline.Client/Assets/Resources/tstd2.nes b/AxibugEmuOnline.Client/Assets/Resources/tstd2.nes new file mode 100644 index 0000000..f9f8eff Binary files /dev/null and b/AxibugEmuOnline.Client/Assets/Resources/tstd2.nes differ diff --git a/AxibugEmuOnline.Client/Assets/Resources/tstd2.nes.meta b/AxibugEmuOnline.Client/Assets/Resources/tstd2.nes.meta new file mode 100644 index 0000000..536e719 --- /dev/null +++ b/AxibugEmuOnline.Client/Assets/Resources/tstd2.nes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5df1a0f25b9a1864493e694ce7b40cc4 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Resources/tstd2.sav b/AxibugEmuOnline.Client/Assets/Resources/tstd2.sav new file mode 100644 index 0000000..6d17cf9 Binary files /dev/null and b/AxibugEmuOnline.Client/Assets/Resources/tstd2.sav differ diff --git a/AxibugEmuOnline.Client/Assets/Resources/tstd2.sav.meta b/AxibugEmuOnline.Client/Assets/Resources/tstd2.sav.meta new file mode 100644 index 0000000..b2563ef --- /dev/null +++ b/AxibugEmuOnline.Client/Assets/Resources/tstd2.sav.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 333f6913aec8b2b41807add4cf643f6a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Controller/IController.cs b/AxibugEmuOnline.Client/Assets/Runtime/Controller/IController.cs deleted file mode 100644 index 0548145..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Controller/IController.cs +++ /dev/null @@ -1,15 +0,0 @@ -using UnityEngine; - -namespace AxibugEmuOnline.Client.UNES.Controller -{ - public interface IController - { - void Strobe(bool on); - - int ReadState(); - - void PressKey(KeyCode keyCode); - - void ReleaseKey(KeyCode keyCode); - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Controller/IController.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Controller/IController.cs.meta deleted file mode 100644 index 097e178..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Controller/IController.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: fde4f0c3566240b4fa824b147b019ff7 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Controller/KeyConfig.cs b/AxibugEmuOnline.Client/Assets/Runtime/Controller/KeyConfig.cs deleted file mode 100644 index 811c060..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Controller/KeyConfig.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using UnityEngine; - -namespace AxibugEmuOnline.Client.UNES.Controller -{ - [Serializable] - public class KeyConfig - { - public KeyCode Up = KeyCode.UpArrow; - public KeyCode Down = KeyCode.DownArrow; - public KeyCode Left = KeyCode.LeftArrow; - public KeyCode Right = KeyCode.RightArrow; - - public KeyCode A = KeyCode.A; - public KeyCode B = KeyCode.S; - - public KeyCode Start = KeyCode.Alpha1; - public KeyCode Select = KeyCode.Alpha2; - - public KeyCode Debug = KeyCode.P; - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Controller/KeyConfig.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Controller/KeyConfig.cs.meta deleted file mode 100644 index 4e8d851..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Controller/KeyConfig.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3e51d74785e24fa4f972a1eb002a81d7 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Controller/NesController.cs b/AxibugEmuOnline.Client/Assets/Runtime/Controller/NesController.cs deleted file mode 100644 index 5b2126e..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Controller/NesController.cs +++ /dev/null @@ -1,83 +0,0 @@ -using System.Collections.Generic; -using UnityEngine; -using AxibugEmuOnline.Client.UNES.Input; - -namespace AxibugEmuOnline.Client.UNES.Controller -{ - public class NesController : IController - { - private readonly UNESBehaviour _nes; - private int _data; - private int _serialData; - private bool _strobing; - - public bool Debug; - - public KeyConfig Config => _nes.KeyConfig; - - // bit: 7 6 5 4 3 2 1 0 - // button: A B Select Start Up Down Left - - private readonly Dictionary _keyMapping; - - public NesController(UNESBehaviour nse) - { - _nes = nse; - - _keyMapping = new Dictionary - { - {Config.A, 7}, - {Config.B, 6}, - {Config.Select, 5}, - {Config.Start, 4}, - {Config.Up, 3}, - {Config.Down, 2}, - {Config.Left, 1}, - {Config.Right, 0}, - }; - } - - public void Strobe(bool on) - { - _serialData = _data; - _strobing = on; - } - - public int ReadState() - { - int ret = ((_serialData & 0x80) > 0).AsByte(); - if (!_strobing) - { - _serialData <<= 1; - _serialData &= 0xFF; - } - - return ret; - } - - public void PressKey(KeyCode keyCode) - { - if (keyCode == Config.Debug) - { - Debug ^= true; - } - - if (!_keyMapping.ContainsKey(keyCode)) - { - return; - } - - _data |= 1 << _keyMapping[keyCode]; - } - - public void ReleaseKey(KeyCode keyCode) - { - if (!_keyMapping.ContainsKey(keyCode)) - { - return; - } - - _data &= ~(1 << _keyMapping[keyCode]); - } - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Core/Addressable.cs b/AxibugEmuOnline.Client/Assets/Runtime/Core/Addressable.cs deleted file mode 100644 index 770cb10..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Core/Addressable.cs +++ /dev/null @@ -1,62 +0,0 @@ -using System.Runtime.CompilerServices; - -namespace AxibugEmuOnline.Client.UNES -{ - public abstract class Addressable - { - public delegate uint ReadDelegate(uint address); - - public delegate void WriteDelegate(uint address, byte val); - - protected readonly Emulator _emulator; - protected readonly ReadDelegate[] _readMap; - protected readonly WriteDelegate[] _writeMap; - protected readonly uint _addressSize; - - protected Addressable(Emulator emulator, uint addressSpace) - { - _emulator = emulator; - _addressSize = addressSpace; - _readMap = new ReadDelegate[addressSpace + 1]; - _writeMap = new WriteDelegate[addressSpace + 1]; - } - - protected virtual void InitializeMemoryMap() - { - _readMap.Fill(address => 0); - - // Some games write to addresses not mapped and expect to continue afterwards - _writeMap.Fill((address, val) => { }); - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public uint ReadByte(uint address) - { - address &= _addressSize; - return _readMap[address](address); - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void WriteByte(uint address, uint val) - { - address &= _addressSize; - _writeMap[address](address, (byte)val); - } - - public void MapReadHandler(uint start, uint end, CPU.ReadDelegate func) - { - for (uint i = start; i <= end; i++) - { - _readMap[i] = func; - } - } - - public void MapWriteHandler(uint start, uint end, CPU.WriteDelegate func) - { - for (uint i = start; i <= end; i++) - { - _writeMap[i] = func; - } - } - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.Core.cs b/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.Core.cs deleted file mode 100644 index b68c527..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.Core.cs +++ /dev/null @@ -1,81 +0,0 @@ -using System; - -namespace AxibugEmuOnline.Client.UNES -{ - sealed partial class CPU - { - public enum InterruptType - { - NMI, - IRQ, - RESET - } - - private readonly uint[] _interruptHandlerOffsets = { 0xFFFA, 0xFFFE, 0xFFFC }; - private readonly bool[] _interrupts = new bool[2]; - - public void Initialize() - { - A = 0; - X = 0; - Y = 0; - SP = 0xFD; - P = 0x24; - - PC = ReadWord(_interruptHandlerOffsets[(int) InterruptType.RESET]); - } - - public void Reset() - { - SP -= 3; - F.InterruptsDisabled = true; - } - - public void TickFromPPU() - { - if (Cycle-- > 0) return; - ExecuteSingleInstruction(); - } - - public void ExecuteSingleInstruction() - { - for (var i = 0; i < _interrupts.Length; i++) - { - if (_interrupts[i]) - { - PushWord(PC); - Push(P); - PC = ReadWord(_interruptHandlerOffsets[i]); - F.InterruptsDisabled = true; - _interrupts[i] = false; - return; - } - } - - _currentInstruction = NextByte(); - - Cycle += _opCodeDefs[_currentInstruction].Cycles; - - ResetInstructionAddressingMode(); - // if (_numExecuted > 10000 && PC - 1 == 0xFF61) - // if(_emulator.Controller.debug || 0x6E00 <= PC && PC <= 0x6EEF) - // Console.WriteLine($"{(PC - 1).ToString("X4")} {_currentInstruction.ToString("X2")} {opcodeNames[_currentInstruction]}\t\t\tA:{A.ToString("X2")} X:{X.ToString("X2")} Y:{Y.ToString("X2")} P:{P.ToString("X2")} SP:{SP.ToString("X2")}"); - - var op = _opCodes[_currentInstruction]; - if (op == null) - { - throw new ArgumentException(_currentInstruction.ToString("X2")); - } - - op(); - } - - public void TriggerInterrupt(InterruptType type) - { - if (!F.InterruptsDisabled || type == InterruptType.NMI) - { - _interrupts[(int)type] = true; - } - } - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.Core.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.Core.cs.meta deleted file mode 100644 index 5f375dc..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.Core.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 63ec605962bce0e4899b19d49d4ed747 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.IORegisters.cs b/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.IORegisters.cs deleted file mode 100644 index 039a0d1..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.IORegisters.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Runtime.CompilerServices; -using System.Text; -using System.Threading.Tasks; - -namespace AxibugEmuOnline.Client.UNES -{ - sealed partial class CPU - { - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public void WriteIoRegister(uint reg, byte val) - { - switch (reg) - { - case 0x4014: // OAM DMA - _emulator.PPU.PerformDMA(val); - break; - case 0x4016: - _emulator.Controller.Strobe(val == 1); - break; - } - - if (reg <= 0x401F) - { - return; // APU write - } - - throw new NotImplementedException($"{reg:X4} = {val:X2}"); - } - - public uint ReadIORegister(uint reg) - { - switch (reg) - { - case 0x4016: - return (uint) _emulator.Controller.ReadState() & 0x1; - } - return 0x00; - //throw new NotImplementedException(); - } - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.IORegisters.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.IORegisters.cs.meta deleted file mode 100644 index 42ddf45..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.IORegisters.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6ad8b3c04ef34de48b5cab3029811d9d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.Instructions.cs b/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.Instructions.cs deleted file mode 100644 index 1d32389..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.Instructions.cs +++ /dev/null @@ -1,463 +0,0 @@ -using System; -using static AxibugEmuOnline.Client.UNES.CPU.AddressingMode; - -namespace AxibugEmuOnline.Client.UNES -{ - public sealed partial class CPU - { - [AttributeUsage(AttributeTargets.Method, Inherited = false, AllowMultiple = true)] - public class OpCodeDef : Attribute - { - public int OpCode; - public int Cycles = 1; - public bool PageBoundary; - public bool RMW; - public AddressingMode Mode = None; - } - - [OpCodeDef(OpCode = 0x20, Cycles = 6)] - private void JSR() - { - PushWord(PC + 1); - PC = NextWord(); - } - - [OpCodeDef(OpCode = 0x40, Cycles = 6)] - private void RTI() - { - // TODO: this dummy fetch should happen for all single-byte instructions - NextByte(); - P = Pop(); - PC = PopWord(); - } - - [OpCodeDef(OpCode = 0x60, Cycles = 6)] - private void RTS() - { - NextByte(); - PC = PopWord() + 1; - } - - [OpCodeDef(OpCode = 0xC8, Cycles = 2)] - private void INY() => Y++; - - [OpCodeDef(OpCode = 0x88, Cycles = 2)] - private void DEY() => Y--; - - [OpCodeDef(OpCode = 0xE8, Cycles = 2)] - private void INX() => X++; - - [OpCodeDef(OpCode = 0xCA, Cycles = 2, RMW = true)] - private void DEX() => X--; - - [OpCodeDef(OpCode = 0xA8, Cycles = 2)] - private void TAY() => Y = A; - - [OpCodeDef(OpCode = 0x98, Cycles = 2)] - private void TYA() => A = Y; - - [OpCodeDef(OpCode = 0xAA, Cycles = 2, RMW = true)] - private void TAX() => X = A; - - [OpCodeDef(OpCode = 0x8A, Cycles = 2, RMW = true)] - private void TXA() => A = X; - - [OpCodeDef(OpCode = 0xBA, Cycles = 2)] - private void TSX() => X = SP; - - [OpCodeDef(OpCode = 0x9A, Cycles = 2, RMW = true)] - private void TXS() => SP = X; - - [OpCodeDef(OpCode = 0x08, Cycles = 3)] - private void PHP() => Push(P | BreakSourceBit); - - [OpCodeDef(OpCode = 0x28, Cycles = 4)] - private void PLP() => P = (uint)(Pop() & ~BreakSourceBit); - - [OpCodeDef(OpCode = 0x68, Cycles = 4)] - private void PLA() => A = Pop(); - - [OpCodeDef(OpCode = 0x48, Cycles = 3)] - private void PHA() => Push(A); - - [OpCodeDef(OpCode = 0x24, Mode = ZeroPage, Cycles = 3)] - [OpCodeDef(OpCode = 0x2C, Mode = Absolute, Cycles = 4)] - private void BIT() - { - uint val = AddressRead(); - F.Overflow = (val & 0x40) > 0; - F.Zero = (val & A) == 0; - F.Negative = (val & 0x80) > 0; - } - - private void Branch(bool cond) - { - uint nPC = (uint)(PC + NextSByte() + 1); - if (cond) - { - PC = nPC; - Cycle++; - } - } - - [OpCodeDef(OpCode = 0x4C, Cycles = 3)] - [OpCodeDef(OpCode = 0x6C, Cycles = 5)] - private void JMP() - { - if (_currentInstruction == 0x4C) - { - PC = NextWord(); - } - else if (_currentInstruction == 0x6C) - { - uint off = NextWord(); - // AN INDIRECT JUMP MUST NEVER USE A VECTOR BEGINNING ON THE LAST BYTE OF A PAGE - // - // If address $3000 contains $40, $30FF contains $80, and $3100 contains $50, - // the result of JMP ($30FF) will be a transfer of control to $4080 rather than - // $5080 as you intended i.e. the 6502 took the low byte of the address from - // $30FF and the high byte from $3000. - // - // http://www.6502.org/tutorials/6502opcodes.html - uint hi = (off & 0xFF) == 0xFF ? off - 0xFF : off + 1; - uint oldPC = PC; - PC = ReadByte(off) | (ReadByte(hi) << 8); - - if ((oldPC & 0xFF00) != (PC & 0xFF00)) - { - Cycle += 2; - } - } - else - { - throw new NotImplementedException(); - } - } - - [OpCodeDef(OpCode = 0xB0, Cycles = 2)] - private void BCS() => Branch(F.Carry); - - [OpCodeDef(OpCode = 0x90, Cycles = 2)] - private void BCC() => Branch(!F.Carry); - - [OpCodeDef(OpCode = 0xF0, Cycles = 2)] - private void BEQ() => Branch(F.Zero); - - [OpCodeDef(OpCode = 0xD0, Cycles = 2)] - private void BNE() => Branch(!F.Zero); - - [OpCodeDef(OpCode = 0x70, Cycles = 2)] - private void BVS() => Branch(F.Overflow); - - [OpCodeDef(OpCode = 0x50, Cycles = 2)] - private void BVC() => Branch(!F.Overflow); - - [OpCodeDef(OpCode = 0x10, Cycles = 2)] - private void BPL() => Branch(!F.Negative); - - [OpCodeDef(OpCode = 0x30, Cycles = 2)] - private void BMI() => Branch(F.Negative); - - [OpCodeDef(OpCode = 0x81, Mode = IndirectX, Cycles = 6)] - [OpCodeDef(OpCode = 0x91, Mode = IndirectY, Cycles = 6)] - [OpCodeDef(OpCode = 0x95, Mode = ZeroPageX, Cycles = 4)] - [OpCodeDef(OpCode = 0x99, Mode = AbsoluteY, Cycles = 5)] - [OpCodeDef(OpCode = 0x9D, Mode = AbsoluteX, Cycles = 5)] - [OpCodeDef(OpCode = 0x85, Mode = ZeroPage, Cycles = 3)] - [OpCodeDef(OpCode = 0x8D, Mode = Absolute, Cycles = 4)] - private void STA() => AddressWrite(A); - - [OpCodeDef(OpCode = 0x96, Mode = ZeroPageY, Cycles = 4)] - [OpCodeDef(OpCode = 0x86, Mode = ZeroPage, Cycles = 3)] - [OpCodeDef(OpCode = 0x8E, Mode = Absolute, Cycles = 4)] - private void STX() => AddressWrite(X); - - [OpCodeDef(OpCode = 0x94, Mode = ZeroPageX, Cycles = 4)] - [OpCodeDef(OpCode = 0x84, Mode = ZeroPage, Cycles = 3)] - [OpCodeDef(OpCode = 0x8C, Mode = Absolute, Cycles = 4)] - private void STY() => AddressWrite(Y); - - [OpCodeDef(OpCode = 0x18, Cycles = 2)] - private void CLC() => F.Carry = false; - - [OpCodeDef(OpCode = 0x38, Cycles = 2)] - private void SEC() => F.Carry = true; - - [OpCodeDef(OpCode = 0x58, Cycles = 2)] - private void CLI() => F.InterruptsDisabled = false; - - [OpCodeDef(OpCode = 0x78, Cycles = 2)] - private void SEI() => F.InterruptsDisabled = true; - - [OpCodeDef(OpCode = 0xB8, Cycles = 2)] - private void CLV() => F.Overflow = false; - - [OpCodeDef(OpCode = 0xD8, Cycles = 2)] - private void CLD() => F.DecimalMode = false; - - [OpCodeDef(OpCode = 0xF8, Cycles = 2)] - private void SED() => F.DecimalMode = true; - - [OpCodeDef(OpCode = 0xEA, Cycles = 2)] - [OpCodeDef(OpCode = 0x1A, Cycles = 2)] // Unofficial - [OpCodeDef(OpCode = 0x3A, Cycles = 2)] // Unofficial - [OpCodeDef(OpCode = 0x5A, Cycles = 2)] // Unofficial - [OpCodeDef(OpCode = 0x7A, Cycles = 2)] // Unofficial - [OpCodeDef(OpCode = 0xDA, Cycles = 2)] // Unofficial - [OpCodeDef(OpCode = 0xFA, Cycles = 2)] // Unofficial - private void NOP() { } - - [OpCodeDef(OpCode = 0xA1, Mode = IndirectX, Cycles = 6)] - [OpCodeDef(OpCode = 0xA5, Mode = ZeroPage, Cycles = 3)] - [OpCodeDef(OpCode = 0xA9, Mode = Immediate, Cycles = 2)] - [OpCodeDef(OpCode = 0xAD, Mode = Absolute, Cycles = 4)] - [OpCodeDef(OpCode = 0xB1, Mode = IndirectY, Cycles = 5, PageBoundary = true)] - [OpCodeDef(OpCode = 0xB5, Mode = ZeroPageX, Cycles = 4)] - [OpCodeDef(OpCode = 0xB9, Mode = AbsoluteY, Cycles = 4, PageBoundary = true)] - [OpCodeDef(OpCode = 0xBD, Mode = AbsoluteX, Cycles = 4, PageBoundary = true)] - private void LDA() => A = AddressRead(); - - [OpCodeDef(OpCode = 0xA0, Mode = Immediate, Cycles = 2)] - [OpCodeDef(OpCode = 0xA4, Mode = ZeroPage, Cycles = 3)] - [OpCodeDef(OpCode = 0xAC, Mode = Absolute, Cycles = 4)] - [OpCodeDef(OpCode = 0xB4, Mode = ZeroPageX, Cycles = 4)] - [OpCodeDef(OpCode = 0xBC, Mode = AbsoluteX, Cycles = 4, PageBoundary = true)] - private void LDY() => Y = AddressRead(); - - [OpCodeDef(OpCode = 0xA2, Mode = Immediate, Cycles = 2, RMW = true)] - [OpCodeDef(OpCode = 0xA6, Mode = ZeroPage, Cycles = 3, RMW = true)] - [OpCodeDef(OpCode = 0xAE, Mode = Absolute, Cycles = 4, RMW = true)] - [OpCodeDef(OpCode = 0xB6, Mode = ZeroPageY, Cycles = 4, RMW = true)] - [OpCodeDef(OpCode = 0xBE, Mode = AbsoluteY, Cycles = 4, PageBoundary = true, RMW = true)] - private void LDX() => X = AddressRead(); - - [OpCodeDef(OpCode = 0x01, Mode = IndirectX, Cycles = 6)] - [OpCodeDef(OpCode = 0x05, Mode = ZeroPage, Cycles = 3)] - [OpCodeDef(OpCode = 0x09, Mode = Immediate, Cycles = 2)] - [OpCodeDef(OpCode = 0x0D, Mode = Absolute, Cycles = 4)] - [OpCodeDef(OpCode = 0x11, Mode = IndirectY, Cycles = 5, PageBoundary = true)] - [OpCodeDef(OpCode = 0x15, Mode = ZeroPageX, Cycles = 4)] - [OpCodeDef(OpCode = 0x19, Mode = AbsoluteY, Cycles = 4, PageBoundary = true)] - [OpCodeDef(OpCode = 0x1D, Mode = AbsoluteX, Cycles = 4, PageBoundary = true)] - private void ORA() => A |= AddressRead(); - - [OpCodeDef(OpCode = 0x21, Mode = IndirectX, Cycles = 6)] - [OpCodeDef(OpCode = 0x25, Mode = ZeroPage, Cycles = 3)] - [OpCodeDef(OpCode = 0x29, Mode = Immediate, Cycles = 2)] - [OpCodeDef(OpCode = 0x2D, Mode = Absolute, Cycles = 4)] - [OpCodeDef(OpCode = 0x31, Mode = IndirectY, Cycles = 5, PageBoundary = true)] - [OpCodeDef(OpCode = 0x35, Mode = ZeroPageX, Cycles = 4)] - [OpCodeDef(OpCode = 0x39, Mode = AbsoluteY, Cycles = 4, PageBoundary = true)] - [OpCodeDef(OpCode = 0x3D, Mode = AbsoluteX, Cycles = 4, PageBoundary = true)] - private void AND() => A &= AddressRead(); - - [OpCodeDef(OpCode = 0x41, Mode = IndirectX, Cycles = 6)] - [OpCodeDef(OpCode = 0x45, Mode = ZeroPage, Cycles = 3)] - [OpCodeDef(OpCode = 0x49, Mode = Immediate, Cycles = 2)] - [OpCodeDef(OpCode = 0x4D, Mode = Absolute, Cycles = 4)] - [OpCodeDef(OpCode = 0x51, Mode = IndirectY, Cycles = 5, PageBoundary = true)] - [OpCodeDef(OpCode = 0x55, Mode = ZeroPageX, Cycles = 4)] - [OpCodeDef(OpCode = 0x59, Mode = AbsoluteY, Cycles = 4, PageBoundary = true)] - [OpCodeDef(OpCode = 0x5D, Mode = AbsoluteX, Cycles = 4, PageBoundary = true)] - private void EOR() => A ^= AddressRead(); - - [OpCodeDef(OpCode = 0xE1, Mode = IndirectX, Cycles = 6)] - [OpCodeDef(OpCode = 0xE5, Mode = ZeroPage, Cycles = 3)] - [OpCodeDef(OpCode = 0x69, Mode = Immediate, Cycles = 2)] - [OpCodeDef(OpCode = 0xE9, Mode = Immediate, Cycles = 2)] // Official duplicate of $69 - [OpCodeDef(OpCode = 0xEB, Mode = Immediate, Cycles = 2)] // Unofficial duplicate of $69 - [OpCodeDef(OpCode = 0xED, Mode = Absolute, Cycles = 4)] - [OpCodeDef(OpCode = 0xF1, Mode = IndirectY, Cycles = 5, PageBoundary = true)] - [OpCodeDef(OpCode = 0xF5, Mode = ZeroPageX, Cycles = 4)] - [OpCodeDef(OpCode = 0xF9, Mode = AbsoluteY, Cycles = 4, PageBoundary = true)] - [OpCodeDef(OpCode = 0xFD, Mode = AbsoluteX, Cycles = 4, PageBoundary = true)] - private void SBC() => ADCImpl((byte)~AddressRead()); - - [OpCodeDef(OpCode = 0x61, Mode = IndirectX, Cycles = 6)] - [OpCodeDef(OpCode = 0x65, Mode = ZeroPage, Cycles = 3)] - [OpCodeDef(OpCode = 0x69, Mode = Immediate, Cycles = 2)] - [OpCodeDef(OpCode = 0x6D, Mode = Absolute, Cycles = 4)] - [OpCodeDef(OpCode = 0x71, Mode = IndirectY, Cycles = 5, PageBoundary = true)] - [OpCodeDef(OpCode = 0x75, Mode = ZeroPageX, Cycles = 4)] - [OpCodeDef(OpCode = 0x79, Mode = AbsoluteY, Cycles = 4, PageBoundary = true)] - [OpCodeDef(OpCode = 0x7D, Mode = AbsoluteX, Cycles = 4, PageBoundary = true)] - private void ADC() => ADCImpl(AddressRead()); - - private void ADCImpl(uint val) - { - int nA = (sbyte)A + (sbyte)val + (sbyte)(F.Carry ? 1 : 0); - F.Overflow = nA < -128 || nA > 127; - F.Carry = (A + val + (F.Carry ? 1 : 0)) > 0xFF; - A = (byte)(nA & 0xFF); - } - - [OpCodeDef(OpCode = 0x00, Cycles = 7)] - private void BRK() - { - NextByte(); - Push(P | BreakSourceBit); - F.InterruptsDisabled = true; - PC = ReadByte(0xFFFE) | (ReadByte(0xFFFF) << 8); - } - - [OpCodeDef(OpCode = 0xC1, Mode = IndirectX, Cycles = 6)] - [OpCodeDef(OpCode = 0xC5, Mode = ZeroPage, Cycles = 3)] - [OpCodeDef(OpCode = 0xC9, Mode = Immediate, Cycles = 2)] - [OpCodeDef(OpCode = 0xCD, Mode = Absolute, Cycles = 4)] - [OpCodeDef(OpCode = 0xD1, Mode = IndirectY, Cycles = 5, PageBoundary = true)] - [OpCodeDef(OpCode = 0xD5, Mode = ZeroPageX, Cycles = 4)] - [OpCodeDef(OpCode = 0xD9, Mode = AbsoluteY, Cycles = 4, PageBoundary = true)] - [OpCodeDef(OpCode = 0xDD, Mode = AbsoluteX, Cycles = 4, PageBoundary = true)] - private void CMP() => CMPImpl(A); - - [OpCodeDef(OpCode = 0xE0, Mode = Immediate, Cycles = 2)] - [OpCodeDef(OpCode = 0xE4, Mode = ZeroPage, Cycles = 3)] - [OpCodeDef(OpCode = 0xEC, Mode = Absolute, Cycles = 4)] - private void CPX() => CMPImpl(X); - - [OpCodeDef(OpCode = 0xC0, Mode = Immediate, Cycles = 2)] - [OpCodeDef(OpCode = 0xC4, Mode = ZeroPage, Cycles = 3)] - [OpCodeDef(OpCode = 0xCC, Mode = Absolute, Cycles = 4)] - private void CPY() => CMPImpl(Y); - - private void CMPImpl(uint reg) - { - long d = reg - (int)AddressRead(); - - F.Negative = (d & 0x80) > 0 && d != 0; - F.Carry = d >= 0; - F.Zero = d == 0; - } - - [OpCodeDef(OpCode = 0x46, Mode = ZeroPage, Cycles = 5, RMW = true)] - [OpCodeDef(OpCode = 0x4E, Mode = Absolute, Cycles = 6, RMW = true)] - [OpCodeDef(OpCode = 0x56, Mode = ZeroPageX, Cycles = 6, RMW = true)] - [OpCodeDef(OpCode = 0x5E, Mode = AbsoluteX, Cycles = 7, RMW = true)] - [OpCodeDef(OpCode = 0x4A, Mode = Direct, Cycles = 2, RMW = true)] - private void LSR() - { - uint D = AddressRead(); - F.Carry = (D & 0x1) > 0; - D >>= 1; - _F(D); - AddressWrite(D); - } - - [OpCodeDef(OpCode = 0x06, Mode = ZeroPage, Cycles = 5, RMW = true)] - [OpCodeDef(OpCode = 0x0E, Mode = Absolute, Cycles = 6, RMW = true)] - [OpCodeDef(OpCode = 0x16, Mode = ZeroPageX, Cycles = 6, RMW = true)] - [OpCodeDef(OpCode = 0x1E, Mode = AbsoluteX, Cycles = 7, RMW = true)] - [OpCodeDef(OpCode = 0x0A, Mode = Direct, Cycles = 2, RMW = true)] - private void ASL() - { - uint D = AddressRead(); - F.Carry = (D & 0x80) > 0; - D <<= 1; - _F(D); - AddressWrite(D); - } - - [OpCodeDef(OpCode = 0x66, Mode = ZeroPage, Cycles = 5, RMW = true)] - [OpCodeDef(OpCode = 0x6E, Mode = Absolute, Cycles = 6, RMW = true)] - [OpCodeDef(OpCode = 0x76, Mode = ZeroPageX, Cycles = 6, RMW = true)] - [OpCodeDef(OpCode = 0x7E, Mode = AbsoluteX, Cycles = 7, RMW = true)] - [OpCodeDef(OpCode = 0x6A, Mode = Direct, Cycles = 2, RMW = true)] - private void ROR() - { - uint D = AddressRead(); - bool c = F.Carry; - F.Carry = (D & 0x1) > 0; - D >>= 1; - if (c) D |= 0x80; - _F(D); - AddressWrite(D); - } - - [OpCodeDef(OpCode = 0x26, Mode = ZeroPage, Cycles = 5, RMW = true)] - [OpCodeDef(OpCode = 0x2E, Mode = Absolute, Cycles = 6, RMW = true)] - [OpCodeDef(OpCode = 0x36, Mode = ZeroPageX, Cycles = 6, RMW = true)] - [OpCodeDef(OpCode = 0x3E, Mode = AbsoluteX, Cycles = 7, RMW = true)] - [OpCodeDef(OpCode = 0x2A, Mode = Direct, Cycles = 2, RMW = true)] - private void ROL() - { - uint D = AddressRead(); - bool c = F.Carry; - F.Carry = (D & 0x80) > 0; - D <<= 1; - if (c) D |= 0x1; - _F(D); - AddressWrite(D); - } - - [OpCodeDef(OpCode = 0xE6, Mode = ZeroPage, Cycles = 5, RMW = true)] - [OpCodeDef(OpCode = 0xEE, Mode = Absolute, Cycles = 6, RMW = true)] - [OpCodeDef(OpCode = 0xF6, Mode = ZeroPageX, Cycles = 6, RMW = true)] - [OpCodeDef(OpCode = 0xFE, Mode = AbsoluteX, Cycles = 7, RMW = true)] - private void INC() - { - byte D = (byte)(AddressRead() + 1); - _F(D); - AddressWrite(D); - } - - [OpCodeDef(OpCode = 0xC6, Mode = ZeroPage, Cycles = 5, RMW = true)] - [OpCodeDef(OpCode = 0xCE, Mode = Absolute, Cycles = 3, RMW = true)] - [OpCodeDef(OpCode = 0xD6, Mode = ZeroPageX, Cycles = 6, RMW = true)] - [OpCodeDef(OpCode = 0xDE, Mode = AbsoluteX, Cycles = 7, RMW = true)] - private void DEC() - { - byte D = (byte)(AddressRead() - 1); - _F(D); - AddressWrite(D); - } - - #region Unofficial Opcodes - - [OpCodeDef(OpCode = 0x80, Cycles = 2)] - [OpCodeDef(OpCode = 0x82, Cycles = 2)] - [OpCodeDef(OpCode = 0x89, Cycles = 2)] - [OpCodeDef(OpCode = 0xC2, Cycles = 2)] - [OpCodeDef(OpCode = 0xE2, Cycles = 2)] - private void SKB() => NextByte(); // Essentially a 2-byte NOP - - [OpCodeDef(OpCode = 0x0B, Mode = Immediate, Cycles = 2)] - [OpCodeDef(OpCode = 0x2B, Mode = Immediate, Cycles = 2)] - private void ANC() - { - A &= AddressRead(); - F.Carry = F.Negative; - } - - [OpCodeDef(OpCode = 0x4B, Mode = Immediate, Cycles = 2)] - private void ALR() - { - A &= AddressRead(); - F.Carry = (A & 0x1) > 0; - A >>= 1; - _F(A); - } - - [OpCodeDef(OpCode = 0x6B, Mode = Immediate, Cycles = 2)] - private void ARR() - { - A &= AddressRead(); - bool c = F.Carry; - F.Carry = (A & 0x1) > 0; - A >>= 1; - if (c) A |= 0x80; - _F(A); - } - - [OpCodeDef(OpCode = 0xAB, Mode = Immediate, Cycles = 2)] - private void ATX() - { - // This opcode ORs the A register with #$EE, ANDs the result with an immediate - // value, and then stores the result in both A and X. - A |= ReadByte(0xEE); - A &= AddressRead(); - X = A; - } - - #endregion - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.Instructions.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.Instructions.cs.meta deleted file mode 100644 index 7817694..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.Instructions.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: cae8846694d75f04a8214a484032d533 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.Memory.cs b/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.Memory.cs deleted file mode 100644 index 5a628b7..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.Memory.cs +++ /dev/null @@ -1,165 +0,0 @@ -using System; -using System.Linq; -using System.Runtime.CompilerServices; -using static AxibugEmuOnline.Client.UNES.CPU.AddressingMode; - -namespace AxibugEmuOnline.Client.UNES -{ - sealed partial class CPU - { - public enum AddressingMode - { - None, - Direct, - Immediate, - ZeroPage, - Absolute, - ZeroPageX, - ZeroPageY, - AbsoluteX, - AbsoluteY, - IndirectX, - IndirectY - } - - private uint? _currentMemoryAddress; - private uint _rmwValue; - - private void ResetInstructionAddressingMode() => _currentMemoryAddress = null; - - private uint _Address() - { - var def = _opCodeDefs[_currentInstruction]; - switch (def.Mode) - { - case Immediate: - return PC++; - case ZeroPage: - return NextByte(); - case Absolute: - return NextWord(); - case ZeroPageX: - return (NextByte() + X) & 0xFF; - case ZeroPageY: - return (NextByte() + Y) & 0xFF; - case AbsoluteX: - var address = NextWord(); - if (def.PageBoundary && (address & 0xFF00) != ((address + X) & 0xFF00)) - { - Cycle += 1; - } - - return address + X; - case AbsoluteY: - address = NextWord(); - if (def.PageBoundary && (address & 0xFF00) != ((address + Y) & 0xFF00)) - { - Cycle += 1; - } - - return address + Y; - case IndirectX: - var off = (NextByte() + X) & 0xFF; - return ReadByte(off) | (ReadByte((off + 1) & 0xFF) << 8); - case IndirectY: - off = NextByte() & 0xFF; - address = ReadByte(off) | (ReadByte((off + 1) & 0xFF) << 8); - if (def.PageBoundary && (address & 0xFF00) != ((address + Y) & 0xFF00)) - { - Cycle += 1; - } - - return (address + Y) & 0xFFFF; - } - throw new NotImplementedException(); - } - - public uint AddressRead() - { - if (_opCodeDefs[_currentInstruction].Mode == Direct) - { - return _rmwValue = A; - } - - if (_currentMemoryAddress == null) - { - _currentMemoryAddress = _Address(); - } - - return _rmwValue = ReadByte((uint)_currentMemoryAddress) & 0xFF; - } - - public void AddressWrite(uint val) - { - if (_opCodeDefs[_currentInstruction].Mode == Direct) - { - A = val; - } - else - { - if (_currentMemoryAddress == null) - { - _currentMemoryAddress = _Address(); - } - - if (_opCodeDefs[_currentInstruction].RMW) - { - WriteByte((uint)_currentMemoryAddress, _rmwValue); - } - - WriteByte((uint)_currentMemoryAddress, val); - } - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private uint ReadWord(uint address) => ReadByte(address) | (ReadByte(address + 1) << 8); - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private uint NextByte() => ReadByte(PC++); - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private uint NextWord() => NextByte() | (NextByte() << 8); - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private sbyte NextSByte() => (sbyte)NextByte(); - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private void Push(uint what) - { - WriteByte(0x100 + SP, what); - SP--; - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private uint Pop() - { - SP++; - return ReadByte(0x100 + SP); - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private void PushWord(uint what) - { - Push(what >> 8); - Push(what & 0xFF); - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private uint PopWord() => Pop() | (Pop() << 8); - - protected override void InitializeMemoryMap() - { - base.InitializeMemoryMap(); - - MapReadHandler(0x0000, 0x1FFF, address => _ram[address & 0x07FF]); - MapReadHandler(0x2000, 0x3FFF, address => _emulator.PPU.ReadRegister((address & 0x7) - 0x2000)); - MapReadHandler(0x4000, 0x4017, ReadIORegister); - - MapWriteHandler(0x0000, 0x1FFF, (address, val) => _ram[address & 0x07FF] = val); - MapWriteHandler(0x2000, 0x3FFF, (address, val) => _emulator.PPU.WriteRegister((address & 0x7) - 0x2000, val)); - MapWriteHandler(0x4000, 0x401F, WriteIoRegister); - - _emulator.Mapper.InitializeMemoryMap(this); - } - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.Memory.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.Memory.cs.meta deleted file mode 100644 index e10a02a..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.Memory.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: cc18416f50415b74e96092e235a95f92 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.Registers.cs b/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.Registers.cs deleted file mode 100644 index 3179eb6..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.Registers.cs +++ /dev/null @@ -1,89 +0,0 @@ -using System.Runtime.CompilerServices; - -namespace AxibugEmuOnline.Client.UNES -{ - sealed partial class CPU - { - private const int CarryBit = 0x1; - private const int ZeroBit = 0x2; - private const int InterruptDisabledBit = 0x4; - private const int DecimalModeBit = 0x8; - private const int BreakSourceBit = 0x10; - private const int OverflowBit = 0x40; - private const int NegativeBit = 0x80; - - public class CPUFlags - { - public bool Negative; - public bool Overflow; - public bool BreakSource; - public bool DecimalMode; - public bool InterruptsDisabled; - public bool Zero; - public bool Carry; - } - - public readonly CPUFlags F = new CPUFlags(); - - public uint _A, _X, _Y, _SP; - public uint PC; - - public uint A - { - get => _A; - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private set => _A = _F(value & 0xFF); - } - - public uint X - { - get => _X; - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private set => _X = _F(value & 0xFF); - } - - public uint Y - { - get => _Y; - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private set => _Y = _F(value & 0xFF); - } - - public uint SP - { - get => _SP; - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private set => _SP = value & 0xFF; - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - private uint _F(uint val) - { - F.Zero = (val & 0xFF) == 0; - F.Negative = (val & 0x80) > 0; - return val; - } - - public uint P - { - get => (uint) ((F.Carry.AsByte() << 0) | - (F.Zero.AsByte() << 1) | - (F.InterruptsDisabled.AsByte() << 2) | - (F.DecimalMode.AsByte() << 3) | - (F.BreakSource.AsByte() << 4) | - (1 << 5) | - (F.Overflow.AsByte() << 6) | - (F.Negative.AsByte() << 7)); - set - { - F.Carry = (value & CarryBit) > 0; - F.Zero = (value & ZeroBit) > 0; - F.InterruptsDisabled = (value & InterruptDisabledBit) > 0; - F.DecimalMode = (value & DecimalModeBit) > 0; - F.BreakSource = (value & BreakSourceBit) > 0; - F.Overflow = (value & OverflowBit) > 0; - F.Negative = (value & NegativeBit) > 0; - } - } - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.Registers.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.Registers.cs.meta deleted file mode 100644 index 508a0d9..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.Registers.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 57750595bb8e0d24babf00d51e4624bb -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.cs b/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.cs deleted file mode 100644 index 6bd0564..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.cs +++ /dev/null @@ -1,65 +0,0 @@ -using System; -using System.Linq; -using System.Reflection; - -namespace AxibugEmuOnline.Client.UNES -{ - sealed partial class CPU : Addressable - { - private readonly byte[] _ram = new byte[0x800]; - public int Cycle; - private uint _currentInstruction; - - public delegate void OpCode(); - - private readonly OpCode[] _opCodes = new OpCode[256]; - private readonly string[] _opCodeNames = new string[256]; - private readonly OpCodeDef[] _opCodeDefs = new OpCodeDef[256]; - - public CPU(Emulator emulator) : base(emulator, 0xFFFF) - { - InitializeOpCodes(); - InitializeMemoryMap(); - Initialize(); - } - - private void InitializeOpCodes() - { - var opCodeBindings = from opCode in GetType().GetMethods(BindingFlags.NonPublic | BindingFlags.Instance) - let defs = opCode.GetCustomAttributes(typeof(OpCodeDef), false) - where defs.Length > 0 - select new - { - binding = (OpCode)Delegate.CreateDelegate(typeof(OpCode), this, opCode.Name), - name = opCode.Name, - defs = (from d in defs select (OpCodeDef)d) - }; - - foreach (var opCode in opCodeBindings) - { - foreach (var def in opCode.defs) - { - _opCodes[def.OpCode] = opCode.binding; - _opCodeNames[def.OpCode] = opCode.name; - _opCodeDefs[def.OpCode] = def; - } - } - } - - public void Execute() - { - for (var i = 0; i < 5000; i++) - { - ExecuteSingleInstruction(); - } - - uint w; - ushort x = 6000; - string z = ""; - while ((w = ReadByte(x)) != '\0') - { - z += (char)w; - } - } - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.cs.meta deleted file mode 100644 index f80ca2b..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Core/CPU.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: fa724afa42498dd4e80f44c3da2a5881 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Core/Cartridge.cs b/AxibugEmuOnline.Client/Assets/Runtime/Core/Cartridge.cs deleted file mode 100644 index bb1c6bc..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Core/Cartridge.cs +++ /dev/null @@ -1,66 +0,0 @@ -using System; - -namespace AxibugEmuOnline.Client.UNES -{ - public class Cartridge - { - public readonly byte[] Raw; - public readonly int PRGROMSize; - public readonly int CHRROMSize; - public readonly int PRGRAMSize; - public readonly int PRGROMOffset; - public readonly int MapperNumber; - public readonly byte[] PRGROM; - public readonly byte[] CHRROM; - public VRAMMirroringMode MirroringMode; - - public enum VRAMMirroringMode - { - Horizontal, Vertical, All, Upper, Lower - } - - public Cartridge(byte[] bytes) - { - Raw = bytes; - - var header = BitConverter.ToInt32(Raw, 0); - if (header != 0x1A53454E) // "NES" - { - throw new FormatException("unexpected header value " + header.ToString("X")); - } - - PRGROMSize = Raw[4] * 0x4000; // 16kb units - CHRROMSize = Raw[5] * 0x2000; // 8kb units - PRGRAMSize = Raw[8] * 0x2000; - - var hasTrainer = (Raw[6] & 0b100) > 0; - PRGROMOffset = 16 + (hasTrainer ? 512 : 0); - - MirroringMode = (Raw[6] & 0x1) > 0 ? VRAMMirroringMode.Vertical : VRAMMirroringMode.Horizontal; - if ((Raw[6] & 0x8) > 0) - { - MirroringMode = VRAMMirroringMode.All; - } - - MapperNumber = (Raw[6] >> 4) | (Raw[7] & 0xF0); - - PRGROM = new byte[PRGROMSize]; - Array.Copy(Raw, PRGROMOffset, PRGROM, 0, PRGROMSize); - - if (CHRROMSize == 0) - { - CHRROM = new byte[0x2000]; - } - else - { - CHRROM = new byte[CHRROMSize]; - Array.Copy(Raw, PRGROMOffset + PRGROMSize, CHRROM, 0, CHRROMSize); - } - } - - public override string ToString() - { - return $"Cartridge{{PRGROMSize={PRGROMSize}, CHRROMSize={CHRROMSize}, PRGROMOffset={PRGROMOffset}, MapperNumber={MapperNumber}}}"; - } - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Core/Cartridge.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Core/Cartridge.cs.meta deleted file mode 100644 index 4fcccd7..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Core/Cartridge.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b45675095efbb224cad44ee16c2587ff -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Core/Emulator.cs b/AxibugEmuOnline.Client/Assets/Runtime/Core/Emulator.cs deleted file mode 100644 index 271c287..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Core/Emulator.cs +++ /dev/null @@ -1,44 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Reflection; -using AxibugEmuOnline.Client.UNES.Controller; -using AxibugEmuOnline.Client.UNES.Mapper; - -namespace AxibugEmuOnline.Client.UNES -{ - public class Emulator - { - private static readonly Dictionary> Mappers = (from type in Assembly.GetExecutingAssembly().GetTypes() - let def = (MapperDef)type.GetCustomAttributes(typeof(MapperDef), true).FirstOrDefault() - where def != null - select new { def, type }).ToDictionary(a => a.def.Id, a => new KeyValuePair(a.type, a.def)); - - public IController Controller; - - public readonly CPU CPU; - - public readonly PPU PPU; - - public readonly BaseMapper Mapper; - - public readonly Cartridge Cartridge; - - public Emulator(byte[] bytes, IController controller) - { - Cartridge = new Cartridge(bytes); - if (!Mappers.ContainsKey(Cartridge.MapperNumber)) - { - throw new NotImplementedException($"unsupported mapper {Cartridge.MapperNumber}"); - } - - Mapper = (BaseMapper)Activator.CreateInstance(Mappers[Cartridge.MapperNumber].Key, this); - CPU = new CPU(this); - PPU = new PPU(this); - Controller = controller; - - // Load(); - } - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Core/Emulator.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Core/Emulator.cs.meta deleted file mode 100644 index 49774f0..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Core/Emulator.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9c56d6518f6443745a10dd7dda0ac7f9 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Core/PPU.Core.cs b/AxibugEmuOnline.Client/Assets/Runtime/Core/PPU.Core.cs deleted file mode 100644 index e797bd6..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Core/PPU.Core.cs +++ /dev/null @@ -1,394 +0,0 @@ -using System; - -namespace AxibugEmuOnline.Client.UNES -{ - partial class PPU - { - private const int GameWidth = 256, GameHeight = 240; - - private uint _bufferPos; - public readonly uint[] RawBitmap = new uint[GameWidth * GameHeight]; - //查找表的Idx网络缓存 - public readonly byte[] RawBitmap_paletteIdxCache = new byte[GameWidth * GameHeight]; - private readonly uint[] _priority = new uint[GameWidth * GameHeight]; - - // TODO: use real chroma/luma decoding - private readonly uint[] _palette = { - 0x7C7C7C, 0x0000FC, 0x0000BC, 0x4428BC, 0x940084, 0xA80020, 0xA81000, 0x881400, - 0x503000, 0x007800, 0x006800, 0x005800, 0x004058, 0x000000, 0x000000, 0x000000, - 0xBCBCBC, 0x0078F8, 0x0058F8, 0x6844FC, 0xD800CC, 0xE40058, 0xF83800, 0xE45C10, - 0xAC7C00, 0x00B800, 0x00A800, 0x00A844, 0x008888, 0x000000, 0x000000, 0x000000, - 0xF8F8F8, 0x3CBCFC, 0x6888FC, 0x9878F8, 0xF878F8, 0xF85898, 0xF87858, 0xFCA044, - 0xF8B800, 0xB8F818, 0x58D854, 0x58F898, 0x00E8D8, 0x787878, 0x000000, 0x000000, - 0xFCFCFC, 0xA4E4FC, 0xB8B8F8, 0xD8B8F8, 0xF8B8F8, 0xF8A4C0, 0xF0D0B0, 0xFCE0A8, - 0xF8D878, 0xD8F878, 0xB8F8B8, 0xB8F8D8, 0x00FCFC, 0xF8D8F8, 0x000000, 0x000000 - }; - - private int _scanLineCount = 261; - private int _cyclesPerLine = 341; - private int _cpuSyncCounter; - private readonly uint[] _scanLineOAM = new uint[8 * 4]; - private readonly bool[] _isSprite0 = new bool[8]; - private int _spriteCount; - - private long _tileShiftRegister; - private uint _currentNameTableByte; - private uint _currentHighTile, _currentLowTile; - private uint _currentColor; - - public void ProcessPixel(int x, int y) - { - ProcessBackgroundForPixel(x, y); - if (F.DrawSprites) - { - ProcessSpritesForPixel(x, y); - } - - if (y != -1) - { - _bufferPos++; - } - } - - private void CountSpritesOnLine(int scanLine) - { - _spriteCount = 0; - var height = F.TallSpritesEnabled ? 16 : 8; - - for (var idx = 0; idx < _oam.Length; idx += 4) - { - var y = _oam[idx] + 1; - if (scanLine >= y && scanLine < y + height) - { - _isSprite0[_spriteCount] = idx == 0; - _scanLineOAM[_spriteCount * 4 + 0] = _oam[idx + 0]; - _scanLineOAM[_spriteCount * 4 + 1] = _oam[idx + 1]; - _scanLineOAM[_spriteCount * 4 + 2] = _oam[idx + 2]; - _scanLineOAM[_spriteCount * 4 + 3] = _oam[idx + 3]; - _spriteCount++; - } - - if (_spriteCount == 8) - { - break; - } - } - } - - private void NextNameTableByte() - { - _currentNameTableByte = ReadByte(0x2000 | (V & 0x0FFF)); - } - - private void NextTileByte(bool hi) - { - var tileIdx = _currentNameTableByte * 16; - var address = F.PatternTableAddress + tileIdx + FineY; - - if (hi) - { - _currentHighTile = ReadByte(address + 8); - } - else - { - _currentLowTile = ReadByte(address); - } - } - - private void NextAttributeByte() - { - // Bless nesdev - var address = 0x23C0 | (V & 0x0C00) | ((V >> 4) & 0x38) | ((V >> 2) & 0x07); - _currentColor = (ReadByte(address) >> (int)((CoarseX & 2) | ((CoarseY & 2) << 1))) & 0x3; - } - - private void ShiftTileRegister() - { - for (var x = 0; x < 8; x++) - { - uint palette = ((_currentHighTile & 0x80) >> 6) | ((_currentLowTile & 0x80) >> 7); - _tileShiftRegister |= (palette + _currentColor * 4) << ((7 - x) * 4); - _currentLowTile <<= 1; - _currentHighTile <<= 1; - } - } - - private void ProcessBackgroundForPixel(int cycle, int scanLine) - { - if (cycle < 8 && !F.DrawLeftBackground || !F.DrawBackground && scanLine != -1) - { - // Maximally sketchy: if current address is in the PPU palette, then it draws that palette entry if rendering is disabled - // Otherwise, it draws $3F00 (universal bg color) - // https://www.romhacking.net/forum/index.php?topic=20554.0 - // Don't know if any game actually uses it, but a test ROM I wrote unexpectedly showed this - // corner case - - //RawBitmap[_bufferPos] = _palette[ReadByte(0x3F00 + ((F.BusAddress & 0x3F00) == 0x3F00 ? F.BusAddress & 0x001F : 0)) & 0x3F]; - byte pIdx = (byte)(ReadByte(0x3F00 + ((F.BusAddress & 0x3F00) == 0x3F00 ? F.BusAddress & 0x001F : 0)) & 0x3F); - RawBitmap[_bufferPos] = _palette[pIdx]; - RawBitmap_paletteIdxCache[_bufferPos] = pIdx; - return; - } - - var paletteEntry = (uint)(_tileShiftRegister >> 32 >> (int)((7 - X) * 4)) & 0x0F; - if (paletteEntry % 4 == 0) paletteEntry = 0; - - if (scanLine != -1) - { - _priority[_bufferPos] = paletteEntry; - //RawBitmap[_bufferPos] = _palette[ReadByte(0x3F00u + paletteEntry) & 0x3F]; - byte pIdx = (byte)(ReadByte(0x3F00u + paletteEntry) & 0x3F); - RawBitmap[_bufferPos] = _palette[pIdx]; - RawBitmap_paletteIdxCache[_bufferPos] = pIdx; - } - } - - private void ProcessSpritesForPixel(int x, int scanLine) - { - for (var idx = _spriteCount * 4 - 4; idx >= 0; idx -= 4) - { - var spriteX = _scanLineOAM[idx + 3]; - var spriteY = _scanLineOAM[idx] + 1; - - // Don't draw this sprite if... - if (spriteY == 0 || // it's located at y = 0 - spriteY > 239 || // it's located past y = 239 ($EF) - x >= spriteX + 8 || // it's behind the current dot - x < spriteX || // it's ahead of the current dot - x < 8 && !F.DrawLeftSprites) // it's in the clip area, and clipping is enabled - { - continue; - } - - // amusingly enough, the PPU's palette handling is basically identical - // to that of the Gameboy / Gameboy Color, so I've sort of just copy/pasted - // handling code wholesale from my GBC emulator at - // https://github.com/Xyene/Nitrous-Emulator/blob/master/src/main/java/nitrous/lcd/LCD.java#L642 - var tileIdx = _scanLineOAM[idx + 1]; - if (F.TallSpritesEnabled) - { - tileIdx &= ~0x1u; - } - - tileIdx *= 16; - - var attribute = _scanLineOAM[idx + 2] & 0xE3; - - var palette = attribute & 0x3; - var front = (attribute & 0x20) == 0; - var flipX = (attribute & 0x40) > 0; - var flipY = (attribute & 0x80) > 0; - - var px = (int) (x - spriteX); - var line = (int) (scanLine - spriteY); - - var tableBase = F.TallSpritesEnabled ? (_scanLineOAM[idx + 1] & 1) * 0x1000 : F.SpriteTableAddress; - - if (F.TallSpritesEnabled) - { - if (line >= 8) - { - line -= 8; - if (!flipY) - { - tileIdx += 16; - } - - flipY = false; - } - - if (flipY) - { - tileIdx += 16; - } - } - - // here we handle the x and y flipping by tweaking the indices we are accessing - var logicalX = flipX ? 7 - px : px; - var logicalLine = flipY ? 7 - line : line; - - var address = (uint) (tableBase + tileIdx + logicalLine); - - // this looks bad, but it's about as readable as it's going to get - var color = (uint) ( - ( - ( - ( - // fetch upper bit from 2nd bit plane - ReadByte(address + 8) & (0x80 >> logicalX) - ) >> (7 - logicalX) - ) << 1 // this is the upper bit of the color number - ) | - ( - ( - ReadByte(address) & (0x80 >> logicalX) - ) >> (7 - logicalX) - )); // << 0, this is the lower bit of the color number - - if (color > 0) - { - var backgroundPixel = _priority[_bufferPos]; - // Sprite 0 hits... - if (!(!_isSprite0[idx / 4] || // do not occur on not-0 sprite - x < 8 && !F.DrawLeftSprites || // or if left clipping is enabled - backgroundPixel == 0 || // or if bg pixel is transparent - F.Sprite0Hit || // or if it fired this frame already - x == 255)) // or if x is 255, "for an obscure reason related to the pixel pipeline" - { - F.Sprite0Hit = true; - } - - if (F.DrawBackground && (front || backgroundPixel == 0)) - { - if (scanLine != -1) - { - //RawBitmap[_bufferPos] = _palette[ReadByte(0x3F10 + palette * 4 + color) & 0x3F]; - - byte pIdx = (byte)(ReadByte(0x3F10 + palette * 4 + color) & 0x3F); - RawBitmap[_bufferPos] = _palette[pIdx]; - RawBitmap_paletteIdxCache[_bufferPos] = pIdx; - } - } - } - } - } - - public void ProcessFrame() - { - RawBitmap.Fill(0u); - RawBitmap_paletteIdxCache.Fill((byte)0); - _priority.Fill(0u); - _bufferPos = 0; - - for (var i = -1; i < _scanLineCount; i++) - { - ProcessScanLine(i); - } - } - - public void ProcessScanLine(int line) - { - for (var i = 0; i < _cyclesPerLine; i++) - { - ProcessCycle(line, i); - } - } - - private int _cpuClocksSinceVBL; - private int _ppuClocksSinceVBL; - - public void ProcessCycle(int scanLine, int cycle) - { - var visibleCycle = 1 <= cycle && cycle <= 256; - var prefetchCycle = 321 <= cycle && cycle <= 336; - var fetchCycle = visibleCycle || prefetchCycle; - - if (F.VBlankStarted) - { - _ppuClocksSinceVBL++; - } - - if (0 <= scanLine && scanLine < 240 || scanLine == -1) - { - if (visibleCycle) - { - ProcessPixel(cycle - 1, scanLine); - } - - // During pixels 280 through 304 of this scanline, the vertical scroll bits are reloaded TODO: if rendering is enabled. - if (scanLine == -1 && 280 <= cycle && cycle <= 304) - { - ReloadScrollY(); - } - - if (fetchCycle) - { - _tileShiftRegister <<= 4; - - // See https://wiki.nesdev.com/w/images/d/d1/Ntsc_timing.png - // Takes 8 cycles for tile to be read, 2 per "step" - switch (cycle & 7) - { - case 1: // NT - NextNameTableByte(); - break; - case 3: // AT - NextAttributeByte(); - break; - case 5: // Tile low - NextTileByte(false); - break; - case 7: // Tile high - NextTileByte(true); - break; - case 0: // 2nd cycle of tile high fetch - if (cycle == 256) - IncrementScrollY(); - else - IncrementScrollX(); - // Begin rendering a brand new tile - ShiftTileRegister(); - break; - } - } - - if (cycle == 257) - { - ReloadScrollX(); - // 257 - 320 - // The tile data for the sprites on the next scanline are fetched here. - // TODO: stagger this over all the cycles as opposed to only on 257 - CountSpritesOnLine(scanLine + 1); - } - } - - // TODO: this is a hack; VBlank should be cleared on dot 1 of the pre-render line, - // but for some reason we're at 2272-2273 CPU clocks at that time - // (i.e., our PPU timing is off somewhere by 6-9 PPU cycles per frame) - if (F.VBlankStarted && _cpuClocksSinceVBL == 2270) - { - F.VBlankStarted = false; - _cpuClocksSinceVBL = 0; - } - - if (cycle == 1) - { - if (scanLine == 241) - { - F.VBlankStarted = true; - if (F.NMIEnabled) - { - _emulator.CPU.TriggerInterrupt(CPU.InterruptType.NMI); - } - } - - // Happens at the same time as 1st cycle of NT byte fetch - if (scanLine == -1) - { - // Console.WriteLine(_ppuClocksSinceVBL); - _ppuClocksSinceVBL = 0; - F.VBlankStarted = false; - F.Sprite0Hit = false; - F.SpriteOverflow = false; - } - } - - _emulator.Mapper.ProcessCycle(scanLine, cycle); - - if (_cpuSyncCounter + 1 == 3) - { - if (F.VBlankStarted) - { - _cpuClocksSinceVBL++; - } - - _emulator.CPU.TickFromPPU(); - _cpuSyncCounter = 0; - } - else - { - _cpuSyncCounter++; - } - } - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Core/PPU.Core.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Core/PPU.Core.cs.meta deleted file mode 100644 index db54fa8..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Core/PPU.Core.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: c6d671ac51126cd43981be89a0309422 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Core/PPU.Memory.cs b/AxibugEmuOnline.Client/Assets/Runtime/Core/PPU.Memory.cs deleted file mode 100644 index 10afa10..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Core/PPU.Memory.cs +++ /dev/null @@ -1,130 +0,0 @@ -using System; -using System.Runtime.CompilerServices; - -namespace AxibugEmuOnline.Client.UNES -{ - partial class PPU - { - private readonly byte[] _oam = new byte[0x100]; - private readonly byte[] _vRam = new byte[0x2000]; - private readonly byte[] _paletteRAM = new byte[0x20]; - - private static readonly uint[][] _vRamMirrorLookup = - { - new uint[]{0, 0, 1, 1}, // H - new uint[]{0, 1, 0, 1}, // V - new uint[]{0, 1, 2, 3}, // All - new uint[]{0, 0, 0, 0}, // Upper - new uint[]{1, 1, 1, 1}, // Lower - }; - - private int _lastWrittenRegister; - - public void WriteRegister(uint reg, byte val) - { - reg &= 0xF; - _lastWrittenRegister = val & 0xFF; - switch (reg) - { - case 0x0000: - PPUCTRL = val; - return; - case 0x0001: - PPUMASK = val; - return; - case 0x0002: return; - case 0x0003: - OAMADDR = val; - return; - case 0x0004: - OAMDATA = val; - return; - case 0x005: - PPUSCROLL = val; - return; - case 0x0006: - PPUADDR = val; - return; - case 0x0007: - PPUDATA = val; - return; - } - - throw new NotImplementedException($"{reg:X4} = {val:X2}"); - } - - public byte ReadRegister(uint reg) - { - reg &= 0xF; - switch (reg) - { - case 0x0000: return (byte)_lastWrittenRegister; - case 0x0001: return (byte)_lastWrittenRegister; - case 0x0002: - return (byte)PPUSTATUS; - case 0x0003: - return (byte)OAMADDR; - case 0x0004: - return (byte)OAMDATA; - case 0x0005: return (byte)_lastWrittenRegister; - case 0x0006: return (byte)_lastWrittenRegister; - case 0x0007: - return (byte)PPUDATA; - } - throw new NotImplementedException(reg.ToString("X2")); - } - - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public uint GetVRamMirror(long address) - { - long entry; - var table = Math.DivRem(address - 0x2000, 0x400, out entry); - return _vRamMirrorLookup[(int)_emulator.Cartridge.MirroringMode][table] * 0x400 + (uint)entry; - } - - protected override void InitializeMemoryMap() - { - base.InitializeMemoryMap(); - - MapReadHandler(0x2000, 0x2FFF, address => _vRam[GetVRamMirror(address)]); - MapReadHandler(0x3000, 0x3EFF, address => _vRam[GetVRamMirror(address - 0x1000)]); - MapReadHandler(0x3F00, 0x3FFF, address => - { - if (address == 0x3F10 || address == 0x3F14 || address == 0x3F18 || address == 0x3F0C) - { - address -= 0x10; - } - - return _paletteRAM[(address - 0x3F00) & 0x1F]; - }); - - MapWriteHandler(0x2000, 0x2FFF, (address, val) => _vRam[GetVRamMirror(address)] = val); - MapWriteHandler(0x3000, 0x3EFF, (address, val) => _vRam[GetVRamMirror(address - 0x1000)] = val); - MapWriteHandler(0x3F00, 0x3FFF, (address, val) => - { - if (address == 0x3F10 || address == 0x3F14 || address == 0x3F18 || address == 0x3F0C) - { - address -= 0x10; - } - - _paletteRAM[(address - 0x3F00) & 0x1F] = val; - }); - - _emulator.Mapper.InitializeMemoryMap(this); - } - - public void PerformDMA(uint from) - { - //Console.WriteLine("OAM DMA"); - from <<= 8; - for (uint i = 0; i <= 0xFF; i++) - { - _oam[F.OAMAddress] = (byte)_emulator.CPU.ReadByte(from); - from++; - F.OAMAddress++; - } - - _emulator.CPU.Cycle += 513 + _emulator.CPU.Cycle % 2; - } - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Core/PPU.Memory.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Core/PPU.Memory.cs.meta deleted file mode 100644 index cf6d09f..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Core/PPU.Memory.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: fa442177f52c5ff4a805fb4e1a30703b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Core/PPU.Registers.cs b/AxibugEmuOnline.Client/Assets/Runtime/Core/PPU.Registers.cs deleted file mode 100644 index 338d1dc..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Core/PPU.Registers.cs +++ /dev/null @@ -1,261 +0,0 @@ -using System; - -namespace AxibugEmuOnline.Client.UNES -{ - partial class PPU - { - public class PPUFlags - { - /* PPUCTRL register */ - public bool NMIEnabled; - public bool IsMaster; - public bool TallSpritesEnabled; - public uint PatternTableAddress; - public uint SpriteTableAddress; - public uint VRAMIncrement; - - /* PPUMASK register */ - public bool GrayscaleEnabled; - public bool DrawLeftBackground; - public bool DrawLeftSprites; - public bool DrawBackground; - public bool DrawSprites; - // Flipped for PAL/Dendy - public bool EmphasizeRed; - public bool EmphasizeGreen; - public bool EmphasizeBlue; - - /* PPUSTATUS register */ - public bool VBlankStarted; - public bool Sprite0Hit; - public bool SpriteOverflow; - public bool AddressLatch; - - /* PPUADDR register */ - private uint _busAddress; - public uint BusAddress - { - get => _busAddress; - set => _busAddress = value & 0x3FFF; - } - - /* PPUDATA register */ - public uint BusData; - - /* OAMADDR register */ - private uint _oamAddress; - public uint OAMAddress - { - get => _oamAddress; - set => _oamAddress = value & 0xFF; - } - - /* PPUSCROLL registers */ - [Obsolete] - public uint ScrollX; - [Obsolete] - public uint ScrollY; - - public bool RenderingEnabled => DrawBackground || DrawSprites; - } - - public PPUFlags F = new PPUFlags(); - - private uint _v; - public uint V - { - get => _v; - set => _v = value & 0x7FFF; - } - public uint T, X; - - public uint CoarseX => V & 0x1F; - - public uint CoarseY => (V >> 5) & 0x1F; - - public uint FineY => (V >> 12) & 0x7; - - public void ReloadScrollX() => V = (V & 0xFBE0) | (T & 0x041F); - - public void ReloadScrollY() => V = (V & 0x841F) | (T & 0x7BE0); - - public void IncrementScrollX() - { - if ((V & 0x001F) == 31) // if coarse X == 31 - { - V &= ~0x001Fu; // coarse X = 0 - V ^= 0x0400; // switch horizontal nametable - } - else - { - V += 1; // increment coarse X - } - } - - public void IncrementScrollY() - { - if ((V & 0x7000) != 0x7000) // if fine Y < 7 - { - V += 0x1000; // increment fine Y - } - else - { - V &= ~0x7000u; // fine Y = 0 - - uint y = (V & 0x03E0) >> 5; // let y = coarse Y - if (y == 29) - { - y = 0; // coarse Y = 0 - V ^= 0x0800; - } - // switch vertical nametable - else if (y == 31) - { - y = 0; // coarse Y = 0, nametable not switched - } - else - { - y += 1; // increment coarse Y - } - - V = (V & ~0x03E0u) | (y << 5); // put coarse Y back into v - } - } - - public uint PPUCTRL - { - set - { - F.NMIEnabled = (value & 0x80) > 0; - F.IsMaster = (value & 0x40) > 0; - F.TallSpritesEnabled = (value & 0x20) > 0; - F.PatternTableAddress = (value & 0x10) > 0 ? 0x1000u : 0x0000; - F.SpriteTableAddress = (value & 0x08) > 0 ? 0x1000u : 0x0000; - F.VRAMIncrement = (value & 0x04) > 0 ? 32u : 1; - // yyy NN YYYYY XXXXX - // ||| || ||||| +++++--coarse X scroll - // ||| || +++++--------coarse Y scroll - // ||| ++--------------nametable select - // +++-----------------fine Y scroll - T = (T & 0xF3FF) | ((value & 0x3) << 10); // Bits 10-11 hold the base address of the nametable minus $2000 - } - } - - public uint PPUMASK - { - set - { - F.GrayscaleEnabled = (value & 0x1) > 0; - F.DrawLeftBackground = (value & 0x2) > 0; - F.DrawLeftSprites = (value & 0x4) > 0; - F.DrawBackground = (value & 0x8) > 0; - F.DrawSprites = (value & 0x10) > 0; - F.EmphasizeRed = (value & 0x20) > 0; - F.EmphasizeGreen = (value & 0x40) > 0; - F.EmphasizeBlue = (value & 0x80) > 0; - } - } - - /** $2002 **/ - public uint PPUSTATUS - { - get - { - F.AddressLatch = false; - var ret = (F.VBlankStarted.AsByte() << 7) | - (F.Sprite0Hit.AsByte() << 6) | - (F.SpriteOverflow.AsByte() << 5) | - (_lastWrittenRegister & 0x1F); - F.VBlankStarted = false; - return (uint)ret; - } - } - - /** $2006 **/ - public uint PPUADDR - { - set - { - if (F.AddressLatch) - { - T = (T & 0xFF00) | value; - F.BusAddress = T; - V = T; - } - else - { - T = (T & 0x80FF) | ((value & 0x3F) << 8); - } - - F.AddressLatch ^= true; - } - } - - /** $2005 **/ - public uint PPUSCROLL - { - set - { - if (F.AddressLatch) - { - F.ScrollY = value; - T = (T & 0x8FFF) | ((value & 0x7) << 12); - T = (T & 0xFC1F) | (value & 0xF8) << 2; - } - else - { - F.ScrollX = value; - X = value & 0x7; - T = (T & 0xFFE0) | (value >> 3); - } - - F.AddressLatch ^= true; - } - } - - private uint _readBuffer; - public uint PPUDATA - { - get - { - uint ret = ReadByte(F.BusAddress); - if (F.BusAddress < 0x3F00) - { - uint temp = _readBuffer; - _readBuffer = ret; - ret = temp; - } - else - { - // Palette read should also read VRAM into read buffer - _readBuffer = ReadByte(F.BusAddress - 0x1000); - } - - F.BusAddress += F.VRAMIncrement; - return ret; - } - set - { - F.BusData = value; - WriteByte(F.BusAddress, value); - F.BusAddress += F.VRAMIncrement; - } - } - - public uint OAMADDR - { - get => F.OAMAddress; - set => F.OAMAddress = value; - } - - public uint OAMDATA - { - get => _oam[F.OAMAddress]; - set - { - _oam[F.OAMAddress] = (byte)value; - F.OAMAddress++; - } - } - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Core/PPU.Registers.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Core/PPU.Registers.cs.meta deleted file mode 100644 index 24948ac..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Core/PPU.Registers.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0db554be3f472c940bde6ce34fc9ed7e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Core/PPU.cs b/AxibugEmuOnline.Client/Assets/Runtime/Core/PPU.cs deleted file mode 100644 index bd1fdb2..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Core/PPU.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace AxibugEmuOnline.Client.UNES -{ - public sealed partial class PPU : Addressable - { - public PPU(Emulator emulator) : base(emulator, 0x3FFF) - { - InitializeMemoryMap(); - } - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Core/PPU.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Core/PPU.cs.meta deleted file mode 100644 index 5006815..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Core/PPU.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: bd14757720b242e4b92425c9d6aae16a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Core/Utility.cs b/AxibugEmuOnline.Client/Assets/Runtime/Core/Utility.cs deleted file mode 100644 index 0455b41..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Core/Utility.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Runtime.CompilerServices; - -namespace AxibugEmuOnline.Client.UNES -{ - public static class Utility - { - [MethodImpl(MethodImplOptions.AggressiveInlining)] - public static byte AsByte(this bool to) - { - unsafe - { - var result = *((byte*) &to); - return result; - } - } - - public static void Fill(this T[] arr, T value) - { - for (var i = 0; i < arr.Length; i++) - { - arr[i] = value; - } - } - - public static void Map(this IEnumerable enumerator, Action go) - { - foreach (var e in enumerator) - { - go(e); - } - } - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Core/Utility.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Core/Utility.cs.meta deleted file mode 100644 index 2d1f3ff..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Core/Utility.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b326828d1b42abc419d9fe125eed8205 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Input/BaseInput.cs b/AxibugEmuOnline.Client/Assets/Runtime/Input/BaseInput.cs deleted file mode 100644 index 1a96398..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Input/BaseInput.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using UnityEngine; - -namespace AxibugEmuOnline.Client.UNES.Input -{ - public abstract class BaseInput - { - public abstract void HandlerKeyDown(Action onKeyDown); - public abstract void HandlerKeyUp(Action onKeyUp); - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Input/BaseInput.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Input/BaseInput.cs.meta deleted file mode 100644 index fefd734..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Input/BaseInput.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b60ded3f5a662a14a8a50795bae8121b -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Input/DefaultInput.cs b/AxibugEmuOnline.Client/Assets/Runtime/Input/DefaultInput.cs deleted file mode 100644 index 43cbb96..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Input/DefaultInput.cs +++ /dev/null @@ -1,49 +0,0 @@ -using System; -using UnityEngine; - -namespace AxibugEmuOnline.Client.UNES.Input -{ - public class DefaultInput : BaseInput - { - private KeyCode[] _keyCodes - { - get - { - if (_keyCodeCache == null) - { - var array = Enum.GetValues(typeof(KeyCode)); - _keyCodeCache = new KeyCode[array.Length]; - for (var i = 0; i < array.Length; i++) - { - _keyCodeCache[i] = (KeyCode)array.GetValue(i); - } - } - - return _keyCodeCache; - } - } - private KeyCode[] _keyCodeCache; - - public override void HandlerKeyDown(Action onKeyDown) - { - foreach (var keyCode in _keyCodes) - { - if (UnityEngine.Input.GetKeyDown(keyCode)) - { - onKeyDown(keyCode); - } - } - } - - public override void HandlerKeyUp(Action onKeyUp) - { - foreach (var keyCode in _keyCodes) - { - if (UnityEngine.Input.GetKeyUp(keyCode)) - { - onKeyUp(keyCode); - } - } - } - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Input/DefaultInput.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Input/DefaultInput.cs.meta deleted file mode 100644 index 01b9f33..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Input/DefaultInput.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 028fda8a78366f347b421062b3604d20 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper.meta b/AxibugEmuOnline.Client/Assets/Runtime/Mapper.meta deleted file mode 100644 index f05ed2d..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d22acc98b0a7fa042bb19b9894899fb7 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/AxROM.cs b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/AxROM.cs deleted file mode 100644 index 76e4b7b..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/AxROM.cs +++ /dev/null @@ -1,26 +0,0 @@ -using static AxibugEmuOnline.Client.UNES.Cartridge.VRAMMirroringMode; - -namespace AxibugEmuOnline.Client.UNES.Mapper -{ - [MapperDef(7)] - public class AxROM : BaseMapper - { - protected int _bankOffset; - private readonly Cartridge.VRAMMirroringMode[] _mirroringModes = { Lower, Upper }; - - public AxROM(Emulator emulator) : base(emulator) - { - _emulator.Cartridge.MirroringMode = _mirroringModes[0]; - } - - public override void InitializeMemoryMap(CPU cpu) - { - cpu.MapReadHandler(0x8000, 0xFFFF, address => _prgROM[_bankOffset + (address - 0x8000)]); - cpu.MapWriteHandler(0x8000, 0xFFFF, (address, val) => - { - _bankOffset = (val & 0x7) * 0x8000; - _emulator.Cartridge.MirroringMode = _mirroringModes[(val >> 4) & 0x1]; - }); - } - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/AxROM.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/AxROM.cs.meta deleted file mode 100644 index 67ab997..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/AxROM.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 632b907c0f30abb47b218545e40ff06d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/BaseMapper.cs b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/BaseMapper.cs deleted file mode 100644 index 05d3e3f..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/BaseMapper.cs +++ /dev/null @@ -1,67 +0,0 @@ -using System; -using System.IO; - -namespace AxibugEmuOnline.Client.UNES.Mapper -{ - [AttributeUsage(AttributeTargets.Class, Inherited = false)] - public class MapperDef : Attribute - { - public int Id; - public string Name; - public string Description; - - public MapperDef() - { - - } - - public MapperDef(int id) - { - Id = id; - } - } - - public abstract class BaseMapper - { - protected readonly Emulator _emulator; - protected readonly byte[] _prgROM; - protected readonly byte[] _prgRAM = new byte[0x2000]; - protected readonly byte[] _chrROM; - protected readonly uint _lastBankOffset; - - protected BaseMapper(Emulator emulator) - { - _emulator = emulator; - var cart = emulator.Cartridge; - _prgROM = cart.PRGROM; - _chrROM = cart.CHRROM; - _lastBankOffset = (uint) _prgROM.Length - 0x4000; - } - - public virtual void InitializeMemoryMap(CPU cpu) - { - - } - - public virtual void InitializeMemoryMap(PPU ppu) - { - ppu.MapReadHandler(0x0000, 0x1FFF, address => _chrROM[address]); - ppu.MapWriteHandler(0x0000, 0x1FFF, (address, val) => _chrROM[address] = val); - } - - public virtual void ProcessCycle(int scanLine, int cycle) - { - - } - - public virtual byte[] GetSaveData() - { - return _prgRAM; - } - - public virtual void LoadSaveData(byte[] saveData) - { - Array.Copy(saveData, _prgRAM, saveData.Length); - } - } -} \ No newline at end of file diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/BaseMapper.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/BaseMapper.cs.meta deleted file mode 100644 index 6e44d0d..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/BaseMapper.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a468573a1ef266542a055638aeef33cb -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/CNROM.cs b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/CNROM.cs deleted file mode 100644 index 0ac1eda..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/CNROM.cs +++ /dev/null @@ -1,32 +0,0 @@ -namespace AxibugEmuOnline.Client.UNES.Mapper -{ - [MapperDef(3)] - public class CNROM : BaseMapper - { - protected int _bankOffset; - - public CNROM(Emulator emulator) : base(emulator) - { - } - - public override void InitializeMemoryMap(PPU ppu) - { - ppu.MapReadHandler(0x0000, 0x1FFF, address => _chrROM[_bankOffset + address]); - } - - public override void InitializeMemoryMap(CPU cpu) - { - if (_prgROM.Length == 0x8000) - { - cpu.MapReadHandler(0x8000, 0xFFFF, address => _prgROM[address - 0x8000]); - } - else - { - cpu.MapReadHandler(0x8000, 0xBFFF, address => _prgROM[address - 0x8000]); - cpu.MapReadHandler(0xC000, 0xFFFF, address => _prgROM[address - 0xC000]); - } - - cpu.MapWriteHandler(0x8000, 0xFFFF, (address, val) => _bankOffset = (val & 0x3) * 0x2000); - } - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/CNROM.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/CNROM.cs.meta deleted file mode 100644 index 15d040c..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/CNROM.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: fdaa43625af49e54aacf69d2ed92544f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Camerica.cs b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Camerica.cs deleted file mode 100644 index 8f0cf99..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Camerica.cs +++ /dev/null @@ -1,27 +0,0 @@ -namespace AxibugEmuOnline.Client.UNES.Mapper -{ - [MapperDef(71)] - public class Camerica : BaseMapper - { - protected int _prgBankOffset; - - public Camerica(Emulator emulator) : base(emulator) - { - } - - public override void InitializeMemoryMap(CPU cpu) - { - cpu.MapReadHandler(0x8000, 0xBFFF, address => _prgROM[_prgBankOffset + (address - 0x8000)]); - cpu.MapReadHandler(0xC000, 0xFFFF, address => _prgROM[_prgROM.Length - 0x4000 + (address - 0xC000)]); - - // Actually starts at 0x8000, but use 0x9000 for compatibility w/o submapper - cpu.MapWriteHandler(0x9000, 0x9FFF, (address, val) => - { - // TODO: Fire Hawk mirroring - }); - - // The number of bits available vary: 4 for the BF9093, 3 for the BF9097, and 2 for the BF9096. - cpu.MapWriteHandler(0xC000, 0xFFFF, (address, val) => _prgBankOffset = (val & 0xF) * 0x4000 % _prgROM.Length); - } - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Camerica.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Camerica.cs.meta deleted file mode 100644 index 2d735de..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Camerica.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a879b12017bd97949a00317043b96f54 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/ColorDreams.cs b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/ColorDreams.cs deleted file mode 100644 index fae07ee..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/ColorDreams.cs +++ /dev/null @@ -1,29 +0,0 @@ -namespace AxibugEmuOnline.Client.UNES.Mapper -{ - [MapperDef(11)] - public class ColorDreams : BaseMapper - { - protected int _prgBankOffset; - protected int _chrBankOffset; - - public ColorDreams(Emulator emulator) : base(emulator) - { - } - - public override void InitializeMemoryMap(PPU ppu) - { - ppu.MapReadHandler(0x0000, 0x1FFF, address => _chrROM[_chrBankOffset + address]); - } - - public override void InitializeMemoryMap(CPU cpu) - { - cpu.MapReadHandler(0x8000, 0xFFFF, address => _prgROM[_prgBankOffset + (address - 0x8000)]); - - cpu.MapWriteHandler(0x8000, 0xFFFF, (address, val) => - { - _prgBankOffset = (val & 0x3) * 0x8000; - _chrBankOffset = (val >> 4) * 0x2000; - }); - } - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/ColorDreams.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/ColorDreams.cs.meta deleted file mode 100644 index 172a6aa..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/ColorDreams.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 50a4c8ff195db574585c43ba079d8195 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/DxROM.cs b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/DxROM.cs deleted file mode 100644 index b4f8c62..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/DxROM.cs +++ /dev/null @@ -1,39 +0,0 @@ -namespace AxibugEmuOnline.Client.UNES.Mapper -{ - [MapperDef(206)] - public class DxROM : MMC3 - { - public DxROM(Emulator emulator) : base(emulator) - { - _prgBankingMode = PRGBankingMode.SwitchFix; - _chrBankingMode = CHRBankingMode.TwoFour; - } - - public override void InitializeMemoryMap(CPU cpu) - { - cpu.MapReadHandler(0x8000, 0xFFFF, address => _prgROM[_prgBankOffsets[(address - 0x8000) / 0x2000] + address % 0x2000]); - - cpu.MapWriteHandler(0x8000, 0x9FFF, (address, val) => - { - if ((address & 0x1) == 0) - { - _currentBank = val & 0x7u; - } - else - { - if (_currentBank <= 1) val &= 0x1F; - else if (_currentBank <= 5) val &= 0x3F; - else val &= 0xF; - - _banks[_currentBank] = val; - UpdateOffsets(); - } - }); - } - - public override void InitializeMemoryMap(PPU ppu) - { - ppu.MapReadHandler(0x0000, 0x1FFF, address => _chrROM[_chrBankOffsets[address / 0x400] + address % 0x400]); - } - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/DxROM.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/DxROM.cs.meta deleted file mode 100644 index dd2b1c3..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/DxROM.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b8ae98e170ab70143bc7284dc01b9627 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/GxROM.cs b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/GxROM.cs deleted file mode 100644 index 92a063a..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/GxROM.cs +++ /dev/null @@ -1,29 +0,0 @@ -namespace AxibugEmuOnline.Client.UNES.Mapper -{ - [MapperDef(66)] - public class GxROM : BaseMapper - { - protected int _prgBankOffset; - protected int _chrBankOffset; - - public GxROM(Emulator emulator) : base(emulator) - { - } - - public override void InitializeMemoryMap(PPU ppu) - { - ppu.MapReadHandler(0x0000, 0x1FFF, address => _chrROM[_chrBankOffset + address]); - } - - public override void InitializeMemoryMap(CPU cpu) - { - cpu.MapReadHandler(0x8000, 0xFFFF, address => _prgROM[_prgBankOffset + (address - 0x8000)]); - - cpu.MapWriteHandler(0x8000, 0xFFFF, (address, val) => - { - _prgBankOffset = ((val >> 4) & 0x3) * 0x8000; - _chrBankOffset = (val & 0x3) * 0x2000; - }); - } - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/GxROM.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/GxROM.cs.meta deleted file mode 100644 index 2810704..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/GxROM.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9a06e1a753215b64886b90ecde825cec -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Jaleco.cs b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Jaleco.cs deleted file mode 100644 index b85b047..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Jaleco.cs +++ /dev/null @@ -1,29 +0,0 @@ -namespace AxibugEmuOnline.Client.UNES.Mapper -{ - [MapperDef(140)] - public class Jaleco : BaseMapper - { - protected int _prgBankOffset; - protected int _chrBankOffset; - - public Jaleco(Emulator emulator) : base(emulator) - { - } - - public override void InitializeMemoryMap(PPU ppu) - { - ppu.MapReadHandler(0x0000, 0x1FFF, address => _chrROM[_chrBankOffset + address]); - } - - public override void InitializeMemoryMap(CPU cpu) - { - cpu.MapReadHandler(0x8000, 0xFFFF, address => _prgROM[_prgBankOffset + (address - 0x8000)]); - - cpu.MapWriteHandler(0x6000, 0x7FFF, (address, val) => - { - _prgBankOffset = ((val >> 4) & 0x3) * 0x8000; - _chrBankOffset = (val & 0x3) * 0x2000; - }); - } - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Jaleco.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Jaleco.cs.meta deleted file mode 100644 index 836c62f..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Jaleco.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ac2f62d216cf70643919c921900c6e70 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/MMC1.cs b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/MMC1.cs deleted file mode 100644 index a420edf..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/MMC1.cs +++ /dev/null @@ -1,170 +0,0 @@ -using static AxibugEmuOnline.Client.UNES.Cartridge.VRAMMirroringMode; - -namespace AxibugEmuOnline.Client.UNES.Mapper -{ - [MapperDef(1)] - public class MMC1 : BaseMapper - { - // TODO: are MMC1 and MMC1A even different chip types? - public enum ChipType { MMC1, MMC1A, MMC1B, MMC1C } - public enum CHRBankingMode { Single, Double } - public enum PRGBankingMode { Switch32Kb, Switch16KbFixFirst, Switch16KbFixLast } - - private readonly Cartridge.VRAMMirroringMode[] _mirroringModes = { Lower, Upper, Vertical, Horizontal }; - - private readonly ChipType _type; - private CHRBankingMode _chrBankingMode; - private PRGBankingMode _prgBankingMode; - - private uint _serialData; - private int _serialPos; - - private uint _control; - - private readonly uint[] _chrBankOffsets = new uint[2]; - private readonly uint[] _chrBanks = new uint[2]; - - private readonly uint[] _prgBankOffsets = new uint[2]; - private uint _prgBank; - - private bool _prgRAMEnabled; - - private uint? _lastWritePC; - - public MMC1(Emulator emulator) : this(emulator, ChipType.MMC1B) - { - - } - - public MMC1(Emulator emulator, ChipType chipType) : base(emulator) - { - _type = chipType; - if (chipType == ChipType.MMC1B) _prgRAMEnabled = true; - UpdateControl(0x0F); - _emulator.Cartridge.MirroringMode = Horizontal; - } - - public override void InitializeMemoryMap(CPU cpu) - { - cpu.MapReadHandler(0x6000, 0x7FFF, address => _prgRAM[address - 0x6000]); - cpu.MapReadHandler(0x8000, 0xFFFF, address => _prgROM[_prgBankOffsets[(address - 0x8000) / 0x4000] + address % 0x4000]); - - cpu.MapWriteHandler(0x6000, 0x7FFF, (address, val) => - { - // PRG RAM is always enabled on MMC1A - if (_type == ChipType.MMC1A || _prgRAMEnabled) - _prgRAM[address - 0x6000] = val; - }); - - cpu.MapWriteHandler(0x8000, 0xFFFF, (address, val) => - { - // Explicitly ignore the second write happening on consecutive cycles - // of an RMW instruction - var cycle = _emulator.CPU.PC; - if (cycle == _lastWritePC) - return; - _lastWritePC = cycle; - - if ((val & 0x80) > 0) - { - _serialData = 0; - _serialPos = 0; - UpdateControl(_control | 0x0C); - } - else - { - _serialData |= (uint)((val & 0x1) << _serialPos); - _serialPos++; - - if (_serialPos == 5) - { - // Address is incompletely decoded - address &= 0x6000; - if (address == 0x0000) - UpdateControl(_serialData); - else if (address == 0x2000) - UpdateCHRBank(0, _serialData); - else if (address == 0x4000) - UpdateCHRBank(1, _serialData); - else if (address == 0x6000) - UpdatePRGBank(_serialData); - - _serialData = 0; - _serialPos = 0; - } - } - }); - } - - public override void InitializeMemoryMap(PPU ppu) - { - ppu.MapReadHandler(0x0000, 0x1FFF, address => _chrROM[_chrBankOffsets[address / 0x1000] + address % 0x1000]); - ppu.MapWriteHandler(0x0000, 0x1FFF, (address, val) => _chrROM[_chrBankOffsets[address / 0x1000] + address % 0x1000] = val); - } - - private void UpdateControl(uint value) - { - _control = value; - - _emulator.Cartridge.MirroringMode = _mirroringModes[value & 0x3]; - - _chrBankingMode = (CHRBankingMode)((value >> 4) & 0x1); - - var prgMode = (value >> 2) & 0x3; - // Both 0 and 1 are 32Kb switch - if (prgMode == 0) prgMode = 1; - _prgBankingMode = (PRGBankingMode)(prgMode - 1); - - UpdateCHRBank(1, _chrBanks[1]); - UpdateCHRBank(0, _chrBanks[0]); - UpdatePRGBank(_prgBank); - } - - private void UpdatePRGBank(uint value) - { - _prgBank = value; - - _prgRAMEnabled = (value & 0x10) == 0; - value &= 0xF; - - switch (_prgBankingMode) - { - case PRGBankingMode.Switch32Kb: - value >>= 1; - value *= 0x4000; - _prgBankOffsets[0] = value; - _prgBankOffsets[1] = value + 0x4000; - break; - case PRGBankingMode.Switch16KbFixFirst: - _prgBankOffsets[0] = 0; - _prgBankOffsets[1] = value * 0x4000; - break; - case PRGBankingMode.Switch16KbFixLast: - _prgBankOffsets[0] = value * 0x4000; - _prgBankOffsets[1] = _lastBankOffset; - break; - } - } - - private void UpdateCHRBank(uint bank, uint value) - { - _chrBanks[bank] = value; - - // TODO FIXME: I feel like this branch should only be taken - // when bank == 0, but this breaks Final Fantasy - // When can banking mode change without UpdateCHRBank being called? - if (_chrBankingMode == CHRBankingMode.Single) - { - value = _chrBanks[0]; - value >>= 1; - value *= 0x1000; - _chrBankOffsets[0] = value; - _chrBankOffsets[1] = value + 0x1000; - } - else - { - _chrBankOffsets[bank] = value * 0x1000; - } - } - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/MMC1.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/MMC1.cs.meta deleted file mode 100644 index 4c02868..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/MMC1.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d3ab06f7819df254491a7afa6a82bb43 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/MMC2.cs b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/MMC2.cs deleted file mode 100644 index 2aa4a06..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/MMC2.cs +++ /dev/null @@ -1,33 +0,0 @@ -namespace AxibugEmuOnline.Client.UNES.Mapper -{ - [MapperDef(Id = 9, Description = "Mike Tyson's Punch-Out!!")] - public class MMC2 : MMC4 - { - public MMC2(Emulator emulator) : base(emulator) - { - - } - - public override void InitializeMemoryMap(CPU cpu) - { - base.InitializeMemoryMap(cpu); - - cpu.MapReadHandler(0x8000, 0xBFFF, address => _prgROM[_prgBankOffset + (address - 0x8000)]); - cpu.MapReadHandler(0xA000, 0xFFFF, address => _prgROM[_prgROM.Length - 0x4000 - 0x2000 + (address - 0xA000)]); - - cpu.MapWriteHandler(0xA000, 0xAFFF, (address, val) => _prgBankOffset = (val & 0xF) * 0x2000); - } - - protected override void GetLatch(uint address, out uint latch, out bool? on) - { - base.GetLatch(address, out latch, out on); - - // For MMC2, only 0xFD8 and 0xFE8 trigger the latch, - // not the whole range like in MMC4 - if (latch == 0 && (address & 0x3) != 0) - { - on = null; - } - } - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/MMC2.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/MMC2.cs.meta deleted file mode 100644 index 3270f4a..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/MMC2.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 522a51dcf1b92d2498013b4d6f9accb0 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/MMC3.cs b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/MMC3.cs deleted file mode 100644 index ff9bc22..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/MMC3.cs +++ /dev/null @@ -1,182 +0,0 @@ -using static AxibugEmuOnline.Client.UNES.Cartridge.VRAMMirroringMode; - -namespace AxibugEmuOnline.Client.UNES.Mapper -{ - [MapperDef(4)] - public class MMC3 : BaseMapper - { - // Different PRG RAM write/enable controls - public enum ChipType { MMC3, MMC6 } - public enum CHRBankingMode { TwoFour, FourTwo } - public enum PRGBankingMode { SwitchFix, FixSwitch } - - private readonly Cartridge.VRAMMirroringMode[] _mirroringModes = { Vertical, Horizontal }; - - private readonly ChipType _type; - protected CHRBankingMode _chrBankingMode; - protected PRGBankingMode _prgBankingMode; - - - protected readonly uint[] _chrBankOffsets = new uint[8]; - protected uint[] _prgBankOffsets; - protected readonly uint[] _banks = new uint[8]; - protected uint _currentBank; - - private uint _irqReloadValue; - private uint _irqCounter; - protected bool _irqEnabled; - - private bool _prgRAMEnabled; - - public MMC3(Emulator emulator) : this(emulator, ChipType.MMC3) - { - - } - - public MMC3(Emulator emulator, ChipType chipType) : base(emulator) - { - _type = chipType; - _prgBankOffsets = new uint[] { 0, 0x2000, _lastBankOffset, _lastBankOffset + 0x2000 }; - } - - public override void InitializeMemoryMap(CPU cpu) - { - cpu.MapReadHandler(0x6000, 0x7FFF, address => _prgRAM[address - 0x6000]); - cpu.MapReadHandler(0x8000, 0xFFFF, address => _prgROM[_prgBankOffsets[(address - 0x8000) / 0x2000] + address % 0x2000]); - - cpu.MapWriteHandler(0x6000, 0xFFFF, WriteByte); - } - - public override void InitializeMemoryMap(PPU ppu) - { - ppu.MapReadHandler(0x0000, 0x1FFF, address => _chrROM[_chrBankOffsets[address / 0x400] + address % 0x400]); - ppu.MapWriteHandler(0x0000, 0x1FFF, (address, val) => _chrROM[_chrBankOffsets[address / 0x400] + address % 0x400] = val); - } - - public override void ProcessCycle(int scanLine, int cycle) - { - if (_emulator.PPU.F.RenderingEnabled && cycle == 260 && (0 <= scanLine && scanLine < 240 || scanLine == -1)) - { - if (_irqCounter == 0) - { - _irqCounter = _irqReloadValue; - } - else - { - _irqCounter--; - if (_irqEnabled && _irqCounter == 0) - { - _emulator.CPU.TriggerInterrupt(CPU.InterruptType.IRQ); - } - } - } - } - - protected void WriteByte(uint addr, byte value) - { - bool even = (addr & 0x1) == 0; - - if (addr < 0x8000) - { - if (_prgRAMEnabled) - { - _prgRAM[addr - 0x6000] = value; - } - } - else if (addr < 0xA000) - { - if (even) - { - _currentBank = value & 0x7u; - _prgBankingMode = (PRGBankingMode)((value >> 6) & 0x1); - _chrBankingMode = (CHRBankingMode)((value >> 7) & 0x1); - } - else - { - _banks[_currentBank] = value; - } - - UpdateOffsets(); - } - else if (addr < 0xC000) - { - if (even) - { - _emulator.Cartridge.MirroringMode = _mirroringModes[value & 0x1]; - } - else - { - _prgRAMEnabled = (value & 0xC0) == 0x80; - } - } - else if (addr < 0xE000) - { - if (even) - { - _irqReloadValue = value; - } - else - { - _irqCounter = 0; - } - } - else - { - _irqEnabled = !even; - } - } - - protected void UpdateOffsets() - { - switch (_prgBankingMode) - { - case PRGBankingMode.SwitchFix: - _prgBankOffsets[0] = _banks[6] * 0x2000; - _prgBankOffsets[1] = _banks[7] * 0x2000; - _prgBankOffsets[2] = _lastBankOffset; - _prgBankOffsets[3] = _lastBankOffset + 0x2000; - break; - case PRGBankingMode.FixSwitch: - _prgBankOffsets[0] = _lastBankOffset; - _prgBankOffsets[1] = _banks[7] * 0x2000; - _prgBankOffsets[2] = _banks[6] * 0x2000; - _prgBankOffsets[3] = _lastBankOffset + 0x2000; - break; - } - - switch (_chrBankingMode) - { - case CHRBankingMode.TwoFour: - _chrBankOffsets[0] = _banks[0] & 0xFE; - _chrBankOffsets[1] = _banks[0] | 0x01; - _chrBankOffsets[2] = _banks[1] & 0xFE; - _chrBankOffsets[3] = _banks[1] | 0x01; - _chrBankOffsets[4] = _banks[2]; - _chrBankOffsets[5] = _banks[3]; - _chrBankOffsets[6] = _banks[4]; - _chrBankOffsets[7] = _banks[5]; - break; - case CHRBankingMode.FourTwo: - _chrBankOffsets[0] = _banks[2]; - _chrBankOffsets[1] = _banks[3]; - _chrBankOffsets[2] = _banks[4]; - _chrBankOffsets[3] = _banks[5]; - _chrBankOffsets[4] = _banks[0] & 0xFE; - _chrBankOffsets[5] = _banks[0] | 0x01; - _chrBankOffsets[6] = _banks[1] & 0xFE; - _chrBankOffsets[7] = _banks[1] | 0x01; - break; - } - - for (var i = 0; i < _prgBankOffsets.Length; i++) - { - _prgBankOffsets[i] %= (uint)_prgROM.Length; - } - - for (var i = 0; i < _chrBankOffsets.Length; i++) - { - _chrBankOffsets[i] = (uint) (_chrBankOffsets[i] * 0x400 % _chrROM.Length); - } - } - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/MMC3.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/MMC3.cs.meta deleted file mode 100644 index 0adfec7..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/MMC3.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 82fb09fbeba58ae458f58e52898fedb1 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/MMC4.cs b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/MMC4.cs deleted file mode 100644 index 9d817e1..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/MMC4.cs +++ /dev/null @@ -1,73 +0,0 @@ -using static AxibugEmuOnline.Client.UNES.Cartridge.VRAMMirroringMode; - -namespace AxibugEmuOnline.Client.UNES.Mapper -{ - [MapperDef(10)] - public class MMC4 : BaseMapper - { - protected readonly Cartridge.VRAMMirroringMode[] _mirroringModes = { Vertical, Horizontal }; - - protected int _prgBankOffset; - protected int[,] _chrBankOffsets = new int[2, 2]; - protected bool[] _latches = new bool[2]; - - public MMC4(Emulator emulator) : base(emulator) - { - } - - public override void InitializeMemoryMap(CPU cpu) - { - cpu.MapReadHandler(0x6000, 0x7FFF, address => _prgRAM[address - 0x6000]); - cpu.MapReadHandler(0x8000, 0xBFFF, address => _prgROM[_prgBankOffset + (address - 0x8000)]); - cpu.MapReadHandler(0xC000, 0xFFFF, address => _prgROM[_prgROM.Length - 0x4000 + (address - 0xC000)]); - - cpu.MapWriteHandler(0x6000, 0x7FFF, (address, val) => _prgRAM[address - 0x6000] = val); - cpu.MapWriteHandler(0xA000, 0xAFFF, (address, val) => _prgBankOffset = (val & 0xF) * 0x4000); - cpu.MapWriteHandler(0xB000, 0xEFFF, (address, val) => - { - var bank = (address - 0xB000) / 0x2000; - var latch = ((address & 0x1FFF) == 0).AsByte(); - _chrBankOffsets[bank, latch] = (val & 0x1F) * 0x1000; - }); - - cpu.MapWriteHandler(0xF000, 0xFFFF, (address, val) => _emulator.Cartridge.MirroringMode = _mirroringModes[val & 0x1]); - } - - public override void InitializeMemoryMap(PPU ppu) - { - ppu.MapReadHandler(0x0000, 0x1FFF, address => - { - var bank = address / 0x1000; - var ret = _chrROM[_chrBankOffsets[bank, _latches[bank].AsByte()] + address % 0x1000]; - if ((address & 0x08) > 0) - { - GetLatch(address, out uint latch, out bool? on); - - if (on != null) - { - _latches[latch] = (bool)on; - } - } - - return ret; - }); - } - - protected virtual void GetLatch(uint address, out uint latch, out bool? on) - { - latch = (address >> 12) & 0x1; - on = null; - - address = (address >> 4) & 0xFF; - - if (address == 0xFE) - { - on = true; - } - else if (address == 0xFD) - { - on = false; - } - } - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/MMC4.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/MMC4.cs.meta deleted file mode 100644 index 81f2dfe..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/MMC4.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 54d8f341641616d45b20c65ec4a75ff2 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Mapper094.cs b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Mapper094.cs deleted file mode 100644 index 4baaefe..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Mapper094.cs +++ /dev/null @@ -1,17 +0,0 @@ -namespace AxibugEmuOnline.Client.UNES.Mapper -{ - [MapperDef(Id = 94, Description = "Senjou no Ookami")] - public class Mapper094 : UxROM - { - public Mapper094(Emulator emulator) : base(emulator) - { - } - - public override void InitializeMemoryMap(CPU cpu) - { - base.InitializeMemoryMap(cpu); - - cpu.MapWriteHandler(0x8000, 0xFFFF, (address, val) => _bankOffset = (val & 0x1C) << 12); - } - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Mapper094.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Mapper094.cs.meta deleted file mode 100644 index 70a9d00..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Mapper094.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0abeb567769f715418ae9125bd029206 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Mapper155.cs b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Mapper155.cs deleted file mode 100644 index 44fb15b..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Mapper155.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace AxibugEmuOnline.Client.UNES.Mapper -{ - [MapperDef(Id = 155, Description = "MMC1A")] - public class Mapper155 : MMC1 - { - // Mapper for games requiring MMC1A - public Mapper155(Emulator emulator) : base(emulator, ChipType.MMC1A) - { - } - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Mapper155.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Mapper155.cs.meta deleted file mode 100644 index a775951..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Mapper155.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: dc90c4e04b12a134c884ca3431375aac -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Mapper180.cs b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Mapper180.cs deleted file mode 100644 index e7a81fe..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Mapper180.cs +++ /dev/null @@ -1,21 +0,0 @@ -namespace AxibugEmuOnline.Client.UNES.Mapper -{ - // Mapper used strictly for Crazy Climber; logic is slighly different - [MapperDef(Id = 180, Description = "Crazy Climber")] - public class Mapper180 : UxROM - { - public Mapper180(Emulator emulator) : base(emulator) - { - } - - public override void InitializeMemoryMap(CPU cpu) - { - base.InitializeMemoryMap(cpu); - - // $8000-$C000 is fixed to *first* bank - cpu.MapReadHandler(0x8000, 0xBFFF, address => _prgROM[address - 0x8000]); - // $C000-$FFFF is switchable, controlled the same as UxROM - cpu.MapReadHandler(0xC000, 0xFFFF, address => _prgROM[_bankOffset + (address - 0xC000)]); - } - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Mapper180.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Mapper180.cs.meta deleted file mode 100644 index 41282e8..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Mapper180.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0ed79f8d409c2864bab9bc85848bc36a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/NROM.cs b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/NROM.cs deleted file mode 100644 index bf7ad3d..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/NROM.cs +++ /dev/null @@ -1,23 +0,0 @@ -namespace AxibugEmuOnline.Client.UNES.Mapper -{ - [MapperDef(0)] - public class NROM : BaseMapper - { - private readonly byte[] _addressSpace = new byte[0x2000 + 0x8000]; // Space for $2000 VRAM + $8000 PRG - - public NROM(Emulator emulator) : base(emulator) - { - for (var i = 0; i < 0x8000; i++) - { - var offset = _emulator.Cartridge.PRGROMSize == 0x4000 ? i & 0xBFFF : i; - _addressSpace[0x2000 + i] = _prgROM[offset]; - } - } - - public override void InitializeMemoryMap(CPU cpu) - { - cpu.MapReadHandler(0x6000, 0xFFFF, address => _addressSpace[address - 0x6000]); - cpu.MapWriteHandler(0x6000, 0x7FFF, (address, val) => _addressSpace[address - 0x6000] = val); - } - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/NROM.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/NROM.cs.meta deleted file mode 100644 index f09b0e2..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/NROM.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7781217265cd36043acd57aa3a049d25 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Nina003006.cs b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Nina003006.cs deleted file mode 100644 index d26761b..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Nina003006.cs +++ /dev/null @@ -1,32 +0,0 @@ -namespace AxibugEmuOnline.Client.UNES.Mapper -{ - [MapperDef(79)] - public class Nina003006 : BaseMapper - { - protected int _prgBankOffset; - protected int _chrBankOffset; - - public Nina003006(Emulator emulator) : base(emulator) - { - } - - public override void InitializeMemoryMap(PPU ppu) - { - ppu.MapReadHandler(0x0000, 0x1FFF, address => _chrROM[_chrBankOffset + address]); - } - - public override void InitializeMemoryMap(CPU cpu) - { - cpu.MapReadHandler(0x8000, 0xFFFF, address => _prgROM[_prgBankOffset + (address - 0x8000)]); - - cpu.MapWriteHandler(0x4000, 0x5FFF, (address, val) => - { - if ((address & 0b1110_0001_0000_0000) == 0b0100_0001_0000_0000) - { - _prgBankOffset = ((val >> 4) & 0x3) * 0x8000; - _chrBankOffset = (val & 0x3) * 0x2000; - } - }); - } - } -} \ No newline at end of file diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Nina003006.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Nina003006.cs.meta deleted file mode 100644 index 128d6ad..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/Nina003006.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4a935d078b54a6a4b9434e3478863251 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/UxROM.cs b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/UxROM.cs deleted file mode 100644 index fa24992..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/UxROM.cs +++ /dev/null @@ -1,22 +0,0 @@ -namespace AxibugEmuOnline.Client.UNES.Mapper -{ - [MapperDef(2)] - public class UxROM : BaseMapper - { - protected int _bankOffset; - - public UxROM(Emulator emulator) : base(emulator) - { - } - - public override void InitializeMemoryMap(CPU cpu) - { - cpu.MapReadHandler(0x6000, 0x7FFF, address => _prgRAM[address - 0x6000]); - cpu.MapReadHandler(0x8000, 0xBFFF, address => _prgROM[_bankOffset + (address - 0x8000)]); - cpu.MapReadHandler(0xC000, 0xFFFF, address => _prgROM[_prgROM.Length - 0x4000 + (address - 0xC000)]); - - cpu.MapWriteHandler(0x6000, 0x7FFF, (address, val) => _prgRAM[address - 0x6000] = val); - cpu.MapWriteHandler(0x8000, 0xFFFF, (address, val) => _bankOffset = (val & 0xF) * 0x4000); - } - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/UxROM.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Mapper/UxROM.cs.meta deleted file mode 100644 index 9b0f9dc..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Mapper/UxROM.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9fa6ddb08aec2014fada61a92af067ad -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Renderer.meta b/AxibugEmuOnline.Client/Assets/Runtime/Renderer.meta deleted file mode 100644 index ede6704..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Renderer.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ff3612d2884e82145a83b869175fe872 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Renderer/IRenderer.cs b/AxibugEmuOnline.Client/Assets/Runtime/Renderer/IRenderer.cs deleted file mode 100644 index de133db..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Renderer/IRenderer.cs +++ /dev/null @@ -1,13 +0,0 @@ -namespace AxibugEmuOnline.Client.UNES.Renderer -{ - public interface IRenderer - { - string Name { get; } - - void HandleRender(); - - void Init(UNESBehaviour nes); - - void End(); - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Renderer/IRenderer.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Renderer/IRenderer.cs.meta deleted file mode 100644 index 5bad6e1..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Renderer/IRenderer.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6e02ede35ded0294fb7f13f60387557f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Renderer/UnityRenderer.cs b/AxibugEmuOnline.Client/Assets/Runtime/Renderer/UnityRenderer.cs deleted file mode 100644 index d48923b..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Renderer/UnityRenderer.cs +++ /dev/null @@ -1,71 +0,0 @@ -using System.Runtime.InteropServices; -using UnityEngine; - -namespace AxibugEmuOnline.Client.UNES.Renderer -{ - public class UnityRenderer : IRenderer - { - public UNESBehaviour UnesBehaviour; - public RenderTexture RenderTexture; - - public string Name => "Unity"; - - private Texture2D _drawTexture; - private Color[] _pixelCache; - - private Texture2D _clearTexture; - - public void Init(UNESBehaviour nes) - { - UnesBehaviour = nes; - RenderTexture = nes.RenderTexture; - _drawTexture = new Texture2D(UNESBehaviour.GameWidth, UNESBehaviour.GameHeight); - _pixelCache = new Color[UNESBehaviour.GameWidth * UNESBehaviour.GameHeight]; - - _clearTexture = new Texture2D(1, 1); - _clearTexture.SetPixel(0, 0, Color.clear); - _clearTexture.Apply(); - } - - public void HandleRender() - { - if (RenderTexture.filterMode != UnesBehaviour.FilterMode) - { - RenderTexture.filterMode = UnesBehaviour.FilterMode; - } - - for (var y = 0; y < UNESBehaviour.GameHeight; y++) - { - for (var x = 0; x < UNESBehaviour.GameWidth; x++) - { - var rawIndex = UNESBehaviour.GameWidth * y + x; - var color = GetColor(UnesBehaviour.RawBitmap[rawIndex]); - var texIndex = UNESBehaviour.GameWidth * (UNESBehaviour.GameHeight - y - 1) + x; - _pixelCache[texIndex] = color; - } - } - - _drawTexture.SetPixels(_pixelCache); - _drawTexture.Apply(); - - Graphics.Blit(_drawTexture, RenderTexture); - } - - public Color GetColor(uint value) - { - var r = 0xFF0000 & value; - r >>= 16; - var b = 0xFF & value; - var g = 0xFF00 & value; - g >>= 8; - var color = new Color(r / 255f, g / 255f, b / 255f); - return color; - } - - public void End() - { - Graphics.Blit(_clearTexture, RenderTexture); - } - } -} - diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Renderer/UnityRenderer.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/Renderer/UnityRenderer.cs.meta deleted file mode 100644 index 13e31a8..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/Renderer/UnityRenderer.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1f751adeb00750a43a0d2534a2301da2 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Runtime/UNESBehaviour.cs b/AxibugEmuOnline.Client/Assets/Runtime/UNESBehaviour.cs deleted file mode 100644 index ac1fc93..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/UNESBehaviour.cs +++ /dev/null @@ -1,281 +0,0 @@ -using System; -using System.Diagnostics; -using System.Threading; -using UnityEngine; -using AxibugEmuOnline.Client.UNES.Controller; -using AxibugEmuOnline.Client.UNES.Input; -using AxibugEmuOnline.Client.UNES.Renderer; -using AxibugEmuOnline.Client.ClientCore; -using AxibugEmuOnline.Client.Sample; -using System.Collections.Generic; -using System.Collections; -using System.Linq; - -namespace AxibugEmuOnline.Client.UNES -{ - public class UNESBehaviour : MonoBehaviour - { - [Header("Render")] - public RenderTexture RenderTexture; - public const int GameWidth = 256; - public const int GameHeight = 240; - public FilterMode FilterMode = FilterMode.Point; - public bool LogicThread = true; - - [Header("Input")] - public KeyConfig KeyConfig; - - public BaseInput Input { get; set; } - public IRenderer Renderer { get; set; } - public uint[] RawBitmap { get; set; } = new uint[GameWidth * GameHeight]; - public bool Ready { get; set; } - public bool GameStarted { get; set; } - - private bool _rendererRunning = true; - private IController _controller; - private Emulator _emu; - private bool _suspended; - private Thread _renderThread; - private int _activeSpeed = 1; - - public void Boot(byte[] romData) - { - InitInput(); - InitRenderer(); - BootCartridge(romData); - } - - public void Boot_Obs() - { - InitInput(); - InitRenderer(); - BootCartridge_Obs(); - } - - public void LoadSaveData(byte[] saveData) - { - _emu?.Mapper.LoadSaveData(saveData); - } - - public byte[] GetSaveData() - { - return _emu?.Mapper.GetSaveData(); - } - - Queue _queue = new Queue(); - - - private void BootCartridge(byte[] romData) - { - _emu = new Emulator(romData, _controller); - if (LogicThread) - { - _renderThread = new Thread(() => - { - GameStarted = true; - var s = new Stopwatch(); - var s0 = new Stopwatch(); - while (_rendererRunning) - { - if (_suspended) - { - Thread.Sleep(100); - continue; - } - - s.Restart(); - for (var i = 0; i < 60 && !_suspended; i++) - { - s0.Restart(); - lock (RawBitmap) - { - _emu.PPU.ProcessFrame(); - RawBitmap = _emu.PPU.RawBitmap; - //塞进发送队列 - _queue.Enqueue(_emu.PPU.RawBitmap_paletteIdxCache); - } - - s0.Stop(); - Thread.Sleep(Math.Max((int)(980 / 60.0 - s0.ElapsedMilliseconds), 0) / _activeSpeed); - } - - s.Stop(); - } - }); - - _renderThread.Start(); - } - else - { - GameStarted = true; - } - } - - private void BootCartridge_Obs() - { - if (LogicThread) - { - _renderThread = new Thread(() => - { - GameStarted = true; - var s = new Stopwatch(); - var s0 = new Stopwatch(); - while (_rendererRunning) - { - if (_suspended) - { - Thread.Sleep(100); - continue; - } - - s.Restart(); - for (var i = 0; i < 60 && !_suspended; i++) - { - s0.Restart(); - lock (RawBitmap) - { - RawBitmap = AppAxibugEmuOnline.game.RawBitmap; - } - - s0.Stop(); - Thread.Sleep(Math.Max((int)(980 / 60.0 - s0.ElapsedMilliseconds), 0) / _activeSpeed); - } - - s.Stop(); - } - }); - - _renderThread.Start(); - } - else - { - GameStarted = true; - } - } - - #region Monobehaviour - - public void Awake() - { - } - - public void OnEnable() - { - - } - - public void OnDisable() - { - _rendererRunning = false; - Renderer?.End(); - } - - public void Update() - { - if (!GameStarted) return; - UpdateInput(); - - if (UNESTest.instance.PlayerP1) - { - UpdateRender(); - } - else - { - UpdateRender_Obs(); - } - } - - #endregion - - #region Input - - private void InitInput() - { - _controller = new NesController(this); - Input = new DefaultInput(); - } - - public void UpdateInput() - { - Input.HandlerKeyDown(keyCode => - { - switch (keyCode) - { - case KeyCode.F2: - _suspended = false; - break; - case KeyCode.F3: - _suspended = true; - break; - default: - _controller.PressKey(keyCode); - break; - } - }); - - Input.HandlerKeyUp(keyCode => - { - _controller.ReleaseKey(keyCode); - }); - } - - #endregion - - #region Render - - public void UpdateRender() - { - while (_queue.Count() > 0) - { - //发送 - AppAxibugEmuOnline.game.SendScreen(_queue.Dequeue()); - } - if (!_rendererRunning) return; - if (_suspended) return; - - if (!LogicThread) - { - _emu.PPU.ProcessFrame(); - RawBitmap = _emu.PPU.RawBitmap; - Renderer.HandleRender(); - - } - else - { - lock (RawBitmap) - { - Renderer.HandleRender(); - } - } - } - - public void UpdateRender_Obs() - { - if (!_rendererRunning) return; - if (_suspended) return; - - if (!LogicThread) - { - RawBitmap = AppAxibugEmuOnline.game.RawBitmap; - Renderer.HandleRender(); - } - else - { - lock (RawBitmap) - { - Renderer.HandleRender(); - } - } - } - - private void InitRenderer() - { - Renderer?.End(); - - Renderer = new UnityRenderer(); - Renderer.Init(this); - } - - #endregion - } -} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/UNESBehaviour.cs.meta b/AxibugEmuOnline.Client/Assets/Runtime/UNESBehaviour.cs.meta deleted file mode 100644 index 99998ce..0000000 --- a/AxibugEmuOnline.Client/Assets/Runtime/UNESBehaviour.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 5948479853ec1194497c60babb6bc213 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/Assets/Scene/AxibugEmuOnline.Client.unity b/AxibugEmuOnline.Client/Assets/Scene/AxibugEmuOnline.Client.unity index 40d817e..264e198 100644 --- a/AxibugEmuOnline.Client/Assets/Scene/AxibugEmuOnline.Client.unity +++ b/AxibugEmuOnline.Client/Assets/Scene/AxibugEmuOnline.Client.unity @@ -282,7 +282,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &622947734 GameObject: @@ -535,85 +535,13 @@ RectTransform: m_Children: - {fileID: 622947735} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!1 &1434955706 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1434955708} - - component: {fileID: 1434955709} - - component: {fileID: 1434955707} - m_Layer: 0 - m_Name: UNES - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1434955707 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1434955706} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5948479853ec1194497c60babb6bc213, type: 3} - m_Name: - m_EditorClassIdentifier: - RenderTexture: {fileID: 8400000, guid: 6645567e4c11d9447b1aee2406f681c5, type: 2} - FilterMode: 1 - LogicThread: 1 - KeyConfig: - Up: 119 - Down: 115 - Left: 97 - Right: 100 - A: 107 - B: 106 - Start: 98 - Select: 118 - Debug: 112 ---- !u!4 &1434955708 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1434955706} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1434955709 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1434955706} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8e94e6b3864b9034b89b70aa411a2894, type: 3} - m_Name: - m_EditorClassIdentifier: - RomFile: Mario - PlayerP1: 0 --- !u!1 &1498586261 GameObject: m_ObjectHideFlags: 3 @@ -656,5 +584,5 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/AxibugEmuOnline.Client/Assets/Script/AppAxibugEmuOnline.cs b/AxibugEmuOnline.Client/Assets/Script/AppAxibugEmuOnline.cs index 11c7815..1f45603 100644 --- a/AxibugEmuOnline.Client/Assets/Script/AppAxibugEmuOnline.cs +++ b/AxibugEmuOnline.Client/Assets/Script/AppAxibugEmuOnline.cs @@ -17,7 +17,8 @@ namespace AxibugEmuOnline.Client.ClientCore public static AppLogin login; public static AppChat chat; public static UserDataManager user; - public static AppGame game; + public static AppNetGame netgame; + public static AppEmu emu; public static void Init() { @@ -27,7 +28,8 @@ namespace AxibugEmuOnline.Client.ClientCore login = new AppLogin(); chat = new AppChat(); user = new UserDataManager(); - game = new AppGame(); + emu = new AppEmu(); + netgame = new AppNetGame(); } public static bool Connect(string IP, int port) diff --git a/AxibugEmuOnline.Client/Assets/Aya.UNes.asmdef b/AxibugEmuOnline.Client/Assets/Script/AxibugEmuOnline.Client.asmdef similarity index 86% rename from AxibugEmuOnline.Client/Assets/Aya.UNes.asmdef rename to AxibugEmuOnline.Client/Assets/Script/AxibugEmuOnline.Client.asmdef index dd9bddb..7bdf3cc 100644 --- a/AxibugEmuOnline.Client/Assets/Aya.UNes.asmdef +++ b/AxibugEmuOnline.Client/Assets/Script/AxibugEmuOnline.Client.asmdef @@ -1,5 +1,5 @@ { - "name": "AxibugEmuOnline.Client.UNES", + "name": "AxibugEmuOnline.Client", "references": [], "includePlatforms": [], "excludePlatforms": [], diff --git a/AxibugEmuOnline.Client/Assets/Aya.UNes.asmdef.meta b/AxibugEmuOnline.Client/Assets/Script/AxibugEmuOnline.Client.asmdef.meta similarity index 100% rename from AxibugEmuOnline.Client/Assets/Aya.UNes.asmdef.meta rename to AxibugEmuOnline.Client/Assets/Script/AxibugEmuOnline.Client.asmdef.meta diff --git a/AxibugEmuOnline.Client/Assets/Runtime.meta b/AxibugEmuOnline.Client/Assets/Script/Emu.meta similarity index 77% rename from AxibugEmuOnline.Client/Assets/Runtime.meta rename to AxibugEmuOnline.Client/Assets/Script/Emu.meta index 079a930..92efcfb 100644 --- a/AxibugEmuOnline.Client/Assets/Runtime.meta +++ b/AxibugEmuOnline.Client/Assets/Script/Emu.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ca1eb074eb7f66946b0d974b802d7b8d +guid: 481b76fe04e7dcd4c9d5c89eab10343d folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/AxibugEmuOnline.Client/Assets/Script/Emu/WINSettings.cs b/AxibugEmuOnline.Client/Assets/Script/Emu/WINSettings.cs new file mode 100644 index 0000000..e1f5ade --- /dev/null +++ b/AxibugEmuOnline.Client/Assets/Script/Emu/WINSettings.cs @@ -0,0 +1,100 @@ +using System.Reflection; +using MyNes.Core; + +namespace AxibugEmuOnline.Client +{ + public class WINSettings : ISettings + { + public string App_Version = ""; + + public int Win_Location_X = 10; + + public int Win_Location_Y = 10; + + public int Win_Size_W = 768; + + public int Win_Size_H = 743; + + public bool Win_StartInFullscreen; + + public string[] Misc_RecentFiles = new string[0]; + + public bool PauseEmuWhenFocusLost = true; + + public bool ShowGettingStarted = true; + + public string InterfaceLanguage = "English"; + + public bool ShutdowOnEscapePress = true; + + public bool LoadStateOpenRecent; + + public string Database_FilePath = ""; + + public string[] Database_FoldersSnapshots; + + public string[] Database_FoldersCovers; + + public string[] Database_FoldersInfos; + + public string[] Database_FoldersScanned; + + public bool LauncherRememberLastSelection = true; + + public int LauncherLatestSelection; + + public int LauncherLocationX = 10; + + public int LauncherLocationY = 10; + + public int LauncherSizeW = 1480; + + public int LauncherSizeH = 920; + + public int LauncherSpliter1 = 807; + + public int LauncherSpliter2 = 420; + + public int LauncherSpliter3 = 308; + + public int LauncherSpliter4 = 271; + + public bool LauncherAutoMinimize = true; + + public bool LauncherAutoCycleImagesInGameTab = true; + + public bool LauncherShowAyAppStart; + + public int SnapsView_ImageMode = 1; + + public bool SnapsView_ShowBar = true; + + public bool SnapsView_ShowStatus = true; + + public bool SnapsView_AutoCycle = true; + + public int CoversView_ImageMode = 1; + + public bool CoversView_ShowBar = true; + + public bool CoversView_ShowStatus = true; + + public bool CoversView_AutoCycle = true; + + public WINSettings(string path) + : base(path) + { + } + + public override void LoadSettings() + { + base.LoadSettings(); + if (App_Version != Assembly.GetExecutingAssembly().GetName().Version.ToString()) + { + ShowGettingStarted = true; + App_Version = Assembly.GetExecutingAssembly().GetName().Version.ToString(); + } + } + } + +} \ No newline at end of file diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Controller/NesController.cs.meta b/AxibugEmuOnline.Client/Assets/Script/Emu/WINSettings.cs.meta similarity index 83% rename from AxibugEmuOnline.Client/Assets/Runtime/Controller/NesController.cs.meta rename to AxibugEmuOnline.Client/Assets/Script/Emu/WINSettings.cs.meta index 0582652..49f210d 100644 --- a/AxibugEmuOnline.Client/Assets/Runtime/Controller/NesController.cs.meta +++ b/AxibugEmuOnline.Client/Assets/Script/Emu/WINSettings.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6a6001b2b26e33144b77fe0b02e21dc0 +guid: ed2bba3664d14d840a5ed2847926614c MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/AxibugEmuOnline.Client/Assets/Script/Manager/AppEmu.cs b/AxibugEmuOnline.Client/Assets/Script/Manager/AppEmu.cs new file mode 100644 index 0000000..2e591b6 --- /dev/null +++ b/AxibugEmuOnline.Client/Assets/Script/Manager/AppEmu.cs @@ -0,0 +1,155 @@ +using MyNes.Core; +using Palmmedia.ReportGenerator.Core; +using SevenZip; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.IO; +using System.Threading; + +namespace AxibugEmuOnline.Client.Manager +{ + public class AppEmu + { + INes _nes; + + public static WINSettings Settings { get; private set; } + + private bool isMaxing; + + private bool isMoving; + + private bool pausedByMainWindow; + + private bool isMouseVisible; + + private int mouseHiderCounter; + + private const int mouseHiderReload = 1; + + private bool gameLoaded; + + private IContainer components; + + public AppEmu() + { + } + + public void Init() + { + _nes = new INes(); + } + + internal void LoadGame(string filePath) + { + bool success = false; + switch (Path.GetExtension(filePath).ToLower()) + { + case ".nes": + NesEmu.LoadGame(filePath, out success); + break; + case ".7z": + case ".zip": + case ".rar": + case ".gzip": + case ".tar": + case ".bzip2": + case ".xz": + { + string text = filePath; + string text2 = Path.GetTempPath() + "\\MYNES\\"; + SevenZipExtractor sevenZipExtractor; + try + { + sevenZipExtractor = new SevenZipExtractor(text); + } + catch (Exception ex) + { + MessageBox.Show(Resources.Message35 + ": \n" + ex.Message); + return; + } + if (sevenZipExtractor.ArchiveFileData.Count == 1) + { + if (sevenZipExtractor.ArchiveFileData[0].FileName.Substring(sevenZipExtractor.ArchiveFileData[0].FileName.Length - 4, 4).ToLower() == ".nes") + { + sevenZipExtractor.ExtractArchive(text2); + text = text2 + sevenZipExtractor.ArchiveFileData[0].FileName; + } + } + else + { + List list = new List(); + foreach (ArchiveFileInfo archiveFileDatum in sevenZipExtractor.ArchiveFileData) + { + list.Add(archiveFileDatum.FileName); + } + FormFilesList formFilesList = new FormFilesList(list.ToArray()); + if (formFilesList.ShowDialog(this) != DialogResult.OK) + { + return; + } + string[] fileNames = new string[1] { formFilesList.SelectedRom }; + sevenZipExtractor.ExtractFiles(text2, fileNames); + text = text2 + formFilesList.SelectedRom; + } + NesEmu.LoadGame(text, out success); + break; + } + } + if (success) + { + if (Settings.Misc_RecentFiles == null) + { + Settings.Misc_RecentFiles = new string[0]; + } + List list2 = new List(Settings.Misc_RecentFiles); + if (list2.Contains(filePath)) + { + list2.Remove(filePath); + } + list2.Insert(0, filePath); + if (list2.Count > 19) + { + list2.RemoveAt(list2.Count - 1); + } + Settings.Misc_RecentFiles = list2.ToArray(); + gameLoaded = true; + if (Settings.Win_StartInFullscreen) + { + if (base.WindowState != FormWindowState.Maximized) + { + MyNesMain.VideoProvider.ResizeBegin(); + Thread.Sleep(100); + MyNesMain.RendererSettings.Vid_Fullscreen = true; + base.FormBorderStyle = FormBorderStyle.None; + menuStrip1.Visible = false; + base.WindowState = FormWindowState.Maximized; + MyNesMain.VideoProvider.ResizeEnd(); + } + } + else if (MyNesMain.RendererSettings.Vid_AutoStretch) + { + ApplyStretch(applyRegion: true); + } + } + ApplyWindowTitle(); + } + + + #region Setting + + internal void LoadSettings() + { + base.Location = new Point(Program.Settings.Win_Location_X, Program.Settings.Win_Location_Y); + base.Size = new Size(Program.Settings.Win_Size_W, Program.Settings.Win_Size_H); + for (int i = 0; i < Program.SupportedLanguages.Length / 3; i++) + { + ToolStripMenuItem toolStripMenuItem = new ToolStripMenuItem(); + toolStripMenuItem.Text = Program.SupportedLanguages[i, 2]; + toolStripMenuItem.Checked = Program.SupportedLanguages[i, 0] == Program.Settings.InterfaceLanguage; + interfaceLanguageToolStripMenuItem.DropDownItems.Add(toolStripMenuItem); + } + } + #endregion + } +} diff --git a/AxibugEmuOnline.Client/Assets/Runtime/Core/Addressable.cs.meta b/AxibugEmuOnline.Client/Assets/Script/Manager/AppEmu.cs.meta similarity index 83% rename from AxibugEmuOnline.Client/Assets/Runtime/Core/Addressable.cs.meta rename to AxibugEmuOnline.Client/Assets/Script/Manager/AppEmu.cs.meta index 84e599c..319f723 100644 --- a/AxibugEmuOnline.Client/Assets/Runtime/Core/Addressable.cs.meta +++ b/AxibugEmuOnline.Client/Assets/Script/Manager/AppEmu.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 8649a70e245ed1744aa620cb28504fb5 +guid: 930c8764a7c92fb419e0feccd3b8f1d0 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/AxibugEmuOnline.Client/Assets/Script/Manager/AppGame.cs b/AxibugEmuOnline.Client/Assets/Script/Manager/AppNetGame.cs similarity index 60% rename from AxibugEmuOnline.Client/Assets/Script/Manager/AppGame.cs rename to AxibugEmuOnline.Client/Assets/Script/Manager/AppNetGame.cs index 3258c36..b8339c2 100644 --- a/AxibugEmuOnline.Client/Assets/Script/Manager/AppGame.cs +++ b/AxibugEmuOnline.Client/Assets/Script/Manager/AppNetGame.cs @@ -2,7 +2,6 @@ using AxibugEmuOnline.Client.Common; using AxibugEmuOnline.Client.Network; using AxibugProtobuf; -using AxibugEmuOnline.Client.UNES; using Google.Protobuf; using System.IO; using System.IO.Compression; @@ -10,26 +9,14 @@ using System.Linq; namespace AxibugEmuOnline.Client.Manager { - public class AppGame + public class AppNetGame { - public AppGame() + public AppNetGame() { NetMsg.Instance.RegNetMsgEvent((int)CommandID.CmdScreen, OnScreen); } Protobuf_Screnn_Frame _Protobuf_Screnn_Frame = new Protobuf_Screnn_Frame(); - public uint[] RawBitmap { get; set; } = new uint[UNESBehaviour.GameWidth * UNESBehaviour.GameHeight]; - // TODO: use real chroma/luma decoding - private readonly uint[] _palette = { - 0x7C7C7C, 0x0000FC, 0x0000BC, 0x4428BC, 0x940084, 0xA80020, 0xA81000, 0x881400, - 0x503000, 0x007800, 0x006800, 0x005800, 0x004058, 0x000000, 0x000000, 0x000000, - 0xBCBCBC, 0x0078F8, 0x0058F8, 0x6844FC, 0xD800CC, 0xE40058, 0xF83800, 0xE45C10, - 0xAC7C00, 0x00B800, 0x00A800, 0x00A844, 0x008888, 0x000000, 0x000000, 0x000000, - 0xF8F8F8, 0x3CBCFC, 0x6888FC, 0x9878F8, 0xF878F8, 0xF85898, 0xF87858, 0xFCA044, - 0xF8B800, 0xB8F818, 0x58D854, 0x58F898, 0x00E8D8, 0x787878, 0x000000, 0x000000, - 0xFCFCFC, 0xA4E4FC, 0xB8B8F8, 0xD8B8F8, 0xF8B8F8, 0xF8A4C0, 0xF0D0B0, 0xFCE0A8, - 0xF8D878, 0xD8F878, 0xB8F8B8, 0xB8F8D8, 0x00FCFC, 0xF8D8F8, 0x000000, 0x000000 - }; public void SendScreen(byte[] ScreenData) { byte[] comData = CompressByteArray(ScreenData); @@ -41,14 +28,14 @@ namespace AxibugEmuOnline.Client.Manager public void OnScreen(byte[] reqData) { Protobuf_Screnn_Frame msg = ProtoBufHelper.DeSerizlize(reqData); - lock (RawBitmap) - { - byte[] data = DecompressByteArray(msg.RawBitmap.ToArray()); - for (int i = 0; i < data.Length; i++) - { - RawBitmap[i] = _palette[data[i]]; - } - } + //lock (RawBitmap) + //{ + // byte[] data = DecompressByteArray(msg.RawBitmap.ToArray()); + // for (int i = 0; i < data.Length; i++) + // { + // RawBitmap[i] = _palette[data[i]]; + // } + //} } public static byte[] CompressByteArray(byte[] bytesToCompress) diff --git a/AxibugEmuOnline.Client/Assets/Script/Manager/AppGame.cs.meta b/AxibugEmuOnline.Client/Assets/Script/Manager/AppNetGame.cs.meta similarity index 100% rename from AxibugEmuOnline.Client/Assets/Script/Manager/AppGame.cs.meta rename to AxibugEmuOnline.Client/Assets/Script/Manager/AppNetGame.cs.meta diff --git a/AxibugEmuOnline.Client/Assets/Script/UNESTest.cs b/AxibugEmuOnline.Client/Assets/Script/UNESTest.cs deleted file mode 100644 index 1776792..0000000 --- a/AxibugEmuOnline.Client/Assets/Script/UNESTest.cs +++ /dev/null @@ -1,45 +0,0 @@ -using UnityEngine; -using AxibugEmuOnline.Client.UNES; -using AxibugEmuOnline.Client.ClientCore; - -namespace AxibugEmuOnline.Client.Sample -{ - public class UNESTest : MonoBehaviour - { - public string RomFile; - - public bool PlayerP1; - - public static UNESTest instance; - public UNESBehaviour UNES { get; set; } - - public void Awake() - { - Screen.SetResolution(640, 480,false); - - instance = this; - AppAxibugEmuOnline.Init(); - AppAxibugEmuOnline.Connect("127.0.0.1", 10492); - } - - public void Start() - { - UNES = GetComponent(); - if (PlayerP1) - { - var data = Resources.Load(RomFile).bytes; - UNES.Boot(data); - } - else - { - UNES.Boot_Obs(); - } - } - - public void OnDisable() - { - AppAxibugEmuOnline.Close(); - } - - } -} diff --git a/AxibugEmuOnline.Client/Assets/Script/UNESTest.cs.meta b/AxibugEmuOnline.Client/Assets/Script/UNESTest.cs.meta deleted file mode 100644 index 5c34fdc..0000000 --- a/AxibugEmuOnline.Client/Assets/Script/UNESTest.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 8e94e6b3864b9034b89b70aa411a2894 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/AxibugEmuOnline.Client/AxibugEmuOnline.Client.sln b/AxibugEmuOnline.Client/AxibugEmuOnline.Client.sln index 84d1c1e..8141836 100644 --- a/AxibugEmuOnline.Client/AxibugEmuOnline.Client.sln +++ b/AxibugEmuOnline.Client/AxibugEmuOnline.Client.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AxibugEmuOnline.Client.UNES", "AxibugEmuOnline.Client.UNES.csproj", "{02571108-3006-F6EF-03C9-9DCFC8015A55}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AxibugEmuOnline.Client", "AxibugEmuOnline.Client.csproj", "{59C211A4-B928-7505-AF2E-6C604DAB3622}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -9,10 +9,10 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {02571108-3006-F6EF-03C9-9DCFC8015A55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {02571108-3006-F6EF-03C9-9DCFC8015A55}.Debug|Any CPU.Build.0 = Debug|Any CPU - {02571108-3006-F6EF-03C9-9DCFC8015A55}.Release|Any CPU.ActiveCfg = Release|Any CPU - {02571108-3006-F6EF-03C9-9DCFC8015A55}.Release|Any CPU.Build.0 = Release|Any CPU + {59C211A4-B928-7505-AF2E-6C604DAB3622}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {59C211A4-B928-7505-AF2E-6C604DAB3622}.Debug|Any CPU.Build.0 = Debug|Any CPU + {59C211A4-B928-7505-AF2E-6C604DAB3622}.Release|Any CPU.ActiveCfg = Release|Any CPU + {59C211A4-B928-7505-AF2E-6C604DAB3622}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE