HDLRuby 2.11.12 → 3.1.0

data/lib/HDLRuby/hdrcc.rb

@@ -263,6 +263,9 @@ module HDLRuby
             # Initialize the environment for processing the hdr file.
             bind = TOPLEVEL_BINDING.clone
             eval("require 'HDLRuby'\n\nconfigure_high\n\n",bind)
+            if $options[:std] then
+                eval("require 'std/std.rb'\n\ninclude HDLRuby::High::Std\n\n",bind)
+            end
             # Process it.
             eval(@texts[0],bind,@top_file_name,1)
             # Get the resulting instance
@@ -280,8 +283,8 @@ module HDLRuby
     end
 
 
-    # Extend the Code class with generation of file for the content.
     class HDLRuby::Low::Code
+        ## Extends the Code class with generation of file for the content.
 
         ## Creates a file in +path+ containing the content of the code.
         def to_file(path = "")
@@ -337,6 +340,9 @@ end
 require 'optparse'
 # Process the command line options
 $options = {}
+# By default the std libraries are loaded.
+$options[:std] = true
+# Parse the options
 $optparse = OptionParser.new do |opts|
     opts.banner = "Usage: hdrcc.rb [options] <input file> [<output directory or file>]"
 
@@ -435,6 +441,9 @@ $optparse = OptionParser.new do |opts|
     opts.on("--testall","Compile all the available unit tests.") do |t|
         $options[:testall] = t
     end
+    opts.on("--no-std", "Compile without the standard library.") do |t|
+        $options[:std] = false
+    end
     opts.on("-t", "--top system", "Specify the top system to process") do|t|
         $options[:top] = t
     end
@@ -445,7 +454,11 @@ $optparse = OptionParser.new do |opts|
         $options[:dump] = v
         $options[:multiple] = v
     end
-    opts.on("--version", "Shows the version of HDLRuby.") do |v|
+    opts.on("--get-samples", "Copy the sample directory (hdr_samples) to current one, the exit") do
+        FileUtils.copy_entry(File.dirname(__FILE__) + "/hdr_samples","./hdr_samples")
+        exit
+    end
+    opts.on("--version", "Show the version of HDLRuby, then exit") do |v|
         puts VERSION
         exit
     end
@@ -808,7 +821,7 @@ elsif $options[:verilog] then
     $top_system.each_systemT_deep do |systemT|
         HDLRuby.show? "signal2subs step..."
         # Ensure there is not implicit assign to sub signals.
-        systemT.signal2subs!
+        systemT.signal2subs!(true)
         # HDLRuby.show "casts_without_expression! step..."
         # systemT.casts_without_expression!
         # HDLRuby.show Time.now

data/lib/HDLRuby/hdrlib.rb

@@ -226,8 +226,8 @@ module HDLRuby
     end
 
 
-    # Extend the Code class with generation of file for the content.
     class HDLRuby::Low::Code
+        ## Extends the Code class with generation of file for the content.
 
         ## Creates a file in +path+ containing the content of the code.
         def to_file(path = "")

data/lib/HDLRuby/hruby_db.rb

@@ -9,7 +9,7 @@ warn "hruby_db.rb (former hruby_low.rb) is deprecated."
 ##
 # Low-level libraries for describing digital hardware.        
 #######################################################
-module HDLRuby::Low
+module HDLRuby::LowDB
 
     Base = HDLRuby::Base
 
@@ -151,7 +151,7 @@ module HDLRuby::Low
     end
 
     ##
-    # Describes a unsigned integer data type.
+    # Describes an unsigned integer data type.
     class TypeUnsigned < Base::TypeUnsigned
         include Ltype
     end

data/lib/HDLRuby/hruby_high.rb

@@ -2044,7 +2044,7 @@ module HDLRuby::High
     end
 
     ##
-    # Describes a unsigned integer data type.
+    # Describes an unsigned integer data type.
     class TypeUnsigned < TypeVector
 
         # Creates a new vector type named +name+ from +base+ type and with
@@ -2198,29 +2198,48 @@ module HDLRuby::High
     #
     # NOTE: a function is a short-cut for a method that creates a scope.
     def function(name, &ruby_block)
+        warn("Construct 'function' is deprecated, use 'hdef' instead.")
         # Ensure there is a block.
         ruby_block = proc {} unless block_given?
         if HDLRuby::High.in_system? then
             define_singleton_method(name.to_sym) do |*args,&other_block|
-                # sub do
                 sub(HDLRuby.uniq_name(name)) do
                     HDLRuby::High.top_user.instance_exec(*args,*other_block,
                                                          &ruby_block)
-                    # ruby_block.call(*args)
                 end
             end
         else
             define_method(name.to_sym) do |*args,&other_block|
-                # sub do
                 sub(HDLRuby.uniq_name(name)) do
                     HDLRuby::High.top_user.instance_exec(*args,*other_block,
                                                          &ruby_block)
-                    # ruby_block.call(*args,*other_block)
                 end
             end
         end
     end
 
+    # Declares a function named +name+ using +ruby_block+ as body.
+    #
+    # NOTE: a function is a short-cut for a method that creates a scope.
+    def hdef(name, &ruby_block)
+        # Ensure there is a block.
+        ruby_block = proc {} unless block_given?
+        if HDLRuby::High.in_system? then
+            define_singleton_method(name.to_sym) do |*args,&other_block|
+                sub(HDLRuby.uniq_name(name)) do
+                    HDLRuby::High.top_user.instance_exec(*args,*other_block,
+                                                         &ruby_block)
+                end
+            end
+        else
+            define_method(name.to_sym) do |*args,&other_block|
+                sub(HDLRuby.uniq_name(name)) do
+                    HDLRuby::High.top_user.instance_exec(*args,*other_block,
+                                                         &ruby_block)
+                end
+            end
+        end
+    end
 
 
 
