Github/littlefs
1
Fork 0
Code Actions Activity

Renamed SUP/SUBMASK -> SUP/SUB

Browse Source 
There wasn't really a collision with this, and I think it's clear what
these flags are doing.

Also fixed a missed renamed of lfsr_tag_issup/subwide ->
lfsr_tag_issup/sub
This commit is contained in:
Christopher Haster
2024-02-24 14:41:39 -06:00
parent 6c9ce4e8f1
commit 4a66816d4f
3 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_btree.toml
+19 -19
View File
@@ -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],
tests/test_rbyd.toml
+10 -10
View File
@@ -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);