From 4d8bfeae71667e5c6d3cceca0dccbcc227297334 Mon Sep 17 00:00:00 2001 From: Christopher Haster Date: Wed, 21 Aug 2024 14:19:38 -0500 Subject: [PATCH] attrs: Reduced UATTR/SATTR range down to 7-bits It would be nice to have a full 8-bit range for both user attrs and system attrs, for both backwards compatibility and maximizing the available attr space, but I think it just doesn't make sense from an API perspective. Sure we could finagle the user/sys bit into a flags argument, or provide separate lfsr_getuattr/getsattr functions, but asking users to use a 9-bit int for higher-level operations (dynamic attrs, iteration, etc) is a bit much... So this reduces the two attr ranges down to 7-bits, requiring 8-bits total to store all possible attr types in the current system: TAG_ATTR 0x0400 v--- -1-a -aaa aaaa TAG_UATTR 0x04aa v--- -1-- -aaa aaaa TAG_SATTR 0x05aa v--- -1-1 -aaa aaaa This really just affects scripts, since we haven't actually implemented attributes yet. Worst case we still have the 9-bit encoding space carved out, so we can always add an additional set of attrs in the future if we start running into attr pressure. Or, you know, just turn on the subtype leb128 encoding the 8th subtype bit is reserved for. Then you'd only be limited by internal driver details, probably 24-bits per attr range if we make tags 32-bits internally. Though this would probably come with quite a code cost... --- lfs.c | 12 +- scripts/dbgbmap.py | 5 +- scripts/dbgbtree.py | 18 +- scripts/dbglfs.py | 18 +- scripts/dbgmtree.py | 18 +- scripts/dbgrbyd.py | 18 +- scripts/dbgtag.py | 18 +- tests/test_mtree.toml | 298 +-- tests/test_rbyd.toml | 4018 ++++++++++++++++++++--------------------- 9 files changed, 2200 insertions(+), 2223 deletions(-) diff --git a/lfs.c b/lfs.c index a3737c5a..05b5aef0 100644 --- a/lfs.c +++ b/lfs.c @@ -1392,8 +1392,9 @@ enum lfsr_tag { LFSR_TAG_BRANCH = 0x032c, // user/sys attributes + LFSR_TAG_ATTR = 0x0400, LFSR_TAG_UATTR = 0x0400, - LFSR_TAG_SATTR = 0x0600, + LFSR_TAG_SATTR = 0x0500, // shrub tags belong to secondary trees LFSR_TAG_SHRUB = 0x1000, @@ -1433,13 +1434,8 @@ enum lfsr_tag { | (0x1000 & (d)) \ | (0x0fff & (lfsr_tag_t)(key))) -#define LFSR_TAG_UATTR(attr) \ - (LFSR_TAG_UATTR \ - | ((0x80 & (lfsr_tag_t)(attr)) << 1) \ - | (0x7f & (lfsr_tag_t)(attr))) - -#define LFSR_TAG_SATTR(attr) \ - (LFSR_TAG_SATTR \ +#define LFSR_TAG_ATTR(attr) \ + (LFSR_TAG_ATTR \ | ((0x80 & (lfsr_tag_t)(attr)) << 1) \ | (0x7f & (lfsr_tag_t)(attr))) diff --git a/scripts/dbgbmap.py b/scripts/dbgbmap.py index a5e0f28e..2f85e8ab 100755 --- a/scripts/dbgbmap.py +++ b/scripts/dbgbmap.py @@ -37,8 +37,9 @@ TAG_MDIR = 0x0315 # 0x0314 v--- --11 ---1 -1rr TAG_MTREE = 0x031c # 0x031c v--- --11 ---1 11rr TAG_DID = 0x0320 # 0x0320 v--- --11 --1- ---- TAG_BRANCH = 0x032c # 0x032c v--- --11 --1- 11rr -TAG_UATTR = 0x0400 # 0x04aa v--- -1-a -aaa aaaa -TAG_SATTR = 0x0600 # 0x06aa v--- -11a -aaa aaaa +TAG_ATTR = 0x0400 ## 0x04aa v--- -1-a -aaa aaaa +TAG_UATTR = 0x0400 # 0x04aa v--- -1-- -aaa aaaa +TAG_SATTR = 0x0500 # 0x05aa v--- -1-1 -aaa aaaa TAG_SHRUB = 0x1000 ## 0x1kkk v--1 kkkk -kkk kkkk TAG_ALT = 0x4000 ## 0x4kkk v1cd kkkk -kkk kkkk TAG_B = 0x0000 diff --git a/scripts/dbgbtree.py b/scripts/dbgbtree.py index 34c6e774..eb742560 100755 --- a/scripts/dbgbtree.py +++ b/scripts/dbgbtree.py @@ -35,8 +35,9 @@ TAG_MDIR = 0x0315 # 0x0314 v--- --11 ---1 -1rr TAG_MTREE = 0x031c # 0x031c v--- --11 ---1 11rr TAG_DID = 0x0320 # 0x0320 v--- --11 --1- ---- TAG_BRANCH = 0x032c # 0x032c v--- --11 --1- 11rr -TAG_UATTR = 0x0400 # 0x04aa v--- -1-a -aaa aaaa -TAG_SATTR = 0x0600 # 0x06aa v--- -11a -aaa aaaa +TAG_ATTR = 0x0400 ## 0x04aa v--- -1-a -aaa aaaa +TAG_UATTR = 0x0400 # 0x04aa v--- -1-- -aaa aaaa +TAG_SATTR = 0x0500 # 0x05aa v--- -1-1 -aaa aaaa TAG_SHRUB = 0x1000 ## 0x1kkk v--1 kkkk -kkk kkkk TAG_ALT = 0x4000 ## 0x4kkk v1cd kkkk -kkk kkkk TAG_B = 0x0000 @@ -213,16 +214,11 @@ def tagrepr(tag, w=None, size=None, off=None): else 'struct 0x%02x' % (tag & 0xff), ' w%d' % w if w else '', ' %s' % size if size is not None else '') - elif (tag & 0x6e00) == TAG_UATTR: - return '%suattr 0x%02x%s%s' % ( + elif (tag & 0x6e00) == TAG_ATTR: + return '%s%sattr 0x%02x%s%s' % ( 'shrub' if tag & TAG_SHRUB else '', - ((tag & 0x100) >> 1) | (tag & 0xff), - ' w%d' % w if w else '', - ' %s' % size if size is not None else '') - elif (tag & 0x6e00) == TAG_SATTR: - return '%ssattr 0x%02x%s%s' % ( - 'shrub' if tag & TAG_SHRUB else '', - ((tag & 0x100) >> 1) | (tag & 0xff), + 's' if tag & 0x100 else 'u', + ((tag & 0x100) >> 1) ^ (tag & 0xff), ' w%d' % w if w else '', ' %s' % size if size is not None else '') elif tag & TAG_ALT: diff --git a/scripts/dbglfs.py b/scripts/dbglfs.py index 334ef803..50e2112f 100755 --- a/scripts/dbglfs.py +++ b/scripts/dbglfs.py @@ -36,8 +36,9 @@ TAG_MDIR = 0x0315 # 0x0314 v--- --11 ---1 -1rr TAG_MTREE = 0x031c # 0x031c v--- --11 ---1 11rr TAG_DID = 0x0320 # 0x0320 v--- --11 --1- ---- TAG_BRANCH = 0x032c # 0x032c v--- --11 --1- 11rr -TAG_UATTR = 0x0400 # 0x04aa v--- -1-a -aaa aaaa -TAG_SATTR = 0x0600 # 0x06aa v--- -11a -aaa aaaa +TAG_ATTR = 0x0400 ## 0x04aa v--- -1-a -aaa aaaa +TAG_UATTR = 0x0400 # 0x04aa v--- -1-- -aaa aaaa +TAG_SATTR = 0x0500 # 0x05aa v--- -1-1 -aaa aaaa TAG_SHRUB = 0x1000 ## 0x1kkk v--1 kkkk -kkk kkkk TAG_ALT = 0x4000 ## 0x4kkk v1cd kkkk -kkk kkkk TAG_B = 0x0000 @@ -244,16 +245,11 @@ def tagrepr(tag, w=None, size=None, off=None): else 'struct 0x%02x' % (tag & 0xff), ' w%d' % w if w else '', ' %s' % size if size is not None else '') - elif (tag & 0x6e00) == TAG_UATTR: - return '%suattr 0x%02x%s%s' % ( + elif (tag & 0x6e00) == TAG_ATTR: + return '%s%sattr 0x%02x%s%s' % ( 'shrub' if tag & TAG_SHRUB else '', - ((tag & 0x100) >> 1) | (tag & 0xff), - ' w%d' % w if w else '', - ' %s' % size if size is not None else '') - elif (tag & 0x6e00) == TAG_SATTR: - return '%ssattr 0x%02x%s%s' % ( - 'shrub' if tag & TAG_SHRUB else '', - ((tag & 0x100) >> 1) | (tag & 0xff), + 's' if tag & 0x100 else 'u', + ((tag & 0x100) >> 1) ^ (tag & 0xff), ' w%d' % w if w else '', ' %s' % size if size is not None else '') elif tag & TAG_ALT: diff --git a/scripts/dbgmtree.py b/scripts/dbgmtree.py index 6accfee4..2ae1e195 100755 --- a/scripts/dbgmtree.py +++ b/scripts/dbgmtree.py @@ -35,8 +35,9 @@ TAG_MDIR = 0x0315 # 0x0314 v--- --11 ---1 -1rr TAG_MTREE = 0x031c # 0x031c v--- --11 ---1 11rr TAG_DID = 0x0320 # 0x0320 v--- --11 --1- ---- TAG_BRANCH = 0x032c # 0x032c v--- --11 --1- 11rr -TAG_UATTR = 0x0400 # 0x04aa v--- -1-a -aaa aaaa -TAG_SATTR = 0x0600 # 0x06aa v--- -11a -aaa aaaa +TAG_ATTR = 0x0400 ## 0x04aa v--- -1-a -aaa aaaa +TAG_UATTR = 0x0400 # 0x04aa v--- -1-- -aaa aaaa +TAG_SATTR = 0x0500 # 0x05aa v--- -1-1 -aaa aaaa TAG_SHRUB = 0x1000 ## 0x1kkk v--1 kkkk -kkk kkkk TAG_ALT = 0x4000 ## 0x4kkk v1cd kkkk -kkk kkkk TAG_B = 0x0000 @@ -228,16 +229,11 @@ def tagrepr(tag, w=None, size=None, off=None): else 'struct 0x%02x' % (tag & 0xff), ' w%d' % w if w else '', ' %s' % size if size is not None else '') - elif (tag & 0x6e00) == TAG_UATTR: - return '%suattr 0x%02x%s%s' % ( + elif (tag & 0x6e00) == TAG_ATTR: + return '%s%sattr 0x%02x%s%s' % ( 'shrub' if tag & TAG_SHRUB else '', - ((tag & 0x100) >> 1) | (tag & 0xff), - ' w%d' % w if w else '', - ' %s' % size if size is not None else '') - elif (tag & 0x6e00) == TAG_SATTR: - return '%ssattr 0x%02x%s%s' % ( - 'shrub' if tag & TAG_SHRUB else '', - ((tag & 0x100) >> 1) | (tag & 0xff), + 's' if tag & 0x100 else 'u', + ((tag & 0x100) >> 1) ^ (tag & 0xff), ' w%d' % w if w else '', ' %s' % size if size is not None else '') elif tag & TAG_ALT: diff --git a/scripts/dbgrbyd.py b/scripts/dbgrbyd.py index 01501c71..9c240015 100755 --- a/scripts/dbgrbyd.py +++ b/scripts/dbgrbyd.py @@ -44,8 +44,9 @@ TAG_MDIR = 0x0315 # 0x0314 v--- --11 ---1 -1rr TAG_MTREE = 0x031c # 0x031c v--- --11 ---1 11rr TAG_DID = 0x0320 # 0x0320 v--- --11 --1- ---- TAG_BRANCH = 0x032c # 0x032c v--- --11 --1- 11rr -TAG_UATTR = 0x0400 # 0x04aa v--- -1-a -aaa aaaa -TAG_SATTR = 0x0600 # 0x06aa v--- -11a -aaa aaaa +TAG_ATTR = 0x0400 ## 0x04aa v--- -1-a -aaa aaaa +TAG_UATTR = 0x0400 # 0x04aa v--- -1-- -aaa aaaa +TAG_SATTR = 0x0500 # 0x05aa v--- -1-1 -aaa aaaa TAG_SHRUB = 0x1000 ## 0x1kkk v--1 kkkk -kkk kkkk TAG_ALT = 0x4000 ## 0x4kkk v1cd kkkk -kkk kkkk TAG_B = 0x0000 @@ -215,16 +216,11 @@ def tagrepr(tag, w=None, size=None, off=None): else 'struct 0x%02x' % (tag & 0xff), ' w%d' % w if w else '', ' %s' % size if size is not None else '') - elif (tag & 0x6e00) == TAG_UATTR: - return '%suattr 0x%02x%s%s' % ( + elif (tag & 0x6e00) == TAG_ATTR: + return '%s%sattr 0x%02x%s%s' % ( 'shrub' if tag & TAG_SHRUB else '', - ((tag & 0x100) >> 1) | (tag & 0xff), - ' w%d' % w if w else '', - ' %s' % size if size is not None else '') - elif (tag & 0x6e00) == TAG_SATTR: - return '%ssattr 0x%02x%s%s' % ( - 'shrub' if tag & TAG_SHRUB else '', - ((tag & 0x100) >> 1) | (tag & 0xff), + 's' if tag & 0x100 else 'u', + ((tag & 0x100) >> 1) ^ (tag & 0xff), ' w%d' % w if w else '', ' %s' % size if size is not None else '') elif tag & TAG_ALT: diff --git a/scripts/dbgtag.py b/scripts/dbgtag.py index 35aa80eb..73a9341d 100755 --- a/scripts/dbgtag.py +++ b/scripts/dbgtag.py @@ -33,8 +33,9 @@ TAG_MDIR = 0x0315 # 0x0314 v--- --11 ---1 -1rr TAG_MTREE = 0x031c # 0x031c v--- --11 ---1 11rr TAG_DID = 0x0320 # 0x0320 v--- --11 --1- ---- TAG_BRANCH = 0x032c # 0x032c v--- --11 --1- 11rr -TAG_UATTR = 0x0400 # 0x04aa v--- -1-a -aaa aaaa -TAG_SATTR = 0x0600 # 0x06aa v--- -11a -aaa aaaa +TAG_ATTR = 0x0400 ## 0x04aa v--- -1-a -aaa aaaa +TAG_UATTR = 0x0400 # 0x04aa v--- -1-- -aaa aaaa +TAG_SATTR = 0x0500 # 0x05aa v--- -1-1 -aaa aaaa TAG_SHRUB = 0x1000 ## 0x1kkk v--1 kkkk -kkk kkkk TAG_ALT = 0x4000 ## 0x4kkk v1cd kkkk -kkk kkkk TAG_B = 0x0000 @@ -170,16 +171,11 @@ def tagrepr(tag, w=None, size=None, off=None): else 'struct 0x%02x' % (tag & 0xff), ' w%d' % w if w else '', ' %s' % size if size is not None else '') - elif (tag & 0x6e00) == TAG_UATTR: - return '%suattr 0x%02x%s%s' % ( + elif (tag & 0x6e00) == TAG_ATTR: + return '%s%sattr 0x%02x%s%s' % ( 'shrub' if tag & TAG_SHRUB else '', - ((tag & 0x100) >> 1) | (tag & 0xff), - ' w%d' % w if w else '', - ' %s' % size if size is not None else '') - elif (tag & 0x6e00) == TAG_SATTR: - return '%ssattr 0x%02x%s%s' % ( - 'shrub' if tag & TAG_SHRUB else '', - ((tag & 0x100) >> 1) | (tag & 0xff), + 's' if tag & 0x100 else 'u', + ((tag & 0x100) >> 1) ^ (tag & 0xff), ' w%d' % w if w else '', ' %s' % size if size is not None else '') elif tag & TAG_ALT: diff --git a/tests/test_mtree.toml b/tests/test_mtree.toml index 848d9784..bcb938d2 100644 --- a/tests/test_mtree.toml +++ b/tests/test_mtree.toml @@ -27,14 +27,14 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(i), 0, + LFSR_TAG_ATTR(i), 0, LFSR_DATA_BUF(&(uint8_t){'a'+(i % 26)}, 1)))) => 0; } for (lfs_size_t i = 0; i < N; i++) { lfsr_data_t data; uint8_t buffer[1]; - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(i), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(i), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(memcmp(buffer, &(uint8_t){'a'+(i % 26)}, 1) == 0); } @@ -48,7 +48,7 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { lfsr_data_t data; uint8_t buffer[1]; - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(i), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(i), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(memcmp(buffer, &(uint8_t){'a'+(i % 26)}, 1) == 0); } @@ -72,14 +72,14 @@ code = ''' lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(i), 0, + LFSR_TAG_ATTR(i), 0, LFSR_DATA_BUF(&(uint8_t){'a'+(i % 26)}, 1)))) => 0; } for (lfs_size_t i = 0; i < N; i++) { lfsr_data_t data; uint8_t buffer[1]; - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(i), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(i), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(memcmp(buffer, &(uint8_t){'a'+(i % 26)}, 1) == 0); } @@ -93,7 +93,7 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { lfsr_data_t data; uint8_t buffer[1]; - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(i), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(i), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(memcmp(buffer, &(uint8_t){'a'+(i % 26)}, 1) == 0); } @@ -114,19 +114,19 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF(&(uint8_t){'a'+(i % 26)}, 1)))) => 0; lfsr_data_t data; uint8_t buffer[4]; - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 1; assert(memcmp(buffer, &(uint8_t){'a'+(i % 26)}, 1) == 0); } lfsr_data_t data; uint8_t buffer[4]; - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 1; assert(memcmp(buffer, &(uint8_t){'a'+((N-1) % 26)}, 1) == 0); @@ -136,7 +136,7 @@ code = ''' // check things stay sane after remount lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0; - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 1; assert(memcmp(buffer, &(uint8_t){'a'+((N-1) % 26)}, 1) == 0); @@ -162,18 +162,18 @@ code = ''' uint8_t buffer[SIZE]; memset(buffer, 'a', SIZE); lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(1), 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0; memset(buffer, 'b', SIZE); lfsr_mdir_t mdir; lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(2), 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0; // force mroot to compact lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(3), 0, LFSR_DATA_BUF("c", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("c", 1)))) => 0; // assert mdirs were unininlined assert(lfsr_mtree_weight_(&lfs.mtree) == (1 << lfs.mdir_bits)); @@ -181,17 +181,17 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our attrs are still in the mroot/mtree - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[0] == 'a'); lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; assert(mdir.rbyd.weight == 1); - lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[0] == 'b'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); @@ -205,17 +205,17 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our attrs are still in the mroot/mtree - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[0] == 'a'); lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; assert(mdir.rbyd.weight == 1); - lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[0] == 'b'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); @@ -254,7 +254,7 @@ code = ''' // force mroot to compact lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(1), 0, LFSR_DATA_BUF("c", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("c", 1)))) => 0; // assert mdirs were unininlined and split assert(lfsr_mtree_weight_(&lfs.mtree) == (2 << lfs.mdir_bits)); @@ -274,7 +274,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'b'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); @@ -300,7 +300,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'b'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); @@ -339,7 +339,7 @@ code = ''' // force mroot to compact lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(1), 0, LFSR_DATA_BUF("c", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("c", 1)))) => 0; // assert mdirs were unininlined and split assert(lfsr_mtree_weight_(&lfs.mtree) == (2 << lfs.mdir_bits)); @@ -357,7 +357,7 @@ code = ''' // force mdir to compact mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(2), 0, LFSR_DATA_BUF("e", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("e", 1)))) => 0; // assert mdir was split correctly assert(lfsr_mtree_weight_(&lfs.mtree) == (3 << lfs.mdir_bits)); @@ -377,7 +377,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'b'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); @@ -387,7 +387,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'd'); - lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'e'); @@ -413,7 +413,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'b'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); @@ -423,7 +423,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'd'); - lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'e'); @@ -650,7 +650,7 @@ code = ''' // force mroot to compact lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(1), 0, LFSR_DATA_BUF("c", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("c", 1)))) => 0; // assert mdirs were unininlined and split assert(lfsr_mtree_weight_(&lfs.mtree) == (2 << lfs.mdir_bits)); @@ -677,7 +677,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); @@ -697,7 +697,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); @@ -736,7 +736,7 @@ code = ''' // force mroot to compact lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(1), 0, LFSR_DATA_BUF("c", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("c", 1)))) => 0; // assert mdirs were unininlined and split assert(lfsr_mtree_weight_(&lfs.mtree) == (2 << lfs.mdir_bits)); @@ -765,7 +765,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); @@ -785,7 +785,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); @@ -895,7 +895,7 @@ code = ''' // force mroot to compact lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(1), 0, LFSR_DATA_BUF("c", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("c", 1)))) => 0; // assert mdirs were unininlined and split assert(lfsr_mtree_weight_(&lfs.mtree) == (2 << lfs.mdir_bits)); @@ -932,7 +932,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); @@ -958,7 +958,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); @@ -1003,7 +1003,7 @@ code = ''' // force mroot to compact lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(1), 0, LFSR_DATA_BUF("c", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("c", 1)))) => 0; // assert mdirs were unininlined and split assert(lfsr_mtree_weight_(&lfs.mtree) == (2 << lfs.mdir_bits)); @@ -1046,7 +1046,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'b'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); @@ -1072,7 +1072,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'b'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); @@ -1228,18 +1228,18 @@ code = ''' uint8_t buffer[SIZE]; memset(buffer, 'a', SIZE); lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(1), 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0; memset(buffer, 'b', SIZE); lfsr_mdir_t mdir; lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(2), 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0; // force mroot to compact lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(3), 0, LFSR_DATA_BUF("c", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("c", 1)))) => 0; // assert mdirs were unininlined assert(lfsr_mtree_weight_(&lfs.mtree) == (1 << lfs.mdir_bits)); @@ -1251,10 +1251,10 @@ code = ''' lfsr_mdir_t old_mdir = mdir; mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(4), 0, LFSR_DATA_BUF("d", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("d", 1)))) => 0; mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(5), 0, LFSR_DATA_BUF("e", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("e", 1)))) => 0; // assert we relocated assert(lfsr_mdir_cmp(&old_mdir, &mdir) != 0); @@ -1264,27 +1264,27 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our attrs are still in the mroot/mtree - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[0] == 'a'); lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; assert(mdir.rbyd.weight == 1); - lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[0] == 'b'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; assert(mdir.rbyd.weight == 1); - lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'd'); - lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'e'); @@ -1298,27 +1298,27 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our attrs are still in the mroot/mtree - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[0] == 'a'); lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; assert(mdir.rbyd.weight == 1); - lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[0] == 'b'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; assert(mdir.rbyd.weight == 1); - lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'd'); - lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'e'); @@ -1359,7 +1359,7 @@ code = ''' // force mroot to compact lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(1), 0, LFSR_DATA_BUF("c", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("c", 1)))) => 0; // assert mdirs were unininlined and split assert(lfsr_mtree_weight_(&lfs.mtree) == (2 << lfs.mdir_bits)); @@ -1373,10 +1373,10 @@ code = ''' lfsr_mdir_t old_mdir = mdir; mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(2), 0, LFSR_DATA_BUF("d", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("d", 1)))) => 0; mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(3), 0, LFSR_DATA_BUF("e", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("e", 1)))) => 0; // assert we relocated assert(lfsr_mdir_cmp(&old_mdir, &mdir) != 0); @@ -1398,17 +1398,17 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'b'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); lfsr_mtree_lookup(&lfs, (0 << lfs.mdir_bits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); - lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'd'); - lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'e'); @@ -1434,17 +1434,17 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'b'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); lfsr_mtree_lookup(&lfs, (0 << lfs.mdir_bits)+1, &mdir) => 0; assert(mdir.rbyd.weight == 2); - lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'd'); - lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'e'); @@ -1485,7 +1485,7 @@ code = ''' // force mroot to compact lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(1), 0, LFSR_DATA_BUF("c", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("c", 1)))) => 0; // assert mdirs were unininlined and split assert(lfsr_mtree_weight_(&lfs.mtree) == (2 << lfs.mdir_bits)); @@ -1499,10 +1499,10 @@ code = ''' lfsr_mdir_t old_mdir = mdir; mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(2), 0, LFSR_DATA_BUF("d", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("d", 1)))) => 0; mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(3), 0, LFSR_DATA_BUF("e", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("e", 1)))) => 0; // assert we relocated assert(lfsr_mdir_cmp(&old_mdir, &mdir) != 0); @@ -1524,17 +1524,17 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'b'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); lfsr_mtree_lookup(&lfs, (1 << lfs.mdir_bits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); - lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'd'); - lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'e'); @@ -1560,17 +1560,17 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'b'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); lfsr_mtree_lookup(&lfs, (1 << lfs.mdir_bits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); - lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'd'); - lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'e'); @@ -1605,10 +1605,10 @@ code = ''' lfsr_mdir_t old_mroot = lfs.mroot; lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(1), 0, LFSR_DATA_BUF("b", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("b", 1)))) => 0; lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(2), 0, LFSR_DATA_BUF("c", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("c", 1)))) => 0; // assert we relocated assert(lfsr_mdir_cmp(&old_mroot, &lfs.mroot) != 0); @@ -1619,11 +1619,11 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'b'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); @@ -1638,11 +1638,11 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'b'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); @@ -1680,10 +1680,10 @@ code = ''' lfsr_mdir_t old_mroot = lfs.mroot; lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(1), 0, LFSR_DATA_BUF("b", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("b", 1)))) => 0; lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(2), 0, LFSR_DATA_BUF("c", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("c", 1)))) => 0; // assert we relocated assert(lfsr_mdir_cmp(&old_mroot, &lfs.mroot) != 0); @@ -1692,16 +1692,16 @@ code = ''' old_mroot = lfs.mroot; lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(3), 0, LFSR_DATA_BUF("d", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("d", 1)))) => 0; lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(4), 0, LFSR_DATA_BUF("e", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("e", 1)))) => 0; lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(5), 0, LFSR_DATA_BUF("f", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("f", 1)))) => 0; lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(6), 0, LFSR_DATA_BUF("g", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(6), 0, LFSR_DATA_BUF("g", 1)))) => 0; // assert we relocated assert(lfsr_mdir_cmp(&old_mroot, &lfs.mroot) != 0); @@ -1712,27 +1712,27 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'b'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'd'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'e'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'f'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'g'); @@ -1747,27 +1747,27 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'b'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'd'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'e'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'f'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'g'); @@ -1802,10 +1802,10 @@ code = ''' lfsr_mdir_t old_mroot = lfs.mroot; lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(1), 0, LFSR_DATA_BUF("b", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("b", 1)))) => 0; lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(2), 0, LFSR_DATA_BUF("c", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("c", 1)))) => 0; // assert we relocated assert(lfsr_mdir_cmp(&old_mroot, &lfs.mroot) != 0); @@ -1813,10 +1813,10 @@ code = ''' old_mroot = lfs.mroot; lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(3), 0, LFSR_DATA_BUF("d", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("d", 1)))) => 0; lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(4), 0, LFSR_DATA_BUF("e", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("e", 1)))) => 0; // assert we relocated assert(lfsr_mdir_cmp(&old_mroot, &lfs.mroot) != 0); @@ -1827,19 +1827,19 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'b'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'd'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'e'); @@ -1854,19 +1854,19 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'b'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'd'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'e'); @@ -1907,7 +1907,7 @@ code = ''' // force mroot to compact lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(1), 0, LFSR_DATA_BUF("c", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("c", 1)))) => 0; // assert mdirs were unininlined and split assert(lfsr_mtree_weight_(&lfs.mtree) == (2 << lfs.mdir_bits)); @@ -1924,10 +1924,10 @@ code = ''' lfsr_mdir_t old_mdir = mdir; mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(2), 0, LFSR_DATA_BUF("d", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("d", 1)))) => 0; mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(3), 0, LFSR_DATA_BUF("e", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("e", 1)))) => 0; // assert we relocated assert(lfsr_mdir_cmp(&old_mdir, &mdir) != 0); // assert mroot relocated @@ -1951,17 +1951,17 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'b'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); lfsr_mtree_lookup(&lfs, (1 << lfs.mdir_bits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); - lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'd'); - lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'e'); @@ -1987,17 +1987,17 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'b'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); lfsr_mtree_lookup(&lfs, (1 << lfs.mdir_bits)+0, &mdir) => 0; assert(mdir.rbyd.weight == 1); - lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'd'); - lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'e'); @@ -2038,7 +2038,7 @@ code = ''' // force mroot to compact lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(1), 0, LFSR_DATA_BUF("c", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("c", 1)))) => 0; // assert mdirs were unininlined and split assert(lfsr_mtree_weight_(&lfs.mtree) == (2 << lfs.mdir_bits)); @@ -2060,10 +2060,10 @@ code = ''' lfsr_mdir_t old_mdir = mdir; mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(2), 0, LFSR_DATA_BUF("e", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("e", 1)))) => 0; mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(3), 0, LFSR_DATA_BUF("f", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("f", 1)))) => 0; // assert we relocated assert(lfsr_mdir_cmp(&old_mdir, &mdir) != 0); // assert mroot relocated @@ -2087,7 +2087,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'b'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); @@ -2097,11 +2097,11 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'd'); - lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'e'); - lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'f'); @@ -2127,7 +2127,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'b'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); @@ -2137,11 +2137,11 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'd'); - lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'e'); - lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'f'); @@ -2182,7 +2182,7 @@ code = ''' // force mroot to compact lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(1), 0, LFSR_DATA_BUF("c", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("c", 1)))) => 0; // assert mdirs were unininlined and split assert(lfsr_mtree_weight_(&lfs.mtree) == (2 << lfs.mdir_bits)); @@ -2199,7 +2199,7 @@ code = ''' // force mdir to compact twice, this should relocate mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(2), 0, LFSR_DATA_BUF("d", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("d", 1)))) => 0; // force mdir to compact while we're removing mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( @@ -2220,7 +2220,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); @@ -2240,7 +2240,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'a'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); @@ -2269,19 +2269,19 @@ code = ''' uint8_t buffer[SIZE]; memset(buffer, 'a', SIZE); lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(1), 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0; memset(buffer, 'b', SIZE); lfsr_mdir_t mdir; lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(2), 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0; // force mroot to compact, this should both uninline and relocate lfsr_mdir_t old_mroot = lfs.mroot; lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(3), 0, LFSR_DATA_BUF("c", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("c", 1)))) => 0; // assert mroot relocated assert(lfsr_mdir_cmp(&old_mroot, &lfs.mroot) != 0); @@ -2291,17 +2291,17 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our attrs are still in the mroot/mtree - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[0] == 'a'); lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; assert(mdir.rbyd.weight == 1); - lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[0] == 'b'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); @@ -2315,17 +2315,17 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our attrs are still in the mroot/mtree - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[0] == 'a'); lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; assert(mdir.rbyd.weight == 1); - lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[0] == 'b'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); @@ -2372,7 +2372,7 @@ code = ''' lfsr_mdir_t old_mroot = lfs.mroot; lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(1), 0, LFSR_DATA_BUF("c", 1)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("c", 1)))) => 0; // assert mroot relocated assert(lfsr_mdir_cmp(&old_mroot, &lfs.mroot) != 0); @@ -2394,7 +2394,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'b'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); @@ -2420,7 +2420,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[1] == 'b'); - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 1) => 1; assert(buffer[0] == 'c'); @@ -3457,13 +3457,13 @@ code = ''' uint8_t buffer[SIZE]; memset(buffer, 'a', SIZE); lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(1), 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0; memset(buffer, 'b', SIZE); lfsr_mdir_t mdir; lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; lfsr_mdir_commit(&lfs, &mdir, LFSR_ATTRS( - LFSR_ATTR(LFSR_TAG_UATTR(1), 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_ATTR(LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0; // force mroot to compact lfs.mroot.rbyd.eoff = -1; @@ -3540,13 +3540,13 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our attrs are still in the mroot/mtree - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[0] == 'a'); lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; assert(mdir.rbyd.weight == 1); - lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[0] == 'b'); @@ -3560,13 +3560,13 @@ code = ''' assert(lfs.mroot.rbyd.weight == 0); // assert that our attrs are still in the mroot/mtree - lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &lfs.mroot, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[0] == 'a'); lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; assert(mdir.rbyd.weight == 1); - lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, SIZE) => SIZE; assert(buffer[0] == 'b'); diff --git a/tests/test_rbyd.toml b/tests/test_rbyd.toml index 9e721aa0..b9e61faa 100644 --- a/tests/test_rbyd.toml +++ b/tests/test_rbyd.toml @@ -33,7 +33,7 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; @@ -42,10 +42,10 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; ''' @@ -70,7 +70,7 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; @@ -79,11 +79,11 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; ''' @@ -108,7 +108,7 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; // fetch @@ -117,7 +117,7 @@ code = ''' // commit with the second attribute lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; ''' @@ -150,24 +150,24 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // commit with two attributes @@ -175,37 +175,37 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // commit with two attributes, in the other direction @@ -213,37 +213,37 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; ''' @@ -270,24 +270,24 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // commit with two attributes @@ -295,38 +295,38 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // commit with two attributes, in the other direction @@ -334,38 +334,38 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; ''' @@ -391,20 +391,20 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &data) => LFS_ERR_NOENT; // commit with two attributes @@ -412,25 +412,25 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &data) => LFS_ERR_NOENT; // commit with two attributes, in the other direction @@ -438,24 +438,24 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &data) => LFS_ERR_NOENT; ''' @@ -481,20 +481,20 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &data) => LFS_ERR_NOENT; // commit with two attributes @@ -502,26 +502,26 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &data) => LFS_ERR_NOENT; // commit with two attributes, in the other direction @@ -529,25 +529,25 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; - lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &data) => LFS_ERR_NOENT; ''' @@ -577,21 +577,21 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); @@ -603,21 +603,21 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); ''' @@ -648,24 +648,24 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); @@ -677,24 +677,24 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); ''' @@ -727,29 +727,29 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); @@ -763,29 +763,29 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); ''' @@ -818,32 +818,32 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); @@ -857,32 +857,32 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); @@ -896,32 +896,32 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); @@ -935,32 +935,32 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); ''' @@ -995,37 +995,37 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); @@ -1041,37 +1041,37 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); @@ -1087,37 +1087,37 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); @@ -1133,37 +1133,37 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); ''' @@ -1198,37 +1198,37 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); @@ -1244,37 +1244,37 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); @@ -1290,37 +1290,37 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); @@ -1336,37 +1336,37 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); ''' @@ -1403,40 +1403,40 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); @@ -1454,40 +1454,40 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); @@ -1503,40 +1503,40 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); @@ -1552,40 +1552,40 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); ''' @@ -1624,45 +1624,45 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(5), 0, + LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(5), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(5)); + assert(tag_ == LFSR_TAG_ATTR(5)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); @@ -1682,45 +1682,45 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(5), 0, + LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(5), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(5)); + assert(tag_ == LFSR_TAG_ATTR(5)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); @@ -1738,45 +1738,45 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(5), 0, + LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(5), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(5)); + assert(tag_ == LFSR_TAG_ATTR(5)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); @@ -1794,45 +1794,45 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(5), 0, + LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(5), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(5)); + assert(tag_ == LFSR_TAG_ATTR(5)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); ''' @@ -1871,48 +1871,48 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(5), 0, + LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(5), 0, + LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(5), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(5)); + assert(tag_ == LFSR_TAG_ATTR(5)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); @@ -1932,48 +1932,48 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(5), 0, + LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(5), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(5)); + assert(tag_ == LFSR_TAG_ATTR(5)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); @@ -1993,48 +1993,48 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(5), 0, + LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(5), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(5)); + assert(tag_ == LFSR_TAG_ATTR(5)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); ''' @@ -2075,53 +2075,53 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(5), 0, + LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(6), 0, + LFSR_TAG_ATTR(6), 0, LFSR_DATA_BUF("\xff\xff\xff\xff", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(5), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(5)); + assert(tag_ == LFSR_TAG_ATTR(5)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(6), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(6), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(6)); + assert(tag_ == LFSR_TAG_ATTR(6)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); @@ -2141,53 +2141,53 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(5), 0, + LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(6), 0, + LFSR_TAG_ATTR(6), 0, LFSR_DATA_BUF("\xff\xff\xff\xff", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(5), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(5)); + assert(tag_ == LFSR_TAG_ATTR(5)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(6), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(6), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(6)); + assert(tag_ == LFSR_TAG_ATTR(6)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); @@ -2207,53 +2207,53 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(5), 0, + LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(6), 0, + LFSR_TAG_ATTR(6), 0, LFSR_DATA_BUF("\xff\xff\xff\xff", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(5), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(5)); + assert(tag_ == LFSR_TAG_ATTR(5)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(6), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(6), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(6)); + assert(tag_ == LFSR_TAG_ATTR(6)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); ''' @@ -2307,7 +2307,7 @@ code = ''' struct lfsr_attr attrs[N]; for (unsigned j = 0; j < N; j++) { attrs[j] = LFSR_ATTR( - LFSR_TAG_UATTR(perm[j]+1), 0, + LFSR_TAG_ATTR(perm[j]+1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)); } @@ -2318,9 +2318,9 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; for (unsigned j = 0; j < N; j++) { - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(j+1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(j+1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(j+1)); + assert(tag_ == LFSR_TAG_ATTR(j+1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); } @@ -2400,15 +2400,15 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(perm[j]+1), 0, + LFSR_TAG_ATTR(perm[j]+1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; } lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; for (unsigned j = 0; j < N; j++) { - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(j+1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(j+1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(j+1)); + assert(tag_ == LFSR_TAG_ATTR(j+1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); } @@ -2460,20 +2460,20 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, @@ -2482,12 +2482,12 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, @@ -2498,20 +2498,20 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, @@ -2520,12 +2520,12 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, @@ -2557,21 +2557,21 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, @@ -2580,12 +2580,12 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, @@ -2596,21 +2596,21 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, @@ -2619,12 +2619,12 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, @@ -2676,7 +2676,7 @@ code = ''' struct lfsr_attr attrs[N]; for (unsigned j = 0; j < N; j++) { attrs[j] = LFSR_ATTR( - LFSR_TAG_UATTR(perm[j]+1), 0, + LFSR_TAG_ATTR(perm[j]+1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)); } @@ -2692,7 +2692,7 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(j+1)); + assert(tag_ == LFSR_TAG_ATTR(j+1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); } @@ -2751,7 +2751,7 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(perm[j]+1), 0, + LFSR_TAG_ATTR(perm[j]+1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; } @@ -2762,7 +2762,7 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(j+1)); + assert(tag_ == LFSR_TAG_ATTR(j+1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); } @@ -2808,7 +2808,7 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(j+1), 0, + LFSR_TAG_ATTR(j+1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; } @@ -2850,16 +2850,16 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(perm[j]+1), 0, + LFSR_TAG_ATTR(perm[j]+1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa\xaa\xaa", 6)))) => 0; } // check that all tags have been updated lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; for (unsigned j = 0; j < N; j++) { - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(j+1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(j+1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(j+1)); + assert(tag_ == LFSR_TAG_ATTR(j+1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 6); } @@ -2929,7 +2929,7 @@ code = ''' : TEST_PRNG(&prng); int err = lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(x & 0x7f), 0, + LFSR_TAG_ATTR(x & 0x7f), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))); if (err == LFS_ERR_RANGE) { break; @@ -2947,9 +2947,9 @@ code = ''' = (ORDER == 0) ? i : (ORDER == 1) ? (((lfs_size_t)-1) - i) : TEST_PRNG(&prng); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(x & 0x7f), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(x & 0x7f), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(x & 0x7f)); + assert(tag_ == LFSR_TAG_ATTR(x & 0x7f)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); } @@ -2981,22 +2981,22 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR(1), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0, LFSR_DATA_NULL()))) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // commit with two attributes, remove the first one @@ -3004,41 +3004,41 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR(1), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0, LFSR_DATA_NULL()))) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // commit with two attributes, remove the second one @@ -3046,35 +3046,35 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR(2), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR(2), 0, LFSR_DATA_NULL()))) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; ''' @@ -3133,7 +3133,7 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(perm[j]+1), 0, + LFSR_TAG_ATTR(perm[j]+1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; } @@ -3158,13 +3158,13 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR(j+1), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR(j+1), 0, LFSR_DATA_NULL()))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], CFG->block_size) => 0; for (unsigned k = 0; k < N; k++) { int err = lfsr_rbyd_lookupnext(&lfs, &rbyd, - -1, LFSR_TAG_UATTR(k+1), + -1, LFSR_TAG_ATTR(k+1), &rid_, &tag_, NULL, &data_); assert(!err || err == LFS_ERR_NOENT); if (k == j) { @@ -3172,12 +3172,12 @@ code = ''' assert(err == LFS_ERR_NOENT); } else { assert(err == 0); - assert(tag_ == LFSR_TAG_UATTR(j+1+1)); + assert(tag_ == LFSR_TAG_ATTR(j+1+1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); } } else { - assert(tag_ == LFSR_TAG_UATTR(k+1)); + assert(tag_ == LFSR_TAG_ATTR(k+1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); } @@ -3187,20 +3187,20 @@ code = ''' printf("--- append: %d ---\n", j); lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(j+1), 0, + LFSR_TAG_ATTR(j+1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa\xaa\xaa", 6)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], CFG->block_size) => 0; for (unsigned k = 0; k < N; k++) { lfsr_rbyd_lookupnext(&lfs, &rbyd, - -1, LFSR_TAG_UATTR(k+1), + -1, LFSR_TAG_ATTR(k+1), &rid_, &tag_, NULL, &data_) => 0; if (k == j) { - assert(tag_ == LFSR_TAG_UATTR(k+1)); + assert(tag_ == LFSR_TAG_ATTR(k+1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 6); } else { - assert(tag_ == LFSR_TAG_UATTR(k+1)); + assert(tag_ == LFSR_TAG_ATTR(k+1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); } @@ -3283,7 +3283,7 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(perm[j]+1), 0, + LFSR_TAG_ATTR(perm[j]+1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; } @@ -3308,7 +3308,7 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR(j+1), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR(j+1), 0, LFSR_DATA_NULL()))) => 0; // try traversing over the tags @@ -3320,11 +3320,11 @@ code = ''' lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; if (k >= j) { - assert(tag_ == LFSR_TAG_UATTR(k+1+1)); + assert(tag_ == LFSR_TAG_ATTR(k+1+1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); } else { - assert(tag_ == LFSR_TAG_UATTR(k+1)); + assert(tag_ == LFSR_TAG_ATTR(k+1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); } @@ -3362,139 +3362,139 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)))) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(5), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // try to remove tags that aren't there, this should do nothing lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR(1), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0, LFSR_DATA_NULL()))) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(5), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR(3), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR(3), 0, LFSR_DATA_NULL()))) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(5), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR(5), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR(5), 0, LFSR_DATA_NULL()))) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(5), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // one last fetch to make sure nothing was broken lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(5), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; ''' @@ -3521,243 +3521,243 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(5), 0, + LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)))) => 0; // remove several attributes lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR(1), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0, LFSR_DATA_NULL()), LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR(3), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR(3), 0, LFSR_DATA_NULL()), LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR(5), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR(5), 0, LFSR_DATA_NULL()))) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(5), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // try to remove tags that aren't there, this should do nothing lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR(1), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0, LFSR_DATA_NULL()))) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(5), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR(3), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR(3), 0, LFSR_DATA_NULL()))) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(5), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR(5), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR(5), 0, LFSR_DATA_NULL()))) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(5), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // 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, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR(1), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0, LFSR_DATA_NULL()))) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(5), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR(3), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR(3), 0, LFSR_DATA_NULL()))) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(5), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR(5), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR(5), 0, LFSR_DATA_NULL()))) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(5), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // one last fetch to make sure nothing was broken lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(4), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(4), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(4)); + assert(tag_ == LFSR_TAG_ATTR(4)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(5), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(5), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; ''' @@ -3784,22 +3784,22 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR(1), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0, LFSR_DATA_NULL()))) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // commit with two attributes, remove both @@ -3807,28 +3807,28 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR(1), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0, LFSR_DATA_NULL()), LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR(2), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR(2), 0, LFSR_DATA_NULL()))) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; // commit with two attributes, remove both in the other order @@ -3836,28 +3836,28 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR(2), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR(2), 0, LFSR_DATA_NULL()), LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR(1), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0, LFSR_DATA_NULL()))) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; ''' @@ -3898,7 +3898,7 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(j+1), 0, + LFSR_TAG_ATTR(j+1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; } @@ -3940,31 +3940,31 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR(perm[j]+1), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR(perm[j]+1), 0, LFSR_DATA_NULL()))) => 0; } // check that all tags are now removed lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; for (unsigned j = 0; j < N; j++) { - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(j+1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(j+1), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; } // try resuming from all tags being removed lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa\xaa\xaa", 6)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 6); for (unsigned j = 1; j < N; j++) { - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(j+1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(j+1), &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; } @@ -4053,7 +4053,7 @@ code = ''' // update our rbyd lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(attr), 0, + LFSR_TAG_ATTR(attr), 0, LFSR_DATA_BUF(&(uint8_t){'a'+(i % 26)}, 1)))) => 0; } else { // update our sim @@ -4061,7 +4061,7 @@ code = ''' // update our rbyd lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR(attr), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR(attr), 0, LFSR_DATA_NULL()))) => 0; } } @@ -4082,7 +4082,7 @@ code = ''' printf("rbyd: ["); first = true; for (unsigned attr = 0; attr < N; attr++) { - int err = lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(attr), + int err = lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(attr), &data); if (!err) { lfs_ssize_t size = lfsr_data_read(&lfs, &data, buffer, 4); @@ -4096,7 +4096,7 @@ code = ''' printf("]\n"); for (unsigned attr = 0; attr < N; attr++) { - int err = lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_UATTR(attr), + int err = lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(attr), &data); if (sim[attr]) { assert(err == 0); @@ -4920,14 +4920,14 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)))) => 0; assert(rbyd.weight == 1); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); @@ -4936,7 +4936,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); @@ -4948,26 +4948,26 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xbb\xbb", 2)))) => 0; assert(rbyd.weight == 2); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); @@ -4976,13 +4976,13 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); @@ -4994,19 +4994,19 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xbb\xbb", 2)), LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xcc\xcc", 2)))) => 0; assert(rbyd.weight == 3); @@ -5036,19 +5036,19 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xcc\xcc", 2) == 0); @@ -5057,19 +5057,19 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xcc\xcc", 2) == 0); ''' @@ -5100,14 +5100,14 @@ code = ''' LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)))) => 0; assert(rbyd.weight == 1); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); @@ -5116,7 +5116,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); @@ -5129,7 +5129,7 @@ code = ''' LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_ATTRS( LFSR_ATTR( @@ -5137,20 +5137,20 @@ code = ''' LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xbb\xbb", 2)))) => 0; assert(rbyd.weight == 2); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); @@ -5159,13 +5159,13 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); @@ -5178,7 +5178,7 @@ code = ''' LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xbb\xbb", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_ATTRS( LFSR_ATTR( @@ -5186,20 +5186,20 @@ code = ''' LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)))) => 0; assert(rbyd.weight == 2); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); @@ -5208,13 +5208,13 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); @@ -5227,7 +5227,7 @@ code = ''' LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_ATTRS( LFSR_ATTR( @@ -5235,7 +5235,7 @@ code = ''' LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xbb\xbb", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_ATTRS( LFSR_ATTR( @@ -5243,7 +5243,7 @@ code = ''' LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xcc\xcc", 2)))) => 0; assert(rbyd.weight == 3); @@ -5273,19 +5273,19 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xcc\xcc", 2) == 0); @@ -5294,19 +5294,19 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xcc\xcc", 2) == 0); @@ -5319,7 +5319,7 @@ code = ''' LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xbb\xbb", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_ATTRS( LFSR_ATTR( @@ -5327,7 +5327,7 @@ code = ''' LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xcc\xcc", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_ATTRS( LFSR_ATTR( @@ -5335,26 +5335,26 @@ code = ''' LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)))) => 0; assert(rbyd.weight == 3); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xcc\xcc", 2) == 0); @@ -5363,19 +5363,19 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xcc\xcc", 2) == 0); @@ -5388,7 +5388,7 @@ code = ''' LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_ATTRS( LFSR_ATTR( @@ -5396,7 +5396,7 @@ code = ''' LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xcc\xcc", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_ATTRS( LFSR_ATTR( @@ -5404,26 +5404,26 @@ code = ''' LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xbb\xbb", 2)))) => 0; assert(rbyd.weight == 3); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xcc\xcc", 2) == 0); @@ -5432,19 +5432,19 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xcc\xcc", 2) == 0); ''' @@ -5524,7 +5524,7 @@ code = ''' for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(u+1), 0, + LFSR_TAG_ATTR(u+1), 0, LFSR_DATA_BUF(names[perm[j] % 6], 2)))) => 0; } } @@ -5537,7 +5537,7 @@ code = ''' assert(memcmp(buffer, names[j % 6], 4) == 0); for (unsigned u = 0; u < M; u++) { - lfsr_rbyd_lookup(&lfs, &rbyd, j, LFSR_TAG_UATTR(u+1), + lfsr_rbyd_lookup(&lfs, &rbyd, j, LFSR_TAG_ATTR(u+1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, names[j % 6], 2) == 0); @@ -5596,13 +5596,13 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xbb\xbb", 2)))) => 0; lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, @@ -5615,7 +5615,7 @@ code = ''' assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 0); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -5631,7 +5631,7 @@ code = ''' assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 1); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -5651,7 +5651,7 @@ code = ''' assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 0); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -5667,7 +5667,7 @@ code = ''' assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 1); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -5708,7 +5708,7 @@ code = ''' LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_ATTRS( LFSR_ATTR( @@ -5716,7 +5716,7 @@ code = ''' LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xbb\xbb", 2)))) => 0; lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, @@ -5729,7 +5729,7 @@ code = ''' assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 0); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -5745,7 +5745,7 @@ code = ''' assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 1); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -5765,7 +5765,7 @@ code = ''' assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 0); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -5781,7 +5781,7 @@ code = ''' assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 1); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -5799,7 +5799,7 @@ code = ''' LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xbb\xbb", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_ATTRS( LFSR_ATTR( @@ -5807,7 +5807,7 @@ code = ''' LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)))) => 0; lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, @@ -5820,7 +5820,7 @@ code = ''' assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 0); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -5836,7 +5836,7 @@ code = ''' assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 1); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -5856,7 +5856,7 @@ code = ''' assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 0); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -5872,7 +5872,7 @@ code = ''' assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 1); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -5956,7 +5956,7 @@ code = ''' for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(u+1), 0, + LFSR_TAG_ATTR(u+1), 0, LFSR_DATA_BUF(names[perm[j] % 6], 2)))) => 0; } } @@ -5981,7 +5981,7 @@ code = ''' for (unsigned u = 0; u < M; u++) { lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(u+1)); + assert(tag_ == LFSR_TAG_ATTR(u+1)); assert(rid_ == j); assert(lfsr_data_size(data_) == 2); @@ -6046,7 +6046,7 @@ code = ''' for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(u+1), 0, + LFSR_TAG_ATTR(u+1), 0, LFSR_DATA_BUF(names[j % 6], 2)))) => 0; } } @@ -6089,7 +6089,7 @@ code = ''' for (unsigned j = 0; j < N*M; j++) { lfsr_rbyd_commit(&lfs, &rbyd, perm[j]/M, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(perm[j]%M+1), 0, + LFSR_TAG_ATTR(perm[j]%M+1), 0, LFSR_DATA_BUF(names[(perm[j]/M) % 6], 3)))) => 0; } @@ -6101,7 +6101,7 @@ code = ''' assert(memcmp(buffer, names[j % 6], 4) == 0); for (unsigned u = 0; u < M; u++) { - lfsr_rbyd_lookup(&lfs, &rbyd, j, LFSR_TAG_UATTR(u+1), + lfsr_rbyd_lookup(&lfs, &rbyd, j, LFSR_TAG_ATTR(u+1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 3; assert(memcmp(buffer, names[j % 6], 3) == 0); @@ -6213,7 +6213,7 @@ code = ''' for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(u+1), 0, + LFSR_TAG_ATTR(u+1), 0, LFSR_DATA_BUF(names[perm[j] % 6], 2)))) => 0; } } @@ -6239,7 +6239,7 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, j/M, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR((j%M)+1), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR((j%M)+1), 0, LFSR_DATA_NULL()))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], CFG->block_size) => 0; @@ -6250,7 +6250,7 @@ code = ''' for (unsigned u = 0; u < M; u++) { int err = lfsr_rbyd_lookupnext(&lfs, &rbyd, - k, LFSR_TAG_UATTR(u+1), + k, LFSR_TAG_ATTR(u+1), &rid_, &tag_, NULL, &data_); assert(!err || err == LFS_ERR_NOENT); if (k == j/M && u == j%M) { @@ -6263,12 +6263,12 @@ code = ''' assert(lfsr_data_size(data_) == 4); } else { assert(err == 0); - assert(tag_ == LFSR_TAG_UATTR(u+1+1)); + assert(tag_ == LFSR_TAG_ATTR(u+1+1)); assert(rid_ == k); assert(lfsr_data_size(data_) == 2); } } else { - assert(tag_ == LFSR_TAG_UATTR(u+1)); + assert(tag_ == LFSR_TAG_ATTR(u+1)); assert(rid_ == k); assert(lfsr_data_size(data_) == 2); @@ -6283,7 +6283,7 @@ code = ''' printf("--- append: rid%jd, %jd ---\n", j/M, (j%M)+1); lfsr_rbyd_commit(&lfs, &rbyd, j/M, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR((j%M)+1), 0, + LFSR_TAG_ATTR((j%M)+1), 0, LFSR_DATA_BUF(names[(j/M)%6], 3)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], CFG->block_size) => 0; @@ -6294,10 +6294,10 @@ code = ''' for (unsigned u = 0; u < M; u++) { lfsr_rbyd_lookupnext(&lfs, &rbyd, - k, LFSR_TAG_UATTR(u+1), + k, LFSR_TAG_ATTR(u+1), &rid_, &tag_, NULL, &data_) => 0; if (k == j/M && u == j%M) { - assert(tag_ == LFSR_TAG_UATTR(u+1)); + assert(tag_ == LFSR_TAG_ATTR(u+1)); assert(rid_ == k); assert(lfsr_data_size(data_) == 3); @@ -6305,7 +6305,7 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, 4) => 3; assert(memcmp(buffer, names[k % 6], 3) == 0); } else { - assert(tag_ == LFSR_TAG_UATTR(u+1)); + assert(tag_ == LFSR_TAG_ATTR(u+1)); assert(rid_ == k); assert(lfsr_data_size(data_) == 2); @@ -6393,7 +6393,7 @@ code = ''' for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(u+1), 0, + LFSR_TAG_ATTR(u+1), 0, LFSR_DATA_BUF(names[j % 6], 2)))) => 0; } } @@ -6436,7 +6436,7 @@ code = ''' for (unsigned j = 0; j < N*M; j++) { lfsr_rbyd_commit(&lfs, &rbyd, perm[j]/M, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR(perm[j]%M+1), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR(perm[j]%M+1), 0, LFSR_DATA_NULL()))) => 0; } @@ -6448,7 +6448,7 @@ code = ''' assert(memcmp(buffer, names[j % 6], 4) == 0); for (unsigned u = 0; u < M; u++) { - lfsr_rbyd_lookup(&lfs, &rbyd, j, LFSR_TAG_UATTR(u+1), + lfsr_rbyd_lookup(&lfs, &rbyd, j, LFSR_TAG_ATTR(u+1), &data) => LFS_ERR_NOENT; } } @@ -6531,7 +6531,7 @@ code = ''' attrs[0] = LFSR_ATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(names[x % 6], 4)); for (unsigned u = 0; u < M; u++) { attrs[1+u] = LFSR_ATTR( - LFSR_TAG_UATTR(u+1), 0, + LFSR_TAG_ATTR(u+1), 0, LFSR_DATA_BUF(names[x % 6], 2)); } @@ -6557,9 +6557,9 @@ code = ''' assert(lfsr_data_size(data_) == 4); for (unsigned u = 0; u < M; u++) { - lfsr_rbyd_lookupnext(&lfs, &rbyd, x, LFSR_TAG_UATTR(u+1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, x, LFSR_TAG_ATTR(u+1), &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(u+1)); + assert(tag_ == LFSR_TAG_ATTR(u+1)); assert(rid_ == x); assert(lfsr_data_size(data_) == 2); } @@ -6638,7 +6638,7 @@ code = ''' // note the data size differences here lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(perm[j]+1), 0, + LFSR_TAG_ATTR(perm[j]+1), 0, LFSR_DATA_BUF(names[perm[j] % 6], 1)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_ATTRS( @@ -6652,7 +6652,7 @@ code = ''' assert(rbyd.weight == N); for (unsigned j = 0; j < N; j++) { lfsr_rbyd_lookup(&lfs, &rbyd, - -1, LFSR_TAG_UATTR(j+1), &data) => 0; + -1, LFSR_TAG_ATTR(j+1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 1; assert(memcmp(buffer, names[j % 6], 1) == 0); } @@ -6670,7 +6670,7 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(j+1)); + assert(tag_ == LFSR_TAG_ATTR(j+1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 1); @@ -6784,7 +6784,7 @@ code = ''' // note the data size differences here lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(perm[j]+1), 0, + LFSR_TAG_ATTR(perm[j]+1), 0, LFSR_DATA_BUF(names[perm[j] % 6], 1)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_ATTRS( @@ -6794,7 +6794,7 @@ code = ''' for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(u+1), 0, + LFSR_TAG_ATTR(u+1), 0, LFSR_DATA_BUF(names[perm[j] % 6], 2)))) => 0; } } @@ -6804,7 +6804,7 @@ code = ''' assert(rbyd.weight == N); for (unsigned j = 0; j < N; j++) { lfsr_rbyd_lookup(&lfs, &rbyd, - -1, LFSR_TAG_UATTR(j+1), &data) => 0; + -1, LFSR_TAG_ATTR(j+1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 1; assert(memcmp(buffer, names[j % 6], 1) == 0); } @@ -6814,7 +6814,7 @@ code = ''' assert(memcmp(buffer, names[j % 6], 4) == 0); for (unsigned u = 0; u < M; u++) { - lfsr_rbyd_lookup(&lfs, &rbyd, j, LFSR_TAG_UATTR(u+1), + lfsr_rbyd_lookup(&lfs, &rbyd, j, LFSR_TAG_ATTR(u+1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, names[j % 6], 2) == 0); @@ -6828,7 +6828,7 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(j+1)); + assert(tag_ == LFSR_TAG_ATTR(j+1)); assert(rid_ == -1); assert(lfsr_data_size(data_) == 1); @@ -6850,7 +6850,7 @@ code = ''' for (unsigned u = 0; u < M; u++) { lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(u+1)); + assert(tag_ == LFSR_TAG_ATTR(u+1)); assert(rid_ == j); assert(lfsr_data_size(data_) == 2); @@ -7091,13 +7091,13 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xbb\xbb", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_ATTRS( LFSR_ATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; @@ -7106,12 +7106,12 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; @@ -7119,12 +7119,12 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; // try to delete the other rid @@ -7135,13 +7135,13 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xbb\xbb", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_ATTRS( LFSR_ATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; @@ -7150,12 +7150,12 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; @@ -7163,12 +7163,12 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; // try to delete the largest of three @@ -7179,19 +7179,19 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xbb\xbb", 2)), LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xcc\xcc", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_ATTRS( LFSR_ATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; @@ -7200,18 +7200,18 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; @@ -7219,18 +7219,18 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; // try to delete the smallest of three @@ -7241,19 +7241,19 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xbb\xbb", 2)), LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xcc\xcc", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_ATTRS( LFSR_ATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; @@ -7262,18 +7262,18 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xcc\xcc", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; @@ -7281,18 +7281,18 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xcc\xcc", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; // try to delete the middle @@ -7303,19 +7303,19 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xbb\xbb", 2)), LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xcc\xcc", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_ATTRS( LFSR_ATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; @@ -7324,18 +7324,18 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xcc\xcc", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; @@ -7343,18 +7343,18 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xcc\xcc", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; ''' @@ -7393,59 +7393,59 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(5), 0, + LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(6), 0, + LFSR_TAG_ATTR(6), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xcc\xcc", 2)), LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(5), 0, + LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(6), 0, + LFSR_TAG_ATTR(6), 0, LFSR_DATA_BUF("\xee\xee", 2)), // propagate yellow to the root LFSR_ATTR( - LFSR_TAG_UATTR(6), 0, + LFSR_TAG_ATTR(6), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(6), 0, + LFSR_TAG_ATTR(6), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(6), 0, + LFSR_TAG_ATTR(6), 0, LFSR_DATA_BUF("\xee\xee", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_ATTRS( @@ -7455,48 +7455,48 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; @@ -7504,48 +7504,48 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; // try to recreate @@ -7558,22 +7558,22 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; @@ -7582,27 +7582,27 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; @@ -7610,22 +7610,22 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; @@ -7634,27 +7634,27 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; ''' @@ -7691,50 +7691,50 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xcc\xcc", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(3), +1, + LFSR_TAG_ATTR(3), +1, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(5), 0, + LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("\xee\xee", 2)), // propagate yellow to the root LFSR_ATTR( - LFSR_TAG_UATTR(5), 0, + LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(5), 0, + LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("\xee\xee", 2)))) => 0; // this gets a bit messy as we try to make the rbyd take the right shape lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(5), 0, + LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("\xaa\xaa", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( LFSR_TAG_REG, 0, @@ -7747,42 +7747,42 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; @@ -7790,42 +7790,42 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; // try to recreate @@ -7838,19 +7838,19 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; @@ -7859,24 +7859,24 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; @@ -7884,19 +7884,19 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; @@ -7905,24 +7905,24 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; ''' @@ -7959,81 +7959,81 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xcc\xcc", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(4), +1, + LFSR_TAG_ATTR(4), +1, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(5), 0, + LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(6), 0, + LFSR_TAG_ATTR(6), 0, LFSR_DATA_BUF("\xee\xee", 2)), // propagate yellow to the root LFSR_ATTR( - LFSR_TAG_UATTR(6), 0, + LFSR_TAG_ATTR(6), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(6), 0, + LFSR_TAG_ATTR(6), 0, LFSR_DATA_BUF("\xee\xee", 2)))) => 0; // this gets a bit messy as we try to make the rbyd take the right shape lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(5), 0, + LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(6), 0, + LFSR_TAG_ATTR(6), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(7), 0, + LFSR_TAG_ATTR(7), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(8), 0, + LFSR_TAG_ATTR(8), 0, LFSR_DATA_BUF("\xaa\xaa", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), // propagate yellow LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xaa\xaa", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( LFSR_TAG_REG, 0, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(8), 0, + LFSR_TAG_ATTR(8), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(7), 0, + LFSR_TAG_ATTR(7), 0, LFSR_DATA_BUF("\xee\xee", 2)), // propagate yellow LFSR_ATTR( - LFSR_TAG_UATTR(7), 0, + LFSR_TAG_ATTR(7), 0, LFSR_DATA_BUF("\xee\xee", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_ATTRS( @@ -8043,60 +8043,60 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(7), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(8), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(8), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(7), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(8), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(8), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; @@ -8104,60 +8104,60 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(7), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(8), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(8), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(7), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(8), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(8), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; // try to recreate @@ -8170,28 +8170,28 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(7), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(8), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(8), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; @@ -8200,33 +8200,33 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(7), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(8), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(8), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; @@ -8234,28 +8234,28 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(7), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(8), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(8), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; @@ -8264,33 +8264,33 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(7), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(8), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(8), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; ''' @@ -8330,62 +8330,62 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(4), +1, + LFSR_TAG_ATTR(4), +1, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(5), 0, + LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(6), 0, + LFSR_TAG_ATTR(6), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(7), 0, + LFSR_TAG_ATTR(7), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(8), 0, + LFSR_TAG_ATTR(8), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(9), 0, + LFSR_TAG_ATTR(9), 0, LFSR_DATA_BUF("\xee\xee", 2)), // propagate yellow to the root LFSR_ATTR( - LFSR_TAG_UATTR(9), 0, + LFSR_TAG_ATTR(9), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(9), 0, + LFSR_TAG_ATTR(9), 0, LFSR_DATA_BUF("\xee\xee", 2)))) => 0; // this gets a bit messy as we try to make the rbyd take the right shape lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(5), 0, + LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(6), 0, + LFSR_TAG_ATTR(6), 0, LFSR_DATA_BUF("\xaa\xaa", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( LFSR_TAG_REG, 0, @@ -8402,57 +8402,57 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(7), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(8), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(8), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(9), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(9), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; @@ -8460,57 +8460,57 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(7), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(8), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(8), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(9), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(9), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; // try to recreate @@ -8523,22 +8523,22 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; @@ -8547,36 +8547,36 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(7), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(8), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(8), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(9), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(9), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; @@ -8584,22 +8584,22 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; @@ -8608,36 +8608,36 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(7), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(8), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(8), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(9), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(9), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; ''' @@ -8677,69 +8677,69 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(9), 0, + LFSR_TAG_ATTR(9), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), +1, + LFSR_TAG_ATTR(2), +1, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(5), 0, + LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(6), 0, + LFSR_TAG_ATTR(6), 0, LFSR_DATA_BUF("\xee\xee", 2)), // propagate yellow to the root LFSR_ATTR( - LFSR_TAG_UATTR(6), 0, + LFSR_TAG_ATTR(6), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(6), 0, + LFSR_TAG_ATTR(6), 0, LFSR_DATA_BUF("\xee\xee", 2)))) => 0; // this gets a bit messy as we try to make the rbyd take the right shape lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( LFSR_TAG_REG, 0, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(5), 0, + LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(6), 0, + LFSR_TAG_ATTR(6), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(7), 0, + LFSR_TAG_ATTR(7), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(8), 0, + LFSR_TAG_ATTR(8), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), // propagate yellow LFSR_ATTR( - LFSR_TAG_UATTR(8), 0, + LFSR_TAG_ATTR(8), 0, LFSR_DATA_BUF("\xaa\xaa", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_ATTRS( @@ -8749,57 +8749,57 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(7), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(8), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(8), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(9), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(9), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; @@ -8807,57 +8807,57 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(7), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(8), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(8), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(9), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(9), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; // try to recreate @@ -8870,31 +8870,31 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(7), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(8), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(8), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(9), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(9), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; @@ -8903,27 +8903,27 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; @@ -8931,31 +8931,31 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(7), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(8), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(8), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(9), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(9), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; @@ -8964,27 +8964,27 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; ''' @@ -9024,70 +9024,70 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), +1, + LFSR_TAG_ATTR(2), +1, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(5), 0, + LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(6), 0, + LFSR_TAG_ATTR(6), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(7), 0, + LFSR_TAG_ATTR(7), 0, LFSR_DATA_BUF("\xee\xee", 2)), // propagate yellow to the root LFSR_ATTR( - LFSR_TAG_UATTR(7), 0, + LFSR_TAG_ATTR(7), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(7), 0, + LFSR_TAG_ATTR(7), 0, LFSR_DATA_BUF("\xee\xee", 2)))) => 0; // this gets a bit messy as we try to make the rbyd take the right shape lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(5), 0, + LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(6), 0, + LFSR_TAG_ATTR(6), 0, LFSR_DATA_BUF("\xaa\xaa", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( LFSR_TAG_REG, 0, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xcc\xcc", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xcc\xcc", 2)), // propagate yellow LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xcc\xcc", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_ATTRS( @@ -9097,51 +9097,51 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(7), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; @@ -9149,51 +9149,51 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(7), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; // try to recreate @@ -9206,22 +9206,22 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; @@ -9230,30 +9230,30 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(7), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; @@ -9261,22 +9261,22 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; @@ -9285,30 +9285,30 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(7), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; ''' @@ -9348,62 +9348,62 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(1), +1, + LFSR_TAG_ATTR(1), +1, LFSR_DATA_BUF("\xcc\xcc", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xcc\xcc", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(2), +1, + LFSR_TAG_ATTR(2), +1, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(5), 0, + LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(6), 0, + LFSR_TAG_ATTR(6), 0, LFSR_DATA_BUF("\xee\xee", 2)), // propagate yellow to the root LFSR_ATTR( - LFSR_TAG_UATTR(6), 0, + LFSR_TAG_ATTR(6), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(6), 0, + LFSR_TAG_ATTR(6), 0, LFSR_DATA_BUF("\xee\xee", 2)))) => 0; // this gets a bit messy as we try to make the rbyd take the right shape lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( LFSR_TAG_REG, 0, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(5), 0, + LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(6), 0, + LFSR_TAG_ATTR(6), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(7), 0, + LFSR_TAG_ATTR(7), 0, LFSR_DATA_BUF("\xaa\xaa", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_ATTRS( LFSR_ATTR( @@ -9421,51 +9421,51 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(7), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; @@ -9473,51 +9473,51 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(7), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; // try to recreate @@ -9530,25 +9530,25 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(7), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; @@ -9557,27 +9557,27 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; @@ -9585,25 +9585,25 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(7), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; @@ -9612,27 +9612,27 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; ''' @@ -9674,85 +9674,85 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(5), 0, + LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(6), 0, + LFSR_TAG_ATTR(6), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(2), +1, + LFSR_TAG_ATTR(2), +1, LFSR_DATA_BUF("\xcc\xcc", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc", 2)), LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(5), 0, + LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(6), 0, + LFSR_TAG_ATTR(6), 0, LFSR_DATA_BUF("\xee\xee", 2)), // propagate yellow to the root LFSR_ATTR( - LFSR_TAG_UATTR(6), 0, + LFSR_TAG_ATTR(6), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(6), 0, + LFSR_TAG_ATTR(6), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(6), 0, + LFSR_TAG_ATTR(6), 0, LFSR_DATA_BUF("\xee\xee", 2)))) => 0; // this gets a bit messy as we try to make the rbyd take the right shape lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(7), 0, + LFSR_TAG_ATTR(7), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(8), 0, + LFSR_TAG_ATTR(8), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(11), 0, + LFSR_TAG_ATTR(11), 0, LFSR_DATA_BUF("\xaa\xaa", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xcc\xcc", 2)), // propagate yellow LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xcc\xcc", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xcc\xcc", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(12), 0, + LFSR_TAG_ATTR(12), 0, LFSR_DATA_BUF("\xaa\xaa", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_ATTRS( LFSR_ATTR( @@ -9764,21 +9764,21 @@ code = ''' LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(13), 0, + LFSR_TAG_ATTR(13), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(14), 0, + LFSR_TAG_ATTR(14), 0, LFSR_DATA_BUF("\xaa\xaa", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(9), 0, + LFSR_TAG_ATTR(9), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(10), 0, + LFSR_TAG_ATTR(10), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), // propagate yellow LFSR_ATTR( - LFSR_TAG_UATTR(10), 0, + LFSR_TAG_ATTR(10), 0, LFSR_DATA_BUF("\xaa\xaa", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_ATTRS( @@ -9788,72 +9788,72 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(7), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(8), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(8), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(9), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(9), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(10), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(10), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(11), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(11), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(12), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(12), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(13), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(13), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(14), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(14), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; @@ -9861,72 +9861,72 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(7), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(8), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(8), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(9), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(9), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(10), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(10), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(11), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(11), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(12), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(12), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(13), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(13), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(14), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(14), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; // try to recreate @@ -9939,46 +9939,46 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(7), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(8), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(8), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(9), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(9), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(10), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(10), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(11), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(11), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(12), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(12), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(13), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(13), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(14), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(14), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; @@ -9987,27 +9987,27 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; @@ -10015,46 +10015,46 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(7), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(8), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(8), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(9), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(9), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(10), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(10), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(11), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(11), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(12), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(12), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(13), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(13), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(14), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(14), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; @@ -10063,27 +10063,27 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; ''' @@ -10125,109 +10125,109 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(5), 0, + LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(6), 0, + LFSR_TAG_ATTR(6), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xcc\xcc", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xcc\xcc", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(6), +1, + LFSR_TAG_ATTR(6), +1, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(7), 0, + LFSR_TAG_ATTR(7), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(8), 0, + LFSR_TAG_ATTR(8), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(9), 0, + LFSR_TAG_ATTR(9), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(10), 0, + LFSR_TAG_ATTR(10), 0, LFSR_DATA_BUF("\xee\xee", 2)), // propagate yellow to the root LFSR_ATTR( - LFSR_TAG_UATTR(10), 0, + LFSR_TAG_ATTR(10), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(10), 0, + LFSR_TAG_ATTR(10), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(10), 0, + LFSR_TAG_ATTR(10), 0, LFSR_DATA_BUF("\xee\xee", 2)))) => 0; // this gets a bit messy as we try to make the rbyd take the right shape lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(11), 0, + LFSR_TAG_ATTR(11), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(12), 0, + LFSR_TAG_ATTR(12), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(13), 0, + LFSR_TAG_ATTR(13), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(14), 0, + LFSR_TAG_ATTR(14), 0, LFSR_DATA_BUF("\xee\xee", 2)), // propagate yellow LFSR_ATTR( - LFSR_TAG_UATTR(14), 0, + LFSR_TAG_ATTR(14), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(14), 0, + LFSR_TAG_ATTR(14), 0, LFSR_DATA_BUF("\xee\xee", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xee\xee", 2)), // propagate yellow LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xee\xee", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( LFSR_TAG_REG, 0, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(5), 0, + LFSR_TAG_ATTR(5), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xee\xee", 2)), // propagate yellow LFSR_ATTR( - LFSR_TAG_UATTR(4), 0, + LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xee\xee", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_ATTRS( @@ -10237,72 +10237,72 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(7), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(8), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(8), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(9), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(9), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(10), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(10), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(11), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(11), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(12), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(12), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(13), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(13), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(14), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(14), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; @@ -10310,72 +10310,72 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(7), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(8), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(8), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(9), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(9), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(10), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(10), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(11), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(11), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(12), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(12), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(13), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(13), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_UATTR(14), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(14), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; // try to recreate @@ -10388,22 +10388,22 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; @@ -10412,51 +10412,51 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(7), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(8), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(8), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(9), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(9), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(10), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(10), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(11), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(11), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(12), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(12), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(13), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(13), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(14), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(14), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; @@ -10464,22 +10464,22 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; @@ -10488,51 +10488,51 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(2), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(3), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(4), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(4), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(5), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(6), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(7), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(8), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(8), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(9), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(9), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(10), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(10), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(11), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(11), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(12), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(12), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(13), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(13), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_UATTR(14), &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(14), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; ''' @@ -10775,7 +10775,7 @@ code = ''' for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(u+1), 0, + LFSR_TAG_ATTR(u+1), 0, LFSR_DATA_BUF(names[perm[j] % 6], 2)))) => 0; } } @@ -10817,7 +10817,7 @@ code = ''' for (unsigned u = 0; u < M; u++) { lfsr_rbyd_lookup(&lfs, &rbyd, - k, LFSR_TAG_UATTR(u+1), &data) => 0; + k, LFSR_TAG_ATTR(u+1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; if (k >= j) { assert(memcmp(buffer, names[(k+1) % 6], 2) == 0); @@ -10828,7 +10828,7 @@ code = ''' } lfsr_rbyd_lookup(&lfs, &rbyd, N-1, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, N-1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, N-1, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; // try recreating the rid to make sure things still work @@ -10840,7 +10840,7 @@ code = ''' for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(u+1), 0, + LFSR_TAG_ATTR(u+1), 0, LFSR_DATA_BUF(names[j % 6], 3)))) => 0; } assert(rbyd.weight == N); @@ -10855,7 +10855,7 @@ code = ''' for (unsigned u = 0; u < M; u++) { lfsr_rbyd_lookup(&lfs, &rbyd, - k, LFSR_TAG_UATTR(u+1), &data) => 0; + k, LFSR_TAG_ATTR(u+1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 6) => 3; assert(memcmp(buffer, names[k % 6], 3) == 0); } @@ -10866,7 +10866,7 @@ code = ''' for (unsigned u = 0; u < M; u++) { lfsr_rbyd_lookup(&lfs, &rbyd, - k, LFSR_TAG_UATTR(u+1), &data) => 0; + k, LFSR_TAG_ATTR(u+1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 6) => 2; assert(memcmp(buffer, names[k % 6], 2) == 0); } @@ -11105,7 +11105,7 @@ code = ''' for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(u+1), 0, + LFSR_TAG_ATTR(u+1), 0, LFSR_DATA_BUF(names[perm[j] % 6], 2)))) => 0; } } @@ -11158,7 +11158,7 @@ code = ''' for (unsigned u = 0; u < M; u++) { lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(u+1)); + assert(tag_ == LFSR_TAG_ATTR(u+1)); assert(rid_ == k); assert(lfsr_data_size(data_) == 2); @@ -11347,7 +11347,7 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_ATTRS( LFSR_ATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; @@ -11369,13 +11369,13 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xbb\xbb", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_ATTRS( LFSR_ATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()), @@ -11398,13 +11398,13 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xbb\xbb", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_ATTRS( LFSR_ATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; @@ -11428,19 +11428,19 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xbb\xbb", 2)), LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xcc\xcc", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_ATTRS( LFSR_ATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()), @@ -11464,19 +11464,19 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xbb\xbb", 2)), LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xcc\xcc", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_ATTRS( LFSR_ATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; @@ -11694,7 +11694,7 @@ code = ''' for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(u+1), 0, + LFSR_TAG_ATTR(u+1), 0, LFSR_DATA_BUF(names[j % 6], 2)))) => 0; } } @@ -11765,7 +11765,7 @@ code = ''' for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(u+1), 0, + LFSR_TAG_ATTR(u+1), 0, LFSR_DATA_BUF("\xaa\xaa\xaa", 3)))) => 0; } assert(rbyd.weight == 1); @@ -11778,7 +11778,7 @@ code = ''' assert(memcmp(buffer, "\xaa\xaa\xaa\xaa\xaa\xaa", 6) == 0); for (unsigned u = 0; u < M; u++) { lfsr_rbyd_lookup(&lfs, &rbyd, - 0, LFSR_TAG_UATTR(u+1), &data) => 0; + 0, LFSR_TAG_ATTR(u+1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 6) => 3; assert(memcmp(buffer, "\xaa\xaa\xaa", 3) == 0); } @@ -11786,7 +11786,7 @@ code = ''' 1, LFSR_TAG_REG, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, - 1, LFSR_TAG_UATTR(1), + 1, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; // keep track of the worst size @@ -12500,21 +12500,21 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("unrelated", 9)), LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xaa\xaa", 2)))) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); @@ -12524,23 +12524,23 @@ code = ''' assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); @@ -12550,15 +12550,15 @@ code = ''' assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -12569,18 +12569,18 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xbb\xbb", 2)), LFSR_ATTR( LFSR_TAG_GROW, +1, LFSR_DATA_NULL()), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb", 2)))) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); @@ -12590,15 +12590,15 @@ code = ''' assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -12608,23 +12608,23 @@ code = ''' assert(rid_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); @@ -12634,15 +12634,15 @@ code = ''' assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -12652,15 +12652,15 @@ code = ''' assert(rid_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -12671,18 +12671,18 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xcc\xcc", 2)), LFSR_ATTR( LFSR_TAG_GROW, +2, LFSR_DATA_NULL()), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xcc\xcc", 2)))) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); @@ -12692,15 +12692,15 @@ code = ''' assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -12710,15 +12710,15 @@ code = ''' assert(rid_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -12728,23 +12728,23 @@ code = ''' assert(rid_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); @@ -12754,15 +12754,15 @@ code = ''' assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -12772,15 +12772,15 @@ code = ''' assert(rid_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -12790,15 +12790,15 @@ code = ''' assert(rid_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -12809,18 +12809,18 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xdd\xdd", 2)), LFSR_ATTR( LFSR_TAG_GROW, +3, LFSR_DATA_NULL()), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xdd\xdd", 2)))) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); @@ -12830,15 +12830,15 @@ code = ''' assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -12848,15 +12848,15 @@ code = ''' assert(rid_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -12866,15 +12866,15 @@ code = ''' assert(rid_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -12884,23 +12884,23 @@ code = ''' assert(rid_ == 9); assert(weight_ == 4); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 9); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 9); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); @@ -12910,15 +12910,15 @@ code = ''' assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -12928,15 +12928,15 @@ code = ''' assert(rid_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -12946,15 +12946,15 @@ code = ''' assert(rid_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -12964,15 +12964,15 @@ code = ''' assert(rid_ == 9); assert(weight_ == 4); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 9); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 9); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -12983,18 +12983,18 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( LFSR_TAG_GROW, +4, LFSR_DATA_NULL()), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xee\xee", 2)))) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); @@ -13004,15 +13004,15 @@ code = ''' assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -13022,15 +13022,15 @@ code = ''' assert(rid_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -13040,15 +13040,15 @@ code = ''' assert(rid_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -13058,15 +13058,15 @@ code = ''' assert(rid_ == 9); assert(weight_ == 4); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 9); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 9); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -13076,23 +13076,23 @@ code = ''' assert(rid_ == 14); assert(weight_ == 5); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 14, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 14, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 14); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 14, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 14, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 14); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); @@ -13102,15 +13102,15 @@ code = ''' assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -13120,15 +13120,15 @@ code = ''' assert(rid_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -13138,15 +13138,15 @@ code = ''' assert(rid_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -13156,15 +13156,15 @@ code = ''' assert(rid_ == 9); assert(weight_ == 4); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 9); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 9); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -13174,15 +13174,15 @@ code = ''' assert(rid_ == 14); assert(weight_ == 5); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 14, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 14, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 14); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 14, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, 14, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 14); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -13211,75 +13211,75 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("unrelated", 9)), // make id0 with weight w1 LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), // make id2 with weight w2 LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xbb\xbb", 2)), LFSR_ATTR( LFSR_TAG_GROW, +1, LFSR_DATA_NULL()), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xbb\xbb", 2)), // make id5 with weight w3 LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xcc\xcc", 2)), LFSR_ATTR( LFSR_TAG_GROW, +2, LFSR_DATA_NULL()), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xcc\xcc", 2)), // make id9 with weight w4 LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xdd\xdd", 2)), LFSR_ATTR( LFSR_TAG_GROW, +3, LFSR_DATA_NULL()), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xdd\xdd", 2)), // make id14 with weight w5 LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_ATTR( LFSR_TAG_GROW, +4, LFSR_DATA_NULL()), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xee\xee", 2)))) => 0; // traverse, finding tags and weights lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); @@ -13291,13 +13291,13 @@ code = ''' assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -13309,13 +13309,13 @@ code = ''' assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -13327,13 +13327,13 @@ code = ''' assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -13345,13 +13345,13 @@ code = ''' assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 9); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 9); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -13363,13 +13363,13 @@ code = ''' assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 14); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 14); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -13379,7 +13379,7 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); @@ -13391,13 +13391,13 @@ code = ''' assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -13409,13 +13409,13 @@ code = ''' assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -13427,13 +13427,13 @@ code = ''' assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -13445,13 +13445,13 @@ code = ''' assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 9); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 9); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -13463,13 +13463,13 @@ code = ''' assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == 14); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == 14); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -13537,7 +13537,7 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("unrelated", 9)))) => 0; for (unsigned j = 0; j < N; j++) { @@ -13554,21 +13554,21 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF(names[perm[j] % 6], 2)), LFSR_ATTR( LFSR_TAG_GROW, +W-1, LFSR_DATA_NULL()), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF(names[perm[j] % 6], 2)))) => 0; } lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == N*W); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(3), + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(3), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); @@ -13579,15 +13579,15 @@ code = ''' assert(rid_ == j*W+W-1); assert(weight_ == W); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, j*W+W-1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookupnext(&lfs, &rbyd, j*W+W-1, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == j*W+W-1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, j*W+W-1, LFSR_TAG_UATTR(2), + lfsr_rbyd_lookupnext(&lfs, &rbyd, j*W+W-1, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == j*W+W-1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -13659,7 +13659,7 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(3), 0, + LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("unrelated", 9)))) => 0; for (unsigned j = 0; j < N; j++) { @@ -13676,13 +13676,13 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF(names[perm[j] % 6], 2)), LFSR_ATTR( LFSR_TAG_GROW, +W-1, LFSR_DATA_NULL()), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF(names[perm[j] % 6], 2)))) => 0; } @@ -13693,7 +13693,7 @@ code = ''' rid_ = -1; lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(3)); + assert(tag_ == LFSR_TAG_ATTR(3)); assert(rid_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); @@ -13711,13 +13711,13 @@ code = ''' lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == j*W+W-1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == j*W+W-1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -14076,7 +14076,7 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, rid*W, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(2), +W, + LFSR_TAG_ATTR(2), +W, LFSR_DATA_BUF(names[perm[j] % 6], 4)))) => 0; } assert(rbyd.weight == N*W); @@ -14102,7 +14102,7 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, j*W+W-1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_GROW | LFSR_TAG_UATTR(1), +D, + LFSR_TAG_GROW | LFSR_TAG_ATTR(1), +D, LFSR_DATA_BUF(names[j % 6], 6)))) => 0; assert(rbyd.weight == N*W+D); @@ -14111,9 +14111,9 @@ code = ''' for (unsigned k = 0; k < N; k++) { if (k == j) { lfsr_rbyd_lookupnext(&lfs, &rbyd, - k*W+W-1+D, LFSR_TAG_UATTR(1), + k*W+W-1+D, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == k*W+W-1+D); assert(weight_ == W+D); assert(lfsr_data_size(data_) == 6); @@ -14123,9 +14123,9 @@ code = ''' assert(memcmp(buffer, names[k % 6], 6) == 0); lfsr_rbyd_lookupnext(&lfs, &rbyd, - k*W+W-1+D, LFSR_TAG_UATTR(2), + k*W+W-1+D, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == k*W+W-1+D); assert(weight_ == 0); assert(lfsr_data_size(data_) == 4); @@ -14135,9 +14135,9 @@ code = ''' assert(memcmp(buffer, names[k % 6], 4) == 0); } else if (k > j) { lfsr_rbyd_lookupnext(&lfs, &rbyd, - k*W+W-1+D, LFSR_TAG_UATTR(2), + k*W+W-1+D, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == k*W+W-1+D); assert(weight_ == W); assert(lfsr_data_size(data_) == 4); @@ -14147,9 +14147,9 @@ code = ''' assert(memcmp(buffer, names[k % 6], 4) == 0); } else { lfsr_rbyd_lookupnext(&lfs, &rbyd, - k*W+W-1, LFSR_TAG_UATTR(2), + k*W+W-1, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == k*W+W-1); assert(weight_ == W); assert(lfsr_data_size(data_) == 4); @@ -14509,7 +14509,7 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, rid*W, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(2), +W, + LFSR_TAG_ATTR(2), +W, LFSR_DATA_BUF(names[perm[j] % 6], 4)))) => 0; } assert(rbyd.weight == N*W); @@ -14535,7 +14535,7 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, j*W+W-1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_GROW | LFSR_TAG_UATTR(1), -D, + LFSR_TAG_GROW | LFSR_TAG_ATTR(1), -D, LFSR_DATA_BUF(names[j % 6], 6)))) => 0; assert(rbyd.weight == N*W-D); @@ -14544,9 +14544,9 @@ code = ''' for (unsigned k = 0; k < N; k++) { if (k == j) { lfsr_rbyd_lookupnext(&lfs, &rbyd, - k*W+W-1-D, LFSR_TAG_UATTR(1), + k*W+W-1-D, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == k*W+W-1-D); assert(weight_ == W-D); assert(lfsr_data_size(data_) == 6); @@ -14556,9 +14556,9 @@ code = ''' assert(memcmp(buffer, names[k % 6], 6) == 0); lfsr_rbyd_lookupnext(&lfs, &rbyd, - k*W+W-1-D, LFSR_TAG_UATTR(2), + k*W+W-1-D, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == k*W+W-1-D); assert(weight_ == 0); assert(lfsr_data_size(data_) == 4); @@ -14568,9 +14568,9 @@ code = ''' assert(memcmp(buffer, names[k % 6], 4) == 0); } else if (k > j) { lfsr_rbyd_lookupnext(&lfs, &rbyd, - k*W+W-1-D, LFSR_TAG_UATTR(2), + k*W+W-1-D, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == k*W+W-1-D); assert(weight_ == W); assert(lfsr_data_size(data_) == 4); @@ -14580,9 +14580,9 @@ code = ''' assert(memcmp(buffer, names[k % 6], 4) == 0); } else { lfsr_rbyd_lookupnext(&lfs, &rbyd, - k*W+W-1, LFSR_TAG_UATTR(2), + k*W+W-1, LFSR_TAG_ATTR(2), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(rid_ == k*W+W-1); assert(weight_ == W); assert(lfsr_data_size(data_) == 4); @@ -14856,7 +14856,7 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, j*W+W-1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF(names[j % 6], 2)))) => 0; assert(rbyd.weight == N*W); @@ -14876,9 +14876,9 @@ code = ''' if (k == j) { lfsr_rbyd_lookupnext(&lfs, &rbyd, - k*W+W-1, LFSR_TAG_UATTR(1), + k*W+W-1, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == k*W+W-1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -14889,7 +14889,7 @@ code = ''' printf("--- removing: %d ---\n", j); lfsr_rbyd_commit(&lfs, &rbyd, j*W+W-1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR(1), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == N*W); @@ -14908,7 +14908,7 @@ code = ''' assert(memcmp(buffer, names[k % 6], 4) == 0); if (k == j) { - lfsr_rbyd_lookup(&lfs, &rbyd, k*W+W-1, LFSR_TAG_UATTR(1), + lfsr_rbyd_lookup(&lfs, &rbyd, k*W+W-1, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; } } @@ -14917,7 +14917,7 @@ code = ''' printf("--- appending: %d ---\n", j); lfsr_rbyd_commit(&lfs, &rbyd, j*W+W-1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF(names[j % 6], 2)))) => 0; assert(rbyd.weight == N*W); @@ -14937,9 +14937,9 @@ code = ''' if (k == j) { lfsr_rbyd_lookupnext(&lfs, &rbyd, - k*W+W-1, LFSR_TAG_UATTR(1), + k*W+W-1, LFSR_TAG_ATTR(1), &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(rid_ == k*W+W-1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); @@ -15046,7 +15046,7 @@ code = ''' // update our rbyd lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(u), 0, + LFSR_TAG_ATTR(u), 0, LFSR_DATA_BUF(&(uint8_t){'a'+(i % 26)}, 1)))) => 0; } else if (op == 3) { @@ -15055,7 +15055,7 @@ code = ''' // update our rbyd lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR(u), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR(u), 0, LFSR_DATA_NULL()))) => 0; } } @@ -15087,7 +15087,7 @@ code = ''' printf("?"); } for (uint8_t u = 0; u < M; u++) { - err = lfsr_rbyd_lookup(&lfs, &rbyd, rid, LFSR_TAG_UATTR(u), + err = lfsr_rbyd_lookup(&lfs, &rbyd, rid, LFSR_TAG_ATTR(u), &data); if (!err) { lfs_ssize_t size = lfsr_data_read(&lfs, &data, buffer, 4); @@ -15373,7 +15373,7 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)), LFSR_ATTR( - LFSR_TAG_UATTR((perm[j] + SHIFT) & 0x7f), 0, + LFSR_TAG_ATTR((perm[j] + SHIFT) & 0x7f), 0, LFSR_DATA_BUF(names[perm[j] % 6], 2)))) => 0; } assert(rbyd.weight == N); @@ -15385,10 +15385,10 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_tag_t tag_; lfsr_data_t data_; - lfsr_rbyd_sublookup(&lfs, &rbyd, j, LFSR_TAG_UATTR, + lfsr_rbyd_sublookup(&lfs, &rbyd, j, LFSR_TAG_ATTR, &tag_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR((j + SHIFT) & 0x7f)); + assert(tag_ == LFSR_TAG_ATTR((j + SHIFT) & 0x7f)); assert(lfsr_data_size(data_) == 2); } } @@ -15463,7 +15463,7 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)), LFSR_ATTR( - LFSR_TAG_UATTR((perm[j] + SHIFT) & 0x7f), 0, + LFSR_TAG_ATTR((perm[j] + SHIFT) & 0x7f), 0, LFSR_DATA_BUF(names[perm[j] % 6], 2)))) => 0; } assert(rbyd.weight == N); @@ -15490,7 +15490,7 @@ code = ''' // remove with a wide tag lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_SUB | LFSR_TAG_UATTR, 0, + LFSR_TAG_RM | LFSR_TAG_SUB | LFSR_TAG_ATTR, 0, LFSR_DATA_NULL()))) => 0; // try traversing over the tags @@ -15511,7 +15511,7 @@ code = ''' lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; assert(rid_ == k); - assert(tag_ == LFSR_TAG_UATTR((k + SHIFT) & 0x7f)); + assert(tag_ == LFSR_TAG_ATTR((k + SHIFT) & 0x7f)); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); } @@ -15522,12 +15522,12 @@ code = ''' // also test that we can lookup each tag with a wide lookup for (unsigned k = 0; k < N; k++) { if (k == j) { - lfsr_rbyd_sublookup(&lfs, &rbyd, k, LFSR_TAG_UATTR, + lfsr_rbyd_sublookup(&lfs, &rbyd, k, LFSR_TAG_ATTR, &tag_, &data_) => LFS_ERR_NOENT; } else { - lfsr_rbyd_sublookup(&lfs, &rbyd, k, LFSR_TAG_UATTR, + lfsr_rbyd_sublookup(&lfs, &rbyd, k, LFSR_TAG_ATTR, &tag_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR((k + SHIFT) & 0x7f)); + assert(tag_ == LFSR_TAG_ATTR((k + SHIFT) & 0x7f)); assert(lfsr_data_size(data_) == 2); } } @@ -15607,7 +15607,7 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)), LFSR_ATTR( - LFSR_TAG_UATTR((perm[j] + SHIFT) & 0x7f), 0, + LFSR_TAG_ATTR((perm[j] + SHIFT) & 0x7f), 0, LFSR_DATA_BUF(names[perm[j] % 6], 2)))) => 0; } assert(rbyd.weight == N); @@ -15634,7 +15634,7 @@ code = ''' // replace with bitwise inverse lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUB | LFSR_TAG_UATTR(~(j + SHIFT) & 0x7f), + LFSR_TAG_SUB | LFSR_TAG_ATTR(~(j + SHIFT) & 0x7f), 0, LFSR_DATA_BUF(names[j % 6], 3)))) => 0; @@ -15656,12 +15656,12 @@ code = ''' &rid_, &tag_, &weight_, &data_) => 0; if (k == j) { assert(rid_ == k); - assert(tag_ == LFSR_TAG_UATTR(~(k + SHIFT) & 0x7f)); + assert(tag_ == LFSR_TAG_ATTR(~(k + SHIFT) & 0x7f)); assert(weight_ == 0); assert(lfsr_data_size(data_) == 3); } else { assert(rid_ == k); - assert(tag_ == LFSR_TAG_UATTR((k + SHIFT) & 0x7f)); + assert(tag_ == LFSR_TAG_ATTR((k + SHIFT) & 0x7f)); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); } @@ -15671,13 +15671,13 @@ code = ''' // also test that we can lookup each tag with a wide lookup for (unsigned k = 0; k < N; k++) { - lfsr_rbyd_sublookup(&lfs, &rbyd, k, LFSR_TAG_UATTR, + lfsr_rbyd_sublookup(&lfs, &rbyd, k, LFSR_TAG_ATTR, &tag_, &data_) => 0; if (k == j) { - assert(tag_ == LFSR_TAG_UATTR(~(k + SHIFT) & 0x7f)); + assert(tag_ == LFSR_TAG_ATTR(~(k + SHIFT) & 0x7f)); assert(lfsr_data_size(data_) == 3); } else { - assert(tag_ == LFSR_TAG_UATTR((k + SHIFT) & 0x7f)); + assert(tag_ == LFSR_TAG_ATTR((k + SHIFT) & 0x7f)); assert(lfsr_data_size(data_) == 2); } } @@ -15753,10 +15753,10 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)), LFSR_ATTR( - LFSR_TAG_UATTR((perm[j] + SHIFT) & 0x7f), 0, + LFSR_TAG_ATTR(0x7f & (perm[j] + SHIFT)), 0, LFSR_DATA_BUF(names[perm[j] % 6], 2)), LFSR_ATTR( - LFSR_TAG_SATTR(0), 0, + LFSR_TAG_ATTR(0x80), 0, LFSR_DATA_BUF(names[perm[j] % 6], 1)))) => 0; } assert(rbyd.weight == N); @@ -15768,10 +15768,10 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_tag_t tag_; lfsr_data_t data_; - lfsr_rbyd_sublookup(&lfs, &rbyd, j, LFSR_TAG_UATTR, + lfsr_rbyd_sublookup(&lfs, &rbyd, j, LFSR_TAG_ATTR, &tag_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR((j + SHIFT) & 0x7f)); + assert(tag_ == LFSR_TAG_ATTR(0x7f & (j + SHIFT))); assert(lfsr_data_size(data_) == 2); } } @@ -15846,10 +15846,10 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)), LFSR_ATTR( - LFSR_TAG_UATTR((perm[j] + SHIFT) & 0x7f), 0, + LFSR_TAG_ATTR(0x7f & (perm[j] + SHIFT)), 0, LFSR_DATA_BUF(names[perm[j] % 6], 2)), LFSR_ATTR( - LFSR_TAG_SATTR(0), 0, + LFSR_TAG_ATTR(0x80), 0, LFSR_DATA_BUF(names[perm[j] % 6], 1)))) => 0; } assert(rbyd.weight == N); @@ -15876,7 +15876,7 @@ code = ''' // remove with a wide tag lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_SUB | LFSR_TAG_UATTR, 0, + LFSR_TAG_RM | LFSR_TAG_SUB | LFSR_TAG_ATTR, 0, LFSR_DATA_NULL()))) => 0; // try traversing over the tags @@ -15897,7 +15897,7 @@ code = ''' lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; assert(rid_ == k); - assert(tag_ == LFSR_TAG_UATTR((k + SHIFT) & 0x7f)); + assert(tag_ == LFSR_TAG_ATTR(0x7f & (k + SHIFT))); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); } @@ -15905,7 +15905,7 @@ code = ''' lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; assert(rid_ == k); - assert(tag_ == LFSR_TAG_SATTR(0)); + assert(tag_ == LFSR_TAG_ATTR(0x80)); assert(weight_ == 0); assert(lfsr_data_size(data_) == 1); } @@ -15915,12 +15915,12 @@ code = ''' // also test that we can lookup each tag with a wide lookup for (unsigned k = 0; k < N; k++) { if (k == j) { - lfsr_rbyd_sublookup(&lfs, &rbyd, k, LFSR_TAG_UATTR, + lfsr_rbyd_sublookup(&lfs, &rbyd, k, LFSR_TAG_ATTR, &tag_, &data_) => LFS_ERR_NOENT; } else { - lfsr_rbyd_sublookup(&lfs, &rbyd, k, LFSR_TAG_UATTR, + lfsr_rbyd_sublookup(&lfs, &rbyd, k, LFSR_TAG_ATTR, &tag_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR((k + SHIFT) & 0x7f)); + assert(tag_ == LFSR_TAG_ATTR((k + SHIFT) & 0x7f)); assert(lfsr_data_size(data_) == 2); } } @@ -16000,10 +16000,10 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)), LFSR_ATTR( - LFSR_TAG_UATTR((perm[j] + SHIFT) & 0x7f), 0, + LFSR_TAG_ATTR(0x7f & (perm[j] + SHIFT)), 0, LFSR_DATA_BUF(names[perm[j] % 6], 2)), LFSR_ATTR( - LFSR_TAG_SATTR(0), 0, + LFSR_TAG_ATTR(0x80), 0, LFSR_DATA_BUF(names[perm[j] % 6], 1)))) => 0; } assert(rbyd.weight == N); @@ -16030,7 +16030,7 @@ code = ''' // replace with bitwise inverse lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUB | LFSR_TAG_UATTR(~(j + SHIFT) & 0x7f), + LFSR_TAG_SUB | LFSR_TAG_ATTR(~(j + SHIFT) & 0x7f), 0, LFSR_DATA_BUF(names[j % 6], 3)))) => 0; @@ -16052,12 +16052,12 @@ code = ''' &rid_, &tag_, &weight_, &data_) => 0; if (k == j) { assert(rid_ == k); - assert(tag_ == LFSR_TAG_UATTR(~(k + SHIFT) & 0x7f)); + assert(tag_ == LFSR_TAG_ATTR(0x7f & ~(k + SHIFT))); assert(weight_ == 0); assert(lfsr_data_size(data_) == 3); } else { assert(rid_ == k); - assert(tag_ == LFSR_TAG_UATTR((k + SHIFT) & 0x7f)); + assert(tag_ == LFSR_TAG_ATTR(0x7f & (k + SHIFT))); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); } @@ -16065,7 +16065,7 @@ code = ''' lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; assert(rid_ == k); - assert(tag_ == LFSR_TAG_SATTR(0)); + assert(tag_ == LFSR_TAG_ATTR(0x80)); assert(weight_ == 0); assert(lfsr_data_size(data_) == 1); } @@ -16074,13 +16074,13 @@ code = ''' // also test that we can lookup each tag with a wide lookup for (unsigned k = 0; k < N; k++) { - lfsr_rbyd_sublookup(&lfs, &rbyd, k, LFSR_TAG_UATTR, + lfsr_rbyd_sublookup(&lfs, &rbyd, k, LFSR_TAG_ATTR, &tag_, &data_) => 0; if (k == j) { - assert(tag_ == LFSR_TAG_UATTR(~(k + SHIFT) & 0x7f)); + assert(tag_ == LFSR_TAG_ATTR(~(k + SHIFT) & 0x7f)); assert(lfsr_data_size(data_) == 3); } else { - assert(tag_ == LFSR_TAG_UATTR((k + SHIFT) & 0x7f)); + assert(tag_ == LFSR_TAG_ATTR((k + SHIFT) & 0x7f)); assert(lfsr_data_size(data_) == 2); } } @@ -16153,7 +16153,7 @@ code = ''' // give each attr a subtype based on its rid + SHIFT lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR((perm[j] + SHIFT) & 0x7f), +1, + LFSR_TAG_ATTR((perm[j] + SHIFT) & 0x7f), +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)))) => 0; } assert(rbyd.weight == N); @@ -16165,10 +16165,10 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_tag_t tag_; lfsr_data_t data_; - lfsr_rbyd_sublookup(&lfs, &rbyd, j, LFSR_TAG_UATTR, + lfsr_rbyd_sublookup(&lfs, &rbyd, j, LFSR_TAG_ATTR, &tag_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR((j + SHIFT) & 0x7f)); + assert(tag_ == LFSR_TAG_ATTR((j + SHIFT) & 0x7f)); assert(lfsr_data_size(data_) == 4); } } @@ -16240,7 +16240,7 @@ code = ''' // give each attr a subtype based on its rid + SHIFT lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR((perm[j] + SHIFT) & 0x7f), +1, + LFSR_TAG_ATTR((perm[j] + SHIFT) & 0x7f), +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)))) => 0; } assert(rbyd.weight == N); @@ -16267,7 +16267,7 @@ code = ''' // remove with a wide tag lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_SUB | LFSR_TAG_UATTR, 0, + LFSR_TAG_RM | LFSR_TAG_SUB | LFSR_TAG_ATTR, 0, LFSR_DATA_NULL()))) => 0; // try traversing over the tags @@ -16281,17 +16281,17 @@ code = ''' &rid_, &tag_, &weight_, &data_) => 0; if (k == j) { assert(rid_ == k+1); - assert(tag_ == LFSR_TAG_UATTR((k+1 + SHIFT) & 0x7f)); + assert(tag_ == LFSR_TAG_ATTR((k+1 + SHIFT) & 0x7f)); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); } else if (k > j) { assert(rid_ == k+1); - assert(tag_ == LFSR_TAG_UATTR((k+1 + SHIFT) & 0x7f)); + assert(tag_ == LFSR_TAG_ATTR((k+1 + SHIFT) & 0x7f)); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); } else { assert(rid_ == k); - assert(tag_ == LFSR_TAG_UATTR((k + SHIFT) & 0x7f)); + assert(tag_ == LFSR_TAG_ATTR((k + SHIFT) & 0x7f)); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); } @@ -16302,12 +16302,12 @@ code = ''' // also test that we can lookup each tag with a wide lookup for (unsigned k = 0; k < N; k++) { if (k == j) { - lfsr_rbyd_sublookup(&lfs, &rbyd, k, LFSR_TAG_UATTR, + lfsr_rbyd_sublookup(&lfs, &rbyd, k, LFSR_TAG_ATTR, &tag_, &data_) => LFS_ERR_NOENT; } else { - lfsr_rbyd_sublookup(&lfs, &rbyd, k, LFSR_TAG_UATTR, + lfsr_rbyd_sublookup(&lfs, &rbyd, k, LFSR_TAG_ATTR, &tag_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR((k + SHIFT) & 0x7f)); + assert(tag_ == LFSR_TAG_ATTR((k + SHIFT) & 0x7f)); assert(lfsr_data_size(data_) == 4); } } @@ -16384,7 +16384,7 @@ code = ''' // give each attr a subtype based on its rid + SHIFT lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR((perm[j] + SHIFT) & 0x7f), +1, + LFSR_TAG_ATTR((perm[j] + SHIFT) & 0x7f), +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)))) => 0; } assert(rbyd.weight == N); @@ -16411,7 +16411,7 @@ code = ''' // replace with bitwise inverse lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUB | LFSR_TAG_UATTR(~(j + SHIFT) & 0x7f), + LFSR_TAG_SUB | LFSR_TAG_ATTR(~(j + SHIFT) & 0x7f), 0, LFSR_DATA_BUF(names[j % 6], 6)))) => 0; @@ -16426,12 +16426,12 @@ code = ''' &rid_, &tag_, &weight_, &data_) => 0; if (k == j) { assert(rid_ == k); - assert(tag_ == LFSR_TAG_UATTR(~(k + SHIFT) & 0x7f)); + assert(tag_ == LFSR_TAG_ATTR(~(k + SHIFT) & 0x7f)); assert(weight_ == 1); assert(lfsr_data_size(data_) == 6); } else { assert(rid_ == k); - assert(tag_ == LFSR_TAG_UATTR((k + SHIFT) & 0x7f)); + assert(tag_ == LFSR_TAG_ATTR((k + SHIFT) & 0x7f)); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); } @@ -16441,13 +16441,13 @@ code = ''' // also test that we can lookup each tag with a wide lookup for (unsigned k = 0; k < N; k++) { - lfsr_rbyd_sublookup(&lfs, &rbyd, k, LFSR_TAG_UATTR, + lfsr_rbyd_sublookup(&lfs, &rbyd, k, LFSR_TAG_ATTR, &tag_, &data_) => 0; if (k == j) { - assert(tag_ == LFSR_TAG_UATTR(~(k + SHIFT) & 0x7f)); + assert(tag_ == LFSR_TAG_ATTR(~(k + SHIFT) & 0x7f)); assert(lfsr_data_size(data_) == 6); } else { - assert(tag_ == LFSR_TAG_UATTR((k + SHIFT) & 0x7f)); + assert(tag_ == LFSR_TAG_ATTR((k + SHIFT) & 0x7f)); assert(lfsr_data_size(data_) == 4); } } @@ -16524,7 +16524,7 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)), LFSR_ATTR( - LFSR_TAG_UATTR((perm[j] + SHIFT) & 0x7f), 0, + LFSR_TAG_ATTR((perm[j] + SHIFT) & 0x7f), 0, LFSR_DATA_BUF(names[perm[j] % 6], 2)))) => 0; } assert(rbyd.weight == N); @@ -16614,7 +16614,7 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)), LFSR_ATTR( - LFSR_TAG_UATTR((perm[j] + SHIFT) & 0x7f), 0, + LFSR_TAG_ATTR((perm[j] + SHIFT) & 0x7f), 0, LFSR_DATA_BUF(names[perm[j] % 6], 2)))) => 0; } assert(rbyd.weight == N); @@ -16641,7 +16641,7 @@ code = ''' // remove with a wide tag lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_SUP | LFSR_TAG_UATTR, 0, + LFSR_TAG_RM | LFSR_TAG_SUP | LFSR_TAG_ATTR, 0, LFSR_DATA_NULL()))) => 0; // try traversing over the tags @@ -16662,7 +16662,7 @@ code = ''' lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; assert(rid_ == k); - assert(tag_ == LFSR_TAG_UATTR((k + SHIFT) & 0x7f)); + assert(tag_ == LFSR_TAG_ATTR((k + SHIFT) & 0x7f)); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); } @@ -16673,12 +16673,12 @@ code = ''' // also test that we can lookup each tag with a wide lookup for (unsigned k = 0; k < N; k++) { if (k == j) { - lfsr_rbyd_sublookup(&lfs, &rbyd, k, LFSR_TAG_UATTR, + lfsr_rbyd_sublookup(&lfs, &rbyd, k, LFSR_TAG_ATTR, &tag_, &data_) => LFS_ERR_NOENT; } else { - lfsr_rbyd_sublookup(&lfs, &rbyd, k, LFSR_TAG_UATTR, + lfsr_rbyd_sublookup(&lfs, &rbyd, k, LFSR_TAG_ATTR, &tag_, &data_) => 0; - assert(tag_ == LFSR_TAG_UATTR((k + SHIFT) & 0x7f)); + assert(tag_ == LFSR_TAG_ATTR((k + SHIFT) & 0x7f)); assert(lfsr_data_size(data_) == 2); } } @@ -16758,7 +16758,7 @@ code = ''' LFSR_TAG_REG, +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)), LFSR_ATTR( - LFSR_TAG_UATTR((perm[j] + SHIFT) & 0x7f), 0, + LFSR_TAG_ATTR((perm[j] + SHIFT) & 0x7f), 0, LFSR_DATA_BUF(names[perm[j] % 6], 2)))) => 0; } assert(rbyd.weight == N); @@ -16785,7 +16785,7 @@ code = ''' // replace with bitwise inverse lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUP | LFSR_TAG_UATTR(~(j + SHIFT) & 0x7f), + LFSR_TAG_SUP | LFSR_TAG_ATTR(~(j + SHIFT) & 0x7f), 0, LFSR_DATA_BUF(names[j % 6], 3)))) => 0; @@ -16800,7 +16800,7 @@ code = ''' lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; assert(rid_ == k); - assert(tag_ == LFSR_TAG_UATTR(~(k + SHIFT) & 0x7f)); + assert(tag_ == LFSR_TAG_ATTR(~(k + SHIFT) & 0x7f)); assert(weight_ == 1); assert(lfsr_data_size(data_) == 3); @@ -16815,7 +16815,7 @@ code = ''' lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; assert(rid_ == k); - assert(tag_ == LFSR_TAG_UATTR((k + SHIFT) & 0x7f)); + assert(tag_ == LFSR_TAG_ATTR((k + SHIFT) & 0x7f)); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); } @@ -16825,13 +16825,13 @@ code = ''' // also test that we can lookup each tag with a wide lookup for (unsigned k = 0; k < N; k++) { - lfsr_rbyd_sublookup(&lfs, &rbyd, k, LFSR_TAG_UATTR, + lfsr_rbyd_sublookup(&lfs, &rbyd, k, LFSR_TAG_ATTR, &tag_, &data_) => 0; if (k == j) { - assert(tag_ == LFSR_TAG_UATTR(~(k + SHIFT) & 0x7f)); + assert(tag_ == LFSR_TAG_ATTR(~(k + SHIFT) & 0x7f)); assert(lfsr_data_size(data_) == 3); } else { - assert(tag_ == LFSR_TAG_UATTR((k + SHIFT) & 0x7f)); + assert(tag_ == LFSR_TAG_ATTR((k + SHIFT) & 0x7f)); assert(lfsr_data_size(data_) == 2); } } @@ -16868,13 +16868,13 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(0), 0, + LFSR_TAG_ATTR(0), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR(0), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR(0), 0, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 0); @@ -16886,14 +16886,14 @@ code = ''' lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &rid_, &tag_, &weight_, &data_) => 0; assert(rid_ == -1); - assert(tag_ == LFSR_TAG_UATTR(1)); + assert(tag_ == LFSR_TAG_ATTR(1)); assert(weight_ == 0); assert(lfsr_data_size(data_) == 4); uint8_t rbuf[32]; lfsr_data_read(&lfs, &data_, rbuf, 32) => 4; assert(memcmp(rbuf, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(1)+1, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1)+1, &rid_, &tag_, &weight_, &data_) => LFS_ERR_NOENT; ''' @@ -16917,23 +16917,23 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(0), 0, + LFSR_TAG_ATTR(0), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(2), 0, + LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR(0), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR(0), 0, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 0); // remove a neighbor to the hole lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR(1), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 0); @@ -16945,14 +16945,14 @@ code = ''' lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &rid_, &tag_, &weight_, &data_) => 0; assert(rid_ == -1); - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(weight_ == 0); assert(lfsr_data_size(data_) == 4); uint8_t rbuf[32]; lfsr_data_read(&lfs, &data_, rbuf, 32) => 4; assert(memcmp(rbuf, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2)+1, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2)+1, &rid_, &tag_, &weight_, &data_) => LFS_ERR_NOENT; ''' @@ -16976,7 +16976,7 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(0), 0, + LFSR_TAG_ATTR(0), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( LFSR_TAG_REG, +1, @@ -16986,7 +16986,7 @@ code = ''' LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR(0), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR(0), 0, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 2); @@ -17034,23 +17034,23 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(0), 0, + LFSR_TAG_ATTR(0x00), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(0x01), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( - LFSR_TAG_SATTR(0), 0, + LFSR_TAG_ATTR(0x80), 0, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)), LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR(0), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR(0), 0, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 0); // subwide replace a neighbor to the hole lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUB | LFSR_TAG_UATTR(2), 0, + LFSR_TAG_SUB | LFSR_TAG_ATTR(0x02), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; assert(rbyd.weight == 0); @@ -17062,23 +17062,23 @@ code = ''' lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &rid_, &tag_, &weight_, &data_) => 0; assert(rid_ == -1); - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(0x02)); assert(weight_ == 0); assert(lfsr_data_size(data_) == 4); uint8_t rbuf[32]; lfsr_data_read(&lfs, &data_, rbuf, 32) => 4; assert(memcmp(rbuf, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2)+1, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2)+1, &rid_, &tag_, &weight_, &data_) => 0; assert(rid_ == -1); - assert(tag_ == LFSR_TAG_SATTR(0)); + assert(tag_ == LFSR_TAG_ATTR(0x80)); assert(weight_ == 0); assert(lfsr_data_size(data_) == 4); lfsr_data_read(&lfs, &data_, rbuf, 32) => 4; assert(memcmp(rbuf, "\xdd\xdd\xdd\xdd", 4) == 0); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_SATTR(0)+1, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(0x80)+1, &rid_, &tag_, &weight_, &data_) => LFS_ERR_NOENT; ''' @@ -17102,24 +17102,24 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_UATTR(0), 0, + LFSR_TAG_ATTR(0), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_ATTR( - LFSR_TAG_UATTR(1), 0, + LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_ATTR( LFSR_TAG_REG, +1, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_RM | LFSR_TAG_UATTR(0), 0, + LFSR_TAG_RM | LFSR_TAG_ATTR(0), 0, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 1); // supwide replace a neighbor to the hole lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_ATTRS( LFSR_ATTR( - LFSR_TAG_SUP | LFSR_TAG_UATTR(2), 0, + LFSR_TAG_SUP | LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; assert(rbyd.weight == 1); @@ -17131,14 +17131,14 @@ code = ''' lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &rid_, &tag_, &weight_, &data_) => 0; assert(rid_ == -1); - assert(tag_ == LFSR_TAG_UATTR(2)); + assert(tag_ == LFSR_TAG_ATTR(2)); assert(weight_ == 0); assert(lfsr_data_size(data_) == 4); uint8_t rbuf[32]; lfsr_data_read(&lfs, &data_, rbuf, 32) => 4; assert(memcmp(rbuf, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_UATTR(2)+1, + lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2)+1, &rid_, &tag_, &weight_, &data_) => 0; assert(rid_ == 0); assert(tag_ == LFSR_TAG_REG);