rggen-default-register-map 0.28.0 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fac466f73de34a7e0a0575920f09cf424d4712b8a17a6b787d580d7252dac6f
-  data.tar.gz: 0fd170d8deb150dfd7d6fe8cd15f357b9e5781f32649bd709c53d7a1b1d76d45
+  metadata.gz: a715cb1298469ed180728f9252c8a82bc879a156b427f08b7f5f0ead4881a79d
+  data.tar.gz: eebb8fdf95cc6727a48145089812049540b3bd900c78a91e9dd55d8844a9e9a1
 SHA512:
-  metadata.gz: c3872a9705e22a74c0c0e2ed45a09ffdf3e8e2e96ed6ca84c179636de0227f09560b2f266fde6450f2121524ba10fa830efa311560bf94469b05c33431f28e74
-  data.tar.gz: 9afaa664572a6c282027e15f382bb81f3d7b0413506c9c0d02d31b71bfae37b051532b388948666e87da97d6f3a18b013d4bcf2846845d2bea584dc26a59c958
+  metadata.gz: b4b816a40f826f0545c84040ed25d33b808de5dacbba83ccd75fe813183b8789767c7ea450f846ac780256850e7c20ef4780a23d5d37b28489e3e0003a544452
+  data.tar.gz: b9a9949aea2259f9cb66f4d9bb123a92ff9e6dc9513ea8b9074e72f3121ddb6f260128cc9612fda20595694f6cc12fc77c0ccfa513f8e439f22b2e8099ddd3ed

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019-2022 Taichi Ishitani
+Copyright (c) 2019-2023 Taichi Ishitani
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -39,7 +39,7 @@ Feedbacks, bug reports, questions and etc. are wellcome! You can post them by us
 
 ## Copyright & License
 
