origen 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55916e76f5bdf501c90b99100958b5679c2cdb3f
-  data.tar.gz: bdb95336085bf8ebcdef8ad13a3a822c8019381f
+  metadata.gz: 0a60b5bfd209deedf03b7570995fc99a7b3b7a8b
+  data.tar.gz: b5e59ccbdd265391a4f112e815a14611bde2a5b0
 SHA512:
-  metadata.gz: bb6d9bb6cdd345f83eb5c5b1644e2fb5e5e1c8f0e3eebee828cc54a2ab6503b6429a095633ba783d2b485a6692115ea7870366c12e0ee72f4198d2496bb308b7
-  data.tar.gz: a28f70593e2d10c39353f2f5e897d2c0561fd13a7b6cbe0f2a8c9586b8933596802e9291bf1fb8cbfdcc05c7c3de26383440a0e63e9aa12250b42590ecc114bb
+  metadata.gz: 9b698ff5114c367f2ada6b9558e3f89a66fb2e52cc7ee8c1af5611861c77731c77283f364e0260f6f7a2b996f0636b3904190df072fe92cd41e582aa0f245665
+  data.tar.gz: 7b44b93ef1e695cb88b72d89fe2e2bd01722c97b69e8aa133b4434a565063722caa8603498800e2d95afe82f4a2556d8284f6d3870a96f9a9df086b202eb5d3b

data/config/version.rb

@@ -1,7 +1,7 @@
 module Origen
   MAJOR = 0
   MINOR = 7
-  BUGFIX = 3
+  BUGFIX = 4
   DEV = nil
 
   VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')

data/lib/origen/memory.rb

@@ -0,0 +1,50 @@
+module Origen
+  module Memory
+    def memory(address, options = {})
+      if is_top_level?
+        r = "mem_#{address.to_s(16)}".to_sym
+        unless has_reg?(r)
+          if memory_address_aligned?(address)
+            add_reg r, address, size: memory_width
+          end
+        end
+        send(r)
+      else
+        Origen.top_level.memory(address + base_address, options)
+      end
+    end
+    alias_method :mem, :memory
+
+    def memory_address_aligned?(address)
+      b = (memory_width / 8) - 1
+      unless address & b == 0
+        s = b - 1
+        aligned = (address >> s) << s
+        fail "Address #{address.to_hex} is not aligned to the memory width, it should be #{aligned.to_hex}"
+      end
+      true
+    end
+
+    def memory_width
+      if is_top_level?
+        @memory_width ||= 32
+      else
+        Origen.top_level.memory_width
+      end
+    end
+
+    def memory_width=(size)
+      if is_top_level?
+        unless size % 8 == 0
+          fail 'Memory width must be a multiple of 8'
+        end
+        if @memory_width
+          fail 'The memory width cannot be changed after a memory location has been referenced'
+        end
+        @memory_width = size
+      else
+        Origen.top_level.memory_width = size
+      end
+    end
+  end
+end

data/lib/origen/model.rb

@@ -1,4 +1,5 @@
 require 'active_support/concern'
+require 'origen/memory'
 module Origen
   # Include this module to identify it as an SoC IP Block, this will automatically
   # include common modules such as Pin and Register support
@@ -21,6 +22,7 @@ module Origen
       include Origen::Specs
       include Origen::Ports
       include Origen::Netlist
+      include Origen::Memory
     end
 
     module ClassMethods
@@ -41,6 +43,12 @@ module Origen
       true
     end
 
+    # Returns true if the model is the current DUT/top-level model
+    def is_top_level?
+      Origen.top_level == self
+    end
+    alias_method :is_dut?, :is_top_level?
+
     # Means that when dealing with a controller/model pair, you can
     # always call obj.model and obj.controller to get the one you want,
     # regardless of the one you currently have.
@@ -295,9 +303,10 @@ module Origen
       end
     end
 
+    # @api private
     # Returns true after the model's initialize method has been run
-    def initialized?
-      !!@initialized
+    def _initialized?
+      !!@_initialized
     end
 
     def clock!
@@ -319,8 +328,8 @@ module Origen
 
     private
 
-    def initialized
-      @initialized = true
+    def _initialized
+      @_initialized = true
     end
 
     def _controller=(controller)

data/lib/origen/model_initializer.rb

@@ -29,7 +29,7 @@ module Origen
         else
           x.send(:initialize, *args, &block)
         end
-        x.send(:initialized) if x.respond_to?(:is_an_origen_model?)
+        x.send(:_initialized) if x.respond_to?(:is_an_origen_model?)
         x.register_callback_listener if x.respond_to?(:register_callback_listener)
         # Do this before wrapping, otherwise the respond to method in the controller will
         # be looking for the model to be instantiated when it is not fully done yet

data/lib/origen/ports.rb

@@ -24,7 +24,7 @@ module Origen
           if has_port?(args.first)
             _ports[args.first.to_s.symbolize]
           else
-            if initialized?
+            if _initialized?
               puts "Model #{self.class} does not have a port named #{args.first}, the available ports are:"
               puts _ports.keys
               puts

data/lib/origen/registers/bit_collection.rb

@@ -96,7 +96,8 @@ module Origen
       #
       # Normally this method should be called from a breakpoint during pattern debug, and it is
       # not intended to be inserted into production pattern logic.
-      def sync
+      def sync(size = nil, options = {})
+        size, options = nil, size if size.is_a?(Hash)
         if tester.try(:link?)
           preserve_flags do
             v = tester.capture do
@@ -106,11 +107,21 @@ module Origen
               bit.write(v.first[i])
             end
           end
-          parent
+          if size
+            puts "#{parent.address.to_s(16).upcase}: " + data.to_s(16).upcase.rjust(Origen.top_level.memory_width / 4, '0')
+            if size > 1
+              step = Origen.top_level.memory_width / 8
+              Origen.top_level.mem(parent.address + step).sync(size - 1)
+            end
+            nil
+          else
+            parent
+          end
         else
           Origen.log.warning 'Sync is not supported on the current tester driver, register not updated'
         end
       end
+      alias_method :sync!, :sync
 
       # At the end of the given block, the status flags of all bits will be restored to the state that
       # they were upon entry to the block

data/lib/origen/registers.rb

@@ -27,8 +27,14 @@ module Origen
     end
 
     def method_missing(method, *args, &block) # :nodoc:
+      if method[-1] == '!'
+        bang = true
+        method = method.to_s.chop.to_sym
+      end
       if _registers.key?(method)
-        reg(method)
+        r = reg(method)
+        r.sync if bang
+        r
       else
         super
       end
@@ -478,7 +484,7 @@ module Origen
     # Can also be used to define a new register if a block is supplied in which case
     # it is equivalent to calling add_reg with a block.
     def reg(*args, &block)
-      if block_given? || (args[1].is_a?(Fixnum) && !try(:initialized?))
+      if block_given? || (args[1].is_a?(Fixnum) && !try(:_initialized?))
         @reg_define_file = define_file(caller[0])
         add_reg(*args, &block)
       else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: origen
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Stephen McGinty
@@ -528,6 +528,7 @@ files:
 - lib/origen/location/map.rb
 - lib/origen/log.rb
 - lib/origen/logger_methods.rb
+- lib/origen/memory.rb
 - lib/origen/mode.rb
 - lib/origen/model.rb
 - lib/origen/model_initializer.rb