Guard against UB in lsb/msb

lsb(b) and msb(b) are undefined when b == 0. This can lead to subtle bugs, where
the resulting code behaves differently on different configurations:
- It can be the home grown software LSB/MSB
- It can be the compiler generated software LSB/MSB (when using compiler
  intrinsics without the right compiler flags to allow compiler to use hardware
  LSB/MSB). Which of course depends on the compiler.
- It can be hardware LSB/MSB generated by the compiler.
- Not to mention that hardware LSB/MSB can return different value on different
  hardware when b == 0.

No functional change

Resolves #610

diff --git a/src/bitboard.cpp b/src/bitboard.cpp
index 4ea69ebc757df81fbea8f70d79e1d54c7d568446..ba1af2f2865f28865791178206add9752a392889 100644 (file)
--- a/src/bitboard.cpp
+++ b/src/bitboard.cpp
@@ -81,11 +81,13 @@ namespace {
 /// Software fall-back of lsb() and msb() for CPU lacking hardware support
 
 Square lsb(Bitboard b) {
 /// Software fall-back of lsb() and msb() for CPU lacking hardware support
 
 Square lsb(Bitboard b) {

+  assert(b);

   return BSFTable[bsf_index(b)];
 }
 
 Square msb(Bitboard b) {
 
   return BSFTable[bsf_index(b)];
 }
 
 Square msb(Bitboard b) {
 

+  assert(b);

   unsigned b32;
   int result = 0;
 
   unsigned b32;
   int result = 0;
 

diff --git a/src/bitboard.h b/src/bitboard.h
index 2ad8773634dce967e6cc6b223e68eeb3d4d66f05..77a824ba62106965ba9513803a19c650c092bb4c 100644 (file)
--- a/src/bitboard.h
+++ b/src/bitboard.h
@@ -261,18 +261,27 @@ inline Bitboard attacks_bb(Piece pc, Square s, Bitboard occupied) {
 
 #if defined(__GNUC__)
 
 
 #if defined(__GNUC__)
 

-inline Square lsb(Bitboard b) { return Square(__builtin_ctzll(b)); }
-inline Square msb(Bitboard b) { return Square(63 - __builtin_clzll(b)); }
+inline Square lsb(Bitboard b) {
+  assert(b);
+  return Square(__builtin_ctzll(b));
+}
+
+inline Square msb(Bitboard b) {
+  assert(b);
+  return Square(63 - __builtin_clzll(b));
+}

 
 #elif defined(_WIN64) && defined(_MSC_VER)
 
 inline Square lsb(Bitboard b) {
 
 #elif defined(_WIN64) && defined(_MSC_VER)
 
 inline Square lsb(Bitboard b) {

+  assert(b);

   unsigned long idx;
   _BitScanForward64(&idx, b);
   return (Square) idx;
 }
 
 inline Square msb(Bitboard b) {
   unsigned long idx;
   _BitScanForward64(&idx, b);
   return (Square) idx;
 }
 
 inline Square msb(Bitboard b) {

+  assert(b);

   unsigned long idx;
   _BitScanReverse64(&idx, b);
   return (Square) idx;
   unsigned long idx;
   _BitScanReverse64(&idx, b);
   return (Square) idx;