Don't need a struct here. Speed test shows
result is teh same. Moreover RKISS is used
mainly at startup to compute magics, so
prefer to keep it simple...RKISS ;-)
Also some assorted triviality while there.
No functional change.
from = from_sq(m);
to = to_sq(m);
from = from_sq(m);
to = to_sq(m);
- swapList[0] = PieceValue[MG][type_of(piece_on(to))];
+ swapList[0] = PieceValue[MG][piece_on(to)];
stm = color_of(piece_on(from));
occupied = pieces() ^ from;
stm = color_of(piece_on(from));
occupied = pieces() ^ from;
// Having built the swap list, we negamax through it to find the best
// achievable score from the point of view of the side to move.
while (--slIndex)
// Having built the swap list, we negamax through it to find the best
// achievable score from the point of view of the side to move.
while (--slIndex)
- swapList[slIndex-1] = std::min(-swapList[slIndex], swapList[slIndex-1]);
+ swapList[slIndex - 1] = std::min(-swapList[slIndex], swapList[slIndex - 1]);
- struct S { uint64_t a, b, c, d; } s; // Keep variables always together
uint64_t rotate(uint64_t x, uint64_t k) const {
return (x << k) | (x >> (64 - k));
uint64_t rotate(uint64_t x, uint64_t k) const {
return (x << k) | (x >> (64 - k));
- const uint64_t
- e = s.a - rotate(s.b, 7);
- s.a = s.b ^ rotate(s.c, 13);
- s.b = s.c + rotate(s.d, 37);
- s.c = s.d + e;
- return s.d = e + s.a;
+ const uint64_t e = a - rotate(b, 7);
+ a = b ^ rotate(c, 13);
+ b = c + rotate(d, 37);
+ c = d + e;
+ return d = e + a;
}
public:
RKISS(int seed = 73) {
}
public:
RKISS(int seed = 73) {
- s.a = 0xf1ea5eed;
- s.b = s.c = s.d = 0xd4e12c77;
+ a = 0xF1EA5EED, b = c = d = 0xD4E12C77;
+
for (int i = 0; i < seed; ++i) // Scramble a few rounds
rand64();
}
for (int i = 0; i < seed; ++i) // Scramble a few rounds
rand64();
}
}
inline Color operator~(Color c) {
}
inline Color operator~(Color c) {
+ return Color(c ^ BLACK);
}
inline Square operator~(Square s) {
}
inline Square operator~(Square s) {
- return Square(s ^ 56); // Vertical flip SQ_A1 -> SQ_A8
+ return Square(s ^ SQ_A8); // Vertical flip SQ_A1 -> SQ_A8
}
inline Square operator|(File f, Rank r) {
}
inline Square operator|(File f, Rank r) {