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

[Project64] Add comment to StoreArmRegToArmRegPointer

This commit is contained in:
zilmar 2016-11-22 18:04:17 +11:00
parent b046831771
commit 88fc1130c8
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -991,17 +991,17 @@ void CArmOps::SignExtendByte(ArmReg Reg)
} }
} }
void CArmOps::StoreArmRegToArmRegPointer(ArmReg Reg, ArmReg RegPointer, uint8_t Offset) void CArmOps::StoreArmRegToArmRegPointer(ArmReg DestReg, ArmReg RegPointer, uint8_t Offset, const char * comment)
{ {
if (mInItBlock) { g_Notify->BreakPoint(__FILE__,__LINE__); } if (mInItBlock) { g_Notify->BreakPoint(__FILE__,__LINE__); }
if (Reg > 0x7 || RegPointer > 0x7 || (Offset & (~0x7C)) != 0) if (DestReg > 0x7 || RegPointer > 0x7 || (Offset & (~0x7C)) != 0)
{ {
if ((Offset & (~0xFFF)) != 0) { g_Notify->BreakPoint(__FILE__,__LINE__); return; } if ((Offset & (~0xFFF)) != 0) { g_Notify->BreakPoint(__FILE__,__LINE__); return; }
CPU_Message(" str\t%s, [%s, #%d]", ArmRegName(Reg), ArmRegName(RegPointer), (uint32_t)Offset); CPU_Message(" str\t%s, [%s, #%d]%s%s", ArmRegName(DestReg), ArmRegName(RegPointer), (uint32_t)Offset, comment != NULL ? "\t; " : "", comment != NULL ? comment : "");
Arm32Opcode op = {0}; Arm32Opcode op = {0};
op.imm12.rt = Reg; op.imm12.rt = DestReg;
op.imm12.rn = RegPointer; op.imm12.rn = RegPointer;
op.imm12.imm = Offset; op.imm12.imm = Offset;
op.imm12.opcode = 0xF8C; op.imm12.opcode = 0xF8C;
@ -1009,9 +1009,9 @@ void CArmOps::StoreArmRegToArmRegPointer(ArmReg Reg, ArmReg RegPointer, uint8_t
} }
else else
{ {
CPU_Message(" str\t%s, [%s, #%d]", ArmRegName(Reg), ArmRegName(RegPointer), (uint32_t)Offset); CPU_Message(" str\t%s, [%s, #%d]%s%s", ArmRegName(DestReg), ArmRegName(RegPointer), (uint32_t)Offset, comment != NULL ? "\t; " : "", comment != NULL ? comment : "");
ArmThumbOpcode op = {0}; ArmThumbOpcode op = {0};
op.Imm5.rt = Reg; op.Imm5.rt = DestReg;
op.Imm5.rn = RegPointer; op.Imm5.rn = RegPointer;
op.Imm5.imm5 = Offset >> 2; op.Imm5.imm5 = Offset >> 2;
op.Imm5.opcode = ArmSTR_ThumbImm; op.Imm5.opcode = ArmSTR_ThumbImm;

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

@ -194,7 +194,7 @@ protected:
static void ShiftLeftImmed(ArmReg DestReg, ArmReg SourceReg, uint32_t shift); static void ShiftLeftImmed(ArmReg DestReg, ArmReg SourceReg, uint32_t shift);
static void SignExtendByte(ArmReg Reg); static void SignExtendByte(ArmReg Reg);
static void StoreArmRegToArmRegPointer(ArmReg DestReg, ArmReg RegPointer, uint8_t Offset, const char * comment = NULL); static void StoreArmRegToArmRegPointer(ArmReg DestReg, ArmReg RegPointer, uint8_t Offset, const char * comment = NULL);
static void StoreArmRegToArmRegPointer(ArmReg Reg, ArmReg RegPointer, uint8_t Offset); static void StoreArmRegToArmRegPointer(ArmReg DestReg, ArmReg RegPointer, ArmReg RegPointer2, uint8_t shift);
static void StoreFloatingPointControlReg(ArmReg SourceReg); static void StoreFloatingPointControlReg(ArmReg SourceReg);
static void StoreFloatRegToArmRegPointer(ArmFpuSingle Reg, ArmReg RegPointer, uint8_t Offset); static void StoreFloatRegToArmRegPointer(ArmFpuSingle Reg, ArmReg RegPointer, uint8_t Offset);
static void SubArmRegFromArmReg(ArmReg DestReg, ArmReg SourceReg1, ArmReg SourceReg2); static void SubArmRegFromArmReg(ArmReg DestReg, ArmReg SourceReg1, ArmReg SourceReg2);