| Message ID | 1521034084-17344-2-git-send-email-abdallah.bouassida@lauterbach.com |
|---|---|
| State | New |
| Headers | show |
| Series | target/arm: Add a dynamic XML-description of the cp-registers to GDB | expand |
Abdallah Bouassida <abdallah.bouassida@lauterbach.com> writes: > This is a preparation for the coming feature of creating dynamically an XML > description for the ARM sysregs. > A register has ARM_CP_NO_GDB enabled will not be shown in the dynamic XML. > This bit is enabled automatically when creating CP_ANY wildcard aliases. > This bit could be enabled manually for any register we want to remove from the > dynamic XML description. > > Signed-off-by: Abdallah Bouassida <abdallah.bouassida@lauterbach.com> > Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Alex Bennée <alex.bennee@linaro.org> > --- > target/arm/cpu.h | 3 ++- > target/arm/helper.c | 2 +- > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/target/arm/cpu.h b/target/arm/cpu.h > index 1e7e1f8..5a6ea24 100644 > --- a/target/arm/cpu.h > +++ b/target/arm/cpu.h > @@ -1815,10 +1815,11 @@ static inline uint64_t cpreg_to_kvm_id(uint32_t cpregid) > #define ARM_LAST_SPECIAL ARM_CP_DC_ZVA > #define ARM_CP_FPU 0x1000 > #define ARM_CP_SVE 0x2000 > +#define ARM_CP_NO_GDB 0x4000 > /* Used only as a terminator for ARMCPRegInfo lists */ > #define ARM_CP_SENTINEL 0xffff > /* Mask of only the flag bits in a type field */ > -#define ARM_CP_FLAG_MASK 0x30ff > +#define ARM_CP_FLAG_MASK 0x70ff > > /* Valid values for ARMCPRegInfo state field, indicating which of > * the AArch32 and AArch64 execution states this register is visible in. > diff --git a/target/arm/helper.c b/target/arm/helper.c > index 09893e3..db8c925 100644 > --- a/target/arm/helper.c > +++ b/target/arm/helper.c > @@ -5664,7 +5664,7 @@ static void add_cpreg_to_hashtable(ARMCPU *cpu, const ARMCPRegInfo *r, > if (((r->crm == CP_ANY) && crm != 0) || > ((r->opc1 == CP_ANY) && opc1 != 0) || > ((r->opc2 == CP_ANY) && opc2 != 0)) { > - r2->type |= ARM_CP_ALIAS; > + r2->type |= ARM_CP_ALIAS | ARM_CP_NO_GDB; > } > > /* Check that raw accesses are either forbidden or handled. Note that -- Alex Bennée
diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 1e7e1f8..5a6ea24 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -1815,10 +1815,11 @@ static inline uint64_t cpreg_to_kvm_id(uint32_t cpregid) #define ARM_LAST_SPECIAL ARM_CP_DC_ZVA #define ARM_CP_FPU 0x1000 #define ARM_CP_SVE 0x2000 +#define ARM_CP_NO_GDB 0x4000 /* Used only as a terminator for ARMCPRegInfo lists */ #define ARM_CP_SENTINEL 0xffff /* Mask of only the flag bits in a type field */ -#define ARM_CP_FLAG_MASK 0x30ff +#define ARM_CP_FLAG_MASK 0x70ff /* Valid values for ARMCPRegInfo state field, indicating which of * the AArch32 and AArch64 execution states this register is visible in. diff --git a/target/arm/helper.c b/target/arm/helper.c index 09893e3..db8c925 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -5664,7 +5664,7 @@ static void add_cpreg_to_hashtable(ARMCPU *cpu, const ARMCPRegInfo *r, if (((r->crm == CP_ANY) && crm != 0) || ((r->opc1 == CP_ANY) && opc1 != 0) || ((r->opc2 == CP_ANY) && opc2 != 0)) { - r2->type |= ARM_CP_ALIAS; + r2->type |= ARM_CP_ALIAS | ARM_CP_NO_GDB; } /* Check that raw accesses are either forbidden or handled. Note that