From 4b03d36b62d7be140b4fb9759008631b6d6e14ae Mon Sep 17 00:00:00 2001
From: zilmar <zilmar@pj64-emu.com>
Date: Mon, 5 Nov 2012 21:09:15 +1100
Subject: [PATCH] Change of initial block code with 64bit system

---
 .../N64 System/Recompiler/Code Section.cpp    | 42 ++++++++++++++++---
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/Source/Project64/N64 System/Recompiler/Code Section.cpp b/Source/Project64/N64 System/Recompiler/Code Section.cpp
index e94bafa1a..711eb5887 100644
--- a/Source/Project64/N64 System/Recompiler/Code Section.cpp	
+++ b/Source/Project64/N64 System/Recompiler/Code Section.cpp	
@@ -1816,15 +1816,45 @@ bool CCodeSection::InheritParentInfo ( void )
 					}
 					break;
 				default:
-					_Notify->DisplayError("Unknown CPU State(%d) in InheritParentInfo",MipsRegState(i2));
+					CPU_Message("Unknown CPU State(%d) in InheritParentInfo",MipsRegState(i2));
+					_Notify->BreakPoint(__FILE__,__LINE__);
 				}
 			}
 			if (IsConst(i2)) {
-				if (MipsRegState(i2) != RegSet->MipsRegState(i2)) {
-					if (Is32Bit(i2)) {
-						Map_GPR_32bit(i2,true,i2);
-					} else {
-						Map_GPR_32bit(i2,true,i2);
+				if (MipsRegState(i2) != RegSet->MipsRegState(i2))
+				{
+					switch (RegSet->MipsRegState(i2)) {
+					case CRegInfo::STATE_MAPPED_64:
+						Map_GPR_64bit(i2,i2);
+						break;
+					case CRegInfo::STATE_MAPPED_32_ZERO:
+						if (Is32Bit(i2))
+						{
+							Map_GPR_32bit(i2,(GetMipsRegLo(i2) & 0x80000000) != 0,i2);
+						} else {
+							_Notify->BreakPoint(__FILE__,__LINE__);
+						}
+						break;
+					case CRegInfo::STATE_MAPPED_32_SIGN:
+						if (Is32Bit(i2))
+						{
+							Map_GPR_32bit(i2,true,i2);
+						} else {
+							_Notify->BreakPoint(__FILE__,__LINE__);
+						}
+						break;
+					case CRegInfo::STATE_UNKNOWN:
+						if (b32BitCore())
+						{
+							Map_GPR_32bit(i2,true,i2);
+						} else {
+							Map_GPR_64bit(i2,i2);
+						}
+						break;
+					default:
+						CPU_Message("Unknown CPU State(%d) in InheritParentInfo",RegSet->MipsRegState(i2));
+						_Notify->BreakPoint(__FILE__,__LINE__);
+						break;
 					}
 				} else if (Is32Bit(i2) && GetMipsRegLo(i2) != RegSet->GetMipsRegLo(i2)) {
 					Map_GPR_32bit(i2,true,i2);