[PATCH] gdb/features: re-generate riscv/{32,64}bit-csr.c

Andrew Burgess andrew.burgess@embecosm.com
Thu Jun 18 20:17:56 GMT 2020


* Simon Marchi via Gdb-patches <gdb-patches@sourceware.org> [2020-06-18 15:39:05 -0400]:

> Running
> 
>     make cfiles GDB=...
> 
> inside the gdb/features source directory leads to those two files
> becoming dirty.  I did a bisect, and found that it started with this
> commit:
> 
>     commit bd0cf5a6bae180f65f3b9298619d1bd695abcdd8
>     Author: Nelson Chu <nelson.chu@sifive.com>
>     Date:   Wed Feb 12 02:18:49 2020 -0800
> 
>         RISC-V: Support the ISA-dependent CSR checking.
> 
> This patch commits the re-generated files.
> 
> gdb/ChangeLog:
> 
> 	* features/riscv/32bit-csr.c: Re-generate.
> 	* features/riscv/64bit-csr.c: Re-generate.

You're welcome to merge this, but:

  https://sourceware.org/pipermail/gdb-patches/2020-June/169568.html

Thanks,
Andrew


> 
> Change-Id: I0721e56d060ccbc364c4cd81b8abe0f8353b7390
> ---
>  gdb/features/riscv/32bit-csr.c |  5 ++-
>  gdb/features/riscv/64bit-csr.c | 70 ++--------------------------------
>  2 files changed, 6 insertions(+), 69 deletions(-)
> 
> diff --git a/gdb/features/riscv/32bit-csr.c b/gdb/features/riscv/32bit-csr.c
> index d306bc8d2934..5956d3c5bd1e 100644
> --- a/gdb/features/riscv/32bit-csr.c
> +++ b/gdb/features/riscv/32bit-csr.c
> @@ -194,6 +194,7 @@ create_feature_riscv_32bit_csr (struct target_desc *result, long regnum)
>    tdesc_create_reg (feature, "mhpmcounter29h", regnum++, 1, NULL, 32, "int");
>    tdesc_create_reg (feature, "mhpmcounter30h", regnum++, 1, NULL, 32, "int");
>    tdesc_create_reg (feature, "mhpmcounter31h", regnum++, 1, NULL, 32, "int");
> +  tdesc_create_reg (feature, "mcountinhibit", regnum++, 1, NULL, 32, "int");
>    tdesc_create_reg (feature, "mhpmevent3", regnum++, 1, NULL, 32, "int");
>    tdesc_create_reg (feature, "mhpmevent4", regnum++, 1, NULL, 32, "int");
>    tdesc_create_reg (feature, "mhpmevent5", regnum++, 1, NULL, 32, "int");
> @@ -229,7 +230,8 @@ create_feature_riscv_32bit_csr (struct target_desc *result, long regnum)
>    tdesc_create_reg (feature, "tdata3", regnum++, 1, NULL, 32, "int");
>    tdesc_create_reg (feature, "dcsr", regnum++, 1, NULL, 32, "int");
>    tdesc_create_reg (feature, "dpc", regnum++, 1, NULL, 32, "int");
> -  tdesc_create_reg (feature, "dscratch", regnum++, 1, NULL, 32, "int");
> +  tdesc_create_reg (feature, "dscratch0", regnum++, 1, NULL, 32, "int");
> +  tdesc_create_reg (feature, "dscratch1", regnum++, 1, NULL, 32, "int");
>    tdesc_create_reg (feature, "hstatus", regnum++, 1, NULL, 32, "int");
>    tdesc_create_reg (feature, "hedeleg", regnum++, 1, NULL, 32, "int");
>    tdesc_create_reg (feature, "hideleg", regnum++, 1, NULL, 32, "int");
> @@ -246,7 +248,6 @@ create_feature_riscv_32bit_csr (struct target_desc *result, long regnum)
>    tdesc_create_reg (feature, "mibound", regnum++, 1, NULL, 32, "int");
>    tdesc_create_reg (feature, "mdbase", regnum++, 1, NULL, 32, "int");
>    tdesc_create_reg (feature, "mdbound", regnum++, 1, NULL, 32, "int");
> -  tdesc_create_reg (feature, "mucounteren", regnum++, 1, NULL, 32, "int");
>    tdesc_create_reg (feature, "mscounteren", regnum++, 1, NULL, 32, "int");
>    tdesc_create_reg (feature, "mhcounteren", regnum++, 1, NULL, 32, "int");
>    return regnum;
> diff --git a/gdb/features/riscv/64bit-csr.c b/gdb/features/riscv/64bit-csr.c
> index e46a77f30518..2b37ef5716a3 100644
> --- a/gdb/features/riscv/64bit-csr.c
> +++ b/gdb/features/riscv/64bit-csr.c
> @@ -52,38 +52,6 @@ create_feature_riscv_64bit_csr (struct target_desc *result, long regnum)
>    tdesc_create_reg (feature, "hpmcounter29", regnum++, 1, NULL, 64, "int");
>    tdesc_create_reg (feature, "hpmcounter30", regnum++, 1, NULL, 64, "int");
>    tdesc_create_reg (feature, "hpmcounter31", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "cycleh", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "timeh", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "instreth", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "hpmcounter3h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "hpmcounter4h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "hpmcounter5h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "hpmcounter6h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "hpmcounter7h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "hpmcounter8h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "hpmcounter9h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "hpmcounter10h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "hpmcounter11h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "hpmcounter12h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "hpmcounter13h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "hpmcounter14h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "hpmcounter15h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "hpmcounter16h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "hpmcounter17h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "hpmcounter18h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "hpmcounter19h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "hpmcounter20h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "hpmcounter21h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "hpmcounter22h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "hpmcounter23h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "hpmcounter24h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "hpmcounter25h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "hpmcounter26h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "hpmcounter27h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "hpmcounter28h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "hpmcounter29h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "hpmcounter30h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "hpmcounter31h", regnum++, 1, NULL, 64, "int");
>    tdesc_create_reg (feature, "sstatus", regnum++, 1, NULL, 64, "int");
>    tdesc_create_reg (feature, "sedeleg", regnum++, 1, NULL, 64, "int");
>    tdesc_create_reg (feature, "sideleg", regnum++, 1, NULL, 64, "int");
> @@ -113,9 +81,7 @@ create_feature_riscv_64bit_csr (struct target_desc *result, long regnum)
>    tdesc_create_reg (feature, "mtval", regnum++, 1, NULL, 64, "int");
>    tdesc_create_reg (feature, "mip", regnum++, 1, NULL, 64, "int");
>    tdesc_create_reg (feature, "pmpcfg0", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "pmpcfg1", regnum++, 1, NULL, 64, "int");
>    tdesc_create_reg (feature, "pmpcfg2", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "pmpcfg3", regnum++, 1, NULL, 64, "int");
>    tdesc_create_reg (feature, "pmpaddr0", regnum++, 1, NULL, 64, "int");
>    tdesc_create_reg (feature, "pmpaddr1", regnum++, 1, NULL, 64, "int");
>    tdesc_create_reg (feature, "pmpaddr2", regnum++, 1, NULL, 64, "int");
> @@ -163,37 +129,7 @@ create_feature_riscv_64bit_csr (struct target_desc *result, long regnum)
>    tdesc_create_reg (feature, "mhpmcounter29", regnum++, 1, NULL, 64, "int");
>    tdesc_create_reg (feature, "mhpmcounter30", regnum++, 1, NULL, 64, "int");
>    tdesc_create_reg (feature, "mhpmcounter31", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "mcycleh", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "minstreth", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "mhpmcounter3h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "mhpmcounter4h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "mhpmcounter5h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "mhpmcounter6h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "mhpmcounter7h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "mhpmcounter8h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "mhpmcounter9h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "mhpmcounter10h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "mhpmcounter11h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "mhpmcounter12h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "mhpmcounter13h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "mhpmcounter14h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "mhpmcounter15h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "mhpmcounter16h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "mhpmcounter17h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "mhpmcounter18h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "mhpmcounter19h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "mhpmcounter20h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "mhpmcounter21h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "mhpmcounter22h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "mhpmcounter23h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "mhpmcounter24h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "mhpmcounter25h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "mhpmcounter26h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "mhpmcounter27h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "mhpmcounter28h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "mhpmcounter29h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "mhpmcounter30h", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "mhpmcounter31h", regnum++, 1, NULL, 64, "int");
> +  tdesc_create_reg (feature, "mcountinhibit", regnum++, 1, NULL, 64, "int");
>    tdesc_create_reg (feature, "mhpmevent3", regnum++, 1, NULL, 64, "int");
>    tdesc_create_reg (feature, "mhpmevent4", regnum++, 1, NULL, 64, "int");
>    tdesc_create_reg (feature, "mhpmevent5", regnum++, 1, NULL, 64, "int");
> @@ -229,7 +165,8 @@ create_feature_riscv_64bit_csr (struct target_desc *result, long regnum)
>    tdesc_create_reg (feature, "tdata3", regnum++, 1, NULL, 64, "int");
>    tdesc_create_reg (feature, "dcsr", regnum++, 1, NULL, 64, "int");
>    tdesc_create_reg (feature, "dpc", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "dscratch", regnum++, 1, NULL, 64, "int");
> +  tdesc_create_reg (feature, "dscratch0", regnum++, 1, NULL, 64, "int");
> +  tdesc_create_reg (feature, "dscratch1", regnum++, 1, NULL, 64, "int");
>    tdesc_create_reg (feature, "hstatus", regnum++, 1, NULL, 64, "int");
>    tdesc_create_reg (feature, "hedeleg", regnum++, 1, NULL, 64, "int");
>    tdesc_create_reg (feature, "hideleg", regnum++, 1, NULL, 64, "int");
> @@ -246,7 +183,6 @@ create_feature_riscv_64bit_csr (struct target_desc *result, long regnum)
>    tdesc_create_reg (feature, "mibound", regnum++, 1, NULL, 64, "int");
>    tdesc_create_reg (feature, "mdbase", regnum++, 1, NULL, 64, "int");
>    tdesc_create_reg (feature, "mdbound", regnum++, 1, NULL, 64, "int");
> -  tdesc_create_reg (feature, "mucounteren", regnum++, 1, NULL, 64, "int");
>    tdesc_create_reg (feature, "mscounteren", regnum++, 1, NULL, 64, "int");
>    tdesc_create_reg (feature, "mhcounteren", regnum++, 1, NULL, 64, "int");
>    return regnum;
> -- 
> 2.27.0
> 


More information about the Gdb-patches mailing list