Simplify and optimize value extractors

[stockfish] / src / types.h

diff --git a/src/types.h b/src/types.h
index c7ac4c643f4d1d4a559b6b21a6e7b06b3d9795a3..2d7696307060002af557620d27c18b8087181cbd 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -273,11 +273,15 @@ inline Score make_score(int mg, int eg) {
 /// according to the standard a simple cast to short is implementation defined
 /// and so is a right shift of a signed integer.
 inline Value mg_value(Score s) {
-  return Value(((s + 0x8000) & ~0xFFFF) / 0x10000);
+
+  union { uint16_t u; int16_t s; } mg = { uint16_t(unsigned(s + 0x8000) >> 16) };
+  return Value(mg.s);
 }
 
 inline Value eg_value(Score s) {
-  return Value((int)(unsigned(s) & 0x7FFFU) - (int)(unsigned(s) & 0x8000U));
+
+  union { uint16_t u; int16_t s; } eg = { uint16_t(unsigned(s)) };
+  return Value(eg.s);
 }
 
 #define ENABLE_BASE_OPERATORS_ON(T)                             \