rggen-vhdl 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c74cc68ef729bcf49af9fbfb49184006e2f145408fa67d77adf96cd85ab07510
-  data.tar.gz: e113dc0c84be1b6646ae0d876e4f0cb920680c0bba12d71d434fbd6d168e6f42
+  metadata.gz: a3fe2a4f117ebddd32c38f4e65d042c845f81e85f6130d7f85ebf94f7b12868f
+  data.tar.gz: 55c35ac2e82232c2fba80da4ec23ad0bb417cb35c228b3e94a76ee134f747f54
 SHA512:
-  metadata.gz: fc44aaaafada6892281fc6f608af510e051bfb46aa00331dd4f1ac727c551d49d27dff01fd5f775cf5dc998c552553b1d30c682764e730696306c4ccf6ee2901
-  data.tar.gz: d378636891636a4609d1a40a4878ffd4a2edde73c5c30335d9e2a45265203de768db5f34d42a2dbbc8cea9b46e6b2f82416d9f43d2d185dc5d7c9d9204f7513b
+  metadata.gz: 1e1d50c4f6eea7cfd80de27beac4e2f451d8913d13b77976776e0c021252dc53da2aa1227ed5b587f905d30aa54d66437e4af795bc15cea9626f8a7076bc521f
+  data.tar.gz: 0fa49c35d10ddfe2c4d680780dd3f40ef0a8dc64aa4808cc352c55261ccf9d8d754aa450643bdacf1072b86f88ce880050851afcf09001a091ea25f0439353e3

data/README.md

@@ -60,7 +60,8 @@ $ simulator \
 
 Feedbacks, bus reports, questions and etc. are welcome! You can post them bu using following ways:
 
