fix diff_buts for BOUNDARY_LENGTH which are not multiple of 8 bits

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

diff --git a/openocd-jtag-boundary-scan.pl b/openocd-jtag-boundary-scan.pl
index c44a386..3634bbe 100755 (executable)
--- a/openocd-jtag-boundary-scan.pl
+++ b/openocd-jtag-boundary-scan.pl
@@ -13,8 +13,10 @@ my $bsdl_file = $ENV{BSDL} ||
 #      '_3128at100.bsd';
 #      '3064at44.bsd'; # XXX 
 my $tap = $ENV{TAP} || 'tb276.tap';
+my $project_file = 'Altera/epm3064_dac/3064at44.qsf';
+$project_file = 'tb276/f32c.qsf';
 
-my $BOUNDARY_LENGTH = 288;
+my $BOUNDARY_LENGTH = -1;
 my $entity;
 
 my $bit2pin;
@@ -30,7 +32,9 @@ my $parse_regex = join('|', qw(
 
 $|=1; # flush stdout
 
-require 'gpio.pl';
+my $have_gpio = `which gpio`;
+warn "# ", ! $have_gpio ? "DOESN'T " : '', "have rpi gpio\n";
+require 'gpio.pl' if $have_gpio;
 
 open(my $bsdl, '<', $bsdl_file);
 while(<$bsdl>) {
@@ -91,12 +95,11 @@ store \$pin2io, $entity . '.pin2io.storable';
 
 my $opcode;
 my $o = $parse->{INSTRUCTION_OPCODE} || die "no INSTRUCTION_OPCODE in ",dump($parse);
-warn "XXX [$o]";
 
 foreach ( split(/\)\s*,\s*/, $o) ) {
        s/\s+\(/ /g;
        s/\s*\)\s*$//g;
-       warn "XXX [$_]\n";
+       warn "### [$_]\n";
        my ( $inst_opcode, $bin ) = split(/\s+/, $_);
        $opcode->{$inst_opcode} = sprintf "0x%02x", eval '0b' . $bin;
 }
@@ -113,17 +116,17 @@ foreach my $pin_file ( glob "pins/$entity*.tsv" ) {
                chomp;
                my ($pin,$desc, $bcm) = split(/\t+/,$_,3);
                $pin_desc->{$pin} = $desc;
-               gpio::add_bcm_desc( $bcm => $desc );
+               gpio::add_bcm_desc( $bcm => $desc ) if $have_gpio;
        }
        close($fh);
        warn "# $pin_file ",dump($pin_desc);
 }
 
 {
-       my $pin_file = 'Altera/epm3064_dac/3064at44.qsf';
-       open(my $fh, '<', $pin_file);
+       open(my $fh, '<', $project_file);
        while(<$fh>) {
                chomp;
+               s/[\r\n]+$//;
                my ($set,$pin, $op, $desc) = split(/\s+/,$_,4);
                if ( $set =~ m/set_location_assignment/i && $op =~ m/-to/i && $pin =~ s/^PIN_//ig ) {
                        $pin_desc->{$pin} = $desc; # overwrite pin description
@@ -132,7 +135,7 @@ foreach my $pin_file ( glob "pins/$entity*.tsv" ) {
                }
        }
        close($fh);
-       warn "# $pin_file ",dump($pin_desc);
+       warn "# $project_file ",dump($pin_desc);
 }
 
 =for remove
@@ -158,8 +161,9 @@ sub print_io {
        my $bits = shift;
        my $o_bits = $bits;
        $bits = reverse $bits; # make substr work as expected
+       my $last_bits_r = reverse $last_bits;
 
-       print "pin off io___ ICO prv | " x 4, $openocd_remote,"\n";
+       print "pin off io___ ICO          | " x 4, $openocd_remote,"\n";
        foreach my $i ( 0 .. ($#$pin2io/4)-1 ) {
                foreach my $j ( 0 .. 3 ) {
                        #my $pin = ($i*4) + $j + 1; # rows
@@ -169,7 +173,7 @@ sub print_io {
 
                        if ( defined $o ) {
                                my $l = $b = substr($bits, $o, 3);
-                               $l = substr($last_bits,$o,3) if $last_bits;
+                               $l = substr($last_bits_r,$o,3) if $last_bits;
 
                                my $desc = $pin_desc->{$pin} || '';
                                my $bits = bits($b);
@@ -182,9 +186,12 @@ sub print_io {
                                        }
                                }
 
-                               printf "%-3d %-3d %-5s %3s %-8s | ", $pin, $o, $io, $bits, $desc;
+                               $desc = ' ' . $desc if length($desc) < 10;
+                               $desc = substr($desc,0,10);
+
+                               printf "%-3d %-3d %-5s %3s%-10s| ", $pin, $o, $io, $bits, $desc;
                        } else {
-                               printf "%-3d ... %-5s %3s %-8s | ", $pin, $io, '', '';
+                               printf "%-3d ... %-18s | ", $pin, $io;
                        }
                }
                print "\n";
@@ -235,7 +242,7 @@ while (<$sock>) {
                diff_bits($BSR, $bin);
                $BSR = $bin;
                print_io $bin if $bin ne $last_bits;
-               gpio::pins();
+               gpio::pins() if $have_gpio;
                last;
        } else {
                warn "# in ",dump($_);
@@ -244,23 +251,26 @@ while (<$sock>) {
 
 sub diff_bits {
        my ($old, $new) = @_;
+       $old = reverse $old; # extra bits must be on the end
+       $new = reverse $new;
        $old =~ s/(...)/$1 /g;
        $new =~ s/(...)/$1 /g;
        my @o = split(/ /, $old);
        my @n = split(/ /, $new);
-       foreach my $i ( 0 .. $#o ) {
+       my $bsr_max_bit = $BOUNDARY_LENGTH / 3 - 1;
+       foreach my $i ( 0 .. $bsr_max_bit ) {
                if ( $o[$i] eq $n[$i] ) {
                        $o[$i]='.';
                } else {
-                       my $pin = $bit2pin->{ $BOUNDARY_LENGTH - ($i * 3) - 3 }->[0];
+                       my $pin = $bit2pin->{ $i * 3 }->[0];
                        $o[$i] = " $pin@" . ( $i * 3 ) . ":" . $o[$i] . '>' . $n[$i];
                }
        }
-       my $diff = join('', @o);
+       my $diff = join('', @o[ 0 .. $bsr_max_bit ]);
        print "# diff_bits $diff\n";
 }
 
-print "[press enter]\n";
+print "> ";
 my $cmd = <STDIN>;
 chomp $cmd;
 if ( $cmd =~ /(p|o)(\d+)=(\d+)/ ) {
@@ -297,7 +307,7 @@ warn "XXX",length($old_bsr), " == ",length($b);
 
        $b = reverse $b;
 
-       diff_bits( $BSR, $b ), $/;
+       diff_bits( $BSR, $b );
 
 #      print $sock "irscan $tap $opcode->{SAMPLE}\n"; # SAMPLE/PRELOAD
        print $sock "drscan $tap $BOUNDARY_LENGTH 0x", bin2hex($b), "\n";
@@ -309,7 +319,7 @@ warn "XXX",length($old_bsr), " == ",length($b);
        print $sock "irscan $tap $opcode->{SAMPLE}\n"; # SAMPLE/PRELOAD
        print $sock "drscan $tap $BOUNDARY_LENGTH 0\n";
 } else {
-       gpio::cmd( $cmd );
+       gpio::cmd( $cmd ) if $have_gpio;
        print $sock "irscan $tap $opcode->{SAMPLE}\n"; # SAMPLE/PRELOAD
        print $sock "drscan $tap $BOUNDARY_LENGTH 0\n";
 }