ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Memory: Got LWU to use the same code as LW

This commit is contained in:
zilmar 2013-01-12 08:57:51 +11:00
parent 5bba8a011a
commit b2f7f67dc2
2 changed files with 15 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Source/Project64/N64 System/Mips/Memory Virtual Mem.cpp
View File

@ -2798,6 +2798,11 @@ void CMipsMemoryVM::Compile_LHU (void)
} }
void CMipsMemoryVM::Compile_LW (void) void CMipsMemoryVM::Compile_LW (void)
{
Compile_LW(true);
}
void CMipsMemoryVM::Compile_LW (bool ResultSigned)
{ {
OPCODE & Opcode = CRecompilerOps::m_Opcode; OPCODE & Opcode = CRecompilerOps::m_Opcode;
CPU_Message(" %X %s",m_CompilePC,R4300iOpcodeName(Opcode.Hex,m_CompilePC)); CPU_Message(" %X %s",m_CompilePC,R4300iOpcodeName(Opcode.Hex,m_CompilePC));
@ -2808,14 +2813,15 @@ void CMipsMemoryVM::Compile_LW (void)
if (Opcode.base == 29 && g_System->bFastSP()) { if (Opcode.base == 29 && g_System->bFastSP()) {
char String[100]; char String[100];
Map_GPR_32bit(Opcode.rt,TRUE,-1); Map_GPR_32bit(Opcode.rt,ResultSigned,-1);
TempReg1 = Map_MemoryStack(x86_Any,true); TempReg1 = Map_MemoryStack(x86_Any,true);
sprintf(String,"%Xh",(short)Opcode.offset); sprintf(String,"%Xh",(short)Opcode.offset);
MoveVariableDispToX86Reg((void *)((DWORD)(short)Opcode.offset),String,GetMipsRegMapLo(Opcode.rt),TempReg1,1); MoveVariableDispToX86Reg((void *)((DWORD)(short)Opcode.offset),String,GetMipsRegMapLo(Opcode.rt),TempReg1,1);
return;
} else { } else {
if (IsConst(Opcode.base)) { if (IsConst(Opcode.base)) {
DWORD Address = GetMipsRegLo(Opcode.base) + (short)Opcode.offset; DWORD Address = GetMipsRegLo(Opcode.base) + (short)Opcode.offset;
Map_GPR_32bit(Opcode.rt,TRUE,-1); Map_GPR_32bit(Opcode.rt,ResultSigned,-1);
Compile_LW(GetMipsRegMapLo(Opcode.rt),Address); Compile_LW(GetMipsRegMapLo(Opcode.rt),Address);
} else { } else {
if (g_System->bUseTlb()) { if (g_System->bUseTlb()) {
@ -2842,19 +2848,19 @@ void CMipsMemoryVM::Compile_LW (void)
ShiftRightUnsignImmed(TempReg2,12); ShiftRightUnsignImmed(TempReg2,12);
MoveVariableDispToX86Reg(m_TLB_ReadMap,"m_TLB_ReadMap",TempReg2,TempReg2,4); MoveVariableDispToX86Reg(m_TLB_ReadMap,"m_TLB_ReadMap",TempReg2,TempReg2,4);
CompileReadTLBMiss(TempReg1,TempReg2); CompileReadTLBMiss(TempReg1,TempReg2);
Map_GPR_32bit(Opcode.rt,TRUE,-1); Map_GPR_32bit(Opcode.rt,ResultSigned,-1);
MoveX86regPointerToX86reg(TempReg1, TempReg2,GetMipsRegMapLo(Opcode.rt)); MoveX86regPointerToX86reg(TempReg1, TempReg2,GetMipsRegMapLo(Opcode.rt));
} else { } else {
if (IsMapped(Opcode.base)) { if (IsMapped(Opcode.base)) {
ProtectGPR(Opcode.base); ProtectGPR(Opcode.base);
if (Opcode.offset != 0) { if (Opcode.offset != 0) {
Map_GPR_32bit(Opcode.rt,TRUE,-1); Map_GPR_32bit(Opcode.rt,ResultSigned,-1);
LeaSourceAndOffset(GetMipsRegMapLo(Opcode.rt),GetMipsRegMapLo(Opcode.base),(short)Opcode.offset); LeaSourceAndOffset(GetMipsRegMapLo(Opcode.rt),GetMipsRegMapLo(Opcode.base),(short)Opcode.offset);
} else { } else {
Map_GPR_32bit(Opcode.rt,TRUE,Opcode.base); Map_GPR_32bit(Opcode.rt,ResultSigned,Opcode.base);
} }
} else { } else {
Map_GPR_32bit(Opcode.rt,TRUE,Opcode.base); Map_GPR_32bit(Opcode.rt,ResultSigned,Opcode.base);
AddConstToX86Reg(GetMipsRegMapLo(Opcode.rt),(short)Opcode.immediate); AddConstToX86Reg(GetMipsRegMapLo(Opcode.rt),(short)Opcode.immediate);
} }
AndConstToX86Reg(GetMipsRegMapLo(Opcode.rt),0x1FFFFFFF); AndConstToX86Reg(GetMipsRegMapLo(Opcode.rt),0x1FFFFFFF);
@ -3077,45 +3083,7 @@ void CMipsMemoryVM::Compile_LWR (void)
void CMipsMemoryVM::Compile_LWU (void) void CMipsMemoryVM::Compile_LWU (void)
{ {
OPCODE & Opcode = CRecompilerOps::m_Opcode; Compile_LW(false);
x86Reg TempReg1, TempReg2;
CPU_Message(" %X %s",m_CompilePC,R4300iOpcodeName(Opcode.Hex,m_CompilePC));
if (Opcode.rt == 0) return;
if (IsConst(Opcode.base)) {
DWORD Address = (GetMipsRegLo(Opcode.base) + (short)Opcode.offset);
Map_GPR_32bit(Opcode.rt,FALSE,0);
Compile_LW(GetMipsRegMapLo(Opcode.rt),Address);
return;
}
if (IsMapped(Opcode.rt)) { ProtectGPR(Opcode.rt); }
if (IsMapped(Opcode.base)) {
ProtectGPR(Opcode.base);
if (Opcode.offset != 0) {
TempReg1 = Map_TempReg(x86_Any,-1,FALSE);
LeaSourceAndOffset(TempReg1,GetMipsRegMapLo(Opcode.base),(short)Opcode.offset);
} else {
TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
}
} else {
TempReg1 = Map_TempReg(x86_Any,Opcode.base,FALSE);
AddConstToX86Reg(TempReg1,(short)Opcode.immediate);
}
if (g_System->bUseTlb()) {
TempReg2 = Map_TempReg(x86_Any,-1,FALSE);
MoveX86RegToX86Reg(TempReg1, TempReg2);
ShiftRightUnsignImmed(TempReg2,12);
MoveVariableDispToX86Reg(m_TLB_ReadMap,"m_TLB_ReadMap",TempReg2,TempReg2,4);
CompileReadTLBMiss(TempReg1,TempReg2);
Map_GPR_32bit(Opcode.rt,FALSE,-1);
MoveZxHalfX86regPointerToX86reg(TempReg1, TempReg2,GetMipsRegMapLo(Opcode.rt));
} else {
AndConstToX86Reg(TempReg1,0x1FFFFFFF);
Map_GPR_32bit(Opcode.rt,TRUE,-1);
MoveZxN64MemToX86regHalf(GetMipsRegMapLo(Opcode.rt), TempReg1);
}
} }
void CMipsMemoryVM::Compile_LD (void) void CMipsMemoryVM::Compile_LD (void)

2
Source/Project64/N64 System/Mips/Memory Virtual Mem.h
View File

@ -109,6 +109,8 @@ private:
CMipsMemoryVM(const CMipsMemoryVM&); // Disable copy constructor CMipsMemoryVM(const CMipsMemoryVM&); // Disable copy constructor
CMipsMemoryVM& operator=(const CMipsMemoryVM&); // Disable assignment CMipsMemoryVM& operator=(const CMipsMemoryVM&); // Disable assignment
void Compile_LW ( bool ResultSigned );
static void RdramChanged ( CMipsMemoryVM * _this ); static void RdramChanged ( CMipsMemoryVM * _this );
static void ChangeSpStatus ( void ); static void ChangeSpStatus ( void );
static void ChangeMiIntrMask ( void ); static void ChangeMiIntrMask ( void );