origen_jtag 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dbecdacc92743469c85938ba80bdb6314e4f366
-  data.tar.gz: d36ea9459ef965f61e5d1ca063067a3c44cb9110
+  metadata.gz: 300c822af7cb117a48ceea25d068f327d7a19186
+  data.tar.gz: 8e5eb5874aa781c3e55518c340d2433c0a5cca67
 SHA512:
-  metadata.gz: ba9368d6fcf22c79128e56ff390825e0d73b89d716c81e2c3a66a1be1e4073dc085b37cfad492d49d82b9f4e51c493a970b16b6568044f4fe101b6ae07d8d60c
-  data.tar.gz: ef625c031b70f9651b2e514d431162251879afa6fab7273d6f5ee654c220dce403d47a6c0e925a5c21bfa69741445da4cafd4ebcb838355eadb8ba01230a0456
+  metadata.gz: b3e929d62e4ef0cf0b30f8c45071c9f9182514ce6f37eae8bf0274fe1a37c9717ab9a9666593a3a90781cf49562763e9fdaf32b263256fe810b17401769e9a31
+  data.tar.gz: cb077d873f3aae8a2cd941f9308eb7d0e61cb454e656c71c3ab19de13eb5edee7abb01b07dfaef2e996fbac285cc7fd35a3995ec2f2b15db39dcfdb6c26d41a6

data/config/commands.rb

@@ -46,6 +46,9 @@ when "examples", "test"
   ARGV = %w(jtag_workout -t debug_RL4 -e j750.rb -r approved)
   load "#{Origen.top}/lib/origen/commands/generate.rb"
   
+  ARGV = %w(rww_test -t debug_RH4 -e j750.rb -r approved)
+  load "#{Origen.top}/lib/origen/commands/generate.rb"
+
   if Origen.app.stats.changed_files == 0 &&
      Origen.app.stats.new_files == 0 &&
      Origen.app.stats.changed_patterns == 0 &&

data/config/version.rb

@@ -1,6 +1,6 @@
 module OrigenJTAG
   MAJOR = 0
-  MINOR = 15
+  MINOR = 16
   BUGFIX = 0
   DEV = nil
 

data/lib/origen_jtag/driver.rb

@@ -118,21 +118,24 @@ module OrigenJTAG
       tdo_reg = extract_shift_out_data(reg_or_val, size, options)
       global_ovl, ovl_reg = extract_overlay_data(reg_or_val, size, options)
 
-      # tester does not support direct labels, so can't do
-      if options[:no_subr] && !$tester.respond_to?('label')
-        cc 'This tester does not support use of labels, cannot do no_subr option as requested'
-        cc '  going with subroutine overlay instead'
-        options[:no_subr] = false
-      end
+      # let the tester handle overlay if possible
+      unless tester.respond_to?(:source_memory)
+        # tester does not support direct labels, so can't do
+        if options[:no_subr] && !$tester.respond_to?('label')
+          cc 'This tester does not support use of labels, cannot do no_subr option as requested'
+          cc '  going with subroutine overlay instead'
+          options[:no_subr] = false
+        end
 
-      # insert global label if specified
-      if global_ovl
-        if $tester.respond_to?('label')
-          $tester.label(global_ovl, true)
-        else
-          cc "Unsupported global label: #{global_ovl}"
+        # insert global label if specified
+        if global_ovl
+          if $tester.respond_to?('label')
+            $tester.label(global_ovl, true)
+          else
+            cc "Unsupported global label: #{global_ovl}"
+          end
         end
-      end
+      end # of let tester handle overlay if possible
 
       # loop through each data bit
       last_overlay_label = ''
@@ -158,26 +161,36 @@ module OrigenJTAG
         # TMS
         owner.pin(:tms).drive(0)
 
-        # Overlay - reconfigure pin action for overlay if necessary
-        if ovl_reg[i] && ovl_reg[i].has_overlay? && !Origen.mode.simulation?
-          if options[:no_subr]
-            Origen.tester.dont_compress = true
-            if ovl_reg[i].overlay_str != last_overlay_label
-              $tester.label(ovl_reg[i].overlay_str)
-              last_overlay_label = ovl_reg[i].overlay_str
+        # let tester handle overlay if implemented
+        overlay_options = {}
+        if tester.respond_to?(:source_memory)
+          if ovl_reg[i] && ovl_reg[i].has_overlay? && !Origen.mode.simulation?
+            overlay_options[:pins] = owner.pin(:tdi)
+            overlay_options[:overlay_str] = ovl_reg[i].overlay_str
+            overlay_options[:overlay_style] = :label if options[:no_subr]
+          end
+        else
+          # Overlay - reconfigure pin action for overlay if necessary
+          if ovl_reg[i] && ovl_reg[i].has_overlay? && !Origen.mode.simulation?
+            if options[:no_subr]
+              Origen.tester.dont_compress = true
+              if ovl_reg[i].overlay_str != last_overlay_label
+                $tester.label(ovl_reg[i].overlay_str)
+                last_overlay_label = ovl_reg[i].overlay_str
+              end
+              owner.pin(:tdo).assert(tdo_reg[i]) if options[:read]
+            else
+              owner.pin(:tdi).drive(0)
+              call_subroutine = ovl_reg[i].overlay_str
             end
