rggen 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8557db72205fd083dafe52498b9739d454ad263472beb66607409ca4641fd0b2
-  data.tar.gz: e5373123cdf438cf0a8d59a8c98d80268baaa3733eb97e76ff3b9215a3e5cd3a
+  metadata.gz: d2a8d729d006b9018f50cd1859191ba69eac8ffff986644c75b727606efe2cd9
+  data.tar.gz: f0f31ea88bc75e766a6aaba4205e1b38c172f80649b3641dc0923e242de37fb0
 SHA512:
-  metadata.gz: c68809dcf02ebbc254eb88b7b54fde450213bfbbcdb18b0c83bfd319fdfa711fbda93b94108a3521a131e57b93db2ff2f689c8935a97c646a63bd6d7b40b08e9
-  data.tar.gz: a433ecd75b2c6ee8d2a34ecc654b0cf4672530bd5bc7f86c62e9db132cff032a757e6ad7098f8ca49573b5f6867b47335d1cdeccbbcde7824b83fcc1226a1785
+  metadata.gz: beb719d28bf108dd444a090d0a08d4b99bf486368aa45f9cdd9e2ce34637fdc4f593a34b15934be3bb15456bc73da22ef08edab49c6d2c5eeb8325403491e94b
+  data.tar.gz: 51f8948e0709eaf8468e860dc71c71937e398b03cc2b59b61a875dfef3ba31345f5433b35548ac3d22c95797492febee2ed665ef313f5d146a1c4ec02ccd8da7

data/lib/rggen/builtins/bit_field/type.rb

@@ -173,8 +173,6 @@ list_item :bit_field, :type do
         :array_port_format
       ] => :configuration
 
-      available? { !bit_field.reserved? }
-
       build do
         interface :bit_field, :bit_field_sub_if,
                   type:       :rggen_bit_field_if,

data/lib/rggen/builtins/bit_field/types/reserved.erb

@@ -0,0 +1,6 @@
+rggen_bit_field_ro #(
+  .WIDTH  (<%= width %>)
+) u_bit_field (
+  .bit_field_if (<%= bit_field_sub_if %>),
+  .i_value      (<%= default_value %>)
+);

data/lib/rggen/builtins/bit_field/types/reserved.rb

@@ -3,8 +3,16 @@ list_item :bit_field, :type, :reserved  do
     reserved
   end
 
+  rtl do
+    generate_code_from_template :bit_field
+
+    def default_value
+      hex(0, width)
+    end
+  end
+
   ral do
     access :ro
-    hdl_path { '' }
+    hdl_path { "g_#{bit_field.name}.u_bit_field.i_value" }
   end
 end

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

@@ -194,12 +194,8 @@ list_item :register, :type do
 
       private
 
-      def actual_bit_fields
-        @non_reserved_bit_fields ||= register.bit_fields.reject(&:reserved?)
-      end
-
       def total_bit_fields
-        actual_bit_fields.size
+        register.bit_fields.size
       end
 
       def address_range
@@ -234,7 +230,7 @@ list_item :register, :type do
       end
 
       def valid_bits_value
-        actual_bit_fields.inject(0) do |bits, bit_field|
+        register.bit_fields.inject(0) do |bits, bit_field|
           bits | (((1 << bit_field.width) - 1) << bit_field.lsb)
         end
       end

data/lib/rggen/version.rb

@@ -1,6 +1,6 @@
 module RgGen
   MAJOR   = 0
   MINOR   = 8
-  TEENY   = 1
+  TEENY   = 2
   VERSION = "#{MAJOR}.#{MINOR}.#{TEENY}".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rggen
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2019-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi
@@ -150,6 +150,7 @@ files:
 - lib/rggen/builtins/bit_field/reference.rb
 - lib/rggen/builtins/bit_field/rtl_top.rb
 - lib/rggen/builtins/bit_field/type.rb
+- lib/rggen/builtins/bit_field/types/reserved.erb
 - lib/rggen/builtins/bit_field/types/reserved.rb
 - lib/rggen/builtins/bit_field/types/ro.erb
 - lib/rggen/builtins/bit_field/types/ro.rb