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

[Android] Add OrArmRegToArmReg

This commit is contained in:
zilmar 2016-10-01 09:26:52 +10:00
parent 24973f49e2
commit c0802d11c7
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -467,6 +467,36 @@ void CArmOps::MoveVariableToFloatReg(void * Variable, const char * VariableName,
LoadArmRegPointerToFloatReg(Arm_R0,reg,0); LoadArmRegPointerToFloatReg(Arm_R0,reg,0);
} }
void CArmOps::OrArmRegToArmReg(ArmReg DestReg, ArmReg SourceReg1, ArmReg SourceReg2, uint32_t shift)
{
if (shift == 0 && SourceReg1 == SourceReg2 && SourceReg1 <= 7 && SourceReg2 <= 7)
{
g_Notify->BreakPoint(__FILE__,__LINE__);
return;
}
if (shift)
{
CPU_Message(" orr.w\t%s, %s, %s, lsl #%d", ArmRegName(DestReg), ArmRegName(SourceReg1), ArmRegName(SourceReg2), shift);
}
else
{
CPU_Message(" orr.w\t%s, %s, %s", ArmRegName(DestReg), ArmRegName(SourceReg1), ArmRegName(SourceReg2));
}
Arm32Opcode op = {0};
op.imm5.rn = SourceReg1;
op.imm5.s = 0;
op.imm5.opcode = 0x752;
op.imm5.rm = SourceReg2;
op.imm5.type = 0;
op.imm5.imm2 = (shift & 3);
op.imm5.rd = DestReg;
op.imm5.imm3 = ((shift >> 2) & 7);
op.imm5.opcode2 = 0;
AddCode32(op.Hex);
}
void CArmOps::PushArmReg(uint16_t Registers) void CArmOps::PushArmReg(uint16_t Registers)
{ {
if (Registers == 0) if (Registers == 0)

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

@ -159,6 +159,7 @@ protected:
static void MoveFloatRegToVariable(ArmFpuSingle reg, void * Variable, const char * VariableName); static void MoveFloatRegToVariable(ArmFpuSingle reg, void * Variable, const char * VariableName);
static void MoveVariableToArmReg(void * Variable, const char * VariableName, ArmReg reg); static void MoveVariableToArmReg(void * Variable, const char * VariableName, ArmReg reg);
static void MoveVariableToFloatReg(void * Variable, const char * VariableName, ArmFpuSingle reg); static void MoveVariableToFloatReg(void * Variable, const char * VariableName, ArmFpuSingle reg);
static void OrArmRegToArmReg(ArmReg DestReg, ArmReg SourceReg1, ArmReg SourceReg2, uint32_t shift);
static void PushArmReg(uint16_t Registers); static void PushArmReg(uint16_t Registers);
static void PopArmReg(uint16_t Registers); static void PopArmReg(uint16_t Registers);
static void ShiftRightSignImmed(ArmReg DestReg, ArmReg SourceReg, uint32_t shift); static void ShiftRightSignImmed(ArmReg DestReg, ArmReg SourceReg, uint32_t shift);