lcov: Sort branches in unnamed blocks first

When processing branch coverage data, consider branches in "unnamed"
blocks to come before other blocks on the same line, so that they
appear in the correct order in HTML output.

This is accomplished by using block number -1 for unnamed blocks,
instead of 9999 as was previously done.  In branch data vectors, this
is reprsented by the value $BR_VEC_MAX, which is defined to be the
largest value representable in the field width used.  This same value
is also used in .info files, for backward-compatibility with regular
expressions used to parse these files.  As a result, .info files
generated by versions of lcov with this change can be read by older
versions, though branch results will still appear out of order.

Signed-off-by: Jeffrey Hutzelman <[email protected]>

Author: jhutz

bin/genhtml

@@ -73,7 +73,7 @@ use Digest::MD5 qw(md5_base64);
 
 # Global constants
 our $title		= "LCOV - code coverage report";
-our $lcov_version	= 'LCOV version 1.11 pre (CVS $Revision: 1.79 $)';
+our $lcov_version	= 'LCOV version 1.11 pre (CVS $Revision: 1.80 $)';
 our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
 our $tool_name		= basename($0);
 
@@ -146,6 +146,7 @@ our $BR_BRANCH		= 1;
 our $BR_TAKEN		= 2;
 our $BR_VEC_ENTRIES	= 3;
 our $BR_VEC_WIDTH	= 32;
+our $BR_VEC_MAX		= vec(pack('b*', 1 x $BR_VEC_WIDTH), 0, $BR_VEC_WIDTH);
 
 # Additional offsets used when converting branch coverage data to HTML
 our $BR_LEN	= 3;
@@ -5041,6 +5042,7 @@ sub br_ivec_get($$)
 
 	# Retrieve data from vector
 	$block	= vec($vec, $offset + $BR_BLOCK, $BR_VEC_WIDTH);
+	$block = -1 if ($block == $BR_VEC_MAX);
 	$branch = vec($vec, $offset + $BR_BRANCH, $BR_VEC_WIDTH);
 	$taken	= vec($vec, $offset + $BR_TAKEN, $BR_VEC_WIDTH);
 
@@ -5066,10 +5068,12 @@ sub br_ivec_push($$$$)
 	my $i;
 
 	$vec = "" if (!defined($vec));
+	$block = $BR_VEC_MAX if $block < 0;
 
 	# Check if branch already exists in vector
 	for ($i = 0; $i < $num; $i++) {
 		my ($v_block, $v_branch, $v_taken) = br_ivec_get($vec, $i);
+		$v_block = $BR_VEC_MAX if $v_block < 0;
 
 		next if ($v_block != $block || $v_branch != $branch);
 

bin/geninfo

@@ -61,7 +61,7 @@ if( $^O eq "msys" )
 }
 
 # Constants
-our $lcov_version	= 'LCOV version 1.11 pre (CVS $Revision: 1.127 $)';
+our $lcov_version	= 'LCOV version 1.11 pre (CVS $Revision: 1.128 $)';
 our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
 our $gcov_tool		= "gcov";
 our $tool_name		= basename($0);
@@ -145,8 +145,9 @@ our $BR_BRANCH		= 2;
 our $BR_TAKEN		= 3;
 our $BR_VEC_ENTRIES	= 4;
 our $BR_VEC_WIDTH	= 32;
+our $BR_VEC_MAX		= vec(pack('b*', 1 x $BR_VEC_WIDTH), 0, $BR_VEC_WIDTH);
 
-our $UNNAMED_BLOCK	= 9999;
+our $UNNAMED_BLOCK	= -1;
 
 # Prototypes
 sub print_usage(*);
@@ -1252,6 +1253,7 @@ sub process_dafile($$)
 			my ($line, $block, $branch, $taken) =
 				br_gvec_get($gcov_branches, $i);
 
+			$block = $BR_VEC_MAX if ($block < 0);
 			print(INFO_HANDLE "BRDA:$line,$block,$branch,$taken\n");
 			$br_found++;
 			$br_hit++ if ($taken ne '-' && $taken > 0);
@@ -1596,6 +1598,7 @@ sub br_gvec_get($$)
 	# Retrieve data from vector
 	$line	= vec($vec, $offset + $BR_LINE, $BR_VEC_WIDTH);
 	$block	= vec($vec, $offset + $BR_BLOCK, $BR_VEC_WIDTH);
+	$block = -1 if ($block == $BR_VEC_MAX);
 	$branch = vec($vec, $offset + $BR_BRANCH, $BR_VEC_WIDTH);
 	$taken	= vec($vec, $offset + $BR_TAKEN, $BR_VEC_WIDTH);
 
@@ -1623,6 +1626,7 @@ sub br_gvec_push($$$$$)
 
 	$vec = "" if (!defined($vec));
 	$offset = br_gvec_len($vec) * $BR_VEC_ENTRIES;
+	$block = $BR_VEC_MAX if $block < 0;
 
 	# Encode taken value into an integer
 	if ($taken eq "-") {

bin/lcov

@@ -71,7 +71,7 @@ use Cwd qw /abs_path getcwd/;
 
 
 # Global constants
-our $lcov_version	= 'LCOV version 1.11 pre (CVS $Revision: 1.98 $)';
+our $lcov_version	= 'LCOV version 1.11 pre (CVS $Revision: 1.99 $)';
 our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
 our $tool_name		= basename($0);
 
@@ -93,6 +93,7 @@ our $BR_BRANCH		= 1;
 our $BR_TAKEN		= 2;
 our $BR_VEC_ENTRIES	= 3;
 our $BR_VEC_WIDTH	= 32;
+our $BR_VEC_MAX		= vec(pack('b*', 1 x $BR_VEC_WIDTH), 0, $BR_VEC_WIDTH);
 
 # Branch data combination types
 our $BR_SUB = 0;
@@ -1472,10 +1473,12 @@ sub br_ivec_push($$$$)
 	my $i;
 
 	$vec = "" if (!defined($vec));
+	$block = $BR_VEC_MAX if $block < 0;
 
 	# Check if branch already exists in vector
 	for ($i = 0; $i < $num; $i++) {
 		my ($v_block, $v_branch, $v_taken) = br_ivec_get($vec, $i);
+		$v_block = $BR_VEC_MAX if $v_block < 0;
 
 		next if ($v_block != $block || $v_branch != $branch);
 
@@ -1512,6 +1515,7 @@ sub br_ivec_get($$)
 
 	# Retrieve data from vector
 	$block	= vec($vec, $offset + $BR_BLOCK, $BR_VEC_WIDTH);
+	$block = -1 if ($block == $BR_VEC_MAX);
 	$branch = vec($vec, $offset + $BR_BRANCH, $BR_VEC_WIDTH);
 	$taken	= vec($vec, $offset + $BR_TAKEN, $BR_VEC_WIDTH);
 
@@ -2632,6 +2636,7 @@ sub write_info_file(*$)
 					my ($block, $branch, $taken) =
 						br_ivec_get($brdata, $i);
 
+					$block = $BR_VEC_MAX if ($block < 0);
 					print(INFO_HANDLE "BRDA:$line,$block,".
 					      "$branch,$taken\n");
 					$br_found++;