/[pcsx2_0.9.7]/trunk/pcsx2/x86/BaseblockEx.h
ViewVC logotype

Diff of /trunk/pcsx2/x86/BaseblockEx.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

--- trunk/pcsx2/x86/BaseblockEx.h	2010/12/23 11:48:33	279
+++ trunk/pcsx2/x86/BaseblockEx.h	2010/12/23 12:02:12	280
@@ -81,9 +81,6 @@
 	__fi int Index (u32 startpc) const
 	{
 		int idx = LastIndex(startpc);
-		// fixme: I changed the parenthesis to be unambiguous, but this needs to be checked to see if ((x or y or z) and w)
-		// is correct, or ((x or y) or (z and w)), or some other variation. --arcum42
-		// Mixing &&'s and ||'s is not actually ambiguous; &&'s take precedence.  Reverted to old behavior -- ChickenLiver.
 		if ((idx == -1) || (startpc < blocks[idx].startpc) ||
 			((blocks[idx].size) && (startpc >= blocks[idx].startpc + blocks[idx].size * 4)))
 			return -1;
@@ -139,9 +136,10 @@
 static void recLUT_SetPage(uptr reclut[0x10000], uptr hwlut[0x10000],
 						   BASEBLOCK *mapbase, uint pagebase, uint pageidx, uint mappage)
 {
+	// this value is in 64k pages!
 	uint page = pagebase + pageidx;
 
-	jASSUME( page < 0x10000 );
+	pxAssume( page < 0x10000 );
 	reclut[page] = (uptr)&mapbase[(mappage - page) << 14];
 	if (hwlut)
 		hwlut[page] = 0u - (pagebase << 16);

 

  ViewVC Help
Powered by ViewVC 1.1.22