rggen-duh 0.2.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d22b0dc17bcbcc805b0a645107a78aa4d80554f11112d0690e37cde1c4a6dcd7
-  data.tar.gz: 8638fefb8ae9f698b836c431c959ad2e36dacba4a77a61dc6364976d00909853
+  metadata.gz: 6b5ce08e269e78df704f19710e47175c0767d0c09f0f9d97b8fef2365dd3d7b9
+  data.tar.gz: 80800a7f97dc36786d61ed1773e71fc1ce7f618506584bf8194f40c4b779820a
 SHA512:
-  metadata.gz: 14588567b6340bbf8bcc9ce223d320d171ecc13c20f9b85f18bca3054fca27a5e4ef1b9ecb166dd8d39b61abe933445e33936ff9b49ee05a9ae900b32d342865
-  data.tar.gz: b98bdef9b548c0bfaf359f22e02c22c19e4e5c01792ecd8290def85392ba1a84ac14e3a8bd85ec167ce2fe3a3f21480a4bb58eeda41fc4478f6bc993c3a2e11e
+  metadata.gz: 91021bac959ff0d798cb32e08b9bc43d366b0e6b7b1e0348087eee61db022c49b74e2550ad731861cd33e894786e0f528ca95dadecd766418448aaa98c0d998e
+  data.tar.gz: 3bbde57d20911503ad739f5bd2d8ffba5c61f1e599383725cb6f1ae7e102358401f17bc917f79e09eaa2eb18f2122457f4d0a08fe9480db73e324110762802c3

data/LICENSE

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

