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

[Project64] Add second source to AndArmRegToArmReg

This commit is contained in:
zilmar 2016-11-22 17:48:03 +11:00
parent beea1d8c27
commit afd92fc562
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -194,28 +194,28 @@ void CArmOps::AddConstToArmReg(ArmReg DestReg, ArmReg SourceReg, uint32_t Const)
} }
} }
void CArmOps::AndArmRegToArmReg(ArmReg DestReg, ArmReg SourceReg) void CArmOps::AndArmRegToArmReg(ArmReg DestReg, ArmReg SourceReg1, ArmReg SourceReg2)
{ {
if (mInItBlock) { g_Notify->BreakPoint(__FILE__,__LINE__); } if (mInItBlock) { g_Notify->BreakPoint(__FILE__,__LINE__); }
if (DestReg <= 0x7 && SourceReg <= 0x7 ) if (DestReg <= 0x7 && SourceReg2 <= 0x7 && SourceReg1 == DestReg)
{ {
CPU_Message(" ands\t%s, %s", ArmRegName(DestReg), ArmRegName(SourceReg)); CPU_Message(" ands\t%s, %s", ArmRegName(DestReg), ArmRegName(SourceReg2));
ArmThumbOpcode op = {0}; ArmThumbOpcode op = {0};
op.Reg2.rn = DestReg; op.Reg2.rn = DestReg;
op.Reg2.rm = SourceReg; op.Reg2.rm = SourceReg2;
op.Reg2.opcode = 0x100; op.Reg2.opcode = 0x100;
AddCode16(op.Hex); AddCode16(op.Hex);
} }
else else
{ {
CPU_Message(" and.w\t%s, %s, %s", ArmRegName(DestReg), ArmRegName(DestReg), ArmRegName(SourceReg)); CPU_Message(" and.w\t%s, %s, %s", ArmRegName(DestReg), ArmRegName(SourceReg1), ArmRegName(SourceReg2));
Arm32Opcode op = {0}; Arm32Opcode op = {0};
op.imm5.rn = DestReg; op.imm5.rn = SourceReg1;
op.imm5.s = 0; op.imm5.s = 0;
op.imm5.opcode = 0x750; op.imm5.opcode = 0x750;
op.imm5.rm = SourceReg; op.imm5.rm = SourceReg2;
op.imm5.type = 0; op.imm5.type = 0;
op.imm5.imm2 = 0; op.imm5.imm2 = 0;
op.imm5.rd = DestReg; op.imm5.rd = DestReg;

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

@ -161,7 +161,7 @@ protected:
static void AddConstToArmReg(ArmReg DestReg, ArmReg SourceReg, uint32_t Const); static void AddConstToArmReg(ArmReg DestReg, ArmReg SourceReg, uint32_t Const);
static void AndConstToVariable(void *Variable, const char * VariableName, uint32_t Const); static void AndConstToVariable(void *Variable, const char * VariableName, uint32_t Const);
static void AndConstToArmReg(ArmReg DestReg, ArmReg SourceReg, uint32_t Const); static void AndConstToArmReg(ArmReg DestReg, ArmReg SourceReg, uint32_t Const);
static void AndArmRegToArmReg(ArmReg DestReg, ArmReg SourceReg); static void AndArmRegToArmReg(ArmReg DestReg, ArmReg SourceReg1, ArmReg SourceReg2);
static void BranchLabel8(ArmCompareType CompareType, const char * Label); static void BranchLabel8(ArmCompareType CompareType, const char * Label);
static void BranchLabel20(ArmCompareType 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);