-            owner.pin(:tdo).assert(tdo_reg[i]) if options[:read]
-          else
-            owner.pin(:tdi).drive(0)
-            call_subroutine = ovl_reg[i].overlay_str
           end
-        end
+        end # of let tester handle overlay
 
         # With JTAG pin actions queued up, use block call to tclk_cycle to
         #   execute a single TCLK period.  Special handling of subroutines,
         #   case of last bit in shift, and store vector (within a multi-cycle
         #   tclk config).
-        if call_subroutine
+        if call_subroutine && !tester.respond_to?(:source_memory)
           Origen.tester.call_subroutine(call_subroutine)
           @last_data_vector_shifted = true
         else
@@ -193,7 +206,12 @@ module OrigenJTAG
               if store_tdo_this_tclk && @next_data_vector_to_be_stored
                 Origen.tester.store_next_cycle(owner.pin(:tdo))
               end
-              Origen.tester.cycle
+              if overlay_options[:pins].nil?
+                Origen.tester.cycle
+              else
+                Origen.tester.cycle overlay: overlay_options
+                overlay_options[:change_data] = false			# data change only on first cycle if overlay
+              end
             end
             owner.pin(:tdo).dont_care
           else
@@ -508,10 +526,16 @@ module OrigenJTAG
         if options[:read]
           tdo = reg_or_val.dup
         else
-          tdo = Reg.dummy(size)
+          tdo = Reg.dummy(size) unless options[:shift_out_data].is_a?(Origen::Registers::Reg)
+        end
+        unless options[:read]			# if this is a write operation
           if options[:shift_out_data]
-            tdo.write(options[:shift_out_data])
-            tdo.read
+            if options[:shift_out_data].is_a?(Origen::Registers::Reg)
+              tdo = options[:shift_out_data]
+            else
+              tdo.write(options[:shift_out_data])
+              tdo.read
+            end
           else
             tdo.write(0)
           end
@@ -523,8 +547,12 @@ module OrigenJTAG
           tdo.read
         else
           if options[:shift_out_data]
-            tdo.write(options[:shift_out_data])
-            tdo.read
+            if options[:shift_out_data].is_a?(Origen::Registers::Reg)
+              tdo = options[:shift_out_data]
+            else
+              tdo.write(options[:shift_out_data])
+              tdo.read
+            end
           else
             tdo.write(0)
           end

data/lib/origen_jtag_dev/top_level.rb

@@ -40,6 +40,10 @@ module OrigenJTAGDev
         reg.bit 31..16, :bus
         reg.bit 0, :bit
       end
+
+      reg :full16, 0x0012, size: 16 do |reg|
+        reg.bit 15..0, :data
+      end
     end
 
     def instantiate_pins(options = {})

data/pattern/rww_test.rb

@@ -0,0 +1,25 @@
+
+Pattern.create(options = { name: 'rww_test' }) do
+
+  jtag = $dut.jtag
+  reg = $dut.reg(:full16)
+
+  cc 'TDO should be HLHL_LHLH_HLHL_LHLH'
+  jtag.write_dr 0xFFFF, size: 16, shift_out_data: 0xA5A5
+
+  cc 'TDO should be XXXX_XXXX_HHHH_HHHH'
+  reg.write(0xFFFF)
+  reg.bits[0..7].read
+  jtag.write_dr 0xFFFF, size: 16, shift_out_data: reg
+
+
+  cc 'TDO should be HLHL_LHLH_HLHL_LHLH'
+  reg.write(0xFFFF)
+  jtag.write_dr reg, shift_out_data: 0xA5A5
+
+  cc 'TDO should be XXXX_XXXX_HHHH_HHHH'
+  reg.write(0xFFFF)
+  reg2 = reg.dup
+  reg2.bits[0..7].read
+  jtag.write_dr reg, size: 16, shift_out_data: reg2
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_jtag
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-28 00:00:00.000000000 Z
+date: 2017-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -47,6 +47,7 @@ files:
 - lib/origen_jtag/tap_controller.rb
 - lib/origen_jtag_dev/top_level.rb
 - pattern/jtag_workout.rb
+- pattern/rww_test.rb
 - templates/web/index.md.erb
 - templates/web/layouts/_basic.html.erb
 - templates/web/partials/_navbar.html.erb