diff --git a/lfs.c b/lfs.c index 233fd266..0b5d83b4 100644 --- a/lfs.c +++ b/lfs.c @@ -2135,49 +2135,49 @@ typedef struct lfsr_rattr { } u; } lfsr_rattr_t; -#define LFSR_RATTR__(_tag, _weight, _etc, _data_count) \ +#define LFSR_RATTR(_tag, _weight, _etc, _data_count) \ ((lfsr_rattr_t){ \ .tag=_tag, \ .data_count=(uint16_t){_data_count}, \ .weight=_weight, \ .u.etc=_etc}) -#define LFSR_RATTR_DATA__(_tag, _weight, _data) \ +#define LFSR_RATTR_DATA(_tag, _weight, _data) \ ((lfsr_rattr_t){ \ .tag=_tag, \ .data_count=-1, \ .weight=_weight, \ .u.datas=_data}) -#define LFSR_RATTR_CAT___(_tag, _weight, _datas, _data_count) \ +#define LFSR_RATTR_CAT_(_tag, _weight, _datas, _data_count) \ ((lfsr_rattr_t){ \ .tag=_tag, \ .data_count=-(uint16_t){_data_count}, \ .weight=_weight, \ .u.datas=_datas}) -#define LFSR_RATTR_CAT__(_tag, _weight, ...) \ - LFSR_RATTR_CAT___( \ +#define LFSR_RATTR_CAT(_tag, _weight, ...) \ + LFSR_RATTR_CAT_( \ _tag, \ _weight, \ ((const lfsr_data_t[]){__VA_ARGS__}), \ sizeof((const lfsr_data_t[]){__VA_ARGS__}) / sizeof(lfsr_data_t)) -#define LFSR_RATTR_NOOP__() \ +#define LFSR_RATTR_NOOP() \ ((lfsr_rattr_t){ \ .tag=LFSR_TAG_NULL, \ .data_count=0, \ .weight=0, \ .u.etc=NULL}) -#define LFSR_RATTR_LE32__(_tag, _weight, _le32) \ +#define LFSR_RATTR_LE32(_tag, _weight, _le32) \ ((lfsr_rattr_t){ \ .tag=_tag, \ .data_count=LFSR_LE32_DSIZE, \ .weight=_weight, \ .u.le32=_le32}) -#define LFSR_RATTR_LEB128__(_tag, _weight, _leb128) \ +#define LFSR_RATTR_LEB128(_tag, _weight, _leb128) \ ((lfsr_rattr_t){ \ .tag=_tag, \ .data_count=LFSR_LEB128_DSIZE, \ @@ -2191,14 +2191,14 @@ typedef struct lfsr_name { lfs_size_t name_len; } lfsr_name_t; -#define LFSR_RATTR_NAME___(_tag, _weight, _name) \ +#define LFSR_RATTR_NAME_(_tag, _weight, _name) \ ((lfsr_rattr_t){ \ .tag=_tag, \ .weight=_weight, \ .u.etc=(const lfsr_name_t*){_name}}) -#define LFSR_RATTR_NAME__(_tag, _weight, _did, _name, _name_len) \ - LFSR_RATTR_NAME___( \ +#define LFSR_RATTR_NAME(_tag, _weight, _did, _name, _name_len) \ + LFSR_RATTR_NAME_( \ _tag, \ _weight, \ (&(lfsr_name_t){ \ @@ -4219,7 +4219,7 @@ trunk:; } // terminate diverged trunk with an unreachable tag - err = lfsr_rbyd_appendrattr_(lfs, rbyd, LFSR_RATTR__( + err = lfsr_rbyd_appendrattr_(lfs, rbyd, LFSR_RATTR( (lfsr_rbyd_isshrub(rbyd) ? LFSR_TAG_SHRUB : 0) | LFSR_TAG_NULL, 0, @@ -4334,7 +4334,7 @@ leaf:; // // note we always need a non-alt to terminate the trunk, otherwise we // can't find trunks during fetch - err = lfsr_rbyd_appendrattr_(lfs, rbyd, LFSR_RATTR__( + err = lfsr_rbyd_appendrattr_(lfs, rbyd, LFSR_RATTR( // mark as shrub if we are a shrub (lfsr_rbyd_isshrub(rbyd) ? LFSR_TAG_SHRUB : 0) // rm => null, otherwise strip off control bits @@ -4411,7 +4411,7 @@ static int lfsr_rbyd_appendcksum_(lfs_t *lfs, lfsr_rbyd_t *rbyd, return err; } - err = lfsr_rbyd_appendrattr_(lfs, rbyd, LFSR_RATTR__( + err = lfsr_rbyd_appendrattr_(lfs, rbyd, LFSR_RATTR( LFSR_TAG_ECKSUM, 0, (&(lfsr_ecksum_t){ .cksize=lfs->cfg->prog_size, @@ -4662,7 +4662,7 @@ static int lfsr_rbyd_appendcompactrattr(lfs_t *lfs, lfsr_rbyd_t *rbyd, } // write the tag - err = lfsr_rbyd_appendrattr_(lfs, rbyd, LFSR_RATTR__( + err = lfsr_rbyd_appendrattr_(lfs, rbyd, LFSR_RATTR( (lfsr_rbyd_isshrub(rbyd) ? LFSR_TAG_SHRUB : 0) | rattr.tag, rattr.weight, rattr.u.etc, rattr.data_count)); @@ -4698,7 +4698,7 @@ static int lfsr_rbyd_appendcompactrbyd(lfs_t *lfs, lfsr_rbyd_t *rbyd_, } // write the tag - err = lfsr_rbyd_appendcompactrattr(lfs, rbyd_, LFSR_RATTR_DATA__( + err = lfsr_rbyd_appendcompactrattr(lfs, rbyd_, LFSR_RATTR_DATA( tag, weight, &data)); if (err) { return err; @@ -5754,15 +5754,15 @@ static int lfsr_btree_commit__(lfs_t *lfs, lfsr_btree_t *btree, // new root? if (!lfsr_rbyd_trunk(&parent)) { bscratch->branches[0] = rbyd__; - bscratch->rattrs[rattr_count_++] = LFSR_RATTR__( + bscratch->rattrs[rattr_count_++] = LFSR_RATTR( LFSR_TAG_BRANCH, +rbyd__.weight, &bscratch->branches[0], LFSR_BRANCH_DSIZE); bscratch->branches[1] = sibling; - bscratch->rattrs[rattr_count_++] = LFSR_RATTR__( + bscratch->rattrs[rattr_count_++] = LFSR_RATTR( LFSR_TAG_BRANCH, +sibling.weight, &bscratch->branches[1], LFSR_BRANCH_DSIZE); if (lfsr_tag_suptype(split_tag) == LFSR_TAG_NAME) { - bscratch->rattrs[rattr_count_++] = LFSR_RATTR_DATA__( + bscratch->rattrs[rattr_count_++] = LFSR_RATTR_DATA( LFSR_TAG_NAME, 0, &bscratch->split_data); } @@ -5770,20 +5770,20 @@ static int lfsr_btree_commit__(lfs_t *lfs, lfsr_btree_t *btree, } else { bid_ -= pid - (rbyd_.weight-1); bscratch->branches[0] = rbyd__; - bscratch->rattrs[rattr_count_++] = LFSR_RATTR__( + bscratch->rattrs[rattr_count_++] = LFSR_RATTR( LFSR_TAG_BRANCH, 0, &bscratch->branches[0], LFSR_BRANCH_DSIZE); if (rbyd__.weight != rbyd_.weight) { - bscratch->rattrs[rattr_count_++] = LFSR_RATTR__( + bscratch->rattrs[rattr_count_++] = LFSR_RATTR( LFSR_TAG_GROW, -rbyd_.weight + rbyd__.weight, NULL, 0); } bscratch->branches[1] = sibling; - bscratch->rattrs[rattr_count_++] = LFSR_RATTR__( + bscratch->rattrs[rattr_count_++] = LFSR_RATTR( LFSR_TAG_BRANCH, +sibling.weight, &bscratch->branches[1], LFSR_BRANCH_DSIZE); if (lfsr_tag_suptype(split_tag) == LFSR_TAG_NAME) { - bscratch->rattrs[rattr_count_++] = LFSR_RATTR_DATA__( + bscratch->rattrs[rattr_count_++] = LFSR_RATTR_DATA( LFSR_TAG_NAME, 0, &bscratch->split_data); } @@ -5860,14 +5860,14 @@ static int lfsr_btree_commit__(lfs_t *lfs, lfsr_btree_t *btree, LFS_ASSERT(rbyd__.weight > 0); rattr_count_ = 0; bid_ -= pid - (rbyd_.weight-1); - bscratch->rattrs[rattr_count_++] = LFSR_RATTR__( + bscratch->rattrs[rattr_count_++] = LFSR_RATTR( LFSR_TAG_RM, -sibling.weight, NULL, 0); bscratch->branches[0] = rbyd__; - bscratch->rattrs[rattr_count_++] = LFSR_RATTR__( + bscratch->rattrs[rattr_count_++] = LFSR_RATTR( LFSR_TAG_BRANCH, 0, &bscratch->branches[0], LFSR_BRANCH_DSIZE); if (rbyd__.weight != rbyd_.weight) { - bscratch->rattrs[rattr_count_++] = LFSR_RATTR__( + bscratch->rattrs[rattr_count_++] = LFSR_RATTR( LFSR_TAG_GROW, -rbyd_.weight + rbyd__.weight, NULL, 0); } @@ -5900,15 +5900,15 @@ static int lfsr_btree_commit__(lfs_t *lfs, lfsr_btree_t *btree, rattr_count_ = 0; bid_ -= pid - (rbyd_.weight-1); if (rbyd__.weight == 0) { - bscratch->rattrs[rattr_count_++] = LFSR_RATTR__( + bscratch->rattrs[rattr_count_++] = LFSR_RATTR( LFSR_TAG_RM, -rbyd_.weight, NULL, 0); } else { bscratch->branches[0] = rbyd__; - bscratch->rattrs[rattr_count_++] = LFSR_RATTR__( + bscratch->rattrs[rattr_count_++] = LFSR_RATTR( LFSR_TAG_BRANCH, 0, &bscratch->branches[0], LFSR_BRANCH_DSIZE); if (rbyd__.weight != rbyd_.weight) { - bscratch->rattrs[rattr_count_++] = LFSR_RATTR__( + bscratch->rattrs[rattr_count_++] = LFSR_RATTR( LFSR_TAG_GROW, -rbyd_.weight + rbyd__.weight, NULL, 0); } @@ -6516,7 +6516,7 @@ static int lfsr_bshrub_commit_(lfs_t *lfs, lfsr_bshrub_t *bshrub, // commit to shrub int err = lfsr_mdir_commit(lfs, &bshrub->o.mdir, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_SHRUBCOMMIT, 0, (&(lfsr_shrubcommit_t){ .bshrub=bshrub, @@ -7083,7 +7083,7 @@ static int lfsr_rbyd_appendgdelta(lfs_t *lfs, lfsr_rbyd_t *rbyd) { // append to our rbyd, replacing any existing delta lfs_size_t size = lfs_memlen(grmdelta_, LFSR_GRM_DSIZE); - err = lfsr_rbyd_appendrattr(lfs, rbyd, -1, LFSR_RATTR__( + err = lfsr_rbyd_appendrattr(lfs, rbyd, -1, LFSR_RATTR( // opportunistically remove this tag if delta is all zero (size == 0) ? LFSR_TAG_RM | LFSR_TAG_GRMDELTA @@ -7616,7 +7616,7 @@ static int lfsr_mdir_commit__(lfs_t *lfs, lfsr_mdir_t *mdir, // write our new shrb tag err = lfsr_rbyd_appendrattr(lfs, &mdir->rbyd, rid - lfs_smax(start_rid, 0), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_BSHRUB, 0, &shrub, LFSR_SHRUB_DSIZE)); if (err) { @@ -7627,7 +7627,7 @@ static int lfsr_mdir_commit__(lfs_t *lfs, lfsr_mdir_t *mdir, } else { err = lfsr_rbyd_appendrattr(lfs, &mdir->rbyd, rid - lfs_smax(start_rid, 0), - LFSR_RATTR_DATA__(tag, 0, &data)); + LFSR_RATTR_DATA(tag, 0, &data)); if (err) { return err; } @@ -7692,11 +7692,11 @@ static int lfsr_mdir_commit__(lfs_t *lfs, lfsr_mdir_t *mdir, rid - lfs_smax(start_rid, 0), // removing or updating? (lfsr_attr_isnoattr(&attrs_[j])) - ? LFSR_RATTR__( + ? LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(attrs_[j].type), 0, NULL, 0) - : LFSR_RATTR__( + : LFSR_RATTR( LFSR_TAG_ATTR(attrs_[j].type), 0, attrs_[j].buffer, lfsr_attr_size(&attrs_[j]))); @@ -7756,7 +7756,7 @@ static int lfsr_mdir_commit__(lfs_t *lfs, lfsr_mdir_t *mdir, ^ lfs_crc32c_cube(lfs->gcksum ^ cksum) ^ lfs->gcksum_d; - int err = lfsr_rbyd_appendrattr_(lfs, &mdir->rbyd, LFSR_RATTR_LE32__( + int err = lfsr_rbyd_appendrattr_(lfs, &mdir->rbyd, LFSR_RATTR_LE32( LFSR_TAG_GCKSUMDELTA, 0, mdir->gcksumdelta)); if (err) { return err; @@ -7953,7 +7953,7 @@ static int lfsr_mdir_compact__(lfs_t *lfs, lfsr_mdir_t *mdir_, // write the new shrub tag err = lfsr_rbyd_appendcompactrattr(lfs, &mdir_->rbyd, - LFSR_RATTR__(tag, weight, &shrub, LFSR_SHRUB_DSIZE)); + LFSR_RATTR(tag, weight, &shrub, LFSR_SHRUB_DSIZE)); if (err) { LFS_ASSERT(err != LFS_ERR_RANGE); return err; @@ -7962,7 +7962,7 @@ static int lfsr_mdir_compact__(lfs_t *lfs, lfsr_mdir_t *mdir_, } else { // write the tag err = lfsr_rbyd_appendcompactrattr(lfs, &mdir_->rbyd, - LFSR_RATTR_DATA__(tag, weight, &data)); + LFSR_RATTR_DATA(tag, weight, &data)); if (err) { LFS_ASSERT(err != LFS_ERR_RANGE); return err; @@ -8397,13 +8397,13 @@ static int lfsr_mdir_commit(lfs_t *lfs, lfsr_mdir_t *mdir, err = lfsr_btree_commit(lfs, &mtree_, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_MDIR, +(1 << lfs->mdir_bits), mdir_[0].rbyd.blocks, LFSR_MPTR_DSIZE), - LFSR_RATTR_DATA__( + LFSR_RATTR_DATA( LFSR_TAG_NAME, +(1 << lfs->mdir_bits), &split_data), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_MDIR, 0, mdir_[1].rbyd.blocks, LFSR_MPTR_DSIZE))); if (err) { @@ -8417,13 +8417,13 @@ static int lfsr_mdir_commit(lfs_t *lfs, lfsr_mdir_t *mdir, err = lfsr_btree_commit(lfs, &mtree_, lfsr_mid_bid(lfs, mdir->mid), LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_MDIR, 0, mdir_[0].rbyd.blocks, LFSR_MPTR_DSIZE), - LFSR_RATTR_DATA__( + LFSR_RATTR_DATA( LFSR_TAG_NAME, +(1 << lfs->mdir_bits), &split_data), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_MDIR, 0, mdir_[1].rbyd.blocks, LFSR_MPTR_DSIZE))); if (err) { @@ -8457,7 +8457,7 @@ static int lfsr_mdir_commit(lfs_t *lfs, lfsr_mdir_t *mdir, // update our mtree err = lfsr_btree_commit(lfs, &mtree_, lfsr_mid_bid(lfs, mdir->mid), LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM, -(1 << lfs->mdir_bits), NULL, 0))); if (err) { @@ -8480,7 +8480,7 @@ static int lfsr_mdir_commit(lfs_t *lfs, lfsr_mdir_t *mdir, err = lfsr_btree_commit(lfs, &mtree_, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_MDIR, +(1 << lfs->mdir_bits), mdir_[0].rbyd.blocks, LFSR_MPTR_DSIZE))); if (err) { @@ -8494,7 +8494,7 @@ static int lfsr_mdir_commit(lfs_t *lfs, lfsr_mdir_t *mdir, err = lfsr_btree_commit(lfs, &mtree_, lfsr_mid_bid(lfs, mdir->mid), LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_MDIR, 0, mdir_[0].rbyd.blocks, LFSR_MPTR_DSIZE))); if (err) { @@ -8549,15 +8549,15 @@ static int lfsr_mdir_commit(lfs_t *lfs, lfsr_mdir_t *mdir, // in our mroot err = lfsr_mdir_commit_(lfs, &mroot_, -2, 0, NULL, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_SUB | LFSR_TAG_MTREE, 0, &mtree_, LFSR_BTREE_DSIZE), // were we committing to the mroot? include any -1 rattrs (mdir->mid == -1) - ? LFSR_RATTR__( + ? LFSR_RATTR( LFSR_TAG_RATTRS, 0, rattrs, rattr_count) - : LFSR_RATTR_NOOP__())); + : LFSR_RATTR_NOOP())); if (err) { LFS_ASSERT(err != LFS_ERR_RANGE); goto failed; @@ -8600,7 +8600,7 @@ static int lfsr_mdir_commit(lfs_t *lfs, lfsr_mdir_t *mdir, // commit mrootchild err = lfsr_mdir_commit_(lfs, &mrootparent_, -2, -1, NULL, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_MROOT, 0, mrootchild_.rbyd.blocks, LFSR_MPTR_DSIZE))); if (err) { @@ -8645,10 +8645,10 @@ static int lfsr_mdir_commit(lfs_t *lfs, lfsr_mdir_t *mdir, err = lfsr_mdir_commit__(lfs, &mrootanchor_, -2, -1, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_MAGIC, 0, "littlefs", 8), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_MROOT, 0, mrootchild_.rbyd.blocks, LFSR_MPTR_DSIZE))); if (err) { @@ -9985,7 +9985,7 @@ int lfsr_mkdir(lfs_t *lfs, const char *path) { // commit our bookmark and a grm to self-remove in case of powerloss lfs_alloc_ckpoint(lfs); err = lfsr_mdir_commit(lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_LEB128__( + LFSR_RATTR_LEB128( LFSR_TAG_BOOKMARK, +1, did_))); if (err) { return err; @@ -10006,10 +10006,10 @@ int lfsr_mkdir(lfs_t *lfs, const char *path) { lfsr_grm_pop(lfs); lfs_alloc_ckpoint(lfs); err = lfsr_mdir_commit(lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_SUP | LFSR_TAG_DIR, (!exists) ? +1 : 0, did, path, name_len), - LFSR_RATTR_LEB128__( + LFSR_RATTR_LEB128( LFSR_TAG_DID, 0, did_))); if (err) { return err; @@ -10156,10 +10156,10 @@ int lfsr_remove(lfs_t *lfs, const char *path) { // we use a create+delete here to also clear any rattrs // and trim the entry size (zombie) - ? LFSR_RATTR_NAME__( + ? LFSR_RATTR_NAME( LFSR_TAG_SUP | LFSR_TAG_STICKYNOTE, 0, did, path, lfsr_path_namelen(path)) - : LFSR_RATTR__( + : LFSR_RATTR( LFSR_TAG_RM, -1, NULL, 0))); if (err) { return err; @@ -10323,10 +10323,10 @@ int lfsr_rename(lfs_t *lfs, const char *old_path, const char *new_path) { // new rid, while also marking the old rid for removal lfs_alloc_ckpoint(lfs); err = lfsr_mdir_commit(lfs, &new_mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_SUP | old_tag, (!exists) ? +1 : 0, new_did, new_path, new_name_len), - LFSR_RATTR__(LFSR_TAG_MOVE, 0, &old_mdir, 0))); + LFSR_RATTR(LFSR_TAG_MOVE, 0, &old_mdir, 0))); if (err) { return err; } @@ -10767,7 +10767,7 @@ int lfsr_setattr(lfs_t *lfs, const char *path, uint8_t type, // commit our attr lfs_alloc_ckpoint(lfs); err = lfsr_mdir_commit(lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(type), 0, buffer, size))); if (err) { @@ -10819,7 +10819,7 @@ int lfsr_removeattr(lfs_t *lfs, const char *path, uint8_t type) { // commit our removal lfs_alloc_ckpoint(lfs); err = lfsr_mdir_commit(lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(type), 0, NULL, 0))); if (err) { @@ -11073,7 +11073,7 @@ int lfsr_file_opencfg(lfs_t *lfs, lfsr_file_t *file, lfs_alloc_ckpoint(lfs); err = lfsr_mdir_commit(lfs, &file->b.o.mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_STICKYNOTE, +1, did, path, name_len))); if (err) { @@ -11430,14 +11430,14 @@ static int lfsr_file_carve(lfs_t *lfs, lfsr_file_t *file, // can we coalesce? if (file->b.shrub.weight > 0) { bid = lfs_min(bid, file->b.shrub.weight-1); - rattrs[rattr_count++] = LFSR_RATTR__( + rattrs[rattr_count++] = LFSR_RATTR( LFSR_TAG_GROW, +(pos - file->b.shrub.weight), NULL, 0); // new hole } else { bid = lfs_min(bid, file->b.shrub.weight); - rattrs[rattr_count++] = LFSR_RATTR__( + rattrs[rattr_count++] = LFSR_RATTR( LFSR_TAG_DATA, +(pos - file->b.shrub.weight), NULL, 0); } @@ -11486,12 +11486,12 @@ static int lfsr_file_carve(lfs_t *lfs, lfsr_file_t *file, -1); err = lfsr_file_commit(lfs, file, bid, LFSR_RATTRS( - LFSR_RATTR_DATA__( + LFSR_RATTR_DATA( LFSR_TAG_GROW | LFSR_TAG_SUB | LFSR_TAG_DATA, -(weight_ - lfs->cfg->fragment_size), &LFSR_DATA_TRUNCATE(left.data, lfs->cfg->fragment_size)), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_BLOCK, +(weight_ - lfs->cfg->fragment_size), &bptr_, LFSR_BPTR_DSIZE))); @@ -11515,11 +11515,11 @@ static int lfsr_file_carve(lfs_t *lfs, lfsr_file_t *file, lfsr_data_size(bptr_.data) - lfs->cfg->fragment_size); err = lfsr_file_commit(lfs, file, bid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_GROW | LFSR_TAG_SUB | LFSR_TAG_BLOCK, -(weight_ - lfsr_data_size(bptr_.data)), &bptr_, LFSR_BPTR_DSIZE), - LFSR_RATTR_DATA__( + LFSR_RATTR_DATA( LFSR_TAG_DATA, +(weight_ - lfsr_data_size(bptr_.data)), &LFSR_DATA_FRUNCATE(right.data, @@ -11539,19 +11539,19 @@ static int lfsr_file_carve(lfs_t *lfs, lfsr_file_t *file, if (bid-(weight_-1) < pos) { // can we get away with a grow attribute? if (lfsr_data_size(bptr_.data) == lfsr_data_size(left.data)) { - rattrs[rattr_count++] = LFSR_RATTR__( + rattrs[rattr_count++] = LFSR_RATTR( LFSR_TAG_GROW, -(bid+1 - pos), NULL, 0); // carve fragment? } else if (!lfsr_bptr_isbptr(&bptr_)) { - rattrs[rattr_count++] = LFSR_RATTR_DATA__( + rattrs[rattr_count++] = LFSR_RATTR_DATA( LFSR_TAG_GROW | LFSR_TAG_SUB | LFSR_TAG_DATA, -(bid+1 - pos), &left.data); // carve bptr? } else { - rattrs[rattr_count++] = LFSR_RATTR__( + rattrs[rattr_count++] = LFSR_RATTR( LFSR_TAG_GROW | LFSR_TAG_SUB | LFSR_TAG_BLOCK, -(bid+1 - pos), &left, LFSR_BPTR_DSIZE); @@ -11559,7 +11559,7 @@ static int lfsr_file_carve(lfs_t *lfs, lfsr_file_t *file, // completely overwriting this entry? } else { - rattrs[rattr_count++] = LFSR_RATTR__( + rattrs[rattr_count++] = LFSR_RATTR( LFSR_TAG_RM, -weight_, NULL, 0); } @@ -11589,13 +11589,13 @@ static int lfsr_file_carve(lfs_t *lfs, lfsr_file_t *file, // carve fragment? } else if (!lfsr_bptr_isbptr(&bptr_)) { - right_rattr_ = LFSR_RATTR_DATA__( + right_rattr_ = LFSR_RATTR_DATA( LFSR_TAG_DATA, bid+1 - (pos+weight), &right.data); // carve bptr? } else { - right_rattr_ = LFSR_RATTR__( + right_rattr_ = LFSR_RATTR( LFSR_TAG_BLOCK, bid+1 - (pos+weight), &right, LFSR_BPTR_DSIZE); } @@ -11611,21 +11611,21 @@ static int lfsr_file_carve(lfs_t *lfs, lfsr_file_t *file, // can we coalesce a hole? if (lfsr_rattr_dsize(rattr) == 0 && pos > 0) { bid = lfs_min(bid, file->b.shrub.weight-1); - rattrs[rattr_count++] = LFSR_RATTR__( + rattrs[rattr_count++] = LFSR_RATTR( LFSR_TAG_GROW, +(weight + rattr.weight), NULL, 0); // need a new hole? } else if (lfsr_rattr_dsize(rattr) == 0) { bid = lfs_min(bid, file->b.shrub.weight); - rattrs[rattr_count++] = LFSR_RATTR__( + rattrs[rattr_count++] = LFSR_RATTR( LFSR_TAG_DATA, +(weight + rattr.weight), NULL, 0); // append new fragment/bptr? } else { bid = lfs_min(bid, file->b.shrub.weight); - rattrs[rattr_count++] = LFSR_RATTR__( + rattrs[rattr_count++] = LFSR_RATTR( rattr.tag, +(weight + rattr.weight), rattr.u.etc, rattr.data_count); } @@ -12017,7 +12017,7 @@ static int lfsr_file_flush_(lfs_t *lfs, lfsr_file_t *file, // and write it into our tree err = lfsr_file_carve(lfs, file, block_start, block_end - block_start, - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_BLOCK, 0, &bptr, LFSR_BPTR_DSIZE)); if (err) { @@ -12148,7 +12148,7 @@ fragment:; // our tree int err = lfsr_file_carve(lfs, file, fragment_start, fragment_end - fragment_start, - LFSR_RATTR_CAT___( + LFSR_RATTR_CAT_( LFSR_TAG_DATA, 0, datas, data_count)); if (err && err != LFS_ERR_RANGE) { @@ -12391,7 +12391,7 @@ int lfsr_file_sync(lfs_t *lfs, lfsr_file_t *file) { goto failed; } - rattrs[rattr_count++] = LFSR_RATTR_DATA__( + rattrs[rattr_count++] = LFSR_RATTR_DATA( LFSR_TAG_SUB | LFSR_TAG_REG, 0, &name_data); } @@ -12410,18 +12410,18 @@ int lfsr_file_sync(lfs_t *lfs, lfsr_file_t *file) { // no bshrub/btree? if (lfsr_bshrub_isbnull(&file->b)) { - rattrs[rattr_count++] = LFSR_RATTR__( + rattrs[rattr_count++] = LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_SUB | LFSR_TAG_STRUCT, 0, NULL, 0); // bshrub? } else if (lfsr_bshrub_isbshrub(&file->b)) { - rattrs[rattr_count++] = LFSR_RATTR__( + rattrs[rattr_count++] = LFSR_RATTR( LFSR_TAG_SUB | LFSR_TAG_BSHRUB, 0, // note we use the staged trunk here &file->b.shrub_, LFSR_SHRUB_DSIZE); // btree? } else if (lfsr_bshrub_isbtree(&file->b)) { - rattrs[rattr_count++] = LFSR_RATTR__( + rattrs[rattr_count++] = LFSR_RATTR( LFSR_TAG_SUB | LFSR_TAG_BTREE, 0, &file->b.shrub, LFSR_BTREE_DSIZE); } else { @@ -12468,7 +12468,7 @@ int lfsr_file_sync(lfs_t *lfs, lfsr_file_t *file) { } if (attrs) { // need to append custom attributes - rattrs[rattr_count++] = LFSR_RATTR__( + rattrs[rattr_count++] = LFSR_RATTR( LFSR_TAG_ATTRS, 0, file->cfg->attrs, file->cfg->attr_count); } @@ -12679,7 +12679,7 @@ int lfsr_file_truncate(lfs_t *lfs, lfsr_file_t *file, lfs_off_t size_) { // truncate our btree err = lfsr_file_carve(lfs, file, lfs_min(size, size_), size - lfs_min(size, size_), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +size_ - size, NULL, 0)); if (err) { @@ -12736,7 +12736,7 @@ int lfsr_file_fruncate(lfs_t *lfs, lfsr_file_t *file, lfs_off_t size_) { // fruncate our btree err = lfsr_file_carve(lfs, file, 0, lfs_smax(size - size_, 0), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +size_ - size, NULL, 0)); if (err) { @@ -13828,32 +13828,32 @@ static int lfsr_formatinited(lfs_t *lfs) { // - any format-time configuration // - the root's bookmark tag, which reserves did = 0 for the root err = lfsr_rbyd_appendrattrs(lfs, &rbyd, -1, -1, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_MAGIC, 0, "littlefs", 8), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_VERSION, 0, ((const uint8_t[2]){ LFS_DISK_VERSION_MAJOR, LFS_DISK_VERSION_MINOR}), 2), - LFSR_RATTR_LE32__( + LFSR_RATTR_LE32( LFSR_TAG_RCOMPAT, 0, LFSR_RCOMPAT_COMPAT), - LFSR_RATTR_LE32__( + LFSR_RATTR_LE32( LFSR_TAG_WCOMPAT, 0, LFSR_WCOMPAT_COMPAT), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_GEOMETRY, 0, (&(lfsr_geometry_t){ lfs->cfg->block_size, lfs->cfg->block_count}), LFSR_GEOMETRY_DSIZE), - LFSR_RATTR_LEB128__( + LFSR_RATTR_LEB128( LFSR_TAG_NAMELIMIT, 0, lfs->name_limit), - LFSR_RATTR_LEB128__( + LFSR_RATTR_LEB128( LFSR_TAG_FILELIMIT, 0, lfs->file_limit), - LFSR_RATTR_LEB128__( + LFSR_RATTR_LEB128( LFSR_TAG_BOOKMARK, +1, 0))); if (err) { @@ -13862,7 +13862,7 @@ static int lfsr_formatinited(lfs_t *lfs) { // append initial gcksum uint32_t cksum = rbyd.cksum; - err = lfsr_rbyd_appendrattr_(lfs, &rbyd, LFSR_RATTR_LE32__( + err = lfsr_rbyd_appendrattr_(lfs, &rbyd, LFSR_RATTR_LE32( LFSR_TAG_GCKSUMDELTA, 0, lfs_crc32c_cube(cksum))); // and commit @@ -14051,7 +14051,7 @@ static int lfsr_fs_fixgrm(lfs_t *lfs) { lfs_alloc_ckpoint(lfs); // remove the rid while atomically updating our grm err = lfsr_mdir_commit(lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))); + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))); if (err) { // revert grm manually lfs->grm = grm_p; @@ -14094,7 +14094,7 @@ static int lfsr_mdir_mkconsistent(lfs_t *lfs, lfsr_mdir_t *mdir) { lfs_alloc_ckpoint(lfs); err = lfsr_mdir_commit(lfs, mdir, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))); + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))); if (err) { goto failed; } @@ -14370,7 +14370,7 @@ int lfsr_fs_grow(lfs_t *lfs, lfs_size_t block_count_) { // update our on-disk config lfs_alloc_ckpoint(lfs); int err = lfsr_mdir_commit(lfs, &lfs->mroot, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_GEOMETRY, 0, (&(lfsr_geometry_t){ lfs->cfg->block_size, diff --git a/tests/test_badblocks.toml b/tests/test_badblocks.toml index 2f9ca165..6ad57112 100644 --- a/tests/test_badblocks.toml +++ b/tests/test_badblocks.toml @@ -76,7 +76,7 @@ code = ''' // add to btree lfsr_btree_commit(&lfs, &btree, bid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, &(uint8_t){'a'+(i % 26)}, 1))) => 0; @@ -1851,7 +1851,7 @@ code = ''' // add to btree lfsr_btree_commit(&lfs, &btree, bid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, &(uint8_t){'a'+(i % 26)}, 1))) => 0; @@ -3626,7 +3626,7 @@ code = ''' // add to btree lfsr_btree_commit(&lfs, &btree, bid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, &(uint8_t){'a'+(i % 26)}, 1))) => 0; diff --git a/tests/test_btree.toml b/tests/test_btree.toml index ac3ca9dc..8737bd5f 100644 --- a/tests/test_btree.toml +++ b/tests/test_btree.toml @@ -55,7 +55,7 @@ code = ''' lfsr_btree_t btree; lfsr_btree_init(&btree); lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "a", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "a", 1))) => 0; printf("btree: w%d 0x%x.%x\n", btree.weight, btree.blocks[0], @@ -97,9 +97,9 @@ code = ''' lfsr_btree_t btree; lfsr_btree_init(&btree); lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "a", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "a", 1))) => 0; lfsr_btree_commit(&lfs, &btree, 1, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "b", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "b", 1))) => 0; printf("btree: w%d 0x%x.%x\n", btree.weight, btree.blocks[0], @@ -147,9 +147,9 @@ code = ''' lfsr_btree_t btree; lfsr_btree_init(&btree); lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "b", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "b", 1))) => 0; lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "a", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "a", 1))) => 0; printf("btree: w%d 0x%x.%x\n", btree.weight, btree.blocks[0], @@ -198,11 +198,11 @@ code = ''' lfsr_btree_t btree; lfsr_btree_init(&btree); lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "a", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "a", 1))) => 0; lfsr_btree_commit(&lfs, &btree, 1, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "b", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "b", 1))) => 0; lfsr_btree_commit(&lfs, &btree, 2, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "c", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "c", 1))) => 0; printf("btree: w%d 0x%x.%x\n", btree.weight, btree.blocks[0], @@ -257,11 +257,11 @@ code = ''' lfsr_btree_t btree; lfsr_btree_init(&btree); lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "c", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "c", 1))) => 0; lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "b", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "b", 1))) => 0; lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "a", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "a", 1))) => 0; printf("btree: w%d 0x%x.%x\n", btree.weight, btree.blocks[0], @@ -321,7 +321,7 @@ code = ''' lfs_size_t n = 0; for (lfs_size_t i = 0; i < N; i++) { lfsr_btree_commit(&lfs, &btree, i, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, &(uint8_t){'a'+(i % 26)}, 1))) => 0; n += 1; @@ -372,7 +372,7 @@ code = ''' lfs_size_t n = 0; for (lfs_size_t i = 0; i < N; i++) { lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, &(uint8_t){'a'+((N-1-i) % 26)}, 1))) => 0; n += 1; @@ -438,7 +438,7 @@ code = ''' // add to btree lfsr_btree_commit(&lfs, &btree, bid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, &(uint8_t){'a'+(i % 26)}, 1))) => 0; @@ -508,7 +508,7 @@ code = ''' lfs_size_t n = 0; for (lfs_size_t i = 0; i < N; i++) { lfsr_btree_commit(&lfs, &btree, i*W, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +W, &(uint8_t){'a'+(i % 26)}, 1))) => 0; n += 1; @@ -600,7 +600,7 @@ code = ''' // add to btree lfsr_btree_commit(&lfs, &btree, weighted_bid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +weight, &(uint8_t){'a'+(i % 26)}, 1))) => 0; @@ -711,10 +711,10 @@ code = ''' lfsr_btree_t btree; lfsr_btree_init(&btree); lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "a", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "a", 1))) => 0; // update the tree lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_SUB | LFSR_TAG_DATA, 0, "A", 1))) => 0; printf("btree: w%d 0x%x.%x\n", @@ -757,16 +757,16 @@ code = ''' lfsr_btree_t btree; lfsr_btree_init(&btree); lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "a", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "a", 1))) => 0; lfsr_btree_commit(&lfs, &btree, 1, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "b", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "b", 1))) => 0; // update the tree lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_SUB | LFSR_TAG_DATA, 0, "A", 1))) => 0; lfsr_btree_commit(&lfs, &btree, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_SUB | LFSR_TAG_DATA, 0, "B", 1))) => 0; printf("btree: w%d 0x%x.%x\n", @@ -816,22 +816,22 @@ code = ''' lfsr_btree_t btree; lfsr_btree_init(&btree); lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "a", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "a", 1))) => 0; lfsr_btree_commit(&lfs, &btree, 1, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "b", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "b", 1))) => 0; lfsr_btree_commit(&lfs, &btree, 2, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "c", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "c", 1))) => 0; // update the tree lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_SUB | LFSR_TAG_DATA, 0, "A", 1))) => 0; lfsr_btree_commit(&lfs, &btree, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_SUB | LFSR_TAG_DATA, 0, "B", 1))) => 0; lfsr_btree_commit(&lfs, &btree, 2, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_SUB | LFSR_TAG_DATA, 0, "C", 1))) => 0; printf("btree: w%d 0x%x.%x\n", @@ -890,14 +890,14 @@ code = ''' lfsr_btree_init(&btree); for (lfs_size_t i = 0; i < N; i++) { lfsr_btree_commit(&lfs, &btree, i, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, &(uint8_t){'a'+(i % 26)}, 1))) => 0; } // update the tree for (lfs_size_t i = 0; i < N; i++) { lfsr_btree_commit(&lfs, &btree, i, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_SUB | LFSR_TAG_DATA, 0, &(uint8_t){'A'+(i % 26)}, 1))) => 0; } @@ -948,7 +948,7 @@ code = ''' lfsr_btree_init(&btree); for (lfs_size_t i = 0; i < N; i++) { lfsr_btree_commit(&lfs, &btree, i, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, &(uint8_t){'a'+(i % 26)}, 1))) => 0; } @@ -969,7 +969,7 @@ code = ''' // update btree lfsr_btree_commit(&lfs, &btree, bid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_SUB | LFSR_TAG_DATA, 0, &(uint8_t){'A'+(i % 26)}, 1))) => 0; @@ -1035,14 +1035,14 @@ code = ''' lfsr_btree_init(&btree); for (lfs_size_t i = 0; i < N; i++) { lfsr_btree_commit(&lfs, &btree, i*W, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +W, &(uint8_t){'a'+(i % 26)}, 1))) => 0; } // update the tree for (lfs_size_t i = 0; i < N; i++) { lfsr_btree_commit(&lfs, &btree, i*W+W-1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_SUB | LFSR_TAG_DATA, 0, &(uint8_t){'A'+(i % 26)}, 1))) => 0; } @@ -1109,7 +1109,7 @@ code = ''' lfsr_btree_init(&btree); for (lfs_size_t i = 0; i < N; i++) { lfsr_btree_commit(&lfs, &btree, i*W, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +W, &(uint8_t){'a'+(i % 26)}, 1))) => 0; } @@ -1141,10 +1141,10 @@ code = ''' // update btree lfsr_btree_commit(&lfs, &btree, weighted_bid+sim_weights[bid]-1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_SUB | LFSR_TAG_DATA, 0, &(uint8_t){'A'+(i % 26)}, 1), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_GROW, +weight-sim_weights[bid], NULL, 0))) => 0; @@ -1252,10 +1252,10 @@ code = ''' lfsr_btree_t btree; lfsr_btree_init(&btree); lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "a", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "a", 1))) => 0; // pop! lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; printf("btree: w%d 0x%x.%x\n", btree.weight, btree.blocks[0], @@ -1273,7 +1273,7 @@ code = ''' // try to putting it back to see if things still work lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "A", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "A", 1))) => 0; printf("btree: w%d 0x%x.%x\n", btree.weight, btree.blocks[0], @@ -1309,12 +1309,12 @@ code = ''' lfsr_btree_t btree; lfsr_btree_init(&btree); lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "a", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "a", 1))) => 0; lfsr_btree_commit(&lfs, &btree, 1, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "b", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "b", 1))) => 0; // pop! lfsr_btree_commit(&lfs, &btree, 1, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; printf("btree: w%d 0x%x.%x\n", btree.weight, btree.blocks[0], @@ -1339,7 +1339,7 @@ code = ''' // try to putting it back to see if things still work lfsr_btree_commit(&lfs, &btree, 1, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "B", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "B", 1))) => 0; printf("btree: w%d 0x%x.%x\n", btree.weight, btree.blocks[0], @@ -1382,12 +1382,12 @@ code = ''' lfsr_btree_t btree; lfsr_btree_init(&btree); lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "a", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "a", 1))) => 0; lfsr_btree_commit(&lfs, &btree, 1, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "b", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "b", 1))) => 0; // pop! lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; printf("btree: w%d 0x%x.%x\n", btree.weight, btree.blocks[0], @@ -1412,7 +1412,7 @@ code = ''' // try to putting it back to see if things still work lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "A", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "A", 1))) => 0; printf("btree: w%d 0x%x.%x\n", btree.weight, btree.blocks[0], @@ -1455,14 +1455,14 @@ code = ''' lfsr_btree_t btree; lfsr_btree_init(&btree); lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "a", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "a", 1))) => 0; lfsr_btree_commit(&lfs, &btree, 1, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "b", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "b", 1))) => 0; lfsr_btree_commit(&lfs, &btree, 2, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "c", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "c", 1))) => 0; // pop! lfsr_btree_commit(&lfs, &btree, 2, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; printf("btree: w%d 0x%x.%x\n", btree.weight, btree.blocks[0], @@ -1494,7 +1494,7 @@ code = ''' // try to putting it back to see if things still work lfsr_btree_commit(&lfs, &btree, 2, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "C", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "C", 1))) => 0; printf("btree: w%d 0x%x.%x\n", btree.weight, btree.blocks[0], @@ -1548,14 +1548,14 @@ code = ''' lfsr_btree_init(&btree); for (lfs_size_t i = 0; i < N; i++) { lfsr_btree_commit(&lfs, &btree, i, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, &(uint8_t){'a'+(i % 26)}, 1))) => 0; } // drain the tree for (lfs_size_t i = 0; i < N-REMAINING; i++) { lfsr_btree_commit(&lfs, &btree, N-1-i, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; } printf("btree: w%d 0x%x.%x\n", @@ -1585,7 +1585,7 @@ code = ''' // try recovering lfsr_btree_commit(&lfs, &btree, REMAINING, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "R", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "R", 1))) => 0; for (lfs_size_t i = 0; i < REMAINING; i++) { lfsr_btree_lookup(&lfs, &btree, i, @@ -1628,14 +1628,14 @@ code = ''' lfsr_btree_init(&btree); for (lfs_size_t i = 0; i < N; i++) { lfsr_btree_commit(&lfs, &btree, i, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, &(uint8_t){'a'+(i % 26)}, 1))) => 0; } // drain the tree for (lfs_size_t i = 0; i < N-REMAINING; i++) { lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; } printf("btree: w%d 0x%x.%x\n", btree.weight, @@ -1665,7 +1665,7 @@ code = ''' // try recovering lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "R", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "R", 1))) => 0; lfsr_btree_lookup(&lfs, &btree, 0, &tag_, &weight_, &data_) => 0; @@ -1711,7 +1711,7 @@ code = ''' lfsr_btree_init(&btree); for (lfs_size_t i = 0; i < N; i++) { lfsr_btree_commit(&lfs, &btree, i, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, &(uint8_t){'a'+(i % 26)}, 1))) => 0; } @@ -1733,7 +1733,7 @@ code = ''' // remove from btree lfsr_btree_commit(&lfs, &btree, bid, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; // remove from sim memmove(&sim[bid], &sim[bid+1], sim_size-(bid+1)); @@ -1800,14 +1800,14 @@ code = ''' lfsr_btree_init(&btree); for (lfs_size_t i = 0; i < N; i++) { lfsr_btree_commit(&lfs, &btree, i*W, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +W, &(uint8_t){'a'+(i % 26)}, 1))) => 0; } // drain the tree for (lfs_size_t i = 0; i < N-REMAINING; i++) { lfsr_btree_commit(&lfs, &btree, (N-1-i)*W+W-1, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -W, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -W, NULL, 0))) => 0; } printf("btree: w%d 0x%x.%x\n", btree.weight, @@ -1836,7 +1836,7 @@ code = ''' // try recovering lfsr_btree_commit(&lfs, &btree, REMAINING*W, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +W, "R", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +W, "R", 1))) => 0; for (lfs_size_t i = 0; i < REMAINING; i++) { lfsr_btree_lookup(&lfs, &btree, i*W+W-1, @@ -1927,7 +1927,7 @@ code = ''' } lfsr_btree_commit(&lfs, &btree, weighted_bid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +weight, &(uint8_t){'a'+(i % 26)}, 1))) => 0; @@ -1949,7 +1949,7 @@ code = ''' // remove from btree lfsr_btree_commit(&lfs, &btree, weighted_bid+sim_weights[bid]-1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM, -sim_weights[bid], NULL, 0))) => 0; @@ -2057,16 +2057,16 @@ code = ''' lfsr_btree_t btree; lfsr_btree_init(&btree); lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, &(uint8_t){'a'+(0 % 26)}, 1))) => 0; lfs_size_t n = 1; for (lfs_size_t i = 1; i < N; i++) { lfsr_btree_commit(&lfs, &btree, i-1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, 0, &(uint8_t){'a'+((i-1) % 26)}, 1), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, &(uint8_t){'a'+((i-0) % 26)}, 1))) => 0; n += 1; @@ -2117,7 +2117,7 @@ code = ''' lfsr_btree_t btree; lfsr_btree_init(&btree); lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "_", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "_", 1))) => 0; // set up a simulation to compare against // @@ -2135,10 +2135,10 @@ code = ''' // split btree lfsr_btree_commit(&lfs, &btree, bid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, 0, &(uint8_t){'a'+(i % 26)}, 1), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, &(uint8_t){'A'+(i % 26)}, 1))) => 0; @@ -2207,16 +2207,16 @@ code = ''' lfsr_btree_t btree; lfsr_btree_init(&btree); lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +W, &(uint8_t){'a'+(0 % 26)}, 1))) => 0; lfs_size_t n = 1; for (lfs_size_t i = 1; i < N; i++) { lfsr_btree_commit(&lfs, &btree, (i-1)*W+W-1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, 0, &(uint8_t){'a'+((i-1) % 26)}, 1), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +W, &(uint8_t){'a'+((i-0) % 26)}, 1))) => 0; n += 1; @@ -2268,7 +2268,7 @@ code = ''' lfsr_btree_t btree; lfsr_btree_init(&btree); lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +W, "_", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +W, "_", 1))) => 0; // set up a simulation to compare against // @@ -2299,13 +2299,13 @@ code = ''' // split btree lfsr_btree_commit(&lfs, &btree, weighted_bid+sim_weights[bid]-1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_GROW, +weight1-sim_weights[bid], NULL, 0), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, 0, &(uint8_t){'a'+(i % 26)}, 1), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +weight2, &(uint8_t){'A'+(i % 26)}, 1))) => 0; @@ -2449,19 +2449,19 @@ code = ''' // the extra push here avoids trying to inline the big entry lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "_", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "_", 1))) => 0; uint8_t buf1[SIZE]; memset(buf1, 'a', SIZE); uint8_t buf2[SIZE]; memset(buf2, 'b', SIZE); lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, 0, buf1, SIZE), - LFSR_RATTR__(LFSR_TAG_DATA, +1, buf2, SIZE))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, 0, buf1, SIZE), + LFSR_RATTR(LFSR_TAG_DATA, +1, buf2, SIZE))) => 0; // force compaction btree.eoff = -1; memset(buf2, 'b', SIZE); lfsr_btree_commit(&lfs, &btree, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_SUB | LFSR_TAG_DATA, 0, buf2, SIZE))) => 0; assert(btree.weight == 2); @@ -2469,7 +2469,7 @@ code = ''' // now remove one entry, since this brings the rbyd down to zero, // this should force one of the blocks to drop lfsr_btree_commit(&lfs, &btree, SIBLING, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; printf("btree: w%d 0x%x.%x\n", btree.weight, @@ -2517,19 +2517,19 @@ code = ''' // the extra push here avoids trying to inline the big entry lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "_", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "_", 1))) => 0; uint8_t buf1[SIZE]; memset(buf1, 'a', SIZE); uint8_t buf2[SIZE]; memset(buf2, 'b', SIZE); lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, 0, buf1, SIZE), - LFSR_RATTR__(LFSR_TAG_DATA, +1, buf2, SIZE))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, 0, buf1, SIZE), + LFSR_RATTR(LFSR_TAG_DATA, +1, buf2, SIZE))) => 0; // force compaction btree.eoff = -1; memset(buf2, 'b', SIZE); lfsr_btree_commit(&lfs, &btree, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_SUB | LFSR_TAG_DATA, 0, buf2, SIZE))) => 0; assert(btree.weight == 2); @@ -2540,7 +2540,7 @@ code = ''' // do this while forcing a compaction btree.eoff = -1; lfsr_btree_commit(&lfs, &btree, SIBLING, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; printf("btree: w%d 0x%x.%x\n", btree.weight, @@ -2588,14 +2588,14 @@ code = ''' // the extra push here avoids trying to inline the big entry lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "_", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "_", 1))) => 0; uint8_t buf1[SIZE]; memset(buf1, 'a', SIZE); uint8_t buf2[SIZE]; memset(buf2, 'b', SIZE); lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, 0, buf1, SIZE), - LFSR_RATTR__(LFSR_TAG_DATA, +1, buf2, SIZE))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, 0, buf1, SIZE), + LFSR_RATTR(LFSR_TAG_DATA, +1, buf2, SIZE))) => 0; // force compaction, causing a split, but while we're splitting, // also remove an entry, bringing the split rbyd down to zero mid split @@ -2604,7 +2604,7 @@ code = ''' // btree.eoff = -1; lfsr_btree_commit(&lfs, &btree, SIBLING, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; printf("btree: w%d 0x%x.%x\n", btree.weight, @@ -2652,30 +2652,30 @@ code = ''' // the extra push here avoids trying to inline the big entry lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "_", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "_", 1))) => 0; uint8_t buf1[SIZE]; memset(buf1, 'a', SIZE); uint8_t buf2[SIZE]; memset(buf2, 'b', SIZE); lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, 0, buf1, SIZE), - LFSR_RATTR__(LFSR_TAG_DATA, +1, buf2, SIZE))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, 0, buf1, SIZE), + LFSR_RATTR(LFSR_TAG_DATA, +1, buf2, SIZE))) => 0; // force compaction btree.eoff = -1; memset(buf2, 'b', SIZE); lfsr_btree_commit(&lfs, &btree, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_SUB | LFSR_TAG_DATA, 0, buf2, SIZE))) => 0; assert(btree.weight == 2); // now make both entries small so they should be merged if either compacts lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_SUB | LFSR_TAG_DATA, 0, "a", 1))) => 0; lfsr_btree_commit(&lfs, &btree, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_SUB | LFSR_TAG_DATA, 0, "b", 1))) => 0; @@ -2683,7 +2683,7 @@ code = ''' // down to zero while also triggering a merge btree.eoff = -1; lfsr_btree_commit(&lfs, &btree, SIBLING, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; printf("btree: w%d 0x%x.%x\n", btree.weight, @@ -2747,7 +2747,7 @@ code = ''' if (op == 0 || bid == sim_size) { // push to btree lfsr_btree_commit(&lfs, &btree, bid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, &(uint8_t){'a'+(i % 26)}, 1))) => 0; @@ -2759,7 +2759,7 @@ code = ''' } else if (op == 1) { // update btree lfsr_btree_commit(&lfs, &btree, bid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_SUB | LFSR_TAG_DATA, 0, &(uint8_t){'a'+(i % 26)}, 1))) => 0; @@ -2769,7 +2769,7 @@ code = ''' } else { // pop from btree lfsr_btree_commit(&lfs, &btree, bid, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; // pop from sim memmove(&sim[bid], &sim[bid+1], sim_size-(bid+1)); @@ -2864,7 +2864,7 @@ code = ''' if (op == 0 || bid == sim_size) { // push to btree lfsr_btree_commit(&lfs, &btree, weighted_bid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +weight, &(uint8_t){'a'+(i % 26)}, 1))) => 0; @@ -2880,10 +2880,10 @@ code = ''' // update btree lfsr_btree_commit(&lfs, &btree, weighted_bid+sim_weights[bid]-1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_SUB | LFSR_TAG_DATA, 0, &(uint8_t){'a'+(i % 26)}, 1), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_GROW, +weight-sim_weights[bid], NULL, 0))) => 0; @@ -2895,7 +2895,7 @@ code = ''' // remove from btree lfsr_btree_commit(&lfs, &btree, weighted_bid+sim_weights[bid]-1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM, -sim_weights[bid], NULL, 0))) => 0; @@ -3037,10 +3037,10 @@ code = ''' lfsr_btree_t btree; lfsr_btree_init(&btree); lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_NAME, +1, 0, "aaa", 3), - LFSR_RATTR__(LFSR_TAG_DATA, 0, "0", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, 0, "0", 1))) => 0; printf("btree: w%d 0x%x.%x\n", btree.weight, btree.blocks[0], @@ -3090,16 +3090,16 @@ code = ''' lfsr_btree_t btree; lfsr_btree_init(&btree); lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_NAME, +1, 0, "aaa", 3), - LFSR_RATTR__(LFSR_TAG_DATA, 0, "0", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, 0, "0", 1))) => 0; lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, 0, "0", 1), - LFSR_RATTR_NAME__( + LFSR_RATTR(LFSR_TAG_DATA, 0, "0", 1), + LFSR_RATTR_NAME( LFSR_TAG_NAME, +1, 0, "aab", 3), - LFSR_RATTR__(LFSR_TAG_DATA, 0, "1", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, 0, "1", 1))) => 0; printf("btree: w%d 0x%x.%x\n", btree.weight, btree.blocks[0], @@ -3157,22 +3157,22 @@ code = ''' lfsr_btree_t btree; lfsr_btree_init(&btree); lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_NAME, +1, 0, "aaa", 3), - LFSR_RATTR__(LFSR_TAG_DATA, 0, "0", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, 0, "0", 1))) => 0; lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, 0, "0", 1), - LFSR_RATTR_NAME__( + LFSR_RATTR(LFSR_TAG_DATA, 0, "0", 1), + LFSR_RATTR_NAME( LFSR_TAG_NAME, +1, 1*DID, "aab", 3), - LFSR_RATTR__(LFSR_TAG_DATA, 0, "1", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, 0, "1", 1))) => 0; lfsr_btree_commit(&lfs, &btree, 1, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, 0, "1", 1), - LFSR_RATTR_NAME__( + LFSR_RATTR(LFSR_TAG_DATA, 0, "1", 1), + LFSR_RATTR_NAME( LFSR_TAG_NAME, +1, 2*DID, "aac", 3), - LFSR_RATTR__(LFSR_TAG_DATA, 0, "2", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, 0, "2", 1))) => 0; printf("btree: w%d 0x%x.%x\n", btree.weight, btree.blocks[0], @@ -3238,22 +3238,22 @@ code = ''' lfsr_btree_t btree; lfsr_btree_init(&btree); lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_NAME, +1, 0, "aaa", 3), - LFSR_RATTR__(LFSR_TAG_DATA, 0, "0", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, 0, "0", 1))) => 0; lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, 0, "1", 1), - LFSR_RATTR_NAME__( + LFSR_RATTR(LFSR_TAG_DATA, 0, "1", 1), + LFSR_RATTR_NAME( LFSR_TAG_NAME, +1, 2*DID, "aac", 3), - LFSR_RATTR__(LFSR_TAG_DATA, 0, "2", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, 0, "2", 1))) => 0; lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, 0, "0", 1), - LFSR_RATTR_NAME__( + LFSR_RATTR(LFSR_TAG_DATA, 0, "0", 1), + LFSR_RATTR_NAME( LFSR_TAG_NAME, +1, 1*DID, "aab", 3), - LFSR_RATTR__(LFSR_TAG_DATA, 0, "1", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, 0, "1", 1))) => 0; printf("btree: w%d 0x%x.%x\n", btree.weight, btree.blocks[0], @@ -3323,10 +3323,10 @@ code = ''' 'a'+((0/26/26) % 26), 'a'+((0/26) % 26), 'a'+(0 % 26) }; lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_NAME, +1, 0, name, 3), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, 0, &(uint8_t){'0'+(0 % 10)}, 1))) => 0; lfs_size_t n = 1; @@ -3335,13 +3335,13 @@ code = ''' 'a'+((i/26/26) % 26), 'a'+((i/26) % 26), 'a'+(i % 26) }; lfsr_btree_commit(&lfs, &btree, i-1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, 0, &(uint8_t){'0'+((i-1) % 10)}, 1), - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_NAME, +1, i*DID, name, 3), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, 0, &(uint8_t){'0'+((i-0) % 10)}, 1))) => 0; n += 1; @@ -3394,10 +3394,10 @@ code = ''' lfsr_btree_t btree; lfsr_btree_init(&btree); lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_NAME, +1, 0, "___", 3), - LFSR_RATTR__(LFSR_TAG_DATA, 0, "_", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, 0, "_", 1))) => 0; // set up a simulation to compare against // @@ -3431,13 +3431,13 @@ code = ''' // split btree lfsr_btree_commit(&lfs, &btree, bid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, 0, &(uint8_t){'0'+(i % 10)}, 1), - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_NAME, +1, 0, name, 3), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, 0, &(uint8_t){'0'+(i % 10)}, 1))) => 0; @@ -3512,10 +3512,10 @@ code = ''' 'a'+((0/26/26) % 26), 'a'+((0/26) % 26), 'a'+(0 % 26) }; lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_NAME, +W, 0, name, 3), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, 0, &(uint8_t){'0'+(0 % 10)}, 1))) => 0; lfs_size_t n = 1; @@ -3524,13 +3524,13 @@ code = ''' 'a'+((i/26/26) % 26), 'a'+((i/26) % 26), 'a'+(i % 26) }; lfsr_btree_commit(&lfs, &btree, (i-1)*W+W-1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, 0, &(uint8_t){'0'+((i-1) % 10)}, 1), - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_NAME, +W, i*DID, name, 3), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, 0, &(uint8_t){'0'+((i-0) % 10)}, 1))) => 0; n += 1; @@ -3584,10 +3584,10 @@ code = ''' lfsr_btree_t btree; lfsr_btree_init(&btree); lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_NAME, +W, 0, "___", 3), - LFSR_RATTR__(LFSR_TAG_DATA, 0, "_", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, 0, "_", 1))) => 0; // set up a simulation to compare against // @@ -3634,16 +3634,16 @@ code = ''' // split btree lfsr_btree_commit(&lfs, &btree, weighted_bid+sim_weights[bid]-1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_GROW, +weight1-sim_weights[bid], NULL, 0), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, 0, &(uint8_t){'0'+(i % 10)}, 1), - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_NAME, +weight2, 0, name, 3), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, 0, &(uint8_t){'0'+(i % 10)}, 1))) => 0; @@ -3741,10 +3741,10 @@ code = ''' lfsr_btree_t btree; lfsr_btree_init(&btree); lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_NAME, +1, 0, "___", 3), - LFSR_RATTR__(LFSR_TAG_DATA, 0, "_", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, 0, "_", 1))) => 0; // set up a simulation to compare against // @@ -3792,21 +3792,21 @@ code = ''' if (cmp > LFS_CMP_EQ) { lfsr_btree_commit(&lfs, &btree, split_bid, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_NAME, +1, 0, name, 3), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, 0, &(uint8_t){'0'+(i % 10)}, 1))) => 0; } else { lfsr_btree_commit(&lfs, &btree, split_bid, LFSR_RATTRS( - LFSR_RATTR_DATA__( + LFSR_RATTR_DATA( LFSR_TAG_DATA, 0, &split_data), - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_NAME, +1, 0, name, 3), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, 0, &(uint8_t){'0'+(i % 10)}, 1))) => 0; } @@ -3821,7 +3821,7 @@ code = ''' } else if (op == 1) { // update btree lfsr_btree_commit(&lfs, &btree, bid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_SUB | LFSR_TAG_DATA, 0, &(uint8_t){'0'+(i % 10)}, 1))) => 0; @@ -3831,7 +3831,7 @@ code = ''' } else { // pop from btree lfsr_btree_commit(&lfs, &btree, bid, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; // pop from sim memmove(&sim[bid], &sim[bid+1], sim_size-(bid+1)); @@ -3898,10 +3898,10 @@ code = ''' lfsr_btree_t btree; lfsr_btree_init(&btree); lfsr_btree_commit(&lfs, &btree, 0, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_NAME, +W, 0, "___", 3), - LFSR_RATTR__(LFSR_TAG_DATA, 0, "_", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, 0, "_", 1))) => 0; // set up a simulation to compare against // @@ -3961,21 +3961,21 @@ code = ''' if (cmp > LFS_CMP_EQ) { lfsr_btree_commit(&lfs, &btree, split_bid-(split_weight-1), LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_NAME, +weight, 0, name, 3), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, 0, &(uint8_t){'0'+(i % 10)}, 1))) => 0; } else { lfsr_btree_commit(&lfs, &btree, split_bid, LFSR_RATTRS( - LFSR_RATTR_DATA__( + LFSR_RATTR_DATA( LFSR_TAG_DATA, 0, &split_data), - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_NAME, +weight, 0, name, 3), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, 0, &(uint8_t){'0'+(i % 10)}, 1))) => 0; } @@ -3994,10 +3994,10 @@ code = ''' // update btree lfsr_btree_commit(&lfs, &btree, weighted_bid+sim_weights[bid]-1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_SUB | LFSR_TAG_DATA, 0, &(uint8_t){'0'+(i % 10)}, 1), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_GROW, +weight-sim_weights[bid], NULL, 0))) => 0; @@ -4009,7 +4009,7 @@ code = ''' // pop from btree lfsr_btree_commit(&lfs, &btree, weighted_bid+sim_weights[bid]-1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM, -sim_weights[bid], NULL, 0))) => 0; @@ -4105,7 +4105,7 @@ code = ''' lfs_size_t n = 0; for (lfs_size_t i = 0; i < N; i++) { lfsr_btree_commit(&lfs, &btree, i, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, &(uint8_t){'a'+(i % 26)}, 1))) => 0; n += 1; @@ -4243,7 +4243,7 @@ code = ''' // add to btree lfsr_btree_commit(&lfs, &btree, bid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, &(uint8_t){'a'+(i % 26)}, 1))) => 0; diff --git a/tests/test_files.toml b/tests/test_files.toml index 6d226345..1ea99fba 100644 --- a/tests/test_files.toml +++ b/tests/test_files.toml @@ -978,7 +978,7 @@ code = ''' // delete any bshrub/btree lfsr_mdir_commit(&lfs, &file.b.o.mdir, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_SUB | LFSR_TAG_STRUCT, 0, NULL, 0))) => 0; @@ -1095,25 +1095,25 @@ code = ''' // create an empty bshrub lfsr_mdir_commit(&lfs, &file.b.o.mdir, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_SHRUBCOMMIT, 0, (&(lfsr_shrubcommit_t){ .bshrub=&file.b, .rid=0, .rattrs=((lfsr_rattr_t[]){ - LFSR_RATTR__(LFSR_TAG_DATA, +1, "?", 1)}), + LFSR_RATTR(LFSR_TAG_DATA, +1, "?", 1)}), .rattr_count=1}), 0))) => 0; lfsr_mdir_commit(&lfs, &file.b.o.mdir, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_SHRUBCOMMIT, 0, (&(lfsr_shrubcommit_t){ .bshrub=&file.b, .rid=0, .rattrs=((lfsr_rattr_t[]){ - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0)}), + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0)}), .rattr_count=1}), 0))) => 0; lfsr_mdir_commit(&lfs, &file.b.o.mdir, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_SUB | LFSR_TAG_BSHRUB, 0, &file.b.shrub_, LFSR_SHRUB_DSIZE))) => 0; @@ -1232,11 +1232,11 @@ code = ''' lfs_alloc_ckpoint(&lfs); lfsr_rbyd_alloc(&lfs, &file.b.shrub) => 0; lfsr_rbyd_commit(&lfs, &file.b.shrub, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, "?", 1))) => 0; + LFSR_RATTR(LFSR_TAG_DATA, +1, "?", 1))) => 0; lfsr_rbyd_commit(&lfs, &file.b.shrub, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; lfsr_mdir_commit(&lfs, &file.b.o.mdir, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_SUB | LFSR_TAG_BTREE, 0, &file.b.shrub, LFSR_BTREE_DSIZE))) => 0; diff --git a/tests/test_mount.toml b/tests/test_mount.toml index 0d6b7e2c..76c28963 100644 --- a/tests/test_mount.toml +++ b/tests/test_mount.toml @@ -545,7 +545,7 @@ code = ''' // is not a user API lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_MAGIC, 0, NULL, 0))) => 0; lfsr_unmount(&lfs) => 0; @@ -569,7 +569,7 @@ code = ''' // is not a user API lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_MAGIC, 0, "lottlefs", 8))) => 0; lfsr_unmount(&lfs) => 0; @@ -593,7 +593,7 @@ code = ''' // is not a user API lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_VERSION, 0, ((const uint8_t[2]){ LFS_DISK_VERSION_MAJOR+1, @@ -619,7 +619,7 @@ code = ''' // is not a user API lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_VERSION, 0, ((const uint8_t[2]){ LFS_DISK_VERSION_MAJOR, @@ -646,7 +646,7 @@ code = ''' // is not a user API lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR_LE32__( + LFSR_RATTR_LE32( LFSR_TAG_RCOMPAT, 0, LFSR_RCOMPAT_COMPAT | LFSR_RCOMPAT_NONSTANDARD))) => 0; @@ -672,7 +672,7 @@ code = ''' // is not a user API lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR_LE32__( + LFSR_RATTR_LE32( LFSR_TAG_WCOMPAT, 0, LFSR_WCOMPAT_COMPAT | LFSR_WCOMPAT_NONSTANDARD))) => 0; @@ -701,7 +701,7 @@ code = ''' // is not a user API lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR_LE32__( + LFSR_RATTR_LE32( LFSR_TAG_OCOMPAT, 0, LFSR_OCOMPAT_COMPAT | LFSR_OCOMPAT_NONSTANDARD))) => 0; @@ -728,7 +728,7 @@ code = ''' // is not a user API lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR_LE32__( + LFSR_RATTR_LE32( LFSR_TAG_WCOMPAT, 0, LFSR_WCOMPAT_COMPAT | LFSR_WCOMPAT_RDONLY))) => 0; @@ -756,7 +756,7 @@ code = ''' // is not a user API lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR_LE32__( + LFSR_RATTR_LE32( LFSR_TAG_RCOMPAT, 0, LFSR_RCOMPAT_COMPAT | LFSR_RCOMPAT_WRONLY))) => 0; @@ -788,7 +788,7 @@ code = ''' lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0; uint8_t rcompat_buf[LFSR_LE32_DSIZE]; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_RCOMPAT, 0, LFSR_DATA_LE32(LFSR_RCOMPAT_COMPAT, rcompat_buf), LFSR_DATA_BUF(overflow, sizeof(overflow))))) => 0; @@ -822,7 +822,7 @@ code = ''' lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0; uint8_t wcompat_buf[LFSR_LE32_DSIZE]; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_WCOMPAT, 0, LFSR_DATA_LE32(LFSR_WCOMPAT_COMPAT, wcompat_buf), LFSR_DATA_BUF(overflow, sizeof(overflow))))) => 0; @@ -856,7 +856,7 @@ code = ''' lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0; uint8_t ocompat_buf[LFSR_LE32_DSIZE]; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_OCOMPAT, 0, LFSR_DATA_LE32(LFSR_OCOMPAT_COMPAT, ocompat_buf), LFSR_DATA_BUF(overflow, sizeof(overflow))))) => 0; @@ -888,7 +888,7 @@ code = ''' lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0; uint8_t rcompat_buf[LFSR_LE32_DSIZE]; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_RCOMPAT, 0, LFSR_DATA_LE32(LFSR_RCOMPAT_COMPAT, rcompat_buf), LFSR_DATA_BUF(overflow, sizeof(overflow))))) => 0; @@ -922,7 +922,7 @@ code = ''' lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0; uint8_t wcompat_buf[LFSR_LE32_DSIZE]; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_WCOMPAT, 0, LFSR_DATA_LE32(LFSR_WCOMPAT_COMPAT, wcompat_buf), LFSR_DATA_BUF(overflow, sizeof(overflow))))) => 0; @@ -953,7 +953,7 @@ code = ''' lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0; uint8_t ocompat_buf[LFSR_LE32_DSIZE]; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_OCOMPAT, 0, LFSR_DATA_LE32(LFSR_OCOMPAT_COMPAT, ocompat_buf), LFSR_DATA_BUF(overflow, sizeof(overflow))))) => 0; @@ -981,7 +981,7 @@ code = ''' // is not a user API lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_GEOMETRY, 0, (&(lfsr_geometry_t){ INC_BLOCK_SIZE, @@ -1008,7 +1008,7 @@ code = ''' // is not a user API lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_GEOMETRY, 0, (&(lfsr_geometry_t){ BLOCK_SIZE, @@ -1035,7 +1035,7 @@ code = ''' // is not a user API lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR_LEB128__( + LFSR_RATTR_LEB128( LFSR_TAG_NAMELIMIT, 0, INC_NAME_LIMIT))) => 0; lfsr_unmount(&lfs) => 0; @@ -1060,7 +1060,7 @@ code = ''' lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0; uint8_t file_limit_buf[LFSR_LEB128_DSIZE]; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_FILELIMIT, 0, // it's a bit difficult to test this since file limit // is usually our integer limit, but we can force a @@ -1086,7 +1086,7 @@ code = ''' // create an unknown config lfsr_mount(&lfs, LFS_M_RDWR, CFG) => 0; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_CONFIG + 0x13, 0, "oh no!", strlen("oh no!")))) => 0; lfsr_unmount(&lfs) => 0; @@ -1132,7 +1132,7 @@ code = ''' lfsr_mtree_pathlookup(&lfs, &path, &mdir, NULL, &did) => 0; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_SUB | (LFSR_TAG_NAME + 0x13), 0, LFSR_DATA_LEB128(did, (uint8_t[LFSR_LEB128_DSIZE]){0}), LFSR_DATA_BUF(path, lfsr_path_namelen(path))))) => 0; diff --git a/tests/test_mtree.toml b/tests/test_mtree.toml index 10ad1dc1..bf48c2c6 100644 --- a/tests/test_mtree.toml +++ b/tests/test_mtree.toml @@ -37,7 +37,7 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(i), 0, &(uint8_t){'a'+(i % 26)}, 1))) => 0; } @@ -82,7 +82,7 @@ code = ''' lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(i), 0, &(uint8_t){'a'+(i % 26)}, 1))) => 0; } @@ -124,7 +124,7 @@ code = ''' for (lfs_size_t i = 0; i < N; i++) { lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, &(uint8_t){'a'+(i % 26)}, 1))) => 0; lfsr_data_t data; @@ -173,18 +173,18 @@ code = ''' uint8_t buffer[SIZE]; memset(buffer, 'a', SIZE); lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(1), 0, buffer, SIZE))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(1), 0, buffer, SIZE))) => 0; memset(buffer, 'b', SIZE); lfsr_mdir_t mdir; lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(2), 0, buffer, SIZE))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(2), 0, buffer, SIZE))) => 0; // force mroot to compact lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(3), 0, "c", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(3), 0, "c", 1))) => 0; // assert mdirs were unininlined assert(lfs.mtree.weight == (1 << lfs.mdir_bits)); @@ -252,7 +252,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); @@ -261,7 +261,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 3); @@ -269,7 +269,7 @@ code = ''' // force mroot to compact lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(1), 0, "c", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(1), 0, "c", 1))) => 0; // assert mdirs were unininlined and split assert(lfs.mtree.weight == (2 << lfs.mdir_bits)); @@ -341,7 +341,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); @@ -350,7 +350,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 3); @@ -358,7 +358,7 @@ code = ''' // force mroot to compact lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(1), 0, "c", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(1), 0, "c", 1))) => 0; // assert mdirs were unininlined and split assert(lfs.mtree.weight == (2 << lfs.mdir_bits)); @@ -370,7 +370,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); @@ -378,7 +378,7 @@ code = ''' // force mdir to compact mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(2), 0, "e", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(2), 0, "e", 1))) => 0; // assert mdir was split correctly assert(lfs.mtree.weight == (3 << lfs.mdir_bits)); @@ -477,7 +477,7 @@ code = ''' mdir.rbyd.eoff = -1; } lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, name+1, 3))) => 0; + LFSR_RATTR_NAME(LFSR_TAG_REG, +1, 0, name+1, 3))) => 0; lfsr_data_t data; uint8_t buffer[256]; @@ -575,7 +575,7 @@ code = ''' mdir.rbyd.eoff = -1; } lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, name+1, 3))) => 0; + LFSR_RATTR_NAME(LFSR_TAG_REG, +1, 0, name+1, 3))) => 0; lfsr_data_t data; // double check @@ -658,7 +658,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); @@ -667,7 +667,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 3); @@ -675,7 +675,7 @@ code = ''' // force mroot to compact lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(1), 0, "c", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(1), 0, "c", 1))) => 0; // assert mdirs were unininlined and split assert(lfs.mtree.weight == (2 << lfs.mdir_bits)); @@ -687,7 +687,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => 0; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(mdir.rbyd.weight == 0); // assert mdir was dropped @@ -748,7 +748,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); @@ -757,7 +757,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 3); @@ -765,7 +765,7 @@ code = ''' // force mroot to compact lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(1), 0, "c", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(1), 0, "c", 1))) => 0; // assert mdirs were unininlined and split assert(lfs.mtree.weight == (2 << lfs.mdir_bits)); @@ -779,7 +779,7 @@ code = ''' // force mdir to compact while we're removing mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(mdir.rbyd.weight == 0); // assert mdir was dropped @@ -840,7 +840,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); @@ -849,7 +849,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 3); @@ -862,7 +862,7 @@ code = ''' lfs.mroot.rbyd.eoff = -1; mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(mdir.rbyd.weight == 2); // assert split/drop worked out @@ -915,7 +915,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); @@ -924,7 +924,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 3); @@ -932,7 +932,7 @@ code = ''' // force mroot to compact lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(1), 0, "c", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(1), 0, "c", 1))) => 0; // assert mdirs were unininlined and split assert(lfs.mtree.weight == (2 << lfs.mdir_bits)); @@ -944,7 +944,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); @@ -956,7 +956,7 @@ code = ''' // force mdir to compact while we're removing mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(mdir.rbyd.weight == 1); // assert split/drop worked out @@ -1029,7 +1029,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); @@ -1038,7 +1038,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 3); @@ -1046,7 +1046,7 @@ code = ''' // force mroot to compact lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(1), 0, "c", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(1), 0, "c", 1))) => 0; // assert mdirs were unininlined and split assert(lfs.mtree.weight == (2 << lfs.mdir_bits)); @@ -1058,7 +1058,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); @@ -1070,7 +1070,7 @@ code = ''' // force mdir to compact while we're removing mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(mdir.rbyd.weight == 1); // assert split/drop worked out @@ -1170,7 +1170,7 @@ code = ''' mdir.rbyd.eoff = -1; } lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, name+1, 3))) => 0; + LFSR_RATTR_NAME(LFSR_TAG_REG, +1, 0, name+1, 3))) => 0; lfsr_data_t data; // double check @@ -1198,7 +1198,7 @@ code = ''' mdir.rbyd.eoff = -1; } lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; } } @@ -1273,18 +1273,18 @@ code = ''' uint8_t buffer[SIZE]; memset(buffer, 'a', SIZE); lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(1), 0, buffer, SIZE))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(1), 0, buffer, SIZE))) => 0; memset(buffer, 'b', SIZE); lfsr_mdir_t mdir; lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(2), 0, buffer, SIZE))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(2), 0, buffer, SIZE))) => 0; // force mroot to compact lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(3), 0, "c", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(3), 0, "c", 1))) => 0; // assert mdirs were unininlined assert(lfs.mtree.weight == (1 << lfs.mdir_bits)); @@ -1296,10 +1296,10 @@ code = ''' lfsr_mdir_t old_mdir = mdir; mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(4), 0, "d", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(4), 0, "d", 1))) => 0; mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(5), 0, "e", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(5), 0, "e", 1))) => 0; // assert we relocated assert(lfsr_mdir_cmp(&old_mdir, &mdir) != 0); @@ -1391,7 +1391,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); @@ -1400,7 +1400,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 3); @@ -1408,7 +1408,7 @@ code = ''' // force mroot to compact lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(1), 0, "c", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(1), 0, "c", 1))) => 0; // assert mdirs were unininlined and split assert(lfs.mtree.weight == (2 << lfs.mdir_bits)); @@ -1422,10 +1422,10 @@ code = ''' lfsr_mdir_t old_mdir = mdir; mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(2), 0, "d", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(2), 0, "d", 1))) => 0; mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(3), 0, "e", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(3), 0, "e", 1))) => 0; // assert we relocated assert(lfsr_mdir_cmp(&old_mdir, &mdir) != 0); @@ -1521,7 +1521,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); @@ -1530,7 +1530,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 3); @@ -1538,7 +1538,7 @@ code = ''' // force mroot to compact lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(1), 0, "c", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(1), 0, "c", 1))) => 0; // assert mdirs were unininlined and split assert(lfs.mtree.weight == (2 << lfs.mdir_bits)); @@ -1552,10 +1552,10 @@ code = ''' lfsr_mdir_t old_mdir = mdir; mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(2), 0, "d", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(2), 0, "d", 1))) => 0; mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(3), 0, "e", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(3), 0, "e", 1))) => 0; // assert we relocated assert(lfsr_mdir_cmp(&old_mdir, &mdir) != 0); @@ -1651,7 +1651,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); @@ -1660,10 +1660,10 @@ code = ''' lfsr_mdir_t old_mroot = lfs.mroot; lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(1), 0, "b", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(1), 0, "b", 1))) => 0; lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(2), 0, "c", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(2), 0, "c", 1))) => 0; // assert we relocated assert(lfsr_mdir_cmp(&old_mroot, &lfs.mroot) != 0); @@ -1728,7 +1728,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); @@ -1737,10 +1737,10 @@ code = ''' lfsr_mdir_t old_mroot = lfs.mroot; lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(1), 0, "b", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(1), 0, "b", 1))) => 0; lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(2), 0, "c", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(2), 0, "c", 1))) => 0; // assert we relocated assert(lfsr_mdir_cmp(&old_mroot, &lfs.mroot) != 0); @@ -1749,16 +1749,16 @@ code = ''' old_mroot = lfs.mroot; lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(3), 0, "d", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(3), 0, "d", 1))) => 0; lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(4), 0, "e", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(4), 0, "e", 1))) => 0; lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(5), 0, "f", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(5), 0, "f", 1))) => 0; lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(6), 0, "g", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(6), 0, "g", 1))) => 0; // assert we relocated assert(lfsr_mdir_cmp(&old_mroot, &lfs.mroot) != 0); @@ -1852,7 +1852,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); @@ -1861,10 +1861,10 @@ code = ''' lfsr_mdir_t old_mroot = lfs.mroot; lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(1), 0, "b", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(1), 0, "b", 1))) => 0; lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(2), 0, "c", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(2), 0, "c", 1))) => 0; // assert we relocated assert(lfsr_mdir_cmp(&old_mroot, &lfs.mroot) != 0); @@ -1872,10 +1872,10 @@ code = ''' old_mroot = lfs.mroot; lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(3), 0, "d", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(3), 0, "d", 1))) => 0; lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(4), 0, "e", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(4), 0, "e", 1))) => 0; // assert we relocated assert(lfsr_mdir_cmp(&old_mroot, &lfs.mroot) != 0); @@ -1953,7 +1953,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); @@ -1962,7 +1962,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 3); @@ -1970,7 +1970,7 @@ code = ''' // force mroot to compact lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(1), 0, "c", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(1), 0, "c", 1))) => 0; // assert mdirs were unininlined and split assert(lfs.mtree.weight == (2 << lfs.mdir_bits)); @@ -1987,10 +1987,10 @@ code = ''' lfsr_mdir_t old_mdir = mdir; mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(2), 0, "d", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(2), 0, "d", 1))) => 0; mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(3), 0, "e", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(3), 0, "e", 1))) => 0; // assert we relocated assert(lfsr_mdir_cmp(&old_mdir, &mdir) != 0); // assert mroot relocated @@ -2088,7 +2088,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); @@ -2097,7 +2097,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 3); @@ -2105,7 +2105,7 @@ code = ''' // force mroot to compact lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(1), 0, "c", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(1), 0, "c", 1))) => 0; // assert mdirs were unininlined and split assert(lfs.mtree.weight == (2 << lfs.mdir_bits)); @@ -2117,7 +2117,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); @@ -2129,10 +2129,10 @@ code = ''' lfsr_mdir_t old_mdir = mdir; mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(2), 0, "e", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(2), 0, "e", 1))) => 0; mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(3), 0, "f", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(3), 0, "f", 1))) => 0; // assert we relocated assert(lfsr_mdir_cmp(&old_mdir, &mdir) != 0); // assert mroot relocated @@ -2238,7 +2238,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); @@ -2247,7 +2247,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 3); @@ -2255,7 +2255,7 @@ code = ''' // force mroot to compact lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(1), 0, "c", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(1), 0, "c", 1))) => 0; // assert mdirs were unininlined and split assert(lfs.mtree.weight == (2 << lfs.mdir_bits)); @@ -2272,11 +2272,11 @@ code = ''' // force mdir to compact twice, this should relocate mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(2), 0, "d", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(2), 0, "d", 1))) => 0; // force mdir to compact while we're removing mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(mdir.rbyd.weight == 0); // assert mroot relocated assert(lfsr_mdir_cmp(&old_mroot, &lfs.mroot) != 0); @@ -2342,19 +2342,19 @@ code = ''' uint8_t buffer[SIZE]; memset(buffer, 'a', SIZE); lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(1), 0, buffer, SIZE))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(1), 0, buffer, SIZE))) => 0; memset(buffer, 'b', SIZE); lfsr_mdir_t mdir; lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(2), 0, buffer, SIZE))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(2), 0, buffer, SIZE))) => 0; // force mroot to compact, this should both uninline and relocate lfsr_mdir_t old_mroot = lfs.mroot; lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(3), 0, "c", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(3), 0, "c", 1))) => 0; // assert mroot relocated assert(lfsr_mdir_cmp(&old_mroot, &lfs.mroot) != 0); @@ -2431,7 +2431,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); @@ -2440,7 +2440,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 3); @@ -2449,7 +2449,7 @@ code = ''' lfsr_mdir_t old_mroot = lfs.mroot; lfs.mroot.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(1), 0, "c", 1))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(1), 0, "c", 1))) => 0; // assert mroot relocated assert(lfsr_mdir_cmp(&old_mroot, &lfs.mroot) != 0); @@ -2552,7 +2552,7 @@ code = ''' mdir.rbyd.eoff = -1; } lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, name+1, 3))) => 0; + LFSR_RATTR_NAME(LFSR_TAG_REG, +1, 0, name+1, 3))) => 0; lfsr_data_t data; // double check @@ -2581,7 +2581,7 @@ code = ''' // we can't really change metadata names, but commits still // trigger writes to the mdir lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__(LFSR_TAG_REG, 0, 0, name+1, 3))) => 0; + LFSR_RATTR_NAME(LFSR_TAG_REG, 0, 0, name+1, 3))) => 0; lfsr_data_t data; // double check @@ -2609,7 +2609,7 @@ code = ''' mdir.rbyd.eoff = -1; } lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; } } @@ -2679,7 +2679,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, "a", 1, &left.mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &left.mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; + LFSR_RATTR_NAME(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; assert(left.mdir.rbyd.weight == 2); lfsr_omdir_open(&lfs, &left); @@ -2687,7 +2687,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, "c", 1, &right.mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &right.mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "c", 1))) => 0; + LFSR_RATTR_NAME(LFSR_TAG_REG, +1, 0, "c", 1))) => 0; assert(right.mdir.rbyd.weight == 3); lfsr_omdir_open(&lfs, &right); @@ -2696,7 +2696,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, "b", 1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "b", 1))) => 0; + LFSR_RATTR_NAME(LFSR_TAG_REG, +1, 0, "b", 1))) => 0; assert(mdir.rbyd.weight == 4); lfsr_data_t data; @@ -2738,7 +2738,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, "a", 1, &left.mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &left.mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; + LFSR_RATTR_NAME(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; assert(left.mdir.rbyd.weight == 2); lfsr_omdir_open(&lfs, &left); @@ -2746,7 +2746,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, "b", 1, &right.mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &right.mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "b", 1))) => 0; + LFSR_RATTR_NAME(LFSR_TAG_REG, +1, 0, "b", 1))) => 0; assert(right.mdir.rbyd.weight == 3); lfsr_omdir_open(&lfs, &right); @@ -2755,7 +2755,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, "a", 1, &mdir, NULL, NULL) => 0; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(mdir.rbyd.weight == 2); // assert neighbor was removed @@ -2788,7 +2788,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, "a", 1, &left.mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &left.mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; + LFSR_RATTR_NAME(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; assert(left.mdir.rbyd.weight == 2); lfsr_omdir_open(&lfs, &left); @@ -2796,7 +2796,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, "b", 1, &right.mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &right.mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "b", 1))) => 0; + LFSR_RATTR_NAME(LFSR_TAG_REG, +1, 0, "b", 1))) => 0; assert(right.mdir.rbyd.weight == 3); lfsr_omdir_open(&lfs, &right); @@ -2805,7 +2805,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, "b", 1, &mdir, NULL, NULL) => 0; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(mdir.rbyd.weight == 2); // assert neighbor was removed @@ -2840,7 +2840,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, "a", 1, &left.mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &left.mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; + LFSR_RATTR_NAME(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; assert(left.mdir.rbyd.weight == 2); lfsr_omdir_open(&lfs, &left); @@ -2848,7 +2848,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, "d", 1, &right.mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &right.mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "d", 1))) => 0; + LFSR_RATTR_NAME(LFSR_TAG_REG, +1, 0, "d", 1))) => 0; assert(right.mdir.rbyd.weight == 3); lfsr_omdir_open(&lfs, &right); @@ -2860,7 +2860,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 4); @@ -2869,7 +2869,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 5); @@ -2917,7 +2917,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, "a", 1, &left.mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &left.mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; + LFSR_RATTR_NAME(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; assert(left.mdir.rbyd.weight == 2); lfsr_omdir_open(&lfs, &left); @@ -2925,7 +2925,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, "e", 1, &right.mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &right.mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "e", 1))) => 0; + LFSR_RATTR_NAME(LFSR_TAG_REG, +1, 0, "e", 1))) => 0; assert(right.mdir.rbyd.weight == 3); lfsr_omdir_open(&lfs, &right); @@ -2937,7 +2937,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 4); @@ -2946,7 +2946,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 5); @@ -2960,7 +2960,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 4); @@ -3008,7 +3008,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, "a", 1, &left.mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &left.mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; + LFSR_RATTR_NAME(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; assert(left.mdir.rbyd.weight == 2); lfsr_omdir_open(&lfs, &left); @@ -3016,7 +3016,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, "b", 1, &right.mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &right.mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "b", 1))) => 0; + LFSR_RATTR_NAME(LFSR_TAG_REG, +1, 0, "b", 1))) => 0; assert(right.mdir.rbyd.weight == 3); lfsr_omdir_open(&lfs, &right); @@ -3066,7 +3066,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, "a", 1, &left.mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &left.mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; + LFSR_RATTR_NAME(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; assert(left.mdir.rbyd.weight == 2); lfsr_omdir_open(&lfs, &left); @@ -3074,7 +3074,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, "d", 1, &right.mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &right.mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "d", 1))) => 0; + LFSR_RATTR_NAME(LFSR_TAG_REG, +1, 0, "d", 1))) => 0; assert(right.mdir.rbyd.weight == 3); lfsr_omdir_open(&lfs, &right); @@ -3086,7 +3086,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 4); @@ -3095,7 +3095,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 5); @@ -3116,12 +3116,12 @@ code = ''' lfsr_mdir_t old_mdir = mdir; mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, 0, 0, (const char*)buffer+1, SIZE-1))) => 0; mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, 0, 0, (const char*)buffer+1, SIZE-1))) => 0; // assert we relocated @@ -3163,7 +3163,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, "a", 1, &left.mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &left.mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; + LFSR_RATTR_NAME(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; assert(left.mdir.rbyd.weight == 2); lfsr_omdir_open(&lfs, &left); @@ -3171,7 +3171,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, "d", 1, &right.mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &right.mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "d", 1))) => 0; + LFSR_RATTR_NAME(LFSR_TAG_REG, +1, 0, "d", 1))) => 0; assert(right.mdir.rbyd.weight == 3); lfsr_omdir_open(&lfs, &right); @@ -3183,7 +3183,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 4); @@ -3192,7 +3192,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 5); @@ -3213,12 +3213,12 @@ code = ''' lfsr_mdir_t old_mdir = mdir; mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, 0, 0, (const char*)buffer+1, SIZE-1))) => 0; mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, 0, 0, (const char*)buffer+1, SIZE-1))) => 0; // assert we relocated @@ -3258,7 +3258,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, "a", 1, &left.mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &left.mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; + LFSR_RATTR_NAME(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; assert(left.mdir.rbyd.weight == 2); lfsr_omdir_open(&lfs, &left); @@ -3266,7 +3266,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, "f", 1, &right.mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &right.mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "f", 1))) => 0; + LFSR_RATTR_NAME(LFSR_TAG_REG, +1, 0, "f", 1))) => 0; assert(right.mdir.rbyd.weight == 3); lfsr_omdir_open(&lfs, &right); @@ -3278,7 +3278,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 4); @@ -3287,7 +3287,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 5); @@ -3301,7 +3301,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 4); @@ -3320,7 +3320,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); @@ -3368,7 +3368,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, "a", 1, &left.mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &left.mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; + LFSR_RATTR_NAME(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; assert(left.mdir.rbyd.weight == 2); lfsr_omdir_open(&lfs, &left); @@ -3376,7 +3376,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, "e", 1, &right.mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &right.mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "e", 1))) => 0; + LFSR_RATTR_NAME(LFSR_TAG_REG, +1, 0, "e", 1))) => 0; assert(right.mdir.rbyd.weight == 3); lfsr_omdir_open(&lfs, &right); @@ -3388,7 +3388,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 4); @@ -3397,7 +3397,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 5); @@ -3411,7 +3411,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 4); @@ -3427,7 +3427,7 @@ code = ''' // now remove the middle entry, forcing a drop lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(mdir.rbyd.weight == 0); // assert mdir was dropped correctly @@ -3472,7 +3472,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, "a", 1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; + LFSR_RATTR_NAME(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; assert(mdir.rbyd.weight == 2); // test that we can traverse the tree, keeping track of all blocks we see @@ -3575,13 +3575,13 @@ code = ''' uint8_t buffer[SIZE]; memset(buffer, 'a', SIZE); lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(1), 0, buffer, SIZE))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(1), 0, buffer, SIZE))) => 0; memset(buffer, 'b', SIZE); lfsr_mdir_t mdir; lfsr_mtree_lookup(&lfs, 0, &mdir) => 0; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_ATTR(1), 0, buffer, SIZE))) => 0; + LFSR_RATTR(LFSR_TAG_ATTR(1), 0, buffer, SIZE))) => 0; // force mroot to compact lfs.mroot.rbyd.eoff = -1; @@ -3712,7 +3712,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); @@ -3721,7 +3721,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 3); @@ -3859,7 +3859,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); @@ -3868,7 +3868,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 3); @@ -3887,7 +3887,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); @@ -4033,7 +4033,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, "a", 1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; + LFSR_RATTR_NAME(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; assert(mdir.rbyd.weight == 2); // force mroot to compact twice, this should extend the mroot @@ -4158,7 +4158,7 @@ code = ''' mdir.rbyd.eoff = -1; } lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, name+1, 3))) => 0; + LFSR_RATTR_NAME(LFSR_TAG_REG, +1, 0, name+1, 3))) => 0; lfsr_data_t data; uint8_t buffer[256]; @@ -4320,7 +4320,7 @@ code = ''' mdir.rbyd.eoff = -1; } lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, name+1, 3))) => 0; + LFSR_RATTR_NAME(LFSR_TAG_REG, +1, 0, name+1, 3))) => 0; lfsr_data_t data; // double check @@ -4458,7 +4458,7 @@ code = ''' lfs_alloc_ckpoint(&lfs); lfsr_mdir_commit(&lfs, &lfs.mroot, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_MROOT, 0, LFSR_MPTR_MROOTANCHOR(), LFSR_MPTR_DSIZE))) => 0; @@ -4786,7 +4786,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); @@ -4845,7 +4845,7 @@ code = ''' lfsr_mtree_namelookup(&lfs, 0, (const char*)buffer+1, SIZE-1, &mdir, NULL, NULL) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_NAME__( + LFSR_RATTR_NAME( LFSR_TAG_REG, +1, 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); diff --git a/tests/test_paths.toml b/tests/test_paths.toml index 1b09c59a..d6d8f128 100644 --- a/tests/test_paths.toml +++ b/tests/test_paths.toml @@ -4566,7 +4566,7 @@ code = ''' lfsr_mtree_pathlookup(&lfs, &path, &mdir, NULL, &did) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_NAME + 0x13, +1, LFSR_DATA_LEB128(did, (uint8_t[LFSR_LEB128_DSIZE]){0}), LFSR_DATA_BUF(path, lfsr_path_namelen(path))))) => 0; @@ -4574,7 +4574,7 @@ code = ''' lfsr_mtree_pathlookup(&lfs, &path, &mdir, NULL, &did) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_NAME + 0x13, +1, LFSR_DATA_LEB128(did, (uint8_t[LFSR_LEB128_DSIZE]){0}), LFSR_DATA_BUF(path, lfsr_path_namelen(path))))) => 0; @@ -4582,7 +4582,7 @@ code = ''' lfsr_mtree_pathlookup(&lfs, &path, &mdir, NULL, &did) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_NAME + 0x13, +1, LFSR_DATA_LEB128(did, (uint8_t[LFSR_LEB128_DSIZE]){0}), LFSR_DATA_BUF(path, lfsr_path_namelen(path))))) => 0; @@ -4590,7 +4590,7 @@ code = ''' lfsr_mtree_pathlookup(&lfs, &path, &mdir, NULL, &did) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_NAME + 0x13, +1, LFSR_DATA_LEB128(did, (uint8_t[LFSR_LEB128_DSIZE]){0}), LFSR_DATA_BUF(path, lfsr_path_namelen(path))))) => 0; @@ -4598,7 +4598,7 @@ code = ''' lfsr_mtree_pathlookup(&lfs, &path, &mdir, NULL, &did) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_NAME + 0x13, +1, LFSR_DATA_LEB128(did, (uint8_t[LFSR_LEB128_DSIZE]){0}), LFSR_DATA_BUF(path, lfsr_path_namelen(path))))) => 0; @@ -4606,7 +4606,7 @@ code = ''' lfsr_mtree_pathlookup(&lfs, &path, &mdir, NULL, &did) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_NAME + 0x13, +1, LFSR_DATA_LEB128(did, (uint8_t[LFSR_LEB128_DSIZE]){0}), LFSR_DATA_BUF(path, lfsr_path_namelen(path))))) => 0; @@ -4752,7 +4752,7 @@ code = ''' lfsr_mtree_pathlookup(&lfs, &path, &mdir, NULL, &did) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_NAME + 0x13, +1, LFSR_DATA_LEB128(did, (uint8_t[LFSR_LEB128_DSIZE]){0}), LFSR_DATA_BUF(path, lfsr_path_namelen(path))))) => 0; @@ -4760,7 +4760,7 @@ code = ''' lfsr_mtree_pathlookup(&lfs, &path, &mdir, NULL, &did) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_NAME + 0x13, +1, LFSR_DATA_LEB128(did, (uint8_t[LFSR_LEB128_DSIZE]){0}), LFSR_DATA_BUF(path, lfsr_path_namelen(path))))) => 0; @@ -4768,7 +4768,7 @@ code = ''' lfsr_mtree_pathlookup(&lfs, &path, &mdir, NULL, &did) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_NAME + 0x13, +1, LFSR_DATA_LEB128(did, (uint8_t[LFSR_LEB128_DSIZE]){0}), LFSR_DATA_BUF(path, lfsr_path_namelen(path))))) => 0; @@ -4776,7 +4776,7 @@ code = ''' lfsr_mtree_pathlookup(&lfs, &path, &mdir, NULL, &did) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_NAME + 0x13, +1, LFSR_DATA_LEB128(did, (uint8_t[LFSR_LEB128_DSIZE]){0}), LFSR_DATA_BUF(path, lfsr_path_namelen(path))))) => 0; @@ -4784,7 +4784,7 @@ code = ''' lfsr_mtree_pathlookup(&lfs, &path, &mdir, NULL, &did) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_NAME + 0x13, +1, LFSR_DATA_LEB128(did, (uint8_t[LFSR_LEB128_DSIZE]){0}), LFSR_DATA_BUF(path, lfsr_path_namelen(path))))) => 0; @@ -4792,7 +4792,7 @@ code = ''' lfsr_mtree_pathlookup(&lfs, &path, &mdir, NULL, &did) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_NAME + 0x13, +1, LFSR_DATA_LEB128(did, (uint8_t[LFSR_LEB128_DSIZE]){0}), LFSR_DATA_BUF(path, lfsr_path_namelen(path))))) => 0; @@ -5048,7 +5048,7 @@ code = ''' lfsr_mtree_pathlookup(&lfs, &path, &mdir, NULL, &did) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_NAME + 0x13, +1, LFSR_DATA_LEB128(did, (uint8_t[LFSR_LEB128_DSIZE]){0}), LFSR_DATA_BUF(path, lfsr_path_namelen(path))))) => 0; @@ -5056,7 +5056,7 @@ code = ''' lfsr_mtree_pathlookup(&lfs, &path, &mdir, NULL, &did) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_NAME + 0x13, +1, LFSR_DATA_LEB128(did, (uint8_t[LFSR_LEB128_DSIZE]){0}), LFSR_DATA_BUF(path, lfsr_path_namelen(path))))) => 0; @@ -5064,7 +5064,7 @@ code = ''' lfsr_mtree_pathlookup(&lfs, &path, &mdir, NULL, &did) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_NAME + 0x13, +1, LFSR_DATA_LEB128(did, (uint8_t[LFSR_LEB128_DSIZE]){0}), LFSR_DATA_BUF(path, lfsr_path_namelen(path))))) => 0; @@ -5072,7 +5072,7 @@ code = ''' lfsr_mtree_pathlookup(&lfs, &path, &mdir, NULL, &did) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_NAME + 0x13, +1, LFSR_DATA_LEB128(did, (uint8_t[LFSR_LEB128_DSIZE]){0}), LFSR_DATA_BUF(path, lfsr_path_namelen(path))))) => 0; @@ -5080,7 +5080,7 @@ code = ''' lfsr_mtree_pathlookup(&lfs, &path, &mdir, NULL, &did) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_NAME + 0x13, +1, LFSR_DATA_LEB128(did, (uint8_t[LFSR_LEB128_DSIZE]){0}), LFSR_DATA_BUF(path, lfsr_path_namelen(path))))) => 0; @@ -5088,7 +5088,7 @@ code = ''' lfsr_mtree_pathlookup(&lfs, &path, &mdir, NULL, &did) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_NAME + 0x13, +1, LFSR_DATA_LEB128(did, (uint8_t[LFSR_LEB128_DSIZE]){0}), LFSR_DATA_BUF(path, lfsr_path_namelen(path))))) => 0; @@ -5290,7 +5290,7 @@ code = ''' lfsr_mtree_pathlookup(&lfs, &path, &mdir, NULL, &did) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_NAME + 0x13, +1, LFSR_DATA_LEB128(did, (uint8_t[LFSR_LEB128_DSIZE]){0}), LFSR_DATA_BUF(path, lfsr_path_namelen(path))))) => 0; @@ -5298,7 +5298,7 @@ code = ''' lfsr_mtree_pathlookup(&lfs, &path, &mdir, NULL, &did) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_NAME + 0x13, +1, LFSR_DATA_LEB128(did, (uint8_t[LFSR_LEB128_DSIZE]){0}), LFSR_DATA_BUF(path, lfsr_path_namelen(path))))) => 0; @@ -5306,7 +5306,7 @@ code = ''' lfsr_mtree_pathlookup(&lfs, &path, &mdir, NULL, &did) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_NAME + 0x13, +1, LFSR_DATA_LEB128(did, (uint8_t[LFSR_LEB128_DSIZE]){0}), LFSR_DATA_BUF(path, lfsr_path_namelen(path))))) => 0; @@ -5314,7 +5314,7 @@ code = ''' lfsr_mtree_pathlookup(&lfs, &path, &mdir, NULL, &did) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_NAME + 0x13, +1, LFSR_DATA_LEB128(did, (uint8_t[LFSR_LEB128_DSIZE]){0}), LFSR_DATA_BUF(path, lfsr_path_namelen(path))))) => 0; @@ -5322,7 +5322,7 @@ code = ''' lfsr_mtree_pathlookup(&lfs, &path, &mdir, NULL, &did) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_NAME + 0x13, +1, LFSR_DATA_LEB128(did, (uint8_t[LFSR_LEB128_DSIZE]){0}), LFSR_DATA_BUF(path, lfsr_path_namelen(path))))) => 0; @@ -5330,7 +5330,7 @@ code = ''' lfsr_mtree_pathlookup(&lfs, &path, &mdir, NULL, &did) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_NAME + 0x13, +1, LFSR_DATA_LEB128(did, (uint8_t[LFSR_LEB128_DSIZE]){0}), LFSR_DATA_BUF(path, lfsr_path_namelen(path))))) => 0; @@ -5532,7 +5532,7 @@ code = ''' lfsr_mtree_pathlookup(&lfs, &path, &mdir, NULL, &did) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_NAME + 0x13, +1, LFSR_DATA_LEB128(did, (uint8_t[LFSR_LEB128_DSIZE]){0}), LFSR_DATA_BUF(path, lfsr_path_namelen(path))))) => 0; @@ -5540,7 +5540,7 @@ code = ''' lfsr_mtree_pathlookup(&lfs, &path, &mdir, NULL, &did) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_NAME + 0x13, +1, LFSR_DATA_LEB128(did, (uint8_t[LFSR_LEB128_DSIZE]){0}), LFSR_DATA_BUF(path, lfsr_path_namelen(path))))) => 0; @@ -5548,7 +5548,7 @@ code = ''' lfsr_mtree_pathlookup(&lfs, &path, &mdir, NULL, &did) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_NAME + 0x13, +1, LFSR_DATA_LEB128(did, (uint8_t[LFSR_LEB128_DSIZE]){0}), LFSR_DATA_BUF(path, lfsr_path_namelen(path))))) => 0; @@ -5556,7 +5556,7 @@ code = ''' lfsr_mtree_pathlookup(&lfs, &path, &mdir, NULL, &did) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_NAME + 0x13, +1, LFSR_DATA_LEB128(did, (uint8_t[LFSR_LEB128_DSIZE]){0}), LFSR_DATA_BUF(path, lfsr_path_namelen(path))))) => 0; @@ -5564,7 +5564,7 @@ code = ''' lfsr_mtree_pathlookup(&lfs, &path, &mdir, NULL, &did) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_NAME + 0x13, +1, LFSR_DATA_LEB128(did, (uint8_t[LFSR_LEB128_DSIZE]){0}), LFSR_DATA_BUF(path, lfsr_path_namelen(path))))) => 0; @@ -5572,7 +5572,7 @@ code = ''' lfsr_mtree_pathlookup(&lfs, &path, &mdir, NULL, &did) => LFS_ERR_NOENT; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR_CAT__( + LFSR_RATTR_CAT( LFSR_TAG_NAME + 0x13, +1, LFSR_DATA_LEB128(did, (uint8_t[LFSR_LEB128_DSIZE]){0}), LFSR_DATA_BUF(path, lfsr_path_namelen(path))))) => 0; diff --git a/tests/test_rbyd.toml b/tests/test_rbyd.toml index 32594b94..07fe6ac0 100644 --- a/tests/test_rbyd.toml +++ b/tests/test_rbyd.toml @@ -32,7 +32,7 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; @@ -41,10 +41,10 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; @@ -69,7 +69,7 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; @@ -78,11 +78,11 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; @@ -107,7 +107,7 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; @@ -116,7 +116,7 @@ code = ''' // commit with the second attribute lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; @@ -149,7 +149,7 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; @@ -174,10 +174,10 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; @@ -212,10 +212,10 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; @@ -269,7 +269,7 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; @@ -294,11 +294,11 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; @@ -333,11 +333,11 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; @@ -390,7 +390,7 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; @@ -411,10 +411,10 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; @@ -437,10 +437,10 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &data) => 0; @@ -480,7 +480,7 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; @@ -501,11 +501,11 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; @@ -528,11 +528,11 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), &data) => 0; @@ -576,10 +576,10 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; @@ -602,10 +602,10 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; @@ -647,13 +647,13 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; @@ -676,13 +676,13 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; @@ -726,13 +726,13 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xcc\xcc\xcc\xcc", 4))) => 0; @@ -762,13 +762,13 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; @@ -817,16 +817,16 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xcc\xcc\xcc\xcc", 4))) => 0; @@ -856,16 +856,16 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; @@ -895,16 +895,16 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; @@ -934,16 +934,16 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; @@ -994,16 +994,16 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xdd\xdd\xdd\xdd", 4))) => 0; @@ -1040,16 +1040,16 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xdd\xdd\xdd\xdd", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; @@ -1086,16 +1086,16 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xdd\xdd\xdd\xdd", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; @@ -1132,16 +1132,16 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xdd\xdd\xdd\xdd", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; @@ -1197,16 +1197,16 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xdd\xdd\xdd\xdd", 4))) => 0; @@ -1243,16 +1243,16 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xdd\xdd\xdd\xdd", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xcc\xcc\xcc\xcc", 4))) => 0; @@ -1289,16 +1289,16 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xdd\xdd\xdd\xdd", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xcc\xcc\xcc\xcc", 4))) => 0; @@ -1335,16 +1335,16 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xdd\xdd\xdd\xdd", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xcc\xcc\xcc\xcc", 4))) => 0; @@ -1402,19 +1402,19 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xdd\xdd\xdd\xdd", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xdd\xdd\xdd\xdd", 4))) => 0; @@ -1453,19 +1453,19 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xdd\xdd\xdd\xdd", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xcc\xcc\xcc\xcc", 4))) => 0; @@ -1502,19 +1502,19 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xdd\xdd\xdd\xdd", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; @@ -1551,19 +1551,19 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xdd\xdd\xdd\xdd", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; @@ -1623,19 +1623,19 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xdd\xdd\xdd\xdd", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(5), 0, "\xee\xee\xee\xee", 4))) => 0; @@ -1681,19 +1681,19 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xdd\xdd\xdd\xdd", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(5), 0, "\xee\xee\xee\xee", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xcc\xcc\xcc\xcc", 4))) => 0; @@ -1737,19 +1737,19 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xdd\xdd\xdd\xdd", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(5), 0, "\xee\xee\xee\xee", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; @@ -1793,19 +1793,19 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xdd\xdd\xdd\xdd", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(5), 0, "\xee\xee\xee\xee", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; @@ -1870,22 +1870,22 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xdd\xdd\xdd\xdd", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(5), 0, "\xee\xee\xee\xee", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(5), 0, "\xee\xee\xee\xee", 4))) => 0; @@ -1931,22 +1931,22 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xdd\xdd\xdd\xdd", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(5), 0, "\xee\xee\xee\xee", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; @@ -1992,22 +1992,22 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xdd\xdd\xdd\xdd", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(5), 0, "\xee\xee\xee\xee", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; @@ -2074,22 +2074,22 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xdd\xdd\xdd\xdd", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(5), 0, "\xee\xee\xee\xee", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(6), 0, "\xff\xff\xff\xff", 4))) => 0; @@ -2140,22 +2140,22 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xdd\xdd\xdd\xdd", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(5), 0, "\xee\xee\xee\xee", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(6), 0, "\xff\xff\xff\xff", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; @@ -2206,22 +2206,22 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xdd\xdd\xdd\xdd", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(5), 0, "\xee\xee\xee\xee", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(6), 0, "\xff\xff\xff\xff", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; @@ -2306,7 +2306,7 @@ code = ''' // build the attribute list for the current permutation struct lfsr_rattr rattrs[N]; for (unsigned j = 0; j < N; j++) { - rattrs[j] = LFSR_RATTR__( + rattrs[j] = LFSR_RATTR( LFSR_TAG_ATTR(perm[j]+1), 0, "\xaa\xaa\xaa\xaa", 4); } @@ -2399,7 +2399,7 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(perm[j]+1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; } @@ -2459,10 +2459,10 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; @@ -2497,10 +2497,10 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; @@ -2556,11 +2556,11 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; @@ -2595,11 +2595,11 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; @@ -2675,7 +2675,7 @@ code = ''' // build the attribute list for the current permutation struct lfsr_rattr rattrs[N]; for (unsigned j = 0; j < N; j++) { - rattrs[j] = LFSR_RATTR__( + rattrs[j] = LFSR_RATTR( LFSR_TAG_ATTR(perm[j]+1), 0, "\xaa\xaa\xaa\xaa", 4); } @@ -2750,7 +2750,7 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(perm[j]+1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; } @@ -2807,7 +2807,7 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(j+1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; } @@ -2849,7 +2849,7 @@ code = ''' // update each tag in permutation order for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(perm[j]+1), 0, "\xaa\xaa\xaa\xaa\xaa\xaa", 6))) => 0; } @@ -2928,7 +2928,7 @@ code = ''' : (ORDER == 1) ? (((lfs_size_t)-1) - i) : TEST_PRNG(&prng); int err = lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(x & 0x7f), 0, "\xaa\xaa\xaa\xaa", 4))); if (err == LFS_ERR_RANGE) { @@ -2980,11 +2980,11 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0, NULL, 0))) => 0; @@ -3003,14 +3003,14 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0, NULL, 0))) => 0; @@ -3045,14 +3045,14 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(2), 0, NULL, 0))) => 0; @@ -3132,7 +3132,7 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(perm[j]+1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; } @@ -3157,7 +3157,7 @@ code = ''' NULL, false) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(j+1), 0, NULL, 0))) => 0; @@ -3186,7 +3186,7 @@ code = ''' // try appending the tag back to make sure things still work printf("--- append: %d ---\n", j); lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(j+1), 0, "\xaa\xaa\xaa\xaa\xaa\xaa", 6))) => 0; @@ -3282,7 +3282,7 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(perm[j]+1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; } @@ -3307,7 +3307,7 @@ code = ''' NULL, false) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(j+1), 0, NULL, 0))) => 0; @@ -3361,10 +3361,10 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xdd\xdd\xdd\xdd", 4))) => 0; lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), @@ -3392,7 +3392,7 @@ code = ''' // try to remove tags that aren't there, this should do nothing lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0, NULL, 0))) => 0; lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), @@ -3419,7 +3419,7 @@ code = ''' &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(3), 0, NULL, 0))) => 0; lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), @@ -3446,7 +3446,7 @@ code = ''' &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(5), 0, NULL, 0))) => 0; lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), @@ -3520,30 +3520,30 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xdd\xdd\xdd\xdd", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(5), 0, "\xee\xee\xee\xee", 4))) => 0; // remove several attributes lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0, NULL, 0), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(3), 0, NULL, 0), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(5), 0, NULL, 0))) => 0; @@ -3572,7 +3572,7 @@ code = ''' // try to remove tags that aren't there, this should do nothing lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0, NULL, 0))) => 0; lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), @@ -3599,7 +3599,7 @@ code = ''' &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(3), 0, NULL, 0))) => 0; lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), @@ -3626,7 +3626,7 @@ code = ''' &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(5), 0, NULL, 0))) => 0; lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), @@ -3655,7 +3655,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, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0, NULL, 0))) => 0; lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), @@ -3682,7 +3682,7 @@ code = ''' &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(3), 0, NULL, 0))) => 0; lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), @@ -3709,7 +3709,7 @@ code = ''' &rid_, &tag_, NULL, &data_) => LFS_ERR_NOENT; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(5), 0, NULL, 0))) => 0; lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(1), @@ -3783,11 +3783,11 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0, NULL, 0))) => 0; @@ -3806,17 +3806,17 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0, NULL, 0), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(2), 0, NULL, 0))) => 0; @@ -3835,17 +3835,17 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb\xbb\xbb", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(2), 0, NULL, 0), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0, NULL, 0))) => 0; @@ -3897,7 +3897,7 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(j+1), 0, "\xaa\xaa\xaa\xaa", 4))) => 0; } @@ -3939,7 +3939,7 @@ code = ''' // remove each tag in permutation order for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(perm[j]+1), 0, NULL, 0))) => 0; } @@ -3953,7 +3953,7 @@ code = ''' // try resuming from all tags being removed lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa\xaa\xaa\xaa\xaa", 6))) => 0; @@ -4052,7 +4052,7 @@ code = ''' sim[rattr] = 'a'+(i % 26); // update our rbyd lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(rattr), 0, &(uint8_t){'a'+(i % 26)}, 1))) => 0; } else { @@ -4060,7 +4060,7 @@ code = ''' sim[rattr] = '\0'; // update our rbyd lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(rattr), 0, NULL, 0))) => 0; } @@ -4136,7 +4136,7 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4))) => 0; @@ -4155,10 +4155,10 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4))) => 0; @@ -4183,13 +4183,13 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4))) => 0; @@ -4238,7 +4238,7 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4))) => 0; @@ -4257,11 +4257,11 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4))) => 0; @@ -4286,11 +4286,11 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4))) => 0; @@ -4315,15 +4315,15 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4))) => 0; @@ -4354,15 +4354,15 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4))) => 0; @@ -4393,15 +4393,15 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4))) => 0; @@ -4496,7 +4496,7 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, names[perm[j] % 6], 4))) => 0; } @@ -4558,10 +4558,10 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 00000000, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4))) => 0; @@ -4631,11 +4631,11 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4))) => 0; @@ -4682,11 +4682,11 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4))) => 0; @@ -4796,7 +4796,7 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, names[perm[j] % 6], 4))) => 0; } @@ -4869,7 +4869,7 @@ code = ''' x = x % (rbyd.weight+1); int err = lfsr_rbyd_commit(&lfs, &rbyd, x, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_DATA, +1, names[x % 6], 4))); + LFSR_RATTR(LFSR_TAG_DATA, +1, names[x % 6], 4))); if (err == LFS_ERR_RANGE) { break; } @@ -4916,10 +4916,10 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa", 2))) => 0; @@ -4944,16 +4944,16 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xbb\xbb", 2))) => 0; @@ -4990,22 +4990,22 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xbb\xbb", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xcc\xcc", 2))) => 0; @@ -5095,11 +5095,11 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa", 2))) => 0; @@ -5124,19 +5124,19 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xbb\xbb", 2))) => 0; @@ -5173,19 +5173,19 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xbb\xbb", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa", 2))) => 0; @@ -5222,27 +5222,27 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xbb\xbb", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xcc\xcc", 2))) => 0; @@ -5314,27 +5314,27 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xbb\xbb", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xcc\xcc", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa", 2))) => 0; @@ -5383,27 +5383,27 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xcc\xcc", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xbb\xbb", 2))) => 0; @@ -5517,13 +5517,13 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, names[perm[j] % 6], 4))) => 0; // note uattrs have a smaller size to help debugging for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(u+1), 0, names[perm[j] % 6], 2))) => 0; } @@ -5592,16 +5592,16 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xbb\xbb", 2))) => 0; @@ -5703,19 +5703,19 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xbb\xbb", 2))) => 0; @@ -5794,19 +5794,19 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xbb\xbb", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa", 2))) => 0; @@ -5949,13 +5949,13 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, names[perm[j] % 6], 4))) => 0; // note uattrs have a smaller size to help debugging for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(u+1), 0, names[perm[j] % 6], 2))) => 0; } @@ -6039,13 +6039,13 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, names[j % 6], 4))) => 0; // note uattrs have a smaller size to help debugging for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(u+1), 0, names[j % 6], 2))) => 0; } @@ -6088,7 +6088,7 @@ code = ''' // update each tag in permutation order for (unsigned j = 0; j < N*M; j++) { lfsr_rbyd_commit(&lfs, &rbyd, perm[j]/M, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(perm[j]%M+1), 0, names[(perm[j]/M) % 6], 3))) => 0; } @@ -6206,13 +6206,13 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, names[perm[j] % 6], 4))) => 0; // note uattrs have a smaller size to help debugging for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(u+1), 0, names[perm[j] % 6], 2))) => 0; } @@ -6238,7 +6238,7 @@ code = ''' NULL, false) => 0; lfsr_rbyd_commit(&lfs, &rbyd, j/M, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR((j%M)+1), 0, NULL, 0))) => 0; @@ -6282,7 +6282,7 @@ code = ''' // try append the tag back to make sure things still work printf("--- append: rid%jd, %jd ---\n", j/M, (j%M)+1); lfsr_rbyd_commit(&lfs, &rbyd, j/M, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR((j%M)+1), 0, names[(j/M)%6], 3))) => 0; @@ -6386,13 +6386,13 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, names[j % 6], 4))) => 0; // note uattrs have a smaller size to help debugging for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(u+1), 0, names[j % 6], 2))) => 0; } @@ -6435,7 +6435,7 @@ code = ''' // remove each tag in permutation order for (unsigned j = 0; j < N*M; j++) { lfsr_rbyd_commit(&lfs, &rbyd, perm[j]/M, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(perm[j]%M+1), 0, NULL, 0))) => 0; } @@ -6528,11 +6528,11 @@ code = ''' // build a single attribute list with all ratibutes, if this fails // it should fail atomically struct lfsr_rattr rattrs[1+M]; - rattrs[0] = LFSR_RATTR__( + rattrs[0] = LFSR_RATTR( LFSR_TAG_DATA, +1, names[x % 6], 4); for (unsigned u = 0; u < M; u++) { - rattrs[1+u] = LFSR_RATTR__( + rattrs[1+u] = LFSR_RATTR( LFSR_TAG_ATTR(u+1), 0, names[x % 6], 2); } @@ -6639,12 +6639,12 @@ code = ''' // note the data size differences here lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(perm[j]+1), 0, names[perm[j] % 6], 1))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, names[perm[j] % 6], 4))) => 0; } @@ -6785,17 +6785,17 @@ code = ''' // note the data size differences here lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(perm[j]+1), 0, names[perm[j] % 6], 1))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, names[perm[j] % 6], 4))) => 0; for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(u+1), 0, names[perm[j] % 6], 2))) => 0; } @@ -6910,14 +6910,14 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == 1); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; @@ -6938,14 +6938,14 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == 1); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; @@ -6966,17 +6966,17 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == 2); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; @@ -7001,17 +7001,17 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == 2); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; @@ -7036,17 +7036,17 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == 2); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; @@ -7089,20 +7089,20 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xbb\xbb", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == 1); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; @@ -7133,20 +7133,20 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xbb\xbb", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == 1); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; @@ -7177,26 +7177,26 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xbb\xbb", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xcc\xcc", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == 2); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; @@ -7239,26 +7239,26 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xbb\xbb", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xcc\xcc", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == 2); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; @@ -7301,26 +7301,26 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xbb\xbb", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xcc\xcc", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == 2); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; @@ -7391,67 +7391,67 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(5), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(6), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xcc\xcc", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xee\xee\xee\xee", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(5), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(6), 0, "\xee\xee", 2), // propagate yellow to the root - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(6), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(6), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(6), 0, "\xee\xee", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == 2); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; @@ -7552,7 +7552,7 @@ code = ''' // try to recreate lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4))) => 0; @@ -7689,61 +7689,61 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xcc\xcc", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), +1, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(5), 0, "\xee\xee", 2), // propagate yellow to the root - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(5), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(5), 0, "\xee\xee", 2))) => 0; // this gets a bit messy as we try to make the rbyd take the right shape lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(5), 0, "\xaa\xaa", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, 0, "\xee\xee\xee\xee", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == 2); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; @@ -7832,7 +7832,7 @@ code = ''' // try to recreate lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4))) => 0; @@ -7957,89 +7957,89 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xcc\xcc", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), +1, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(5), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(6), 0, "\xee\xee", 2), // propagate yellow to the root - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(6), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(6), 0, "\xee\xee", 2))) => 0; // this gets a bit messy as we try to make the rbyd take the right shape lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(5), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(6), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(7), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(8), 0, "\xaa\xaa", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xaa\xaa", 2), // propagate yellow - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xaa\xaa", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, 0, "\xee\xee\xee\xee", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(8), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(7), 0, "\xee\xee", 2), // propagate yellow - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(7), 0, "\xee\xee", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == 2); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; @@ -8164,7 +8164,7 @@ code = ''' // try to recreate lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4))) => 0; @@ -8328,77 +8328,77 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), +1, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(5), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(6), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(7), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(8), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(9), 0, "\xee\xee", 2), // propagate yellow to the root - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(9), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(9), 0, "\xee\xee", 2))) => 0; // this gets a bit messy as we try to make the rbyd take the right shape lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(5), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(6), 0, "\xaa\xaa", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, 0, "\xee\xee\xee\xee", 4), // propagate yellow - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, 0, "\xee\xee\xee\xee", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == 2); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; @@ -8517,7 +8517,7 @@ code = ''' // try to recreate lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4))) => 0; @@ -8675,77 +8675,77 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(9), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), +1, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(5), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(6), 0, "\xee\xee", 2), // propagate yellow to the root - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(6), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(6), 0, "\xee\xee", 2))) => 0; // this gets a bit messy as we try to make the rbyd take the right shape lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, 0, "\xee\xee\xee\xee", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(5), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(6), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(7), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(8), 0, "\xaa\xaa", 2), // propagate yellow - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(8), 0, "\xaa\xaa", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == 2); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; @@ -8864,7 +8864,7 @@ code = ''' // try to recreate lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4))) => 0; @@ -9022,78 +9022,78 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), +1, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(5), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(6), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(7), 0, "\xee\xee", 2), // propagate yellow to the root - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(7), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(7), 0, "\xee\xee", 2))) => 0; // this gets a bit messy as we try to make the rbyd take the right shape lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(5), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(6), 0, "\xaa\xaa", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, 0, "\xee\xee\xee\xee", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xcc\xcc", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xcc\xcc", 2), // propagate yellow - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xcc\xcc", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == 2); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; @@ -9200,7 +9200,7 @@ code = ''' // try to recreate lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4))) => 0; @@ -9346,78 +9346,78 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), +1, "\xcc\xcc", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xcc\xcc", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), +1, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(5), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(6), 0, "\xee\xee", 2), // propagate yellow to the root - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(6), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(6), 0, "\xee\xee", 2))) => 0; // this gets a bit messy as we try to make the rbyd take the right shape lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, 0, "\xee\xee\xee\xee", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(5), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(6), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(7), 0, "\xaa\xaa", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, 0, "\xcc\xcc\xcc\xcc", 4), // propagate yellow - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, 0, "\xcc\xcc\xcc\xcc", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == 2); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; @@ -9524,7 +9524,7 @@ code = ''' // try to recreate lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4))) => 0; @@ -9672,119 +9672,119 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(5), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(6), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), +1, "\xcc\xcc", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xcc\xcc", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xee\xee\xee\xee", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(5), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(6), 0, "\xee\xee", 2), // propagate yellow to the root - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(6), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(6), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(6), 0, "\xee\xee", 2))) => 0; // this gets a bit messy as we try to make the rbyd take the right shape lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(7), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(8), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(11), 0, "\xaa\xaa", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xcc\xcc", 2), // propagate yellow - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xcc\xcc", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xcc\xcc", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(12), 0, "\xaa\xaa", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, 0, "\xcc\xcc\xcc\xcc", 4), // propagate yellow - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, 0, "\xcc\xcc\xcc\xcc", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(13), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(14), 0, "\xaa\xaa", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(9), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(10), 0, "\xaa\xaa", 2), // propagate yellow - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(10), 0, "\xaa\xaa", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == 2); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; @@ -9933,7 +9933,7 @@ code = ''' // try to recreate lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4))) => 0; @@ -10123,117 +10123,117 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(5), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(6), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xcc\xcc", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xcc\xcc", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xcc\xcc", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(6), +1, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(7), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(8), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(9), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(10), 0, "\xee\xee", 2), // propagate yellow to the root - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(10), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(10), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(10), 0, "\xee\xee", 2))) => 0; // this gets a bit messy as we try to make the rbyd take the right shape lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(11), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(12), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(13), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(14), 0, "\xee\xee", 2), // propagate yellow - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(14), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(14), 0, "\xee\xee", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xee\xee", 2), // propagate yellow - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "\xee\xee", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, 0, "\xee\xee\xee\xee", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(5), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xee\xee", 2), // propagate yellow - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(4), 0, "\xee\xee", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == 2); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; @@ -10382,7 +10382,7 @@ code = ''' // try to recreate lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4))) => 0; @@ -10608,7 +10608,7 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, names[perm[j] % 6], 4))) => 0; } @@ -10634,7 +10634,7 @@ code = ''' NULL, false) => 0; lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == N-1); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], CFG->block_size) => 0; @@ -10654,7 +10654,7 @@ code = ''' // try recreating the rid to make sure things still work printf("--- create: %d ---\n", j); lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, names[j % 6], 6))) => 0; assert(rbyd.weight == N); @@ -10770,13 +10770,13 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, names[perm[j] % 6], 4))) => 0; // note uattrs have a smaller size to help debugging for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(u+1), 0, names[perm[j] % 6], 2))) => 0; } @@ -10803,7 +10803,7 @@ code = ''' NULL, false) => 0; lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == N-1); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], CFG->block_size) => 0; @@ -10836,12 +10836,12 @@ code = ''' // try recreating the rid to make sure things still work printf("--- create: %d ---\n", j); lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, names[j % 6], 6))) => 0; for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(u+1), 0, names[j % 6], 3))) => 0; } @@ -10970,7 +10970,7 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, names[perm[j] % 6], 4))) => 0; } @@ -10996,7 +10996,7 @@ code = ''' NULL, false) => 0; lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == N-1); // try traversing over the tags @@ -11100,13 +11100,13 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, names[perm[j] % 6], 4))) => 0; // note uattrs have a smaller size to help debugging for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(u+1), 0, names[perm[j] % 6], 2))) => 0; } @@ -11133,7 +11133,7 @@ code = ''' NULL, false) => 0; lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == N-1); // try traversing over the tags @@ -11205,11 +11205,11 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, @@ -11224,15 +11224,15 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0), - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0), + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, @@ -11247,16 +11247,16 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, @@ -11271,19 +11271,19 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0), - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0), - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0), + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0), + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, @@ -11298,21 +11298,21 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, @@ -11345,14 +11345,14 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, @@ -11367,21 +11367,21 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xbb\xbb", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0), - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0), + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, @@ -11396,22 +11396,22 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xbb\xbb", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, @@ -11426,28 +11426,28 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xbb\xbb", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xcc\xcc", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0), - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0), - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0), + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0), + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, @@ -11462,30 +11462,30 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xbb\xbb", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xcc\xcc", 2))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, @@ -11540,7 +11540,7 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, names[j % 6], 4))) => 0; } @@ -11592,7 +11592,7 @@ code = ''' lfs_size_t rbyd_weight_before = rbyd.weight; lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == rbyd_weight_before-1); } @@ -11605,7 +11605,7 @@ code = ''' // try resuming from all tags being removed lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa\xaa\xaa", 6))) => 0; assert(rbyd.weight == 1); @@ -11689,13 +11689,13 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, names[j % 6], 4))) => 0; // note uattrs have a smaller size to help debugging for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(u+1), 0, names[j % 6], 2))) => 0; } @@ -11748,7 +11748,7 @@ code = ''' lfs_size_t rbyd_weight_before = rbyd.weight; lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == rbyd_weight_before-1); } @@ -11761,12 +11761,12 @@ code = ''' // try resuming from all tags being removed lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa\xaa\xaa", 6))) => 0; for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(u+1), 0, "\xaa\xaa\xaa", 3))) => 0; } @@ -11882,7 +11882,7 @@ code = ''' count += 1; // update our rbyd lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, &(uint8_t){'a'+(i % 26)}, 1))) => 0; } else { @@ -11891,7 +11891,7 @@ code = ''' count -= 1; // update our rbyd lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; } } @@ -11956,7 +11956,7 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4))) => 0; @@ -11977,7 +11977,7 @@ code = ''' // make id2 with weight w2 lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +2, "\xbb\xbb\xbb\xbb", 4))) => 0; @@ -12010,7 +12010,7 @@ code = ''' // make id5 with weight w3 lfsr_rbyd_commit(&lfs, &rbyd, 3, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +3, "\xcc\xcc\xcc\xcc", 4))) => 0; @@ -12055,7 +12055,7 @@ code = ''' // make id9 with weight w4 lfsr_rbyd_commit(&lfs, &rbyd, 6, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +4, "\xdd\xdd\xdd\xdd", 4))) => 0; @@ -12112,7 +12112,7 @@ code = ''' // make id14 with weight w5 lfsr_rbyd_commit(&lfs, &rbyd, 10, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +5, "\xee\xee\xee\xee", 4))) => 0; @@ -12203,23 +12203,23 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( // make id0 with weight w1 - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), // make id2 with weight w2 - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +2, "\xbb\xbb\xbb\xbb", 4), // make id5 with weight w3 - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +3, "\xcc\xcc\xcc\xcc", 4), // make id9 with weight w4 - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +4, "\xdd\xdd\xdd\xdd", 4), // make id14 with weight w5 - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +5, "\xee\xee\xee\xee", 4))) => 0; @@ -12360,7 +12360,7 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, rid*W, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +W, names[perm[j] % 6], 4))) => 0; } @@ -12450,7 +12450,7 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, rid*W, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +W, names[perm[j] % 6], 4))) => 0; } @@ -12501,16 +12501,16 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "unrelated", 9), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xaa\xaa", 2))) => 0; @@ -12567,16 +12567,16 @@ code = ''' // make id2 with weight w2 lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xbb\xbb", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_GROW, +1, NULL, 0), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb", 2))) => 0; @@ -12669,16 +12669,16 @@ code = ''' // make id5 with weight w3 lfsr_rbyd_commit(&lfs, &rbyd, 3, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xcc\xcc", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_GROW, +2, NULL, 0), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xcc\xcc", 2))) => 0; @@ -12807,16 +12807,16 @@ code = ''' // make id9 with weight w4 lfsr_rbyd_commit(&lfs, &rbyd, 6, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xdd\xdd\xdd\xdd", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xdd\xdd", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_GROW, +3, NULL, 0), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xdd\xdd", 2))) => 0; @@ -12981,16 +12981,16 @@ code = ''' // make id14 with weight w5 lfsr_rbyd_commit(&lfs, &rbyd, 10, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xee\xee\xee\xee", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_GROW, +4, NULL, 0), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xee\xee", 2))) => 0; @@ -13212,69 +13212,69 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "unrelated", 9), // make id0 with weight w1 - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xaa\xaa", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xaa\xaa", 2), // make id2 with weight w2 - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xbb\xbb", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_GROW, +1, NULL, 0), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xbb\xbb", 2), // make id5 with weight w3 - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xcc\xcc", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_GROW, +2, NULL, 0), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xcc\xcc", 2), // make id9 with weight w4 - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xdd\xdd\xdd\xdd", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xdd\xdd", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_GROW, +3, NULL, 0), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xdd\xdd", 2), // make id14 with weight w5 - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xee\xee\xee\xee", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xee\xee", 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_GROW, +4, NULL, 0), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xee\xee", 2))) => 0; @@ -13538,7 +13538,7 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "unrelated", 9))) => 0; @@ -13552,16 +13552,16 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, rid*W, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, names[perm[j] % 6], 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, names[perm[j] % 6], 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_GROW, +W-1, NULL, 0), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, names[perm[j] % 6], 2))) => 0; } @@ -13660,7 +13660,7 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(3), 0, "unrelated", 9))) => 0; @@ -13674,16 +13674,16 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, rid*W, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, names[perm[j] % 6], 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, names[perm[j] % 6], 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_GROW, +W-1, NULL, 0), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, names[perm[j] % 6], 2))) => 0; } @@ -13801,7 +13801,7 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, rid*W, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +W, names[perm[j] % 6], 4))) => 0; } @@ -13827,7 +13827,7 @@ code = ''' NULL, false) => 0; lfsr_rbyd_commit(&lfs, &rbyd, j*W+W-1, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_GROW, +D, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_GROW, +D, NULL, 0))) => 0; assert(rbyd.weight == N*W+D); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], CFG->block_size) => 0; @@ -13933,7 +13933,7 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, rid*W, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +W, names[perm[j] % 6], 4))) => 0; } @@ -13959,7 +13959,7 @@ code = ''' NULL, false) => 0; lfsr_rbyd_commit(&lfs, &rbyd, j*W+W-1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_GROW | LFSR_TAG_DATA, +D, names[j % 6], 6))) => 0; assert(rbyd.weight == N*W+D); @@ -14077,7 +14077,7 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, rid*W, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), +W, names[perm[j] % 6], 4))) => 0; } @@ -14103,7 +14103,7 @@ code = ''' NULL, false) => 0; lfsr_rbyd_commit(&lfs, &rbyd, j*W+W-1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_GROW | LFSR_TAG_ATTR(1), +D, names[j % 6], 6))) => 0; assert(rbyd.weight == N*W+D); @@ -14234,7 +14234,7 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, rid*W, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +W, names[perm[j] % 6], 4))) => 0; } @@ -14260,7 +14260,7 @@ code = ''' NULL, false) => 0; lfsr_rbyd_commit(&lfs, &rbyd, j*W+W-1, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_GROW, -D, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_GROW, -D, NULL, 0))) => 0; assert(rbyd.weight == N*W-D); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], CFG->block_size) => 0; @@ -14366,7 +14366,7 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, rid*W, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +W, names[perm[j] % 6], 4))) => 0; } @@ -14392,7 +14392,7 @@ code = ''' NULL, false) => 0; lfsr_rbyd_commit(&lfs, &rbyd, j*W+W-1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_GROW | LFSR_TAG_DATA, -D, names[j % 6], 6))) => 0; assert(rbyd.weight == N*W-D); @@ -14510,7 +14510,7 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, rid*W, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), +W, names[perm[j] % 6], 4))) => 0; } @@ -14536,7 +14536,7 @@ code = ''' NULL, false) => 0; lfsr_rbyd_commit(&lfs, &rbyd, j*W+W-1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_GROW | LFSR_TAG_ATTR(1), -D, names[j % 6], 6))) => 0; assert(rbyd.weight == N*W-D); @@ -14666,7 +14666,7 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, rid*W, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +W, names[perm[j] % 6], 4))) => 0; } @@ -14692,7 +14692,7 @@ code = ''' NULL, false) => 0; lfsr_rbyd_commit(&lfs, &rbyd, j*W+W-1, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -W, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -W, NULL, 0))) => 0; assert(rbyd.weight == (N-1)*W); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], CFG->block_size) => 0; @@ -14726,7 +14726,7 @@ code = ''' // try recreating the rid to make sure things still work printf("--- create: %d ---\n", j); lfsr_rbyd_commit(&lfs, &rbyd, j*W, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +W, names[j % 6], 6))) => 0; assert(rbyd.weight == N*W); @@ -14830,7 +14830,7 @@ code = ''' } lfsr_rbyd_commit(&lfs, &rbyd, rid*W, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +W, names[perm[j] % 6], 4))) => 0; } @@ -14857,7 +14857,7 @@ code = ''' NULL, false) => 0; lfsr_rbyd_commit(&lfs, &rbyd, j*W+W-1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, names[j % 6], 2))) => 0; assert(rbyd.weight == N*W); @@ -14890,7 +14890,7 @@ code = ''' // now try removing the rattr printf("--- removing: %d ---\n", j); lfsr_rbyd_commit(&lfs, &rbyd, j*W+W-1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0, NULL, 0))) => 0; assert(rbyd.weight == N*W); @@ -14918,7 +14918,7 @@ code = ''' // and try putting the rattr back just for good measure printf("--- appending: %d ---\n", j); lfsr_rbyd_commit(&lfs, &rbyd, j*W+W-1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, names[j % 6], 2))) => 0; assert(rbyd.weight == N*W); @@ -15032,7 +15032,7 @@ code = ''' count += 1; // update our rbyd lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, &(uint8_t){'a'+(i % 26)}, 1))) => 0; } else if (op == 1) { @@ -15041,13 +15041,13 @@ code = ''' count -= 1; // update our rbyd lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; } else if (op == 2) { // update our sim sim[rid*(M+1) + u+1] = 'a'+(i % 26); // update our rbyd lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(u), 0, &(uint8_t){'a'+(i % 26)}, 1))) => 0; @@ -15056,7 +15056,7 @@ code = ''' sim[rid*(M+1) + u+1] = '\0'; // update our rbyd lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(u), 0, NULL, 0))) => 0; } @@ -15207,7 +15207,7 @@ code = ''' count += 1; // update our rbyd lfsr_rbyd_commit(&lfs, &rbyd, weighted_rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +weight, &(uint8_t){'a'+(i % 26)}, 1))) => 0; } else if (op == 1) { @@ -15220,7 +15220,7 @@ code = ''' count -= 1; // update our rbyd lfsr_rbyd_commit(&lfs, &rbyd, weighted_rid+weight_-1, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -weight_, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -weight_, NULL, 0))) => 0; } else if (op == 2) { // get the correct weight from the sim weight_ = sim_weights[rid]; @@ -15228,7 +15228,7 @@ code = ''' sim_weights[rid] += weight; // update our rbyd lfsr_rbyd_commit(&lfs, &rbyd, weighted_rid+weight_-1, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_GROW, +weight, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_GROW, +weight, NULL, 0))) => 0; } else if (op == 3) { // get the correct weight from the sim weight_ = sim_weights[rid]; @@ -15239,7 +15239,7 @@ code = ''' sim_weights[rid] -= weight; // update our rbyd lfsr_rbyd_commit(&lfs, &rbyd, weighted_rid+weight_-1, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_GROW, -weight, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_GROW, -weight, NULL, 0))) => 0; } } @@ -15371,10 +15371,10 @@ code = ''' // give each rattr a subtype based on its rid + SHIFT lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, names[perm[j] % 6], 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR((perm[j] + SHIFT) & 0x7f), 0, names[perm[j] % 6], 2))) => 0; } @@ -15461,10 +15461,10 @@ code = ''' // give each rattr a subtype based on its rid + SHIFT lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, names[perm[j] % 6], 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR((perm[j] + SHIFT) & 0x7f), 0, names[perm[j] % 6], 2))) => 0; } @@ -15491,7 +15491,7 @@ code = ''' // remove with a wide tag lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_SUB | LFSR_TAG_ATTR, 0, NULL, 0))) => 0; @@ -15605,10 +15605,10 @@ code = ''' // give each rattr a subtype based on its rid + SHIFT lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, names[perm[j] % 6], 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR((perm[j] + SHIFT) & 0x7f), 0, names[perm[j] % 6], 2))) => 0; } @@ -15635,7 +15635,7 @@ code = ''' // replace with bitwise inverse lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_SUB | LFSR_TAG_ATTR(~(j + SHIFT) & 0x7f), 0, names[j % 6], 3))) => 0; @@ -15751,13 +15751,13 @@ code = ''' // give each rattr a subtype based on its rid + SHIFT lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, names[perm[j] % 6], 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(0x7f & (perm[j] + SHIFT)), 0, names[perm[j] % 6], 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(0x80), 0, names[perm[j] % 6], 1))) => 0; } @@ -15844,13 +15844,13 @@ code = ''' // give each rattr a subtype based on its rid + SHIFT lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, names[perm[j] % 6], 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(0x7f & (perm[j] + SHIFT)), 0, names[perm[j] % 6], 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(0x80), 0, names[perm[j] % 6], 1))) => 0; } @@ -15877,7 +15877,7 @@ code = ''' // remove with a wide tag lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_SUB | LFSR_TAG_ATTR, 0, NULL, 0))) => 0; @@ -15998,13 +15998,13 @@ code = ''' // give each rattr a subtype based on its rid + SHIFT lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, names[perm[j] % 6], 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(0x7f & (perm[j] + SHIFT)), 0, names[perm[j] % 6], 2), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(0x80), 0, names[perm[j] % 6], 1))) => 0; } @@ -16031,7 +16031,7 @@ code = ''' // replace with bitwise inverse lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_SUB | LFSR_TAG_ATTR(~(j + SHIFT) & 0x7f), 0, names[j % 6], 3))) => 0; @@ -16154,7 +16154,7 @@ code = ''' // give each rattr a subtype based on its rid + SHIFT lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR((perm[j] + SHIFT) & 0x7f), +1, names[perm[j] % 6], 4))) => 0; } @@ -16241,7 +16241,7 @@ code = ''' // give each rattr a subtype based on its rid + SHIFT lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR((perm[j] + SHIFT) & 0x7f), +1, names[perm[j] % 6], 4))) => 0; } @@ -16268,7 +16268,7 @@ code = ''' // remove with a wide tag lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_SUB | LFSR_TAG_ATTR, 0, NULL, 0))) => 0; @@ -16385,7 +16385,7 @@ code = ''' // give each rattr a subtype based on its rid + SHIFT lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR((perm[j] + SHIFT) & 0x7f), +1, names[perm[j] % 6], 4))) => 0; } @@ -16412,7 +16412,7 @@ code = ''' // replace with bitwise inverse lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_SUB | LFSR_TAG_ATTR(~(j + SHIFT) & 0x7f), 0, names[j % 6], 6))) => 0; @@ -16522,10 +16522,10 @@ code = ''' // give each rattr a subtype based on its rid + SHIFT lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, names[perm[j] % 6], 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR((perm[j] + SHIFT) & 0x7f), 0, names[perm[j] % 6], 2))) => 0; } @@ -16612,10 +16612,10 @@ code = ''' // give each rattr a subtype based on its rid + SHIFT lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, names[perm[j] % 6], 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR((perm[j] + SHIFT) & 0x7f), 0, names[perm[j] % 6], 2))) => 0; } @@ -16642,7 +16642,7 @@ code = ''' // remove with a wide tag lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_SUP | LFSR_TAG_ATTR, 0, NULL, 0))) => 0; @@ -16756,10 +16756,10 @@ code = ''' // give each rattr a subtype based on its rid + SHIFT lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, names[perm[j] % 6], 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR((perm[j] + SHIFT) & 0x7f), 0, names[perm[j] % 6], 2))) => 0; } @@ -16786,7 +16786,7 @@ code = ''' // replace with bitwise inverse lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_SUP | LFSR_TAG_ATTR(~(j + SHIFT) & 0x7f), 0, names[j % 6], 3))) => 0; @@ -16869,13 +16869,13 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(0), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(0), 0, NULL, 0))) => 0; assert(rbyd.weight == 0); @@ -16918,23 +16918,23 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(0), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(2), 0, "\xcc\xcc\xcc\xcc", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(0), 0, NULL, 0))) => 0; assert(rbyd.weight == 0); // remove a neighbor to the hole lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(1), 0, NULL, 0))) => 0; assert(rbyd.weight == 0); @@ -16977,24 +16977,24 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(0), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xcc\xcc\xcc\xcc", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(0), 0, NULL, 0))) => 0; assert(rbyd.weight == 2); // delete a neighbor to the hole lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( - LFSR_RATTR__(LFSR_TAG_RM, -1, NULL, 0))) => 0; + LFSR_RATTR(LFSR_TAG_RM, -1, NULL, 0))) => 0; assert(rbyd.weight == 1); // can we still access things? @@ -17035,23 +17035,23 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(0x00), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(0x01), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(0x80), 0, "\xdd\xdd\xdd\xdd", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(0), 0, NULL, 0))) => 0; assert(rbyd.weight == 0); // subwide replace a neighbor to the hole lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_SUB | LFSR_TAG_ATTR(0x02), 0, "\xcc\xcc\xcc\xcc", 4))) => 0; assert(rbyd.weight == 0); @@ -17103,24 +17103,24 @@ code = ''' rbyd = init_rbyd; lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(0), 0, "\xaa\xaa\xaa\xaa", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_ATTR(1), 0, "\xbb\xbb\xbb\xbb", 4), - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_DATA, +1, "\xdd\xdd\xdd\xdd", 4))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_RM | LFSR_TAG_ATTR(0), 0, NULL, 0))) => 0; assert(rbyd.weight == 1); // supwide replace a neighbor to the hole lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( - LFSR_RATTR__( + LFSR_RATTR( LFSR_TAG_SUP | LFSR_TAG_ATTR(2), 0, "\xcc\xcc\xcc\xcc", 4))) => 0; assert(rbyd.weight == 1);