Micro-optimize last_1() for 32bits

[stockfish] / src / misc.cpp

diff --git a/src/misc.cpp b/src/misc.cpp
index 459c13ccccf887e6e72a8c8be9eafe633c6fed4c..0f0fca46624da7c0212b2971c72b0d8a02c2eae8 100644 (file)
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -17,24 +17,6 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#if defined(_WIN32) || defined(_WIN64)
-
-#define NOMINMAX // disable macros min() and max()
-#include <windows.h>
-
-#else
-
-#  include <unistd.h>
-#  if defined(__hpux)
-#     include <sys/pstat.h>
-#  endif
-
-#endif
-
-#if !defined(NO_PREFETCH)
-#  include <xmmintrin.h>
-#endif
-
 #include <iomanip>
 #include <iostream>
 #include <sstream>
@@ -42,6 +24,10 @@
 #include "misc.h"
 #include "thread.h"
 
+#if defined(__hpux)
+#    include <sys/pstat.h>
+#endif
+
 using namespace std;
 
 /// Version number. If Version is left empty, then Tag plus current
@@ -65,17 +51,15 @@ const string engine_info(bool to_uci) {
   string month, day, year;
   stringstream s, date(__DATE__); // From compiler, format is "Sep 21 2008"
 
+  s << "Stockfish " << Version;
+
   if (Version.empty())
   {
       date >> month >> day >> year;
 
-      s << "Stockfish " << Tag
-        << setfill('0') << " " << year.substr(2)
-        << setw(2) << (1 + months.find(month) / 4)
-        << setw(2) << day;
+      s << Tag << setfill('0') << " " << year.substr(2)
+        << setw(2) << (1 + months.find(month) / 4) << setw(2) << day;
   }
-  else
-      s << "Stockfish " << Version;
 
   s << cpu64 << popcnt << (to_uci ? "\nid author ": " by ")
     << "Tord Romstad, Marco Costalba and Joona Kiiski";
@@ -219,6 +203,8 @@ void prefetch(char*) {}
 
 #else
 
+#   include <xmmintrin.h>
+
 void prefetch(char* addr) {
 
 #  if defined(__INTEL_COMPILER) || defined(__ICL)