-Copyright © 2019-2022 Taichi Ishitani. RgGen::DefaultRegisterMap is licensed under the [MIT License](https://opensource.org/licenses/MIT), see [LICENSE](LICENSE) for futher details.
+Copyright © 2019-2023 Taichi Ishitani. RgGen::DefaultRegisterMap is licensed under the [MIT License](https://opensource.org/licenses/MIT), see [LICENSE](LICENSE) for futher details.
 
 ## Code of Conduct
 

data/lib/rggen/default_register_map/bit_field/bit_assignment.rb

@@ -23,7 +23,7 @@ RgGen.define_simple_feature(:bit_field, :bit_assignment) do
     property :sequential?, body: -> { !@sequence_size.nil? }
     property :bit_map, initial: -> { calc_bit_map }
 
-    input_pattern /#{integer}(?::#{integer}){0,3}/,
+    input_pattern /#{integer}(?::#{integer})*/,
                   match_automatically: false
 
     build do |value|
@@ -87,13 +87,21 @@ RgGen.define_simple_feature(:bit_field, :bit_assignment) do
     def preprocess(value)
       if hash?(value)
         value
-      elsif match_pattern(value)
+      elsif match_bit_assignment?(value)
         split_match_data(match_data)
       else
         error "illegal input value for bit assignment: #{value.inspect}"
       end
     end
 
+    # workaround for ruby 3.2 bug
+    # see:
+    # * https://bugs.ruby-lang.org/issues/19273
+    # * https://github.com/rggen/rggen/issues/129#issuecomment-1366666885
+    def match_bit_assignment?(value)
+      match_pattern(value) && value.count(':') <= 3
+    end
+
     def split_match_data(match_data)
       match_data
         .to_s

data/lib/rggen/default_register_map/bit_field/labels.rb

@@ -0,0 +1,124 @@
+# frozen_string_literal: true
+
+RgGen.define_feature(:bit_field, :labels) do
+  register_map do
+    feature do
+      property :labels, initial: -> { [] }
+
+      input_pattern variable_name, match_automatically: false
+
+      define_struct :label_entry, [:name, :value, :comment] do
+        def to_s
+          to_h
+            .compact
+            .map { |k, v| "#{k}: #{v}" }
+            .join(' ')
+        end
+      end
+
+      build do |values|
+        values.each { |label| labels << parse_label(label) }
+      end
+
+      define_helpers do
+        def verify_label_value(&body)
+          label_value_verifiers << create_verifier(&body)
+        end
+
+        def label_value_verifiers
+          @label_value_verifiers ||= []
+        end
+      end
+
+      verify(:component) do
+        check_error do
+          labels.each do |label|
+            helper.label_value_verifiers.each do |verifier|
+              verifier.verify(self, label.value)
+            end
+          end
+        end
+      end
+
+      verify_label_value do
+        error_condition { |value| value < min_label_value }
+        message do |value|
+          'input label value is less than minimum label value: ' \
+          "label value #{value} minimum label value #{min_label_value}"
+        end
+      end
+
+      verify_label_value do
+        error_condition { |value| value > max_label_value }
+        message do |value|
+          'input label value is greater than maximum label value: ' \
+          "label value #{value} maximum label value #{max_label_value}"
+        end
+      end
+
+      printable :labels
+
+      private
+
+      def parse_label(label)
+        label_values = [
+          parse_name(label), parse_value(label), fetch_label(label, :comment)
+        ]
+        label_entry.new(*label_values)
+      end
+
+      def parse_name(label)
+        label_value = fetch_label(label, :name) { error 'no label name is given' }
+        name = match_name(label_value)
+        unique_name?(name) && name ||
+          (error "duplicated label name: #{name}", label_value)
+      end
+
+      def match_name(name)
+        match_data, = match_pattern(name)
+        match_data&.to_s ||
+          (error "illegal input value for label name: #{name.inspect}", name)
+      end
+
+      def unique_name?(name)
+        labels.none? { |label| label.name == name }
+      end
+
+      def parse_value(label)
+        label_value = fetch_label(label, :value) { error 'no label value is given' }
+        value = convert_label_value(label_value)
+        unique_value?(value) && value ||
+          (error "duplicated label value: #{value}", label_value)
+      end
+
+      def convert_label_value(value)
+        Integer(value)
+      rescue ArgumentError, TypeError
+        error "cannot convert #{value.inspect} into label value", value
+      end
+
+      def unique_value?(value)
+        labels.none? { |label| label.value == value }
+      end
+
+      def fetch_label(label, key, &ifnone)
+        match_key =
+          [key.to_sym, key.to_s]
+            .find { |k| label.key?(k) }
+        (match_key || ifnone&.call) && label[match_key]
+      end
+
+      def min_label_value
+        bit_field.width == 1 ? 0 : -(2**(bit_field.width - 1))
+      end
+
+      def max_label_value
+        2**bit_field.width - 1
+      end
+    end
+
+    factory do
+      value_format :hash_list
+    end
+  end
+end

data/lib/rggen/default_register_map/bit_field/type.rb

@@ -108,7 +108,7 @@ RgGen.define_list_feature(:bit_field, :type) do
     end
 
     factory do
-      allow_options
+      value_format :value_with_options
 
       convert_value do |value|
         types = target_features.keys

data/lib/rggen/default_register_map/register/offset_address.rb

@@ -75,9 +75,8 @@ RgGen.define_simple_feature(:register, :offset_address) do
     end
 
     def expand_local_addresses
-      Array.new(shared_address? && 1 || register.count) do |i|
-        offset_address + register.byte_width * i
-      end
+      width = shared_address? && 0 || register.byte_width
+      Array.new(register.count) { |i| offset_address + width * i }
     end
 
     def previous_component

data/lib/rggen/default_register_map/register/size.rb

@@ -77,24 +77,46 @@ RgGen.define_simple_feature(:register, :size) do
         .max
     end
 
-    def calc_byte_size(whole_size = true)
-      if !whole_size || register.settings[:support_shared_address]
-        byte_width
-      else
-        Array(@size).reduce(1, :*) * byte_width
-      end
+    def calc_byte_size(whole_size = true, hierarchical: false)
+      return byte_width unless whole_size
+
+      include_register = !register.settings[:support_shared_address]
+      collect_size(hierarchical, include_register, false).reduce(1, :*) * byte_width
     end
 
-    def array_register?
+    def array_register?(hierarchical: false)
+      return true if hierarchical && register_files.any?(&:array?)
       register.settings[:support_array] && !@size.nil? || false
     end
 
-    def array_registers
-      array_register? && @size || nil
+    def array_registers(hierarchical: false)
+      size = collect_size(hierarchical, true, true)
+      !size.empty? && size || nil
     end
 
     def calc_count(whole_count = true)
-      whole_count ? (@count ||= Array(array_registers).reduce(1, :*)) : 1
+      if whole_count
+        @count ||= collect_size(false, true, true).reduce(1, :*)
+      else
+        1
+      end
+    end
+
+    def collect_size(inculde_register_file, include_register, array_only)
+      size = []
+      collect_register_file_size(size, inculde_register_file)
+      collect_register_size(size, include_register, array_only)
+      size.compact
+    end
+
+    def collect_register_file_size(size, inculde_register_file)
+      inculde_register_file &&
+        size.concat(register_files.flat_map(&:array_size))
+    end
+
+    def collect_register_size(size, include_register, array_only)
+      @size && include_register && (!array_only || array_register?) &&
+        size.concat(@size)
     end
   end
 end

data/lib/rggen/default_register_map/register/type.rb

@@ -84,7 +84,7 @@ RgGen.define_list_feature(:register, :type) do
     end
 
     factory do
-      allow_options
+      value_format :value_with_options
 
       convert_value do |value|
         find_type(value)

data/lib/rggen/default_register_map/version.rb

@@ -2,6 +2,6 @@
 
 module RgGen
   module DefaultRegisterMap
-    VERSION = '0.28.0'
+    VERSION = '0.29.0'
   end
 end

data/lib/rggen/default_register_map.rb

@@ -50,6 +50,7 @@ RgGen.setup_plugin :'rggen-default-register-map' do |plugin|
     'default_register_map/bit_field/type/wos',
     'default_register_map/bit_field/initial_value',
     'default_register_map/bit_field/reference',
+    'default_register_map/bit_field/labels',
     'default_register_map/bit_field/comment'
   ]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rggen-default-register-map
 version: !ruby/object:Gem::Version
-  version: 0.28.0
+  version: 0.29.0
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-10 00:00:00.000000000 Z
+date: 2023-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,7 @@ files:
 - lib/rggen/default_register_map/bit_field/bit_assignment.rb
 - lib/rggen/default_register_map/bit_field/comment.rb
 - lib/rggen/default_register_map/bit_field/initial_value.rb
+- lib/rggen/default_register_map/bit_field/labels.rb
 - lib/rggen/default_register_map/bit_field/name.rb
 - lib/rggen/default_register_map/bit_field/reference.rb
 - lib/rggen/default_register_map/bit_field/type.rb
@@ -99,15 +100,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.1
 signing_key: 
 specification_version: 4
-summary: rggen-default-register-map-0.28.0
+summary: rggen-default-register-map-0.29.0
 test_files: []