rggen-verilog 0.3.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '06670669d48946bead954241343d1a066259235a35831b208d7f83b2609dbb23'
-  data.tar.gz: ccd8a5b93bcbf91d46f2c37187e4c85969f2985c4ab86d7b95b9c471c452f377
+  metadata.gz: 92ebf6366cd316b67c1baff2f0298b9240a2c570cf1660ec808ed952f763f114
+  data.tar.gz: d3cd1664b3e5441c5b09867236012b917c29a0a9dd306c5e781b5c8a215b4b9e
 SHA512:
-  metadata.gz: 72671fa06f46bebf4ec983f872c713a48b0b49b56582bab0a8a3779208f321cfcd2a1c9262a0600276e67f40d5946825805ca617c7f8b8810e7ed8f7a4faaf22
-  data.tar.gz: e61413d89d74a72316ecbb66597cab18ded435dc4819d68fcbd5a2b9f9b11caa978a85c8112ef66a5b338c26874a7aec1452413523013b5f4d323ceb1f5eecaf
+  metadata.gz: d4cf77051fb8dcf8e5516c030a874d7183cca68d2b7e9ca7fe550100cd23fef13e31fd915836ab8d439fe468efb5ffcb33a350f71eda030a81a37a76346c2345
+  data.tar.gz: 1f2e154e8fbe2444127d99d4bcca05c6042058c19ac46b6d2337a3b288ac7a511b3bc77ea88f08cdb5882667e56b74649d5db54f5ba7ea0db6f1fbb7a35f1667

data/LICENSE

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

@@ -60,14 +60,15 @@ $ 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-verilog/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)
 
 ## Copyright & License
 
