From ecd1e05f5725832c2d5dfdc53f4c4100bf763284 Mon Sep 17 00:00:00 2001 From: Giacomo Travaglini Date: Wed, 8 Jul 2020 14:39:36 +0100 Subject: [PATCH] arch-arm: Fix coding style in self_debug.[cc, hh] Change-Id: I67be98af412b745ea9e16d4e8c6d422c9fbb29fc Signed-off-by: Giacomo Travaglini Reviewed-by: Nikos Nikoleris Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/31082 Reviewed-by: Andreas Sandberg Maintainer: Andreas Sandberg Tested-by: kokoro --- src/arch/arm/self_debug.cc | 218 +++++++++++++++++++++--------------- src/arch/arm/self_debug.hh | 220 ++++++++++++++++--------------------- 2 files changed, 229 insertions(+), 209 deletions(-) diff --git a/src/arch/arm/self_debug.cc b/src/arch/arm/self_debug.cc index 63ddb4565..94d2f231a 100644 --- a/src/arch/arm/self_debug.cc +++ b/src/arch/arm/self_debug.cc @@ -107,7 +107,7 @@ SelfDebug::testBreakPoints(ThreadContext *tc, Addr vaddr) Fault -SelfDebug::triggerException(ThreadContext * tc, Addr vaddr) +SelfDebug::triggerException(ThreadContext *tc, Addr vaddr) { if (to32) { return std::make_shared(vaddr, @@ -164,15 +164,17 @@ bool SelfDebug::isDebugEnabledForEL64(ThreadContext *tc, ExceptionLevel el, bool secure, bool mask) { - bool route_to_el2 = ArmSystem::haveEL(tc, EL2) - && !secure && enableTdeTge; - ExceptionLevel target_el = route_to_el2? EL2 : EL1; - if (oslk || (bSDD && secure && ArmSystem::haveEL(tc, EL3))){ + bool route_to_el2 = ArmSystem::haveEL(tc, EL2) && + !secure && enableTdeTge; + + ExceptionLevel target_el = route_to_el2 ? EL2 : EL1; + if (oslk || (bSDD && secure && ArmSystem::haveEL(tc, EL3))) { return false; } - if (el == target_el){ + + if (el == target_el) { return bKDE && !mask; - }else{ + } else { return target_el > el; } } @@ -181,15 +183,16 @@ bool SelfDebug::isDebugEnabledForEL32(ThreadContext *tc, ExceptionLevel el, bool secure, bool mask) { - if (el==EL0 && !ELStateUsingAArch32(tc, EL1, secure)){ + if (el == EL0 && !ELStateUsingAArch32(tc, EL1, secure)) { return isDebugEnabledForEL64(tc, el, secure, mask); } - if (oslk){ + + if (oslk) { return false; } bool enabled; - if (secure && ArmSystem::haveEL(tc, EL3)){ + if (secure && ArmSystem::haveEL(tc, EL3)) { // We ignore the check for invasive External debug checking SPIDEN // and DBGEN signals. They are not implemented bool spd32 = bits(tc->readMiscReg(MISCREG_MDCR_EL3), 14); @@ -197,9 +200,7 @@ SelfDebug::isDebugEnabledForEL32(ThreadContext *tc, ExceptionLevel el, bool suiden = bits(tc->readMiscReg(MISCREG_SDER), 0); enabled = el == EL0 ? (enabled || suiden) : enabled; - } - else - { + } else { enabled = el != EL2; } return enabled; @@ -306,6 +307,61 @@ BrkPoint::test(ThreadContext *tc, Addr pc, ExceptionLevel el, DBGBCR ctr, return v; } +void +SelfDebug::init(ThreadContext *tc) +{ + if (initialized) + return; + CPSR cpsr = tc->readMiscReg(MISCREG_CPSR); + aarch32 = cpsr.width == 1; + + const AA64DFR0 dfr = tc->readMiscReg(MISCREG_ID_AA64DFR0_EL1); + const AA64MMFR2 mm_fr2 = tc->readMiscReg(MISCREG_ID_AA64MMFR2_EL1); + const AA64MMFR1 mm_fr1 = tc->readMiscReg(MISCREG_ID_AA64MMFR1_EL1); + + for (int i = 0; i <= dfr.brps; i++) { + const bool isctxaw = i >= (dfr.brps - dfr.ctx_cmps); + + BrkPoint bkp = BrkPoint((MiscRegIndex)(MISCREG_DBGBCR0_EL1 + i), + (MiscRegIndex)(MISCREG_DBGBVR0_EL1 + i), + this, isctxaw, (bool)mm_fr2.varange, + mm_fr1.vmidbits, aarch32); + const DBGBCR ctr = tc->readMiscReg(MISCREG_DBGBCR0_EL1 + i); + + bkp.updateControl(ctr); + arBrkPoints.push_back(bkp); + } + + for (int i = 0; i <= dfr.wrps; i++) { + WatchPoint wtp = WatchPoint((MiscRegIndex)(MISCREG_DBGWCR0 + i), + (MiscRegIndex)(MISCREG_DBGWVR0 + i), + this, (bool)mm_fr2.varange, aarch32); + const DBGWCR ctr = tc->readMiscReg(MISCREG_DBGWCR0 + i); + + wtp.updateControl(ctr); + arWatchPoints.push_back(wtp); + } + + initialized = true; + + RegVal oslar_el1 = tc->readMiscReg(MISCREG_OSLAR_EL1); + updateOSLock(oslar_el1); + // Initialize preloaded control booleans + uint64_t mdscr_el1 = tc->readMiscReg(MISCREG_MDSCR_EL1); + setMDSCRvals(mdscr_el1); + + const uint64_t mdcr_el3 = tc->readMiscReg(MISCREG_MDCR_EL3); + setbSDD(mdcr_el3); + + const HCR hcr = tc->readMiscReg(MISCREG_HCR_EL2); + const HDCR mdcr = tc->readMiscRegNoEffect(MISCREG_MDCR_EL2); + setenableTDETGE(hcr, mdcr); + + // Enable Vector Catch Exceptions + const DEVID dvid = tc->readMiscReg(MISCREG_DBGDEVID0); + vcExcpt = new VectorCatch(dvid.vectorcatch==0x0, this); +} + bool BrkPoint::testAddrMatch(ThreadContext *tc, Addr in_pc, uint8_t bas) { @@ -316,7 +372,7 @@ BrkPoint::testAddrMatch(ThreadContext *tc, Addr in_pc, uint8_t bas) CPSR cpsr = tc->readMiscReg(MISCREG_CPSR); bool thumb = cpsr.t; - if (thumb){ + if (thumb) { if (bas == 0xc) prs = bits(in_pc, 1, 0) == 0x2; else if (bas == 0x3) @@ -336,7 +392,7 @@ BrkPoint::testAddrMissMatch(ThreadContext *tc, Addr in_pc, uint8_t bas) CPSR cpsr = tc->readMiscReg(MISCREG_CPSR); bool thumb = cpsr.t; - if (thumb){ + if (thumb) { if (bas == 0xc) prs = bits(in_pc, 1, 0) == 0x2; else if (bas == 0x3) @@ -354,11 +410,11 @@ BrkPoint::testContextMatch(ThreadContext *tc, bool ctx1) ExceptionLevel el = currEL(tc); bool a32 = conf->isAArch32(); - if (ctx1){ - miscridx = a32? MISCREG_CONTEXTIDR: MISCREG_CONTEXTIDR_EL1; - if ((el == EL3 && !a32) || el ==EL2) + if (ctx1) { + miscridx = a32? MISCREG_CONTEXTIDR : MISCREG_CONTEXTIDR_EL1; + if ((el == EL3 && !a32) || el == EL2) return false; - }else{ + } else { miscridx = MISCREG_CONTEXTIDR_EL2; if (el == EL2 && a32) return false; @@ -366,7 +422,7 @@ BrkPoint::testContextMatch(ThreadContext *tc, bool ctx1) RegVal ctxid = tc->readMiscReg(miscridx); RegVal v = getContextfromReg(tc, ctx1); - return (v== ctxid); + return (v == ctxid); } bool @@ -386,36 +442,33 @@ BrkPoint::testVMIDMatch(ThreadContext *tc) bool -BrkPoint::isEnabled(ThreadContext* tc, ExceptionLevel el, - uint8_t hmc, uint8_t ssc, uint8_t pmc){ +BrkPoint::isEnabled(ThreadContext *tc, ExceptionLevel el, + uint8_t hmc, uint8_t ssc, uint8_t pmc) +{ bool v; bool aarch32 = conf->isAArch32(); - bool noEL2 = !ArmSystem::haveEL(tc, EL2); - bool noEL3 = !ArmSystem::haveEL(tc, EL3); + bool no_el2 = !ArmSystem::haveEL(tc, EL2); + bool no_el3 = !ArmSystem::haveEL(tc, EL3); - if (noEL3 && !noEL2 && (ssc==0x1 || ssc==0x2) - && !(hmc && ssc == 0x1 && pmc==0x0)){ + if (no_el3 && !no_el2 && (ssc == 0x1 || ssc == 0x2) && + !(hmc && ssc == 0x1 && pmc == 0x0)) { return false; - } - else if (noEL3 && noEL2 &&( hmc != 0x0 || ssc !=0x0) - && !(!aarch32 && ((hmc && ssc == 0x1 && pmc == 0x0) - || ssc == 0x3))){ + } else if (no_el3 && no_el2 && (hmc != 0x0 || ssc != 0x0) && + !(!aarch32 && ((hmc && ssc == 0x1 && pmc == 0x0) || ssc == 0x3))) { return false; - } - else if (noEL2 && hmc && ssc == 0x3 && pmc == 0x0){ + } else if (no_el2 && hmc && ssc == 0x3 && pmc == 0x0) { return false; - } - else if (ssc == 0x11 && pmc==0x1 && - !(!aarch32 && hmc && ssc == 0x3 &&pmc == 0x0)){ + } else if (ssc == 0x11 && pmc == 0x1 && + !(!aarch32 && hmc && ssc == 0x3 && pmc == 0x0)) { // AND secureEL2 not implemented return false; - } - else if (hmc && ssc == 0x1 && pmc == 0x0){//AND secureEL2 not implemented + } else if (hmc && ssc == 0x1 && pmc == 0x0) { + //AND secureEL2 not implemented return false; } switch (el) { case EL0: - v = (pmc == 0x3) || (pmc == 0x2 && hmc == 0x0) ; + v = (pmc == 0x3) || (pmc == 0x2 && hmc == 0x0); if (aarch32) v = v || (pmc == 0x0 && ssc != 0x3 && hmc == 0x0); if (v && ssc == 0x3) @@ -428,7 +481,7 @@ BrkPoint::isEnabled(ThreadContext* tc, ExceptionLevel el, break; case EL2: v = (ssc == 0x3) || - ((hmc == 0x1) && !((ssc==0x2) && (pmc == 0x0))); + ((hmc == 0x1) && !((ssc == 0x2) && (pmc == 0x0))); if (v && pmc == 0x2) panic("Unexpected EL in SelfDebug::isDebugEnabled.\n"); break; @@ -460,42 +513,41 @@ WatchPoint::isEnabled(ThreadContext* tc, ExceptionLevel el, bool v; bool aarch32 = conf->isAArch32(); - bool noEL2 = !ArmSystem::haveEL(tc, EL2); - bool noEL3 = !ArmSystem::haveEL(tc, EL3); + bool no_el2 = !ArmSystem::haveEL(tc, EL2); + bool no_el3 = !ArmSystem::haveEL(tc, EL3); - if (aarch32){ + if (aarch32) { // WatchPoint PL2 using aarch32 is disabled except for // debug state. Check G2-5395 table G2-15. - if (el==EL2) + if (el == EL2) return false; - if (noEL3){ - if (ssc == 0x01 || ssc == 0x02){ + if (no_el3) { + if (ssc == 0x01 || ssc == 0x02 ){ return false; - } - else if (noEL2 && ((!hmc && ssc==0x3) || (hmc && ssc==0x0))) - { + } else if (no_el2 && + ((!hmc && ssc == 0x3) || (hmc && ssc == 0x0))) { return false; } } - if (noEL2 && hmc && ssc == 0x03 && pac == 0) + if (no_el2 && hmc && ssc == 0x03 && pac == 0) return false; } switch (el) { - case EL0: - v = (pac == 0x3 || (pac == 0x2 && !hmc && ssc != 0x3)); - break; - case EL1: - v = (pac == 0x1 || pac == 0x3); - break; - case EL2: - v = (hmc && (ssc != 0x2 || pac != 0x0)); - break; - case EL3: - v = (hmc && (ssc == 0x2 || - (ssc == 0x1 && (pac == 0x1 || pac == 0x3)))); - break; - default: - panic("Unexpected EL in WatchPoint::isEnabled.\n"); + case EL0: + v = (pac == 0x3 || (pac == 0x2 && !hmc && ssc != 0x3)); + break; + case EL1: + v = (pac == 0x1 || pac == 0x3); + break; + case EL2: + v = (hmc && (ssc != 0x2 || pac != 0x0)); + break; + case EL3: + v = (hmc && (ssc == 0x2 || + (ssc == 0x1 && (pac == 0x1 || pac == 0x3)))); + break; + default: + panic("Unexpected EL in WatchPoint::isEnabled.\n"); } return v && SelfDebug::securityStateMatch(tc, ssc, hmc); } @@ -508,14 +560,13 @@ WatchPoint::test(ThreadContext *tc, Addr addr, ExceptionLevel el, bool& wrt, bool v = false; const DBGWCR ctr = tc->readMiscReg(ctrlRegIndex); if (isEnabled(tc, el, ctr.hmc, ctr.ssc, ctr.pac) && - ((wrt && (ctr.lsv & 0x2)) || (!wrt && (ctr.lsv & 0x1)) || atomic)) - { + ((wrt && (ctr.lsv & 0x2)) || (!wrt && (ctr.lsv & 0x1)) || atomic)) { v = compareAddress(tc, addr, ctr.bas, ctr.mask, size); - if (ctr.wt){ + if (ctr.wt) { v = v && (conf->getBrkPoint(ctr.lbn))->testLinkedBk(tc, addr, el); } } - if (atomic && (ctr.lsv & 0x1)){ + if (atomic && (ctr.lsv & 0x1)) { wrt = false; } return v; @@ -533,38 +584,33 @@ WatchPoint::compareAddress(ThreadContext *tc, Addr in_addr, uint8_t bas, if (bas == 0x0) return false; - if (mask == 0x0){ - - for (int i=0; i < maxbits; i++){ + if (mask == 0x0) { + for (int i = 0; i < maxbits; i++) { uint8_t bas_m = 0x1 << i; uint8_t masked_bas = bas & bas_m; - if (masked_bas == bas_m){ + if (masked_bas == bas_m) { uint8_t off = log2(masked_bas); Addr cmpaddr = addr_tocmp | off; - for (int j=0; j bottom){ + if (mask > bottom) { addr = bits((in_addr+j), maxAddrSize, mask); compaddr = bits(addr_tocmp, maxAddrSize, mask); - } - else{ + } else { addr = bits((in_addr+j), maxAddrSize, bottom); compaddr = bits(addr_tocmp, maxAddrSize, bottom); } - v = v || (addr==compaddr) ; + v = v || (addr == compaddr); } return v; } @@ -609,7 +655,7 @@ SoftwareStep::advanceSS(ThreadContext * tc) PCState pc = tc->pcState(); bool res = false; - switch (stateSS){ + switch (stateSS) { case INACTIVE_STATE: pc.debugStep(false); break; @@ -636,14 +682,14 @@ SoftwareStep::advanceSS(ThreadContext * tc) break; default: - break; + break; } return res; } Fault SelfDebug::testVectorCatch(ThreadContext *tc, Addr addr, - ArmFault* fault) + ArmFault *fault) { setAArch32(tc); diff --git a/src/arch/arm/self_debug.hh b/src/arch/arm/self_debug.hh index c185223a4..9dd6e228e 100644 --- a/src/arch/arm/self_debug.hh +++ b/src/arch/arm/self_debug.hh @@ -62,7 +62,7 @@ class BrkPoint SelfDebug * conf; bool isCntxtAware; bool VMID16enabled; - Addr active_pc; + Addr activePc; bool enable; int maxAddrSize; bool onUse; @@ -70,12 +70,12 @@ class BrkPoint public: friend class SelfDebug; - BrkPoint(MiscRegIndex _ctrlIndex, MiscRegIndex _valIndex, - MiscRegIndex _xIndex, SelfDebug* _conf, bool _ctxAw, bool lva, + BrkPoint(MiscRegIndex ctrl_index, MiscRegIndex val_index, + SelfDebug* _conf, bool ctx_aw, bool lva, bool vmid16, bool aarch32): - ctrlRegIndex(_ctrlIndex), valRegIndex(_valIndex), - conf(_conf), isCntxtAware(_ctxAw), - VMID16enabled(vmid16), active_pc(0x0), enable(false) + ctrlRegIndex(ctrl_index), valRegIndex(val_index), + conf(_conf), isCntxtAware(ctx_aw), + VMID16enabled(vmid16), activePc(0x0), enable(false) { maxAddrSize = lva ? 52: 48 ; maxAddrSize = aarch32 ? 31 : maxAddrSize; @@ -87,12 +87,14 @@ class BrkPoint bool from_link); protected: - inline Addr getAddrfromReg(ThreadContext *tc) + inline Addr + getAddrfromReg(ThreadContext *tc) const { return bits(tc->readMiscReg(valRegIndex), maxAddrSize, 2); } - inline RegVal getContextfromReg(ThreadContext *tc, bool ctxid1) + inline RegVal + getContextfromReg(ThreadContext *tc, bool ctxid1) const { if (ctxid1) return bits(tc->readMiscReg(valRegIndex), 31, 0); @@ -108,24 +110,30 @@ class BrkPoint bool testAddrMissMatch(ThreadContext *tc, Addr pc, uint8_t bas); bool testContextMatch(ThreadContext *tc, bool ctx1); bool testVMIDMatch(ThreadContext *tc); - const DBGBCR getControlReg(ThreadContext *tc) + + const DBGBCR + getControlReg(ThreadContext *tc) { - const DBGBCR ctr = tc->readMiscReg(ctrlRegIndex); - return ctr; + return tc->readMiscReg(ctrlRegIndex); } + bool isEnabled(ThreadContext* tc, ExceptionLevel el, uint8_t hmc, uint8_t ssc, uint8_t pmc); - bool isActive(Addr vaddr) + + bool + isActive(Addr vaddr) { - if (vaddr==active_pc){ - active_pc = 0x0; + if (vaddr == activePc) { + activePc = 0x0; return false; - }else{ - active_pc = vaddr; + } else { + activePc = vaddr; return true; } } - inline void updateControl(DBGBCR val) + + inline void + updateControl(DBGBCR val) { enable = val.e == 0x1; } @@ -143,10 +151,10 @@ class WatchPoint public: friend class SelfDebug; - WatchPoint(MiscRegIndex _ctrlIndex, MiscRegIndex _valIndex, - SelfDebug* _conf, bool lva, bool aarch32): - ctrlRegIndex(_ctrlIndex), - valRegIndex(_valIndex), conf(_conf), enable(false) + WatchPoint(MiscRegIndex ctrl_index, MiscRegIndex val_index, + SelfDebug* _conf, bool lva, bool aarch32) : + ctrlRegIndex(ctrl_index), + valRegIndex(val_index), conf(_conf), enable(false) { maxAddrSize = lva ? 52: 48 ; maxAddrSize = aarch32 ? 31 : maxAddrSize; @@ -155,18 +163,21 @@ class WatchPoint bool compareAddress(ThreadContext *tc, Addr in_addr, uint8_t bas, uint8_t mask, unsigned size); - inline Addr getAddrfromReg(ThreadContext *tc) + inline Addr + getAddrfromReg(ThreadContext *tc) { return bits(tc->readMiscReg(valRegIndex), maxAddrSize, 0); } - inline bool isDoubleAligned(Addr addr) + inline bool + isDoubleAligned(Addr addr) { return addr & 0x4; } - inline void updateControl(DBGWCR val) + inline void + updateControl(DBGWCR val) { enable = val.e == 0x1; } @@ -179,53 +190,56 @@ class WatchPoint class SoftwareStep { - private: static const uint8_t INACTIVE_STATE = 0; static const uint8_t ACTIVE_PENDING_STATE = 1; static const uint8_t ACTIVE_NOT_PENDING_STATE = 2; - bool bSS; int stateSS; - SelfDebug * conf; + SelfDebug *conf; bool steppedLdx; bool prevSteppedLdx; bool cpsrD; public: - SoftwareStep(SelfDebug* s): bSS(false), stateSS(INACTIVE_STATE), - conf(s), steppedLdx(false) { } - - ~SoftwareStep() { } + SoftwareStep(SelfDebug *s) + : bSS(false), stateSS(INACTIVE_STATE), + conf(s), steppedLdx(false) + {} bool debugExceptionReturnSS(ThreadContext *tc, CPSR spsr, ExceptionLevel dest, bool aarch32); - bool advanceSS(ThreadContext * tc); + bool advanceSS(ThreadContext *tc); - inline void setCPSRD(bool val) + inline void + setCPSRD(bool val) { cpsrD = val; } - inline void setEnableSS(bool val) + inline void + setEnableSS(bool val) { bSS = val; } - void setLdx() + void + setLdx() { prevSteppedLdx = steppedLdx; steppedLdx = true; } - void clearLdx() + void + clearLdx() { prevSteppedLdx = steppedLdx; steppedLdx = false; } - bool getLdx() + bool + getLdx() const { return prevSteppedLdx; } @@ -245,13 +259,12 @@ class VectorCatch bool addressMatching(ThreadContext *tc, Addr addr, ExceptionLevel el); bool exceptionTrapping(ThreadContext *tc, ExceptionLevel el, ArmFault* fault); - bool isVCMatch() - { - return vcmatch; - } + + bool isVCMatch() const { return vcmatch; } private: - Addr getVectorBase(ThreadContext *tc, bool monitor) + Addr + getVectorBase(ThreadContext *tc, bool monitor) { if (monitor) { return tc->readMiscReg(MISCREG_MVBAR) & ~0x1F; @@ -289,8 +302,9 @@ class SelfDebug bool to32; public: - SelfDebug(): initialized(false), enableTdeTge(false), - enableFlag(false), bSDD(false), bKDE(false), oslk(false) + SelfDebug() + : initialized(false), enableTdeTge(false), + enableFlag(false), bSDD(false), bKDE(false), oslk(false) { softStep = new SoftwareStep(this); } @@ -315,7 +329,8 @@ class SelfDebug public: Fault testVectorCatch(ThreadContext *tc, Addr addr, ArmFault* flt); - inline BrkPoint* getBrkPoint(uint8_t index) + inline BrkPoint* + getBrkPoint(uint8_t index) { return &arBrkPoints[index]; } @@ -323,8 +338,7 @@ class SelfDebug static inline bool securityStateMatch(ThreadContext *tc, uint8_t ssc, bool hmc) { - switch(ssc) - { + switch (ssc) { case 0x0: return true; case 0x1: return !inSecureState(tc); case 0x2: return inSecureState(tc); @@ -343,157 +357,117 @@ class SelfDebug bool isDebugEnabledForEL32(ThreadContext *tc, ExceptionLevel el, bool secure, bool mask); - void activateDebug() + void + activateDebug() { for (auto &p: arBrkPoints){ p.onUse = false; } } - inline bool isDebugEnabled(ThreadContext *tc) + inline bool + isDebugEnabled(ThreadContext *tc) { CPSR cpsr = tc->readMiscReg(MISCREG_CPSR); ExceptionLevel el = (ExceptionLevel) currEL(tc); - if (aarch32){ + if (aarch32) { return isDebugEnabledForEL32(tc, el, inSecureState(tc), (bool)cpsr.d == 1); - }else{ + } else { return isDebugEnabledForEL64(tc, el, inSecureState(tc), (bool)cpsr.d == 1 ); } } - inline void setbSDD(RegVal val) + inline void + setbSDD(RegVal val) { bSDD = bits(val, 16); } - inline void setMDSCRvals(RegVal val) + inline void + setMDSCRvals(RegVal val) { enableFlag = bits(val, 15); bKDE = bits(val, 13); softStep->setEnableSS((bool)bits(val, 0)); } - inline void setMDBGen(RegVal val) + inline void + setMDBGen(RegVal val) { enableFlag = bits(val, 15); } - inline void setenableTDETGE(HCR hcr, HDCR mdcr) + inline void + setenableTDETGE(HCR hcr, HDCR mdcr) { enableTdeTge = (mdcr.tde == 0x1 || hcr.tge == 0x1); } - inline void updateOSLock(RegVal val) + inline void + updateOSLock(RegVal val) { oslk = bool(bits(val, 0)); } - inline void updateDBGBCR(int index, DBGBCR val) + inline void + updateDBGBCR(int index, DBGBCR val) { arBrkPoints[index].updateControl(val); } - inline void updateDBGWCR(int index, DBGWCR val) + inline void + updateDBGWCR(int index, DBGWCR val) { arWatchPoints[index].updateControl(val); } - inline void setDebugMask(bool mask) + inline void + setDebugMask(bool mask) { softStep->setCPSRD(mask); } - inline bool isAArch32() + inline bool + isAArch32() const { return aarch32; } - inline void setAArch32(ThreadContext * tc) + inline void + setAArch32(ThreadContext *tc) { - ExceptionLevel fromEL = (ExceptionLevel) currEL(tc); - if (fromEL == EL0) + ExceptionLevel from_el = (ExceptionLevel) currEL(tc); + if (from_el == EL0) aarch32 = ELIs32(tc, EL0) && ELIs32(tc, EL1); else - aarch32 = ELIs32(tc, fromEL); + aarch32 = ELIs32(tc, from_el); return; } - SoftwareStep * getSstep() + SoftwareStep * + getSstep() { return softStep; } - VectorCatch* getVectorCatch(ThreadContext* tc) + VectorCatch* + getVectorCatch(ThreadContext *tc) { if (!initialized) init(tc); return vcExcpt; } - bool targetAArch32(ThreadContext * tc) + bool + targetAArch32(ThreadContext *tc) { ExceptionLevel ELd = debugTargetFrom(tc, inSecureState(tc)); return ELIs32(tc, ELd) && aarch32; } - void init(ThreadContext *tc) - { - if (initialized) - return; - CPSR cpsr = tc->readMiscReg(MISCREG_CPSR); - aarch32 = cpsr.width == 1; - - const AA64DFR0 dfr = tc->readMiscReg(MISCREG_ID_AA64DFR0_EL1); - const AA64MMFR2 mm_fr2 = tc->readMiscReg(MISCREG_ID_AA64MMFR2_EL1); - const AA64MMFR1 mm_fr1 = tc->readMiscReg(MISCREG_ID_AA64MMFR1_EL1); - const uint8_t nCtxtAwareBp = dfr.ctx_cmps; - const bool VMIDBits = mm_fr1.vmidbits; - for (int i=0; i<=dfr.brps; i++) { - const bool isctxaw = i>=(dfr.brps-nCtxtAwareBp); - - BrkPoint bkp = BrkPoint((MiscRegIndex)(MISCREG_DBGBCR0_EL1+i), - (MiscRegIndex)(MISCREG_DBGBVR0_EL1+i), - (MiscRegIndex)(MISCREG_DBGBXVR0+i), - this, isctxaw, (bool)mm_fr2.varange, - VMIDBits, aarch32); - const DBGBCR ctr = tc->readMiscReg(MISCREG_DBGBCR0_EL1+i); - - bkp.updateControl(ctr); - arBrkPoints.push_back(bkp); - } - - for (int i=0; i<=dfr.wrps; i++) { - WatchPoint wtp = WatchPoint((MiscRegIndex)(MISCREG_DBGWCR0+i), - (MiscRegIndex)(MISCREG_DBGWVR0+i), - this, (bool)mm_fr2.varange, aarch32); - const DBGWCR ctr = tc->readMiscReg(MISCREG_DBGWCR0+i); - - wtp.updateControl(ctr); - arWatchPoints.push_back(wtp); - } - - initialized = true; - - RegVal oslar_el1 = tc->readMiscReg(MISCREG_OSLAR_EL1); - updateOSLock(oslar_el1); - // Initialize preloaded control booleans - uint64_t mdscr_el1 = tc->readMiscReg(MISCREG_MDSCR_EL1); - setMDSCRvals(mdscr_el1); - - const uint64_t mdcr_el3 = tc->readMiscReg(MISCREG_MDCR_EL3); - setbSDD(mdcr_el3); - - const HCR hcr = tc->readMiscReg(MISCREG_HCR_EL2); - const HDCR mdcr = tc->readMiscRegNoEffect(MISCREG_MDCR_EL2); - setenableTDETGE(hcr, mdcr); - - // Enable Vector Catch Exceptions - const DEVID dvid = tc->readMiscReg(MISCREG_DBGDEVID0); - vcExcpt = new VectorCatch(dvid.vectorcatch==0x0, this); - - } + void init(ThreadContext *tc); }; } -- 2.30.2