Giacomo Travaglini has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/31354 )
Change subject: arch-arm: Reduce boilerplate when extracting SelfDebug from
tc
......................................................................
arch-arm: Reduce boilerplate when extracting SelfDebug from tc
Change-Id: I1746400617be64ac9c2f3194442734e178342909
Signed-off-by: Giacomo Travaglini <[email protected]>
Reviewed-by: Richard Cooper <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/31354
Tested-by: kokoro <[email protected]>
---
M src/arch/arm/faults.cc
M src/arch/arm/insts/pseudo.cc
M src/arch/arm/insts/static_inst.cc
M src/arch/arm/insts/static_inst.hh
M src/arch/arm/isa.hh
M src/arch/arm/isa/insts/ldr.isa
M src/arch/arm/isa/insts/ldr64.isa
M src/arch/arm/tlb.cc
8 files changed, 28 insertions(+), 23 deletions(-)
Approvals:
Richard Cooper: Looks good to me, approved
Giacomo Travaglini: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/arm/faults.cc b/src/arch/arm/faults.cc
index 300c82c..07d4ea8 100644
--- a/src/arch/arm/faults.cc
+++ b/src/arch/arm/faults.cc
@@ -723,8 +723,7 @@
bool
ArmFault::vectorCatch(ThreadContext *tc, const StaticInstPtr &inst)
{
- auto *isa = static_cast<ArmISA::ISA *>(tc->getIsaPtr());
- SelfDebug * sd = isa->getSelfDebug();
+ SelfDebug *sd = ArmISA::ISA::getSelfDebug(tc);
VectorCatch* vc = sd->getVectorCatch(tc);
if (!vc->isVCMatch()) {
Fault fault = sd->testVectorCatch(tc, 0x0, this);
diff --git a/src/arch/arm/insts/pseudo.cc b/src/arch/arm/insts/pseudo.cc
index 3fe2dfa..bf1fecc 100644
--- a/src/arch/arm/insts/pseudo.cc
+++ b/src/arch/arm/insts/pseudo.cc
@@ -201,8 +201,11 @@
PCState pc_state(xc->pcState());
pc_state.debugStep(false);
xc->pcState(pc_state);
- auto *isa = static_cast<ArmISA::ISA *>(xc->tcBase()->getIsaPtr());
- bool ldx = isa->getSelfDebug()->getSstep()->getLdx();
+
+ SelfDebug *sd = ArmISA::ISA::getSelfDebug(xc->tcBase());
+
+ bool ldx = sd->getSstep()->getLdx();
+
return std::make_shared<SoftwareStepFault>(machInst, ldx,
pc_state.stepped());
diff --git a/src/arch/arm/insts/static_inst.cc
b/src/arch/arm/insts/static_inst.cc
index 12586c7..2281491 100644
--- a/src/arch/arm/insts/static_inst.cc
+++ b/src/arch/arm/insts/static_inst.cc
@@ -1192,8 +1192,8 @@
new_cpsr.daif = spsr.daif;
}
- auto *isa = static_cast<ArmISA::ISA *>(tc->getIsaPtr());
- SoftwareStep * ss = (isa->getSelfDebug())->getSstep();
+ SelfDebug *sd = ArmISA::ISA::getSelfDebug(tc);
+ SoftwareStep *ss = sd->getSstep();
new_cpsr.ss = ss->debugExceptionReturnSS(tc, spsr, dest,
new_cpsr.width);
return new_cpsr;
diff --git a/src/arch/arm/insts/static_inst.hh
b/src/arch/arm/insts/static_inst.hh
index 2677a10..e101d93 100644
--- a/src/arch/arm/insts/static_inst.hh
+++ b/src/arch/arm/insts/static_inst.hh
@@ -203,8 +203,7 @@
static void
activateBreakpoint(ThreadContext *tc)
{
- auto *isa = static_cast<ArmISA::ISA *>(tc->getIsaPtr());
- SelfDebug * sd = isa->getSelfDebug();
+ SelfDebug *sd = ArmISA::ISA::getSelfDebug(tc);
sd->activateDebug();
}
diff --git a/src/arch/arm/isa.hh b/src/arch/arm/isa.hh
index 3b90de1..1713da0 100644
--- a/src/arch/arm/isa.hh
+++ b/src/arch/arm/isa.hh
@@ -466,10 +466,19 @@
void initID64(const ArmISAParams *p);
public:
- SelfDebug * getSelfDebug()
+ SelfDebug*
+ getSelfDebug() const
{
return selfDebug;
}
+
+ static SelfDebug*
+ getSelfDebug(ThreadContext *tc)
+ {
+ auto *arm_isa = static_cast<ArmISA::ISA *>(tc->getIsaPtr());
+ return arm_isa->getSelfDebug();
+ }
+
RegVal readMiscRegNoEffect(int misc_reg) const;
RegVal readMiscReg(int misc_reg);
void setMiscRegNoEffect(int misc_reg, RegVal val);
diff --git a/src/arch/arm/isa/insts/ldr.isa b/src/arch/arm/isa/insts/ldr.isa
index 37abb64..d7e27a4 100644
--- a/src/arch/arm/isa/insts/ldr.isa
+++ b/src/arch/arm/isa/insts/ldr.isa
@@ -211,9 +211,8 @@
if self.flavor in ('exclusive', 'acex'):
accCode += '''
- auto *isa = static_cast<ArmISA::ISA
*>(xc->tcBase()->getIsaPtr());
- SelfDebug * sd = isa->getSelfDebug();
- sd->getSstep()->setLdx();
+ SelfDebug *sd = ArmISA::ISA::getSelfDebug(xc->tcBase());
+ sd->getSstep()->setLdx();
'''
self.codeBlobs["memacc_code"] = accCode
@@ -293,9 +292,8 @@
'''
if self.flavor in ('exclusive', 'acex'):
accCode += '''
- auto *isa = static_cast<ArmISA::ISA
*>(xc->tcBase()->getIsaPtr());
- SelfDebug * sd = isa->getSelfDebug();
- sd->getSstep()->setLdx();
+ SelfDebug *sd = ArmISA::ISA::getSelfDebug(xc->tcBase());
+ sd->getSstep()->setLdx();
'''
self.codeBlobs["memacc_code"] = accCode
diff --git a/src/arch/arm/isa/insts/ldr64.isa
b/src/arch/arm/isa/insts/ldr64.isa
index c9db190..2cbc8b6 100644
--- a/src/arch/arm/isa/insts/ldr64.isa
+++ b/src/arch/arm/isa/insts/ldr64.isa
@@ -243,9 +243,8 @@
accCode = accCode % buildMemSuffix(self.sign, self.size)
if self.flavor in ('exclusive', 'acex'):
accCode += '''
- auto *isa = static_cast<ArmISA::ISA
*>(xc->tcBase()->getIsaPtr());
- SelfDebug * sd = isa->getSelfDebug();
- sd->getSstep()->setLdx();
+ SelfDebug *sd = ArmISA::ISA::getSelfDebug(xc->tcBase());
+ sd->getSstep()->setLdx();
'''
self.codeBlobs["memacc_code"] = accCode
if accEpilogCode:
@@ -344,9 +343,8 @@
'''
if self.flavor in ('exp', 'acexp'):
accCode += '''
- auto *isa = static_cast<ArmISA::ISA
*>(xc->tcBase()->getIsaPtr());
- SelfDebug * sd = isa->getSelfDebug();
- sd->getSstep()->setLdx();
+ SelfDebug *sd = ArmISA::ISA::getSelfDebug(xc->tcBase());
+ sd->getSstep()->setLdx();
'''
self.codeBlobs["memacc_code"] = accCode
if accEpilogCode:
diff --git a/src/arch/arm/tlb.cc b/src/arch/arm/tlb.cc
index a6205ce..f67475b 100644
--- a/src/arch/arm/tlb.cc
+++ b/src/arch/arm/tlb.cc
@@ -1234,8 +1234,7 @@
//Check for Debug Exceptions
if (fault == NoFault) {
- auto *isa = static_cast<ArmISA::ISA *>(tc->getIsaPtr());
- SelfDebug *sd = isa->getSelfDebug();
+ SelfDebug *sd = ArmISA::ISA::getSelfDebug(tc);
fault = sd->testDebug(tc, req, mode);
}
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/31354
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: I1746400617be64ac9c2f3194442734e178342909
Gerrit-Change-Number: 31354
Gerrit-PatchSet: 3
Gerrit-Owner: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Richard Cooper <[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
