parse-proto-spec works so far

diff --git a/hostside/parse-proto-spec b/hostside/parse-proto-spec
index e49b9051d57112e3143ad6dc5819f8f7305e5e7f..6aa2b74d577ad63077056eb6a9a9a7053d3647ef 100755 (executable)
--- a/hostside/parse-proto-spec
+++ b/hostside/parse-proto-spec
@@ -1,37 +1,55 @@
 #!/usr/bin/perl
+
+print("/* autogenerated - do not edit */\n");
+
 while (<>) {
-    $dirn= '<' if m/^From host to PIC/ ... m/^\S/;
-    $dirn= '>' if m/^From host to PIC/ ... m/^\S/;
-    
-    $dirn=  ? '>' :
-       m/^From PIC to host/ ... m/^\S/ ? '<' : undef;
+    chomp;
+    if (m/^From host to PIC/) {
+       $dirn= '>'; $dname= "HOST2PIC";
+    } elsif (m/^From PIC to host/) {
+       $dirn= '<'; $dname= "PIC2HOST";
+    } elsif (m/^\S/) {
+       $dirn= undef;
+    }
     next unless defined $dirn;
-    next unless m/^ [(<>)] / && $1 eq $dirn;
+    next unless m/^ ([<>]) / && $1 eq $dirn;
     die if m/\t/;
-    die unless m/^ [<>] ([01A-Z. ]+?)   +(?:\([A-Z]\))? (\S.*)$/;
+    die unless m/^ [<>] ([01A-Za-z. ]+?)   +(\S.*)$/;
     $msg= $1; $rhs= $2;
+    $rhs =~ s/^\([A-Z][0-9A-Z]+\) +//;
     next if $rhs =~ m/^\}/;
-    next if $msg =~ m/^\.\.\./;
-    $rhs =~ m/^([A-Z]+)\s/;
+    next if $msg =~ m/\.\.\./;
+    $rhs =~ m/^([A-Z]+)\s/ or die "$rhs?";
     $cname= lc $1;
     $msg =~ s/ //g;
     if ($msg =~ m/^0[01]{7}$/) {
        $opcode= $&;
        $arglen= 0;
+       $ybit= 0;
     } else {
-       $msg =~ m/A-Z/;
+       $ybit= substr($msg,0,8);
+       $ybit =~ y/Y01A-Z/10/;
+       $ybit =~ m/1.*1/ and die "$msg/$ybit?";
+       $msg =~ s/Y/0/g;
+       $msg =~ m/[A-Z]/ or die "$msg?";
        $oplet= $&;
        $msg =~ s/$oplet/_/g;
-       die if $msg =~ m/A-Z/;
-       die if $msg =~ m/_[01]/;
-       die unless $msg =~ m/^(1[01][01_]{6})0_{7}$/ or
+       die "$msg?" if $msg =~ m/[A-Z]/;
+       die "$msg?" unless $msg =~ m/^(1[01][01_]{6})0_{7}$/ or
            $msg =~ m/^(0[01][01_]{6})$/;
        $opcode= $1;
+       die if $opcode =~ m/_[01]/;
+       $opcode =~ s/_/0/g;
        $arglen= $msg;
        $arglen =~ s/[01]//g;
        $arglen= length $arglen;
+       $ybit= oct("0b$ybit");
+    }
+    for $yval ($ybit ? (0,1) : '') {
+       printf(" { %-16s 0x%02x, %2d },\n",
+              sprintf("\"%s%s\",",$cname, $yval),
+              oct("0b$opcode") | $ybit *$yval,
+              $arglen)
+           or die $!;
     }
-    printf(" { %-16s, 0x%02x, %2d },",
-          "\"$cname\",", bin($opcode), $arglen)
-       or die $!;
 }