addr_decode: Arbitrary idx_t types

Author: fischeti

src/addr_decode.sv

@@ -43,12 +43,13 @@ module addr_decode #(
   /// The address decoder expects three fields in `rule_t`:
   ///
   /// typedef struct packed {
-  ///   int unsigned idx;
-  ///   addr_t       start_addr;
-  ///   addr_t       end_addr;
+  ///   idx_t  idx;
+  ///   addr_t start_addr;
+  ///   addr_t end_addr;
   /// } rule_t;
   ///
-  ///  - `idx`:        index of the rule, has to be < `NoIndices`
+  ///  - `idx`:        The index to be returned for a matching rule. Usually an integer but can
+  ///                  be any type of data.
   ///  - `start_addr`: start address of the range the rule describes, value is included in range
   ///  - `end_addr`:   end address of the range the rule describes, value is NOT included in range
   ///                  if `end_addr == '0` end of address space is assumed
@@ -59,13 +60,10 @@ module addr_decode #(
   parameter type         rule_t    = logic,
   // Whether this is a NAPOT (base and mask) or regular range decoder
   parameter bit          Napot     = 0,
-  /// Dependent parameter, do **not** overwite!
-  ///
-  /// Width of the `idx_o` output port.
+  /// The output index type `idx_t` can be specified either with the width `IdxWidth`
+  /// or directly with the type `idx_t`. By default, it will use the maximum index
+  /// `NoIndices` to calculate the required width.
   parameter int unsigned IdxWidth  = cf_math_pkg::idx_width(NoIndices),
-  /// Dependent parameter, do **not** overwite!
-  ///
-  /// Type of the `idx_o` output port.
   parameter type         idx_t     = logic [IdxWidth-1:0]
 ) (
   /// Address to decode.
@@ -92,11 +90,11 @@ module addr_decode #(
 
   // wraps the dynamic configuration version of the address decoder
   addr_decode_dync #(
-    .NoIndices ( NoIndices ),
     .NoRules   ( NoRules   ),
     .addr_t    ( addr_t    ),
     .rule_t    ( rule_t    ),
-    .Napot     ( Napot     )
+    .Napot     ( Napot     ),
+    .idx_t     ( idx_t     )
   ) i_addr_decode_dync (
     .addr_i,
     .addr_map_i,

src/addr_decode_dync.sv

@@ -48,12 +48,13 @@ module addr_decode_dync #(
   /// The address decoder expects three fields in `rule_t`:
   ///
   /// typedef struct packed {
-  ///   int unsigned idx;
-  ///   addr_t       start_addr;
-  ///   addr_t       end_addr;
+  ///   idx_t  idx;
+  ///   addr_t start_addr;
+  ///   addr_t end_addr;
   /// } rule_t;
   ///
-  ///  - `idx`:        index of the rule, has to be < `NoIndices`
+  ///  - `idx`:        The index to be returned for a matching rule. Usually an integer but can
+  ///                  be any type of data.
   ///  - `start_addr`: start address of the range the rule describes, value is included in range
   ///  - `end_addr`:   end address of the range the rule describes, value is NOT included in range
   ///                  if `end_addr == '0` end of address space is assumed
@@ -64,15 +65,10 @@ module addr_decode_dync #(
   parameter type         rule_t    = logic,
   /// Whether this is a NAPOT (base and mask) or regular range decoder
   parameter bit          Napot     = 0,
-  /// Whether to assert maximum indices.
-  parameter bit          AssertIndices = 1'b1,
-  /// Dependent parameter, do **not** overwite!
-  ///
-  /// Width of the `idx_o` output port.
+  /// The output index type `idx_t` can be specified either with the width `IdxWidth`
+  /// or directly with the type `idx_t`. By default, it will use the maximum index
+  /// `NoIndices` to calculate the required width.
   parameter int unsigned IdxWidth  = cf_math_pkg::idx_width(NoIndices),
-  /// Dependent parameter, do **not** overwite!
-  ///
-  /// Type of the `idx_o` output port.
   parameter type         idx_t     = logic [IdxWidth-1:0]
 ) (
   /// Address to decode.
@@ -132,7 +128,6 @@ module addr_decode_dync #(
              $sformatf("Input address has %d bits and address map has %d bits.",
                        $bits(addr_i), $bits(addr_map_i[0].start_addr)))
     `ASSUME_I(norules_0, NoRules > 0, $sformatf("At least one rule needed"))
-    `ASSUME_I(noindices_0, NoIndices > 0 || !AssertIndices, $sformatf("At least one index needed"))
   end
 
   `ASSERT_FINAL(more_than_1_bit_set, $onehot0(matched_rules) || config_ongoing_i,
@@ -157,15 +152,6 @@ module addr_decode_dync #(
               Rule> IDX: %h START: %h END: %h\n\
               #####################################################",
               i ,addr_map_i[i].idx, addr_map_i[i].start_addr, addr_map_i[i].end_addr))
-        // check the SLV ids
-        `ASSUME_I(check_idx, addr_map_i[i].idx < NoIndices|| !AssertIndices,
-            $sformatf("This rule has a IDX that is not allowed!!!\n\
-            Violating rule %d.\n\
-            Rule> IDX: %h START: %h END: %h\n\
-            Rule> MAX_IDX: %h\n\
-            #####################################################",
-            i, addr_map_i[i].idx, addr_map_i[i].start_addr, addr_map_i[i].end_addr,
-            (NoIndices-1)))
         for (int unsigned j = i + 1; j < NoRules; j++) begin
           // overlap check
           `ASSUME_I(check_overlap, Napot ||