Commit ef682cdb authored by Richard Henderson's avatar Richard Henderson Committed by Peter Maydell
Browse files

target/arm: Enable API, APK bits in SCR, HCR 



These bits become writable with the ARMv8.3-PAuth extension.

Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Message-id: 20190129143511.12311-1-richard.henderson@linaro.org
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 4e7beb0c

target/arm/helper.c

+6 −0
Original line number Diff line number Diff line
@@ -1859,6 +1859,9 @@ static void scr_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) 
    if (cpu_isar_feature(aa64_lor, cpu)) {

        valid_mask |= SCR_TLOR;

    }

    if (cpu_isar_feature(aa64_pauth, cpu)) {

        valid_mask |= SCR_API | SCR_APK;

    }



    /* Clear all-context RES0 bits.  */

    value &= valid_mask;
@@ -4558,6 +4561,9 @@ static void hcr_write(CPUARMState *env, const ARMCPRegInfo *ri, uint64_t value) 
    if (cpu_isar_feature(aa64_lor, cpu)) {

        valid_mask |= HCR_TLOR;

    }

    if (cpu_isar_feature(aa64_pauth, cpu)) {

        valid_mask |= HCR_API | HCR_APK;

    }



    /* Clear RES0 bits.  */

    value &= valid_mask;