fixup: riscv: remove CSR macro enum creation branch

Removes CSR helper macro branches that include field enum type creation.

Leaves the creation of the field enum to the separate `csr_field_enum`
macro, or manual definition of the field enum.

Authored-by: rmsyn <[email protected]>
Co-authored-by: romancardenas <[email protected]>

Author: rmsyn

riscv/src/register/macros.rs

@@ -690,6 +690,14 @@ macro_rules! csr_field_enum {
                  val.into_usize()
              }
          }
+
+         impl TryFrom<usize> for $field_ty {
+             type Error = $crate::result::Error;
+
+             fn try_from(val: usize) -> $crate::result::Result<Self> {
+                 Self::from_usize(val)
+             }
+         }
     };
 }
 
@@ -821,22 +829,9 @@ macro_rules! read_write_csr_field {
      $try_field:ident,
      $(#[$set_field_doc:meta])+
      $set_field:ident,
-     $(#[$field_ty_doc:meta])+
-     $field_ty:ident {
-         range: [$field_start:literal : $field_end:literal],
-         default: $default_variant:ident,
-         $($variant:ident = $value:expr$(,)?)+
-     }$(,)?
+     $field_ty:ident,
+     range: [$field_start:literal : $field_end:literal],
     ) => {
-        $crate::csr_field_enum!(
-            $(#[$field_ty_doc])+
-            $field_ty {
-                range: [$field_start : $field_end],
-                default: $default_variant,
-                $($variant = $value,)+
-            },
-         );
-
          $crate::read_only_csr_field!(
              $ty,
              $(#[$field_doc])+
@@ -921,38 +916,6 @@ macro_rules! read_only_csr_field {
         }
     };
 
-    ($ty:ident,
-     $(#[$field_doc:meta])+
-     $field:ident,
-     $(#[$try_field_doc:meta])+
-     $try_field:ident,
-     $(#[$field_ty_doc:meta])+
-     $field_ty:ident {
-         range: [$field_start:literal : $field_end:literal],
-         default: $default_variant:ident,
-         $($variant:ident = $value:expr$(,)?)+
-     }$(,)?
-    ) => {
-        $crate::csr_field_enum!(
-            $(#[$field_ty_doc])+
-            $field_ty {
-                range: [$field_start : $field_end],
-                default: $default_variant,
-                $($variant = $value,)+
-            },
-        );
-
-        $crate::read_only_csr_field!(
-            $ty,
-            $(#[$field_doc])*
-            $field,
-            $(#[$try_field_doc])*
-            $try_field,
-            $field_ty,
-            range: [$field_start : $field_end],
-        );
-    };
-
     ($ty:ident,
      $(#[$field_doc:meta])+
      $field:ident,
@@ -1056,34 +1019,6 @@ macro_rules! write_only_csr_field {
         }
     };
 
-    ($ty:ident,
-     $(#[$field_doc:meta])+
-     $field:ident,
-     $(#[$field_ty_doc:meta])+
-     $field_ty:ident {
-         range: [$field_start:literal : $field_end:literal],
-         default: $default_variant:ident,
-         $($variant:ident = $value:expr$(,)?)+
-     }$(,)?
-    ) => {
-        $crate::csr_field_enum!(
-            $(#[$field_ty_doc])+
-            $field_ty {
-                range: [$field_start : $field_end],
-                default: $default_variant,
-                $($variant = $value,)+
-            },
-         );
-
-        $crate::write_only_csr_field!(
-            $ty,
-            $(#[$field_doc])+
-            $field,
-            $field_ty,
-            range: [$field_start : $field_end],
-        );
-    };
-
     ($ty:ident,
      $(#[$field_doc:meta])+
      $field:ident,

riscv/src/register/tests/read_only_csr.rs

@@ -21,18 +21,13 @@ read_only_csr_field! {
     range: 1..=3,
 }
 
-read_only_csr_field!(
+read_only_csr_field! {
     Mtest,
     /// multi-bit field
     multi_field: [4:7],
-);
+}
 
-read_only_csr_field!(
-    Mtest,
-    /// multi-bit field
-    field_enum,
-    /// try-getter multi-bit field
-    try_field_enum,
+csr_field_enum! {
     /// field enum type with valid field variants
     MtestFieldEnum {
         range: [8:11],
@@ -41,8 +36,18 @@ read_only_csr_field!(
         Field2 = 2,
         Field3 = 3,
         Field4 = 15,
-    },
-);
+    }
+}
+
+read_only_csr_field! {
+    Mtest,
+    /// multi-bit field
+    field_enum,
+    /// try-getter multi-bit field
+    try_field_enum,
+    MtestFieldEnum,
+    range: [8:11],
+}
 
 // we don't test the `read` function, we are only testing in-memory functions.
 #[allow(unused)]

riscv/src/register/tests/read_write_csr.rs

@@ -28,23 +28,16 @@ read_write_csr_field! {
     range: 1..=3,
 }
 
-read_write_csr_field!(
+read_write_csr_field! {
     Mtest,
     /// multi-bit field
     multi_field,
     /// setter multi-bit field
     set_multi_field,
     range: [4:7],
-);
+}
 
-read_write_csr_field!(
-    Mtest,
-    /// multi-bit field
-    field_enum,
-    /// try-get multi-bit field
-    try_field_enum,
-    /// setter multi-bit field
-    set_field_enum,
+csr_field_enum! {
     /// field enum type with valid field variants
     MtestFieldEnum {
         range: [8:11],
@@ -54,7 +47,19 @@ read_write_csr_field!(
         Field3 = 3,
         Field4 = 15,
     }
-);
+}
+
+read_write_csr_field! {
+    Mtest,
+    /// multi-bit field
+    field_enum,
+    /// try-get multi-bit field
+    try_field_enum,
+    /// setter multi-bit field
+    set_field_enum,
+    MtestFieldEnum,
+    range: [8:11],
+}
 
 // we don't test the `read` and `write` functions, we are only testing in-memory functions.
 #[allow(unused)]

riscv/src/register/tests/write_only_csr.rs

@@ -21,16 +21,13 @@ write_only_csr_field! {
     range: 1..=3,
 }
 
-write_only_csr_field!(
+write_only_csr_field! {
     Mtest,
     /// setter multi-bit field
     set_multi_field: [4:7],
-);
+}
 
-write_only_csr_field!(
-    Mtest,
-    /// setter multi-bit field
-    set_field_enum,
+csr_field_enum! {
     /// field enum type with valid field variants
     MtestFieldEnum {
         range: [8:11],
@@ -39,8 +36,16 @@ write_only_csr_field!(
         Field2 = 2,
         Field3 = 3,
         Field4 = 15,
-    },
-);
+    }
+}
+
+write_only_csr_field! {
+    Mtest,
+    /// setter multi-bit field
+    set_field_enum,
+    MtestFieldEnum,
+    range: [8:11],
+}
 
 // we don't test the `write` function, we are only testing in-memory functions.
 #[allow(unused)]