next;
}
unless ($lastregop) {
- $ind++;
($name[$ind], $desc, $rest[$ind]) = /^(\S+)\s+([^\t]+)\s*;\s*(.*)/;
($type[$ind], $code[$ind], $args[$ind], $flags[$ind], $longj[$ind])
= split /[,\s]\s*/, $desc;
+ ++$ind;
} else {
my ($type,@lists)=split /\s+/, $_;
die "No list? $type" if !@lists;
die "unknown :type ':$special'";
}
foreach my $suffix (@suffix) {
- $ind++;
$name[$ind]="$real$suffix";
$type[$ind]=$type;
$rest[$ind]="state for $type";
+ ++$ind;
}
}
}
$ind = 0;
my @selected;
- while (++$ind <= $lastregop) {
- push @selected, $name[$ind] if $flags[$ind] && $flags[$ind] eq $flag;
- }
+ my $bitmap = '';
+ do {
+ my $set = $flags[$ind] && $flags[$ind] eq $flag ? 1 : 0;
+ # Whilst I could do this with vec, I'd prefer to do longhand the arithmetic
+ # ops in the C code.
+ my $current = do {
+ no warnings 'uninitialized';
+ ord do {
+ no warnings 'substr';
+ substr $bitmap, ($ind >> 3);
+ }
+ };
+ substr $bitmap, ($ind >> 3), 1, chr($current | ($set << ($ind & 7)));
+
+ push @selected, $name[$ind] if $set;
+ } while (++$ind < $lastregop);
my $out_string = join ', ', @selected, 0;
$out_string =~ s/(.{1,70},) /$1\n /g;
+
+ my $out_mask = join ', ', map {sprintf "0x%02X", ord $_} split '', $bitmap;
+
return $comment . <<"EOP";
+#define REGNODE_\U$varname\E(node) (PL_${varname}_bitmask[(node) >> 3] & (1 << ((node) & 7)))
+
#ifndef DOINIT
-EXTCONST U8 PL_${varname}[];
+EXTCONST U8 PL_${varname}[] __attribute__deprecated__;
#else
-EXTCONST U8 PL_${varname}[] = {
+EXTCONST U8 PL_${varname}[] __attribute__deprecated__ = {
$out_string
};
#endif /* DOINIT */
+#ifndef DOINIT
+EXTCONST U8 PL_${varname}_bitmask[];
+#else
+EXTCONST U8 PL_${varname}_bitmask[] = {
+ $out_mask
+};
+#endif /* DOINIT */
+
EOP
}
;
-for ($ind=1; $ind <= $lastregop ; $ind++) {
- my $oind = $ind - 1;
+for ($ind=0; $ind < $lastregop ; ++$ind) {
printf $out "#define\t%*s\t%d\t/* %#04x %s */\n",
- -$width, $name[$ind], $ind-1, $ind-1, $rest[$ind];
+ -$width, $name[$ind], $ind, $ind, $rest[$ind];
}
print $out "\t/* ------------ States ------------- */\n";
-for ( ; $ind <= $tot ; $ind++) {
+for ( ; $ind < $tot ; $ind++) {
printf $out "#define\t%*s\t(REGNODE_MAX + %d)\t/* %s */\n",
- -$width, $name[$ind], $ind - $lastregop, $rest[$ind];
+ -$width, $name[$ind], $ind - $lastregop + 1, $rest[$ind];
}
print $out <<EOP;
EOP
$ind = 0;
-while (++$ind <= $tot) {
+do {
printf $out "\t%*s\t/* %*s */\n",
-1-$twidth, "$type[$ind],", -$width, $name[$ind];
print $out "\t/* ------------ States ------------- */\n"
- if $ind == $lastregop and $lastregop != $tot;
-}
+ if $ind + 1 == $lastregop and $lastregop != $tot;
+} while (++$ind < $tot);
print $out <<EOP;
};
EOP
$ind = 0;
-while (++$ind <= $lastregop) {
+do {
my $size = 0;
$size = "EXTRA_SIZE(struct regnode_$args[$ind])" if $args[$ind];
printf $out "\t%*s\t/* %*s */\n",
-37, "$size,",-$rwidth,$name[$ind];
-}
+} while (++$ind < $lastregop);
print $out <<EOP;
};
EOP
$ind = 0;
-while (++$ind <= $lastregop) {
+do {
my $size = $longj[$ind] || 0;
printf $out "\t%d,\t/* %*s */\n",
$size, -$rwidth, $name[$ind]
-}
+} while (++$ind < $lastregop);
print $out <<EOP;
};
EOP
$ind = 0;
-my $ofs = 1;
+my $ofs = 0;
my $sym = "";
-while (++$ind <= $tot) {
+do {
my $size = $longj[$ind] || 0;
printf $out "\t%*s\t/* $sym%#04x */\n",
-3-$width,qq("$name[$ind]",), $ind - $ofs;
- if ($ind == $lastregop and $lastregop != $tot) {
+ if ($ind + 1 == $lastregop and $lastregop != $tot) {
print $out "\t/* ------------ States ------------- */\n";
- $ofs = $lastregop;
+ $ofs = $lastregop - 1;
$sym = 'REGNODE_MAX +';
}
-}
+} while (++$ind < $tot);
print $out <<EOP;
};