target/arm: Move id_pfr0, id_pfr1 into ARMISARegisters

Move the id_pfr0 and id_pfr1 fields into the ARMISARegisters
sub-struct. We're going to want id_pfr1 for an isar_features
check, and moving both at the same time avoids an odd
inconsistency.

Changes other than the ones to cpu.h and kvm64.c made
automatically with:
  perl -p -i -e 's/cpu->id_pfr/cpu->isar.id_pfr/' target/arm/*.c hw/intc/armv7m_nvic.c

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20200910173855.4068-3-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2020-09-10 18:38:52 +01:00
parent 0ae0326b98
commit 8a130a7be6
7 changed files with 44 additions and 40 deletions

View file

@ -906,6 +906,8 @@ struct ARMCPU {
uint32_t id_mmfr2;
uint32_t id_mmfr3;
uint32_t id_mmfr4;
uint32_t id_pfr0;
uint32_t id_pfr1;
uint32_t mvfr0;
uint32_t mvfr1;
uint32_t mvfr2;
@ -926,8 +928,6 @@ struct ARMCPU {
uint32_t reset_fpsid;
uint32_t ctr;
uint32_t reset_sctlr;
uint32_t id_pfr0;
uint32_t id_pfr1;
uint64_t pmceid0;
uint64_t pmceid1;
uint32_t id_afr0;