mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 00:03:54 -06:00
target/arm: Implement ARMv8.0-PredInv
Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20190301200501.16533-4-richard.henderson@linaro.org Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
9888bd1e20
commit
cb570bd318
4 changed files with 70 additions and 1 deletions
|
@ -5719,6 +5719,50 @@ static const ARMCPRegInfo pauth_reginfo[] = {
|
|||
};
|
||||
#endif
|
||||
|
||||
static CPAccessResult access_predinv(CPUARMState *env, const ARMCPRegInfo *ri,
|
||||
bool isread)
|
||||
{
|
||||
int el = arm_current_el(env);
|
||||
|
||||
if (el == 0) {
|
||||
uint64_t sctlr = arm_sctlr(env, el);
|
||||
if (!(sctlr & SCTLR_EnRCTX)) {
|
||||
return CP_ACCESS_TRAP;
|
||||
}
|
||||
} else if (el == 1) {
|
||||
uint64_t hcr = arm_hcr_el2_eff(env);
|
||||
if (hcr & HCR_NV) {
|
||||
return CP_ACCESS_TRAP_EL2;
|
||||
}
|
||||
}
|
||||
return CP_ACCESS_OK;
|
||||
}
|
||||
|
||||
static const ARMCPRegInfo predinv_reginfo[] = {
|
||||
{ .name = "CFP_RCTX", .state = ARM_CP_STATE_AA64,
|
||||
.opc0 = 1, .opc1 = 3, .crn = 7, .crm = 3, .opc2 = 4,
|
||||
.type = ARM_CP_NOP, .access = PL0_W, .accessfn = access_predinv },
|
||||
{ .name = "DVP_RCTX", .state = ARM_CP_STATE_AA64,
|
||||
.opc0 = 1, .opc1 = 3, .crn = 7, .crm = 3, .opc2 = 5,
|
||||
.type = ARM_CP_NOP, .access = PL0_W, .accessfn = access_predinv },
|
||||
{ .name = "CPP_RCTX", .state = ARM_CP_STATE_AA64,
|
||||
.opc0 = 1, .opc1 = 3, .crn = 7, .crm = 3, .opc2 = 7,
|
||||
.type = ARM_CP_NOP, .access = PL0_W, .accessfn = access_predinv },
|
||||
/*
|
||||
* Note the AArch32 opcodes have a different OPC1.
|
||||
*/
|
||||
{ .name = "CFPRCTX", .state = ARM_CP_STATE_AA32,
|
||||
.cp = 15, .opc1 = 0, .crn = 7, .crm = 3, .opc2 = 4,
|
||||
.type = ARM_CP_NOP, .access = PL0_W, .accessfn = access_predinv },
|
||||
{ .name = "DVPRCTX", .state = ARM_CP_STATE_AA32,
|
||||
.cp = 15, .opc1 = 0, .crn = 7, .crm = 3, .opc2 = 5,
|
||||
.type = ARM_CP_NOP, .access = PL0_W, .accessfn = access_predinv },
|
||||
{ .name = "CPPRCTX", .state = ARM_CP_STATE_AA32,
|
||||
.cp = 15, .opc1 = 0, .crn = 7, .crm = 3, .opc2 = 7,
|
||||
.type = ARM_CP_NOP, .access = PL0_W, .accessfn = access_predinv },
|
||||
REGINFO_SENTINEL
|
||||
};
|
||||
|
||||
void register_cp_regs_for_features(ARMCPU *cpu)
|
||||
{
|
||||
/* Register all the coprocessor registers based on feature bits */
|
||||
|
@ -6618,6 +6662,17 @@ void register_cp_regs_for_features(ARMCPU *cpu)
|
|||
define_arm_cp_regs(cpu, pauth_reginfo);
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* While all v8.0 cpus support aarch64, QEMU does have configurations
|
||||
* that do not set ID_AA64ISAR1, e.g. user-only qemu-arm -cpu max,
|
||||
* which will set ID_ISAR6.
|
||||
*/
|
||||
if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64)
|
||||
? cpu_isar_feature(aa64_predinv, cpu)
|
||||
: cpu_isar_feature(aa32_predinv, cpu)) {
|
||||
define_arm_cp_regs(cpu, predinv_reginfo);
|
||||
}
|
||||
}
|
||||
|
||||
void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue