rggen-default-register-map 0.31.0 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '096c64fcca6cd793439076e3d9c1c453cb936224698a9d59674eaf0d216945fc'
-  data.tar.gz: 2ff4dcdb1f202d3fde23a4a2856caf865201258684d736a3827b84869d657506
+  metadata.gz: c2fcba848943bcea3fcb9a11fea7eea0da0818d97a2bb4f2b1bd1889f78083e6
+  data.tar.gz: 14d072446eb76d25100b57b7b84a54a1e6d7d8695b89fb2e6456f9ea0a6fd4dc
 SHA512:
-  metadata.gz: 97d25fb253e1dc48ce3c96b5a50eb10c37d4b84eb7546cd1531c3e1e4842b7a754cdad2423f7a824f0d3be1d7c1233e0c3573cd3a895c376ca0ba7d65df96b3c
-  data.tar.gz: c5f8aca4a7e382e370b04cd29ad9ae31f90aa436f785697bd9d3eb7dfa606eb1f209dd7002a69e4b75dbcd7ff40e21b7efcd9044ca9b70993059188c8c5a3c69
+  metadata.gz: 9770d8cab49c4a78f7c627760e306a74ada4246f2328742ee4f0c44a9b771e0601896724a13c834ab9d18853bc92b8b136b1a1b3cdde8c6bb93832ec3c9d1827
+  data.tar.gz: 7d0631ec3faa746ac88d61326b811e73ea07c7efbf8dad2fb3cbe1a18cb37d415cc349ba2cc477756948bc4c9c5df4eb0344fe3d0cf3fdb5f2869d7d043403be

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019-2023 Taichi Ishitani
+Copyright (c) 2019-2024 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,7 +2,6 @@
 [![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://api.codeclimate.com/v1/badges/73177494e096af47f09e/maintainability)](https://codeclimate.com/github/rggen/rggen-default-register-map/maintainability)
 [![codecov](https://codecov.io/gh/rggen/rggen-default-register-map/branch/master/graph/badge.svg)](https://codecov.io/gh/rggen/rggen-default-register-map)
-[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=rggen_rggen-default-register-map&metric=alert_status)](https://sonarcloud.io/dashboard?id=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)
 
 
@@ -39,7 +38,7 @@ Feedbacks, bug reports, questions and etc. are wellcome! You can post them by us
 
 ## Copyright & License
 
-Copyright © 2019-2023 Taichi Ishitani. RgGen::DefaultRegisterMap is licensed under the [MIT License](https://opensource.org/licenses/MIT), see [LICENSE](LICENSE) for futher details.
+Copyright © 2019-2024 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/{rol.rb → rohw.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RgGen.define_list_item_feature(:bit_field, :type, :rol) do
+RgGen.define_list_item_feature(:bit_field, :type, :rohw) do
   register_map do
     read_only
     initial_value require: true

data/lib/rggen/default_register_map/bit_field/type/{rwc_rws.rb → rwc_rwhw_rws.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-RgGen.define_list_item_feature(:bit_field, :type, [:rwc, :rws]) do
+RgGen.define_list_item_feature(:bit_field, :type, [:rwc, :rwhw, :rws]) do
   register_map do
     read_write
     initial_value require: true

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

@@ -92,16 +92,10 @@ RgGen.define_simple_feature(:register, :offset_address) do
     end
 
     def overlap_address_range?(other, shareable)
-      overlap_range?(other) &&
+      address_range.overlap?(other.address_range) &&
         (exclusive_range?(other) || !shareable_access?(other, shareable))
     end
 
-    def overlap_range?(other)
-      self_range = address_range
-      othre_range = other.address_range
-      self_range.include?(othre_range.first) || othre_range.include?(self_range.first)
-    end
-
     def exclusive_range?(other)
       other.register_file? || other.reserved? || register.reserved?
     end

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

@@ -199,10 +199,6 @@ RgGen.define_list_item_feature(:register, :type, :indirect) do
       (string?(field_name) || symbol?(field_name)) && match_pattern(field_name)
     end
 
-    def sting_or_symbol?(value)
-      string?(value) || symbol?(value)
-    end
-
     def convert_index_value(value)
       to_int(value) { |v| "cannot convert #{v.inspect} into indirect index value" }
     end

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

@@ -38,7 +38,7 @@ RgGen.define_simple_feature(:register_file, :offset_address) do
 
     verify(:component) do
       error_condition do
-        files_and_registers.any?(&method(:overlap_address_range?))
+        files_and_registers.any? { |other| address_range.overlap?(other.address_range) }
       end
       message do
         'offset address range overlaps with other offset address range: ' \
@@ -81,12 +81,6 @@ RgGen.define_simple_feature(:register_file, :offset_address) do
       end
     end
 
-    def overlap_address_range?(other)
-      self_range = address_range
-      other_range = other.address_range
-      self_range.include?(other_range.first) || other_range.include?(self_range.first)
-    end
-
     def bus_width
       configuration.bus_width
     end

data/lib/rggen/default_register_map/version.rb

@@ -2,6 +2,6 @@
 
 module RgGen
   module DefaultRegisterMap
-    VERSION = '0.31.0'
+    VERSION = '0.33.0'
   end
 end

data/lib/rggen/default_register_map.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.3.0')
+  require 'facets/range/overlap'
+end
+
 require_relative 'default_register_map/version'
 require_relative 'default_register_map/comment'
 
@@ -33,12 +37,12 @@ RgGen.setup_plugin :'rggen-default-register-map' do |plugin|
     'default_register_map/bit_field/type/reserved',
     'default_register_map/bit_field/type/ro_rotrg',
     'default_register_map/bit_field/type/rof',
-    'default_register_map/bit_field/type/rol',
+    'default_register_map/bit_field/type/rohw',
     'default_register_map/bit_field/type/row0trg_row1trg',
     'default_register_map/bit_field/type/rowo_rowotrg',
     'default_register_map/bit_field/type/rs',
     'default_register_map/bit_field/type/rw_rwtrg_w1_wrc_wrs',
-    'default_register_map/bit_field/type/rwc_rws',
+    'default_register_map/bit_field/type/rwc_rwhw_rws',
     'default_register_map/bit_field/type/rwe_rwl',
     'default_register_map/bit_field/type/w0c_w1c_wc',
     'default_register_map/bit_field/type/w0crs_w1crs_wcrs',

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rggen-default-register-map
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.33.0
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-12 00:00:00.000000000 Z
+date: 2024-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: facets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '3.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 description: Default register map implementation for RgGen
 email:
 - rggen@googlegroups.com
@@ -47,12 +47,12 @@ files:
 - lib/rggen/default_register_map/bit_field/type/reserved.rb
 - lib/rggen/default_register_map/bit_field/type/ro_rotrg.rb
 - lib/rggen/default_register_map/bit_field/type/rof.rb
-- lib/rggen/default_register_map/bit_field/type/rol.rb
+- lib/rggen/default_register_map/bit_field/type/rohw.rb
 - lib/rggen/default_register_map/bit_field/type/row0trg_row1trg.rb
 - lib/rggen/default_register_map/bit_field/type/rowo_rowotrg.rb
 - lib/rggen/default_register_map/bit_field/type/rs.rb
 - lib/rggen/default_register_map/bit_field/type/rw_rwtrg_w1_wrc_wrs.rb
-- lib/rggen/default_register_map/bit_field/type/rwc_rws.rb
+- lib/rggen/default_register_map/bit_field/type/rwc_rwhw_rws.rb
 - lib/rggen/default_register_map/bit_field/type/rwe_rwl.rb
 - lib/rggen/default_register_map/bit_field/type/w0c_w1c_wc.rb
 - lib/rggen/default_register_map/bit_field/type/w0crs_w1crs_wcrs.rb
@@ -101,15 +101,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.17
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
-summary: rggen-default-register-map-0.31.0
+summary: rggen-default-register-map-0.33.0
 test_files: []