From 10473f716ecafdc5693709d91db1a99227b70583 Mon Sep 17 00:00:00 2001 From: Christopher Haster Date: Thu, 6 Apr 2023 15:08:35 -0500 Subject: [PATCH] Some minor cleanup post-lfsr_data_t adoption --- lfs.c | 241 ++------- tests/test_rbyd.toml | 1168 +++++++++++++++++++++--------------------- 2 files changed, 638 insertions(+), 771 deletions(-) diff --git a/lfs.c b/lfs.c index f8bb68b2..490ae3e5 100644 --- a/lfs.c +++ b/lfs.c @@ -773,92 +773,51 @@ struct lfsr_attr { const struct lfsr_attr *next; }; -#define LFSD_ATTR_(_tag, _id, _delta, _buf, _len, _next) \ +#define LFSR_ATTR_(_tag, _id, _delta, _buf, _len, _next) \ (&(const struct lfsr_attr){ \ _tag, _id, _delta, \ LFSR_DATA_BUF(_buf, _len), \ _next}) -#define LFSD_ATTR(_type, _id, _delta, _buf, _len, _next) \ - LFSD_ATTR_(LFSR_TAG_##_type, _id, _delta, _buf, _len, _next) +#define LFSR_ATTR(_type, _id, _delta, _buf, _len, _next) \ + LFSR_ATTR_(LFSR_TAG_##_type, _id, _delta, _buf, _len, _next) -#define LFSD_ATTR_DISK_(_tag, _id, _delta, _block, _off, _len, _next) \ +#define LFSR_ATTR_DISK_(_tag, _id, _delta, _block, _off, _len, _next) \ (&(const struct lfsr_attr){ \ _tag, _id, _delta, \ LFSR_DATA_DISK(_block, _off, _len), \ _next}) -#define LFSD_ATTR_DISK(_type, _id, _delta, _block, _off, _len, _next) \ - LFSD_ATTR_DISK_(LFSR_TAG_##_type, _id, _delta, _block, _off, _len, _next) +#define LFSR_ATTR_DISK(_type, _id, _delta, _block, _off, _len, _next) \ + LFSR_ATTR_DISK_(LFSR_TAG_##_type, _id, _delta, _block, _off, _len, _next) -#define LFSD_ATTR_IF_(_pred, _tag, _id, _delta, _buf, _len, _next) \ - LFSD_ATTR_( \ - (_pred) ? (_tag) : LFSR_TAG_UNR, \ - _id, \ - (_pred) ? (_delta) : 0, \ - _buf, \ - (_pred) ? (_len) : 0, \ - _next) - -#define LFSD_ATTR_IF(_pred, _type, _id, _delta, _buf, _len, _next) \ - LFSD_ATTR_IF_(_pred, LFSR_TAG_##_type, _id, _delta, _buf, _len, _next) - -#define LFSD_ATTR_DISK_IF_(_pred, \ - _tag, _id, _delta, _block, _off, _len, _next) \ - LFSD_ATTR_DISK_( \ - (_pred) ? (_tag) : LFSD_TAG_NOOP, \ - _id, \ - (_pred) ? (_delta) : 0, \ - _block, \ - _off, \ - (_pred) ? (_len) : 0, \ - _next) - -#define LFSD_ATTR_DISK_IF(_pred, \ - _type, _id, _delta, _block, _off, _len, _next) \ - LFSD_ATTR_DISK_IF_(_pred, \ - LFSD_TAG_##_type, _id, _delta, _block, _off, _len, _next) - -#define LFSR_ATTR_(_tag, _id, _buf, _len, _next) \ - (&(const struct lfsr_attr){ \ - _tag, _id, 0, \ - LFSR_DATA_BUF(_buf, _len), \ - _next}) - -#define LFSR_ATTR(_type, _id, _buf, _len, _next) \ - LFSR_ATTR_(LFSR_TAG_##_type, _id, _buf, _len, _next) - -#define LFSR_ATTR_DISK_(_tag, _id, _block, _off, _len, _next) \ - (&(const struct lfsr_attr){ \ - _tag, _id, 0, \ - LFSR_DATA_DISK(_block, _off, _len), \ - _next}) - -#define LFSR_ATTR_DISK(_type, _id, _block, _off, _len, _next) \ - LFSR_ATTR_DISK_(LFSR_TAG_##_type, _id, _block, _off, _len, _next) - -#define LFSR_ATTR_IF_(_pred, _tag, _id, _buf, _len, _next) \ +#define LFSR_ATTR_IF_(_pred, _tag, _id, _delta, _buf, _len, _next) \ LFSR_ATTR_( \ (_pred) ? (_tag) : LFSR_TAG_UNR, \ _id, \ + (_pred) ? (_delta) : 0, \ _buf, \ (_pred) ? (_len) : 0, \ _next) -#define LFSR_ATTR_IF(_pred, _type, _id, _buf, _len, _next) \ - LFSR_ATTR_IF_(_pred, LFSR_TAG_##_type, _id, _buf, _len, _next) +#define LFSR_ATTR_IF(_pred, _type, _id, _delta, _buf, _len, _next) \ + LFSR_ATTR_IF_(_pred, LFSR_TAG_##_type, _id, _delta, _buf, _len, _next) -#define LFSR_ATTR_DISK_IF_(_pred, _tag, _id, _block, _off, _len, _next) \ +#define LFSR_ATTR_DISK_IF_(_pred, \ + _tag, _id, _delta, _block, _off, _len, _next) \ LFSR_ATTR_DISK_( \ - (_pred) ? (_tag) : LFSR_TAG_UNR, \ + (_pred) ? (_tag) : LFSR_TAG_NOOP, \ _id, \ + (_pred) ? (_delta) : 0, \ _block, \ _off, \ (_pred) ? (_len) : 0, \ _next) -#define LFSR_ATTR_DISK_IF(_pred, _type, _id, _block, _off, _len, _next) \ - LFSR_ATTR_DISK_IF_(_pred, LFSR_TAG_##_type, _id, _block, _off, _len, _next) +#define LFSR_ATTR_DISK_IF(_pred, \ + _type, _id, _delta, _block, _off, _len, _next) \ + LFSR_ATTR_DISK_IF_(_pred, \ + LFSR_TAG_##_type, _id, _delta, _block, _off, _len, _next) struct lfsr_attr_from { const lfsr_rbyd_t *rbyd; @@ -2451,38 +2410,6 @@ leaf:; return 0; } -// TODO remove this wrapper -static int lfsr_rbyd_append_(lfs_t *lfs, lfsr_rbyd_t *rbyd, - lfsr_tag_t tag, lfs_ssize_t id, lfsr_data_t data) { - if (tag == LFSR_TAG_GROW) { - int err = lfsr_rbyd_append(lfs, rbyd, - LFSR_TAG_UNR, id, - +lfsr_data_len(data), LFSR_DATA_NULL); - if (err) { - return err; - } - - return 0; - } else if (tag == LFSR_TAG_SHRINK) { - int err = lfsr_rbyd_append(lfs, rbyd, - LFSR_TAG_UNR, id, - -lfsr_data_len(data), LFSR_DATA_NULL); - if (err) { - return err; - } - - return 0; - } else { - int err = lfsr_rbyd_append(lfs, rbyd, - tag, id, 0, data); - if (err) { - return err; - } - - return 0; - } -} - static int lfsr_rbyd_commit(lfs_t *lfs, lfsr_rbyd_t *rbyd, const struct lfsr_attr *attrs) { // we can't do anything if we're not erased @@ -2508,19 +2435,10 @@ static int lfsr_rbyd_commit(lfs_t *lfs, lfsr_rbyd_t *rbyd, // append each tag to the tree for (const struct lfsr_attr *attr = attrs; attr; attr = attr->next) { - // TODO rm this - if (attr->delta == 0) { - int err = lfsr_rbyd_append_(lfs, &rbyd_, - attr->tag, attr->id, attr->data); - if (err) { - return err; - } - } else { - int err = lfsr_rbyd_append(lfs, &rbyd_, - attr->tag, attr->id, attr->delta, attr->data); - if (err) { - return err; - } + int err = lfsr_rbyd_append(lfs, &rbyd_, + attr->tag, attr->id, attr->delta, attr->data); + if (err) { + return err; } } @@ -3128,14 +3046,14 @@ static int lfsr_btree_commit(lfs_t *lfs, // note that since we defer merges to compaction time, we can // end up removing an rbyd here if (rbyd->weight == 0) { - scratch_attrs[0] = *LFSD_ATTR( + scratch_attrs[0] = *LFSR_ATTR( MKUNR, rid, +rbyd->weight-rweight, scratch_buf1, delta, NULL); } else { - scratch_attrs[0] = *LFSD_ATTR( + scratch_attrs[0] = *LFSR_ATTR( BRANCH, rid, 0, scratch_buf1, delta, &scratch_attrs[1]); - scratch_attrs[1] = *LFSD_ATTR( + scratch_attrs[1] = *LFSR_ATTR( UNR, rid, +rbyd->weight-rweight, NULL, 0, NULL); } @@ -3170,19 +3088,6 @@ static int lfsr_btree_commit(lfs_t *lfs, break; } -// // TODO this is really wasteful and throws off our predicted -// // size, can we combine grows into the tag append in the rbyd -// // somehow? -// // create grows as necessary -// err = lfsr_rbyd_append_(lfs, &rbyd_, -// LFSR_TAG_GROW, -// id - (weight-1), -// // TODO also this is a weird way to use lfsr_data_t -// LFSR_DATA_BUF(NULL, weight)); -// if (err) { -// return err; -// } - // Because it makes a lot of the split-sensitive cross-id operations // easier, we can end up with an occasional "vestigial" name tag on // the first id in a block. We make sure to ignore these during @@ -3260,14 +3165,14 @@ static int lfsr_btree_commit(lfs_t *lfs, // note that since we defer merges to compaction time, we can // end up removing an rbyd here if (rbyd_.weight == 0) { - scratch_attrs[0] = *LFSD_ATTR( + scratch_attrs[0] = *LFSR_ATTR( MKUNR, rid, +rbyd_.weight-rweight, scratch_buf1, delta, NULL); } else { - scratch_attrs[0] = *LFSD_ATTR( + scratch_attrs[0] = *LFSR_ATTR( BRANCH, rid, 0, scratch_buf1, delta, &scratch_attrs[1]); - scratch_attrs[1] = *LFSD_ATTR( + scratch_attrs[1] = *LFSR_ATTR( UNR, rid, +rbyd_.weight-rweight, NULL, 0, NULL); } @@ -3312,13 +3217,7 @@ static int lfsr_btree_commit(lfs_t *lfs, // we need to make sure we keep bisect updated with weight changes if (attr->id < bisect_) { - // TODO do we need to check for mk? bisect_ += attr->delta; -// if (attr->tag == LFSR_TAG_GROW) { -// bisect_ += attr->data.len; -// } else if (attr->tag == LFSR_TAG_SHRINK) { -// bisect_ -= attr->data.len; -// } } } @@ -3353,19 +3252,6 @@ static int lfsr_btree_commit(lfs_t *lfs, break; } -// // TODO this is really wasteful and throws off our predicted -// // size, can we combine grows into the tag append in the rbyd -// // somehow? -// // create grows as necessary -// err = lfsr_rbyd_append_(lfs, &sibling, -// LFSR_TAG_GROW, -// id - bisect - (weight-1), -// // TODO also this is a weird way to use lfsr_data_t -// LFSR_DATA_BUF(NULL, weight)); -// if (err) { -// return err; -// } - // append the attr err = lfsr_rbyd_append(lfs, &sibling, lfsr_tag_setmk(tag), @@ -3391,13 +3277,7 @@ static int lfsr_btree_commit(lfs_t *lfs, // we need to make sure we keep bisect updated with weight changes if (attr->id < bisect_) { - // TODO do we need to check for mk? bisect_ += attr->delta; -// if (attr->tag == LFSR_TAG_GROW) { -// bisect_ += attr->data.len; -// } else if (attr->tag == LFSR_TAG_SHRINK) { -// bisect_ -= attr->data.len; -// } } } @@ -3445,21 +3325,21 @@ static int lfsr_btree_commit(lfs_t *lfs, return delta2; } - scratch_attrs[0] = *LFSD_ATTR( + scratch_attrs[0] = *LFSR_ATTR( MKBRANCH, 0, +rbyd_.weight, scratch_buf1, delta1, &scratch_attrs[1]); if (lfsr_tag_suptype(stag) == LFSR_TAG_NAME) { - scratch_attrs[1] = *LFSD_ATTR_DISK( + scratch_attrs[1] = *LFSR_ATTR_DISK( MKBNAME, rbyd_.weight, +sibling.weight, sibling.block, soff, ssize, &scratch_attrs[2]); - scratch_attrs[2] = *LFSD_ATTR( + scratch_attrs[2] = *LFSR_ATTR( BRANCH, 0+rbyd_.weight+sibling.weight-1, 0, scratch_buf2, delta2, NULL); } else { - scratch_attrs[1] = *LFSD_ATTR( + scratch_attrs[1] = *LFSR_ATTR( MKBRANCH, 0+rbyd_.weight, +sibling.weight, scratch_buf2, delta2, NULL); @@ -3483,27 +3363,27 @@ static int lfsr_btree_commit(lfs_t *lfs, return delta2; } - scratch_attrs[0] = *LFSD_ATTR( + scratch_attrs[0] = *LFSR_ATTR( UNR, rid, +rbyd_.weight-rweight, NULL, 0, &scratch_attrs[1]); - scratch_attrs[1] = *LFSD_ATTR( + scratch_attrs[1] = *LFSR_ATTR( BRANCH, rid-(rweight-1)+rbyd_.weight-1, 0, scratch_buf1, delta1, &scratch_attrs[2]); if (lfsr_tag_suptype(stag) == LFSR_TAG_NAME) { - scratch_attrs[2] = *LFSD_ATTR_DISK( + scratch_attrs[2] = *LFSR_ATTR_DISK( MKBNAME, rid-(rweight-1)+rbyd_.weight, +sibling.weight, sibling.block, soff, ssize, &scratch_attrs[3]); - scratch_attrs[3] = *LFSD_ATTR( + scratch_attrs[3] = *LFSR_ATTR( BRANCH, rid-(rweight-1)+rbyd_.weight+sibling.weight-1, 0, scratch_buf2, delta2, NULL); } else { - scratch_attrs[2] = *LFSD_ATTR( + scratch_attrs[2] = *LFSR_ATTR( MKBRANCH, rid-(rweight-1)+rbyd_.weight, +sibling.weight, scratch_buf2, delta2, @@ -3589,19 +3469,6 @@ static int lfsr_btree_commit(lfs_t *lfs, break; } -// // TODO this is really wasteful and throws off our predicted -// // size, can we combine grows into the tag append in the rbyd -// // somehow? -// // create grows as necessary -// err = lfsr_rbyd_append_(lfs, &rbyd_, -// LFSR_TAG_GROW, -// sdelta + id - (weight-1), -// // TODO also this is a weird way to use lfsr_data_t -// LFSR_DATA_BUF(NULL, weight)); -// if (err) { -// return err; -// } - // append the attr err = lfsr_rbyd_append(lfs, &rbyd_, lfsr_tag_setmk(tag), @@ -3687,13 +3554,13 @@ static int lfsr_btree_commit(lfs_t *lfs, lfs_swap32(&rweight, &sweight); } - scratch_attrs[0] = *LFSD_ATTR( + scratch_attrs[0] = *LFSR_ATTR( MKUNR, sid, -sweight, NULL, 0, &scratch_attrs[1]); - scratch_attrs[1] = *LFSD_ATTR( + scratch_attrs[1] = *LFSR_ATTR( BRANCH, rid, 0, scratch_buf1, delta1, &scratch_attrs[2]); - scratch_attrs[2] = *LFSD_ATTR( + scratch_attrs[2] = *LFSR_ATTR( UNR, rid, +rbyd_.weight-rweight, NULL, 0, NULL); } @@ -3737,10 +3604,10 @@ static int lfsr_btree_push(lfs_t *lfs, lfsr_btree_t *btree, // commit our entries err = lfsr_rbyd_commit(lfs, &rbyd, - LFSD_ATTR_( + LFSR_ATTR_( lfsr_tag_setmk(btree->tag), 0, +btree->weight, btree->u.inlined.buf, btree->u.inlined.size, - LFSD_ATTR_( + LFSR_ATTR_( lfsr_tag_setmk(tag), id, +weight, buffer, size, NULL))); @@ -3778,7 +3645,7 @@ static int lfsr_btree_push(lfs_t *lfs, lfsr_btree_t *btree, // of the rest return lfsr_btree_commit(lfs, btree, lfs_min32(id, btree->weight-1), &rbyd, - LFSD_ATTR_(lfsr_tag_setmk(tag), rid, +weight, buffer, size, + LFSR_ATTR_(lfsr_tag_setmk(tag), rid, +weight, buffer, size, NULL)); } } @@ -3816,10 +3683,10 @@ static int lfsr_btree_update(lfs_t *lfs, lfsr_btree_t *btree, // commit our id into the tree, letting lfsr_btree_commit take care // of the rest return lfsr_btree_commit(lfs, btree, id, &rbyd, - LFSD_ATTR_IF_(tag != rtag, + LFSR_ATTR_IF_(tag != rtag, lfsr_tag_setrm(rtag), rid, 0, NULL, 0, - LFSD_ATTR_(tag, rid, 0, buffer, size, - LFSD_ATTR(UNR, rid, +weight-rweight, NULL, 0, + LFSR_ATTR_(tag, rid, 0, buffer, size, + LFSR_ATTR(UNR, rid, +weight-rweight, NULL, 0, NULL)))); } } @@ -3907,7 +3774,7 @@ static int lfsr_btree_pop(lfs_t *lfs, lfsr_btree_t *btree, lfs_size_t id) { // remove our id, letting lfsr_btree_commit take care // of the rest return lfsr_btree_commit(lfs, btree, id, &rbyd, - LFSD_ATTR(MKUNR, rid, -rweight, NULL, 0, + LFSR_ATTR(MKUNR, rid, -rweight, NULL, 0, NULL)); } } @@ -3937,11 +3804,11 @@ static int lfsr_btree_split(lfs_t *lfs, lfsr_btree_t *btree, // commit our entries err = lfsr_rbyd_commit(lfs, &rbyd, - LFSD_ATTR_(lfsr_tag_setmk(tag1), 0, +weight1, + LFSR_ATTR_(lfsr_tag_setmk(tag1), 0, +weight1, buffer1, size1, - LFSD_ATTR(MKBNAME, weight1, +weight2, + LFSR_ATTR(MKBNAME, weight1, +weight2, name, name_len, - LFSD_ATTR_(tag2, weight1+weight2-1, 0, + LFSR_ATTR_(tag2, weight1+weight2-1, 0, buffer2, size2, NULL)))); if (err) { @@ -3979,13 +3846,13 @@ static int lfsr_btree_split(lfs_t *lfs, lfsr_btree_t *btree, // commit our id into the tree, letting lfsr_btree_commit take care // of the rest return lfsr_btree_commit(lfs, btree, id, &rbyd, - LFSD_ATTR(UNR, rid, +weight1-rweight, NULL, 0, - LFSD_ATTR_(tag1, rid-(rweight-1)+weight1-1, 0, + LFSR_ATTR(UNR, rid, +weight1-rweight, NULL, 0, + LFSR_ATTR_(tag1, rid-(rweight-1)+weight1-1, 0, buffer1, size1, // TODO should we always be making name entries? - LFSD_ATTR(MKBNAME, rid-(rweight-1)+weight1, +weight2, + LFSR_ATTR(MKBNAME, rid-(rweight-1)+weight1, +weight2, name, name_len, - LFSD_ATTR_(tag2, rid-(rweight-1)+weight1+weight2-1, 0, + LFSR_ATTR_(tag2, rid-(rweight-1)+weight1+weight2-1, 0, buffer2, size2, NULL))))); } diff --git a/tests/test_rbyd.toml b/tests/test_rbyd.toml index 79479b3d..bfed1faf 100644 --- a/tests/test_rbyd.toml +++ b/tests/test_rbyd.toml @@ -40,15 +40,15 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; // commit with two attributes rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL))) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; ''' @@ -79,16 +79,16 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; // commit with two attributes rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; ''' @@ -113,12 +113,12 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; // commit with the second attribute lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; ''' @@ -164,7 +164,7 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, &tag_, &id_, NULL, &off_, &size_) => 0; @@ -187,8 +187,8 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL))) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL))) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, &tag_, &id_, NULL, &off_, &size_) => 0; @@ -221,8 +221,8 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL))) => 0; + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL))) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, &tag_, &id_, NULL, &off_, &size_) => 0; @@ -289,7 +289,7 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, &tag_, &id_, NULL, &off_, &size_) => 0; @@ -312,9 +312,9 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, &tag_, &id_, NULL, &off_, &size_) => 0; @@ -347,9 +347,9 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, &tag_, &id_, NULL, &off_, &size_) => 0; @@ -413,7 +413,7 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, buffer, 4) => 4; @@ -432,8 +432,8 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL))) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL))) => 0; lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, buffer, 4) => 4; @@ -454,8 +454,8 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL))) => 0; + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL))) => 0; lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, buffer, 4) => 4; lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_UATTR(2), -1, buffer, 4) @@ -506,7 +506,7 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, buffer, 4) => 4; @@ -525,9 +525,9 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, buffer, 4) => 4; @@ -548,9 +548,9 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, buffer, 4) => 4; lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_UATTR(2), -1, buffer, 4) @@ -595,8 +595,8 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL))) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, @@ -617,8 +617,8 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL))) => 0; + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, @@ -661,9 +661,9 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL)))) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, @@ -684,9 +684,9 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)))) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, @@ -731,9 +731,9 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, NULL)))) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, NULL)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, @@ -761,9 +761,9 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)))) => 0; + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, @@ -813,10 +813,10 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, NULL))))) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, NULL))))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, @@ -844,10 +844,10 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL))))) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL))))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, @@ -875,10 +875,10 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL))))) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL))))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, @@ -906,10 +906,10 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL))))) => 0; + LFSR_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL))))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, @@ -961,10 +961,10 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, NULL))))) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, NULL))))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, @@ -999,10 +999,10 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL))))) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL))))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, @@ -1037,10 +1037,10 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL))))) => 0; + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL))))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, @@ -1075,10 +1075,10 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL))))) => 0; + LFSR_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL))))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, @@ -1135,10 +1135,10 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, NULL))))) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, NULL))))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, @@ -1173,10 +1173,10 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, - LFSD_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, NULL))))) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, + LFSR_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, NULL))))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, @@ -1211,10 +1211,10 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, NULL))))) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, NULL))))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, @@ -1249,10 +1249,10 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, NULL))))) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, NULL))))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, @@ -1311,11 +1311,11 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, - LFSD_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, NULL)))))) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, + LFSR_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, NULL)))))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, @@ -1352,11 +1352,11 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, - LFSD_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, NULL)))))) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, + LFSR_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, NULL)))))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, @@ -1391,11 +1391,11 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL)))))) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL)))))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, @@ -1430,11 +1430,11 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)))))) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)))))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, @@ -1495,11 +1495,11 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, - LFSD_ATTR(UATTR(5), -1, 0, "\xee\xee\xee\xee", 4, NULL)))))) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, + LFSR_ATTR(UATTR(5), -1, 0, "\xee\xee\xee\xee", 4, NULL)))))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, @@ -1543,11 +1543,11 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, - LFSD_ATTR(UATTR(5), -1, 0, "\xee\xee\xee\xee", 4, - LFSD_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, NULL)))))) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, + LFSR_ATTR(UATTR(5), -1, 0, "\xee\xee\xee\xee", 4, + LFSR_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, NULL)))))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, @@ -1589,11 +1589,11 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, - LFSD_ATTR(UATTR(5), -1, 0, "\xee\xee\xee\xee", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL)))))) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, + LFSR_ATTR(UATTR(5), -1, 0, "\xee\xee\xee\xee", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL)))))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, @@ -1635,11 +1635,11 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, - LFSD_ATTR(UATTR(5), -1, 0, "\xee\xee\xee\xee", 4, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)))))) => 0; + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, + LFSR_ATTR(UATTR(5), -1, 0, "\xee\xee\xee\xee", 4, + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)))))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, @@ -1705,12 +1705,12 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, - LFSD_ATTR(UATTR(5), -1, 0, "\xee\xee\xee\xee", 4, - LFSD_ATTR(UATTR(5), -1, 0, "\xee\xee\xee\xee", 4, NULL))))))) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, + LFSR_ATTR(UATTR(5), -1, 0, "\xee\xee\xee\xee", 4, + LFSR_ATTR(UATTR(5), -1, 0, "\xee\xee\xee\xee", 4, NULL))))))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, @@ -1754,12 +1754,12 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, - LFSD_ATTR(UATTR(5), -1, 0, "\xee\xee\xee\xee", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL))))))) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, + LFSR_ATTR(UATTR(5), -1, 0, "\xee\xee\xee\xee", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL))))))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, @@ -1803,12 +1803,12 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, - LFSD_ATTR(UATTR(5), -1, 0, "\xee\xee\xee\xee", 4, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL))))))) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, + LFSR_ATTR(UATTR(5), -1, 0, "\xee\xee\xee\xee", 4, + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL))))))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, @@ -1876,12 +1876,12 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, - LFSD_ATTR(UATTR(5), -1, 0, "\xee\xee\xee\xee", 4, - LFSD_ATTR(UATTR(6), -1, 0, "\xff\xff\xff\xff", 4, NULL))))))) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, + LFSR_ATTR(UATTR(5), -1, 0, "\xee\xee\xee\xee", 4, + LFSR_ATTR(UATTR(6), -1, 0, "\xff\xff\xff\xff", 4, NULL))))))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, @@ -1930,12 +1930,12 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, - LFSD_ATTR(UATTR(5), -1, 0, "\xee\xee\xee\xee", 4, - LFSD_ATTR(UATTR(6), -1, 0, "\xff\xff\xff\xff", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL))))))) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, + LFSR_ATTR(UATTR(5), -1, 0, "\xee\xee\xee\xee", 4, + LFSR_ATTR(UATTR(6), -1, 0, "\xff\xff\xff\xff", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL))))))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, @@ -1984,12 +1984,12 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, - LFSD_ATTR(UATTR(5), -1, 0, "\xee\xee\xee\xee", 4, - LFSD_ATTR(UATTR(6), -1, 0, "\xff\xff\xff\xff", 4, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL))))))) => 0; + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, + LFSR_ATTR(UATTR(5), -1, 0, "\xee\xee\xee\xee", 4, + LFSR_ATTR(UATTR(6), -1, 0, "\xff\xff\xff\xff", 4, + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL))))))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, @@ -2075,7 +2075,7 @@ code = ''' // build the attribute list for the current permutation struct lfsr_attr attrs[N]; for (unsigned j = 0; j < N; j++) { - attrs[j] = *LFSD_ATTR( + attrs[j] = *LFSR_ATTR( UATTR(perm[j]+1), -1, 0, "\xaa\xaa\xaa\xaa", 4, (j+1 < N) ? &attrs[j+1] : NULL); @@ -2172,7 +2172,7 @@ code = ''' lfs_bd_erase(&lfs, rbyd.block) => 0; for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(perm[j]+1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(perm[j]+1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; } @@ -2234,8 +2234,8 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL))) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL))) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, 0, -1, &tag_, &id_, NULL, &off_, &size_) => 0; @@ -2268,8 +2268,8 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL))) => 0; + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL))) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, 0, -1, &tag_, &id_, NULL, &off_, &size_) => 0; @@ -2326,9 +2326,9 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, 0, -1, &tag_, &id_, NULL, &off_, &size_) => 0; @@ -2361,9 +2361,9 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, 0, -1, &tag_, &id_, NULL, &off_, &size_) => 0; @@ -2440,7 +2440,7 @@ code = ''' // build the attribute list for the current permutation struct lfsr_attr attrs[N]; for (unsigned j = 0; j < N; j++) { - attrs[j] = *LFSD_ATTR( + attrs[j] = *LFSR_ATTR( UATTR(perm[j]+1), -1, 0, "\xaa\xaa\xaa\xaa", 4, (j+1 < N) ? &attrs[j+1] : NULL); @@ -2519,7 +2519,7 @@ code = ''' lfs_bd_erase(&lfs, rbyd.block) => 0; for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(perm[j]+1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(perm[j]+1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; } @@ -2578,7 +2578,7 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(j+1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(j+1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; } @@ -2617,7 +2617,7 @@ code = ''' // update each tag in permutation order for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(perm[j]+1), -1, 0, + LFSR_ATTR(UATTR(perm[j]+1), -1, 0, "\xaa\xaa\xaa\xaa\xaa\xaa", 6, NULL)) => 0; } @@ -2699,7 +2699,7 @@ code = ''' : (ORDER == 1) ? (uint8_t)(((lfs_size_t)-1) - i) : (uint8_t)TEST_PRNG(&prng); int err = lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(x), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(x), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)); if (err == LFS_ERR_RANGE) { break; @@ -2753,9 +2753,9 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(RMUATTR(1), -1, 0, NULL, 0, NULL)) => 0; + LFSR_ATTR(RMUATTR(1), -1, 0, NULL, 0, NULL)) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, &tag_, &id_, NULL, &off_, &size_) => LFS_ERR_NOENT; @@ -2772,10 +2772,10 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL))) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(RMUATTR(1), -1, 0, NULL, 0, NULL)) => 0; + LFSR_ATTR(RMUATTR(1), -1, 0, NULL, 0, NULL)) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, &tag_, &id_, NULL, &off_, &size_) => 0; @@ -2808,10 +2808,10 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL))) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(RMUATTR(2), -1, 0, NULL, 0, NULL)) => 0; + LFSR_ATTR(RMUATTR(2), -1, 0, NULL, 0, NULL)) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, &tag_, &id_, NULL, &off_, &size_) => 0; @@ -2892,7 +2892,7 @@ code = ''' lfs_bd_erase(&lfs, rbyd.block) => 0; for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(perm[j]+1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(perm[j]+1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; } @@ -2914,7 +2914,7 @@ code = ''' lfs_bd_flush(&lfs, &lfs.pcache, &lfs.rcache, false) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(RMUATTR(j+1), -1, 0, NULL, 0, NULL)) => 0; + LFSR_ATTR(RMUATTR(j+1), -1, 0, NULL, 0, NULL)) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; @@ -2942,7 +2942,7 @@ code = ''' // try appending the tag back to make sure things still work printf("--- append: %d ---\n", j); lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(j+1), -1, 0, "\xaa\xaa\xaa\xaa\xaa\xaa", 6, + LFSR_ATTR(UATTR(j+1), -1, 0, "\xaa\xaa\xaa\xaa\xaa\xaa", 6, NULL)) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, @@ -3041,7 +3041,7 @@ code = ''' lfs_bd_erase(&lfs, rbyd.block) => 0; for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(perm[j]+1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(perm[j]+1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; } @@ -3063,7 +3063,7 @@ code = ''' lfs_bd_flush(&lfs, &lfs.pcache, &lfs.rcache, false) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(RMUATTR(j+1), -1, 0, NULL, 0, NULL)) => 0; + LFSR_ATTR(RMUATTR(j+1), -1, 0, NULL, 0, NULL)) => 0; // try traversing over the tags lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, @@ -3119,8 +3119,8 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, NULL))) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, &tag_, &id_, NULL, &off_, &size_) => 0; @@ -3147,7 +3147,7 @@ code = ''' // try to remove tags that aren't there, this should do nothing lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(RMUATTR(1), -1, 0, NULL, 0, NULL)) => 0; + LFSR_ATTR(RMUATTR(1), -1, 0, NULL, 0, NULL)) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, &tag_, &id_, NULL, &off_, &size_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); @@ -3172,7 +3172,7 @@ code = ''' &tag_, &id_, NULL, &off_, &size_) => LFS_ERR_NOENT; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(RMUATTR(3), -1, 0, NULL, 0, NULL)) => 0; + LFSR_ATTR(RMUATTR(3), -1, 0, NULL, 0, NULL)) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, &tag_, &id_, NULL, &off_, &size_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); @@ -3197,7 +3197,7 @@ code = ''' &tag_, &id_, NULL, &off_, &size_) => LFS_ERR_NOENT; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(RMUATTR(5), -1, 0, NULL, 0, NULL)) => 0; + LFSR_ATTR(RMUATTR(5), -1, 0, NULL, 0, NULL)) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, &tag_, &id_, NULL, &off_, &size_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); @@ -3272,17 +3272,17 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, - LFSD_ATTR(UATTR(5), -1, 0, "\xee\xee\xee\xee", 4, + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(3), -1, 0, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(4), -1, 0, "\xdd\xdd\xdd\xdd", 4, + LFSR_ATTR(UATTR(5), -1, 0, "\xee\xee\xee\xee", 4, NULL)))))) => 0; // remove several attributes lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(RMUATTR(1), -1, 0, NULL, 0, - LFSD_ATTR(RMUATTR(3), -1, 0, NULL, 0, - LFSD_ATTR(RMUATTR(5), -1, 0, NULL, 0, NULL)))) => 0; + LFSR_ATTR(RMUATTR(1), -1, 0, NULL, 0, + LFSR_ATTR(RMUATTR(3), -1, 0, NULL, 0, + LFSR_ATTR(RMUATTR(5), -1, 0, NULL, 0, NULL)))) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, &tag_, &id_, NULL, &off_, &size_) => 0; @@ -3309,7 +3309,7 @@ code = ''' // try to remove tags that aren't there, this should do nothing lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(RMUATTR(1), -1, 0, NULL, 0, NULL)) => 0; + LFSR_ATTR(RMUATTR(1), -1, 0, NULL, 0, NULL)) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, &tag_, &id_, NULL, &off_, &size_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); @@ -3334,7 +3334,7 @@ code = ''' &tag_, &id_, NULL, &off_, &size_) => LFS_ERR_NOENT; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(RMUATTR(3), -1, 0, NULL, 0, NULL)) => 0; + LFSR_ATTR(RMUATTR(3), -1, 0, NULL, 0, NULL)) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, &tag_, &id_, NULL, &off_, &size_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); @@ -3359,7 +3359,7 @@ code = ''' &tag_, &id_, NULL, &off_, &size_) => LFS_ERR_NOENT; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(RMUATTR(5), -1, 0, NULL, 0, NULL)) => 0; + LFSR_ATTR(RMUATTR(5), -1, 0, NULL, 0, NULL)) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, &tag_, &id_, NULL, &off_, &size_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); @@ -3386,7 +3386,7 @@ code = ''' // try to remove the tags again, just to make sure (keep in mind // these removes still commit to the rbyd) lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(RMUATTR(1), -1, 0, NULL, 0, NULL)) => 0; + LFSR_ATTR(RMUATTR(1), -1, 0, NULL, 0, NULL)) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, &tag_, &id_, NULL, &off_, &size_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); @@ -3411,7 +3411,7 @@ code = ''' &tag_, &id_, NULL, &off_, &size_) => LFS_ERR_NOENT; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(RMUATTR(3), -1, 0, NULL, 0, NULL)) => 0; + LFSR_ATTR(RMUATTR(3), -1, 0, NULL, 0, NULL)) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, &tag_, &id_, NULL, &off_, &size_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); @@ -3436,7 +3436,7 @@ code = ''' &tag_, &id_, NULL, &off_, &size_) => LFS_ERR_NOENT; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(RMUATTR(5), -1, 0, NULL, 0, NULL)) => 0; + LFSR_ATTR(RMUATTR(5), -1, 0, NULL, 0, NULL)) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, &tag_, &id_, NULL, &off_, &size_) => 0; assert(tag_ == LFSR_TAG_UATTR(2)); @@ -3511,9 +3511,9 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(RMUATTR(1), -1, 0, NULL, 0, NULL)) => 0; + LFSR_ATTR(RMUATTR(1), -1, 0, NULL, 0, NULL)) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, &tag_, &id_, NULL, &off_, &size_) => LFS_ERR_NOENT; @@ -3530,11 +3530,11 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL))) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(RMUATTR(1), -1, 0, NULL, 0, - LFSD_ATTR(RMUATTR(2), -1, 0, NULL, 0, NULL))) => 0; + LFSR_ATTR(RMUATTR(1), -1, 0, NULL, 0, + LFSR_ATTR(RMUATTR(2), -1, 0, NULL, 0, NULL))) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, &tag_, &id_, NULL, &off_, &size_) => LFS_ERR_NOENT; @@ -3551,11 +3551,11 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL))) => 0; + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(2), -1, 0, "\xbb\xbb\xbb\xbb", 4, NULL))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(RMUATTR(2), -1, 0, NULL, 0, - LFSD_ATTR(RMUATTR(1), -1, 0, NULL, 0, NULL))) => 0; + LFSR_ATTR(RMUATTR(2), -1, 0, NULL, 0, + LFSR_ATTR(RMUATTR(1), -1, 0, NULL, 0, NULL))) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(1), -1, &tag_, &id_, NULL, &off_, &size_) => LFS_ERR_NOENT; @@ -3608,7 +3608,7 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(j+1), -1, 0, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(j+1), -1, 0, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; } @@ -3647,7 +3647,7 @@ code = ''' // remove each tag in permutation order for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(RMUATTR(perm[j]+1), -1, 0, NULL, 0, NULL)) => 0; + LFSR_ATTR(RMUATTR(perm[j]+1), -1, 0, NULL, 0, NULL)) => 0; } // check that all tags are now removed @@ -3659,7 +3659,7 @@ code = ''' // try resuming from all tags being removed lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa\xaa\xaa", 6, + LFSR_ATTR(UATTR(1), -1, 0, "\xaa\xaa\xaa\xaa\xaa\xaa", 6, NULL)) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; @@ -3770,14 +3770,14 @@ code = ''' sim[attr] = alpha[i % 26]; // update our rbyd lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(attr), -1, 0, &alpha[i % 26], 1, + LFSR_ATTR(UATTR(attr), -1, 0, &alpha[i % 26], 1, NULL)) => 0; } else { // update our sim sim[attr] = '\0'; // update our rbyd lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(RMUATTR(attr), -1, 0, NULL, 0, + LFSR_ATTR(RMUATTR(attr), -1, 0, NULL, 0, NULL)) => 0; } } @@ -3868,7 +3868,7 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; assert(rbyd.weight == 1); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) => 4; @@ -3883,8 +3883,8 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, NULL))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, NULL))) => 0; assert(rbyd.weight == 2); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) => 4; @@ -3903,8 +3903,8 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL))) => 0; assert(rbyd.weight == 2); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) => 4; @@ -3923,9 +3923,9 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(MKREG, 2, +1, "\xcc\xcc\xcc\xcc", 4, NULL)))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(MKREG, 2, +1, "\xcc\xcc\xcc\xcc", 4, NULL)))) => 0; assert(rbyd.weight == 3); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) => 4; @@ -3948,9 +3948,9 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(MKREG, 1, +1, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(MKREG, 1, +1, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)))) => 0; assert(rbyd.weight == 3); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) => 4; @@ -3973,9 +3973,9 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(MKREG, 1, +1, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, NULL)))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(MKREG, 1, +1, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, NULL)))) => 0; assert(rbyd.weight == 3); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) => 4; @@ -4017,7 +4017,7 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; assert(rbyd.weight == 1); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) @@ -4034,9 +4034,9 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; assert(rbyd.weight == 2); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) => 4; @@ -4055,9 +4055,9 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; assert(rbyd.weight == 2); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) => 4; @@ -4076,11 +4076,11 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 2, +1, "\xcc\xcc\xcc\xcc", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 2, +1, "\xcc\xcc\xcc\xcc", 4, NULL)) => 0; assert(rbyd.weight == 3); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) => 4; @@ -4103,11 +4103,11 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 1, +1, "\xcc\xcc\xcc\xcc", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 1, +1, "\xcc\xcc\xcc\xcc", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; assert(rbyd.weight == 3); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) => 4; @@ -4130,11 +4130,11 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 1, +1, "\xcc\xcc\xcc\xcc", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 1, +1, "\xcc\xcc\xcc\xcc", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; assert(rbyd.weight == 3); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) => 4; @@ -4218,7 +4218,7 @@ code = ''' } } - attrs[j] = *LFSD_ATTR( + attrs[j] = *LFSR_ATTR( MKREG, id, +1, names[perm[j] % 6], 4, (j+1 < N) ? &attrs[j+1] : NULL); } @@ -4325,7 +4325,7 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, id, +1, names[perm[j] % 6], 4, + LFSR_ATTR(MKREG, id, +1, names[perm[j] % 6], 4, NULL)) => 0; } @@ -4387,8 +4387,8 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, NULL))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, NULL))) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, 0, -1, &tag_, &id_, NULL, &off_, &size_) => 0; @@ -4429,8 +4429,8 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL))) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, 0, -1, &tag_, &id_, NULL, &off_, &size_) => 0; @@ -4496,9 +4496,9 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, 0, -1, &tag_, &id_, NULL, &off_, &size_) => 0; @@ -4539,9 +4539,9 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, 0, -1, &tag_, &id_, NULL, &off_, &size_) => 0; @@ -4643,7 +4643,7 @@ code = ''' } } - attrs[j] = *LFSD_ATTR( + attrs[j] = *LFSR_ATTR( MKREG, id, +1, names[perm[j] % 6], 4, (j+1 < N) ? &attrs[j+1] : NULL); } @@ -4741,7 +4741,7 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, id, +1, names[perm[j] % 6], 4, + LFSR_ATTR(MKREG, id, +1, names[perm[j] % 6], 4, NULL)) => 0; } @@ -4814,7 +4814,7 @@ code = ''' x = x % (rbyd.weight+1); int err = lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, x, +1, names[x % 6], 4, NULL)); + LFSR_ATTR(MKREG, x, +1, names[x % 6], 4, NULL)); if (err == LFS_ERR_RANGE) { break; } @@ -4863,8 +4863,8 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, NULL))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, NULL))) => 0; assert(rbyd.weight == 1); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) => 4; @@ -4883,10 +4883,10 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, NULL))))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, NULL))))) => 0; assert(rbyd.weight == 2); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) => 4; @@ -4913,10 +4913,10 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(1), 0, 0, "\xbb\xbb", 2, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, NULL))))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(1), 0, 0, "\xbb\xbb", 2, + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, NULL))))) => 0; assert(rbyd.weight == 2); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) => 4; @@ -4943,12 +4943,12 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, - LFSD_ATTR(MKREG, 2, +1, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(1), 2, 0, "\xcc\xcc", 2, NULL))))))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, + LFSR_ATTR(MKREG, 2, +1, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(1), 2, 0, "\xcc\xcc", 2, NULL))))))) => 0; assert(rbyd.weight == 3); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) => 4; @@ -5000,12 +5000,12 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(1), 0, 0, "\xbb\xbb", 2, - LFSD_ATTR(MKREG, 1, +1, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(1), 1, 0, "\xcc\xcc", 2, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, NULL))))))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(1), 0, 0, "\xbb\xbb", 2, + LFSR_ATTR(MKREG, 1, +1, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(1), 1, 0, "\xcc\xcc", 2, + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, NULL))))))) => 0; assert(rbyd.weight == 3); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) => 4; @@ -5040,12 +5040,12 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, - LFSD_ATTR(MKREG, 1, +1, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(1), 1, 0, "\xcc\xcc", 2, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, NULL))))))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, + LFSR_ATTR(MKREG, 1, +1, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(1), 1, 0, "\xcc\xcc", 2, + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, NULL))))))) => 0; assert(rbyd.weight == 3); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) => 4; @@ -5099,9 +5099,9 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, NULL)) => 0; + LFSR_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, NULL)) => 0; assert(rbyd.weight == 1); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) => 4; @@ -5120,13 +5120,13 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, NULL)) => 0; + LFSR_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, NULL)) => 0; + LFSR_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, NULL)) => 0; assert(rbyd.weight == 2); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) => 4; @@ -5153,13 +5153,13 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), 0, 0, "\xbb\xbb", 2, NULL)) => 0; + LFSR_ATTR(UATTR(1), 0, 0, "\xbb\xbb", 2, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, NULL)) => 0; + LFSR_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, NULL)) => 0; assert(rbyd.weight == 2); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) => 4; @@ -5186,17 +5186,17 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, NULL)) => 0; + LFSR_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, NULL)) => 0; + LFSR_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 2, +1, "\xcc\xcc\xcc\xcc", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 2, +1, "\xcc\xcc\xcc\xcc", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), 2, 0, "\xcc\xcc", 2, NULL)) => 0; + LFSR_ATTR(UATTR(1), 2, 0, "\xcc\xcc", 2, NULL)) => 0; assert(rbyd.weight == 3); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) => 4; @@ -5248,17 +5248,17 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), 0, 0, "\xbb\xbb", 2, NULL)) => 0; + LFSR_ATTR(UATTR(1), 0, 0, "\xbb\xbb", 2, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 1, +1, "\xcc\xcc\xcc\xcc", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 1, +1, "\xcc\xcc\xcc\xcc", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), 1, 0, "\xcc\xcc", 2, NULL)) => 0; + LFSR_ATTR(UATTR(1), 1, 0, "\xcc\xcc", 2, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, NULL)) => 0; + LFSR_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, NULL)) => 0; assert(rbyd.weight == 3); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) => 4; @@ -5293,17 +5293,17 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, NULL)) => 0; + LFSR_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 1, +1, "\xcc\xcc\xcc\xcc", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 1, +1, "\xcc\xcc\xcc\xcc", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), 1, 0, "\xcc\xcc", 2, NULL)) => 0; + LFSR_ATTR(UATTR(1), 1, 0, "\xcc\xcc", 2, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, NULL)) => 0; + LFSR_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, NULL)) => 0; assert(rbyd.weight == 3); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) => 4; @@ -5400,12 +5400,12 @@ code = ''' } } - attrs[(1+M)*j] = *LFSD_ATTR( + attrs[(1+M)*j] = *LFSR_ATTR( MKREG, id, +1, names[perm[j] % 6], 4, ((1+M)*j+1 < (1+M)*N) ? &attrs[(1+M)*j+1] : NULL); // note uattrs have a smaller size to help debugging for (unsigned u = 0; u < M; u++) { - attrs[(1+M)*j+1+u] = *LFSD_ATTR( + attrs[(1+M)*j+1+u] = *LFSR_ATTR( UATTR(u+1), id, 0, names[perm[j] % 6], 2, ((1+M)*j+1+u+1 < (1+M)*N) ? &attrs[(1+M)*j+1+u+1] @@ -5522,12 +5522,12 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, id, +1, names[perm[j] % 6], 4, + LFSR_ATTR(MKREG, id, +1, names[perm[j] % 6], 4, NULL)) => 0; // note uattrs have a smaller size to help debugging for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(u+1), id, 0, names[perm[j] % 6], 2, + LFSR_ATTR(UATTR(u+1), id, 0, names[perm[j] % 6], 2, NULL)) => 0; } } @@ -5595,10 +5595,10 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, NULL))))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, NULL))))) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, 0, -1, &tag_, &id_, NULL, &off_, &size_) => 0; @@ -5667,10 +5667,10 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(1), 0, 0, "\xbb\xbb", 2, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, NULL))))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(1), 0, 0, "\xbb\xbb", 2, + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, NULL))))) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, 0, -1, &tag_, &id_, NULL, &off_, &size_) => 0; @@ -5764,13 +5764,13 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, NULL)) => 0; + LFSR_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, NULL)) => 0; + LFSR_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, NULL)) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, 0, -1, &tag_, &id_, NULL, &off_, &size_) => 0; @@ -5839,13 +5839,13 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), 0, 0, "\xbb\xbb", 2, NULL)) => 0; + LFSR_ATTR(UATTR(1), 0, 0, "\xbb\xbb", 2, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, NULL)) => 0; + LFSR_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, NULL)) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, 0, -1, &tag_, &id_, NULL, &off_, &size_) => 0; @@ -5976,12 +5976,12 @@ code = ''' } } - attrs[(1+M)*j] = *LFSD_ATTR( + attrs[(1+M)*j] = *LFSR_ATTR( MKREG, id, +1, names[perm[j] % 6], 4, ((1+M)*j+1 < N*(1+M)) ? &attrs[(1+M)*j+1] : NULL); // note uattrs have a smaller size to help debugging for (unsigned u = 0; u < M; u++) { - attrs[(1+M)*j+1+u] = *LFSD_ATTR( + attrs[(1+M)*j+1+u] = *LFSR_ATTR( UATTR(u+1), id, 0, names[perm[j] % 6], 2, ((1+M)*j+1+u+1 < N*(1+M)) ? &attrs[(1+M)*j+1+u+1] @@ -6095,12 +6095,12 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, id, +1, names[perm[j] % 6], 4, + LFSR_ATTR(MKREG, id, +1, names[perm[j] % 6], 4, NULL)) => 0; // note uattrs have a smaller size to help debugging for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(u+1), id, 0, names[perm[j] % 6], 2, + LFSR_ATTR(UATTR(u+1), id, 0, names[perm[j] % 6], 2, NULL)) => 0; } } @@ -6182,12 +6182,12 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, j, +1, names[j % 6], 4, + LFSR_ATTR(MKREG, j, +1, names[j % 6], 4, NULL)) => 0; // note uattrs have a smaller size to help debugging for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(u+1), j, 0, names[j % 6], 2, + LFSR_ATTR(UATTR(u+1), j, 0, names[j % 6], 2, NULL)) => 0; } } @@ -6227,7 +6227,7 @@ code = ''' // update each tag in permutation order for (unsigned j = 0; j < N*M; j++) { lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(perm[j]%M+1), perm[j]/M, 0, + LFSR_ATTR(UATTR(perm[j]%M+1), perm[j]/M, 0, names[(perm[j]/M) % 6], 3, NULL)) => 0; } @@ -6345,12 +6345,12 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, id, +1, names[perm[j] % 6], 4, + LFSR_ATTR(MKREG, id, +1, names[perm[j] % 6], 4, NULL)) => 0; // note uattrs have a smaller size to help debugging for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(u+1), id, 0, names[perm[j] % 6], 2, + LFSR_ATTR(UATTR(u+1), id, 0, names[perm[j] % 6], 2, NULL)) => 0; } } @@ -6373,7 +6373,7 @@ code = ''' lfs_bd_flush(&lfs, &lfs.pcache, &lfs.rcache, false) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(RMUATTR((j%M)+1), j/M, 0, NULL, 0, NULL)) => 0; + LFSR_ATTR(RMUATTR((j%M)+1), j/M, 0, NULL, 0, NULL)) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, cfg->block_size, NULL) => 0; @@ -6414,7 +6414,7 @@ code = ''' // try append the tag back to make sure things still work printf("--- append: id%jd, %jd ---\n", j/M, (j%M)+1); lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR((j%M)+1), j/M, 0, names[(j/M)%6], 3, + LFSR_ATTR(UATTR((j%M)+1), j/M, 0, names[(j/M)%6], 3, NULL)) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, @@ -6516,12 +6516,12 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, j, +1, names[j % 6], 4, + LFSR_ATTR(MKREG, j, +1, names[j % 6], 4, NULL)) => 0; // note uattrs have a smaller size to help debugging for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(u+1), j, 0, names[j % 6], 2, + LFSR_ATTR(UATTR(u+1), j, 0, names[j % 6], 2, NULL)) => 0; } } @@ -6561,7 +6561,7 @@ code = ''' // remove each tag in permutation order for (unsigned j = 0; j < N*M; j++) { lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(RMUATTR(perm[j]%M+1), perm[j]/M, 0, NULL, 0, + LFSR_ATTR(RMUATTR(perm[j]%M+1), perm[j]/M, 0, NULL, 0, NULL)) => 0; } @@ -6654,11 +6654,11 @@ code = ''' // build a single attribute list with all attributes, if this fails // it should fail atomically struct lfsr_attr attrs[1+M]; - attrs[0] = *LFSD_ATTR( + attrs[0] = *LFSR_ATTR( MKREG, x, +1, names[x % 6], 4, M > 0 ? &attrs[1] : NULL); for (unsigned u = 0; u < M; u++) { - attrs[1+u] = *LFSD_ATTR( + attrs[1+u] = *LFSR_ATTR( UATTR(u+1), x, 0, names[x % 6], 2, (1+u+1 < 1+M) ? &attrs[1+u+1] : NULL); } @@ -6767,11 +6767,11 @@ code = ''' // note the data size differences here lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(perm[j]+1), -1, 0, names[perm[j] % 6], 1, + LFSR_ATTR(UATTR(perm[j]+1), -1, 0, names[perm[j] % 6], 1, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, id, +1, names[perm[j] % 6], 4, + LFSR_ATTR(MKREG, id, +1, names[perm[j] % 6], 4, NULL)) => 0; } @@ -6909,15 +6909,15 @@ code = ''' // note the data size differences here lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(perm[j]+1), -1, 0, names[perm[j] % 6], 1, + LFSR_ATTR(UATTR(perm[j]+1), -1, 0, names[perm[j] % 6], 1, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, id, +1, names[perm[j] % 6], 4, + LFSR_ATTR(MKREG, id, +1, names[perm[j] % 6], 4, NULL)) => 0; for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(u+1), id, 0, names[perm[j] % 6], 2, + LFSR_ATTR(UATTR(u+1), id, 0, names[perm[j] % 6], 2, NULL)) => 0; } } @@ -7027,10 +7027,10 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, NULL))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, NULL))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKUNR, 1, -1, NULL, 0, NULL)) => 0; + LFSR_ATTR(MKUNR, 1, -1, NULL, 0, NULL)) => 0; assert(rbyd.weight == 1); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) => 4; @@ -7047,10 +7047,10 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, NULL))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, NULL))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKUNR, 0, -1, NULL, 0, NULL)) => 0; + LFSR_ATTR(MKUNR, 0, -1, NULL, 0, NULL)) => 0; assert(rbyd.weight == 1); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) => 4; @@ -7067,11 +7067,11 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(MKREG, 2, +1, "\xcc\xcc\xcc\xcc", 4, NULL)))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(MKREG, 2, +1, "\xcc\xcc\xcc\xcc", 4, NULL)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKUNR, 2, -1, NULL, 0, NULL)) => 0; + LFSR_ATTR(MKUNR, 2, -1, NULL, 0, NULL)) => 0; assert(rbyd.weight == 2); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) => 4; @@ -7090,11 +7090,11 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(MKREG, 2, +1, "\xcc\xcc\xcc\xcc", 4, NULL)))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(MKREG, 2, +1, "\xcc\xcc\xcc\xcc", 4, NULL)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKUNR, 0, -1, NULL, 0, NULL)) => 0; + LFSR_ATTR(MKUNR, 0, -1, NULL, 0, NULL)) => 0; assert(rbyd.weight == 2); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) => 4; @@ -7113,11 +7113,11 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(MKREG, 2, +1, "\xcc\xcc\xcc\xcc", 4, NULL)))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(MKREG, 2, +1, "\xcc\xcc\xcc\xcc", 4, NULL)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKUNR, 1, -1, NULL, 0, NULL)) => 0; + LFSR_ATTR(MKUNR, 1, -1, NULL, 0, NULL)) => 0; assert(rbyd.weight == 2); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) => 4; @@ -7155,12 +7155,12 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, NULL))))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, NULL))))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKUNR, 1, -1, NULL, 0, NULL)) => 0; + LFSR_ATTR(MKUNR, 1, -1, NULL, 0, NULL)) => 0; assert(rbyd.weight == 1); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) @@ -7191,12 +7191,12 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, NULL))))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, NULL))))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKUNR, 0, -1, NULL, 0, NULL)) => 0; + LFSR_ATTR(MKUNR, 0, -1, NULL, 0, NULL)) => 0; assert(rbyd.weight == 1); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) @@ -7227,14 +7227,14 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, - LFSD_ATTR(MKREG, 2, +1, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(1), 2, 0, "\xcc\xcc", 2, NULL))))))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, + LFSR_ATTR(MKREG, 2, +1, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(1), 2, 0, "\xcc\xcc", 2, NULL))))))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKUNR, 2, -1, NULL, 0, NULL)) => 0; + LFSR_ATTR(MKUNR, 2, -1, NULL, 0, NULL)) => 0; assert(rbyd.weight == 2); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) => 4; @@ -7276,14 +7276,14 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, - LFSD_ATTR(MKREG, 2, +1, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(1), 2, 0, "\xcc\xcc", 2, NULL))))))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, + LFSR_ATTR(MKREG, 2, +1, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(1), 2, 0, "\xcc\xcc", 2, NULL))))))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKUNR, 0, -1, NULL, 0, NULL)) => 0; + LFSR_ATTR(MKUNR, 0, -1, NULL, 0, NULL)) => 0; assert(rbyd.weight == 2); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) @@ -7326,14 +7326,14 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, - LFSD_ATTR(MKREG, 2, +1, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(1), 2, 0, "\xcc\xcc", 2, NULL))))))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, + LFSR_ATTR(MKREG, 2, +1, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(1), 2, 0, "\xcc\xcc", 2, NULL))))))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKUNR, 1, -1, NULL, 0, NULL)) => 0; + LFSR_ATTR(MKUNR, 1, -1, NULL, 0, NULL)) => 0; assert(rbyd.weight == 2); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) @@ -7444,7 +7444,7 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, id, +1, names[perm[j] % 6], 4, + LFSR_ATTR(MKREG, id, +1, names[perm[j] % 6], 4, NULL)) => 0; } assert(rbyd.weight == N); @@ -7467,7 +7467,7 @@ code = ''' lfs_bd_flush(&lfs, &lfs.pcache, &lfs.rcache, false) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKUNR, j, -1, NULL, 0, NULL)) => 0; + LFSR_ATTR(MKUNR, j, -1, NULL, 0, NULL)) => 0; assert(rbyd.weight == N-1); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, @@ -7487,7 +7487,7 @@ code = ''' // try recreating the id to make sure things still work printf("--- create: %d ---\n", j); lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, j, +1, names[j % 6], 6, NULL)) => 0; + LFSR_ATTR(MKREG, j, +1, names[j % 6], 6, NULL)) => 0; assert(rbyd.weight == N); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, @@ -7603,12 +7603,12 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, id, +1, names[perm[j] % 6], 4, + LFSR_ATTR(MKREG, id, +1, names[perm[j] % 6], 4, NULL)) => 0; // note uattrs have a smaller size to help debugging for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(u+1), id, 0, names[perm[j] % 6], 2, + LFSR_ATTR(UATTR(u+1), id, 0, names[perm[j] % 6], 2, NULL)) => 0; } } @@ -7632,7 +7632,7 @@ code = ''' lfs_bd_flush(&lfs, &lfs.pcache, &lfs.rcache, false) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKUNR, j, -1, NULL, 0, NULL)) => 0; + LFSR_ATTR(MKUNR, j, -1, NULL, 0, NULL)) => 0; assert(rbyd.weight == N-1); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, @@ -7664,10 +7664,10 @@ code = ''' // try recreating the id to make sure things still work printf("--- create: %d ---\n", j); lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, j, +1, names[j % 6], 6, NULL)) => 0; + LFSR_ATTR(MKREG, j, +1, names[j % 6], 6, NULL)) => 0; for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(u+1), j, 0, names[j % 6], 3, NULL)) => 0; + LFSR_ATTR(UATTR(u+1), j, 0, names[j % 6], 3, NULL)) => 0; } assert(rbyd.weight == N); @@ -7797,7 +7797,7 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, id, +1, names[perm[j] % 6], 4, + LFSR_ATTR(MKREG, id, +1, names[perm[j] % 6], 4, NULL)) => 0; } assert(rbyd.weight == N); @@ -7820,7 +7820,7 @@ code = ''' lfs_bd_flush(&lfs, &lfs.pcache, &lfs.rcache, false) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKUNR, j, -1, NULL, 0, NULL)) => 0; + LFSR_ATTR(MKUNR, j, -1, NULL, 0, NULL)) => 0; assert(rbyd.weight == N-1); // try traversing over the tags @@ -7926,12 +7926,12 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, id, +1, names[perm[j] % 6], 4, + LFSR_ATTR(MKREG, id, +1, names[perm[j] % 6], 4, NULL)) => 0; // note uattrs have a smaller size to help debugging for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(u+1), id, 0, names[perm[j] % 6], 2, + LFSR_ATTR(UATTR(u+1), id, 0, names[perm[j] % 6], 2, NULL)) => 0; } } @@ -7955,7 +7955,7 @@ code = ''' lfs_bd_flush(&lfs, &lfs.pcache, &lfs.rcache, false) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKUNR, j, -1, NULL, 0, NULL)) => 0; + LFSR_ATTR(MKUNR, j, -1, NULL, 0, NULL)) => 0; assert(rbyd.weight == N-1); // try traversing over the tags @@ -8028,9 +8028,9 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKUNR, 0, -1, NULL, 0, NULL)) => 0; + LFSR_ATTR(MKUNR, 0, -1, NULL, 0, NULL)) => 0; assert(rbyd.weight == 0); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) @@ -8045,11 +8045,11 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, NULL))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, NULL))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKUNR, 0, -1, NULL, 0, - LFSD_ATTR(MKUNR, 0, -1, NULL, 0, NULL))) => 0; + LFSR_ATTR(MKUNR, 0, -1, NULL, 0, + LFSR_ATTR(MKUNR, 0, -1, NULL, 0, NULL))) => 0; assert(rbyd.weight == 0); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) @@ -8064,11 +8064,11 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, NULL))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, NULL))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKUNR, 1, -1, NULL, 0, - LFSD_ATTR(MKUNR, 0, -1, NULL, 0, NULL))) => 0; + LFSR_ATTR(MKUNR, 1, -1, NULL, 0, + LFSR_ATTR(MKUNR, 0, -1, NULL, 0, NULL))) => 0; assert(rbyd.weight == 0); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) @@ -8083,13 +8083,13 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(MKREG, 2, +1, "\xcc\xcc\xcc\xcc", 4, NULL)))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(MKREG, 2, +1, "\xcc\xcc\xcc\xcc", 4, NULL)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKUNR, 0, -1, NULL, 0, - LFSD_ATTR(MKUNR, 0, -1, NULL, 0, - LFSD_ATTR(MKUNR, 0, -1, NULL, 0, NULL)))) => 0; + LFSR_ATTR(MKUNR, 0, -1, NULL, 0, + LFSR_ATTR(MKUNR, 0, -1, NULL, 0, + LFSR_ATTR(MKUNR, 0, -1, NULL, 0, NULL)))) => 0; assert(rbyd.weight == 0); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) @@ -8104,13 +8104,13 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(MKREG, 2, +1, "\xcc\xcc\xcc\xcc", 4, NULL)))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(MKREG, 2, +1, "\xcc\xcc\xcc\xcc", 4, NULL)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKUNR, 2, -1, NULL, 0, - LFSD_ATTR(MKUNR, 1, -1, NULL, 0, - LFSD_ATTR(MKUNR, 0, -1, NULL, 0, NULL)))) => 0; + LFSR_ATTR(MKUNR, 2, -1, NULL, 0, + LFSR_ATTR(MKUNR, 1, -1, NULL, 0, + LFSR_ATTR(MKUNR, 0, -1, NULL, 0, NULL)))) => 0; assert(rbyd.weight == 0); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) @@ -8144,10 +8144,10 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, NULL))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, NULL))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKUNR, 0, -1, NULL, 0, NULL)) => 0; + LFSR_ATTR(MKUNR, 0, -1, NULL, 0, NULL)) => 0; assert(rbyd.weight == 0); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) @@ -8162,13 +8162,13 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, NULL))))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, NULL))))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKUNR, 0, -1, NULL, 0, - LFSD_ATTR(MKUNR, 0, -1, NULL, 0, NULL))) => 0; + LFSR_ATTR(MKUNR, 0, -1, NULL, 0, + LFSR_ATTR(MKUNR, 0, -1, NULL, 0, NULL))) => 0; assert(rbyd.weight == 0); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) @@ -8183,13 +8183,13 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, NULL))))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, NULL))))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKUNR, 1, -1, NULL, 0, - LFSD_ATTR(MKUNR, 0, -1, NULL, 0, NULL))) => 0; + LFSR_ATTR(MKUNR, 1, -1, NULL, 0, + LFSR_ATTR(MKUNR, 0, -1, NULL, 0, NULL))) => 0; assert(rbyd.weight == 0); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) @@ -8204,16 +8204,16 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, - LFSD_ATTR(MKREG, 2, +1, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(1), 2, 0, "\xcc\xcc", 2, NULL))))))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, + LFSR_ATTR(MKREG, 2, +1, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(1), 2, 0, "\xcc\xcc", 2, NULL))))))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKUNR, 0, -1, NULL, 0, - LFSD_ATTR(MKUNR, 0, -1, NULL, 0, - LFSD_ATTR(MKUNR, 0, -1, NULL, 0, NULL)))) => 0; + LFSR_ATTR(MKUNR, 0, -1, NULL, 0, + LFSR_ATTR(MKUNR, 0, -1, NULL, 0, + LFSR_ATTR(MKUNR, 0, -1, NULL, 0, NULL)))) => 0; assert(rbyd.weight == 0); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) @@ -8228,16 +8228,16 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, - LFSD_ATTR(MKREG, 2, +1, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(1), 2, 0, "\xcc\xcc", 2, NULL))))))) => 0; + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, + LFSR_ATTR(MKREG, 2, +1, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(1), 2, 0, "\xcc\xcc", 2, NULL))))))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKUNR, 2, -1, NULL, 0, - LFSD_ATTR(MKUNR, 1, -1, NULL, 0, - LFSD_ATTR(MKUNR, 0, -1, NULL, 0, NULL)))) => 0; + LFSR_ATTR(MKUNR, 2, -1, NULL, 0, + LFSR_ATTR(MKUNR, 1, -1, NULL, 0, + LFSR_ATTR(MKUNR, 0, -1, NULL, 0, NULL)))) => 0; assert(rbyd.weight == 0); lfsr_rbyd_get(&lfs, &rbyd, LFSR_TAG_REG, 0, buffer, 4) @@ -8293,7 +8293,7 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, j, +1, names[j % 6], 4, + LFSR_ATTR(MKREG, j, +1, names[j % 6], 4, NULL)) => 0; } assert(rbyd.weight == N); @@ -8342,7 +8342,7 @@ code = ''' lfs_size_t rbyd_weight_before = rbyd.weight; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKUNR, id, -1, NULL, 0, NULL)) => 0; + LFSR_ATTR(MKUNR, id, -1, NULL, 0, NULL)) => 0; assert(rbyd.weight == rbyd_weight_before-1); } @@ -8355,7 +8355,7 @@ code = ''' // try resuming from all tags being removed lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa\xaa\xaa", 6, + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa\xaa\xaa", 6, NULL)) => 0; assert(rbyd.weight == 1); @@ -8439,12 +8439,12 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, j, +1, names[j % 6], 4, + LFSR_ATTR(MKREG, j, +1, names[j % 6], 4, NULL)) => 0; // note uattrs have a smaller size to help debugging for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(u+1), j, 0, names[j % 6], 2, + LFSR_ATTR(UATTR(u+1), j, 0, names[j % 6], 2, NULL)) => 0; } } @@ -8494,7 +8494,7 @@ code = ''' lfs_size_t rbyd_weight_before = rbyd.weight; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKUNR, id, -1, NULL, 0, NULL)) => 0; + LFSR_ATTR(MKUNR, id, -1, NULL, 0, NULL)) => 0; assert(rbyd.weight == rbyd_weight_before-1); } @@ -8507,11 +8507,11 @@ code = ''' // try resuming from all tags being removed lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa\xaa\xaa", 6, + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa\xaa\xaa", 6, NULL)) => 0; for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(u+1), 0, 0, "\xaa\xaa\xaa", 3, + LFSR_ATTR(UATTR(u+1), 0, 0, "\xaa\xaa\xaa", 3, NULL)) => 0; } assert(rbyd.weight == 1); @@ -8639,7 +8639,7 @@ code = ''' count += 1; // update our rbyd lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, id, +1, &alpha[i % 26], 1, + LFSR_ATTR(MKREG, id, +1, &alpha[i % 26], 1, NULL)) => 0; } else { // update our sim @@ -8647,7 +8647,7 @@ code = ''' count -= 1; // update our rbyd lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKUNR, id, -1, NULL, 0, + LFSR_ATTR(MKUNR, id, -1, NULL, 0, NULL)) => 0; } } @@ -8733,7 +8733,7 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, NULL)) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_REG, 0, @@ -8753,7 +8753,7 @@ code = ''' // make id2 with weight w2 lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 1, +2, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(MKREG, 1, +2, "\xbb\xbb\xbb\xbb", 4, NULL)) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_REG, 0, @@ -8785,7 +8785,7 @@ code = ''' // make id5 with weight w3 lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 3, +3, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(MKREG, 3, +3, "\xcc\xcc\xcc\xcc", 4, NULL)) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_REG, 0, @@ -8829,7 +8829,7 @@ code = ''' // make id9 with weight w4 lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 6, +4, "\xdd\xdd\xdd\xdd", 4, + LFSR_ATTR(MKREG, 6, +4, "\xdd\xdd\xdd\xdd", 4, NULL)) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_REG, 0, @@ -8885,7 +8885,7 @@ code = ''' // make id14 with weight w5 lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 10, +5, "\xee\xee\xee\xee", 4, + LFSR_ATTR(MKREG, 10, +5, "\xee\xee\xee\xee", 4, NULL)) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_REG, 0, @@ -8978,15 +8978,15 @@ code = ''' lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, // make id0 with weight w1 - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, // make id2 with weight w2 - LFSD_ATTR(MKREG, 1, +2, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(MKREG, 1, +2, "\xbb\xbb\xbb\xbb", 4, // make id5 with weight w3 - LFSD_ATTR(MKREG, 3, +3, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(MKREG, 3, +3, "\xcc\xcc\xcc\xcc", 4, // make id9 with weight w4 - LFSD_ATTR(MKREG, 6, +4, "\xdd\xdd\xdd\xdd", 4, + LFSR_ATTR(MKREG, 6, +4, "\xdd\xdd\xdd\xdd", 4, // make id14 with weight w5 - LFSD_ATTR(MKREG, 10, +5, "\xee\xee\xee\xee", 4, + LFSR_ATTR(MKREG, 10, +5, "\xee\xee\xee\xee", 4, NULL)))))) => 0; // traverse, finding tags and weights @@ -9128,7 +9128,7 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, id*W, +W, names[perm[j] % 6], 4, + LFSR_ATTR(MKREG, id*W, +W, names[perm[j] % 6], 4, NULL)) => 0; } @@ -9218,7 +9218,7 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, id*W, +W, names[perm[j] % 6], 4, + LFSR_ATTR(MKREG, id*W, +W, names[perm[j] % 6], 4, NULL)) => 0; } @@ -9270,10 +9270,10 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(3), -1, 0, "unrelated", 9, - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, - LFSD_ATTR(UATTR(2), 0, 0, "\xaa\xaa", 2, NULL))))) => 0; + LFSR_ATTR(UATTR(3), -1, 0, "unrelated", 9, + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, + LFSR_ATTR(UATTR(2), 0, 0, "\xaa\xaa", 2, NULL))))) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(3), -1, &tag_, &id_, &weight_, &off_, &size_) => 0; @@ -9328,10 +9328,10 @@ code = ''' // make id2 with weight w2 lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, - LFSD_ATTR(UNR, 1, +1, NULL, 0, - LFSD_ATTR(UATTR(2), 2, 0, "\xbb\xbb", 2, + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, + LFSR_ATTR(UNR, 1, +1, NULL, 0, + LFSR_ATTR(UATTR(2), 2, 0, "\xbb\xbb", 2, NULL))))) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(3), -1, @@ -9423,10 +9423,10 @@ code = ''' // make id5 with weight w3 lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 3, +1, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(1), 3, 0, "\xcc\xcc", 2, - LFSD_ATTR(UNR, 3, +2, NULL, 0, - LFSD_ATTR(UATTR(2), 5, 0, "\xcc\xcc", 2, + LFSR_ATTR(MKREG, 3, +1, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(1), 3, 0, "\xcc\xcc", 2, + LFSR_ATTR(UNR, 3, +2, NULL, 0, + LFSR_ATTR(UATTR(2), 5, 0, "\xcc\xcc", 2, NULL))))) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(3), -1, @@ -9554,10 +9554,10 @@ code = ''' // make id9 with weight w4 lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 6, +1, "\xdd\xdd\xdd\xdd", 4, - LFSD_ATTR(UATTR(1), 6, 0, "\xdd\xdd", 2, - LFSD_ATTR(UNR, 6, +3, NULL, 0, - LFSD_ATTR(UATTR(2), 9, 0, "\xdd\xdd", 2, + LFSR_ATTR(MKREG, 6, +1, "\xdd\xdd\xdd\xdd", 4, + LFSR_ATTR(UATTR(1), 6, 0, "\xdd\xdd", 2, + LFSR_ATTR(UNR, 6, +3, NULL, 0, + LFSR_ATTR(UATTR(2), 9, 0, "\xdd\xdd", 2, NULL))))) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(3), -1, @@ -9721,10 +9721,10 @@ code = ''' // make id14 with weight w5 lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, 10, +1, "\xee\xee\xee\xee", 4, - LFSD_ATTR(UATTR(1), 10, 0, "\xee\xee", 2, - LFSD_ATTR(UNR, 10, +4, NULL, 0, - LFSD_ATTR(UATTR(2), 14, 0, "\xee\xee", 2, + LFSR_ATTR(MKREG, 10, +1, "\xee\xee\xee\xee", 4, + LFSR_ATTR(UATTR(1), 10, 0, "\xee\xee", 2, + LFSR_ATTR(UNR, 10, +4, NULL, 0, + LFSR_ATTR(UATTR(2), 14, 0, "\xee\xee", 2, NULL))))) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, LFSR_TAG_UATTR(3), -1, @@ -9948,31 +9948,31 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(3), -1, 0, "unrelated", 9, + LFSR_ATTR(UATTR(3), -1, 0, "unrelated", 9, // make id0 with weight w1 - LFSD_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, - LFSD_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, - LFSD_ATTR(UATTR(2), 0, 0, "\xaa\xaa", 2, + LFSR_ATTR(MKREG, 0, +1, "\xaa\xaa\xaa\xaa", 4, + LFSR_ATTR(UATTR(1), 0, 0, "\xaa\xaa", 2, + LFSR_ATTR(UATTR(2), 0, 0, "\xaa\xaa", 2, // make id2 with weight w2 - LFSD_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, - LFSD_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, - LFSD_ATTR(UNR, 1, +1, NULL, 0, - LFSD_ATTR(UATTR(2), 2, 0, "\xbb\xbb", 2, + LFSR_ATTR(MKREG, 1, +1, "\xbb\xbb\xbb\xbb", 4, + LFSR_ATTR(UATTR(1), 1, 0, "\xbb\xbb", 2, + LFSR_ATTR(UNR, 1, +1, NULL, 0, + LFSR_ATTR(UATTR(2), 2, 0, "\xbb\xbb", 2, // make id5 with weight w3 - LFSD_ATTR(MKREG, 3, +1, "\xcc\xcc\xcc\xcc", 4, - LFSD_ATTR(UATTR(1), 3, 0, "\xcc\xcc", 2, - LFSD_ATTR(UNR, 3, +2, NULL, 0, - LFSD_ATTR(UATTR(2), 5, 0, "\xcc\xcc", 2, + LFSR_ATTR(MKREG, 3, +1, "\xcc\xcc\xcc\xcc", 4, + LFSR_ATTR(UATTR(1), 3, 0, "\xcc\xcc", 2, + LFSR_ATTR(UNR, 3, +2, NULL, 0, + LFSR_ATTR(UATTR(2), 5, 0, "\xcc\xcc", 2, // make id9 with weight w4 - LFSD_ATTR(MKREG, 6, +1, "\xdd\xdd\xdd\xdd", 4, - LFSD_ATTR(UATTR(1), 6, 0, "\xdd\xdd", 2, - LFSD_ATTR(UNR, 6, +3, NULL, 0, - LFSD_ATTR(UATTR(2), 9, 0, "\xdd\xdd", 2, + LFSR_ATTR(MKREG, 6, +1, "\xdd\xdd\xdd\xdd", 4, + LFSR_ATTR(UATTR(1), 6, 0, "\xdd\xdd", 2, + LFSR_ATTR(UNR, 6, +3, NULL, 0, + LFSR_ATTR(UATTR(2), 9, 0, "\xdd\xdd", 2, // make id14 with weight w5 - LFSD_ATTR(MKREG, 10, +1, "\xee\xee\xee\xee", 4, - LFSD_ATTR(UATTR(1), 10, 0, "\xee\xee", 2, - LFSD_ATTR(UNR, 10, +4, NULL, 0, - LFSD_ATTR(UATTR(2), 14, 0, "\xee\xee", 2, + LFSR_ATTR(MKREG, 10, +1, "\xee\xee\xee\xee", 4, + LFSR_ATTR(UATTR(1), 10, 0, "\xee\xee", 2, + LFSR_ATTR(UNR, 10, +4, NULL, 0, + LFSR_ATTR(UATTR(2), 14, 0, "\xee\xee", 2, NULL))))))))))))))))))))) => 0; // traverse, finding tags and weights @@ -10237,7 +10237,7 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(3), -1, 0, "unrelated", 9, NULL)) => 0; + LFSR_ATTR(UATTR(3), -1, 0, "unrelated", 9, NULL)) => 0; for (unsigned j = 0; j < N; j++) { // adjust id based on future insertions @@ -10249,10 +10249,10 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, id*W, +1, names[perm[j] % 6], 4, - LFSD_ATTR(UATTR(1), id*W, 0, names[perm[j] % 6], 2, - LFSD_ATTR(UNR, id*W, +W-1, NULL, 0, - LFSD_ATTR(UATTR(2), id*W+W-1, 0, names[perm[j] % 6], 2, + LFSR_ATTR(MKREG, id*W, +1, names[perm[j] % 6], 4, + LFSR_ATTR(UATTR(1), id*W, 0, names[perm[j] % 6], 2, + LFSR_ATTR(UNR, id*W, +W-1, NULL, 0, + LFSR_ATTR(UATTR(2), id*W+W-1, 0, names[perm[j] % 6], 2, NULL))))) => 0; } @@ -10351,7 +10351,7 @@ code = ''' rbyd = init_rbyd; lfs_bd_erase(&lfs, rbyd.block) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(3), -1, 0, "unrelated", 9, NULL)) => 0; + LFSR_ATTR(UATTR(3), -1, 0, "unrelated", 9, NULL)) => 0; for (unsigned j = 0; j < N; j++) { // adjust id based on future insertions @@ -10363,10 +10363,10 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, id*W, +1, names[perm[j] % 6], 4, - LFSD_ATTR(UATTR(1), id*W, 0, names[perm[j] % 6], 2, - LFSD_ATTR(UNR, id*W, +W-1, NULL, 0, - LFSD_ATTR(UATTR(2), id*W+W-1, 0, names[perm[j] % 6], 2, + LFSR_ATTR(MKREG, id*W, +1, names[perm[j] % 6], 4, + LFSR_ATTR(UATTR(1), id*W, 0, names[perm[j] % 6], 2, + LFSR_ATTR(UNR, id*W, +W-1, NULL, 0, + LFSR_ATTR(UATTR(2), id*W+W-1, 0, names[perm[j] % 6], 2, NULL))))) => 0; } @@ -10484,7 +10484,7 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, id*W, +W, names[perm[j] % 6], 4, + LFSR_ATTR(MKREG, id*W, +W, names[perm[j] % 6], 4, NULL)) => 0; } assert(rbyd.weight == N*W); @@ -10507,7 +10507,7 @@ code = ''' lfs_bd_flush(&lfs, &lfs.pcache, &lfs.rcache, false) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UNR, j*W+W-1, +D, NULL, 0, + LFSR_ATTR(UNR, j*W+W-1, +D, NULL, 0, NULL)) => 0; assert(rbyd.weight == N*W+D); @@ -10616,7 +10616,7 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, id*W, +W, names[perm[j] % 6], 4, + LFSR_ATTR(MKREG, id*W, +W, names[perm[j] % 6], 4, NULL)) => 0; } assert(rbyd.weight == N*W); @@ -10639,7 +10639,7 @@ code = ''' lfs_bd_flush(&lfs, &lfs.pcache, &lfs.rcache, false) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(REG, j*W+W-1, +D, names[j % 6], 6, + LFSR_ATTR(REG, j*W+W-1, +D, names[j % 6], 6, NULL)) => 0; assert(rbyd.weight == N*W+D); @@ -10756,7 +10756,7 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKUATTR(2), id*W, +W, names[perm[j] % 6], 4, + LFSR_ATTR(MKUATTR(2), id*W, +W, names[perm[j] % 6], 4, NULL)) => 0; } assert(rbyd.weight == N*W); @@ -10779,7 +10779,7 @@ code = ''' lfs_bd_flush(&lfs, &lfs.pcache, &lfs.rcache, false) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), j*W+W-1, +D, names[j % 6], 6, + LFSR_ATTR(UATTR(1), j*W+W-1, +D, names[j % 6], 6, NULL)) => 0; assert(rbyd.weight == N*W+D); @@ -10904,7 +10904,7 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, id*W, +W, names[perm[j] % 6], 4, + LFSR_ATTR(MKREG, id*W, +W, names[perm[j] % 6], 4, NULL)) => 0; } assert(rbyd.weight == N*W); @@ -10927,7 +10927,7 @@ code = ''' lfs_bd_flush(&lfs, &lfs.pcache, &lfs.rcache, false) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UNR, j*W+W-1, -D, NULL, 0, NULL)) => 0; + LFSR_ATTR(UNR, j*W+W-1, -D, NULL, 0, NULL)) => 0; assert(rbyd.weight == N*W-D); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, @@ -11035,7 +11035,7 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, id*W, +W, names[perm[j] % 6], 4, + LFSR_ATTR(MKREG, id*W, +W, names[perm[j] % 6], 4, NULL)) => 0; } assert(rbyd.weight == N*W); @@ -11058,7 +11058,7 @@ code = ''' lfs_bd_flush(&lfs, &lfs.pcache, &lfs.rcache, false) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(REG, j*W+W-1, -D, names[j % 6], 6, + LFSR_ATTR(REG, j*W+W-1, -D, names[j % 6], 6, NULL)) => 0; assert(rbyd.weight == N*W-D); @@ -11175,7 +11175,7 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKUATTR(2), id*W, +W, names[perm[j] % 6], 4, + LFSR_ATTR(MKUATTR(2), id*W, +W, names[perm[j] % 6], 4, NULL)) => 0; } assert(rbyd.weight == N*W); @@ -11198,7 +11198,7 @@ code = ''' lfs_bd_flush(&lfs, &lfs.pcache, &lfs.rcache, false) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), j*W+W-1, -D, names[j % 6], 6, + LFSR_ATTR(UATTR(1), j*W+W-1, -D, names[j % 6], 6, NULL)) => 0; assert(rbyd.weight == N*W-D); @@ -11322,7 +11322,7 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, id*W, +W, names[perm[j] % 6], 4, + LFSR_ATTR(MKREG, id*W, +W, names[perm[j] % 6], 4, NULL)) => 0; } assert(rbyd.weight == N*W); @@ -11345,7 +11345,7 @@ code = ''' lfs_bd_flush(&lfs, &lfs.pcache, &lfs.rcache, false) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKUNR, j*W+W-1, -W, NULL, 0, NULL)) => 0; + LFSR_ATTR(MKUNR, j*W+W-1, -W, NULL, 0, NULL)) => 0; assert(rbyd.weight == (N-1)*W); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.block, @@ -11378,7 +11378,7 @@ code = ''' // try recreating the id to make sure things still work printf("--- create: %d ---\n", j); lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, j*W, +W, names[j % 6], 6, + LFSR_ATTR(MKREG, j*W, +W, names[j % 6], 6, NULL)) => 0; assert(rbyd.weight == N*W); @@ -11482,7 +11482,7 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, id*W, +W, names[perm[j] % 6], 4, + LFSR_ATTR(MKREG, id*W, +W, names[perm[j] % 6], 4, NULL)) => 0; } assert(rbyd.weight == N*W); @@ -11506,7 +11506,7 @@ code = ''' lfs_bd_flush(&lfs, &lfs.pcache, &lfs.rcache, false) => 0; lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), j*W+W-1, 0, names[j % 6], 2, + LFSR_ATTR(UATTR(1), j*W+W-1, 0, names[j % 6], 2, NULL)) => 0; assert(rbyd.weight == N*W); @@ -11537,7 +11537,7 @@ code = ''' // now try removing the attr printf("--- removing: %d ---\n", j); lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(RMUATTR(1), j*W+W-1, 0, NULL, 0, + LFSR_ATTR(RMUATTR(1), j*W+W-1, 0, NULL, 0, NULL)) => 0; assert(rbyd.weight == N*W); @@ -11564,7 +11564,7 @@ code = ''' // and try putting the attr back just for good measure printf("--- appending: %d ---\n", j); lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(1), j*W+W-1, 0, names[j % 6], 2, + LFSR_ATTR(UATTR(1), j*W+W-1, 0, names[j % 6], 2, NULL)) => 0; assert(rbyd.weight == N*W); @@ -11689,7 +11689,7 @@ code = ''' count += 1; // update our rbyd lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, id, +1, &alpha[i % 26], 1, + LFSR_ATTR(MKREG, id, +1, &alpha[i % 26], 1, NULL)) => 0; } else if (op == 1) { // update our sim @@ -11697,14 +11697,14 @@ code = ''' count -= 1; // update our rbyd lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKUNR, id, -1, NULL, 0, + LFSR_ATTR(MKUNR, id, -1, NULL, 0, NULL)) => 0; } else if (op == 2) { // update our sim sim[id*(M+1) + u+1] = alpha[i % 26]; // update our rbyd lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UATTR(u), id, 0, &alpha[i % 26], 1, + LFSR_ATTR(UATTR(u), id, 0, &alpha[i % 26], 1, NULL)) => 0; } else if (op == 3) { @@ -11712,7 +11712,7 @@ code = ''' sim[id*(M+1) + u+1] = '\0'; // update our rbyd lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(RMUATTR(u), id, 0, NULL, 0, + LFSR_ATTR(RMUATTR(u), id, 0, NULL, 0, NULL)) => 0; } } @@ -11892,7 +11892,7 @@ code = ''' count += 1; // update our rbyd lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKREG, weighted_id, + LFSR_ATTR(MKREG, weighted_id, +weight, &alpha[i % 26], 1, NULL)) => 0; } else if (op == 1) { @@ -11905,7 +11905,7 @@ code = ''' count -= 1; // update our rbyd lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(MKUNR, weighted_id+weight_-1, + LFSR_ATTR(MKUNR, weighted_id+weight_-1, -weight_, NULL, 0, NULL)) => 0; } else if (op == 2) { @@ -11915,7 +11915,7 @@ code = ''' sim_weights[id] += weight; // update our rbyd lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UNR, weighted_id+weight_-1, + LFSR_ATTR(UNR, weighted_id+weight_-1, +weight, NULL, 0, NULL)) => 0; } else if (op == 3) { @@ -11928,7 +11928,7 @@ code = ''' sim_weights[id] -= weight; // update our rbyd lfsr_rbyd_commit(&lfs, &rbyd, - LFSD_ATTR(UNR, weighted_id+weight_-1, + LFSR_ATTR(UNR, weighted_id+weight_-1, -weight, NULL, 0, NULL)) => 0; }