diff options
| author | Aaron Lindsay | 2018-04-26 12:04:38 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-04-26 12:04:38 +0200 |
| commit | ccbc0e338486b21cb0eb52e52cd309bbbe6a7507 (patch) | |
| tree | d3a3826a3f4a5e99d0a3d04d57c2b63cf20a2693 /target | |
| parent | target/arm: Use v7m_stack_read() for reading the frame signature (diff) | |
| download | qemu-ccbc0e338486b21cb0eb52e52cd309bbbe6a7507.tar.gz qemu-ccbc0e338486b21cb0eb52e52cd309bbbe6a7507.tar.xz qemu-ccbc0e338486b21cb0eb52e52cd309bbbe6a7507.zip | |
target/arm: Check PMCNTEN for whether PMCCNTR is enabled
Signed-off-by: Aaron Lindsay <alindsay@codeaurora.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1523997485-1905-2-git-send-email-alindsay@codeaurora.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target')
| -rw-r--r-- | target/arm/helper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/arm/helper.c b/target/arm/helper.c index 0fa02c31e1..1526724d64 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -994,7 +994,7 @@ static inline bool arm_ccnt_enabled(CPUARMState *env) { /* This does not support checking PMCCFILTR_EL0 register */ - if (!(env->cp15.c9_pmcr & PMCRE)) { + if (!(env->cp15.c9_pmcr & PMCRE) || !(env->cp15.c9_pmcnten & (1 << 31))) { return false; } |