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

[Project64] Add CArmRegInfo::VariableMapName

This commit is contained in:
zilmar 2016-11-23 06:28:54 +11:00
parent 13a1f9fc25
commit a8eda0d391
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Source/Project64-core/N64System/Recompiler/Arm/ArmRegInfo.cpp
View File

@ -656,8 +656,9 @@ bool CArmRegInfo::UnMap_ArmReg(ArmReg Reg)
} }
else if (GetArmRegMapped(Reg) == Variable_Mapped) else if (GetArmRegMapped(Reg) == Variable_Mapped)
{ {
CPU_Message(" regcache: unallocate %s from variable mapping", ArmRegName(Reg)); CPU_Message(" regcache: unallocate %s from variable mapping (%s)", ArmRegName(Reg), VariableMapName(GetVariableMappedTo(Reg)));
SetArmRegMapped(Reg, NotMapped); SetArmRegMapped(Reg, NotMapped);
m_Variable_MappedTo[Reg] = VARIABLE_UNKNOWN;
return true; return true;
} }
g_Notify->BreakPoint(__FILE__, __LINE__); g_Notify->BreakPoint(__FILE__, __LINE__);
@ -960,4 +961,20 @@ void CArmRegInfo::ProtectGPR(uint32_t Reg)
SetArmRegProtected(GetMipsRegMapLo(Reg), true); SetArmRegProtected(GetMipsRegMapLo(Reg), true);
} }
const char * CArmRegInfo::VariableMapName(VARIABLE_MAPPED variable)
{
switch (variable)
{
case VARIABLE_UNKNOWN: return "UNKNOWN";
case VARIABLE_GPR: return "_GPR";
case VARIABLE_FPR: return "_FPR_S";
case VARIABLE_TLB_READMAP: return "m_TLB_ReadMap";
case VARIABLE_TLB_LOAD_ADDRESS: return "g_TLBLoadAddress";
case VARIABLE_NEXT_TIMER: return "g_NextTimer";
default:
g_Notify->BreakPoint(__FILE__, __LINE__);
return "unknown VariableMapName";
}
}
#endif #endif

6
Source/Project64-core/N64System/Recompiler/Arm/ArmRegInfo.h
View File

@ -75,9 +75,15 @@ public:
inline uint32_t GetArmRegMapOrder(ArmReg Reg) const { return m_ArmReg_MapOrder[Reg]; } inline uint32_t GetArmRegMapOrder(ArmReg Reg) const { return m_ArmReg_MapOrder[Reg]; }
inline bool GetArmRegProtected(ArmReg Reg) const { return m_ArmReg_Protected[Reg]; } inline bool GetArmRegProtected(ArmReg Reg) const { return m_ArmReg_Protected[Reg]; }
inline REG_MAPPED GetArmRegMapped(ArmReg Reg) const { return m_ArmReg_MappedTo[Reg]; } inline REG_MAPPED GetArmRegMapped(ArmReg Reg) const { return m_ArmReg_MappedTo[Reg]; }
inline void SetArmRegMapOrder(ArmReg Reg, uint32_t Order) { m_ArmReg_MapOrder[Reg] = Order; } inline void SetArmRegMapOrder(ArmReg Reg, uint32_t Order) { m_ArmReg_MapOrder[Reg] = Order; }
inline void SetArmRegProtected(ArmReg Reg, bool Protected) { m_ArmReg_Protected[Reg] = Protected; } inline void SetArmRegProtected(ArmReg Reg, bool Protected) { m_ArmReg_Protected[Reg] = Protected; }
inline void SetArmRegMapped(ArmReg Reg, REG_MAPPED Mapping) { m_ArmReg_MappedTo[Reg] = Mapping; } inline void SetArmRegMapped(ArmReg Reg, REG_MAPPED Mapping) { m_ArmReg_MappedTo[Reg] = Mapping; }
inline VARIABLE_MAPPED GetVariableMappedTo(ArmReg Reg) const { return m_Variable_MappedTo[Reg]; }
inline void SetVariableMappedTo(ArmReg Reg, VARIABLE_MAPPED variable) { m_Variable_MappedTo[Reg] = variable; }
static const char * VariableMapName(VARIABLE_MAPPED variable);
private: private:
bool ShouldPushPopReg (ArmReg Reg); bool ShouldPushPopReg (ArmReg Reg);