diff --git a/DotN64/RCP/RealityCoprocessor.cs b/DotN64/RCP/RealityCoprocessor.cs index dc7ba0f..3938a0b 100644 --- a/DotN64/RCP/RealityCoprocessor.cs +++ b/DotN64/RCP/RealityCoprocessor.cs @@ -44,69 +44,59 @@ namespace DotN64.RCP RI = new RDRAMInterface(this); MemoryMaps = new[] { - new MappingEntry(0x1FC00000, 0x1FC007BF, false) // PIF Boot ROM. + new MappingEntry(0x00000000, 0x03FFFFFF, false) { - Read = nintendo64.PIF.MemoryMaps.ReadWord, - Write = nintendo64.PIF.MemoryMaps.WriteWord + Read = nintendo64.RAM.MemoryMaps.ReadWord, + Write = nintendo64.RAM.MemoryMaps.WriteWord }, - new MappingEntry(0x1FC007C0, 0x1FC007FF, false) // PIF (JoyChannel) RAM. - { - Read = nintendo64.PIF.MemoryMaps.ReadWord, - Write = nintendo64.PIF.MemoryMaps.WriteWord - }, - new MappingEntry(0x04600000, 0x046FFFFF, false) // Peripheral interface (PI) registers. - { - Read = PI.MemoryMaps.ReadWord, - Write = PI.MemoryMaps.WriteWord - }, - new MappingEntry(0x04000000, 0x040FFFFF, false) // SP registers. + new MappingEntry(0x04000000, 0x040FFFFF, false) { Read = SP.MemoryMaps.ReadWord, Write = SP.MemoryMaps.WriteWord }, - new MappingEntry(0x04400000, 0x044FFFFF, false) // Video interface (VI) registers. - { - Read = VI.MemoryMaps.ReadWord, - Write = VI.MemoryMaps.WriteWord - }, - new MappingEntry(0x04500000, 0x045FFFFF, false) // Audio interface (AI) registers. - { - Read = AI.MemoryMaps.ReadWord, - Write = AI.MemoryMaps.WriteWord - }, - new MappingEntry(0x04300000, 0x043FFFFF, false) // MIPS interface (MI) registers. - { - Read = MI.MemoryMaps.ReadWord, - Write = MI.MemoryMaps.WriteWord - }, - new MappingEntry(0x04800000, 0x048FFFFF, false) // Serial interface (SI) registers. - { - Read = SI.MemoryMaps.ReadWord, - Write = SI.MemoryMaps.WriteWord - }, - new MappingEntry(0x10000000, 0x1FBFFFFF, false) // Cartridge Domain 1 Address 2. - { - Read = PI.MemoryMaps.ReadWord - }, - new MappingEntry(0x04100000, 0x041FFFFF, false) // DP command registers. + new MappingEntry(0x04100000, 0x041FFFFF, false) { Read = DP.MemoryMaps.ReadWord, Write = DP.MemoryMaps.WriteWord }, - new MappingEntry(0x04700000, 0x047FFFFF, false) // RDRAM interface (RI) registers. + new MappingEntry(0x04300000, 0x043FFFFF, false) + { + Read = MI.MemoryMaps.ReadWord, + Write = MI.MemoryMaps.WriteWord + }, + new MappingEntry(0x04400000, 0x044FFFFF, false) + { + Read = VI.MemoryMaps.ReadWord, + Write = VI.MemoryMaps.WriteWord + }, + new MappingEntry(0x04500000, 0x045FFFFF, false) + { + Read = AI.MemoryMaps.ReadWord, + Write = AI.MemoryMaps.WriteWord + }, + new MappingEntry(0x04600000, 0x046FFFFF, false) + { + Read = PI.MemoryMaps.ReadWord, + Write = PI.MemoryMaps.WriteWord + }, + new MappingEntry(0x04700000, 0x047FFFFF, false) { Read = RI.MemoryMaps.ReadWord, Write = RI.MemoryMaps.WriteWord }, - new MappingEntry(0x00000000, 0x03EFFFFF, false) // RDRAM memory. + new MappingEntry(0x04800000, 0x048FFFFF, false) { - Read = nintendo64.RAM.MemoryMaps.ReadWord, - Write = nintendo64.RAM.MemoryMaps.WriteWord + Read = SI.MemoryMaps.ReadWord, + Write = SI.MemoryMaps.WriteWord }, - new MappingEntry(0x03F00000, 0x03FFFFFF, false) // RDRAM registers. + new MappingEntry(0x10000000, 0x1FBFFFFF, false) { - Read = nintendo64.RAM.MemoryMaps.ReadWord, - Write = nintendo64.RAM.MemoryMaps.WriteWord + Read = PI.MemoryMaps.ReadWord + }, + new MappingEntry(0x1FC00000, 0x1FC007FF, false) + { + Read = nintendo64.PIF.MemoryMaps.ReadWord, + Write = nintendo64.PIF.MemoryMaps.WriteWord } }; }