rggen-systemverilog 0.29.0 → 0.30.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e5fc548cd3c93e80580efc9d2027ce309b9a6e8900078f3f5bf8bb157357e53
-  data.tar.gz: 4fb5af7f5ad76f4938406a553fe425767e2fc363ce79b79b07213fd292535efb
+  metadata.gz: eabc1a7fe3c4b18369e5a28a4b7cf3be8f3c39535bc675ccb96852142d23ea9f
+  data.tar.gz: 9cd3d819ee42f7f91a920694f74c1cafcd78b3727c762947adcefa4899100721
 SHA512:
-  metadata.gz: 34cc65c49e1510303e8ca8ed7d16b941bfd331d66188602ecdf41a61cc9b1b0a627f56d33c3ba6b44b0c2e56ca1c44a896893ad3d82070a72b5cfb913e5a28b5
-  data.tar.gz: 55600c8bf365ffbbc2d8cc6b020e6cb13c33ebb91f49253d53cef0c5a7a5df86d639a61cc0a1eb2aa5d2a36d86530236e837735721da55def694c2a1c19c9d74
+  metadata.gz: 1798f396c34dedcba253e799ae1123c0e53c885b1a6378bff22a6cce9655dfd3793e119b532fbc8e97fbbf89405c5c6a5d5abaa2eed7881cb115361eb9424481
+  data.tar.gz: d8dc3fff2fd630f789a616ab3fb9880a8c8863d34ef21a0f6787ae0247db1ae451a161a7557957b33a51e9650ca7e47b2352ac4c3dcae1874b5a8b05dcd6ad7d

data/lib/rggen/systemverilog/common/utility.rb

@@ -87,6 +87,10 @@ module RgGen
           [width, bit_length].max
         end
 
+        def width_cast(expression, width)
+          "#{width}'(#{expression})"
+        end
+
         def argument(name, attribute = {})
           DataObject.new(:argument, attribute.merge(name: name)).declaration
         end

data/lib/rggen/systemverilog/ral/register_common.rb

@@ -26,7 +26,7 @@ module RgGen
         end
 
         def default_offset_address(index)
-          component.offset_address + component.byte_size(false) * index
+          component.offset_address + component.entry_byte_size * index
         end
 
         def hdl_path(array_index)

data/lib/rggen/systemverilog/rtl/partial_sum.rb

@@ -10,7 +10,7 @@ module RgGen
           operands
             .chunk(&method(:integer?))
             .flat_map(&method(:calc_partial_sum))
-            .reject { |value| integer?(value) && value.zero? }
+            .reject(&method(:integer_zero?))
             .tap { |sums| sums.empty? && (sums << 0) }
         end
 
@@ -22,6 +22,10 @@ module RgGen
         def integer?(value)
           value.is_a?(Integer)
         end
+
+        def integer_zero?(value)
+          integer?(value) && value.zero?
+        end
       end
     end
   end

data/lib/rggen/systemverilog/rtl/register/type/default.erb

@@ -5,7 +5,7 @@ rggen_default_register #(
   .OFFSET_ADDRESS (<%= offset_address %>),
   .BUS_WIDTH      (<%= bus_width %>),
   .DATA_WIDTH     (<%= width %>),
