ovmerge: Allow it to run on 32-bit Perls

pelwell · pelwell · commit cea1c6ca4d9f · 2023-03-14T10:31:18.000Z
Perl can be configured at build time to support 64-bit integers - ivsize=8 - even on 32-bit platforms. The Raspberry Pi Perl builds are configured this way but some aren't, causing interpreter errors on the 64-bit mask value 0xffffffffffffffff. Replacing this with a -1 has no negative effect when ivsize=8, and it allows the tool to run when ivsize=4 (without supporting values > 32-bit). See: #23 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
diff --git a/ovmerge/ovmerge b/ovmerge/ovmerge
@@ -1885,7 +1885,11 @@ sub get_labels
 sub integer_value
 {
 	my ($value, $size) = @_;
-	my %masks = (1=>0xff, 2=>0xffff, 4=>0xffffffff, 8=>0xffffffffffffffff);
+	# The following line should say '8=>0xffffffffffffffff', but this upsets
+	# builds of Perl with ivsize=4. This won't give the correct result for
+	# large values but Perl will already have rejected them due to integer
+	# overflow.
+	my %masks = (1=>0xff, 2=>0xffff, 4=>0xffffffff, 8=>-1);
 	return undef if (!defined $value);
 	if ($value =~ /^(y|yes|on|true|down)?$/)
 	{

Original file line number	Diff line number	Diff line change
`@@ -1885,7 +1885,11 @@ sub get_labels`
`1885`	`1885`	`sub integer_value`
`1886`	`1886`	`{`
`1887`	`1887`	`my ($value, $size) = @_;`
`1888`		`- my %masks = (1=>0xff, 2=>0xffff, 4=>0xffffffff, 8=>0xffffffffffffffff);`
	`1888`	`+ # The following line should say '8=>0xffffffffffffffff', but this upsets`
	`1889`	`+ # builds of Perl with ivsize=4. This won't give the correct result for`
	`1890`	`+ # large values but Perl will already have rejected them due to integer`
	`1891`	`+ # overflow.`
	`1892`	`+ my %masks = (1=>0xff, 2=>0xffff, 4=>0xffffffff, 8=>-1);`
`1889`	`1893`	`return undef if (!defined $value);`
`1890`	`1894`	`if ($value =~ /^(y\|yes\|on\|true\|down)?$/)`
`1891`	`1895`	`{`