X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmove.h;h=9702d9fbebcfbd0ab6a9088b3889f4807eb754c2;hp=844ec1f6be609d198be1b656630e55eaf327a387;hb=55b5b03273e9740b63663ee84a17788c5424eec3;hpb=cf4df0327a3f30be345b0e9685b095be79e47cae

diff --git a/src/move.h b/src/move.h
index 844ec1f6..9702d9fb 100644
--- a/src/move.h
+++ b/src/move.h
@@ -65,15 +65,15 @@ struct MoveStack {
 // Note that operator< is set up such that sorting will be in descending order
 inline bool operator<(const MoveStack& f, const MoveStack& s) { return s.score < f.score; }
 
-// Our stable insertion sort in range [firstMove, lastMove), platform independent
+// An helper insertion sort implementation
 template<typename T>
-inline void sort_moves(T* firstMove, T* lastMove)
+inline void insertion_sort(T* firstMove, T* lastMove)
 {
     T value;
     T *cur, *p, *d;
 
     if (firstMove != lastMove)
-        for (cur = firstMove; ++cur != lastMove; )
+        for (cur = firstMove + 1; cur != lastMove; cur++)
         {
             p = d = cur;
             value = *p--;
@@ -86,6 +86,59 @@ inline void sort_moves(T* firstMove, T* lastMove)
         }
 }
 
+// Our dedicated sort in range [firstMove, lastMove), it is well
+// tuned for non-captures where we have a lot of zero scored moves.
+template<typename T>
+inline void sort_moves(T* firstMove, T* lastMove)
+{
+    T tmp;
+    T *p, *d;
+
+    d = lastMove;
+    p = firstMove - 1;
+
+    d->score = -1; // right guard
+
+    // Split positives vs non-positives
+    do {
+        while ((++p)->score > 0);
+
+        if (p != d)
+        {
+            while (--d != p && d->score <= 0);
+
+            tmp = *p;
+            *p = *d;
+            *d = tmp;
+        }
+
+    } while (p != d);
+
+    // Sort positives
+    insertion_sort<T>(firstMove, p);
+
+    d = lastMove;
+    p--;
+
+    // Split zero vs negatives
+    do {
+        while ((++p)->score == 0);
+
+        if (p != d)
+        {
+            while (--d != p && d->score < 0);
+
+            tmp = *p;
+            *p = *d;
+            *d = tmp;
+        }
+
+    } while (p != d);
+
+    // Sort negatives
+    insertion_sort<T>(p, lastMove);
+}
+
 // Picks up the best move in range [curMove, lastMove), one per cycle.
 // It is faster then sorting all the moves in advance when moves are few,
 // as normally are the possible captures. Note that is not a stable alghoritm.
@@ -123,6 +176,10 @@ inline PieceType move_promotion_piece(Move m) {
   return PieceType((int(m) >> 12) & 7);
 }
 
+inline int move_is_special(Move m) {
+  return m & (0x1F << 12);
+}
+
 inline int move_is_promotion(Move m) {
   return m & (7 << 12);
 }