HDLRuby 2.3.4 → 2.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9bca5842e518422f5e7b7edb864a8eae5955df19238cd9582a776d4ef6c7a1e
-  data.tar.gz: 6c094ebf5d69c8dbf57ddd800eca16aca88b4bc324db11eecac3f15569b633e3
+  metadata.gz: 641fb6b2455f562967e1dd6d19ff944ed59e6f1e6a4e692c3dbd236af75ea3b6
+  data.tar.gz: 7238f3492e48352e20d4b1a321d9087d25c32b95900c6542e314d941a7a9ff42
 SHA512:
-  metadata.gz: f01e2f703bcade0db355c42e78267205ca3662c8b30589c5676eab6acaf334fac2a86205b600122e50f11eef3e6a17182dacb59b9a7821c3fa9d7aed90ebd6b7
-  data.tar.gz: 5c3b80eddb70a3f25f2941bc26c8e95a8f3a30f5020cb17d6a4a199678aacaab4ce0c5c4ffcd347c23b53bd86fb15d58392818673e57ca3d108aec0c5b062ed0
+  metadata.gz: 15d0cfd9c1ad51076854eb39bce2b2dceee053b242350b7c1745d727e69bed0ced9d38f717252fb2a4bd971de5c6e3c804536212ccc6ac98936b716f574048e2
+  data.tar.gz: 10b6326d21c30106d922eb23f8c9da3849b56bf3cac0b186e21f1c427ebb664fab128aba7d961b53af6e558d861ed2a75ce7777c9fa54f778bd3d23e2ba697f4

data/lib/HDLRuby/hruby_high.rb

@@ -1263,7 +1263,8 @@ module HDLRuby::High
         # Converts the scope to HDLRuby::Low.
         def to_low()
             # Create the resulting low scope.
-            scopeLow = HDLRuby::Low::Scope.new()
+            # scopeLow = HDLRuby::Low::Scope.new()
+            scopeLow = HDLRuby::Low::Scope.new(self.name)
             # Push the private namespace for the low generation.
             High.space_push(@namespace)
             # Pushes on the name stack for converting the internals of
@@ -1858,7 +1859,8 @@ module HDLRuby::High
     def function(name, &ruby_block)
         if HDLRuby::High.in_system? then
             define_singleton_method(name.to_sym) do |*args,&other_block|
-                sub do
+                # sub do
+                sub(HDLRuby.uniq_name(name)) do
                     HDLRuby::High.top_user.instance_exec(*args,*other_block,
                                                          &ruby_block)
                     # ruby_block.call(*args)
@@ -1866,7 +1868,8 @@ module HDLRuby::High
             end
         else
             define_method(name.to_sym) do |*args,&other_block|
-                sub do
+                # sub do
+                sub(HDLRuby.uniq_name(name)) do
                     HDLRuby::High.top_user.instance_exec(*args,*other_block,
                                                          &ruby_block)
                 end

data/lib/HDLRuby/hruby_tools.rb

@@ -13,9 +13,9 @@ module HDLRuby
     @@absoluteCounter = -1 # The absolute name counter.
 
     # Generates an absolute uniq name.
-    def self.uniq_name
+    def self.uniq_name(base = "")
         @@absoluteCounter += 1
-        name = ":#{@@absoluteCounter}"
+        name = base.to_s + ":#{@@absoluteCounter}"
         if Symbol.all_symbols.find {|symbol| symbol.to_s == name } then
             # The symbol exists, try again.
             return self.uniq_name

data/lib/HDLRuby/std/channel.rb

@@ -45,8 +45,10 @@ module HDLRuby::High::Std
             # Generates the channels.
             channelI = nil
             args.each do |nameI|
-                channelI = ChannelI.new(name,&@ruby_block)
-                HDLRuby::High.space_reg(nameI) { channelI }
+                # puts "nameI=#{nameI}"
+                channelI = ChannelI.new(nameI,&@ruby_block)
+                # Already registered!
+                # HDLRuby::High.space_reg(nameI) { channelI }
             end
             channelI
         end
@@ -350,9 +352,11 @@ module HDLRuby::High::Std
         def initialize(name,&ruby_block)
             # Check and set the name of the channel.
             @name = name.to_sym
+            # puts "my name is #{self.name}"
             # Generate a name for the scope containing the signals of
             # the channel.
-            @scope_name = HDLRuby.uniq_name
+            # @scope_name = HDLRuby.uniq_name
+            @scope_name = HDLRuby.uniq_name(name)
 
             # # Sets the scope.
             # @scope = HDLRuby::High.cur_scope
@@ -635,6 +639,7 @@ module HDLRuby::High::Std
         # Alternatively, a ready channel instance can be passed as argument
         # as +channelI+.
         def brancher(name,channelI = nil,&ruby_block)
+            # puts "self.name=#{self.name} and name=#{name}"
             # Ensure name is a symbol.
             name = name.to_s unless name.respond_to?(:to_sym)
             name = name.to_sym
@@ -646,6 +651,7 @@ module HDLRuby::High::Std
             end
             # Now, create the branch.
             channelI = HDLRuby::High::Std.channel_instance(name, &ruby_block)
+            # channelI = HDLRuby::High::Std.channel_instance("#{self.name}::#{name}", &ruby_block)
             @branches[name] = channelI
             return self
         end

data/lib/HDLRuby/std/memory.rb

@@ -568,7 +568,7 @@ HDLRuby::High::Std.channel(:mem_dual) do |typ,size,clk,rst,br_rsts = {}|
         # using +target+ as target of access result.
         writer do |blk,target|
             # On reset the read trigger is 0.
-            rst  = send(rst_name)
+            rst = send(rst_name)
             top_block.unshift do
                 # Initialize the address so that the next access is at address 0.
                 hif(rst == 1) { abus_w <= -1 }

data/lib/HDLRuby/version.rb

@@ -1,3 +1,3 @@
 module HDLRuby
-  VERSION = "2.3.4"
+  VERSION = "2.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: HDLRuby
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.3.5
 platform: ruby
 authors:
 - Lovic Gauthier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-11 00:00:00.000000000 Z
+date: 2020-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler