From f0d4f717ea4a53a09f59fc77fe4e2f9607619340 Mon Sep 17 00:00:00 2001 From: eZio Pan Date: Thu, 7 Mar 2024 01:40:36 +0800 Subject: [PATCH] merge enums --- data/registers/cordic_v1.yaml | 30 ++++++------------------------ transforms/CORDIC.yaml | 8 ++++++++ 2 files changed, 14 insertions(+), 24 deletions(-) create mode 100644 transforms/CORDIC.yaml diff --git a/data/registers/cordic_v1.yaml b/data/registers/cordic_v1.yaml index 7c65d5c..f802c16 100644 --- a/data/registers/cordic_v1.yaml +++ b/data/registers/cordic_v1.yaml @@ -44,35 +44,26 @@ fieldset/CSR: description: Number of results in the RDATA register. bit_offset: 19 bit_size: 1 - enum: NRES + enum: Num - name: NARGS description: Number of arguments expected by the WDATA register. bit_offset: 20 bit_size: 1 - enum: NARGS + enum: Num - name: RESSIZE description: Width of output data. bit_offset: 21 bit_size: 1 - enum: RESSIZE + enum: Size - name: ARGSIZE description: Width of input data. bit_offset: 22 bit_size: 1 - enum: ARGSIZE + enum: Size - name: RRDY description: Result ready flag. bit_offset: 31 bit_size: 1 -enum/ARGSIZE: - bit_size: 1 - variants: - - name: Bits32 - description: Use 32 bit input values. - value: 0 - - name: Bits16 - description: Use 16 bit input values. - value: 1 enum/FUNC: bit_size: 4 variants: @@ -106,7 +97,7 @@ enum/FUNC: - name: SquareRoot description: Square Root function. value: 9 -enum/NARGS: +enum/Num: bit_size: 1 variants: - name: Num1 @@ -115,15 +106,6 @@ enum/NARGS: - name: Num2 description: Two argument writes need to be performed for next calculation. value: 1 -enum/NRES: - bit_size: 1 - variants: - - name: Num1 - description: Only single result value will be returned. After a single read RRDY will be automatically cleared. - value: 0 - - name: Num2 - description: Two return reads need to be performed. After two reads RRDY will be automatically cleared. - value: 1 enum/PRECISION: bit_size: 4 variants: @@ -172,7 +154,7 @@ enum/PRECISION: - name: Iters60 description: 60 iterations. value: 15 -enum/RESSIZE: +enum/Size: bit_size: 1 variants: - name: Bits32 diff --git a/transforms/CORDIC.yaml b/transforms/CORDIC.yaml new file mode 100644 index 0000000..55b0669 --- /dev/null +++ b/transforms/CORDIC.yaml @@ -0,0 +1,8 @@ +transforms: + - !MergeEnums + from: (ARG|RES)SIZE + to: Size + + - !MergeEnums + from: N(ARGS|RES) + to: Num