From 6c13dcdb41363259e0513f3e16f29a075ff3380a Mon Sep 17 00:00:00 2001
From: "Jake.Stine" <Jake.Stine@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Tue, 17 Mar 2009 18:15:02 +0000
Subject: [PATCH] Fixed a bug in the vtlb constprop support (stores weren't
 using the right macro).

Reduced the BIOS rom warnings from gaudy red text and stars to simple yellow warnings (since they really don't matter).

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@805 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 pcsx2/Memory.cpp                      | 6 +-----
 pcsx2/x86/ix86-32/iR5900LoadStore.cpp | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/pcsx2/Memory.cpp b/pcsx2/Memory.cpp
index fdd52ffa84..2e02c84603 100644
--- a/pcsx2/Memory.cpp
+++ b/pcsx2/Memory.cpp
@@ -104,11 +104,7 @@ void loadBiosRom( const char *ext, u8 *dest, long maxSize )
 			Bios1 = Path::Combine( Config.BiosDir, ext ) + ".bin";
 			if( (filesize=Path::getFileSize( Bios1 ) ) <= 0 )
 			{
-				Console::Error( "\n\n\n"
-					"**************\n"
-					"%s NOT FOUND\n"
-					"**************\n\n\n", params ext
-					);
+				Console::Notice( "Bios Warning > %s not found.", params ext );
 				return;
 			}
 		}
diff --git a/pcsx2/x86/ix86-32/iR5900LoadStore.cpp b/pcsx2/x86/ix86-32/iR5900LoadStore.cpp
index 01ffb2198b..21fb5df349 100644
--- a/pcsx2/x86/ix86-32/iR5900LoadStore.cpp
+++ b/pcsx2/x86/ix86-32/iR5900LoadStore.cpp
@@ -2092,7 +2092,7 @@ void recLoad64( u32 bits, bool sign )
 	else
 		MOV32ItoR(EDX, (uptr)&dummyValue[0] );
 
-	if( IS_EECONSTREG( _Rs_ ) )
+	if( GPR_IS_CONST1( _Rs_ ) )
 	{
 		u32 srcadr = g_cpuConstRegs[_Rs_].UL[0] + _Imm_;
 		if( bits == 128 ) srcadr &= ~0x0f;
@@ -2125,7 +2125,7 @@ void recLoad32(u32 bits,bool sign)
 
 	// 8/16/32 bit modes return the loaded value in EAX.
 
-	if( IS_EECONSTREG( _Rs_ ) )
+	if( GPR_IS_CONST1( _Rs_ ) )
 	{
 		u32 srcadr = g_cpuConstRegs[_Rs_].UL[0] + _Imm_;
 		vtlb_DynGenRead32_Const( bits, sign, srcadr );