rggen-default-register-map 0.35.1 → 0.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da15c54ac0f88727c273495d1749f677e28936aa45b1404096c82fedac672cee
-  data.tar.gz: 232b41e263e95fc403edc6a4706af6e92654fa47a1d03219dccf12acc06e28fd
+  metadata.gz: ad030c257184d834491e0df892c25adecb637c48a487ca6dd30986e939ab23f8
+  data.tar.gz: 7516cc539e05d504c0459dfcbfde181edc8ed73579d6f01dfe49708c24a209ed
 SHA512:
-  metadata.gz: 4c99a141c5c96d99a785cbd516a2b6af649c578f3ea342f713ae1e788517c8518288e6d8772563dbfac5717d70759e5b48184b7c999a1aa96c5137f8f2df6816
-  data.tar.gz: 2bd114e1b7a0664b310d68f1eab0a13c391b53f5e3acca9ba8a25e56172023ad3d72c971d8c437e46e0e6365a863d0da14807ddf7d412bd8e1f1bc78df1f0989
+  metadata.gz: 72d36ba1054cede846ff838bc7a1191361a872366305c77d9e813e7f121e139cd9184fc5a30223c1c38e7f3ee03a1b2e414d1b5501bf0120333ecf6ea702ff37
+  data.tar.gz: e6023f5812804db2e401131a45bf364f7d59e2048167ef369b3707bf3ae4f1ac5fc9877a6a3fbcbf42311ee57052397e6d314c6d8f0cbc20c5090baacde2e88b

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019-2025 Taichi Ishitani
+Copyright (c) 2019-2026 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