-  .REGISTER_INDEX (<%= register_index %>)
+  .VALUE_WIDTH    (<%= value_width %>)
 ) u_register (
   .i_clk        (<%= register_block.clock %>),
   .i_rst_n      (<%= register_block.reset %>),

data/lib/rggen/systemverilog/rtl/register/type/external.erb

@@ -1,8 +1,9 @@
 rggen_external_register #(
   .ADDRESS_WIDTH  (<%= address_width %>),
   .BUS_WIDTH      (<%= bus_width %>),
+  .VALUE_WIDTH    (<%= value_width %>),
   .START_ADDRESS  (<%= start_address %>),
-  .END_ADDRESS    (<%= end_address %>)
+  .BYTE_SIZE      (<%= byte_size %>)
 ) u_register (
   .i_clk        (<%= register_block.clock %>),
   .i_rst_n      (<%= register_block.reset %>),

data/lib/rggen/systemverilog/rtl/register/type/external.rb

@@ -14,17 +14,12 @@ RgGen.define_list_item_feature(:register, :type, :external) do
 
     private
 
-    def byte_width
-      configuration.byte_width
-    end
-
     def start_address
-      hex(register.offset_address, address_width)
+      hex(register.address_range.begin, address_width)
     end
 
-    def end_address
-      address = register.offset_address + register.byte_size - 1
-      hex(address, address_width)
+    def byte_size
+      register.total_byte_size
     end
   end
 end

data/lib/rggen/systemverilog/rtl/register/type/indirect.erb

@@ -5,6 +5,7 @@ rggen_indirect_register #(
   .OFFSET_ADDRESS       (<%= offset_address %>),
   .BUS_WIDTH            (<%= bus_width %>),
   .DATA_WIDTH           (<%= width %>),
+  .VALUE_WIDTH          (<%= value_width %>),
   .INDIRECT_INDEX_WIDTH (<%= index_width %>),
   .INDIRECT_INDEX_VALUE (<%= concat(index_values) %>)
 ) u_register (

data/lib/rggen/systemverilog/rtl/register_block/protocol/apb.erb

@@ -7,7 +7,8 @@ rggen_apb_adapter #(
   .BASE_ADDRESS         (<%= base_address %>),
   .BYTE_SIZE            (<%= byte_size %>),
   .ERROR_STATUS         (<%= error_status %>),
-  .DEFAULT_READ_DATA    (<%= default_read_data %>)
+  .DEFAULT_READ_DATA    (<%= default_read_data %>),
+  .INSERT_SLICER        (<%= insert_slicer %>)
 ) u_adapter (
   .i_clk        (<%= clock %>),
   .i_rst_n      (<%= reset %>),

data/lib/rggen/systemverilog/rtl/register_block/protocol/axi4lite.erb

@@ -9,6 +9,7 @@ rggen_axi4lite_adapter #(
   .BYTE_SIZE            (<%= byte_size %>),
   .ERROR_STATUS         (<%= error_status %>),
   .DEFAULT_READ_DATA    (<%= default_read_data %>),
+  .INSERT_SLICER        (<%= insert_slicer %>),
   .WRITE_FIRST          (<%= write_first %>)
 ) u_adapter (
   .i_clk        (<%= clock %>),

data/lib/rggen/systemverilog/rtl/register_block/protocol/axi4lite.rb

@@ -26,11 +26,5 @@ RgGen.define_list_item_feature(:register_block, :protocol, :axi4lite) do
     end
 
     main_code :register_block, from_template: true
-
-    private
-
-    def id_port_width
-      "((#{id_width}>0)?#{id_width}:1)"
-    end
   end
 end

data/lib/rggen/systemverilog/rtl/register_block/protocol/wishbone.erb

@@ -8,6 +8,7 @@ rggen_wishbone_adapter #(
   .BYTE_SIZE            (<%= byte_size %>),
   .ERROR_STATUS         (<%= error_status %>),
   .DEFAULT_READ_DATA    (<%= default_read_data %>),
+  .INSERT_SLICER        (<%= insert_slicer %>),
   .USE_STALL            (<%= use_stall %>)
 ) u_adapter (
   .i_clk        (<%= clock %>),

data/lib/rggen/systemverilog/rtl/register_block/protocol.rb

@@ -17,12 +17,6 @@ RgGen.define_list_feature(:register_block, :protocol) do
     def feature_registries
       @feature_registries ||= []
     end
-
-    def collect_available_protocols(registry)
-      registry
-        .enabled_features(:protocol)
-        .select { |protocol| registry.feature?(:protocol, protocol) }
-    end
   end
 
   configuration do
@@ -89,6 +83,9 @@ RgGen.define_list_feature(:register_block, :protocol) do
           name: 'DEFAULT_READ_DATA', data_type: :bit, width: bus_width,
           default: all_bits_0
         }
+        parameter :insert_slicer, {
+          name: 'INSERT_SLICER', data_type: :bit, width: 1, default: 0
+        }
       end
 
       private
@@ -97,10 +94,6 @@ RgGen.define_list_feature(:register_block, :protocol) do
         configuration.bus_width
       end
 
-      def byte_width
-        configuration.byte_width
-      end
-
       def local_address_width
         register_block.local_address_width
       end

data/lib/rggen/systemverilog/rtl/register_block/sv_rtl_macros.erb

@@ -12,7 +12,7 @@
   if (1) begin : __g_tie_off \
     genvar  __i; \
     for (__i = 0;__i < WIDTH;++__i) begin : g \
