Bench: 22484322

src/history.h

@@ -26,7 +26,7 @@
 #include "types.h"
 
 
-#define QuietEntry(move)        (&thread->history[thread->pos.stm][(bool)(BB(fromSq(move)) & threats)][fromSq(move)][toSq(move)])
+#define QuietEntry(move)        (&thread->history[thread->pos.stm][(bool)(BB(toSq(move)) & threats)][fromSq(move)][toSq(move)])
 #define NoisyEntry(move)        (&thread->captureHistory[piece(move)][toSq(move)][PieceTypeOf(capturing(move))])
 #define ContEntry(offset, move) (&(*(ss-offset)->continuation)[piece(move)][toSq(move)])
 

src/search.c

@@ -55,27 +55,14 @@ static Bitboard Threats(Position *pos, Color c) {
     const Bitboard occ = pieceBB(ALL);
 
     Bitboard threats = 0;
-    Bitboard vulnerable = colorBB(!c) & ~pieceBB(PAWN);
 
-    // Pawn threats
-    Bitboard pawn_attacks = PawnBBAttackBB(colorPieceBB(c, PAWN), c);
-    threats |= pawn_attacks & vulnerable;
-
-    // Knight and Bishop threats
-    vulnerable &= ~(pieceBB(KNIGHT) | pieceBB(BISHOP));
-    Bitboard minor_attacks = 0;
+    threats |= PawnBBAttackBB(colorPieceBB(c, PAWN), c);
     Bitboard knights = colorPieceBB(c, KNIGHT);
-    while (knights) minor_attacks |= AttackBB(KNIGHT, PopLsb(&knights), occ);
+    while (knights) threats |= AttackBB(KNIGHT, PopLsb(&knights), occ);
     Bitboard bishops = colorPieceBB(c, BISHOP);
-    while (bishops) minor_attacks |= AttackBB(BISHOP, PopLsb(&bishops), occ);
-    threats |= minor_attacks & vulnerable;
-
-    // Rook threats
-    vulnerable &= ~pieceBB(ROOK);
-    Bitboard rook_attacks = 0;
+    while (bishops) threats |= AttackBB(BISHOP, PopLsb(&bishops), occ);
     Bitboard rooks = colorPieceBB(c, ROOK);
-    while (rooks) rook_attacks |= AttackBB(ROOK, PopLsb(&rooks), occ);
-    threats |= rook_attacks & vulnerable;
+    while (rooks) threats |= AttackBB(ROOK, PopLsb(&rooks), occ);
 
     return threats;
 }