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

[Project64] Rename ArmBranchCompare to ArmCompareType

This commit is contained in:
zilmar 2016-11-22 17:41:46 +11:00
parent dff480d6dc
commit ae27b59621
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Project64-core/N64System/Recompiler/Arm/ArmOps.cpp
View File

@ -20,7 +20,7 @@
CArmRegInfo CArmOps::m_RegWorkingSet; CArmRegInfo CArmOps::m_RegWorkingSet;
bool CArmOps::mInItBlock = false; bool CArmOps::mInItBlock = false;
int CArmOps::mItBlockInstruction = 0; int CArmOps::mItBlockInstruction = 0;
CArmOps::ArmBranchCompare CArmOps::mItBlockCompareType; CArmOps::ArmCompareType CArmOps::mItBlockCompareType;
CArmOps::ArmItMask CArmOps::mItBlockMask; CArmOps::ArmItMask CArmOps::mItBlockMask;
/************************************************************************** /**************************************************************************
@ -176,11 +176,11 @@ void CArmOps::AndArmRegToArmReg(ArmReg DestReg, ArmReg SourceReg)
} }
} }
void CArmOps::BranchLabel8(ArmBranchCompare CompareType, const char * Label) void CArmOps::BranchLabel8(ArmCompareType CompareType, const char * Label)
{ {
if (mInItBlock) { g_Notify->BreakPoint(__FILE__,__LINE__); } if (mInItBlock) { g_Notify->BreakPoint(__FILE__,__LINE__); }
CPU_Message(" b%s\t%s", ArmBranchSuffix(CompareType),Label); CPU_Message(" b%s\t%s", ArmCompareSuffix(CompareType),Label);
ArmThumbOpcode op = {0}; ArmThumbOpcode op = {0};
if (CompareType == ArmBranch_Always) if (CompareType == ArmBranch_Always)
{ {
@ -196,11 +196,11 @@ void CArmOps::BranchLabel8(ArmBranchCompare CompareType, const char * Label)
AddCode16(op.Hex); AddCode16(op.Hex);
} }
void CArmOps::BranchLabel20(ArmBranchCompare CompareType, const char * Label) void CArmOps::BranchLabel20(ArmCompareType CompareType, const char * Label)
{ {
if (mInItBlock) { g_Notify->BreakPoint(__FILE__,__LINE__); } if (mInItBlock) { g_Notify->BreakPoint(__FILE__,__LINE__); }
CPU_Message(" b%s\t%s", ArmBranchSuffix(CompareType),Label); CPU_Message(" b%s\t%s", ArmCompareSuffix(CompareType),Label);
Arm32Opcode op = {0}; Arm32Opcode op = {0};
op.Branch20.imm6 = 0; op.Branch20.imm6 = 0;
op.Branch20.cond = CompareType == ArmBranch_Always ? 0 : CompareType; op.Branch20.cond = CompareType == ArmBranch_Always ? 0 : CompareType;
@ -340,11 +340,11 @@ void CArmOps::CompareArmRegToArmReg(ArmReg Reg1, ArmReg Reg2)
} }
} }
void CArmOps::IfBlock(ArmItMask mask, ArmBranchCompare CompareType) void CArmOps::IfBlock(ArmItMask mask, ArmCompareType CompareType)
{ {
if (mInItBlock) { g_Notify->BreakPoint(__FILE__,__LINE__); } if (mInItBlock) { g_Notify->BreakPoint(__FILE__,__LINE__); }
CPU_Message(" it%s\t%s", ArmItMaskName(mask), ArmBranchSuffix(CompareType)); CPU_Message(" it%s\t%s", ArmItMaskName(mask), ArmCompareSuffix(CompareType));
mInItBlock = true; mInItBlock = true;
mItBlockInstruction = 0; mItBlockInstruction = 0;
mItBlockCompareType = CompareType; mItBlockCompareType = CompareType;
@ -1191,7 +1191,7 @@ void * CArmOps::GetAddressOf(int value, ...)
return Address; return Address;
} }
bool CArmOps::ArmCompareInverse (ArmBranchCompare CompareType) bool CArmOps::ArmCompareInverse (ArmCompareType CompareType)
{ {
switch (CompareType) switch (CompareType)
{ {
@ -1207,7 +1207,7 @@ bool CArmOps::ArmCompareInverse (ArmBranchCompare CompareType)
return false; return false;
} }
const char * CArmOps::ArmBranchSuffix(ArmBranchCompare CompareType) const char * CArmOps::ArmCompareSuffix(ArmCompareType CompareType)
{ {
switch (CompareType) switch (CompareType)
{ {

14
Source/Project64-core/N64System/Recompiler/Arm/ArmOps.h
View File

@ -121,7 +121,7 @@ public:
ArmPushPop_PC = 0x8000, ArmPushPop_PC = 0x8000,
}; };
enum ArmBranchCompare enum ArmCompareType
{ {
ArmBranch_Equal = 0, //Code = 0000 ArmBranch_Equal = 0, //Code = 0000
ArmBranch_Notequal = 1, //Code = 0001 ArmBranch_Notequal = 1, //Code = 0001
@ -160,12 +160,12 @@ protected:
static void AddConstToArmReg(ArmReg DestReg, uint32_t Const); static void AddConstToArmReg(ArmReg DestReg, uint32_t Const);
static void AddConstToArmReg(ArmReg DestReg, ArmReg SourceReg, uint32_t Const); static void AddConstToArmReg(ArmReg DestReg, ArmReg SourceReg, uint32_t Const);
static void AndArmRegToArmReg(ArmReg DestReg, ArmReg SourceReg); static void AndArmRegToArmReg(ArmReg DestReg, ArmReg SourceReg);
static void BranchLabel8(ArmBranchCompare CompareType, const char * Label); static void BranchLabel8(ArmCompareType CompareType, const char * Label);
static void BranchLabel20(ArmBranchCompare CompareType, const char * Label); static void BranchLabel20(ArmCompareType CompareType, const char * Label);
static void CallFunction(void * Function, const char * FunctionName); static void CallFunction(void * Function, const char * FunctionName);
static void CompareArmRegToConst(ArmReg Reg, uint32_t value); static void CompareArmRegToConst(ArmReg Reg, uint32_t value);
static void CompareArmRegToArmReg(ArmReg Reg1, ArmReg Reg2); static void CompareArmRegToArmReg(ArmReg Reg1, ArmReg Reg2);
static void IfBlock(ArmItMask mask, ArmBranchCompare CompareType); static void IfBlock(ArmItMask mask, ArmCompareType CompareType);
static void LoadArmRegPointerByteToArmReg(ArmReg DestReg, ArmReg RegPointer, ArmReg RegPointer2, uint8_t shift); static void LoadArmRegPointerByteToArmReg(ArmReg DestReg, ArmReg RegPointer, ArmReg RegPointer2, uint8_t shift);
static void LoadArmRegPointerToArmReg(ArmReg DestReg, ArmReg RegPointer, uint8_t Offset); static void LoadArmRegPointerToArmReg(ArmReg DestReg, ArmReg RegPointer, uint8_t Offset);
static void LoadArmRegPointerToArmReg(ArmReg DestReg, ArmReg RegPointer, ArmReg RegPointer2, uint8_t shift); static void LoadArmRegPointerToArmReg(ArmReg DestReg, ArmReg RegPointer, ArmReg RegPointer2, uint8_t shift);
@ -204,9 +204,9 @@ protected:
static CArmRegInfo m_RegWorkingSet; static CArmRegInfo m_RegWorkingSet;
protected: protected:
static const char * ArmBranchSuffix(ArmBranchCompare CompareType);
static const char * ArmRegName(ArmReg Reg); static const char * ArmRegName(ArmReg Reg);
static bool ArmCompareInverse(ArmBranchCompare CompareType); static bool ArmCompareInverse(ArmCompareType CompareType);
static const char * ArmCompareSuffix(ArmCompareType CompareType);
static const char * ArmFpuSingleName(ArmFpuSingle Reg); static const char * ArmFpuSingleName(ArmFpuSingle Reg);
static const char * ArmItMaskName(ArmItMask mask); static const char * ArmItMaskName(ArmItMask mask);
@ -219,7 +219,7 @@ protected:
static bool mInItBlock; static bool mInItBlock;
static int mItBlockInstruction; static int mItBlockInstruction;
static ArmBranchCompare mItBlockCompareType; static ArmCompareType mItBlockCompareType;
static ArmItMask mItBlockMask; static ArmItMask mItBlockMask;
}; };

2
Source/Project64-core/N64System/Recompiler/Arm/ArmRecompilerOps.cpp
View File

@ -4268,7 +4268,7 @@ void CArmRecompilerOps::CompileExit(uint32_t JumpPC, uint32_t TargetPC, CRegInfo
} }
} }
void CArmRecompilerOps::CompileExit(uint32_t JumpPC, uint32_t TargetPC, CRegInfo &ExitRegSet, CExitInfo::EXIT_REASON reason, CArmOps::ArmBranchCompare CompareType) void CArmRecompilerOps::CompileExit(uint32_t JumpPC, uint32_t TargetPC, CRegInfo &ExitRegSet, CExitInfo::EXIT_REASON reason, CArmOps::ArmCompareType CompareType)
{ {
BranchLabel20(CompareType, stdstr_f("Exit_%d", m_ExitInfo.size()).c_str()); BranchLabel20(CompareType, stdstr_f("Exit_%d", m_ExitInfo.size()).c_str());

2
Source/Project64-core/N64System/Recompiler/Arm/ArmRecompilerOps.h
View File

@ -217,7 +217,7 @@ public:
void PreCompileOpcode(void); void PreCompileOpcode(void);
void PostCompileOpcode ( void ); void PostCompileOpcode ( void );
void CompileExit(uint32_t JumpPC, uint32_t TargetPC, CRegInfo &ExitRegSet, CExitInfo::EXIT_REASON reason); void CompileExit(uint32_t JumpPC, uint32_t TargetPC, CRegInfo &ExitRegSet, CExitInfo::EXIT_REASON reason);
void CompileExit(uint32_t JumpPC, uint32_t TargetPC, CRegInfo &ExitRegSet, CExitInfo::EXIT_REASON reason, CArmOps::ArmBranchCompare CompareType); void CompileExit(uint32_t JumpPC, uint32_t TargetPC, CRegInfo &ExitRegSet, CExitInfo::EXIT_REASON reason, CArmOps::ArmCompareType CompareType);
static void UpdateSyncCPU(CRegInfo & RegSet, uint32_t Cycles); static void UpdateSyncCPU(CRegInfo & RegSet, uint32_t Cycles);
void UpdateCounters(CRegInfo & RegSet, bool CheckTimer, bool ClearValues = false); void UpdateCounters(CRegInfo & RegSet, bool CheckTimer, bool ClearValues = false);
void CompileSystemCheck(uint32_t TargetPC, const CRegInfo & RegSet); void CompileSystemCheck(uint32_t TargetPC, const CRegInfo & RegSet);