@@ -2,8 +2,7 @@
 [![CI](https://github.com/rggen/rggen-default-register-map/workflows/CI/badge.svg)](https://github.com/rggen/rggen-default-register-map/actions?query=workflow%3ACI)
 [![Maintainability](https://qlty.sh/badges/4fe50039-28a8-4064-b224-2766eaf9e01f/maintainability.svg)](https://qlty.sh/gh/rggen/projects/rggen-default-register-map)
 [![codecov](https://codecov.io/gh/rggen/rggen-default-register-map/branch/master/graph/badge.svg)](https://codecov.io/gh/rggen/rggen-default-register-map)
-[![Gitter](https://badges.gitter.im/rggen/rggen.svg)](https://gitter.im/rggen/rggen?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
-
+[![Discord](https://img.shields.io/discord/1406572699467124806?style=flat&logo=discord)](https://discord.com/invite/KWya83ZZxr)
 
 # RgGen::DefaultRegisterMap
 
@@ -32,13 +31,13 @@ Feedbacks, bug reports, questions and etc. are wellcome! You can post them by us
 
 * [GitHub Issue Tracker](https://github.com/rggen/rggen/issues)
 * [GitHub Discussions](https://github.com/rggen/rggen/discussions)
-* [Chat Room](https://gitter.im/rggen/rggen)
+* [Discord](https://discord.com/invite/KWya83ZZxr)
 * [Mailing List](https://groups.google.com/d/forum/rggen)
 * [Mail](mailto:rggen@googlegroups.com)
 
 ## Copyright & License
 
-Copyright © 2019-2025 Taichi Ishitani. RgGen::DefaultRegisterMap is licensed under the [MIT License](https://opensource.org/licenses/MIT), see [LICENSE](LICENSE) for futher details.
+Copyright © 2019-2026 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/type/counter.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+RgGen.define_list_item_feature(:bit_field, :type, :counter) do
+  register_map do
+    read_write
+    reference use: true, width: 1
+    initial_value require: true
+  end
+end

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

@@ -3,7 +3,7 @@
 RgGen.define_simple_feature(:register, :offset_address) do
   register_map do
     property :offset_address, initial: -> { default_offset_address }
-    property :expanded_offset_addresses, forward_to: :expand_addresses
+    property :expanded_offset_addresses, body: -> { expand_addresses }
     property :address_range, initial: -> { start_address..end_address }
     property :overlap?, body: ->(other) { overlap_address_range?(other, false) }
 
@@ -45,12 +45,12 @@ RgGen.define_simple_feature(:register, :offset_address) do
       end
       message do
         'offset address range overlaps with other offset address range: ' \
-        "0x#{start_address(true).to_s(16)}-0x#{end_address(true).to_s(16)}"
+        "0x#{start_address(full: true).to_s(16)}-0x#{end_address(full: true).to_s(16)}"
       end
     end
 
     printable(:offset_address) do
-      expand_addresses.map(&method(:format_address))
+      expand_addresses(printable_address: true).map(&method(:format_address))
     end
 
     private
@@ -60,22 +60,29 @@ RgGen.define_simple_feature(:register, :offset_address) do
         (previous_component.offset_address + previous_component.total_byte_size)
     end
 
-    def start_address(full = false)
+    def start_address(full: false)
       full && expand_addresses.first || offset_address
     end
 
-    def end_address(full = false)
-      start_address(full) + register.total_byte_size - 1
+    def end_address(full: false)
+      start_address(full:) + register.total_byte_size - 1
     end
 
-    def expand_addresses
+    def expand_addresses(printable_address: false)
       (register_file&.expanded_offset_addresses || [0])
-        .product(expand_local_addresses).map(&:sum)
+        .product(expand_local_addresses(printable_address)).map(&:sum)
     end
 
-    def expand_local_addresses
-      width = shared_address? && 0 || register.entry_byte_size
-      Array.new(register.count) { |i| offset_address + width * i }
+    def expand_local_addresses(printable_address)
+      count, width =
+        if !shared_address?
+          [register.count, register.entry_byte_size]
+        elsif printable_address
+          [1, 0]
+        else
+          [register.count, 0]
+        end
+      Array.new(count) { |i| offset_address + width * i }
     end
 
     def previous_component

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

@@ -29,10 +29,6 @@ RgGen.define_list_item_feature(:register, :type, :indirect) do
       def find_index_field(bit_fields)
         bit_fields.find { |bit_field| bit_field.full_name == name }
       end
-
-      def to_s
-        [name, value].compact.join(': ')
-      end
     end
 
     property :index_entries
@@ -170,7 +166,14 @@ RgGen.define_list_item_feature(:register, :type, :indirect) do
     end
 
     printable(:index_bit_fields) do
-      index_entries.map(&:to_s)
+      index_entries.map do |index|
+        if index.array_index?
+          value = array_index_value(index)
+          "#{index.name}: [0-#{value - 1}]"
+        else
+          "#{index.name}: #{index.value}"
+        end
+      end
     end
 
     private

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

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+RgGen.define_list_item_feature(:register, :type, :maskable) do
+  register_map do
+    support_array_register
+
+    verify(:component) do
+      check_error do
+        register.bit_fields.each(&method(:check_assignment))
+      end
+    end
+
+    def check_assignment(bit_field)
+      (bit_field.sequence_size || 1).times do |i|
+        msb = bit_field.msb(i)
+        lsb = bit_field.lsb(i)
+        next unless in_mask_range?(msb, lsb)
+
+        error "bit field is assigned to upper half word: [#{msb}:#{lsb}]"
+      end
+    end
+
+    def in_mask_range?(msb, lsb)
+      width = register_block.bus_width
+      half_width = width / 2
+      (lsb..msb).any? { |bit| (bit % width) >= half_width }
+    end
+  end
+end

data/lib/rggen/default_register_map/version.rb

@@ -2,6 +2,6 @@
 
 module RgGen
   module DefaultRegisterMap
-    VERSION = '0.35.1'
+    VERSION = '0.36.0'
   end
 end

data/lib/rggen/default_register_map.rb

@@ -1,9 +1,7 @@
 # frozen_string_literal: true
 
 require 'erubi'
-if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.3.0')
-  require 'facets/range/overlap'
-end
+require 'facets/range/overlap' if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.3.0')
 
 require_relative 'default_register_map/version'
 require_relative 'default_register_map/comment'
@@ -27,12 +25,14 @@ RgGen.setup_plugin :'rggen-default-register-map' do |plugin|
     'default_register_map/register/type',
     'default_register_map/register/type/external',
     'default_register_map/register/type/indirect',
+    'default_register_map/register/type/maskable',
     'default_register_map/register/type/reserved',
     'default_register_map/register/type/rw',
     'default_register_map/register/comment',
     'default_register_map/bit_field/name',
     'default_register_map/bit_field/bit_assignment',
     'default_register_map/bit_field/type',
+    'default_register_map/bit_field/type/counter',
     'default_register_map/bit_field/type/custom',
     'default_register_map/bit_field/type/rc',
     'default_register_map/bit_field/type/reserved',

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rggen-default-register-map
 version: !ruby/object:Gem::Version
-  version: 0.35.1
+  version: 0.36.0
 platform: ruby
 authors:
 - Taichi Ishitani
 bindir: bin
 cert_chain: []
-date: 2025-07-21 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi
@@ -55,6 +55,7 @@ files:
 - 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
+- lib/rggen/default_register_map/bit_field/type/counter.rb
 - lib/rggen/default_register_map/bit_field/type/custom.rb
 - lib/rggen/default_register_map/bit_field/type/rc.rb
 - lib/rggen/default_register_map/bit_field/type/reserved.rb
@@ -86,6 +87,7 @@ files:
 - lib/rggen/default_register_map/register/type.rb
 - lib/rggen/default_register_map/register/type/external.rb
 - lib/rggen/default_register_map/register/type/indirect.rb
+- lib/rggen/default_register_map/register/type/maskable.rb
 - lib/rggen/default_register_map/register/type/reserved.rb
 - lib/rggen/default_register_map/register/type/rw.rb
 - lib/rggen/default_register_map/register_block/bus_width.rb
@@ -113,14 +115,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.1'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.3
 specification_version: 4
-summary: rggen-default-register-map-0.35.1
+summary: rggen-default-register-map-0.36.0
 test_files: []