Diff of /trunk/pcsx2/MemoryTypes.h

Parent Directory | Revision Log | Patch

--- trunk/pcsx2/MemoryTypes.h	2010/11/12 01:10:22	273
+++ trunk/pcsx2/MemoryTypes.h	2010/12/23 12:02:12	280
@@ -17,18 +17,18 @@
 
 namespace Ps2MemSize
 {
-	static const uint Base	= 0x02000000;		// 32 MB main memory!
-	static const uint Rom	= 0x00400000;		// 4 MB main rom
-	static const uint Rom1	= 0x00040000;		// DVD player
-	static const uint Rom2	= 0x00080000;		// Chinese rom extension (?)
-	static const uint ERom	= 0x001C0000;		// DVD player extensions (?)
-	static const uint Hardware = 0x00010000;
-	static const uint Scratch = 0x00004000;
+	static const uint MainRam	= _32mb;			// 32 MB main memory!
+	static const uint Rom		= _1mb * 4;			// 4 MB main rom
+	static const uint Rom1		= 0x00040000;		// DVD player
+	static const uint Rom2		= 0x00080000;		// Chinese rom extension (?)
+	static const uint ERom		= 0x001C0000;		// DVD player extensions (?)
+	static const uint Hardware	= _64kb;
+	static const uint Scratch	= _16kb;
 
-	static const uint IopRam = 0x00200000;		// 2MB main ram on the IOP.
-	static const uint IopHardware = 0x00010000;
+	static const uint IopRam	= _1mb * 2;			// 2MB main ram on the IOP.
+	static const uint IopHardware = _64kb;
 
-	static const uint GSregs = 0x00002000;		// 8k for the GS registers and stuff.
+	static const uint GSregs = 0x00002000;			// 8k for the GS registers and stuff.
 }
 
 typedef u8 mem8_t;
@@ -53,6 +53,9 @@
 // memory, such as hardware registers or scratchpad, the access will generate a page fault, the
 // compiled block will be cleared and re-compiled using "full" VTLB translation logic.
 //
+// Note that support for this feature may not be doable under x86/32 platforms, due to the
+// 2gb/3gb limit of Windows XP (the 3gb feature will make it slightly more feasible at least).
+//
 #define VTLB_UsePageFaulting 0
 
 #if VTLB_UsePageFaulting
@@ -61,9 +64,9 @@
 // full breadth of PS2 RAM and ROM mappings are directly supported.
 struct EEVM_MemoryAllocMess
 {
-	u8 (&Main)[Ps2MemSize::Base];				// Main memory (hard-wired to 32MB)
+	u8 (&Main)[Ps2MemSize::MainRam];				// Main memory (hard-wired to 32MB)
 
-	u8 _padding1[0x1e000000-Ps2MemSize::Base]
+	u8 _padding1[0x1e000000-Ps2MemSize::MainRam]
 	u8 (&ROM1)[Ps2MemSize::Rom1];				// DVD player
 
 	u8 _padding2[0x1e040000-(0x1e000000+Ps2MemSize::Rom1)]
@@ -80,8 +83,8 @@
 
 struct EEVM_MemoryAllocMess
 {
+	u8 Main[Ps2MemSize::MainRam];			// Main memory (hard-wired to 32MB)
 	u8 Scratch[Ps2MemSize::Scratch];		// Scratchpad!
-	u8 Main[Ps2MemSize::Base];				// Main memory (hard-wired to 32MB)
 	u8 ROM[Ps2MemSize::Rom];				// Boot rom (4MB)
 	u8 ROM1[Ps2MemSize::Rom1];				// DVD player
 	u8 ROM2[Ps2MemSize::Rom2];				// Chinese extensions
@@ -101,7 +104,7 @@
 struct IopVM_MemoryAllocMess
 {
 	u8 Main[Ps2MemSize::IopRam];			// Main memory (hard-wired to 2MB)
-	u8 P[0x00010000];						// I really have no idea what this is... --air
+	u8 P[_64kb];							// I really have no idea what this is... --air
 	u8 Sif[0x100];							// a few special SIF/SBUS registers (likely not needed)
 };