From 302bfa17de63023bab393d643e4bfce0e21db56a Mon Sep 17 00:00:00 2001 From: Christopher Haster Date: Fri, 25 Aug 2023 00:17:36 -0500 Subject: [PATCH] Tweaked grms to use bid=-1 as indicator of unused grm slots This is just a proof-of-concept for compressed mids. We can't rely on rid=-1 as a special indicator as before. --- lfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs.c b/lfs.c index b7a9ac0f..eab063c4 100644 --- a/lfs.c +++ b/lfs.c @@ -1624,15 +1624,15 @@ static int lfsr_gdelta_xor(lfs_t *lfs, // GRM (global remove) things static inline bool lfsr_grm_hasrm(const lfsr_grm_t *grm) { - return grm->rms[0].rid != -1; + return grm->rms[0].bid != -1; } static inline uint8_t lfsr_grm_count(const lfsr_grm_t *grm) { - return (grm->rms[0].rid != -1) + (grm->rms[1].rid != -1); + return (grm->rms[0].bid != -1) + (grm->rms[1].bid != -1); } static inline void lfsr_grm_pushrm(lfsr_grm_t *grm, lfsr_mid_t mid) { - LFS_ASSERT(grm->rms[1].rid == -1); + LFS_ASSERT(grm->rms[1].bid == -1); grm->rms[1] = grm->rms[0]; grm->rms[0] = mid; }