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

[Android] Get CompareArmReg to handle larger registers

This commit is contained in:
zilmar 2016-10-01 11:32:29 +10:00
parent f90c3d76e1
commit fbe89fd614
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -294,12 +294,32 @@ void CArmOps::CompareArmRegToConst(ArmReg Reg, uint32_t value)
void CArmOps::CompareArmRegToArmReg(ArmReg Reg1, ArmReg Reg2) void CArmOps::CompareArmRegToArmReg(ArmReg Reg1, ArmReg Reg2)
{ {
CPU_Message(" cmp\t%s, %s", ArmRegName(Reg1), ArmRegName(Reg2)); if (Reg1 <= 0x7 && Reg2 <= 0x7 )
ArmThumbOpcode op = {0}; {
op.Reg2.rn = Reg1; CPU_Message(" cmp\t%s, %s", ArmRegName(Reg1), ArmRegName(Reg2));
op.Reg2.rm = Reg2; ArmThumbOpcode op = {0};
op.Reg2.opcode = 0x10A; op.Reg2.rn = Reg1;
AddCode16(op.Hex); op.Reg2.rm = Reg2;
op.Reg2.opcode = 0x10A;
AddCode16(op.Hex);
}
else
{
CPU_Message(" cmp.w\t%s, %s", ArmRegName(Reg1), ArmRegName(Reg2));
Arm32Opcode op = {0};
op.imm5.rn = Reg1;
op.imm5.s = 1;
op.imm5.opcode = 0x75D;
op.imm5.rm = Reg2;
op.imm5.type = 0;
op.imm5.imm2 = 0;
op.imm5.rd = 0xF;
op.imm5.imm3 = 0;
op.imm5.opcode2 = 0;
AddCode32(op.Hex);
}
} }
void CArmOps::LoadArmRegPointerByteToArmReg(ArmReg DestReg, ArmReg RegPointer, ArmReg RegPointer2, uint8_t shift) void CArmOps::LoadArmRegPointerByteToArmReg(ArmReg DestReg, ArmReg RegPointer, ArmReg RegPointer2, uint8_t shift)