diff --git a/lfs.c b/lfs.c index eb382ad5..9b0cb113 100644 --- a/lfs.c +++ b/lfs.c @@ -755,8 +755,8 @@ enum lfsr_tag { // some in-device only tag modifiers LFSR_TAG_RM = 0x8000, LFSR_TAG_GROW = 0x4000, - LFSR_TAG_SUPMASK = 0x2000, - LFSR_TAG_SUBMASK = 0x1000, + LFSR_TAG_SUP = 0x2000, + LFSR_TAG_SUB = 0x1000, // lfsr_rbyd_appendattr specific flags, also in-device only LFSR_TAG_DIVERGED = 0x4000, @@ -830,12 +830,12 @@ static inline bool lfsr_tag_isgrow(lfsr_tag_t tag) { return tag & LFSR_TAG_GROW; } -static inline bool lfsr_tag_issupwide(lfsr_tag_t tag) { - return tag & LFSR_TAG_SUPMASK; +static inline bool lfsr_tag_issup(lfsr_tag_t tag) { + return tag & LFSR_TAG_SUP; } -static inline bool lfsr_tag_issubwide(lfsr_tag_t tag) { - return tag & LFSR_TAG_SUBMASK; +static inline bool lfsr_tag_issub(lfsr_tag_t tag) { + return tag & LFSR_TAG_SUB; } // lfsr_rbyd_appendattr diverged specific flags @@ -2700,10 +2700,10 @@ static int lfsr_rbyd_appendattr(lfs_t *lfs, lfsr_rbyd_t *rbyd, // note both normal and rm wide-tags have the same bounds, really it's // the normal non-wide-tags that are an outlier here - if (lfsr_tag_issupwide(tag)) { + if (lfsr_tag_issup(tag)) { tag_ = 0; other_tag_ = tag_ + 0x800; - } else if (lfsr_tag_issubwide(tag)) { + } else if (lfsr_tag_issub(tag)) { tag_ = lfsr_tag_supkey(tag); other_tag_ = tag_ + 0x100; } else if (lfsr_tag_isrm(tag) || !lfsr_tag_key(tag)) { @@ -3034,10 +3034,10 @@ static int lfsr_rbyd_appendattr(lfs_t *lfs, lfsr_rbyd_t *rbyd, && (upper_rid-1 < rid-lfs_smax32(-delta, 0) || (upper_rid-1 == rid-lfs_smax32(-delta, 0) && ((!lfsr_tag_isgrow(tag) && delta > 0) - || (!lfsr_tag_issupwide(tag) + || (!lfsr_tag_issup(tag) && lfsr_tag_supkey(tag_) < lfsr_tag_supkey(tag)) - || (!lfsr_tag_issupwide(tag) - && !lfsr_tag_issubwide(tag) + || (!lfsr_tag_issup(tag) + && !lfsr_tag_issub(tag) && lfsr_tag_key(tag_) < lfsr_tag_key(tag)))))) { if (lfsr_tag_isrm(tag) || !lfsr_tag_key(tag)) { // if removed, make our tag unreachable @@ -3060,10 +3060,10 @@ static int lfsr_rbyd_appendattr(lfs_t *lfs, lfsr_rbyd_t *rbyd, && (upper_rid-1 > rid || (upper_rid-1 == rid && ((!lfsr_tag_isgrow(tag) && delta > 0) - || (!lfsr_tag_issupwide(tag) + || (!lfsr_tag_issup(tag) && lfsr_tag_supkey(tag_) > lfsr_tag_supkey(tag)) - || (!lfsr_tag_issupwide(tag) - && !lfsr_tag_issubwide(tag) + || (!lfsr_tag_issup(tag) + && !lfsr_tag_issub(tag) && lfsr_tag_key(tag_) > lfsr_tag_key(tag)))))) { if (lfsr_tag_isrm(tag) || !lfsr_tag_key(tag)) { // if removed, make our tag unreachable @@ -6663,10 +6663,10 @@ static int lfsr_mdir_commit(lfs_t *lfs, lfsr_mdir_t *mdir, err = lfsr_mdir_commit_(lfs, &mroot_, -1, 0, NULL, -1, LFSR_ATTRS( (lfsr_mtree_ismptr(&mtree_)) ? LFSR_ATTR( - LFSR_TAG_SUBMASK | LFSR_TAG_MDIR, 0, + LFSR_TAG_SUB | LFSR_TAG_MDIR, 0, LFSR_DATA_FROMMPTR(&mtree_.u.mptr.mptr)) : LFSR_ATTR( - LFSR_TAG_SUBMASK | LFSR_TAG_MTREE, 0, + LFSR_TAG_SUB | LFSR_TAG_MTREE, 0, LFSR_DATA_FROMBTREE(&mtree_.u.btree)))); if (err) { LFS_ASSERT(err != LFS_ERR_RANGE); @@ -6768,7 +6768,7 @@ static int lfsr_mdir_commit(lfs_t *lfs, lfsr_mdir_t *mdir, err = lfsr_mdir_commit__(lfs, &mrootanchor_, -1, -1, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUBMASK | LFSR_TAG_MROOT, 0, + LFSR_TAG_SUB | LFSR_TAG_MROOT, 0, LFSR_DATA_FROMMPTR(lfsr_mdir_mptr(&mrootchild_))))); if (err) { LFS_ASSERT(err != LFS_ERR_RANGE); @@ -6801,7 +6801,7 @@ static int lfsr_mdir_commit(lfs_t *lfs, lfsr_mdir_t *mdir, && o->mdir.mid >= mid) { // replaced? if (o->mdir.mid == mid - attrs[i].delta - && lfsr_tag_issupwide(attrs[i].tag)) { + && lfsr_tag_issup(attrs[i].tag)) { o->flags |= LFS_F_ZOMBIE | LFS_F_UNSYNC | LFS_O_DESYNC; @@ -8624,7 +8624,7 @@ int lfsr_mkdir(lfs_t *lfs, const char *path) { // process err = lfsr_mdir_commit(lfs, &mdir, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUPMASK | LFSR_TAG_DIR, (!exists) ? +1 : 0, + LFSR_TAG_SUP | LFSR_TAG_DIR, (!exists) ? +1 : 0, LFSR_DATA_CAT( LFSR_DATA_LEB128(did), LFSR_DATA_BUF(name, name_size))), @@ -8731,7 +8731,7 @@ int lfsr_remove(lfs_t *lfs, const char *path) { // and trim the entry size (zombie) ? LFSR_ATTR( - LFSR_TAG_SUPMASK | LFSR_TAG_ORPHAN, 0, + LFSR_TAG_SUP | LFSR_TAG_ORPHAN, 0, LFSR_DATA_CAT( LFSR_DATA_LEB128(did), LFSR_DATA_BUF(name, name_size))) @@ -8881,7 +8881,7 @@ int lfsr_rename(lfs_t *lfs, const char *old_path, const char *new_path) { // new rid, while also marking the old rid for removal err = lfsr_mdir_commit(lfs, &new_mdir, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUPMASK | old_tag, (!exists) ? +1 : 0, + LFSR_TAG_SUP | old_tag, (!exists) ? +1 : 0, LFSR_DATA_CAT( LFSR_DATA_LEB128(new_did), LFSR_DATA_BUF(new_name, new_name_size))), @@ -10079,7 +10079,7 @@ static int lfsr_file_carve(lfs_t *lfs, lfsr_file_t *file, err = lfsr_bshrub_commit(lfs, file, bid, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_GROW | LFSR_TAG_SUBMASK | LFSR_TAG_DATA, + LFSR_TAG_GROW | LFSR_TAG_SUB | LFSR_TAG_DATA, -(weight_ - lfs->cfg->fragment_size), lfsr_data_truncate(left_slice_, lfs->cfg->fragment_size)), @@ -10106,7 +10106,7 @@ static int lfsr_file_carve(lfs_t *lfs, lfsr_file_t *file, err = lfsr_bshrub_commit(lfs, file, bid, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_GROW | LFSR_TAG_SUBMASK | LFSR_TAG_BLOCK, + LFSR_TAG_GROW | LFSR_TAG_SUB | LFSR_TAG_BLOCK, -(weight_ - lfsr_data_size(bptr_.data)), LFSR_DATA_FROMBPTR(&bptr_)), LFSR_ATTR( @@ -10140,7 +10140,7 @@ static int lfsr_file_carve(lfs_t *lfs, lfsr_file_t *file, .cksum = bptr_.cksum, }; attrs[attr_count++] = LFSR_ATTR( - LFSR_TAG_GROW | LFSR_TAG_SUBMASK | LFSR_TAG_BLOCK, + LFSR_TAG_GROW | LFSR_TAG_SUB | LFSR_TAG_BLOCK, -(bid+1 - pos), lfsr_data_frombptr(&bptr__, &buf[buf_size])); buf_size += LFSR_BPTR_DSIZE; @@ -10148,7 +10148,7 @@ static int lfsr_file_carve(lfs_t *lfs, lfsr_file_t *file, // carve fragment? } else { attrs[attr_count++] = LFSR_ATTR( - LFSR_TAG_GROW | LFSR_TAG_SUBMASK | LFSR_TAG_DATA, + LFSR_TAG_GROW | LFSR_TAG_SUB | LFSR_TAG_DATA, -(bid+1 - pos), left_slice_); } @@ -11142,7 +11142,7 @@ int lfsr_file_sync(lfs_t *lfs, lfsr_file_t *file) { } attrs[attr_count++] = LFSR_ATTR( - LFSR_TAG_SUBMASK | LFSR_TAG_REG, 0, data); + LFSR_TAG_SUB | LFSR_TAG_REG, 0, data); } // commit the file state @@ -11150,22 +11150,22 @@ int lfsr_file_sync(lfs_t *lfs, lfsr_file_t *file) { // null? no attr? if (lfsr_f_isunflush(file->m.flags) && file->buffer_size == 0) { attrs[attr_count++] = LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_SUBMASK | LFSR_TAG_STRUCT, 0, + LFSR_TAG_RM | LFSR_TAG_SUB | LFSR_TAG_STRUCT, 0, LFSR_DATA_NULL()); // small file inlined in mdir? } else if (lfsr_f_isunflush(file->m.flags)) { attrs[attr_count++] = LFSR_ATTR( - LFSR_TAG_SUBMASK | LFSR_TAG_DATA, 0, + LFSR_TAG_SUB | LFSR_TAG_DATA, 0, LFSR_DATA_BUF(file->buffer, file->buffer_size)); // bshrub? } else if (lfsr_bshrub_isbshrub(&file->m.mdir, &file->bshrub)) { attrs[attr_count++] = LFSR_ATTR( - LFSR_TAG_SUBMASK | LFSR_TAG_SHRUBTRUNK, 0, + LFSR_TAG_SUB | LFSR_TAG_SHRUBTRUNK, 0, LFSR_DATA_SHRUBTRUNK(&file->bshrub_.u.bshrub)); // btree? } else if (lfsr_bshrub_isbtree(&file->m.mdir, &file->bshrub)) { attrs[attr_count++] = LFSR_ATTR( - LFSR_TAG_SUBMASK | LFSR_TAG_BTREE, 0, + LFSR_TAG_SUB | LFSR_TAG_BTREE, 0, lfsr_data_frombtree( &file->bshrub.u.btree, &buf[buf_size])); diff --git a/tests/test_btree.toml b/tests/test_btree.toml index bdd340b9..5a28fe6b 100644 --- a/tests/test_btree.toml +++ b/tests/test_btree.toml @@ -738,7 +738,7 @@ code = ''' // update the tree lfsr_btree_commit(&lfs, &btree, 0, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUBMASK | LFSR_TAG_DATA, 0, + LFSR_TAG_SUB | LFSR_TAG_DATA, 0, LFSR_DATA_BUF("A", 1)))) => 0; printf("btree: w%d 0x%x.%x\n", btree.weight, @@ -786,11 +786,11 @@ code = ''' // update the tree lfsr_btree_commit(&lfs, &btree, 0, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUBMASK | LFSR_TAG_DATA, 0, + LFSR_TAG_SUB | LFSR_TAG_DATA, 0, LFSR_DATA_BUF("A", 1)))) => 0; lfsr_btree_commit(&lfs, &btree, 1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUBMASK | LFSR_TAG_DATA, 0, + LFSR_TAG_SUB | LFSR_TAG_DATA, 0, LFSR_DATA_BUF("B", 1)))) => 0; printf("btree: w%d 0x%x.%x\n", btree.weight, @@ -847,15 +847,15 @@ code = ''' // update the tree lfsr_btree_commit(&lfs, &btree, 0, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUBMASK | LFSR_TAG_DATA, 0, + LFSR_TAG_SUB | LFSR_TAG_DATA, 0, LFSR_DATA_BUF("A", 1)))) => 0; lfsr_btree_commit(&lfs, &btree, 1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUBMASK | LFSR_TAG_DATA, 0, + LFSR_TAG_SUB | LFSR_TAG_DATA, 0, LFSR_DATA_BUF("B", 1)))) => 0; lfsr_btree_commit(&lfs, &btree, 2, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUBMASK | LFSR_TAG_DATA, 0, + LFSR_TAG_SUB | LFSR_TAG_DATA, 0, LFSR_DATA_BUF("C", 1)))) => 0; printf("btree: w%d 0x%x.%x\n", btree.weight, @@ -930,7 +930,7 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { int err = lfsr_btree_commit(&lfs, &btree, i, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUBMASK | LFSR_TAG_DATA, 0, + LFSR_TAG_SUB | LFSR_TAG_DATA, 0, LFSR_DATA_BUF(&(uint8_t){'A'+(i % 26)}, 1)))); // ignore space issues if (err == LFS_ERR_NOSPC) { @@ -1020,7 +1020,7 @@ code = ''' // update btree int err = lfsr_btree_commit(&lfs, &btree, bid, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUBMASK | LFSR_TAG_DATA, 0, + LFSR_TAG_SUB | LFSR_TAG_DATA, 0, LFSR_DATA_BUF(&(uint8_t){'A'+(i % 26)}, 1)))); // ignore space issues if (err == LFS_ERR_NOSPC) { @@ -1107,7 +1107,7 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { int err = lfsr_btree_commit(&lfs, &btree, i*W+W-1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUBMASK | LFSR_TAG_DATA, 0, + LFSR_TAG_SUB | LFSR_TAG_DATA, 0, LFSR_DATA_BUF(&(uint8_t){'A'+(i % 26)}, 1)))); // ignore space issues if (err == LFS_ERR_NOSPC) { @@ -1223,7 +1223,7 @@ code = ''' int err = lfsr_btree_commit(&lfs, &btree, weighted_bid+sim_weights[bid]-1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUBMASK | LFSR_TAG_DATA, 0, + LFSR_TAG_SUB | LFSR_TAG_DATA, 0, LFSR_DATA_BUF(&(uint8_t){'A'+(i % 26)}, 1)), LFSR_ATTR( LFSR_TAG_GROW, +weight-sim_weights[bid], @@ -2646,7 +2646,7 @@ code = ''' memset(buf2, 'b', SIZE); lfsr_btree_commit(&lfs, &btree, 1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUBMASK | LFSR_TAG_DATA, 0, + LFSR_TAG_SUB | LFSR_TAG_DATA, 0, LFSR_DATA_BUF(buf2, SIZE)))) => 0; assert(btree.weight == 2); @@ -2714,7 +2714,7 @@ code = ''' memset(buf2, 'b', SIZE); lfsr_btree_commit(&lfs, &btree, 1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUBMASK | LFSR_TAG_DATA, 0, + LFSR_TAG_SUB | LFSR_TAG_DATA, 0, LFSR_DATA_BUF(buf2, SIZE)))) => 0; assert(btree.weight == 2); @@ -2849,18 +2849,18 @@ code = ''' memset(buf2, 'b', SIZE); lfsr_btree_commit(&lfs, &btree, 1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUBMASK | LFSR_TAG_DATA, 0, + LFSR_TAG_SUB | LFSR_TAG_DATA, 0, LFSR_DATA_BUF(buf2, SIZE)))) => 0; assert(btree.weight == 2); // now make both entries small so they should be merged if either compacts lfsr_btree_commit(&lfs, &btree, 0, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUBMASK | LFSR_TAG_DATA, 0, + LFSR_TAG_SUB | LFSR_TAG_DATA, 0, LFSR_DATA_BUF("a", 1)))) => 0; lfsr_btree_commit(&lfs, &btree, 1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUBMASK | LFSR_TAG_DATA, 0, + LFSR_TAG_SUB | LFSR_TAG_DATA, 0, LFSR_DATA_BUF("b", 1)))) => 0; // force compaction, while removing one entry, this drops the rbyd @@ -2948,7 +2948,7 @@ code = ''' // update btree int err = lfsr_btree_commit(&lfs, &btree, bid, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUBMASK | LFSR_TAG_DATA, 0, + LFSR_TAG_SUB | LFSR_TAG_DATA, 0, LFSR_DATA_BUF(&(uint8_t){'a'+(i % 26)}, 1)))); // ignore space issues if (err == LFS_ERR_NOSPC) { @@ -3083,7 +3083,7 @@ code = ''' int err = lfsr_btree_commit(&lfs, &btree, weighted_bid+sim_weights[bid]-1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUBMASK | LFSR_TAG_DATA, 0, + LFSR_TAG_SUB | LFSR_TAG_DATA, 0, LFSR_DATA_BUF(&(uint8_t){'a'+(i % 26)}, 1)), LFSR_ATTR( LFSR_TAG_GROW, +weight-sim_weights[bid], @@ -4082,7 +4082,7 @@ code = ''' // update btree int err = lfsr_btree_commit(&lfs, &btree, bid, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUBMASK | LFSR_TAG_DATA, 0, + LFSR_TAG_SUB | LFSR_TAG_DATA, 0, LFSR_DATA_BUF(&(uint8_t){'0'+(i % 10)}, 1)))); // ignore space issues if (err == LFS_ERR_NOSPC) { @@ -4276,7 +4276,7 @@ code = ''' int err = lfsr_btree_commit(&lfs, &btree, weighted_bid+sim_weights[bid]-1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUBMASK | LFSR_TAG_DATA, 0, + LFSR_TAG_SUB | LFSR_TAG_DATA, 0, LFSR_DATA_BUF(&(uint8_t){'0'+(i % 10)}, 1)), LFSR_ATTR( LFSR_TAG_GROW, +weight-sim_weights[bid], diff --git a/tests/test_rbyd.toml b/tests/test_rbyd.toml index 14b8de68..0c513649 100644 --- a/tests/test_rbyd.toml +++ b/tests/test_rbyd.toml @@ -12286,7 +12286,7 @@ code = ''' // remove with a wide tag lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_SUBMASK | LFSR_TAG_UATTR, 0, + LFSR_TAG_RM | LFSR_TAG_SUB | LFSR_TAG_UATTR, 0, LFSR_DATA_NULL()))) => 0; // try traversing over the tags @@ -12429,7 +12429,7 @@ code = ''' // replace with bitwise inverse lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUBMASK | LFSR_TAG_UATTR(~(j + SHIFT) & 0x7f), + LFSR_TAG_SUB | LFSR_TAG_UATTR(~(j + SHIFT) & 0x7f), 0, LFSR_DATA_BUF(names[j % 6], 3)))) => 0; @@ -12670,7 +12670,7 @@ code = ''' // remove with a wide tag lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_SUBMASK | LFSR_TAG_UATTR, 0, + LFSR_TAG_RM | LFSR_TAG_SUB | LFSR_TAG_UATTR, 0, LFSR_DATA_NULL()))) => 0; // try traversing over the tags @@ -12823,7 +12823,7 @@ code = ''' // replace with bitwise inverse lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUBMASK | LFSR_TAG_UATTR(~(j + SHIFT) & 0x7f), + LFSR_TAG_SUB | LFSR_TAG_UATTR(~(j + SHIFT) & 0x7f), 0, LFSR_DATA_BUF(names[j % 6], 3)))) => 0; @@ -13059,7 +13059,7 @@ code = ''' // remove with a wide tag lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_SUBMASK | LFSR_TAG_UATTR, 0, + LFSR_TAG_RM | LFSR_TAG_SUB | LFSR_TAG_UATTR, 0, LFSR_DATA_NULL()))) => 0; // try traversing over the tags @@ -13202,7 +13202,7 @@ code = ''' // replace with bitwise inverse lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUBMASK | LFSR_TAG_UATTR(~(j + SHIFT) & 0x7f), + LFSR_TAG_SUB | LFSR_TAG_UATTR(~(j + SHIFT) & 0x7f), 0, LFSR_DATA_BUF(names[j % 6], 6)))) => 0; @@ -13431,7 +13431,7 @@ code = ''' // remove with a wide tag lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_SUPMASK | LFSR_TAG_UATTR, 0, + LFSR_TAG_RM | LFSR_TAG_SUP | LFSR_TAG_UATTR, 0, LFSR_DATA_NULL()))) => 0; // try traversing over the tags @@ -13574,7 +13574,7 @@ code = ''' // replace with bitwise inverse lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUPMASK | LFSR_TAG_UATTR(~(j + SHIFT) & 0x7f), + LFSR_TAG_SUP | LFSR_TAG_UATTR(~(j + SHIFT) & 0x7f), 0, LFSR_DATA_BUF(names[j % 6], 3)))) => 0; @@ -13835,7 +13835,7 @@ code = ''' // subwide replace a neighbor to the hole lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUBMASK | LFSR_TAG_UATTR(2), 0, + LFSR_TAG_SUB | LFSR_TAG_UATTR(2), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; assert(rbyd.weight == 0); @@ -13903,7 +13903,7 @@ code = ''' // supwide replace a neighbor to the hole lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUPMASK | LFSR_TAG_UATTR(2), 0, + LFSR_TAG_SUP | LFSR_TAG_UATTR(2), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; assert(rbyd.weight == 1);