highlight cell which changed

[x300-pci] / openocd-jtag-boundary-scan.pl

diff --git a/openocd-jtag-boundary-scan.pl b/openocd-jtag-boundary-scan.pl
index dafd874..1b58b0d 100755 (executable)
--- a/openocd-jtag-boundary-scan.pl
+++ b/openocd-jtag-boundary-scan.pl
@@ -8,6 +8,10 @@ use IO::Socket::INET;
 use Storable;
 
 my $openocd_remote = shift @ARGV || 'picam:4444';
+my $bsdl_file = $ENV{BSDL} || '_3128at100.bsd';
+$bsdl_file = '3064at44.bsd'; # XXX 
+my $BOUNDARY_LENGTH = 288;
+my $entity;
 
 my $bit2pin;
 my $io2bit;
@@ -18,7 +22,7 @@ my $pin_map = '';
 
 $|=1; # flush stdout
 
-open(my $bsdl, '<', '_3128at100.bsd');
+open(my $bsdl, '<', $bsdl_file);
 while(<$bsdl>) {
        if ( m/PIN_MAP_STRING/ ) {
                $pin_map .= $_;
@@ -30,7 +34,14 @@ while(<$bsdl>) {
        } elsif ( m/"(\d+)\s+\(BC_\d+,\s+(\S+),\s+(\S+)/ ) {
                $bit2pin->{$1} = [ $2, $3 ];
                push @{ $io2bit->{$2} }, $1;
+       } elsif ( m/attribute\s+BOUNDARY_LENGTH\s+of\s+\S+\s*:\s*entity\s+is\s+(\d+);/ ) {
+               $BOUNDARY_LENGTH = $1;
+               warn "# BSDL $bsdl_file BOUNDARY_LENGTH = $BOUNDARY_LENGTH\n";
+       } elsif ( ! $entity && m/^entity\s(\S+)\s+is/ ) {
+               $entity = $1;
+               warn "# entity = $entity\n";
        }
+
 }
 close($bsdl);
 
@@ -57,7 +68,8 @@ foreach my $map ( split(/\s*,\s*/, $pin_map) ) {
 }
 
 warn "# pin2io = ",dump( $pin2io );
-store \$pin2io, '/dev/shm/pin2io.storable';
+#store \$pin2io, $bsdl_file . '.pin2io.storable';
+store \$pin2io, $entity . '.pin2io.storable';
 
 my @sort = sort {
        my $aa = $a; $aa =~ s/\D+//g;
@@ -65,9 +77,19 @@ my @sort = sort {
        $aa <=> $bb } keys %$io2bit;
 warn "# sort = ",dump(@sort);
 
+sub bits {
+       my $bits = shift;
+       $bits =~ s/0/ /;
+       $bits =~ s/^(.)0/$1 /;
+       $bits =~ s/^1/I/;
+       $bits =~ s/^(.)1/$1./;
+       return $bits;
+}
+
 my $last_bits = '';
 sub print_io {
        my $bits = shift;
+       my $o_bits = $bits;
        $bits = reverse $bits; # make substr work as expected
 
        print "pin off io___ ICO prv | " x 4, $openocd_remote,"\n";
@@ -80,7 +102,7 @@ sub print_io {
                        if ( defined $o ) {
                                my $l = $b = substr($bits, $o, 3);
                                $l = substr($last_bits,$o,3) if $last_bits;
-                               printf "%-3d %-3d %-5s %3s %3s | ", $pin, $o, $io, $b, $b ne $l ? $l : ''
+                               printf "%-3d %-3d %-5s %3s %3s | ", $pin, $o, $io, bits($b), bits($b ne $l ? $l : '')
                        } else {
                                printf "%-3d ... %-5s %3s %3s | ", $pin, $io, '', '';
                        }
@@ -88,7 +110,7 @@ sub print_io {
                print "\n";
        }
        print "\n";
-       $last_bits = $bits;
+       $last_bits = $o_bits;
 }
 
 #foreach my $h (qw(0 1 2 e f 10 11 12 1e 1f 20 30 40 50 100 200 1000)) {
@@ -117,7 +139,7 @@ my $BSR;
 
 # first sample
 print $sock "irscan x300.tap 0x55\n"; # SAMPLE/PRELOAD
-print $sock "drscan x300.tap 288 0\n";
+print $sock "drscan x300.tap $BOUNDARY_LENGTH 0\n";
 
 while(1) {
 
@@ -130,7 +152,7 @@ while (<$sock>) {
                my $bin = hex2bin($hex);
                diff_bits($BSR, $bin);
                $BSR = $bin;
-               print_io $bin;
+               print_io $bin if $bin ne $last_bits;
                last;
        } else {
                warn "# in ",dump($_);
@@ -147,7 +169,8 @@ sub diff_bits {
                if ( $o[$i] eq $n[$i] ) {
                        $o[$i]='.';
                } else {
-                       $o[$i].='>'.$n[$i];
+                       my $pin = $bit2pin->{ $BOUNDARY_LENGTH - ($i * 3) - 3 }->[0];
+                       $o[$i] = " $pin:" . $o[$i] . '>' . $n[$i];
                }
        }
        my $diff = join('', @o);
@@ -157,28 +180,54 @@ sub diff_bits {
 print "[press enter]\n";
 my $cmd = <STDIN>;
 chomp $cmd;
-if ( $cmd =~ /(\d+)=(\d)/ ) {
-       my ( $pin, $v ) = ( $1, $2 );
-       warn "# pin $pin = $v\n";
+if ( $cmd =~ /(p|o)(\d+)=(\d+)/ ) {
+       my ( $what, $p, $v ) = ( $1, $2, $3 );
+
+       my $old_bsr = reverse $BSR;
+       my $b = $old_bsr;
+
+       if ( $what eq 'p' && length($v) == 1 ) {
+
+               my $pin = $p;
+               warn "# pin $pin = $v\n";
+
+               my $io = $pin2io->[$pin];
+               my $bit = $io2bit->{$io}->[0];
 
-       my $io = $pin2io->[$pin];
-       my $bit = $io2bit->{$io}->[0];
+               $b =
+                         substr($old_bsr,0,$bit+1) # leave input as-is
+                       . ( $v eq 'Z' ? 1 : 0 )     # control
+                       . ( $v & 1 )                # output
+                       . substr($old_bsr,$bit+3)
+                       ;
 
-       my $b = substr($BSR,0,$bit+1)
-               . ( substr($BSR,$bit+1,1) ^ 1 )
-               . ( $v & 1 )
-               . substr($BSR,$bit+3)
-               ;
+
+       } elsif ( $what eq 'o' && $p < $BOUNDARY_LENGTH ) {
+               my $o = $p;
+               #$b = substr($old_bsr,0,$o) . reverse $v . substr($old_bsr,$o+length($v));
+               $b = ( "0" x $o ) . reverse $v . ( "0" x ( length($old_bsr) - $o - length($v) ) );
+warn "XXX",length($old_bsr), " == ",length($b);
+               $old_bsr = "0" x length($old_bsr);
+       } else {
+               print "IGNORED ",dump( $what, $p, $v );
+       }
+
+       $b = reverse $b;
 
        diff_bits( $BSR, $b ), $/;
 
-       print $sock "irscan x300.tap 0x55\n"; # SAMPLE/PRELOAD
-       print $sock "drscan x300.tap 288 0x", bin2hex($b), "\n";
+#      print $sock "irscan x300.tap 0x55\n"; # SAMPLE/PRELOAD
+       print $sock "drscan x300.tap $BOUNDARY_LENGTH 0x", bin2hex($b), "\n";
        print $sock "irscan x300.tap 0x00\n"; # EXTEST
-       print $sock "drscan x300.tap 288 0x", bin2hex($b), "\n";
+#      print $sock "drscan x300.tap $BOUNDARY_LENGTH 0x", bin2hex($b), "\n";
+
+} elsif ( $cmd =~ m/\?/ ) {
+       $last_bits = '';
+       print $sock "irscan x300.tap 0x55\n"; # SAMPLE/PRELOAD
+       print $sock "drscan x300.tap $BOUNDARY_LENGTH 0\n";
 } else {
        print $sock "irscan x300.tap 0x55\n"; # SAMPLE/PRELOAD
-       print $sock "drscan x300.tap 288 0\n";
+       print $sock "drscan x300.tap $BOUNDARY_LENGTH 0\n";
 }