HDLRuby 2.3.1 → 2.3.6

data/lib/HDLRuby/std/fixpoint.rb

@@ -15,51 +15,53 @@ module HDLRuby::High::Std
     def self.included(base)
         # Performs the previous included
         res = self.send(:_included_fixpoint,base)
-        # Now modify the Type class
-        ::HDLRuby::High::Type.class_eval do
-            # Saves the former type generation method.
-            alias_method :"_[]_fixpoint", :[]
+        # Now modify the Type class if not already modified.
+        unless ::HDLRuby::High::Type.instance_methods.include?(:"_[]_fixpoint") then
+            ::HDLRuby::High::Type.class_eval do
+                # Saves the former type generation method.
+                alias_method :"_[]_fixpoint", :[]
 
-            # Redefine the type generation method for supporting fixed point
-            # type generation.
-            def [](*args)
-                if args.size == 1 then
-                    return self.send(:"_[]_fixpoint",*args)
-                else
-                    # Handle the arguments and compute the fix point sizes.
-                    arg0,arg1 = *args
-                    if arg0.respond_to?(:to_i) then
-                        isize = arg0
+                # Redefine the type generation method for supporting fixed point
+                # type generation.
+                def [](*args)
+                    if args.size == 1 then
+                        return self.send(:"_[]_fixpoint",*args)
                     else
-                        isize = (arg0.first-arg0.last).abs+1
+                        # Handle the arguments and compute the fix point sizes.
+                        arg0,arg1 = *args
+                        if arg0.respond_to?(:to_i) then
+                            isize = arg0
+                        else
+                            isize = (arg0.first-arg0.last).abs+1
+                        end
+                        if arg1.respond_to?(:to_i) then
+                            fsize = arg1
+                        else
+                            fsize = (arg1.first-arg1.last).abs+1
+                        end
+                        # Build the type.
+                        case(self.name)
+                        when :bit
+                            typ = bit[isize+fsize].typedef(::HDLRuby.uniq_name)
+                        when :unsigned
+                            typ = unsigned[isize+fsize].typedef(::HDLRuby.uniq_name)
+                        when :signed
+                            typ = signed[isize+fsize].typedef(::HDLRuby.uniq_name)
+                        else
+                            raise "Invalid type for generating a fixed point type: #{self.name}"
+                        end
+                        # Redefine the multiplication and division for fixed point.
+                        typ.define_operator(:*) do |left,right|
+                            (left.as([isize+fsize*2])*right) >> fsize
+                        end
+                        typ.define_operator(:/) do |left,right|
+                            (left.as([isize+fsize*2]) << fsize) / right
+                        end
+                        typ
                     end
-                    if arg1.respond_to?(:to_i) then
-                        fsize = arg1
-                    else
-                        fsize = (arg1.first-arg1.last).abs+1
-                    end
-                    # Build the type.
-                    case(self.name)
-                    when :bit
-                        typ = bit[isize+fsize].typedef(::HDLRuby.uniq_name)
-                    when :unsigned
-                        typ = unsigned[isize+fsize].typedef(::HDLRuby.uniq_name)
-                    when :signed
-                        typ = signed[isize+fsize].typedef(::HDLRuby.uniq_name)
-                    else
-                        raise "Invalid type for generating a fixed point type: #{self.name}"
-                    end
-                    # Redefine the multiplication and division for fixed point.
-                    typ.define_operator(:*) do |left,right|
-                        (left.as([isize+fsize*2])*right) >> fsize
-                    end
-                    typ.define_operator(:/) do |left,right|
-                        (left.as([isize+fsize*2]) << fsize) / right
-                    end
-                    typ
                 end
+                return res
             end
-            return res
         end
     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 }
@@ -889,11 +889,11 @@ HDLRuby::High::Std.channel(:mem_file) do |typ,size,clk,rst,br_rsts = {}|
             rst_name = br_rsts[:winc].to_sym
         else
             rst_name = rst.name
-            reader_input rst_name
+            writer_input rst_name
         end
         # Declares the address counter.
         [size.width-1].inner :abus_w
-        reader_inout :abus_w
+        writer_inout :abus_w
 
         # Defines the write procedure at address +addr+
         # using +target+ as target of access result.

data/lib/HDLRuby/version.rb

@@ -1,3 +1,3 @@
 module HDLRuby
-  VERSION = "2.3.1"
+  VERSION = "2.3.6"
 end

metadata

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