rggen-c-header 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dbb6ddb7c867f003e9ba685413ac4d3deb5ae9978ef5e59cca1919de9c51378
-  data.tar.gz: 34f5d2b0bec9eba0c63bec761ec8927214c118ddf70d3b9a4ae17ca6f9cd5c54
+  metadata.gz: 30f0dce81928cecf5804e27e906c88ab4f7df5e72a294668b5a9675c3f968ae2
+  data.tar.gz: d3c9119cddd83be565e659f740ea9563a15393f1b5db8c9cb8bea2a28f7b4305
 SHA512:
-  metadata.gz: a862a0468553d95a8bd094ebf309f53d0745c23619109491b30b968d1bf0200df2bb5d014c632791e04bffc54db4d13ae9447496cbd5541ef44f8a8863475b02
-  data.tar.gz: 7e97c33f3efe07cc93cfb3d09447393b2ddb121de7751cc07a1c1b44fa2d465ac24a20ca96f671544adcac708952050519c1b0a8c6611f1ddea854468b8cd771
+  metadata.gz: dc3b82bd281ad746968e4003a1a9c03daf9e6e4796a6ab60d269a73984578194589e5a0ce3fe18ce9bf5e1a189318fe6aa9ca8f3d0a4beaea5eccd67ca4ddf94
+  data.tar.gz: 6a34fdb593629dde8edc33f36fbdf3316911fb2ca77624d5d91fc1c94c621337955aca00045a714c6d21412114afbe38589b1484c60ea324dfd30fe9fb8a03b8

data/lib/rggen/c_header/bit_field/c_header.rb

@@ -6,6 +6,7 @@ RgGen.define_simple_feature(:bit_field, :c_header) do
       define_macro("#{full_name}_bit_width", width)
       define_macro("#{full_name}_bit_mask", mask)
       define_offset_macro
+      define_label_macros
     end
 
     private
@@ -27,5 +28,13 @@ RgGen.define_simple_feature(:bit_field, :c_header) do
         define_macro("#{full_name}_bit_offset", bit_field.lsb)
       end
     end
+
+    def define_label_macros
+      bit_field.labels.each do |label|
+        name = "#{full_name}_#{label.name}"
+        value = hex(label.value, bit_field.width)
+        define_macro(name, value)
+      end
+    end
   end
 end

data/lib/rggen/c_header/register/c_header.rb

@@ -10,7 +10,7 @@ RgGen.define_simple_feature(:register, :c_header) do
     end
 
     export def declaration
-      type = "uint#{register.width}_t"
+      type = "uint#{entry_width}_t"
       name = register.name
       size = !shared_address? && register.size || nil
       create_declaration(type, name, size)
@@ -23,7 +23,11 @@ RgGen.define_simple_feature(:register, :c_header) do
     end
 
     def byte_size
-      register.byte_size(hierarchical: true)
+      register.total_byte_size(hierarchical: true)
+    end
+
+    def entry_width
+      register.entry_byte_size * 8
     end
 
     def array?

data/lib/rggen/c_header/register_file/c_header.rb

@@ -21,7 +21,7 @@ RgGen.define_simple_feature(:register_file, :c_header) do
     end
 
     def byte_size
-      register_file.byte_size(false)
+      register_file.entry_byte_size
     end
   end
 end

data/lib/rggen/c_header/struct_builder.rb

@@ -28,9 +28,9 @@ module RgGen
       def define_struct_member(offset)
         entries = select_children_by_offset(offset)
         if entries.size >= 2
-          [define_shared_union(offset, entries), entries.first.byte_size]
+          [define_shared_union(offset, entries), entries.first.total_byte_size]
         elsif entries.size == 1
-          [entries.first.declaration, entries.first.byte_size]
+          [entries.first.declaration, entries.first.total_byte_size]
         else
           [reserved_member(offset), bus_byte_width]
         end

data/lib/rggen/c_header/version.rb

@@ -2,6 +2,6 @@
 
 module RgGen
   module CHeader
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rggen-c-header
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Taichi Ishitani
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-02 00:00:00.000000000 Z
+date: 2023-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,8 +72,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
-summary: rggen-c-header-0.3.0
+summary: rggen-c-header-0.4.0
 test_files: []