-      if (!(((VALID_BITS) >> __i) & 1'b1)) begin : g \
+      if ((((VALID_BITS) >> __i) % 2) == 0) begin : g \
         assign  RIF.read_data[__i]  = 1'b0; \
         assign  RIF.value[__i]      = 1'b0; \
       end \

data/lib/rggen/systemverilog/rtl/register_block/sv_rtl_top.rb

@@ -3,6 +3,7 @@
 RgGen.define_simple_feature(:register_block, :sv_rtl_top) do
   sv_rtl do
     export :total_registers
+    export :value_width
 
     build do
       input :clock, { name: 'i_clk', width: 1 }
@@ -19,7 +20,11 @@ RgGen.define_simple_feature(:register_block, :sv_rtl_top) do
     end
 
     def total_registers
-      register_block.files_and_registers.sum(&:count)
+      @total_registers ||= register_block.files_and_registers.sum(&:count)
+    end
+
+    def value_width
+      @value_width ||= register_block.registers.map(&:width).max
     end
 
     private
@@ -32,10 +37,6 @@ RgGen.define_simple_feature(:register_block, :sv_rtl_top) do
       configuration.bus_width
     end
 
-    def value_width
-      register_block.registers.map(&:width).max
-    end
-
     def body_code(code)
       macro_definition(code)
       sv_module_definition(code)

data/lib/rggen/systemverilog/rtl/register_index.rb

@@ -102,7 +102,13 @@ module RgGen
             operands.reduce(:*)
           elsif operands.first == 1
             operands.last
-          elsif need_bracket
+          else
+            product_expression(operands, need_bracket)
+          end
+        end
+
+        def product_expression(operands, need_bracket)
+          if need_bracket && /[+\-*\/]/ =~ operands.last
             "#{operands.first}*(#{operands.last})"
           else
             operands.join('*')

data/lib/rggen/systemverilog/rtl/register_type.rb

@@ -16,10 +16,18 @@ module RgGen
           register.writable? && 1 || 0
         end
 
+        def width
+          register.width
+        end
+
         def bus_width
           configuration.bus_width
         end
 
+        def value_width
+          register_block.value_width
+        end
+
         def address_width
           register_block.local_address_width
         end
@@ -32,15 +40,29 @@ module RgGen
         end
 
         def collect_offsets(component)
-          if component.register_file? && component.array?
+          if need_byte_offset?(component)
             [component.offset_address, byte_offset(component)]
           else
             component.offset_address
           end
         end
 
+        def need_byte_offset?(component)
+          if component.register_file?
+            component.array?
+          else
+            component.array? && !component.settings[:support_shared_address]
+          end
+        end
+
         def byte_offset(component)
-          "#{component.byte_size(false)}*(#{component.local_index})"
+          byte_size = component.entry_byte_size
+          local_index = component.local_index
+          if /[+\-*\/]/ =~ local_index
+            "#{byte_size}*(#{local_index})"
+          else
+            "#{byte_size}*#{local_index}"
+          end
         end
 
         def format_offsets(offsets)
@@ -48,20 +70,15 @@ module RgGen
         end
 
         def format_offset(offset)
-          offset.is_a?(Integer) ? hex(offset, address_width) : offset
-        end
-
-        def width
-          register.width
+          case offset
+          when Integer then hex(offset, address_width)
+          else width_cast(offset, address_width)
+          end
         end
 
         def valid_bits
           bits = register.bit_fields.map(&:bit_map).inject(:|)
-          hex(bits, register.width)
-        end
-
-        def register_index
-          register.local_index || 0
+          hex(bits, width)
         end
       end
     end

data/lib/rggen/systemverilog/rtl_package/register/sv_rtl_package.rb

@@ -9,7 +9,7 @@ RgGen.define_simple_feature(:register, :sv_rtl_package) do
       }
       localparam :__byte_size, {
         name: "#{full_name}_byte_size",
-        data_type: :int, default: register.byte_size(hierarchical: true)
+        data_type: :int, default: register.total_byte_size(hierarchical: true)
       }
       define_array_size_localparam
       define_offset_localparams

data/lib/rggen/systemverilog/version.rb

@@ -2,6 +2,6 @@
 
 module RgGen
   module SystemVerilog
-    VERSION = '0.29.0'
+    VERSION = '0.30.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rggen-systemverilog
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.30.1
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-02 00:00:00.000000000 Z
+date: 2023-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,8 +164,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
-summary: rggen-systemverilog-0.29.0
+summary: rggen-systemverilog-0.30.1
 test_files: []