-* [GitHub Issue Tracker](https://github.com/rggen/rggen-vhdl/issues)
+* [GitHub Issue Tracker](https://github.com/rggen/rggen/issues)
+* [GitHub Discussions](https://github.com/rggen/rggen/discussions)
 * [Chat Room](https://gitter.im/rggen/rggen)
 * [Mailing List](https://groups.google.com/d/forum/rggen)
 * [Mail](mailto:rggen@googlegroups.com)

data/lib/rggen/vhdl/bit_field/type/row0trg_row1trg.erb

@@ -0,0 +1,18 @@
+u_bit_field: entity work.rggen_bit_field_w01trg
+  generic map (
+    WRITE_ONE_TRIGGER => <%= write_one_trigger? %>,
+    WIDTH             => <%= width %>
+  )
+  port map (
+    i_clk             => i_clk,
+    i_rst_n           => i_rst_n,
+    i_sw_valid        => <%= bit_field_valid %>,
+    i_sw_read_mask    => <%= bit_field_read_mask %>,
+    i_sw_write_enable => "1",
+    i_sw_write_mask   => <%= bit_field_write_mask %>,
+    i_sw_write_data   => <%= bit_field_write_data %>,
+    o_sw_read_data    => <%= bit_field_read_data %>,
+    o_sw_value        => <%= bit_field_value %>,
+    i_value           => <%= reference_or_value_in %>,
+    o_trigger         => <%= trigger[loop_variables] %>
+  );

data/lib/rggen/vhdl/bit_field/type/row0trg_row1trg.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+RgGen.define_list_item_feature(:bit_field, :type, [:row0trg, :row1trg]) do
+  vhdl do
+    build do
+      unless bit_field.reference?
+        input :value_in, {
+          name: "i_#{full_name}", width: width, array_size: array_size
+        }
+      end
+      output :trigger, {
+        name: "o_#{full_name}_trigger", width: width, array_size: array_size
+      }
+    end
+
+    main_code :bit_field, from_template: true
+
+    private
+
+    def write_one_trigger?
+      bit_field.type == :row1trg
+    end
+
+    def reference_or_value_in
+      reference_bit_field || value_in[loop_variables]
+    end
+  end
+end

data/lib/rggen/vhdl/bit_field/type/w0trg_w1trg.erb

@@ -13,5 +13,6 @@ u_bit_field: entity work.rggen_bit_field_w01trg
     i_sw_write_data   => <%= bit_field_write_data %>,
     o_sw_read_data    => <%= bit_field_read_data %>,
     o_sw_value        => <%= bit_field_value %>,
+    i_value           => (others => '0'),
     o_trigger         => <%= trigger[loop_variables] %>
   );

data/lib/rggen/vhdl/version.rb

@@ -2,6 +2,6 @@
 
 module RgGen
   module VHDL
-    VERSION = '0.2.1'
+    VERSION = '0.3.0'
   end
 end

data/lib/rggen/vhdl.rb

@@ -10,44 +10,43 @@ require_relative 'vhdl/component'
 require_relative 'vhdl/feature'
 require_relative 'vhdl/factories'
 
-module RgGen
-  module VHDL
-    extend Core::Plugin
+RgGen.setup_plugin :'rggen-vhdl' do |plugin|
+  plugin.version RgGen::VHDL::VERSION
 
-    setup_plugin :'rggen-vhdl' do |plugin|
-      plugin.register_component :vhdl do
-        component Component, ComponentFactory
-        feature Feature, FeatureFactory
-      end
-
-      plugin.files [
-        'vhdl/bit_field/type',
-        'vhdl/bit_field/type/rc_w0c_w1c_wc_woc',
-        'vhdl/bit_field/type/ro_rotrg',
-        'vhdl/bit_field/type/rof',
-        'vhdl/bit_field/type/rowo_rowotrg',
-        'vhdl/bit_field/type/rs_w0s_w1s_ws_wos',
-        'vhdl/bit_field/type/rw_rwtrg_w1',
-        'vhdl/bit_field/type/rwc',
-        'vhdl/bit_field/type/rwe_rwl',
-        'vhdl/bit_field/type/rws',
-        'vhdl/bit_field/type/w0crs_w0src_w1crs_w1src_wcrs_wsrc',
-        'vhdl/bit_field/type/w0t_w1t',
-        'vhdl/bit_field/type/w0trg_w1trg',
-        'vhdl/bit_field/type/wo_wo1_wotrg',
-        'vhdl/bit_field/type/wrc_wrs',
-        'vhdl/bit_field/vhdl_top',
-        'vhdl/register/type',
-        'vhdl/register/type/external',
-        'vhdl/register/type/indirect',
-        'vhdl/register/vhdl_top',
-        'vhdl/register_block/protocol',
-        'vhdl/register_block/protocol/apb',
-        'vhdl/register_block/protocol/axi4lite',
-        'vhdl/register_block/protocol/wishbone',
-        'vhdl/register_block/vhdl_top',
-        'vhdl/register_file/vhdl_top'
-      ]
-    end
+  plugin.register_component :vhdl do
+    component RgGen::VHDL::Component,
+              RgGen::VHDL::ComponentFactory
+    feature RgGen::VHDL::Feature,
+            RgGen::VHDL::FeatureFactory
   end
+
+  plugin.files [
+    'vhdl/register_block/vhdl_top',
+    'vhdl/register_block/protocol',
+    'vhdl/register_block/protocol/apb',
+    'vhdl/register_block/protocol/axi4lite',
+    'vhdl/register_block/protocol/wishbone',
+    'vhdl/register_file/vhdl_top',
+    'vhdl/register/vhdl_top',
+    'vhdl/register/type',
+    'vhdl/register/type/external',
+    'vhdl/register/type/indirect',
+    'vhdl/bit_field/vhdl_top',
+    'vhdl/bit_field/type',
+    'vhdl/bit_field/type/rc_w0c_w1c_wc_woc',
+    'vhdl/bit_field/type/ro_rotrg',
+    'vhdl/bit_field/type/rof',
+    'vhdl/bit_field/type/row0trg_row1trg',
+    'vhdl/bit_field/type/rowo_rowotrg',
+    'vhdl/bit_field/type/rs_w0s_w1s_ws_wos',
+    'vhdl/bit_field/type/rw_rwtrg_w1',
+    'vhdl/bit_field/type/rwc',
+    'vhdl/bit_field/type/rwe_rwl',
+    'vhdl/bit_field/type/rws',
+    'vhdl/bit_field/type/w0crs_w0src_w1crs_w1src_wcrs_wsrc',
+    'vhdl/bit_field/type/w0t_w1t',
+    'vhdl/bit_field/type/w0trg_w1trg',
+    'vhdl/bit_field/type/wo_wo1_wotrg',
+    'vhdl/bit_field/type/wrc_wrs'
+  ]
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rggen-vhdl
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-07 00:00:00.000000000 Z
+date: 2022-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rggen-systemverilog
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.26.0
+        version: 0.27.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -56,6 +56,8 @@ files:
 - lib/rggen/vhdl/bit_field/type/ro_rotrg.rb
 - lib/rggen/vhdl/bit_field/type/rof.erb
 - lib/rggen/vhdl/bit_field/type/rof.rb
+- lib/rggen/vhdl/bit_field/type/row0trg_row1trg.erb
+- lib/rggen/vhdl/bit_field/type/row0trg_row1trg.rb
 - lib/rggen/vhdl/bit_field/type/rowo_rowotrg.erb
 - lib/rggen/vhdl/bit_field/type/rowo_rowotrg.rb
 - lib/rggen/vhdl/bit_field/type/rs_w0s_w1s_ws_wos.erb
@@ -100,7 +102,6 @@ files:
 - lib/rggen/vhdl/register_block/vhdl_top.erb
 - lib/rggen/vhdl/register_block/vhdl_top.rb
 - lib/rggen/vhdl/register_file/vhdl_top.rb
-- lib/rggen/vhdl/setup.rb
 - lib/rggen/vhdl/utility.rb
 - lib/rggen/vhdl/utility/data_object.rb
 - lib/rggen/vhdl/utility/identifier.rb
@@ -110,7 +111,7 @@ homepage: https://github.com/rggen/rggen-vhdl
 licenses:
 - MIT
 metadata:
-  bug_tracker_uri: https://github.com/rggen/rggen-vhdl/issues
+  bug_tracker_uri: https://github.com/rggen/rggen/issues
   mailing_list_uri: https://groups.google.com/d/forum/rggen
   rubygems_mfa_required: 'true'
   source_code_uri: https://github.com/rggen/rggen-vhdl
@@ -133,5 +134,5 @@ requirements: []
 rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
-summary: rggen-vhdl-0.2.1
+summary: rggen-vhdl-0.3.0
 test_files: []

data/lib/rggen/vhdl/setup.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-require 'rggen/vhdl'
-
-RgGen.register_plugin RgGen::VHDL do |builder|
-  builder.load_plugin 'rggen/systemverilog/rtl/setup'
-  builder.enable :register_block, [:vhdl_top]
-  builder.enable :register_file, [:vhdl_top]
-  builder.enable :register, [:vhdl_top]
-  builder.enable :bit_field, [:vhdl_top]
-end