| Message ID | 20230222193544.3392713-4-aaron@os.amperecomputing.com |
|---|---|
| State | New |
| Headers | show |
| Series | Implement Most ARMv8.3 Pointer Authentication Features | expand |
On 2/22/23 09:35, Aaron Lindsay wrote: > Signed-off-by: Aaron Lindsay<aaron@os.amperecomputing.com> > Reviewed-by: Peter Maydell<peter.maydell@linaro.org> > --- > target/arm/pauth_helper.c | 14 +++++++++----- > 1 file changed, 9 insertions(+), 5 deletions(-) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
On 2/22/23 09:35, Aaron Lindsay wrote:
> + if (cpu_isar_feature(aa64_pauth_epac, env_archcpu(env))) {
It might be cleaner, especially later, to have
ARMCPU *cpu = env_archcpu(env);
at the top of the function.
r~
diff --git a/target/arm/pauth_helper.c b/target/arm/pauth_helper.c index f525ef7fad..a83956652f 100644 --- a/target/arm/pauth_helper.c +++ b/target/arm/pauth_helper.c @@ -347,11 +347,15 @@ static uint64_t pauth_addpac(CPUARMState *env, uint64_t ptr, uint64_t modifier, */ test = sextract64(ptr, bot_bit, top_bit - bot_bit); if (test != 0 && test != -1) { - /* - * Note that our top_bit is one greater than the pseudocode's - * version, hence "- 2" here. - */ - pac ^= MAKE_64BIT_MASK(top_bit - 2, 1); + if (cpu_isar_feature(aa64_pauth_epac, env_archcpu(env))) { + pac = 0; + } else { + /* + * Note that our top_bit is one greater than the pseudocode's + * version, hence "- 2" here. + */ + pac ^= MAKE_64BIT_MASK(top_bit - 2, 1); + } } /*