origen_jtag 0.12.1 → 0.13.0.pre0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae69f91bc9e2535f91cecbcd30bef84b57c8a017
-  data.tar.gz: 25accfa2f3054119f0e3fec8efbbdb59f74f9f55
+  metadata.gz: b298fc2934ec803286a7cac8a2f0a74b1089a2c1
+  data.tar.gz: aacc8893df525dc878e3b120d06256a58f67ce2b
 SHA512:
-  metadata.gz: 064956cbd19af58b772357f8b5a5c2ec8aede02531098192b239efbbaa466ded0febe18295b62d0f779d33652a59911857fea2778bdb01a88636cd6e717c054c
-  data.tar.gz: 468f70f9ee9a58ade048f191ad9468400f377c49ae3d77f95f69e7b3e63bcf95b3eb646ac32b1b8aad34c73684b7b3b88ddddf7c1cd34f597bdcdb436381590f
+  metadata.gz: fafb0ef55e995a4aaca2214bf9bd713f27f0345471f2fbc7d68016c4576dae5b1fd857e22d052e381712b518981c73a60ff53b2d74010bff5b4c03dd81ce210e
+  data.tar.gz: 16d11af83861035fcbb8c0d139fcf92c4ab8db11f0abd2c9fff2535ac8aff50e7cf5cdf9a73997ef18640af10b85238c944edf31c4465b9be0f789628a2878be

data/config/version.rb

@@ -1,8 +1,8 @@
 module OrigenJTAG
   MAJOR = 0
-  MINOR = 12
-  BUGFIX = 1
-  DEV = nil
+  MINOR = 13
+  BUGFIX = 0
+  DEV = 0
 
   VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')
 end

data/lib/origen_jtag/driver.rb

@@ -101,9 +101,16 @@ module OrigenJTAG
       options = {
         read:              false,
         cycle_last:        false,
-        includes_last_bit: true
+        includes_last_bit: true,
+        no_subr:           false      # do not use subroutine for any overlay
       }.merge(options)
       size = extract_size(reg_or_val, options)
+      if options[:no_subr] && !$tester.respond_to?('label')
+        # tester does not support direct labels, so can't do
+        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
       if options.key?(:arm_debug_comment)
         cc options[:arm_debug_comment]
       end
@@ -114,8 +121,10 @@ module OrigenJTAG
       contains_bits = (contains_bits?(reg_or_val) || is_a_bit?(reg_or_val))
       owner.pin(:tdi).drive(0) # Drive state when reading out
       owner.pin(:tms).drive(0)
+      last_overlay_label = ''
       size.times do |i|
         call_subroutine = false
+        direct_overlay = false
         if options[:read]
           # If it's a register support bit-wise reads
           if contains_bits
@@ -127,7 +136,16 @@ module OrigenJTAG
                 if Origen.mode.simulation?
                   owner.pin(:tdo).dont_care
                 else
-                  call_subroutine = reg_or_val[i].overlay_str
+                  if options[:no_subr]
+                    Origen.tester.dont_compress = true
+                    if reg_or_val[i].overlay_str != last_overlay_label
+                      $tester.label(reg_or_val[i].overlay_str)
+                      last_overlay_label = reg_or_val[i].overlay_str
+                    end
+                    owner.pin(:tdo).assert(reg_or_val[i] ? reg_or_val[i] : 0)
+                  else
+                    call_subroutine = reg_or_val[i].overlay_str
+                  end
                 end
               elsif reg_or_val[i].is_to_be_read?
                 owner.pin(:tdo).assert(reg_or_val[i] ? reg_or_val[i] : 0)
@@ -148,6 +166,7 @@ module OrigenJTAG
             end
           # Otherwise read the whole thing
           else
+            Origen.tester.dont_compress = false
             owner.pin(:tdo).assert(reg_or_val[i] ? reg_or_val[i] : 0)
           end
         else
@@ -155,7 +174,16 @@ module OrigenJTAG
             if Origen.mode.simulation?
               owner.pin(:tdi).drive(reg_or_val[i] ? reg_or_val[i] : 0)
             else
-              call_subroutine = reg_or_val[i].overlay_str
+              if options[:no_subr]
+                Origen.tester.dont_compress = true
+                if reg_or_val[i].overlay_str != last_overlay_label
+                  $tester.label(reg_or_val[i].overlay_str)
+                  last_overlay_label = reg_or_val[i].overlay_str
+                end
+                owner.pin(:tdi).drive(reg_or_val[i] ? reg_or_val[i] : 0)
+              else
+                call_subroutine = reg_or_val[i].overlay_str
+              end
             end
           elsif options.key?(:arm_debug_overlay)
             if Origen.mode.simulation?
@@ -191,6 +219,8 @@ module OrigenJTAG
       # Clear read and similar flags to reflect that the request has just
       # been fulfilled
       reg_or_val.clear_flags if reg_or_val.respond_to?(:clear_flags)
+      # put back compression if turned on above
+      Origen.tester.dont_compress = false
     end
 
     # Cycles the tester through one TCLK cycle

data/pattern/jtag_workout.rb

@@ -78,10 +78,14 @@ Pattern.create(options={:name => "jtag_workout_#{$dut.tclk_format.upcase}#{$dut.
     Origen.tester.cycle  # Give a padding cycle as a place for the subroutine call to go
     jtag.shift reg, :cycle_last => true
     Origen.mode = :debug
+    if $tester.respond_to?('label')
+      cc "Full register overlay without using subroutine"
+      jtag.shift reg, :cycle_last => true, :no_subr => true
+    end
 
   test "Shift register into TDI with single bit overlay"
     reg.overlay(nil)
-    reg.bit(:bit).overlay("write_overlay")
+    reg.bit(:bit).overlay("write_overlay2")
     Origen.tester.cycle  # Give a padding cycle as a place for the subroutine call to go
     jtag.shift reg, :cycle_last => true
     reg.overlay(nil)
@@ -136,10 +140,14 @@ Pattern.create(options={:name => "jtag_workout_#{$dut.tclk_format.upcase}#{$dut.
     Origen.tester.cycle  # Give a padding cycle as a place for the subroutine call to go
     jtag.shift reg, :cycle_last => true, :read => true
     Origen.mode = :debug
+    if $tester.respond_to?('label')
+      cc "Full register overlay without using subroutine"
+      jtag.shift reg, :cycle_last => true, :read => true, :no_subr => true
+    end
 
   test "Shift register out of TDO with single bit overlay"
     reg.overlay(nil)
-    reg.bit(:bit).overlay("read_overlay")
+    reg.bit(:bit).overlay("read_overlay2")
     Origen.tester.cycle  # Give a padding cycle as a place for the subroutine call to go
     jtag.shift reg, :cycle_last => true
     reg.overlay(nil)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: origen_jtag
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0.pre0
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-07 00:00:00.000000000 Z
+date: 2016-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -65,7 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: JTAG driver for the Origen SDK