@@ -4,7 +4,6 @@
 [![codecov](https://codecov.io/gh/rggen/rggen-duh/branch/master/graph/badge.svg)](https://codecov.io/gh/rggen/rggen-duh)
 [![Gitter](https://badges.gitter.im/rggen/rggen.svg)](https://gitter.im/rggen/rggen?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
-
 # RgGen::DUH
 
 RgGen::DUH adds ability to load register map documents written in [DUH](https://github.com/sifive/duh) format.
@@ -41,9 +40,14 @@ Following table describes which RgGen bit field types are supported by DUH forma
 | RgGen bit field type | Support? | access         | modifiedWriteValue | readAction    | reserved |
 |:---------------------|:---------|:---------------|:-------------------|:--------------|:---------|
 | rw                   | yes      | read-write     | not specified      | not specified | no       |
+| rwtrg                | no       |                |                    |               |          |
 | ro                   | yes      | read-only      | don't care         | not specified | no       |
-| rof                  | no       |                |                    |               | no       |
+| rotrg                | no       |                |                    |               |          |
+| rowo                 | no       |                |                    |               |          |
+| rowotrg              | no       |                |                    |               |          |
+| rof                  | no       |                |                    |               |          |
 | wo                   | yes      | write-only     | not specified      | don't care    | no       |
+| wotrg                | no       |                |                    |               |          |
 | wrc                  | yes      | read-write     | not specified      | clear         | no       |
 | wrs                  | yes      | read-write     | not specified      | set           | no       |
 | rc                   | yes      | read-only      | don't care         | clear         | no       |
@@ -83,7 +87,7 @@ Feedbacks, bug reports, questions and etc. are wellcome! You can post them by us
 
 ## Copyright & License
 
-Copyright © 2020 Taichi Ishitani. RgGen::DUH is licensed under the [MIT License](https://opensource.org/licenses/MIT), see [LICENSE](LICENSE) for futher details.
+Copyright © 2020-2022 Taichi Ishitani. RgGen::DUH is licensed under the [MIT License](https://opensource.org/licenses/MIT), see [LICENSE](LICENSE) for futher details.
 
 ## Notice
 
@@ -92,4 +96,4 @@ See [lib/rggen/duh/duh-schema/README.md](lib/rggen/duh/duh-schema/README.md) for
 
 ## Code of Conduct
 
-Everyone interacting in the Rggen::Duh project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/rggen/rggen-duh/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the RgGen::Duh project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/rggen/rggen-duh/blob/master/CODE_OF_CONDUCT.md).

data/lib/rggen/duh/exceptions.rb

@@ -3,9 +3,6 @@
 module RgGen
   module DUH
     class ParseError < RgGen::Core::LoadError
-      def initialize(message, file_name, reason)
-        super(message, file_name, reason)
-      end
     end
 
     class ValidationError < RgGen::Core::LoadError

data/lib/rggen/duh/extractor/type.rb

@@ -5,107 +5,109 @@ RgGen.define_value_extractor(:register_map, :duh, :bit_field, :type) do
 
   private
 
-  TYPE_MAP = {
-    rw: {
-      access: 'read-write', modified_write_value: 'default',
-      read_action: 'default', reserved: false
-    },
-    ro: {
-      access: 'read-only', read_action: 'default', reserved: false
-    },
-    wo: {
-      access: 'write-only', modified_write_value: 'default', reserved: false
-    },
-    wrc: {
-      access: 'read-write', modified_write_value: 'default',
-      read_action: 'clear', reserved: false
-    },
-    wrs: {
-      access: 'read-write', modified_write_value: 'default',
-      read_action: 'set', reserved: false
-    },
-    rc: {
-      access: 'read-only', read_action: 'clear', reserved: false
-    },
-    w0c: {
-      access: 'read-write', modified_write_value: 'zeroToClear',
-      read_action: 'default', reserved: false
-    },
-    w1c: {
-      access: 'read-write', modified_write_value: 'oneToClear',
-      read_action: 'default', reserved: false
-    },
-    wc: {
-      access: 'read-write', modified_write_value: 'clear',
-      read_action: 'default', reserved: false
-    },
-    woc: {
-      access: 'write-only', modified_write_value: 'clear', reserved: false
-    },
-    rs: {
-      access: 'read-only', read_action: 'set', reserved: false
-    },
-    w0s: {
-      access: 'read-write', modified_write_value: 'zeroToSet',
-      read_action: 'default', reserved: false
-    },
-    w1s: {
-      access: 'read-write', modified_write_value: 'oneToSet',
-      read_action: 'default', reserved: false
-    },
-    ws: {
-      access: 'read-write', modified_write_value: 'set',
-      read_action: 'default', reserved: false
-    },
-    wos: {
-      access: 'write-only', modified_write_value: 'set', reserved: false
-    },
-    w0t: {
-      access: 'read-write', modified_write_value: 'zeroToToggle',
-      read_action: 'default', reserved: false
-    },
-    w1t: {
-      access: 'read-write', modified_write_value: 'oneToToggle',
-      read_action: 'default', reserved: false
-    },
-    w0crs: {
-      access: 'read-write', modified_write_value: 'zeroToClear',
-      read_action: 'set', reserved: false
-    },
-    w1crs: {
-      access: 'read-write', modified_write_value: 'oneToClear',
-      read_action: 'set', reserved: false
-    },
-    wcrs: {
-      access: 'read-write', modified_write_value: 'clear',
-      read_action: 'set', reserved: false
-    },
-    w0src: {
-      access: 'read-write', modified_write_value: 'zeroToSet',
-      read_action: 'clear', reserved: false
-    },
-    w1src: {
-      access: 'read-write', modified_write_value: 'oneToSet',
-      read_action: 'clear', reserved: false
-    },
-    wsrc: {
-      access: 'read-write', modified_write_value: 'set',
-      read_action: 'clear', reserved: false
-    },
-    w1: {
-      access: 'read-writeOnce', modified_write_value: 'default',
-      read_action: 'default', reserved: false
-    },
-    wo1: {
-      access: 'writeOnce', modified_write_value: 'default', reserved: false
-    },
-    reserved: {
-      reserved: true
-    }
-  }.freeze
-
   def find_type(duh)
-    TYPE_MAP.find { |_, properties| match_properties?(duh, properties) }&.first
+    type_map.find { |_, properties| match_properties?(duh, properties) }&.first
+  end
+
+  def type_map
+    @type_map ||= {
+      rw: {
+        access: 'read-write', modified_write_value: 'default',
+        read_action: 'default', reserved: false
+      },
+      ro: {
+        access: 'read-only', read_action: 'default', reserved: false
+      },
+      wo: {
+        access: 'write-only', modified_write_value: 'default', reserved: false
+      },
+      wrc: {
+        access: 'read-write', modified_write_value: 'default',
+        read_action: 'clear', reserved: false
+      },
+      wrs: {
+        access: 'read-write', modified_write_value: 'default',
+        read_action: 'set', reserved: false
+      },
+      rc: {
+        access: 'read-only', read_action: 'clear', reserved: false
+      },
+      w0c: {
+        access: 'read-write', modified_write_value: 'zeroToClear',
+        read_action: 'default', reserved: false
+      },
+      w1c: {
+        access: 'read-write', modified_write_value: 'oneToClear',
+        read_action: 'default', reserved: false
+      },
+      wc: {
+        access: 'read-write', modified_write_value: 'clear',
+        read_action: 'default', reserved: false
+      },
+      woc: {
+        access: 'write-only', modified_write_value: 'clear', reserved: false
+      },
+      rs: {
+        access: 'read-only', read_action: 'set', reserved: false
+      },
+      w0s: {
+        access: 'read-write', modified_write_value: 'zeroToSet',
+        read_action: 'default', reserved: false
+      },
+      w1s: {
+        access: 'read-write', modified_write_value: 'oneToSet',
+        read_action: 'default', reserved: false
+      },
+      ws: {
+        access: 'read-write', modified_write_value: 'set',
+        read_action: 'default', reserved: false
+      },
+      wos: {
+        access: 'write-only', modified_write_value: 'set', reserved: false
+      },
+      w0t: {
+        access: 'read-write', modified_write_value: 'zeroToToggle',
+        read_action: 'default', reserved: false
+      },
+      w1t: {
+        access: 'read-write', modified_write_value: 'oneToToggle',
+        read_action: 'default', reserved: false
+      },
+      w0crs: {
+        access: 'read-write', modified_write_value: 'zeroToClear',
+        read_action: 'set', reserved: false
+      },
+      w1crs: {
+        access: 'read-write', modified_write_value: 'oneToClear',
+        read_action: 'set', reserved: false
+      },
+      wcrs: {
+        access: 'read-write', modified_write_value: 'clear',
+        read_action: 'set', reserved: false
+      },
+      w0src: {
+        access: 'read-write', modified_write_value: 'zeroToSet',
+        read_action: 'clear', reserved: false
+      },
+      w1src: {
+        access: 'read-write', modified_write_value: 'oneToSet',
+        read_action: 'clear', reserved: false
+      },
+      wsrc: {
+        access: 'read-write', modified_write_value: 'set',
+        read_action: 'clear', reserved: false
+      },
+      w1: {
+        access: 'read-writeOnce', modified_write_value: 'default',
+        read_action: 'default', reserved: false
+      },
+      wo1: {
+        access: 'writeOnce', modified_write_value: 'default', reserved: false
+      },
+      reserved: {
+        reserved: true
+      }
+    }.freeze
   end
 
   def match_properties?(duh, properties)

data/lib/rggen/duh/loader.rb

@@ -42,9 +42,14 @@ module RgGen
       }.freeze
 
       def format_sub_layer_data(read_data, layer, _file)
-        SUB_LAYERS[layer]&.each_with_object({}) do |sub_layer, sub_layer_data|
-          data = __send__("collect_#{sub_layer}_data", read_data)
-          data && (sub_layer_data[sub_layer] = data)
+        SUB_LAYERS[layer]&.each_with_object([]) do |sub_layer, sub_layer_data|
+          data =
+            if layer == :root
+              collect_register_block_data(read_data)
+            else
+              collect_sub_layer_data(read_data, sub_layer)
+            end
+          data && sub_layer_data.concat([sub_layer].product(data))
         end
       end
 
@@ -61,21 +66,15 @@ module RgGen
           &.compact
       end
 
-      def collect_register_file_data(read_data)
-        read_data['registerFiles']&.map do |data|
-          add_parent_and_layer_properties(data, read_data, :register_file)
-        end
-      end
-
-      def collect_register_data(read_data)
-        read_data['registers']&.map do |data|
-          add_parent_and_layer_properties(data, read_data, :register)
-        end
-      end
+      KEY_MAP = {
+        register_file: 'registerFiles',
+        register: 'registers',
+        bit_field: 'fields'
+      }.freeze
 
-      def collect_bit_field_data(read_data)
-        read_data['fields']&.map do |data|
-          add_parent_and_layer_properties(data, read_data, :bit_field)
+      def collect_sub_layer_data(read_data, sub_layer)
+        read_data[KEY_MAP[sub_layer]]&.map do |data|
+          add_parent_and_layer_properties(data, read_data, sub_layer)
         end
       end
 

data/lib/rggen/duh/setup.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 
 require 'rggen/duh'
-RgGen.setup RgGen::DUH
+RgGen.register_plugin RgGen::DUH

data/lib/rggen/duh/version.rb

@@ -2,6 +2,6 @@
 
 module RgGen
   module DUH
-    VERSION = '0.2.0'
+    VERSION = '0.5.0'
   end
 end

data/lib/rggen/duh.rb

@@ -11,25 +11,15 @@ require_relative 'duh/loader'
 
 module RgGen
   module DUH
-    PLUGIN_NAME = :'rggen-duh'
+    extend Core::Plugin
 
-    EXTRACTORS = [
-      'duh/extractor/bit_assignment',
-      'duh/extractor/simple_extractors',
-      'duh/extractor/type'
-    ].freeze
-
-    def self.register_loader(builder)
-      builder.register_loader(:register_map, :duh, Loader)
-    end
-
-    def self.load_extractors
-      EXTRACTORS.each { |file| require_relative(file) }
-    end
-
-    def self.default_setup(builder)
-      register_loader(builder)
-      load_extractors
+    setup_plugin :'rggen-duh' do |plugin|
+      plugin.register_loader :register_map, :duh, Loader
+      plugin.files [
+        'duh/extractor/bit_assignment',
+        'duh/extractor/simple_extractors',
+        'duh/extractor/type'
+      ]
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rggen-duh
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-25 00:00:00.000000000 Z
+date: 2022-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_refs
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.12
+        version: 0.2.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.12
+        version: 0.2.17
 - !ruby/object:Gem::Dependency
   name: rb_json5
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,7 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/rggen/rggen-duh/issues
   mailing_list_uri: https://groups.google.com/d/forum/rggen
+  rubygems_mfa_required: 'true'
   source_code_uri: https://github.com/rggen/rggen-duh
   wiki_uri: https://github.com/rggen/rggen/wiki
 post_install_message: 
@@ -104,15 +105,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
-summary: rggen-dut-0.2.0
+summary: rggen-dut-0.5.0
 test_files: []