@@ -2855,17 +2874,17 @@ module HDLRuby::High
 
         # Casts to a bit vector type.
         def to_bit
-            return self.as(bit[self.width])
+            return self.as(HDLRuby::High.top_user.bit[self.type.width])
         end
 
         # Casts to an unsigned bit vector type.
         def to_unsigned
-            return self.as(unsigned[self.width])
+            return self.as(HDLRuby::High.top_user.unsigned[self.type.width])
         end
 
         # Casts to a signed bit vector type.
-        def to_unsigned
-            return self.as(signed[self.width])
+        def to_signed
+            return self.as(HDLRuby::High.top_user.signed[self.type.width])
         end
 
         # Extends on the left to +n+ bits filling with +v+ bit values.
@@ -2997,6 +3016,12 @@ module HDLRuby::High
              define_method(orig_operator(operator),&meth)
          end
 
+         # The <=> operator is also supported by is transformed into a sub
+         # with a signed result.
+         def <=>(expr)
+             return (self.as(self.type.base[self.type.width+1])-expr).to_signed
+         end
+
 
          # Creates an access to elements of range +rng+ of the signal.
          #
@@ -3128,7 +3153,6 @@ module HDLRuby::High
 
         # Converts the unary expression to HDLRuby::Low.
         def to_low
-            # return HDLRuby::Low::Cast.new(self.type.to_low,self.child.to_low)
             castL =HDLRuby::Low::Cast.new(self.type.to_low,self.child.to_low)
             # # For debugging: set the source high object 
             # castL.properties[:low2high] = self.hdr_id
@@ -3188,7 +3212,7 @@ module HDLRuby::High
 
 
     ##
-    # Describes a section operation (generalization of the ternary operator).
+    # Describes a selection operation (generalization of the ternary operator).
     #
     # NOTE: choice is using the value of +select+ as an index.
     class Select < Low::Select
@@ -3344,6 +3368,12 @@ module HDLRuby::High
             end
         end
 
+        # Get the refered objects.
+        def objects
+            return [ self.object] if self.is_a?(RefObject)
+            return self.each.map { |ref| ref.objects }.flatten
+        end
+
         # Reference can be used like enumerator
         include Enumerable
     end
@@ -4410,14 +4440,14 @@ module HDLRuby::High
             super(nil)
             # # Save the Location for debugging information
             # @location = caller_locations
-            # Sets the current behavior
-            @@cur_behavior = self
+            # # Sets the current behavior
+            # @@cur_behavior = self
             # Add the events (they may be hierarchical to flatten)
             events.flatten.each { |event| self.add_event(event) }
             # Create and add the block.
             self.block = High.make_block(mode,&ruby_block)
-            # Unset the current behavior
-            @@cur_behavior = nil
+            # # Unset the current behavior
+            # @@cur_behavior = nil
         end
 
         # Sets an event to the behavior.
@@ -4584,12 +4614,21 @@ module HDLRuby::High
         end
     end
 
-    # The current behavior: by default none.
-    @@cur_behavior = nil
+    # # The current behavior: by default none.
+    # @@cur_behavior = nil
 
     # Gets the enclosing behavior if any.
     def self.cur_behavior
-        return @@cur_behavior
+        # return @@cur_behavior
+        if in_behavior? then
+            user = top_user
+            while(user && !user.is_a?(Behavior)) do
+                user = user.parent
+            end
+            return user
+        else
+            return nil
+        end
     end
 
     # Tell if we are in a behavior.
@@ -4765,13 +4804,10 @@ module HDLRuby::High
                 return Value.new(TypeSigned.new(:"",self.bit_length..0),self)
             end
         end
-    end
-    
-    # Extends the Float class for computing for conversion to expression.
-    class ::Float
-        # Converts to a new high-level expression.
-        def to_expr
-            return Value.new(Float,self)
+
+        # Gets the bit width
+        def width
+            return self.bit_length
         end
     end
 

data/lib/HDLRuby/hruby_high_fullname.rb

@@ -5,10 +5,11 @@ require "HDLRuby/hruby_high"
 module HDLRuby::High
 
 ##
-# Library for describing adding the fullname method to HDLRuby::High objects.
+# Library for adding the fullname method to HDLRuby::High objects.
 #
 ########################################################################
 
+
     class SystemT
 
         ## Returns the name of the signal with its hierarchy.
@@ -32,6 +33,7 @@ module HDLRuby::High
 
     end
 
+
     class Scope
         include WithFullname
     end

data/lib/HDLRuby/hruby_low.rb

@@ -1919,7 +1919,7 @@ module HDLRuby::Low
     end
 
     ##
-    # Describes a unsigned integer data type.
+    # Describes an unsigned integer data type.
     class TypeUnsigned < TypeVector
 
         # Creates a new vector type named +name+ from +base+ type and with
@@ -6117,7 +6117,7 @@ module HDLRuby::Low
 
 
     ## 
-    # Describe a this reference.
+    # Describes a this reference.
     #
     # This is the current system.
     class RefThis < Ref