-Copyright © 2020-2021 Taichi Ishitani. RgGen::Verilog is licensed under the [MIT License](https://opensource.org/licenses/MIT), see [LICENSE](LICENSE) for futher details.
+Copyright © 2020-2022 Taichi Ishitani. RgGen::Verilog is licensed under the [MIT License](https://opensource.org/licenses/MIT), see [LICENSE](LICENSE) for futher details.
 
 ## Code of Conduct
 

data/lib/rggen/verilog/bit_field/type/rc_w0c_w1c_wc_woc.erb

@@ -13,6 +13,8 @@ rggen_bit_field #(
   .i_sw_write_data    (<%= bit_field_write_data %>),
   .o_sw_read_data     (<%= bit_field_read_data %>),
   .o_sw_value         (<%= bit_field_value %>),
+  .o_write_trigger    (),
+  .o_read_trigger     (),
   .i_hw_write_enable  (1'b0),
   .i_hw_write_data    (<%= fill_0(width) %>),
   .i_hw_set           (<%= set[loop_variables] %>),

data/lib/rggen/verilog/bit_field/type/{ro.erb → ro_rotrg.erb}

@@ -1,9 +1,11 @@
 rggen_bit_field #(
-  .WIDTH    (<%= width %>),
-  .STORAGE  (0)
+  .WIDTH              (<%= width %>),
+  .STORAGE            (0),
+  .EXTERNAL_READ_DATA (1),
+  .TRIGGER            (<%= trigger %>)
 ) u_bit_field (
-  .i_clk              (1'b0),
-  .i_rst_n            (1'b0),
+  .i_clk              (<%= clock %>),
+  .i_rst_n            (<%= reset %>),
   .i_sw_valid         (<%= bit_field_valid %>),
   .i_sw_read_mask     (<%= bit_field_read_mask %>),
   .i_sw_write_enable  (1'b0),
@@ -11,6 +13,8 @@ rggen_bit_field #(
   .i_sw_write_data    (<%= bit_field_write_data %>),
   .o_sw_read_data     (<%= bit_field_read_data %>),
   .o_sw_value         (<%= bit_field_value %>),
+  .o_write_trigger    (),
+  .o_read_trigger     (<%= read_trigger_signal %>),
   .i_hw_write_enable  (1'b0),
   .i_hw_write_data    (<%= fill_0(width) %>),
   .i_hw_set           (<%= fill_0(width) %>),

data/lib/rggen/verilog/bit_field/type/ro_rotrg.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+RgGen.define_list_item_feature(:bit_field, :type, [:ro, :rotrg]) do
+  verilog do
+    build do
+      unless bit_field.reference?
+        input :value_in, {
+          name: "i_#{full_name}", width: width, array_size: array_size
+        }
+      end
+      if rotrg?
+        output :read_trigger, {
+          name: "o_#{full_name}_read_trigger", width: 1, array_size: array_size
+        }
+      end
+    end
+
+    main_code :bit_field, from_template: true
+
+    private
+
+    def rotrg?
+      bit_field.type == :rotrg
+    end
+
+    def trigger
+      rotrg? && 1 || 0
+    end
+
+    def read_trigger_signal
+      rotrg? && read_trigger[loop_variables] || nil
+    end
+
+    def reference_or_value_in
+      reference_bit_field || value_in[loop_variables]
+    end
+  end
+end

data/lib/rggen/verilog/bit_field/type/rof.erb

@@ -1,6 +1,7 @@
 rggen_bit_field #(
-  .WIDTH    (<%= width %>),
-  .STORAGE  (0)
+  .WIDTH              (<%= width %>),
+  .STORAGE            (0),
+  .EXTERNAL_READ_DATA (1)
 ) u_bit_field (
   .i_clk              (1'b0),
   .i_rst_n            (1'b0),
@@ -11,6 +12,8 @@ rggen_bit_field #(
   .i_sw_write_data    (<%= bit_field_write_data %>),
   .o_sw_read_data     (<%= bit_field_read_data %>),
   .o_sw_value         (<%= bit_field_value %>),
+  .o_write_trigger    (),
+  .o_read_trigger     (),
   .i_hw_write_enable  (1'b0),
   .i_hw_write_data    (<%= fill_0(width) %>),
   .i_hw_set           (<%= fill_0(width) %>),

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

@@ -0,0 +1,16 @@
+rggen_bit_field_w01trg #(
+  .TRIGGER_VALUE  (<%= trigger_value %>),
+  .WIDTH          (<%= width %>)
+) u_bit_field (
+  .i_clk              (<%= clock %>),
+  .i_rst_n            (<%= reset %>),
+  .i_sw_valid         (<%= bit_field_valid %>),
+  .i_sw_read_mask     (<%= bit_field_read_mask %>),
+  .i_sw_write_enable  (1'b1),
+  .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/verilog/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
+  verilog 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 trigger_value
+      bin({ row0trg: 0, row1trg: 1 }[bit_field.type], 1)
+    end
+
+    def reference_or_value_in
+      reference_bit_field || value_in[loop_variables]
+    end
+  end
+end

data/lib/rggen/verilog/bit_field/type/rowo_rowotrg.erb

@@ -0,0 +1,26 @@
+rggen_bit_field #(
+  .WIDTH              (<%= width %>),
+  .INITIAL_VALUE      (<%= initial_value %>),
+  .EXTERNAL_READ_DATA (1),
+  .TRIGGER            (<%= trigger %>)
+) u_bit_field (
+  .i_clk              (<%= clock %>),
+  .i_rst_n            (<%= reset %>),
+  .i_sw_valid         (<%= bit_field_valid %>),
+  .i_sw_read_mask     (<%= bit_field_read_mask %>),
+  .i_sw_write_enable  (1'b1),
+  .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 %>),
+  .o_write_trigger    (<%= write_trigger_signal %>),
+  .o_read_trigger     (<%= read_trigger_signal %>),
+  .i_hw_write_enable  (1'b0),
+  .i_hw_write_data    (<%= fill_0(width) %>),
+  .i_hw_set           (<%= fill_0(width) %>),
+  .i_hw_clear         (<%= fill_0(width) %>),
+  .i_value            (<%= reference_or_value_in %>),
+  .i_mask             (<%= fill_1(width) %>),
+  .o_value            (<%= value_out[loop_variables] %>),
+  .o_value_unmasked   ()
+);

data/lib/rggen/verilog/bit_field/type/rowo_rowotrg.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+RgGen.define_list_item_feature(:bit_field, :type, [:rowo, :rowotrg]) do
+  verilog do
+    build do
+      output :value_out, {
+        name: "o_#{full_name}", width: width, array_size: array_size
+      }
+      unless bit_field.reference?
+        input :value_in, {
+          name: "i_#{full_name}", width: width, array_size: array_size
+        }
+      end
+      if rowotrg?
+        output :write_trigger, {
+          name: "o_#{full_name}_write_trigger", width: 1, array_size: array_size
+        }
+        output :read_trigger, {
+          name: "o_#{full_name}_read_trigger", width: 1, array_size: array_size
+        }
+      end
+    end
+
+    main_code :bit_field, from_template: true
+
+    private
+
+    def rowotrg?
+      bit_field.type == :rowotrg
+    end
+
+    def trigger
+      rowotrg? && 1 || 0
+    end
+
+    def write_trigger_signal
+      rowotrg? && write_trigger[loop_variables] || nil
+    end
+
+    def read_trigger_signal
+      rowotrg? && read_trigger[loop_variables] || nil
+    end
+
+    def reference_or_value_in
+      reference_bit_field || value_in[loop_variables]
+    end
+  end
+end

data/lib/rggen/verilog/bit_field/type/rs_w0s_w1s_ws_wos.erb

@@ -13,6 +13,8 @@ rggen_bit_field #(
   .i_sw_write_data    (<%= bit_field_write_data %>),
   .o_sw_read_data     (<%= bit_field_read_data %>),
   .o_sw_value         (<%= bit_field_value %>),
+  .o_write_trigger    (),
+  .o_read_trigger     (),
   .i_hw_write_enable  (1'b0),
   .i_hw_write_data    (<%= fill_0(width) %>),
   .i_hw_set           (<%= fill_0(width) %>),

data/lib/rggen/verilog/bit_field/type/{rw_w1_wo_wo1.erb → rw_rwtrg_w1.erb}

@@ -1,8 +1,8 @@
 rggen_bit_field #(
   .WIDTH          (<%= width %>),
   .INITIAL_VALUE  (<%= initial_value %>),
-  .SW_READ_ACTION (<%= read_action %>),
-  .SW_WRITE_ONCE  (<%= write_once %>)
+  .SW_WRITE_ONCE  (<%= write_once %>),
+  .TRIGGER        (<%= trigger %>)
 ) u_bit_field (
   .i_clk              (<%= clock %>),
   .i_rst_n            (<%= reset %>),
@@ -13,6 +13,8 @@ rggen_bit_field #(
   .i_sw_write_data    (<%= bit_field_write_data %>),
   .o_sw_read_data     (<%= bit_field_read_data %>),
   .o_sw_value         (<%= bit_field_value %>),
+  .o_write_trigger    (<%= write_trigger_signal %>),
+  .o_read_trigger     (<%= read_trigger_signal %>),
   .i_hw_write_enable  (1'b0),
   .i_hw_write_data    (<%= fill_0(width) %>),
   .i_hw_set           (<%= fill_0(width) %>),

data/lib/rggen/verilog/bit_field/type/rw_rwtrg_w1.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+RgGen.define_list_item_feature(:bit_field, :type, [:rw, :rwtrg, :w1]) do
+  verilog do
+    build do
+      output :value_out, {
+        name: "o_#{full_name}", width: width, array_size: array_size
+      }
+      if rwtrg?
+        output :write_trigger, {
+          name: "o_#{full_name}_write_trigger", width: 1, array_size: array_size
+        }
+        output :read_trigger, {
+          name: "o_#{full_name}_read_trigger", width: 1, array_size: array_size
+        }
+      end
+    end
+
+    main_code :bit_field, from_template: true
+
+    private
+
+    def rwtrg?
+      bit_field.type == :rwtrg
+    end
+
+    def write_once
+      bit_field.type == :w1 && 1 || 0
+    end
+
+    def trigger
+      rwtrg? && 1 || 0
+    end
+
+    def write_trigger_signal
+      rwtrg? && write_trigger[loop_variables] || nil
+    end
+
+    def read_trigger_signal
+      rwtrg? && read_trigger[loop_variables] || nil
+    end
+  end
+end

data/lib/rggen/verilog/bit_field/type/rwc.erb

@@ -12,6 +12,8 @@ rggen_bit_field #(
   .i_sw_write_data    (<%= bit_field_write_data %>),
   .o_sw_read_data     (<%= bit_field_read_data %>),
   .o_sw_value         (<%= bit_field_value %>),
+  .o_write_trigger    (),
+  .o_read_trigger     (),
   .i_hw_write_enable  (1'b0),
   .i_hw_write_data    (<%= fill_0(width) %>),
   .i_hw_set           (<%= fill_0(width) %>),

data/lib/rggen/verilog/bit_field/type/rwe_rwl.erb

@@ -12,6 +12,8 @@ rggen_bit_field #(
   .i_sw_write_data    (<%= bit_field_write_data %>),
   .o_sw_read_data     (<%= bit_field_read_data %>),
   .o_sw_value         (<%= bit_field_value %>),
+  .o_write_trigger    (),
+  .o_read_trigger     (),
   .i_hw_write_enable  (1'b0),
   .i_hw_write_data    (<%= fill_0(width) %>),
   .i_hw_set           (<%= fill_0(width) %>),

data/lib/rggen/verilog/bit_field/type/rws.erb

@@ -11,6 +11,8 @@ rggen_bit_field #(
   .i_sw_write_data    (<%= bit_field_write_data %>),
   .o_sw_read_data     (<%= bit_field_read_data %>),
   .o_sw_value         (<%= bit_field_value %>),
+  .o_write_trigger    (),
+  .o_read_trigger     (),
   .i_hw_write_enable  (<%= set_signal %>),
   .i_hw_write_data    (<%= value_in[loop_variables] %>),
   .i_hw_set           (<%= fill_0(width) %>),

data/lib/rggen/verilog/bit_field/type/w0crs_w0src_w1crs_w1src_wcrs_wsrc.erb

@@ -13,6 +13,8 @@ rggen_bit_field #(
   .i_sw_write_data    (<%= bit_field_write_data %>),
   .o_sw_read_data     (<%= bit_field_read_data %>),
   .o_sw_value         (<%= bit_field_value %>),
+  .o_write_trigger    (),
+  .o_read_trigger     (),
   .i_hw_write_enable  (1'b0),
   .i_hw_write_data    (<%= fill_0(width) %>),
   .i_hw_set           (<%= fill_0(width) %>),

data/lib/rggen/verilog/bit_field/type/w0t_w1t.erb

@@ -12,6 +12,8 @@ rggen_bit_field #(
   .i_sw_write_data    (<%= bit_field_write_data %>),
   .o_sw_read_data     (<%= bit_field_read_data %>),
   .o_sw_value         (<%= bit_field_value %>),
+  .o_write_trigger    (),
+  .o_read_trigger     (),
   .i_hw_write_enable  (1'b0),
   .i_hw_write_data    (<%= fill_0(width) %>),
   .i_hw_set           (<%= fill_0(width) %>),

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

@@ -2,13 +2,15 @@ rggen_bit_field_w01trg #(
   .TRIGGER_VALUE  (<%= trigger_value %>),
   .WIDTH          (<%= width %>)
 ) u_bit_field (
-  .i_clk                  (<%= clock %>),
-  .i_rst_n                (<%= reset %>),
-  .i_bit_field_valid      (<%= bit_field_valid %>),
-  .i_bit_field_read_mask  (<%= bit_field_read_mask %>),
-  .i_bit_field_write_mask (<%= bit_field_write_mask %>),
-  .i_bit_field_write_data (<%= bit_field_write_data %>),
-  .o_bit_field_read_data  (<%= bit_field_read_data %>),
-  .o_bit_field_value      (<%= bit_field_value %>),
-  .o_trigger              (<%= trigger[loop_variables] %>)
+  .i_clk              (<%= clock %>),
+  .i_rst_n            (<%= reset %>),
+  .i_sw_valid         (<%= bit_field_valid %>),
+  .i_sw_read_mask     (<%= bit_field_read_mask %>),
+  .i_sw_write_enable  (1'b1),
+  .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            (<%= fill_0(width) %>),
+  .o_trigger          (<%= trigger[loop_variables] %>)
 );

data/lib/rggen/verilog/bit_field/type/wo_wo1_wotrg.erb

@@ -0,0 +1,27 @@
+rggen_bit_field #(
+  .WIDTH          (<%= width %>),
+  .INITIAL_VALUE  (<%= initial_value %>),
+  .SW_READ_ACTION (`RGGEN_READ_NONE),
+  .SW_WRITE_ONCE  (<%= write_once %>),
+  .TRIGGER        (<%= trigger %>)
+) u_bit_field (
+  .i_clk              (<%= clock %>),
+  .i_rst_n            (<%= reset %>),
+  .i_sw_valid         (<%= bit_field_valid %>),
+  .i_sw_read_mask     (<%= bit_field_read_mask %>),
+  .i_sw_write_enable  (1'b1),
+  .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 %>),
+  .o_write_trigger    (<%= write_trigger_signal %>),
+  .o_read_trigger     (),
+  .i_hw_write_enable  (1'b0),
+  .i_hw_write_data    (<%= fill_0(width) %>),
+  .i_hw_set           (<%= fill_0(width) %>),
+  .i_hw_clear         (<%= fill_0(width) %>),
+  .i_value            (<%= fill_0(width) %>),
+  .i_mask             (<%= fill_1(width) %>),
+  .o_value            (<%= value_out[loop_variables] %>),
+  .o_value_unmasked   ()
+);

data/lib/rggen/verilog/bit_field/type/wo_wo1_wotrg.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+RgGen.define_list_item_feature(:bit_field, :type, [:wo, :wo1, :wotrg]) do
+  verilog do
+    build do
+      output :value_out, {
+        name: "o_#{full_name}", width: width, array_size: array_size
+      }
+      if wotrg?
+        output :write_trigger, {
+          name: "o_#{full_name}_write_trigger", width: 1, array_size: array_size
+        }
+      end
+    end
+
+    main_code :bit_field, from_template: true
+
+    private
+
+    def wotrg?
+      bit_field.type == :wotrg
+    end
+
+    def write_once
+      bit_field.type == :wo1 && 1 || 0
+    end
+
+    def trigger
+      wotrg? && 1 || 0
+    end
+
+    def write_trigger_signal
+      wotrg? && write_trigger[loop_variables] || nil
+    end
+  end
+end

data/lib/rggen/verilog/bit_field/type/wrc_wrs.erb

@@ -12,6 +12,8 @@ rggen_bit_field #(
   .i_sw_write_data    (<%= bit_field_write_data %>),
   .o_sw_read_data     (<%= bit_field_read_data %>),
   .o_sw_value         (<%= bit_field_value %>),
+  .o_write_trigger    (),
+  .o_read_trigger     (),
   .i_hw_write_enable  (1'b0),
   .i_hw_write_data    (<%= fill_0(width) %>),
   .i_hw_set           (<%= fill_0(width) %>),

data/lib/rggen/verilog/register/type/default.erb

@@ -5,7 +5,6 @@ rggen_default_register #(
   .OFFSET_ADDRESS (<%= offset_address %>),
   .BUS_WIDTH      (<%= bus_width %>),
   .DATA_WIDTH     (<%= width %>),
-  .VALID_BITS     (<%= valid_bits %>),
   .REGISTER_INDEX (<%= register_index %>)
 ) u_register (
   .i_clk                  (<%= clock %>),

data/lib/rggen/verilog/register/type/indirect.erb

@@ -5,7 +5,6 @@ rggen_indirect_register #(
   .OFFSET_ADDRESS       (<%= offset_address %>),
   .BUS_WIDTH            (<%= bus_width %>),
   .DATA_WIDTH           (<%= width %>),
-  .VALID_BITS           (<%= valid_bits %>),
   .INDIRECT_INDEX_WIDTH (<%= index_width %>),
   .INDIRECT_INDEX_VALUE (<%= concat(index_values) %>)
 ) u_register (

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

@@ -5,6 +5,11 @@ RgGen.define_list_feature(:register, :type) do
     base_feature do
       include RgGen::SystemVerilog::RTL::RegisterType
 
+      pre_code :register do |code|
+        register.bit_fields.empty? ||
+          (code << tie_off_unused_signals << nl)
+      end
+
       private
 
       def clock
@@ -78,6 +83,13 @@ RgGen.define_list_feature(:register, :type) do
       def bit_field_value
         register.bit_field_value
       end
+
+      def tie_off_unused_signals
+        macro_call(
+          'rggen_tie_off_unused_signals',
+          [width, valid_bits, bit_field_read_data, bit_field_value]
+        )
+      end
     end
 
     default_feature do

data/lib/rggen/verilog/register_block/protocol/wishbone.erb

@@ -0,0 +1,35 @@
+rggen_wishbone_adapter #(
+  .ADDRESS_WIDTH        (<%= address_width %>),
+  .LOCAL_ADDRESS_WIDTH  (<%= local_address_width %>),
+  .BUS_WIDTH            (<%= bus_width %>),
+  .REGISTERS            (<%= total_registers %>),
+  .PRE_DECODE           (<%= pre_decode %>),
+  .BASE_ADDRESS         (<%= base_address %>),
+  .BYTE_SIZE            (<%= byte_size %>),
+  .ERROR_STATUS         (<%= error_status %>),
+  .DEFAULT_READ_DATA    (<%= default_read_data %>),
+  .USE_STALL            (<%= use_stall %>)
+) u_adapter (
+  .i_clk                  (<%= register_block.clock %>),
+  .i_rst_n                (<%= register_block.reset %>),
+  .i_wb_cyc               (<%= wb_cyc %>),
+  .i_wb_stb               (<%= wb_stb %>),
+  .o_wb_stall             (<%= wb_stall %>),
+  .i_wb_adr               (<%= wb_adr %>),
+  .i_wb_we                (<%= wb_we %>),
+  .i_wb_dat               (<%= wb_dat_i %>),
+  .i_wb_sel               (<%= wb_sel %>),
+  .o_wb_ack               (<%= wb_ack %>),
+  .o_wb_err               (<%= wb_err %>),
+  .o_wb_rty               (<%= wb_rty %>),
+  .o_wb_dat               (<%= wb_dat_o %>),
+  .o_register_valid       (<%= register_block.register_valid %>),
+  .o_register_access      (<%= register_block.register_access %>),
+  .o_register_address     (<%= register_block.register_address %>),
+  .o_register_write_data  (<%= register_block.register_write_data %>),
+  .o_register_strobe      (<%= register_block.register_strobe %>),
+  .i_register_active      (<%= register_block.register_active %>),
+  .i_register_ready       (<%= register_block.register_ready %>),
+  .i_register_status      (<%= register_block.register_status %>),
+  .i_register_read_data   (<%= register_block.register_read_data %>)
+);

data/lib/rggen/verilog/register_block/protocol/wishbone.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+RgGen.define_list_item_feature(:register_block, :protocol, :wishbone) do
+  verilog do
+    build do
+      parameter :use_stall, {
+        name: 'USE_STALL', default: 1
+      }
+
+      input :wb_cyc, {
+        name: 'i_wb_cyc', width: 1
+      }
+      input :wb_stb, {
+        name: 'i_wb_stb', width: 1
+      }
+      output :wb_stall, {
+        name: 'o_wb_stall', width: 1
+      }
+      input :wb_adr, {
+        name: 'i_wb_adr', width: address_width
+      }
+      input :wb_we, {
+        name: 'i_wb_we', width: 1
+      }
+      input :wb_dat_i, {
+        name: 'i_wb_dat', width: bus_width
+      }
+      input :wb_sel, {
+        name: 'i_wb_sel', width: bus_width / 8
+      }
+      output :wb_ack, {
+        name: 'o_wb_ack', width: 1
+      }
+      output :wb_err, {
+        name: 'o_wb_err', width: 1
+      }
+      output :wb_rty, {
+        name: 'o_wb_rty', width: 1
+      }
+      output :wb_dat_o, {
+        name: 'o_wb_dat', width: bus_width
+      }
+    end
+
+    main_code :register_block, from_template: true
+  end
+end

data/lib/rggen/verilog/version.rb

@@ -2,6 +2,6 @@
 
 module RgGen
   module Verilog
-    VERSION = '0.3.2'
+    VERSION = '0.5.0'
   end
 end

data/lib/rggen/verilog.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rggen-verilog
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-21 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.25.0
+        version: 0.27.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.25.0
+        version: 0.27.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -52,14 +52,18 @@ files:
 - lib/rggen/verilog/bit_field/type.rb
 - lib/rggen/verilog/bit_field/type/rc_w0c_w1c_wc_woc.erb
 - lib/rggen/verilog/bit_field/type/rc_w0c_w1c_wc_woc.rb
-- lib/rggen/verilog/bit_field/type/ro.erb
-- lib/rggen/verilog/bit_field/type/ro.rb
+- lib/rggen/verilog/bit_field/type/ro_rotrg.erb
+- lib/rggen/verilog/bit_field/type/ro_rotrg.rb
 - lib/rggen/verilog/bit_field/type/rof.erb
 - lib/rggen/verilog/bit_field/type/rof.rb
+- lib/rggen/verilog/bit_field/type/row0trg_row1trg.erb
+- lib/rggen/verilog/bit_field/type/row0trg_row1trg.rb
+- lib/rggen/verilog/bit_field/type/rowo_rowotrg.erb
+- lib/rggen/verilog/bit_field/type/rowo_rowotrg.rb
 - lib/rggen/verilog/bit_field/type/rs_w0s_w1s_ws_wos.erb
 - lib/rggen/verilog/bit_field/type/rs_w0s_w1s_ws_wos.rb
-- lib/rggen/verilog/bit_field/type/rw_w1_wo_wo1.erb
-- lib/rggen/verilog/bit_field/type/rw_w1_wo_wo1.rb
+- lib/rggen/verilog/bit_field/type/rw_rwtrg_w1.erb
+- lib/rggen/verilog/bit_field/type/rw_rwtrg_w1.rb
 - lib/rggen/verilog/bit_field/type/rwc.erb
 - lib/rggen/verilog/bit_field/type/rwc.rb
 - lib/rggen/verilog/bit_field/type/rwe_rwl.erb
@@ -72,6 +76,8 @@ files:
 - lib/rggen/verilog/bit_field/type/w0t_w1t.rb
 - lib/rggen/verilog/bit_field/type/w0trg_w1trg.erb
 - lib/rggen/verilog/bit_field/type/w0trg_w1trg.rb
+- lib/rggen/verilog/bit_field/type/wo_wo1_wotrg.erb
+- lib/rggen/verilog/bit_field/type/wo_wo1_wotrg.rb
 - lib/rggen/verilog/bit_field/type/wrc_wrs.erb
 - lib/rggen/verilog/bit_field/type/wrc_wrs.rb
 - lib/rggen/verilog/bit_field/verilog_top.rb
@@ -90,10 +96,11 @@ files:
 - lib/rggen/verilog/register_block/protocol/apb.rb
 - lib/rggen/verilog/register_block/protocol/axi4lite.erb
 - lib/rggen/verilog/register_block/protocol/axi4lite.rb
+- lib/rggen/verilog/register_block/protocol/wishbone.erb
+- lib/rggen/verilog/register_block/protocol/wishbone.rb
 - lib/rggen/verilog/register_block/verilog_macros.erb
 - lib/rggen/verilog/register_block/verilog_top.rb
 - lib/rggen/verilog/register_file/verilog_top.rb
-- lib/rggen/verilog/setup.rb
 - lib/rggen/verilog/utility.rb
 - lib/rggen/verilog/utility/local_scope.rb
 - lib/rggen/verilog/version.rb
@@ -101,8 +108,9 @@ homepage: https://github.com/rggen/rggen-verilog
 licenses:
 - MIT
 metadata:
-  bug_tracker_uri: https://github.com/rggen/rggen-verilog/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-verilog
   wiki_uri: https://github.com/rggen/rggen/wiki
 post_install_message: 
@@ -113,15 +121,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.2.3
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
-summary: rggen-verilog-0.3.2
+summary: rggen-verilog-0.5.0
 test_files: []

data/lib/rggen/verilog/bit_field/type/ro.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-RgGen.define_list_item_feature(:bit_field, :type, :ro) do
-  verilog do
-    build do
-      unless bit_field.reference?
-        input :value_in, {
-          name: "i_#{full_name}", width: width, array_size: array_size
-        }
-      end
-    end
-
-    main_code :bit_field, from_template: true
-
-    private
-
-    def reference_or_value_in
-      bit_field.reference? && reference_bit_field || value_in[loop_variables]
-    end
-  end
-end

data/lib/rggen/verilog/bit_field/type/rw_w1_wo_wo1.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-RgGen.define_list_item_feature(:bit_field, :type, [:rw, :w1, :wo, :wo1]) do
-  verilog do
-    build do
-      output :value_out, {
-        name: "o_#{full_name}", width: width, array_size: array_size
-      }
-    end
-
-    main_code :bit_field, from_template: true
-
-    private
-
-    def read_action
-      bit_field.readable? && '`RGGEN_READ_DEFAULT' || '`RGGEN_READ_NONE'
-    end
-
-    def write_once
-      [:w1, :wo1].include?(bit_field.type) && 1 || 0
-    end
-  end
-end

data/lib/rggen/verilog/setup.rb

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