Giacomo Travaglini has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/33434 )
Change subject: arch-arm: Fix coding style in addressTranslation methods
......................................................................
arch-arm: Fix coding style in addressTranslation methods
armFault -> arm_fault
Change-Id: I6263b105f8757b34dd15a06b16abe7289073614d
Signed-off-by: Giacomo Travaglini <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/33434
Reviewed-by: Nikos Nikoleris <[email protected]>
Tested-by: kokoro <[email protected]>
---
M src/arch/arm/isa.cc
1 file changed, 10 insertions(+), 10 deletions(-)
Approvals:
Nikos Nikoleris: Looks good to me, approved
Giacomo Travaglini: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/arm/isa.cc b/src/arch/arm/isa.cc
index 6ef9fe3..0c312d0 100644
--- a/src/arch/arm/isa.cc
+++ b/src/arch/arm/isa.cc
@@ -2359,15 +2359,15 @@
"MISCREG: Translated addr %#x: PAR_EL1: %#xx\n",
val, par);
} else {
- ArmFault *armFault = static_cast<ArmFault *>(fault.get());
- armFault->update(tc);
+ ArmFault *arm_fault = static_cast<ArmFault *>(fault.get());
+ arm_fault->update(tc);
// Set fault bit and FSR
- FSR fsr = armFault->getFsr(tc);
+ FSR fsr = arm_fault->getFsr(tc);
par.f = 1; // F bit
par.fst = fsr.status; // FST
- par.ptw = (armFault->iss() >> 7) & 0x1; // S1PTW
- par.s = armFault->isStage2() ? 1 : 0; // S
+ par.ptw = (arm_fault->iss() >> 7) & 0x1; // S1PTW
+ par.s = arm_fault->isStage2() ? 1 : 0; // S
DPRINTF(MiscRegs,
"MISCREG: Translated addr %#x fault fsr %#x: PAR: %#x\n",
@@ -2418,15 +2418,15 @@
"MISCREG: Translated addr 0x%08x: PAR: 0x%08x\n",
val, par);
} else {
- ArmFault *armFault = static_cast<ArmFault *>(fault.get());
- armFault->update(tc);
+ ArmFault *arm_fault = static_cast<ArmFault *>(fault.get());
+ arm_fault->update(tc);
// Set fault bit and FSR
- FSR fsr = armFault->getFsr(tc);
+ FSR fsr = arm_fault->getFsr(tc);
par.f = 0x1; // F bit
par.lpae = fsr.lpae;
- par.ptw = (armFault->iss() >> 7) & 0x1;
- par.s = armFault->isStage2() ? 1 : 0;
+ par.ptw = (arm_fault->iss() >> 7) & 0x1;
+ par.s = arm_fault->isStage2() ? 1 : 0;
if (par.lpae) {
// LPAE - rearange fault status
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/33434
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I6263b105f8757b34dd15a06b16abe7289073614d
Gerrit-Change-Number: 33434
Gerrit-PatchSet: 3
Gerrit-Owner: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Nikos Nikoleris <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
