--- trunk/RomCheater.EmuMMAPPlugin/EmuMEMMapDockControl.cs	2013/06/08 21:58:23	642
+++ trunk/RomCheater.EmuMMAPPlugin/EmuMEMMapDockControl.cs	2013/06/08 22:15:48	644
@@ -106,7 +106,14 @@ namespace RomCheater.EmuMMAPPlugin
             #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", 0xbfc00000, 0xbfc7ffff));
             return map;
         }
         #endregion
@@ -200,13 +207,13 @@ namespace RomCheater.EmuMMAPPlugin
         {
             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; }