From 88fc1130c81a4b2c0d1d5aedf726e2517ac6a416 Mon Sep 17 00:00:00 2001 From: zilmar Date: Tue, 22 Nov 2016 18:04:17 +1100 Subject: [PATCH] [Project64] Add comment to StoreArmRegToArmRegPointer --- .../N64System/Recompiler/Arm/ArmOps.cpp | 12 ++++++------ .../Project64-core/N64System/Recompiler/Arm/ArmOps.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Source/Project64-core/N64System/Recompiler/Arm/ArmOps.cpp b/Source/Project64-core/N64System/Recompiler/Arm/ArmOps.cpp index 0ae47531f..52c86c0eb 100644 --- a/Source/Project64-core/N64System/Recompiler/Arm/ArmOps.cpp +++ b/Source/Project64-core/N64System/Recompiler/Arm/ArmOps.cpp @@ -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 (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; } - 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}; - op.imm12.rt = Reg; + op.imm12.rt = DestReg; op.imm12.rn = RegPointer; op.imm12.imm = Offset; op.imm12.opcode = 0xF8C; @@ -1009,9 +1009,9 @@ void CArmOps::StoreArmRegToArmRegPointer(ArmReg Reg, ArmReg RegPointer, uint8_t } 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}; - op.Imm5.rt = Reg; + op.Imm5.rt = DestReg; op.Imm5.rn = RegPointer; op.Imm5.imm5 = Offset >> 2; op.Imm5.opcode = ArmSTR_ThumbImm; diff --git a/Source/Project64-core/N64System/Recompiler/Arm/ArmOps.h b/Source/Project64-core/N64System/Recompiler/Arm/ArmOps.h index b712c59de..056b1ccda 100644 --- a/Source/Project64-core/N64System/Recompiler/Arm/ArmOps.h +++ b/Source/Project64-core/N64System/Recompiler/Arm/ArmOps.h @@ -194,7 +194,7 @@ protected: static void ShiftLeftImmed(ArmReg DestReg, ArmReg SourceReg, uint32_t shift); static void SignExtendByte(ArmReg Reg); 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 StoreFloatRegToArmRegPointer(ArmFpuSingle Reg, ArmReg RegPointer, uint8_t Offset); static void SubArmRegFromArmReg(ArmReg DestReg, ArmReg SourceReg1, ArmReg SourceReg2);