Github/littlefs
1
Fork 0
Code Actions Activity

Replaced rattr.u.etc with rattr relevant types

Browse Source 
This does a couple things:

- Makes attr-lists a bit more self-documenting.

- Adds a bit more type-safety. The LFSR_RATTR_* macros should be able to
  reject types that don't match the expected encoding.

- Makes it easier to adjust dsize estimates at one location.

  Specifically, this makes it harder to forget bptr's LFSR_BPTR_DSIZE.

---

Surprisingly this did have a small impact on code size. I'm not entirely
sure why, but considering how much of the codebase this touches I'm just
going to chalk this up to compiler noise:

           code          stack          ctx
  before: 35488           2440          636
  after:  35536 (+0.1%)   2440 (+0.0%)  636 (+0.0%)

lfsr_file_carve seems the hardest hit:

  function (0 added, 0 removed)      osize    nsize    dsize
  lfsr_file_open                        16       20       +4 (+25.0%)
  lfsr_file_carve                     1316     1356      +40 (+3.0%)
  lfsr_remove                          408      412       +4 (+1.0%)
  TOTAL                              35488    35536      +48 (+0.1%)
This commit is contained in:
Christopher Haster
2025-02-12 13:49:38 -06:00
parent d806e7e323
commit 91341a4c48
6 changed files with 317 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_btree.toml
+22 -30
View File
@@ -1145,8 +1145,7 @@ code = '''
LFSR_TAG_SUB | LFSR_TAG_DATA, 0,
&(uint8_t){'A'+(i % 26)}, 1),
LFSR_RATTR(
LFSR_TAG_GROW, +weight-sim_weights[bid],
NULL, 0))) => 0;
LFSR_TAG_GROW, +weight-sim_weights[bid]))) => 0;
// update sim
sim[bid] = 'A'+(i % 26);
@@ -1255,7 +1254,7 @@ code = '''
LFSR_RATTR_BUF(LFSR_TAG_DATA, +1, "a", 1))) => 0;
// pop!
lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
printf("btree: w%d 0x%x.%x\n",
btree.weight,
btree.blocks[0],
@@ -1314,7 +1313,7 @@ code = '''
LFSR_RATTR_BUF(LFSR_TAG_DATA, +1, "b", 1))) => 0;
// pop!
lfsr_btree_commit(&lfs, &btree, 1, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
printf("btree: w%d 0x%x.%x\n",
btree.weight,
btree.blocks[0],
@@ -1387,7 +1386,7 @@ code = '''
LFSR_RATTR_BUF(LFSR_TAG_DATA, +1, "b", 1))) => 0;
// pop!
lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
printf("btree: w%d 0x%x.%x\n",
btree.weight,
btree.blocks[0],
@@ -1462,7 +1461,7 @@ code = '''
LFSR_RATTR_BUF(LFSR_TAG_DATA, +1, "c", 1))) => 0;
// pop!
lfsr_btree_commit(&lfs, &btree, 2, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
printf("btree: w%d 0x%x.%x\n",
btree.weight,
btree.blocks[0],
@@ -1555,7 +1554,7 @@ code = '''
// drain the tree
for (lfs_size_t i = 0; i < N-REMAINING; i++) {
lfsr_btree_commit(&lfs, &btree, N-1-i, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
}
printf("btree: w%d 0x%x.%x\n",
@@ -1635,7 +1634,7 @@ code = '''
// drain the tree
for (lfs_size_t i = 0; i < N-REMAINING; i++) {
lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
}
printf("btree: w%d 0x%x.%x\n",
btree.weight,
@@ -1733,7 +1732,7 @@ code = '''
// remove from btree
lfsr_btree_commit(&lfs, &btree, bid, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
// remove from sim
memmove(&sim[bid], &sim[bid+1], sim_size-(bid+1));
@@ -1807,7 +1806,7 @@ code = '''
// drain the tree
for (lfs_size_t i = 0; i < N-REMAINING; i++) {
lfsr_btree_commit(&lfs, &btree, (N-1-i)*W+W-1, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -W, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -W))) => 0;
}
printf("btree: w%d 0x%x.%x\n",
btree.weight,
@@ -1950,8 +1949,7 @@ code = '''
lfsr_btree_commit(&lfs, &btree,
weighted_bid+sim_weights[bid]-1, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM, -sim_weights[bid],
NULL, 0))) => 0;
LFSR_TAG_RM, -sim_weights[bid]))) => 0;
// remove from sim
memmove(&sim[bid], &sim[bid+1], sim_size-(bid+1));
@@ -2300,8 +2298,7 @@ code = '''
lfsr_btree_commit(&lfs, &btree,
weighted_bid+sim_weights[bid]-1, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_GROW, +weight1-sim_weights[bid],
NULL, 0),
LFSR_TAG_GROW, +weight1-sim_weights[bid]),
LFSR_RATTR_BUF(
LFSR_TAG_DATA, 0,
&(uint8_t){'a'+(i % 26)}, 1),
@@ -2469,7 +2466,7 @@ code = '''
// now remove one entry, since this brings the rbyd down to zero,
// this should force one of the blocks to drop
lfsr_btree_commit(&lfs, &btree, SIBLING, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
printf("btree: w%d 0x%x.%x\n",
btree.weight,
@@ -2540,7 +2537,7 @@ code = '''
// do this while forcing a compaction
btree.eoff = -1;
lfsr_btree_commit(&lfs, &btree, SIBLING, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
printf("btree: w%d 0x%x.%x\n",
btree.weight,
@@ -2604,7 +2601,7 @@ code = '''
//
btree.eoff = -1;
lfsr_btree_commit(&lfs, &btree, SIBLING, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
printf("btree: w%d 0x%x.%x\n",
btree.weight,
@@ -2683,7 +2680,7 @@ code = '''
// down to zero while also triggering a merge
btree.eoff = -1;
lfsr_btree_commit(&lfs, &btree, SIBLING, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
printf("btree: w%d 0x%x.%x\n",
btree.weight,
@@ -2769,7 +2766,7 @@ code = '''
} else {
// pop from btree
lfsr_btree_commit(&lfs, &btree, bid, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
// pop from sim
memmove(&sim[bid], &sim[bid+1], sim_size-(bid+1));
@@ -2884,8 +2881,7 @@ code = '''
LFSR_TAG_SUB | LFSR_TAG_DATA, 0,
&(uint8_t){'a'+(i % 26)}, 1),
LFSR_RATTR(
LFSR_TAG_GROW, +weight-sim_weights[bid],
NULL, 0))) => 0;
LFSR_TAG_GROW, +weight-sim_weights[bid]))) => 0;
// update sim
sim[bid] = 'a'+(i % 26);
@@ -2896,8 +2892,7 @@ code = '''
lfsr_btree_commit(&lfs, &btree,
weighted_bid+sim_weights[bid]-1, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM, -sim_weights[bid],
NULL, 0))) => 0;
LFSR_TAG_RM, -sim_weights[bid]))) => 0;
// remove from sim
memmove(&sim[bid], &sim[bid+1], sim_size-(bid+1));
@@ -3635,8 +3630,7 @@ code = '''
lfsr_btree_commit(&lfs, &btree,
weighted_bid+sim_weights[bid]-1, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_GROW, +weight1-sim_weights[bid],
NULL, 0),
LFSR_TAG_GROW, +weight1-sim_weights[bid]),
LFSR_RATTR_BUF(
LFSR_TAG_DATA, 0,
&(uint8_t){'0'+(i % 10)}, 1),
@@ -3831,7 +3825,7 @@ code = '''
} else {
// pop from btree
lfsr_btree_commit(&lfs, &btree, bid, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
// pop from sim
memmove(&sim[bid], &sim[bid+1], sim_size-(bid+1));
@@ -3998,8 +3992,7 @@ code = '''
LFSR_TAG_SUB | LFSR_TAG_DATA, 0,
&(uint8_t){'0'+(i % 10)}, 1),
LFSR_RATTR(
LFSR_TAG_GROW, +weight-sim_weights[bid],
NULL, 0))) => 0;
LFSR_TAG_GROW, +weight-sim_weights[bid]))) => 0;
// update sim
sim[bid] = '0'+(i % 10);
@@ -4010,8 +4003,7 @@ code = '''
lfsr_btree_commit(&lfs, &btree,
weighted_bid+sim_weights[bid]-1, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM, -sim_weights[bid],
NULL, 0))) => 0;
LFSR_TAG_RM, -sim_weights[bid]))) => 0;
// pop from sim
memmove(&sim[bid], &sim[bid+1], sim_size-(bid+1));
tests/test_files.toml
+11 -14
View File
@@ -979,8 +979,7 @@ code = '''
// delete any bshrub/btree
lfsr_mdir_commit(&lfs, &file.b.o.mdir, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_SUB | LFSR_TAG_STRUCT, 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_SUB | LFSR_TAG_STRUCT, 0))) => 0;
lfsr_file_close(&lfs, &file) => 0;
@@ -1095,27 +1094,25 @@ code = '''
// create an empty bshrub
lfsr_mdir_commit(&lfs, &file.b.o.mdir, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_SHRUBCOMMIT, 0,
LFSR_RATTR_SHRUBCOMMIT(
(&(lfsr_shrubcommit_t){
.bshrub=&file.b,
.rid=0,
.rattrs=((lfsr_rattr_t[]){
LFSR_RATTR_BUF(LFSR_TAG_DATA, +1, "?", 1)}),
.rattr_count=1}), 0))) => 0;
.rattr_count=1})))) => 0;
lfsr_mdir_commit(&lfs, &file.b.o.mdir, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_SHRUBCOMMIT, 0,
LFSR_RATTR_SHRUBCOMMIT(
(&(lfsr_shrubcommit_t){
.bshrub=&file.b,
.rid=0,
.rattrs=((lfsr_rattr_t[]){
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0)}),
.rattr_count=1}), 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1)}),
.rattr_count=1})))) => 0;
lfsr_mdir_commit(&lfs, &file.b.o.mdir, LFSR_RATTRS(
LFSR_RATTR(
LFSR_RATTR_SHRUB(
LFSR_TAG_SUB | LFSR_TAG_BSHRUB, 0,
&file.b.shrub_, LFSR_SHRUB_DSIZE))) => 0;
&file.b.shrub_))) => 0;
lfsr_file_close(&lfs, &file) => 0;
@@ -1234,11 +1231,11 @@ code = '''
lfsr_rbyd_commit(&lfs, &file.b.shrub, 0, LFSR_RATTRS(
LFSR_RATTR_BUF(LFSR_TAG_DATA, +1, "?", 1))) => 0;
lfsr_rbyd_commit(&lfs, &file.b.shrub, 0, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
lfsr_mdir_commit(&lfs, &file.b.o.mdir, LFSR_RATTRS(
LFSR_RATTR(
LFSR_RATTR_BTREE(
LFSR_TAG_SUB | LFSR_TAG_BTREE, 0,
&file.b.shrub, LFSR_BTREE_DSIZE))) => 0;
&file.b.shrub))) => 0;
lfsr_file_close(&lfs, &file) => 0;
tests/test_mount.toml
+5 -6
View File
@@ -546,8 +546,7 @@ code = '''
lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0;
lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_MAGIC, 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_MAGIC, 0))) => 0;
lfsr_unmount(&lfs) => 0;
// mount should now fail
@@ -981,11 +980,11 @@ code = '''
// is not a user API
lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0;
lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS(
LFSR_RATTR(
LFSR_RATTR_GEOMETRY(
LFSR_TAG_GEOMETRY, 0,
(&(lfsr_geometry_t){
INC_BLOCK_SIZE,
BLOCK_COUNT}), LFSR_GEOMETRY_DSIZE))) => 0;
BLOCK_COUNT})))) => 0;
lfsr_unmount(&lfs) => 0;
// mount should now fail
@@ -1008,11 +1007,11 @@ code = '''
// is not a user API
lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0;
lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS(
LFSR_RATTR(
LFSR_RATTR_GEOMETRY(
LFSR_TAG_GEOMETRY, 0,
(&(lfsr_geometry_t){
BLOCK_SIZE,
INC_BLOCK_COUNT}), LFSR_GEOMETRY_DSIZE))) => 0;
INC_BLOCK_COUNT})))) => 0;
lfsr_unmount(&lfs) => 0;
// mount should now fail
tests/test_mtree.toml
+13 -13
View File
@@ -687,7 +687,7 @@ code = '''
lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1,
&mdir, NULL, NULL) => 0;
lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(mdir.rbyd.weight == 0);
// assert mdir was dropped
@@ -779,7 +779,7 @@ code = '''
// force mdir to compact while we're removing
mdir.rbyd.eoff = -1;
lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(mdir.rbyd.weight == 0);
// assert mdir was dropped
@@ -862,7 +862,7 @@ code = '''
lfs.mroot.rbyd.eoff = -1;
mdir.rbyd.eoff = -1;
lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(mdir.rbyd.weight == 2);
// assert split/drop worked out
@@ -956,7 +956,7 @@ code = '''
// force mdir to compact while we're removing
mdir.rbyd.eoff = -1;
lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(mdir.rbyd.weight == 1);
// assert split/drop worked out
@@ -1070,7 +1070,7 @@ code = '''
// force mdir to compact while we're removing
mdir.rbyd.eoff = -1;
lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(mdir.rbyd.weight == 1);
// assert split/drop worked out
@@ -1198,7 +1198,7 @@ code = '''
mdir.rbyd.eoff = -1;
}
lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
}
}
@@ -2276,7 +2276,7 @@ code = '''
// force mdir to compact while we're removing
mdir.rbyd.eoff = -1;
lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(mdir.rbyd.weight == 0);
// assert mroot relocated
assert(lfsr_mdir_cmp(&old_mroot, &lfs.mroot) != 0);
@@ -2609,7 +2609,7 @@ code = '''
mdir.rbyd.eoff = -1;
}
lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
}
}
@@ -2755,7 +2755,7 @@ code = '''
lfsr_mtree_namelookup(&lfs, 0, "a", 1,
&mdir, NULL, NULL) => 0;
lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(mdir.rbyd.weight == 2);
// assert neighbor was removed
@@ -2805,7 +2805,7 @@ code = '''
lfsr_mtree_namelookup(&lfs, 0, "b", 1,
&mdir, NULL, NULL) => 0;
lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(mdir.rbyd.weight == 2);
// assert neighbor was removed
@@ -3427,7 +3427,7 @@ code = '''
// now remove the middle entry, forcing a drop
lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(mdir.rbyd.weight == 0);
// assert mdir was dropped correctly
@@ -4458,9 +4458,9 @@ code = '''
lfs_alloc_ckpoint(&lfs);
lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS(
LFSR_RATTR(
LFSR_RATTR_MPTR(
LFSR_TAG_MROOT, 0,
LFSR_MPTR_MROOTANCHOR(), LFSR_MPTR_DSIZE))) => 0;
LFSR_MPTR_MROOTANCHOR()))) => 0;
// technically, cycle detection only needs to work when we're validating
lfsr_traversal_t t;
tests/test_rbyd.toml
+104 -152
View File
@@ -2985,8 +2985,7 @@ code = '''
"\xaa\xaa\xaa\xaa", 4))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1),
&rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT;
@@ -3011,8 +3010,7 @@ code = '''
"\xbb\xbb\xbb\xbb", 4))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1),
&rid_, &tag_, NULL, &data_) => 0;
@@ -3053,8 +3051,7 @@ code = '''
"\xbb\xbb\xbb\xbb", 4))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR(2), 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_ATTR(2), 0))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1),
&rid_, &tag_, NULL, &data_) => 0;
@@ -3158,8 +3155,7 @@ code = '''
lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR(j+1), 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_ATTR(j+1), 0))) => 0;
lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], CFG->block_size) => 0;
for (unsigned k = 0; k < N; k++) {
@@ -3308,8 +3304,7 @@ code = '''
lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR(j+1), 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_ATTR(j+1), 0))) => 0;
// try traversing over the tags
lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], CFG->block_size) => 0;
@@ -3393,8 +3388,7 @@ code = '''
// try to remove tags that aren't there, this should do nothing
lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1),
&rid_, &tag_, NULL, &data_) => 0;
assert(tag_ == LFSR_TAG_ATTR(2));
@@ -3420,8 +3414,7 @@ code = '''
lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR(3), 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_ATTR(3), 0))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1),
&rid_, &tag_, NULL, &data_) => 0;
assert(tag_ == LFSR_TAG_ATTR(2));
@@ -3447,8 +3440,7 @@ code = '''
lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR(5), 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_ATTR(5), 0))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1),
&rid_, &tag_, NULL, &data_) => 0;
assert(tag_ == LFSR_TAG_ATTR(2));
@@ -3538,14 +3530,11 @@ code = '''
// remove several attributes
lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0,
NULL, 0),
LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0),
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR(3), 0,
NULL, 0),
LFSR_TAG_RM | LFSR_TAG_ATTR(3), 0),
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR(5), 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_ATTR(5), 0))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1),
&rid_, &tag_, NULL, &data_) => 0;
@@ -3573,8 +3562,7 @@ code = '''
// try to remove tags that aren't there, this should do nothing
lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1),
&rid_, &tag_, NULL, &data_) => 0;
assert(tag_ == LFSR_TAG_ATTR(2));
@@ -3600,8 +3588,7 @@ code = '''
lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR(3), 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_ATTR(3), 0))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1),
&rid_, &tag_, NULL, &data_) => 0;
assert(tag_ == LFSR_TAG_ATTR(2));
@@ -3627,8 +3614,7 @@ code = '''
lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR(5), 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_ATTR(5), 0))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1),
&rid_, &tag_, NULL, &data_) => 0;
assert(tag_ == LFSR_TAG_ATTR(2));
@@ -3656,8 +3642,7 @@ code = '''
// these removes still commit to the rbyd)
lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1),
&rid_, &tag_, NULL, &data_) => 0;
assert(tag_ == LFSR_TAG_ATTR(2));
@@ -3683,8 +3668,7 @@ code = '''
lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR(3), 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_ATTR(3), 0))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1),
&rid_, &tag_, NULL, &data_) => 0;
assert(tag_ == LFSR_TAG_ATTR(2));
@@ -3710,8 +3694,7 @@ code = '''
lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR(5), 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_ATTR(5), 0))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1),
&rid_, &tag_, NULL, &data_) => 0;
assert(tag_ == LFSR_TAG_ATTR(2));
@@ -3788,8 +3771,7 @@ code = '''
"\xaa\xaa\xaa\xaa", 4))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1),
&rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT;
@@ -3814,11 +3796,9 @@ code = '''
"\xbb\xbb\xbb\xbb", 4))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0,
NULL, 0),
LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0),
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR(2), 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_ATTR(2), 0))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1),
&rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT;
@@ -3843,11 +3823,9 @@ code = '''
"\xbb\xbb\xbb\xbb", 4))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR(2), 0,
NULL, 0),
LFSR_TAG_RM | LFSR_TAG_ATTR(2), 0),
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1),
&rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT;
@@ -3940,8 +3918,7 @@ code = '''
for (unsigned j = 0; j < N; j++) {
lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR(perm[j]+1), 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_ATTR(perm[j]+1), 0))) => 0;
}
// check that all tags are now removed
@@ -4061,8 +4038,7 @@ code = '''
// update our rbyd
lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR(rattr), 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_ATTR(rattr), 0))) => 0;
}
}
@@ -6239,8 +6215,7 @@ code = '''
lfsr_rbyd_commit(&lfs, &rbyd, j/M, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR((j%M)+1), 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_ATTR((j%M)+1), 0))) => 0;
lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], CFG->block_size) => 0;
for (unsigned k = 0; k < N; k++) {
@@ -6436,8 +6411,7 @@ code = '''
for (unsigned j = 0; j < N*M; j++) {
lfsr_rbyd_commit(&lfs, &rbyd, perm[j]/M, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR(perm[j]%M+1), 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_ATTR(perm[j]%M+1), 0))) => 0;
}
// check that all tags have been removed
@@ -6917,7 +6891,7 @@ code = '''
LFSR_TAG_DATA, +1,
"\xbb\xbb\xbb\xbb", 4))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == 1);
lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0;
@@ -6945,7 +6919,7 @@ code = '''
LFSR_TAG_DATA, +1,
"\xbb\xbb\xbb\xbb", 4))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == 1);
lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0;
@@ -6976,7 +6950,7 @@ code = '''
LFSR_TAG_DATA, +1,
"\xcc\xcc\xcc\xcc", 4))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == 2);
lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0;
@@ -7011,7 +6985,7 @@ code = '''
LFSR_TAG_DATA, +1,
"\xcc\xcc\xcc\xcc", 4))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == 2);
lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0;
@@ -7046,7 +7020,7 @@ code = '''
LFSR_TAG_DATA, +1,
"\xcc\xcc\xcc\xcc", 4))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == 2);
lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0;
@@ -7102,7 +7076,7 @@ code = '''
LFSR_TAG_ATTR(1), 0,
"\xbb\xbb", 2))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == 1);
lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0;
@@ -7146,7 +7120,7 @@ code = '''
LFSR_TAG_ATTR(1), 0,
"\xbb\xbb", 2))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == 1);
lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0;
@@ -7196,7 +7170,7 @@ code = '''
LFSR_TAG_ATTR(1), 0,
"\xcc\xcc", 2))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == 2);
lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0;
@@ -7258,7 +7232,7 @@ code = '''
LFSR_TAG_ATTR(1), 0,
"\xcc\xcc", 2))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == 2);
lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0;
@@ -7320,7 +7294,7 @@ code = '''
LFSR_TAG_ATTR(1), 0,
"\xcc\xcc", 2))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == 2);
lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0;
@@ -7451,7 +7425,7 @@ code = '''
"\xee\xee", 2))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == 2);
lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0;
@@ -7743,7 +7717,7 @@ code = '''
"\xee\xee\xee\xee", 4))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == 2);
lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0;
@@ -8039,7 +8013,7 @@ code = '''
"\xee\xee", 2))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == 2);
lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0;
@@ -8398,7 +8372,7 @@ code = '''
"\xee\xee\xee\xee", 4))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == 2);
lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0;
@@ -8745,7 +8719,7 @@ code = '''
"\xaa\xaa", 2))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == 2);
lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0;
@@ -9093,7 +9067,7 @@ code = '''
"\xcc\xcc", 2))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == 2);
lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0;
@@ -9417,7 +9391,7 @@ code = '''
"\xcc\xcc\xcc\xcc", 4))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == 2);
lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0;
@@ -9784,7 +9758,7 @@ code = '''
"\xaa\xaa", 2))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == 2);
lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0;
@@ -10233,7 +10207,7 @@ code = '''
"\xee\xee", 2))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == 2);
lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0;
@@ -10634,7 +10608,7 @@ code = '''
NULL, false) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == N-1);
lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], CFG->block_size) => 0;
@@ -10803,7 +10777,7 @@ code = '''
NULL, false) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == N-1);
lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], CFG->block_size) => 0;
@@ -10996,7 +10970,7 @@ code = '''
NULL, false) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == N-1);
// try traversing over the tags
@@ -11133,7 +11107,7 @@ code = '''
NULL, false) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == N-1);
// try traversing over the tags
@@ -11209,7 +11183,7 @@ code = '''
LFSR_TAG_DATA, +1,
"\xaa\xaa\xaa\xaa", 4))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == 0);
lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA,
@@ -11231,8 +11205,8 @@ code = '''
LFSR_TAG_DATA, +1,
"\xbb\xbb\xbb\xbb", 4))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0),
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1),
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == 0);
lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA,
@@ -11254,9 +11228,9 @@ code = '''
LFSR_TAG_DATA, +1,
"\xbb\xbb\xbb\xbb", 4))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == 0);
lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA,
@@ -11281,9 +11255,9 @@ code = '''
LFSR_TAG_DATA, +1,
"\xcc\xcc\xcc\xcc", 4))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0),
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0),
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1),
LFSR_RATTR(LFSR_TAG_RM, -1),
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == 0);
lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA,
@@ -11308,11 +11282,11 @@ code = '''
LFSR_TAG_DATA, +1,
"\xcc\xcc\xcc\xcc", 4))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == 0);
lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA,
@@ -11352,7 +11326,7 @@ code = '''
LFSR_TAG_ATTR(1), 0,
"\xaa\xaa", 2))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == 0);
lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA,
@@ -11380,8 +11354,8 @@ code = '''
LFSR_TAG_ATTR(1), 0,
"\xbb\xbb", 2))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0),
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1),
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == 0);
lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA,
@@ -11409,9 +11383,9 @@ code = '''
LFSR_TAG_ATTR(1), 0,
"\xbb\xbb", 2))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == 0);
lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA,
@@ -11445,9 +11419,9 @@ code = '''
LFSR_TAG_ATTR(1), 0,
"\xcc\xcc", 2))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0),
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0),
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1),
LFSR_RATTR(LFSR_TAG_RM, -1),
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == 0);
lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA,
@@ -11481,11 +11455,11 @@ code = '''
LFSR_TAG_ATTR(1), 0,
"\xcc\xcc", 2))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == 0);
lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA,
@@ -11592,7 +11566,7 @@ code = '''
lfs_size_t rbyd_weight_before = rbyd.weight;
lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == rbyd_weight_before-1);
}
@@ -11748,7 +11722,7 @@ code = '''
lfs_size_t rbyd_weight_before = rbyd.weight;
lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == rbyd_weight_before-1);
}
@@ -11891,7 +11865,7 @@ code = '''
count -= 1;
// update our rbyd
lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
}
}
@@ -12574,8 +12548,7 @@ code = '''
LFSR_TAG_ATTR(1), 0,
"\xbb\xbb", 2),
LFSR_RATTR(
LFSR_TAG_GROW, +1,
NULL, 0),
LFSR_TAG_GROW, +1),
LFSR_RATTR_BUF(
LFSR_TAG_ATTR(2), 0,
"\xbb\xbb", 2))) => 0;
@@ -12676,8 +12649,7 @@ code = '''
LFSR_TAG_ATTR(1), 0,
"\xcc\xcc", 2),
LFSR_RATTR(
LFSR_TAG_GROW, +2,
NULL, 0),
LFSR_TAG_GROW, +2),
LFSR_RATTR_BUF(
LFSR_TAG_ATTR(2), 0,
"\xcc\xcc", 2))) => 0;
@@ -12814,8 +12786,7 @@ code = '''
LFSR_TAG_ATTR(1), 0,
"\xdd\xdd", 2),
LFSR_RATTR(
LFSR_TAG_GROW, +3,
NULL, 0),
LFSR_TAG_GROW, +3),
LFSR_RATTR_BUF(
LFSR_TAG_ATTR(2), 0,
"\xdd\xdd", 2))) => 0;
@@ -12988,8 +12959,7 @@ code = '''
LFSR_TAG_ATTR(1), 0,
"\xee\xee", 2),
LFSR_RATTR(
LFSR_TAG_GROW, +4,
NULL, 0),
LFSR_TAG_GROW, +4),
LFSR_RATTR_BUF(
LFSR_TAG_ATTR(2), 0,
"\xee\xee", 2))) => 0;
@@ -13233,8 +13203,7 @@ code = '''
LFSR_TAG_ATTR(1), 0,
"\xbb\xbb", 2),
LFSR_RATTR(
LFSR_TAG_GROW, +1,
NULL, 0),
LFSR_TAG_GROW, +1),
LFSR_RATTR_BUF(
LFSR_TAG_ATTR(2), 0,
"\xbb\xbb", 2),
@@ -13246,8 +13215,7 @@ code = '''
LFSR_TAG_ATTR(1), 0,
"\xcc\xcc", 2),
LFSR_RATTR(
LFSR_TAG_GROW, +2,
NULL, 0),
LFSR_TAG_GROW, +2),
LFSR_RATTR_BUF(
LFSR_TAG_ATTR(2), 0,
"\xcc\xcc", 2),
@@ -13259,8 +13227,7 @@ code = '''
LFSR_TAG_ATTR(1), 0,
"\xdd\xdd", 2),
LFSR_RATTR(
LFSR_TAG_GROW, +3,
NULL, 0),
LFSR_TAG_GROW, +3),
LFSR_RATTR_BUF(
LFSR_TAG_ATTR(2), 0,
"\xdd\xdd", 2),
@@ -13272,8 +13239,7 @@ code = '''
LFSR_TAG_ATTR(1), 0,
"\xee\xee", 2),
LFSR_RATTR(
LFSR_TAG_GROW, +4,
NULL, 0),
LFSR_TAG_GROW, +4),
LFSR_RATTR_BUF(
LFSR_TAG_ATTR(2), 0,
"\xee\xee", 2))) => 0;
@@ -13559,8 +13525,7 @@ code = '''
LFSR_TAG_ATTR(1), 0,
names[perm[j] % 6], 2),
LFSR_RATTR(
LFSR_TAG_GROW, +W-1,
NULL, 0),
LFSR_TAG_GROW, +W-1),
LFSR_RATTR_BUF(
LFSR_TAG_ATTR(2), 0,
names[perm[j] % 6], 2))) => 0;
@@ -13681,8 +13646,7 @@ code = '''
LFSR_TAG_ATTR(1), 0,
names[perm[j] % 6], 2),
LFSR_RATTR(
LFSR_TAG_GROW, +W-1,
NULL, 0),
LFSR_TAG_GROW, +W-1),
LFSR_RATTR_BUF(
LFSR_TAG_ATTR(2), 0,
names[perm[j] % 6], 2))) => 0;
@@ -13827,7 +13791,7 @@ code = '''
NULL, false) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, j*W+W-1, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_GROW, +D, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_GROW, +D))) => 0;
assert(rbyd.weight == N*W+D);
lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], CFG->block_size) => 0;
@@ -14260,7 +14224,7 @@ code = '''
NULL, false) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, j*W+W-1, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_GROW, -D, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_GROW, -D))) => 0;
assert(rbyd.weight == N*W-D);
lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], CFG->block_size) => 0;
@@ -14692,7 +14656,7 @@ code = '''
NULL, false) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, j*W+W-1, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -W, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -W))) => 0;
assert(rbyd.weight == (N-1)*W);
lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], CFG->block_size) => 0;
@@ -14891,8 +14855,7 @@ code = '''
printf("--- removing: %d ---\n", j);
lfsr_rbyd_commit(&lfs, &rbyd, j*W+W-1, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0))) => 0;
assert(rbyd.weight == N*W);
lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], CFG->block_size) => 0;
@@ -15041,7 +15004,7 @@ code = '''
count -= 1;
// update our rbyd
lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
} else if (op == 2) {
// update our sim
sim[rid*(M+1) + u+1] = 'a'+(i % 26);
@@ -15057,8 +15020,7 @@ code = '''
// update our rbyd
lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR(u), 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_ATTR(u), 0))) => 0;
}
}
@@ -15220,7 +15182,7 @@ code = '''
count -= 1;
// update our rbyd
lfsr_rbyd_commit(&lfs, &rbyd, weighted_rid+weight_-1, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -weight_, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -weight_))) => 0;
} else if (op == 2) {
// get the correct weight from the sim
weight_ = sim_weights[rid];
@@ -15228,7 +15190,7 @@ code = '''
sim_weights[rid] += weight;
// update our rbyd
lfsr_rbyd_commit(&lfs, &rbyd, weighted_rid+weight_-1, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_GROW, +weight, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_GROW, +weight))) => 0;
} else if (op == 3) {
// get the correct weight from the sim
weight_ = sim_weights[rid];
@@ -15239,7 +15201,7 @@ code = '''
sim_weights[rid] -= weight;
// update our rbyd
lfsr_rbyd_commit(&lfs, &rbyd, weighted_rid+weight_-1, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_GROW, -weight, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_GROW, -weight))) => 0;
}
}
@@ -15492,8 +15454,7 @@ code = '''
// remove with a wide tag
lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_SUB | LFSR_TAG_ATTR, 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_SUB | LFSR_TAG_ATTR, 0))) => 0;
// try traversing over the tags
lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], CFG->block_size) => 0;
@@ -15878,8 +15839,7 @@ code = '''
// remove with a wide tag
lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_SUB | LFSR_TAG_ATTR, 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_SUB | LFSR_TAG_ATTR, 0))) => 0;
// try traversing over the tags
lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], CFG->block_size) => 0;
@@ -16269,8 +16229,7 @@ code = '''
// remove with a wide tag
lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_SUB | LFSR_TAG_ATTR, 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_SUB | LFSR_TAG_ATTR, 0))) => 0;
// try traversing over the tags
lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], CFG->block_size) => 0;
@@ -16643,8 +16602,7 @@ code = '''
// remove with a wide tag
lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_SUP | LFSR_TAG_ATTR, 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_SUP | LFSR_TAG_ATTR, 0))) => 0;
// try traversing over the tags
lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], CFG->block_size) => 0;
@@ -16876,8 +16834,7 @@ code = '''
LFSR_TAG_ATTR(1), 0,
"\xbb\xbb\xbb\xbb", 4),
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR(0), 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_ATTR(0), 0))) => 0;
assert(rbyd.weight == 0);
// can we still access things?
@@ -16928,15 +16885,13 @@ code = '''
LFSR_TAG_ATTR(2), 0,
"\xcc\xcc\xcc\xcc", 4),
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR(0), 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_ATTR(0), 0))) => 0;
assert(rbyd.weight == 0);
// remove a neighbor to the hole
lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0))) => 0;
assert(rbyd.weight == 0);
// can we still access things?
@@ -16988,13 +16943,12 @@ code = '''
"\xcc\xcc\xcc\xcc", 4))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR(0), 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_ATTR(0), 0))) => 0;
assert(rbyd.weight == 2);
// delete a neighbor to the hole
lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS(
LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0;
LFSR_RATTR(LFSR_TAG_RM, -1))) => 0;
assert(rbyd.weight == 1);
// can we still access things?
@@ -17045,8 +16999,7 @@ code = '''
LFSR_TAG_ATTR(0x80), 0,
"\xdd\xdd\xdd\xdd", 4),
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR(0), 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_ATTR(0), 0))) => 0;
assert(rbyd.weight == 0);
// subwide replace a neighbor to the hole
@@ -17114,8 +17067,7 @@ code = '''
"\xdd\xdd\xdd\xdd", 4))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS(
LFSR_RATTR(
LFSR_TAG_RM | LFSR_TAG_ATTR(0), 0,
NULL, 0))) => 0;
LFSR_TAG_RM | LFSR_TAG_ATTR(0), 0))) => 0;
assert(rbyd.weight == 1);
// supwide replace a neighbor to the hole