Message ID | 1392659525-8335-1-git-send-email-peter.maydell@linaro.org |
---|---|
State | Superseded |
Headers | show |
diff --git a/target-arm/helper.c b/target-arm/helper.c index 5ae08c9..eb5f521 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -1082,8 +1082,8 @@ static int ats_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) env->cp15.c7_par = phys_addr & 0xfffff000; } } else { - env->cp15.c7_par = ((ret & (10 << 1)) >> 5) | - ((ret & (12 << 1)) >> 6) | + env->cp15.c7_par = ((ret & (1 << 10)) >> 5) | + ((ret & (1 << 12)) >> 6) | ((ret & 0xf) << 1) | 1; } env->cp15.c7_par_hi = 0;
Correct some obviously nonsensical bit manipulation spotted by Coverity when constructing the short-form PAR value for ATS operations. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- Presumably most guests don't actually care what the exact cause of a fault was when the v-to-p translation they asked for comes back "nope"... target-arm/helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)