Allow forcing the unit by passing UNIT=type to Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 49e3969ceef0de4cf502d38bc9823d22c61c382a..8cabdb8724009b8f203a668091c6fdfe5308da91 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -129,25 +129,31 @@ if (defined $cc and defined $ld) {
  $PARAMS{CC} = $cc;
  $PARAMS{LD} = $ld;
 
  $PARAMS{CC} = $cc;
  $PARAMS{LD} = $ld;
 

- my $bits = 8;
- if (not is_little_endian()) {
-  print "Forcing unit size of 8 on non-little-endian systems.\n";
+ my $type = filter_argv UNIT => sub { return $_[0] };
+ if (defined $type) {
+  print "Forcing '$type' as the unit.\n";
+  push @DEFINES, '-DBV_UNIT="' . $type . '"';

  } else {
  } else {

-  print "Checking unit size in bits... ";
-  my $size  = 1;
-  my $align = $Config{alignbytes} || 1;
-  my @units = (8, 16, 32, 64);
-  for my $unit (@units) {
-   my $unit_size = $Config{"u${unit}size"};
-   if ($unit_size and $unit_size <= $align) {
-    $bits = $unit;
-    $size = $unit_size;
+  my $bits = 8;
+  if (not is_little_endian()) {
+   print "Forcing unit size of 8 on non-little-endian systems.\n";
+  } else {
+   print "Checking unit size in bits... ";
+   my $size  = 1;
+   my $align = $Config{alignbytes} || 1;
+   my @units = (8, 16, 32, 64);
+   for my $unit (@units) {
+    my $unit_size = $Config{"u${unit}size"};
+    if ($unit_size and $unit_size <= $align) {
+     $bits = $unit;
+     $size = $unit_size;
+    }

    }
    }

+   print "$bits (actually $size bytes for $align bytes alignment).\n";

   }
   }

-  print "$bits (actually $size bytes for $align bytes alignment).\n";
+  push @DEFINES, '-DBV_UNIT="' . ($Config{"u${bits}type"} || "U$bits") . '"';
+  push @DEFINES, "-DSVU_SIZE=$bits";

  }
  }

- push @DEFINES, '-DBV_UNIT="' . ($Config{"u${bits}type"} || "U$bits") . '"';
- push @DEFINES, "-DSVU_SIZE=$bits";

 } else {
  $PARAMS{C}      = [ ];
  $PARAMS{XS}     = { };
 } else {
  $PARAMS{C}      = [ ];
  $PARAMS{XS}     = { };

diff --git a/Util.xs b/Util.xs
index 6342936fc2d33d63cab065319f8a85324b7c8a3a..d878813aba6d96e200d7dea679b29923683bfa06 100644 (file)
--- a/Util.xs
+++ b/Util.xs
@@ -11,6 +11,10 @@
 
 #include "bitvect.h"
 
 
 #include "bitvect.h"
 

+#ifndef SVU_SIZE
+# define SVU_SIZE (CHAR_BIT * sizeof(BV_UNIT))
+#endif
+

 static size_t svu_validate_uv(pTHX_ SV *sv, const char *desc) {
 #define svu_validate_uv(S, D) svu_validate_uv(aTHX_ (S), (D))
  IV i;
 static size_t svu_validate_uv(pTHX_ SV *sv, const char *desc) {
 #define svu_validate_uv(S, D) svu_validate_uv(aTHX_ (S), (D))
  IV i;