Github/littlefs
1
Fork 0
Code Actions Activity

Some cleanup items

Browse Source 
- Adopted *_IS* naming convention for sign-bit macros.
- Made all struct initializing macros function-like, including the
  *_NULL() macros.
- Renamed ggrm/dgrm -> grm_g/grm_d.
- Renamed lfsr_mroot_commit_ -> lfsr_mroot_commit.
- Renamed LFSR_FILE_BSPROUT -> LFSR_FILE_ISDIRECT.
- Renamed LFSR_BSPROUT_NULL -> LFSR_FILE_BNULL().
- Dropped *_unerase functions for explicitly setting eoff=-1.
This commit is contained in:
Christopher Haster
2023-11-25 22:03:39 -06:00
parent f4af2b407e
commit a89b3e42ba
6 changed files with 318 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_rbyd.toml
+87 -87
View File
@@ -2631,7 +2631,7 @@ code = '''
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(-1, UATTR(1), 0, BUF("\xaa\xaa\xaa\xaa", 4)))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(-1, RM(UATTR(1)), 0, NULL))) => 0;
LFSR_ATTR(-1, RM(UATTR(1)), 0, NULL()))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1),
&rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT;
@@ -2651,7 +2651,7 @@ code = '''
LFSR_ATTR(-1, UATTR(1), 0, BUF("\xaa\xaa\xaa\xaa", 4)),
LFSR_ATTR(-1, UATTR(2), 0, BUF("\xbb\xbb\xbb\xbb", 4)))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(-1, RM(UATTR(1)), 0, NULL))) => 0;
LFSR_ATTR(-1, RM(UATTR(1)), 0, NULL()))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1),
&rid_, &tag_, NULL, &data_) => 0;
@@ -2687,7 +2687,7 @@ code = '''
LFSR_ATTR(-1, UATTR(1), 0, BUF("\xaa\xaa\xaa\xaa", 4)),
LFSR_ATTR(-1, UATTR(2), 0, BUF("\xbb\xbb\xbb\xbb", 4)))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(-1, RM(UATTR(2)), 0, NULL))) => 0;
LFSR_ATTR(-1, RM(UATTR(2)), 0, NULL()))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1),
&rid_, &tag_, NULL, &data_) => 0;
@@ -2787,7 +2787,7 @@ code = '''
lfs_bd_flush(&lfs, &lfs.pcache, &lfs.rcache, false) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(-1, RM(UATTR(j+1)), 0, NULL)))
LFSR_ATTR(-1, RM(UATTR(j+1)), 0, NULL())))
=> 0;
lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, CFG->block_size) => 0;
@@ -2932,7 +2932,7 @@ code = '''
lfs_bd_flush(&lfs, &lfs.pcache, &lfs.rcache, false) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(-1, RM(UATTR(j+1)), 0, NULL))) => 0;
LFSR_ATTR(-1, RM(UATTR(j+1)), 0, NULL()))) => 0;
// try traversing over the tags
lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, CFG->block_size) => 0;
@@ -3011,7 +3011,7 @@ code = '''
// try to remove tags that aren't there, this should do nothing
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(-1, RM(UATTR(1)), 0, NULL))) => 0;
LFSR_ATTR(-1, RM(UATTR(1)), 0, NULL()))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1),
&rid_, &tag_, NULL, &data_) => 0;
assert(tag_ == LFSR_TAG_UATTR(2));
@@ -3036,7 +3036,7 @@ code = '''
&rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(-1, RM(UATTR(3)), 0, NULL))) => 0;
LFSR_ATTR(-1, RM(UATTR(3)), 0, NULL()))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1),
&rid_, &tag_, NULL, &data_) => 0;
assert(tag_ == LFSR_TAG_UATTR(2));
@@ -3061,7 +3061,7 @@ code = '''
&rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(-1, RM(UATTR(5)), 0, NULL))) => 0;
LFSR_ATTR(-1, RM(UATTR(5)), 0, NULL()))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1),
&rid_, &tag_, NULL, &data_) => 0;
assert(tag_ == LFSR_TAG_UATTR(2));
@@ -3140,9 +3140,9 @@ code = '''
LFSR_ATTR(-1, UATTR(5), 0, BUF("\xee\xee\xee\xee", 4)))) => 0;
// remove several attributes
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(-1, RM(UATTR(1)), 0, NULL),
LFSR_ATTR(-1, RM(UATTR(3)), 0, NULL),
LFSR_ATTR(-1, RM(UATTR(5)), 0, NULL))) => 0;
LFSR_ATTR(-1, RM(UATTR(1)), 0, NULL()),
LFSR_ATTR(-1, RM(UATTR(3)), 0, NULL()),
LFSR_ATTR(-1, RM(UATTR(5)), 0, NULL()))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1),
&rid_, &tag_, NULL, &data_) => 0;
@@ -3169,7 +3169,7 @@ code = '''
// try to remove tags that aren't there, this should do nothing
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(-1, RM(UATTR(1)), 0, NULL))) => 0;
LFSR_ATTR(-1, RM(UATTR(1)), 0, NULL()))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1),
&rid_, &tag_, NULL, &data_) => 0;
assert(tag_ == LFSR_TAG_UATTR(2));
@@ -3194,7 +3194,7 @@ code = '''
&rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(-1, RM(UATTR(3)), 0, NULL))) => 0;
LFSR_ATTR(-1, RM(UATTR(3)), 0, NULL()))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1),
&rid_, &tag_, NULL, &data_) => 0;
assert(tag_ == LFSR_TAG_UATTR(2));
@@ -3219,7 +3219,7 @@ code = '''
&rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(-1, RM(UATTR(5)), 0, NULL))) => 0;
LFSR_ATTR(-1, RM(UATTR(5)), 0, NULL()))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1),
&rid_, &tag_, NULL, &data_) => 0;
assert(tag_ == LFSR_TAG_UATTR(2));
@@ -3246,7 +3246,7 @@ code = '''
// try to remove the tags again, just to make sure (keep in mind
// these removes still commit to the rbyd)
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(-1, RM(UATTR(1)), 0, NULL))) => 0;
LFSR_ATTR(-1, RM(UATTR(1)), 0, NULL()))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1),
&rid_, &tag_, NULL, &data_) => 0;
assert(tag_ == LFSR_TAG_UATTR(2));
@@ -3271,7 +3271,7 @@ code = '''
&rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(-1, RM(UATTR(3)), 0, NULL))) => 0;
LFSR_ATTR(-1, RM(UATTR(3)), 0, NULL()))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1),
&rid_, &tag_, NULL, &data_) => 0;
assert(tag_ == LFSR_TAG_UATTR(2));
@@ -3296,7 +3296,7 @@ code = '''
&rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(-1, RM(UATTR(5)), 0, NULL))) => 0;
LFSR_ATTR(-1, RM(UATTR(5)), 0, NULL()))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1),
&rid_, &tag_, NULL, &data_) => 0;
assert(tag_ == LFSR_TAG_UATTR(2));
@@ -3370,7 +3370,7 @@ code = '''
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(-1, UATTR(1), 0, BUF("\xaa\xaa\xaa\xaa", 4)))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(-1, RM(UATTR(1)), 0, NULL))) => 0;
LFSR_ATTR(-1, RM(UATTR(1)), 0, NULL()))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1),
&rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT;
@@ -3390,8 +3390,8 @@ code = '''
LFSR_ATTR(-1, UATTR(1), 0, BUF("\xaa\xaa\xaa\xaa", 4)),
LFSR_ATTR(-1, UATTR(2), 0, BUF("\xbb\xbb\xbb\xbb", 4)))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(-1, RM(UATTR(1)), 0, NULL),
LFSR_ATTR(-1, RM(UATTR(2)), 0, NULL))) => 0;
LFSR_ATTR(-1, RM(UATTR(1)), 0, NULL()),
LFSR_ATTR(-1, RM(UATTR(2)), 0, NULL()))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1),
&rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT;
@@ -3411,8 +3411,8 @@ code = '''
LFSR_ATTR(-1, UATTR(1), 0, BUF("\xaa\xaa\xaa\xaa", 4)),
LFSR_ATTR(-1, UATTR(2), 0, BUF("\xbb\xbb\xbb\xbb", 4)))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(-1, RM(UATTR(2)), 0, NULL),
LFSR_ATTR(-1, RM(UATTR(1)), 0, NULL))) => 0;
LFSR_ATTR(-1, RM(UATTR(2)), 0, NULL()),
LFSR_ATTR(-1, RM(UATTR(1)), 0, NULL()))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1),
&rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT;
@@ -3500,7 +3500,7 @@ code = '''
// remove each tag in permutation order
for (unsigned j = 0; j < N; j++) {
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(-1, RM(UATTR(perm[j]+1)), 0, NULL))) => 0;
LFSR_ATTR(-1, RM(UATTR(perm[j]+1)), 0, NULL()))) => 0;
}
// check that all tags are now removed
@@ -3616,7 +3616,7 @@ code = '''
sim[attr] = '\0';
// update our rbyd
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(-1, RM(UATTR(attr)), 0, NULL))) => 0;
LFSR_ATTR(-1, RM(UATTR(attr)), 0, NULL()))) => 0;
}
}
@@ -6125,7 +6125,7 @@ code = '''
lfs_bd_flush(&lfs, &lfs.pcache, &lfs.rcache, false) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(j/M, RM(UATTR((j%M)+1)), 0, NULL))) => 0;
LFSR_ATTR(j/M, RM(UATTR((j%M)+1)), 0, NULL()))) => 0;
lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, CFG->block_size) => 0;
for (unsigned k = 0; k < N; k++) {
@@ -6308,7 +6308,7 @@ code = '''
for (unsigned j = 0; j < N*M; j++) {
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(perm[j]/M, RM(UATTR(perm[j]%M+1)),
0, NULL))) => 0;
0, NULL()))) => 0;
}
// check that all tags have been removed
@@ -6761,7 +6761,7 @@ code = '''
LFSR_ATTR(0, REG, +1, BUF("\xaa\xaa\xaa\xaa", 4)),
LFSR_ATTR(1, REG, +1, BUF("\xbb\xbb\xbb\xbb", 4)))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(1, RM, -1, NULL))) => 0;
LFSR_ATTR(1, RM, -1, NULL()))) => 0;
assert(rbyd.weight == 1);
lfsr_rbyd_get(&lfs, &rbyd, 0, LFSR_TAG_REG, buffer, 4) => 4;
@@ -6781,7 +6781,7 @@ code = '''
LFSR_ATTR(0, REG, +1, BUF("\xaa\xaa\xaa\xaa", 4)),
LFSR_ATTR(1, REG, +1, BUF("\xbb\xbb\xbb\xbb", 4)))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(0, RM, -1, NULL))) => 0;
LFSR_ATTR(0, RM, -1, NULL()))) => 0;
assert(rbyd.weight == 1);
lfsr_rbyd_get(&lfs, &rbyd, 0, LFSR_TAG_REG, buffer, 4) => 4;
@@ -6802,7 +6802,7 @@ code = '''
LFSR_ATTR(1, REG, +1, BUF("\xbb\xbb\xbb\xbb", 4)),
LFSR_ATTR(2, REG, +1, BUF("\xcc\xcc\xcc\xcc", 4)))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(2, RM, -1, NULL))) => 0;
LFSR_ATTR(2, RM, -1, NULL()))) => 0;
assert(rbyd.weight == 2);
lfsr_rbyd_get(&lfs, &rbyd, 0, LFSR_TAG_REG, buffer, 4) => 4;
@@ -6825,7 +6825,7 @@ code = '''
LFSR_ATTR(1, REG, +1, BUF("\xbb\xbb\xbb\xbb", 4)),
LFSR_ATTR(2, REG, +1, BUF("\xcc\xcc\xcc\xcc", 4)))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(0, RM, -1, NULL))) => 0;
LFSR_ATTR(0, RM, -1, NULL()))) => 0;
assert(rbyd.weight == 2);
lfsr_rbyd_get(&lfs, &rbyd, 0, LFSR_TAG_REG, buffer, 4) => 4;
@@ -6848,7 +6848,7 @@ code = '''
LFSR_ATTR(1, REG, +1, BUF("\xbb\xbb\xbb\xbb", 4)),
LFSR_ATTR(2, REG, +1, BUF("\xcc\xcc\xcc\xcc", 4)))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(1, RM, -1, NULL))) => 0;
LFSR_ATTR(1, RM, -1, NULL()))) => 0;
assert(rbyd.weight == 2);
lfsr_rbyd_get(&lfs, &rbyd, 0, LFSR_TAG_REG, buffer, 4) => 4;
@@ -6889,7 +6889,7 @@ code = '''
LFSR_ATTR(1, REG, +1, BUF("\xbb\xbb\xbb\xbb", 4)),
LFSR_ATTR(1, UATTR(1), 0, BUF( "\xbb\xbb", 2)))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(1, RM, -1, NULL))) => 0;
LFSR_ATTR(1, RM, -1, NULL()))) => 0;
assert(rbyd.weight == 1);
lfsr_rbyd_get(&lfs, &rbyd, 0, LFSR_TAG_REG, buffer, 4)
@@ -6925,7 +6925,7 @@ code = '''
LFSR_ATTR(1, REG, +1, BUF("\xbb\xbb\xbb\xbb", 4)),
LFSR_ATTR(1, UATTR(1), 0, BUF( "\xbb\xbb", 2)))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(0, RM, -1, NULL))) => 0;
LFSR_ATTR(0, RM, -1, NULL()))) => 0;
assert(rbyd.weight == 1);
lfsr_rbyd_get(&lfs, &rbyd, 0, LFSR_TAG_REG, buffer, 4)
@@ -6963,7 +6963,7 @@ code = '''
LFSR_ATTR(2, REG, +1, BUF("\xcc\xcc\xcc\xcc", 4)),
LFSR_ATTR(2, UATTR(1), 0, BUF( "\xcc\xcc", 2)))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(2, RM, -1, NULL))) => 0;
LFSR_ATTR(2, RM, -1, NULL()))) => 0;
assert(rbyd.weight == 2);
lfsr_rbyd_get(&lfs, &rbyd, 0, LFSR_TAG_REG, buffer, 4) => 4;
@@ -7012,7 +7012,7 @@ code = '''
LFSR_ATTR(2, REG, +1, BUF("\xcc\xcc\xcc\xcc", 4)),
LFSR_ATTR(2, UATTR(1), 0, BUF( "\xcc\xcc", 2)))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(0, RM, -1, NULL))) => 0;
LFSR_ATTR(0, RM, -1, NULL()))) => 0;
assert(rbyd.weight == 2);
lfsr_rbyd_get(&lfs, &rbyd, 0, LFSR_TAG_REG, buffer, 4)
@@ -7062,7 +7062,7 @@ code = '''
LFSR_ATTR(2, REG, +1, BUF("\xcc\xcc\xcc\xcc", 4)),
LFSR_ATTR(2, UATTR(1), 0, BUF( "\xcc\xcc", 2)))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(1, RM, -1, NULL))) => 0;
LFSR_ATTR(1, RM, -1, NULL()))) => 0;
assert(rbyd.weight == 2);
lfsr_rbyd_get(&lfs, &rbyd, 0, LFSR_TAG_REG, buffer, 4)
@@ -7193,7 +7193,7 @@ code = '''
lfs_bd_flush(&lfs, &lfs.pcache, &lfs.rcache, false) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(j, RM, -1, NULL))) => 0;
LFSR_ATTR(j, RM, -1, NULL()))) => 0;
assert(rbyd.weight == N-1);
lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, CFG->block_size) => 0;
@@ -7353,7 +7353,7 @@ code = '''
lfs_bd_flush(&lfs, &lfs.pcache, &lfs.rcache, false) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(j, RM, -1, NULL))) => 0;
LFSR_ATTR(j, RM, -1, NULL()))) => 0;
assert(rbyd.weight == N-1);
lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, CFG->block_size) => 0;
@@ -7536,7 +7536,7 @@ code = '''
lfs_bd_flush(&lfs, &lfs.pcache, &lfs.rcache, false) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(j, RM, -1, NULL))) => 0;
LFSR_ATTR(j, RM, -1, NULL()))) => 0;
assert(rbyd.weight == N-1);
// try traversing over the tags
@@ -7666,7 +7666,7 @@ code = '''
lfs_bd_flush(&lfs, &lfs.pcache, &lfs.rcache, false) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(j, RM, -1, NULL))) => 0;
LFSR_ATTR(j, RM, -1, NULL()))) => 0;
assert(rbyd.weight == N-1);
// try traversing over the tags
@@ -7738,7 +7738,7 @@ code = '''
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(0, REG, +1, BUF("\xaa\xaa\xaa\xaa", 4)))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(0, RM, -1, NULL))) => 0;
LFSR_ATTR(0, RM, -1, NULL()))) => 0;
assert(rbyd.weight == 0);
lfsr_rbyd_get(&lfs, &rbyd, 0, LFSR_TAG_REG, buffer, 4)
@@ -7756,8 +7756,8 @@ code = '''
LFSR_ATTR(0, REG, +1, BUF("\xaa\xaa\xaa\xaa", 4)),
LFSR_ATTR(1, REG, +1, BUF("\xbb\xbb\xbb\xbb", 4)))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(0, RM, -1, NULL),
LFSR_ATTR(0, RM, -1, NULL))) => 0;
LFSR_ATTR(0, RM, -1, NULL()),
LFSR_ATTR(0, RM, -1, NULL()))) => 0;
assert(rbyd.weight == 0);
lfsr_rbyd_get(&lfs, &rbyd, 0, LFSR_TAG_REG, buffer, 4)
@@ -7775,8 +7775,8 @@ code = '''
LFSR_ATTR(0, REG, +1, BUF("\xaa\xaa\xaa\xaa", 4)),
LFSR_ATTR(1, REG, +1, BUF("\xbb\xbb\xbb\xbb", 4)))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(1, RM, -1, NULL),
LFSR_ATTR(0, RM, -1, NULL))) => 0;
LFSR_ATTR(1, RM, -1, NULL()),
LFSR_ATTR(0, RM, -1, NULL()))) => 0;
assert(rbyd.weight == 0);
lfsr_rbyd_get(&lfs, &rbyd, 0, LFSR_TAG_REG, buffer, 4)
@@ -7795,9 +7795,9 @@ code = '''
LFSR_ATTR(1, REG, +1, BUF("\xbb\xbb\xbb\xbb", 4)),
LFSR_ATTR(2, REG, +1, BUF("\xcc\xcc\xcc\xcc", 4)))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(0, RM, -1, NULL),
LFSR_ATTR(0, RM, -1, NULL),
LFSR_ATTR(0, RM, -1, NULL))) => 0;
LFSR_ATTR(0, RM, -1, NULL()),
LFSR_ATTR(0, RM, -1, NULL()),
LFSR_ATTR(0, RM, -1, NULL()))) => 0;
assert(rbyd.weight == 0);
lfsr_rbyd_get(&lfs, &rbyd, 0, LFSR_TAG_REG, buffer, 4)
@@ -7816,9 +7816,9 @@ code = '''
LFSR_ATTR(1, REG, +1, BUF("\xbb\xbb\xbb\xbb", 4)),
LFSR_ATTR(2, REG, +1, BUF("\xcc\xcc\xcc\xcc", 4)))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(2, RM, -1, NULL),
LFSR_ATTR(1, RM, -1, NULL),
LFSR_ATTR(0, RM, -1, NULL))) => 0;
LFSR_ATTR(2, RM, -1, NULL()),
LFSR_ATTR(1, RM, -1, NULL()),
LFSR_ATTR(0, RM, -1, NULL()))) => 0;
assert(rbyd.weight == 0);
lfsr_rbyd_get(&lfs, &rbyd, 0, LFSR_TAG_REG, buffer, 4)
@@ -7853,7 +7853,7 @@ code = '''
LFSR_ATTR(0, REG, +1, BUF("\xaa\xaa\xaa\xaa", 4)),
LFSR_ATTR(0, UATTR(1), 0, BUF( "\xaa\xaa", 2)))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(0, RM, -1, NULL))) => 0;
LFSR_ATTR(0, RM, -1, NULL()))) => 0;
assert(rbyd.weight == 0);
lfsr_rbyd_get(&lfs, &rbyd, 0, LFSR_TAG_REG, buffer, 4)
@@ -7873,8 +7873,8 @@ code = '''
LFSR_ATTR(1, REG, +1, BUF("\xbb\xbb\xbb\xbb", 4)),
LFSR_ATTR(1, UATTR(1), 0, BUF( "\xbb\xbb", 2)))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(0, RM, -1, NULL),
LFSR_ATTR(0, RM, -1, NULL))) => 0;
LFSR_ATTR(0, RM, -1, NULL()),
LFSR_ATTR(0, RM, -1, NULL()))) => 0;
assert(rbyd.weight == 0);
lfsr_rbyd_get(&lfs, &rbyd, 0, LFSR_TAG_REG, buffer, 4)
@@ -7894,8 +7894,8 @@ code = '''
LFSR_ATTR(1, REG, +1, BUF("\xbb\xbb\xbb\xbb", 4)),
LFSR_ATTR(1, UATTR(1), 0, BUF( "\xbb\xbb", 2)))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(1, RM, -1, NULL),
LFSR_ATTR(0, RM, -1, NULL))) => 0;
LFSR_ATTR(1, RM, -1, NULL()),
LFSR_ATTR(0, RM, -1, NULL()))) => 0;
assert(rbyd.weight == 0);
lfsr_rbyd_get(&lfs, &rbyd, 0, LFSR_TAG_REG, buffer, 4)
@@ -7917,9 +7917,9 @@ code = '''
LFSR_ATTR(2, REG, +1, BUF("\xcc\xcc\xcc\xcc", 4)),
LFSR_ATTR(2, UATTR(1), 0, BUF( "\xcc\xcc", 2)))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(0, RM, -1, NULL),
LFSR_ATTR(0, RM, -1, NULL),
LFSR_ATTR(0, RM, -1, NULL))) => 0;
LFSR_ATTR(0, RM, -1, NULL()),
LFSR_ATTR(0, RM, -1, NULL()),
LFSR_ATTR(0, RM, -1, NULL()))) => 0;
assert(rbyd.weight == 0);
lfsr_rbyd_get(&lfs, &rbyd, 0, LFSR_TAG_REG, buffer, 4)
@@ -7941,9 +7941,9 @@ code = '''
LFSR_ATTR(2, REG, +1, BUF("\xcc\xcc\xcc\xcc", 4)),
LFSR_ATTR(2, UATTR(1), 0, BUF( "\xcc\xcc", 2)))) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(2, RM, -1, NULL),
LFSR_ATTR(1, RM, -1, NULL),
LFSR_ATTR(0, RM, -1, NULL))) => 0;
LFSR_ATTR(2, RM, -1, NULL()),
LFSR_ATTR(1, RM, -1, NULL()),
LFSR_ATTR(0, RM, -1, NULL()))) => 0;
assert(rbyd.weight == 0);
lfsr_rbyd_get(&lfs, &rbyd, 0, LFSR_TAG_REG, buffer, 4)
@@ -8045,7 +8045,7 @@ code = '''
lfs_size_t rbyd_weight_before = rbyd.weight;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(rid, RM, -1, NULL))) => 0;
LFSR_ATTR(rid, RM, -1, NULL()))) => 0;
assert(rbyd.weight == rbyd_weight_before-1);
}
@@ -8193,7 +8193,7 @@ code = '''
lfs_size_t rbyd_weight_before = rbyd.weight;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(rid, RM, -1, NULL))) => 0;
LFSR_ATTR(rid, RM, -1, NULL()))) => 0;
assert(rbyd.weight == rbyd_weight_before-1);
}
@@ -8330,7 +8330,7 @@ code = '''
count -= 1;
// update our rbyd
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(rid, RM, -1, NULL))) => 0;
LFSR_ATTR(rid, RM, -1, NULL()))) => 0;
}
}
@@ -8972,7 +8972,7 @@ code = '''
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(1, REG, +1, BUF("\xbb\xbb\xbb\xbb", 4)),
LFSR_ATTR(1, UATTR(1), 0, BUF("\xbb\xbb", 2)),
LFSR_ATTR(1, RM, +1, NULL),
LFSR_ATTR(1, RM, +1, NULL()),
LFSR_ATTR(2, UATTR(2), 0, BUF("\xbb\xbb", 2)))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3),
@@ -9066,7 +9066,7 @@ code = '''
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(3, REG, +1, BUF("\xcc\xcc\xcc\xcc", 4)),
LFSR_ATTR(3, UATTR(1), 0, BUF("\xcc\xcc", 2)),
LFSR_ATTR(3, RM, +2, NULL),
LFSR_ATTR(3, RM, +2, NULL()),
LFSR_ATTR(5, UATTR(2), 0, BUF("\xcc\xcc", 2)))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3),
@@ -9196,7 +9196,7 @@ code = '''
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(6, REG, +1, BUF("\xdd\xdd\xdd\xdd", 4)),
LFSR_ATTR(6, UATTR(1), 0, BUF("\xdd\xdd", 2)),
LFSR_ATTR(6, RM, +3, NULL),
LFSR_ATTR(6, RM, +3, NULL()),
LFSR_ATTR(9, UATTR(2), 0, BUF("\xdd\xdd", 2)))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3),
@@ -9362,7 +9362,7 @@ code = '''
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(10, REG, +1, BUF("\xee\xee\xee\xee", 4)),
LFSR_ATTR(10, UATTR(1), 0, BUF("\xee\xee", 2)),
LFSR_ATTR(10, RM, +4, NULL),
LFSR_ATTR(10, RM, +4, NULL()),
LFSR_ATTR(14, UATTR(2), 0, BUF("\xee\xee", 2)))) => 0;
lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3),
@@ -9591,22 +9591,22 @@ code = '''
// make id2 with weight w2
LFSR_ATTR(1, REG, +1, BUF("\xbb\xbb\xbb\xbb", 4)),
LFSR_ATTR(1, UATTR(1), 0, BUF("\xbb\xbb", 2)),
LFSR_ATTR(1, RM, +1, NULL),
LFSR_ATTR(1, RM, +1, NULL()),
LFSR_ATTR(2, UATTR(2), 0, BUF("\xbb\xbb", 2)),
// make id5 with weight w3
LFSR_ATTR(3, REG, +1, BUF("\xcc\xcc\xcc\xcc", 4)),
LFSR_ATTR(3, UATTR(1), 0, BUF("\xcc\xcc", 2)),
LFSR_ATTR(3, RM, +2, NULL),
LFSR_ATTR(3, RM, +2, NULL()),
LFSR_ATTR(5, UATTR(2), 0, BUF("\xcc\xcc", 2)),
// make id9 with weight w4
LFSR_ATTR(6, REG, +1, BUF("\xdd\xdd\xdd\xdd", 4)),
LFSR_ATTR(6, UATTR(1), 0, BUF("\xdd\xdd", 2)),
LFSR_ATTR(6, RM, +3, NULL),
LFSR_ATTR(6, RM, +3, NULL()),
LFSR_ATTR(9, UATTR(2), 0, BUF("\xdd\xdd", 2)),
// make id14 with weight w5
LFSR_ATTR(10, REG, +1, BUF("\xee\xee\xee\xee", 4)),
LFSR_ATTR(10, UATTR(1), 0, BUF("\xee\xee", 2)),
LFSR_ATTR(10, RM, +4, NULL),
LFSR_ATTR(10, RM, +4, NULL()),
LFSR_ATTR(14, UATTR(2), 0, BUF("\xee\xee", 2)))) => 0;
// traverse, finding tags and weights
@@ -9882,7 +9882,7 @@ code = '''
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(rid*W, REG, +1, BUF(names[perm[j] % 6], 4)),
LFSR_ATTR(rid*W, UATTR(1), 0, BUF(names[perm[j] % 6], 2)),
LFSR_ATTR(rid*W, RM, +W-1, NULL),
LFSR_ATTR(rid*W, RM, +W-1, NULL()),
LFSR_ATTR(rid*W+W-1, UATTR(2), 0,
BUF(names[perm[j] % 6], 2)))) => 0;
}
@@ -9993,7 +9993,7 @@ code = '''
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(rid*W, REG, +1, BUF(names[perm[j] % 6], 4)),
LFSR_ATTR(rid*W, UATTR(1), 0, BUF(names[perm[j] % 6], 2)),
LFSR_ATTR(rid*W, RM, +W-1, NULL),
LFSR_ATTR(rid*W, RM, +W-1, NULL()),
LFSR_ATTR(rid*W+W-1, UATTR(2), 0,
BUF(names[perm[j] % 6], 2)))) => 0;
}
@@ -10132,7 +10132,7 @@ code = '''
lfs_bd_flush(&lfs, &lfs.pcache, &lfs.rcache, false) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(j*W+W-1, RM, +D, NULL))) => 0;
LFSR_ATTR(j*W+W-1, RM, +D, NULL()))) => 0;
assert(rbyd.weight == N*W+D);
lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, CFG->block_size) => 0;
@@ -10543,7 +10543,7 @@ code = '''
lfs_bd_flush(&lfs, &lfs.pcache, &lfs.rcache, false) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(j*W+W-1, GROW, -D, NULL))) => 0;
LFSR_ATTR(j*W+W-1, GROW, -D, NULL()))) => 0;
assert(rbyd.weight == N*W-D);
lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, CFG->block_size) => 0;
@@ -10953,7 +10953,7 @@ code = '''
lfs_bd_flush(&lfs, &lfs.pcache, &lfs.rcache, false) => 0;
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(j*W+W-1, RM, -W, NULL))) => 0;
LFSR_ATTR(j*W+W-1, RM, -W, NULL()))) => 0;
assert(rbyd.weight == (N-1)*W);
lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, CFG->block_size) => 0;
@@ -11139,7 +11139,7 @@ code = '''
// now try removing the attr
printf("--- removing: %d ---\n", j);
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(j*W+W-1, RM(UATTR(1)), 0, NULL))) => 0;
LFSR_ATTR(j*W+W-1, RM(UATTR(1)), 0, NULL()))) => 0;
assert(rbyd.weight == N*W);
lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, CFG->block_size) => 0;
@@ -11282,7 +11282,7 @@ code = '''
count -= 1;
// update our rbyd
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(rid, RM, -1, NULL))) => 0;
LFSR_ATTR(rid, RM, -1, NULL()))) => 0;
} else if (op == 2) {
// update our sim
sim[rid*(M+1) + u+1] = alpha[i % 26];
@@ -11295,7 +11295,7 @@ code = '''
sim[rid*(M+1) + u+1] = '\0';
// update our rbyd
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(rid, RM(UATTR(u)), 0, NULL))) => 0;
LFSR_ATTR(rid, RM(UATTR(u)), 0, NULL()))) => 0;
}
}
@@ -11453,7 +11453,7 @@ code = '''
// update our rbyd
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(weighted_rid+weight_-1, RM, -weight_,
NULL))) => 0;
NULL()))) => 0;
} else if (op == 2) {
// get the correct weight from the sim
weight_ = sim_weights[rid];
@@ -11462,7 +11462,7 @@ code = '''
// update our rbyd
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(weighted_rid+weight_-1, GROW, +weight,
NULL))) => 0;
NULL()))) => 0;
} else if (op == 3) {
// get the correct weight from the sim
weight_ = sim_weights[rid];
@@ -11474,7 +11474,7 @@ code = '''
// update our rbyd
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(weighted_rid+weight_-1, GROW, -weight,
NULL))) => 0;
NULL()))) => 0;
}
}
@@ -11717,7 +11717,7 @@ code = '''
// remove with a wide tag
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(j, RM(WIDE(UATTR)), 0, NULL))) => 0;
LFSR_ATTR(j, RM(WIDE(UATTR)), 0, NULL()))) => 0;
// try traversing over the tags
lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, CFG->block_size) => 0;
@@ -12084,7 +12084,7 @@ code = '''
// remove with a wide tag
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(j, RM(WIDE(UATTR)), 0, NULL))) => 0;
LFSR_ATTR(j, RM(WIDE(UATTR)), 0, NULL()))) => 0;
// try traversing over the tags
lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, CFG->block_size) => 0;
@@ -12461,7 +12461,7 @@ code = '''
// remove with a wide tag
lfsr_rbyd_commit(&lfs, &rbyd, LFSR_ATTRS(
LFSR_ATTR(j, RM(WIDE(UATTR)), 0, NULL))) => 0;
LFSR_ATTR(j, RM(WIDE(UATTR)), 0, NULL()))) => 0;
// try traversing over the tags
lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, CFG->block_size) => 0;