--- trunk/RomCheater.EmuMMAPPlugin/EmuMEMMapDockControl.cs 2013/06/08 21:50:28 641 +++ trunk/RomCheater.EmuMMAPPlugin/EmuMEMMapDockControl.cs 2013/06/08 22:19:03 645 @@ -106,7 +106,14 @@ #region memory maps maprange.Add(new MemMap(string.Format("{0}_test", name), 0, 0)); #endregion - map = new DeviceMemoryMap(name, maprange); + maprange.Add(new MemMap("Kernel Memory", 0x00000000, 0x0000ffff)); + maprange.Add(new MemMap("User Memory", 0x00010000, 0x001FFFFF)); + maprange.Add(new MemMap("Parallel Port", 0x1f000000, 0x1f00ffff)); + maprange.Add(new MemMap("Scratch Pad", 0x1f800000, 0x1f8003ff)); + maprange.Add(new MemMap("HW Registers", 0x1f801000, 0x1f802fff)); + maprange.Add(new MemMap("Kernel & User Memory (cached)", 0x80000000, 0x801fffff)); + maprange.Add(new MemMap("Kernel & User Memory (uncached)", 0xa0000000, 0xa01fffff)); + maprange.Add(new MemMap("BIOS", 0x1FC00000, 0x1FC7FFFF)); return map; } #endregion @@ -117,7 +124,20 @@ DeviceMemoryMap map = new DeviceMemoryMap(); List maprange = new List(); #region memory maps - maprange.Add(new MemMap(string.Format("{0}_test", name), 0, 0)); + //maprange.Add(new MemMap(string.Format("{0}_test", name), 0, 0)); + maprange.Add(new MemMap("EE Kernel", 0x80000000, 0x800FFFFF)); + maprange.Add(new MemMap("EE RAM (Cached)", 0x00100000, 0x01FFFFFF)); + maprange.Add(new MemMap("EE RAM (Uncached)", 0x20100000, 0x21FFFFFF)); + maprange.Add(new MemMap("EE RAM (Uncached&accelerated)", 0x30100000, 0x31FFFFFF)); + maprange.Add(new MemMap("EE Registers (uncached)", 0x10000000, 0x11FFFFFF)); + maprange.Add(new MemMap("GS Registers (uncached)", 0x12000000, 0x13FFFFFF)); + maprange.Add(new MemMap("Boot ROM0 (uncached)", 0x1FC00000, 0x1FFFFFFF)); + maprange.Add(new MemMap("Boot ROM09 (cached)", 0x9FC00000, 0x9FFFFFFF)); + maprange.Add(new MemMap("Boot ROM0b (uncached)", 0xBFC00000, 0xBFFFFFFF)); + maprange.Add(new MemMap("Boot ROM1", 0xBE000000, 0xBE040000)); + maprange.Add(new MemMap("Boot ROM2", 0xBE400000, 0xBE440000)); + maprange.Add(new MemMap("IOP RAM", 0xBC000000, 0xBC1FFFFF)); + maprange.Add(new MemMap("Scratch Pad", 0x70000000, 0x70003FFF)); #endregion map = new DeviceMemoryMap(name, maprange); return map; @@ -187,13 +207,13 @@ { this.MapName = name; } - public MemMap(string name, ulong start, ulong end) : this(name, string.Format("0x{0}", start.ToString("X")), string.Format("0x{0}", end.ToString("X")), string.Format("0x{0}", (end - start).ToString("X"))) { } - public MemMap(string name, string start, string end, string size) + public MemMap(string name, ulong start, ulong end) : this(name, string.Format("0x{0}", start.ToString("X")), string.Format("0x{0}", end.ToString("X")), end-start) { } + public MemMap(string name, string start, string end, ulong size) : this(name) { this.MapStart = start; this.MapEnd = end; - this.MapSize = size; + this.MapSize = string.Format("0x{0}={1:0.00}MB", size.ToString("X"), ((double)size / (1024.0 * 1024.0))); } #region IMappedMemRange Members public string MapName { get; private set; }