diff --git a/lfs.c b/lfs.c index fcd640ae..67d7dc43 100644 --- a/lfs.c +++ b/lfs.c @@ -2194,6 +2194,28 @@ typedef struct lfsr_rattr { .weight=_weight, \ .u.leb128=_leb128}) +// helper macro for did + name pairs +typedef struct lfsr_name { + uint32_t did; + const char *name; + lfs_size_t name_len; +} lfsr_name_t; + +#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___( \ + _tag, \ + _weight, \ + (&(lfsr_name_t){ \ + .did=_did, \ + .name=_name, \ + .name_len=_name_len})) + // TODO rm me #define LFSR_RATTR_(_tag, _weight, _cat, _count) \ ((lfsr_rattr_t){ \ @@ -3419,6 +3441,11 @@ static int lfsr_rbyd_appendrev(lfs_t *lfs, lfsr_rbyd_t *rbyd, uint32_t rev) { // other low-level appends static int lfsr_rbyd_appendtag(lfs_t *lfs, lfsr_rbyd_t *rbyd, lfsr_tag_t tag, lfsr_rid_t weight, lfs_size_t size) { + // tag must not be internal at this point + LFS_ASSERT(!lfsr_tag_isinternal(tag)); + // bit 7 is reserved for future subtype extensions + LFS_ASSERT(!(tag & 0x80)); + // do we fit? if (lfsr_rbyd_eoff(rbyd) + LFSR_TAG_DSIZE > lfs->cfg->block_size) { @@ -3463,6 +3490,11 @@ static lfsr_data_t lfsr_data_frommptr(const lfs_block_t mptr[static 2], static int lfsr_rbyd_appendrattr_(lfs_t *lfs, lfsr_rbyd_t *rbyd, lfsr_rattr_t rattr) { + // tag must not be internal at this point + LFS_ASSERT(!lfsr_tag_isinternal(rattr.tag)); + // bit 7 is reserved for future subtype extensions + LFS_ASSERT(!(rattr.tag & 0x80)); + // encode lazy tags? // // we encode most tags lazily as this heavily reduces stack usage, @@ -3470,32 +3502,40 @@ static int lfsr_rbyd_appendrattr_(lfs_t *lfs, lfsr_rbyd_t *rbyd, lfs_size_t size; const void *datas; int16_t data_count; - // uh, there's probably a better way to do this, but I'm not sure - // what it is - uint8_t buf[LFS_MAX( - LFSR_LE32_DSIZE, - LFS_MAX( - LFSR_LEB128_DSIZE, - LFS_MAX( - LFSR_GEOMETRY_DSIZE, + struct { + // uh, there's probably a better way to do this, but I'm not + // sure what it is + union { + uint8_t buf[LFS_MAX( + LFSR_LE32_DSIZE, LFS_MAX( - LFSR_BPTR_DSIZE, + LFSR_LEB128_DSIZE, LFS_MAX( - LFSR_SHRUB_DSIZE, + LFSR_GEOMETRY_DSIZE, LFS_MAX( - LFSR_BTREE_DSIZE, + LFSR_BPTR_DSIZE, LFS_MAX( - LFSR_MPTR_DSIZE, - LFSR_ECKSUM_DSIZE)))))))]; + LFSR_SHRUB_DSIZE, + LFS_MAX( + LFSR_BTREE_DSIZE, + LFS_MAX( + LFSR_MPTR_DSIZE, + LFSR_ECKSUM_DSIZE)))))))]; + struct { + lfsr_data_t datas[2]; + uint8_t buf[LFSR_LEB128_DSIZE]; + } name; + } u; + } ctx; switch (lfsr_rattr_dtag(rattr)) { // le32? case LFSR_TAG_RCOMPAT:; case LFSR_TAG_WCOMPAT:; case LFSR_TAG_OCOMPAT:; case LFSR_TAG_GCKSUMDELTA:; - lfsr_data_t data = lfsr_data_fromle32(rattr.u.le32, buf); + lfsr_data_t data = lfsr_data_fromle32(rattr.u.le32, ctx.u.buf); size = lfsr_data_size(data); - datas = buf; + datas = ctx.u.buf; data_count = size; break; @@ -3504,26 +3544,39 @@ static int lfsr_rbyd_appendrattr_(lfs_t *lfs, lfsr_rbyd_t *rbyd, case LFSR_TAG_FILELIMIT:; case LFSR_TAG_BOOKMARK:; case LFSR_TAG_DID:; - data = lfsr_data_fromleb128(rattr.u.leb128, buf); + data = lfsr_data_fromleb128(rattr.u.leb128, ctx.u.buf); size = lfsr_data_size(data); - datas = buf; + datas = ctx.u.buf; data_count = size; break; // geometry? case LFSR_TAG_GEOMETRY:; - data = lfsr_data_fromgeometry(rattr.u.etc, buf); + data = lfsr_data_fromgeometry(rattr.u.etc, ctx.u.buf); size = lfsr_data_size(data); - datas = buf; + datas = ctx.u.buf; data_count = size; break; + // name? + case LFSR_TAG_NAME:; + case LFSR_TAG_REG:; + case LFSR_TAG_DIR:; + case LFSR_TAG_STICKYNOTE:; + const lfsr_name_t *name = rattr.u.etc; + ctx.u.name.datas[0] = lfsr_data_fromleb128(name->did, ctx.u.name.buf); + ctx.u.name.datas[1] = LFSR_DATA_BUF(name->name, name->name_len); + size = lfsr_data_size(ctx.u.name.datas[0]) + name->name_len; + datas = &ctx.u.name.datas; + data_count = -2; + break; + // bptr? case LFSR_TAG_BLOCK:; case LFSR_TAG_SHRUB | LFSR_TAG_BLOCK:; - data = lfsr_data_frombptr(rattr.u.etc, buf); + data = lfsr_data_frombptr(rattr.u.etc, ctx.u.buf); size = lfsr_data_size(data); - datas = buf; + datas = ctx.u.buf; data_count = size; break; @@ -3532,35 +3585,35 @@ static int lfsr_rbyd_appendrattr_(lfs_t *lfs, lfsr_rbyd_t *rbyd, // note unlike the other lazy tags, we _need_ to lazily encode // shrub trunks, since they change underneath us during mdir // compactions, relocations, etc - data = lfsr_data_fromshrub(rattr.u.etc, buf); + data = lfsr_data_fromshrub(rattr.u.etc, ctx.u.buf); size = lfsr_data_size(data); - datas = buf; + datas = ctx.u.buf; data_count = size; break; // btree? case LFSR_TAG_BTREE:; case LFSR_TAG_MTREE:; - data = lfsr_data_frombtree(rattr.u.etc, buf); + data = lfsr_data_frombtree(rattr.u.etc, ctx.u.buf); size = lfsr_data_size(data); - datas = buf; + datas = ctx.u.buf; data_count = size; break; // mptr? case LFSR_TAG_MROOT:; case LFSR_TAG_MDIR:; - data = lfsr_data_frommptr(rattr.u.etc, buf); + data = lfsr_data_frommptr(rattr.u.etc, ctx.u.buf); size = lfsr_data_size(data); - datas = buf; + datas = ctx.u.buf; data_count = size; break; // ecksum? case LFSR_TAG_ECKSUM:; - data = lfsr_data_fromecksum(rattr.u.etc, buf); + data = lfsr_data_fromecksum(rattr.u.etc, ctx.u.buf); size = lfsr_data_size(data); - datas = buf; + datas = ctx.u.buf; data_count = size; break; @@ -10033,7 +10086,7 @@ 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__( @@ -10183,7 +10236,7 @@ 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( @@ -10350,7 +10403,7 @@ 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_MOVE(LFSR_TAG_MOVE, 0, &old_mdir))); @@ -11100,7 +11153,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) { diff --git a/tests/test_mtree.toml b/tests/test_mtree.toml index 05d255bc..6a07a1c6 100644 --- a/tests/test_mtree.toml +++ b/tests/test_mtree.toml @@ -252,14 +252,18 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); memset(buffer+1, 'b', SIZE-1); 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 3); // force mroot to compact @@ -337,14 +341,18 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); memset(buffer+1, 'b', SIZE-1); 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 3); // force mroot to compact @@ -362,7 +370,9 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); // force mdir to compact @@ -459,7 +469,7 @@ code = ''' name[0] = '\0'; sprintf(name+1, "%03x", i); lfsr_mdir_t mdir; - lfsr_mtree_namelookup(&lfs, 0, (const char*)name+1, 3, + lfsr_mtree_namelookup(&lfs, 0, name+1, 3, &mdir, NULL, NULL) => LFS_ERR_NOENT; // force a compaction? if (FORCE_COMPACTION) { @@ -467,7 +477,7 @@ code = ''' mdir.rbyd.eoff = -1; } lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(name, 4)))) => 0; + LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, name+1, 3))) => 0; lfsr_data_t data; uint8_t buffer[256]; @@ -553,7 +563,7 @@ code = ''' name[0] = '\0'; sprintf(name+1, "%03x", x); lfsr_mdir_t mdir; - int err = lfsr_mtree_namelookup(&lfs, 0, (const char*)name+1, 3, + int err = lfsr_mtree_namelookup(&lfs, 0, name+1, 3, &mdir, NULL, NULL); assert(!err || err == LFS_ERR_NOENT); if (!err) { @@ -565,7 +575,7 @@ code = ''' mdir.rbyd.eoff = -1; } lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(name, 4)))) => 0; + LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, name+1, 3))) => 0; lfsr_data_t data; // double check @@ -587,13 +597,13 @@ code = ''' name[0] = '\0'; sprintf(name+1, "%03x", i); if (sim[i]) { - lfsr_mtree_namelookup(&lfs, 0, (const char*)name+1, 3, + lfsr_mtree_namelookup(&lfs, 0, name+1, 3, &mdir, NULL, NULL) => 0; lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, sizeof(buffer)) => 4; assert(memcmp(buffer, name, 4) == 0); } else { - lfsr_mtree_namelookup(&lfs, 0, (const char*)name+1, 3, + lfsr_mtree_namelookup(&lfs, 0, name+1, 3, &mdir, NULL, NULL) => LFS_ERR_NOENT; } } @@ -611,13 +621,13 @@ code = ''' name[0] = '\0'; sprintf(name+1, "%03x", i); if (sim[i]) { - lfsr_mtree_namelookup(&lfs, 0, (const char*)name+1, 3, + lfsr_mtree_namelookup(&lfs, 0, name+1, 3, &mdir, NULL, NULL) => 0; lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, sizeof(buffer)) => 4; assert(memcmp(buffer, name, 4) == 0); } else { - lfsr_mtree_namelookup(&lfs, 0, (const char*)name+1, 3, + lfsr_mtree_namelookup(&lfs, 0, name+1, 3, &mdir, NULL, NULL) => LFS_ERR_NOENT; } } @@ -648,14 +658,18 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); memset(buffer+1, 'b', SIZE-1); 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 3); // force mroot to compact @@ -734,14 +748,18 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); memset(buffer+1, 'b', SIZE-1); 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 3); // force mroot to compact @@ -822,14 +840,18 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); memset(buffer+1, 'b', SIZE-1); 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 3); // remove an entry, forcing the mdir to be dropped @@ -893,14 +915,18 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); memset(buffer+1, 'b', SIZE-1); 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 3); // force mroot to compact @@ -918,7 +944,9 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); // remove an entry, forcing the mdir to be dropped @@ -1001,14 +1029,18 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); memset(buffer+1, 'b', SIZE-1); 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 3); // force mroot to compact @@ -1026,7 +1058,9 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); // remove an entry, forcing the mdir to be dropped @@ -1124,7 +1158,7 @@ code = ''' // update mtree lfsr_mdir_t mdir; - int err = lfsr_mtree_namelookup(&lfs, 0, (const char*)name+1, 3, + int err = lfsr_mtree_namelookup(&lfs, 0, name+1, 3, &mdir, NULL, NULL); assert(!err || err == LFS_ERR_NOENT); if (!err) { @@ -1136,7 +1170,7 @@ code = ''' mdir.rbyd.eoff = -1; } lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(name, 4)))) => 0; + LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, name+1, 3))) => 0; lfsr_data_t data; // double check @@ -1152,7 +1186,7 @@ code = ''' // update mtree lfsr_mdir_t mdir; - int err = lfsr_mtree_namelookup(&lfs, 0, (const char*)name+1, 3, + int err = lfsr_mtree_namelookup(&lfs, 0, name+1, 3, &mdir, NULL, NULL); assert(!err || err == LFS_ERR_NOENT); if (err == LFS_ERR_NOENT) { @@ -1180,13 +1214,13 @@ code = ''' name[0] = '\0'; sprintf(name+1, "%03x", i); if (sim[i]) { - lfsr_mtree_namelookup(&lfs, 0, (const char*)name+1, 3, + lfsr_mtree_namelookup(&lfs, 0, name+1, 3, &mdir, NULL, NULL) => 0; lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, sizeof(buffer)) => 4; assert(memcmp(buffer, name, 4) == 0); } else { - lfsr_mtree_namelookup(&lfs, 0, (const char*)name+1, 3, + lfsr_mtree_namelookup(&lfs, 0, name+1, 3, &mdir, NULL, NULL) => LFS_ERR_NOENT; } } @@ -1204,13 +1238,13 @@ code = ''' name[0] = '\0'; sprintf(name+1, "%03x", i); if (sim[i]) { - lfsr_mtree_namelookup(&lfs, 0, (const char*)name+1, 3, + lfsr_mtree_namelookup(&lfs, 0, name+1, 3, &mdir, NULL, NULL) => 0; lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, sizeof(buffer)) => 4; assert(memcmp(buffer, name, 4) == 0); } else { - lfsr_mtree_namelookup(&lfs, 0, (const char*)name+1, 3, + lfsr_mtree_namelookup(&lfs, 0, name+1, 3, &mdir, NULL, NULL) => LFS_ERR_NOENT; } } @@ -1357,14 +1391,18 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); memset(buffer+1, 'b', SIZE-1); 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 3); // force mroot to compact @@ -1483,14 +1521,18 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); memset(buffer+1, 'b', SIZE-1); 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 3); // force mroot to compact @@ -1609,7 +1651,9 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); // force mroot to compact twice, this should extend the mroot @@ -1684,7 +1728,9 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); // force mroot to compact twice, this should extend the mroot @@ -1806,7 +1852,9 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); // force mroot to compact twice, this should extend the mroot @@ -1905,14 +1953,18 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); memset(buffer+1, 'b', SIZE-1); 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 3); // force mroot to compact @@ -2036,14 +2088,18 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); memset(buffer+1, 'b', SIZE-1); 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 3); // force mroot to compact @@ -2061,7 +2117,9 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); // setup mroot to compact and relocate on next commit @@ -2180,14 +2238,18 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); memset(buffer+1, 'b', SIZE-1); 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 3); // force mroot to compact @@ -2369,14 +2431,18 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); memset(buffer+1, 'b', SIZE-1); 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 3); // force mroot to compact, this should both split and relocate @@ -2474,7 +2540,7 @@ code = ''' // update mtree lfsr_mdir_t mdir; - int err = lfsr_mtree_namelookup(&lfs, 0, (const char*)name+1, 3, + int err = lfsr_mtree_namelookup(&lfs, 0, name+1, 3, &mdir, NULL, NULL); assert(!err || err == LFS_ERR_NOENT); if (!err) { @@ -2486,7 +2552,7 @@ code = ''' mdir.rbyd.eoff = -1; } lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(name, 4)))) => 0; + LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, name+1, 3))) => 0; lfsr_data_t data; // double check @@ -2501,7 +2567,7 @@ code = ''' // update mtree lfsr_mdir_t mdir; - int err = lfsr_mtree_namelookup(&lfs, 0, (const char*)name+1, 3, + int err = lfsr_mtree_namelookup(&lfs, 0, name+1, 3, &mdir, NULL, NULL); assert(!err || err == LFS_ERR_NOENT); if (err == LFS_ERR_NOENT) { @@ -2515,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(LFSR_TAG_REG, 0, LFSR_DATA_BUF(name, 4)))) => 0; + LFSR_RATTR_NAME__(LFSR_TAG_REG, 0, 0, name+1, 3))) => 0; lfsr_data_t data; // double check @@ -2531,7 +2597,7 @@ code = ''' // update mtree lfsr_mdir_t mdir; - int err = lfsr_mtree_namelookup(&lfs, 0, (const char*)name+1, 3, + int err = lfsr_mtree_namelookup(&lfs, 0, name+1, 3, &mdir, NULL, NULL); assert(!err || err == LFS_ERR_NOENT); if (err == LFS_ERR_NOENT) { @@ -2559,13 +2625,13 @@ code = ''' name[0] = '\0'; sprintf(name+1, "%03x", i); if (sim[i]) { - lfsr_mtree_namelookup(&lfs, 0, (const char*)name+1, 3, + lfsr_mtree_namelookup(&lfs, 0, name+1, 3, &mdir, NULL, NULL) => 0; lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, sizeof(buffer)) => 4; assert(memcmp(buffer, name, 4) == 0); } else { - lfsr_mtree_namelookup(&lfs, 0, (const char*)name+1, 3, + lfsr_mtree_namelookup(&lfs, 0, name+1, 3, &mdir, NULL, NULL) => LFS_ERR_NOENT; } } @@ -2583,13 +2649,13 @@ code = ''' name[0] = '\0'; sprintf(name+1, "%03x", i); if (sim[i]) { - lfsr_mtree_namelookup(&lfs, 0, (const char*)name+1, 3, + lfsr_mtree_namelookup(&lfs, 0, name+1, 3, &mdir, NULL, NULL) => 0; lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, sizeof(buffer)) => 4; assert(memcmp(buffer, name, 4) == 0); } else { - lfsr_mtree_namelookup(&lfs, 0, (const char*)name+1, 3, + lfsr_mtree_namelookup(&lfs, 0, name+1, 3, &mdir, NULL, NULL) => LFS_ERR_NOENT; } } @@ -2613,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(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0a", 2)))) => 0; + LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; assert(left.mdir.rbyd.weight == 2); lfsr_omdir_open(&lfs, &left); @@ -2621,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(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0c", 2)))) => 0; + LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "c", 1))) => 0; assert(right.mdir.rbyd.weight == 3); lfsr_omdir_open(&lfs, &right); @@ -2630,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(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0b", 2)))) => 0; + LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "b", 1))) => 0; assert(mdir.rbyd.weight == 4); lfsr_data_t data; @@ -2672,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(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0a", 2)))) => 0; + LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; assert(left.mdir.rbyd.weight == 2); lfsr_omdir_open(&lfs, &left); @@ -2680,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(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0b", 2)))) => 0; + LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "b", 1))) => 0; assert(right.mdir.rbyd.weight == 3); lfsr_omdir_open(&lfs, &right); @@ -2722,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(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0a", 2)))) => 0; + LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; assert(left.mdir.rbyd.weight == 2); lfsr_omdir_open(&lfs, &left); @@ -2730,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(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0b", 2)))) => 0; + LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "b", 1))) => 0; assert(right.mdir.rbyd.weight == 3); lfsr_omdir_open(&lfs, &right); @@ -2774,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(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0a", 2)))) => 0; + LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; assert(left.mdir.rbyd.weight == 2); lfsr_omdir_open(&lfs, &left); @@ -2782,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(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0d", 2)))) => 0; + LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "d", 1))) => 0; assert(right.mdir.rbyd.weight == 3); lfsr_omdir_open(&lfs, &right); @@ -2794,14 +2860,18 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 4); memset(buffer+1, 'c', SIZE-1); 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 5); // force mroot to compact @@ -2847,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(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0a", 2)))) => 0; + LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; assert(left.mdir.rbyd.weight == 2); lfsr_omdir_open(&lfs, &left); @@ -2855,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(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0e", 2)))) => 0; + LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "e", 1))) => 0; assert(right.mdir.rbyd.weight == 3); lfsr_omdir_open(&lfs, &right); @@ -2867,14 +2937,18 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 4); memset(buffer+1, 'd', SIZE-1); 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 5); // force mroot to compact @@ -2886,7 +2960,9 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 4); // force mdir to compact @@ -2932,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(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0a", 2)))) => 0; + LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; assert(left.mdir.rbyd.weight == 2); lfsr_omdir_open(&lfs, &left); @@ -2940,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(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0b", 2)))) => 0; + LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "b", 1))) => 0; assert(right.mdir.rbyd.weight == 3); lfsr_omdir_open(&lfs, &right); @@ -2990,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(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0a", 2)))) => 0; + LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; assert(left.mdir.rbyd.weight == 2); lfsr_omdir_open(&lfs, &left); @@ -2998,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(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0d", 2)))) => 0; + LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "d", 1))) => 0; assert(right.mdir.rbyd.weight == 3); lfsr_omdir_open(&lfs, &right); @@ -3010,14 +3086,18 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 4); memset(buffer+1, 'c', SIZE-1); 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 5); // force mroot to compact @@ -3036,10 +3116,14 @@ code = ''' lfsr_mdir_t old_mdir = mdir; mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR(LFSR_TAG_REG, 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + 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(LFSR_TAG_REG, 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, 0, + 0, (const char*)buffer+1, SIZE-1))) => 0; // assert we relocated assert(lfsr_mdir_cmp(&old_mdir, &mdir) != 0); @@ -3079,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(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0a", 2)))) => 0; + LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; assert(left.mdir.rbyd.weight == 2); lfsr_omdir_open(&lfs, &left); @@ -3087,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(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0d", 2)))) => 0; + LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "d", 1))) => 0; assert(right.mdir.rbyd.weight == 3); lfsr_omdir_open(&lfs, &right); @@ -3099,14 +3183,18 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 4); memset(buffer+1, 'c', SIZE-1); 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 5); // force mroot to compact @@ -3125,10 +3213,14 @@ code = ''' lfsr_mdir_t old_mdir = mdir; mdir.rbyd.eoff = -1; lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR(LFSR_TAG_REG, 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + 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(LFSR_TAG_REG, 0, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, 0, + 0, (const char*)buffer+1, SIZE-1))) => 0; // assert we relocated assert(lfsr_mdir_cmp(&old_mdir, &mdir) != 0); @@ -3166,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(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0a", 2)))) => 0; + LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; assert(left.mdir.rbyd.weight == 2); lfsr_omdir_open(&lfs, &left); @@ -3174,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(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0f", 2)))) => 0; + LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "f", 1))) => 0; assert(right.mdir.rbyd.weight == 3); lfsr_omdir_open(&lfs, &right); @@ -3186,14 +3278,18 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 4); memset(buffer+1, 'e', SIZE-1); 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 5); // force mroot to compact @@ -3205,7 +3301,9 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 4); // force mdir to compact @@ -3222,7 +3320,9 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); // force mdir to compact @@ -3268,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(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0a", 2)))) => 0; + LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "a", 1))) => 0; assert(left.mdir.rbyd.weight == 2); lfsr_omdir_open(&lfs, &left); @@ -3276,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(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0e", 2)))) => 0; + LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, "e", 1))) => 0; assert(right.mdir.rbyd.weight == 3); lfsr_omdir_open(&lfs, &right); @@ -3288,14 +3388,18 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 4); memset(buffer+1, 'd', SIZE-1); 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 5); // force mroot to compact @@ -3307,7 +3411,9 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 4); // force mdir to compact @@ -3366,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(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0a", 2)))) => 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 @@ -3606,14 +3712,18 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); memset(buffer+1, 'b', SIZE-1); 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 3); // force mroot to compact @@ -3749,14 +3859,18 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); memset(buffer+1, 'b', SIZE-1); 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 3); // force mroot to compact @@ -3773,7 +3887,9 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); // force mdir to compact @@ -3917,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(LFSR_TAG_REG, +1, LFSR_DATA_BUF("\0a", 2)))) => 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 @@ -4034,7 +4150,7 @@ code = ''' name[0] = '\0'; sprintf(name+1, "%03x", i); lfsr_mdir_t mdir; - lfsr_mtree_namelookup(&lfs, 0, (const char*)name+1, 3, + lfsr_mtree_namelookup(&lfs, 0, name+1, 3, &mdir, NULL, NULL) => LFS_ERR_NOENT; // force a compaction? if (FORCE_COMPACTION) { @@ -4042,7 +4158,7 @@ code = ''' mdir.rbyd.eoff = -1; } lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(name, 4)))) => 0; + LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, name+1, 3))) => 0; lfsr_data_t data; uint8_t buffer[256]; @@ -4192,7 +4308,7 @@ code = ''' name[0] = '\0'; sprintf(name+1, "%03x", x); lfsr_mdir_t mdir; - int err = lfsr_mtree_namelookup(&lfs, 0, (const char*)name+1, 3, + int err = lfsr_mtree_namelookup(&lfs, 0, name+1, 3, &mdir, NULL, NULL); assert(!err || err == LFS_ERR_NOENT); if (!err) { @@ -4204,7 +4320,7 @@ code = ''' mdir.rbyd.eoff = -1; } lfsr_mdir_commit(&lfs, &mdir, LFSR_RATTRS( - LFSR_RATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(name, 4)))) => 0; + LFSR_RATTR_NAME__(LFSR_TAG_REG, +1, 0, name+1, 3))) => 0; lfsr_data_t data; // double check @@ -4291,13 +4407,13 @@ code = ''' name[0] = '\0'; sprintf(name+1, "%03x", i); if (sim[i]) { - lfsr_mtree_namelookup(&lfs, 0, (const char*)name+1, 3, + lfsr_mtree_namelookup(&lfs, 0, name+1, 3, &mdir, NULL, NULL) => 0; lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, sizeof(buffer)) => 4; assert(memcmp(buffer, name, 4) == 0); } else { - lfsr_mtree_namelookup(&lfs, 0, (const char*)name+1, 3, + lfsr_mtree_namelookup(&lfs, 0, name+1, 3, &mdir, NULL, NULL) => LFS_ERR_NOENT; } } @@ -4315,13 +4431,13 @@ code = ''' name[0] = '\0'; sprintf(name+1, "%03x", i); if (sim[i]) { - lfsr_mtree_namelookup(&lfs, 0, (const char*)name+1, 3, + lfsr_mtree_namelookup(&lfs, 0, name+1, 3, &mdir, NULL, NULL) => 0; lfsr_mdir_lookup(&lfs, &mdir, LFSR_TAG_REG, &data) => 0; lfsr_data_read(&lfs, &data, buffer, sizeof(buffer)) => 4; assert(memcmp(buffer, name, 4) == 0); } else { - lfsr_mtree_namelookup(&lfs, 0, (const char*)name+1, 3, + lfsr_mtree_namelookup(&lfs, 0, name+1, 3, &mdir, NULL, NULL) => LFS_ERR_NOENT; } } @@ -4670,7 +4786,9 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); // force mroot to compact twice, this should extend the mroot @@ -4727,7 +4845,9 @@ 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(LFSR_TAG_REG, +1, LFSR_DATA_BUF(buffer, SIZE)))) => 0; + LFSR_RATTR_NAME__( + LFSR_TAG_REG, +1, + 0, (const char*)buffer+1, SIZE-1))) => 0; assert(mdir.rbyd.weight == 2); // force mroot to compact twice, this should extend the mroot diff --git a/tests/test_rbyd.toml b/tests/test_rbyd.toml index c5f6bbe0..e7b3c7aa 100644 --- a/tests/test_rbyd.toml +++ b/tests/test_rbyd.toml @@ -4137,17 +4137,17 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; assert(rbyd.weight == 1); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 1); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); @@ -4156,26 +4156,26 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); @@ -4184,35 +4184,35 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); ''' @@ -4239,17 +4239,17 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; assert(rbyd.weight == 1); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 1); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); @@ -4258,27 +4258,27 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); @@ -4287,27 +4287,27 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); @@ -4316,37 +4316,37 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); @@ -4355,37 +4355,37 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); @@ -4394,37 +4394,37 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); ''' @@ -4497,7 +4497,7 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)))) => 0; } @@ -4505,7 +4505,7 @@ code = ''' assert(rbyd.weight == N); for (unsigned j = 0; j < N; j++) { lfsr_rbyd_lookup(&lfs, &rbyd, - j, LFSR_TAG_REG, &data) => 0; + j, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, names[j % 6], 4) == 0); } @@ -4559,15 +4559,15 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 00000000, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -4575,7 +4575,7 @@ code = ''' assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -4587,7 +4587,7 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -4595,7 +4595,7 @@ code = ''' assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -4632,16 +4632,16 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -4649,7 +4649,7 @@ code = ''' assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -4661,7 +4661,7 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -4669,7 +4669,7 @@ code = ''' assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -4683,16 +4683,16 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -4700,7 +4700,7 @@ code = ''' assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -4712,7 +4712,7 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -4720,7 +4720,7 @@ code = ''' assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -4797,7 +4797,7 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)))) => 0; } @@ -4809,7 +4809,7 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == j); assert(lfsr_data_size(data_) == 4); @@ -4869,7 +4869,7 @@ code = ''' x = x % (rbyd.weight+1); int err = lfsr_rbyd_commit(&lfs, &rbyd, x, LFSR_RATTRS( - LFSR_RATTR(LFSR_TAG_REG, +1, LFSR_DATA_BUF(names[x % 6], 4)))); + LFSR_RATTR(LFSR_TAG_DATA, +1, LFSR_DATA_BUF(names[x % 6], 4)))); if (err == LFS_ERR_RANGE) { break; } @@ -4884,9 +4884,9 @@ code = ''' lfsr_data_t data_; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; for (uint16_t x = 0; x < rbyd.weight; x++) { - lfsr_rbyd_lookupnext(&lfs, &rbyd, x, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, x, LFSR_TAG_DATA, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == x); assert(lfsr_data_size(data_) == 4); } @@ -4917,14 +4917,14 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)))) => 0; assert(rbyd.weight == 1); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -4933,7 +4933,7 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 1); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -4945,26 +4945,26 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xbb\xbb", 2)))) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; @@ -4973,13 +4973,13 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; @@ -4991,61 +4991,61 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xbb\xbb", 2)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xcc\xcc", 2)))) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; @@ -5054,19 +5054,19 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; @@ -5096,7 +5096,7 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( @@ -5104,7 +5104,7 @@ code = ''' LFSR_DATA_BUF("\xaa\xaa", 2)))) => 0; assert(rbyd.weight == 1); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -5113,7 +5113,7 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 1); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -5125,7 +5125,7 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( @@ -5133,7 +5133,7 @@ code = ''' LFSR_DATA_BUF("\xaa\xaa", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR( @@ -5141,13 +5141,13 @@ code = ''' LFSR_DATA_BUF("\xbb\xbb", 2)))) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; @@ -5156,13 +5156,13 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; @@ -5174,7 +5174,7 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( @@ -5182,7 +5182,7 @@ code = ''' LFSR_DATA_BUF("\xbb\xbb", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( @@ -5190,13 +5190,13 @@ code = ''' LFSR_DATA_BUF("\xaa\xaa", 2)))) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; @@ -5205,13 +5205,13 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; @@ -5223,7 +5223,7 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( @@ -5231,7 +5231,7 @@ code = ''' LFSR_DATA_BUF("\xaa\xaa", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR( @@ -5239,7 +5239,7 @@ code = ''' LFSR_DATA_BUF("\xbb\xbb", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_RATTRS( LFSR_RATTR( @@ -5247,42 +5247,42 @@ code = ''' LFSR_DATA_BUF("\xcc\xcc", 2)))) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; @@ -5291,19 +5291,19 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; @@ -5315,7 +5315,7 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( @@ -5323,7 +5323,7 @@ code = ''' LFSR_DATA_BUF("\xbb\xbb", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR( @@ -5331,7 +5331,7 @@ code = ''' LFSR_DATA_BUF("\xcc\xcc", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( @@ -5339,19 +5339,19 @@ code = ''' LFSR_DATA_BUF("\xaa\xaa", 2)))) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; @@ -5360,19 +5360,19 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; @@ -5384,7 +5384,7 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( @@ -5392,7 +5392,7 @@ code = ''' LFSR_DATA_BUF("\xaa\xaa", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR( @@ -5400,7 +5400,7 @@ code = ''' LFSR_DATA_BUF("\xcc\xcc", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR( @@ -5408,19 +5408,19 @@ code = ''' LFSR_DATA_BUF("\xbb\xbb", 2)))) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; @@ -5429,19 +5429,19 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; @@ -5518,7 +5518,7 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)))) => 0; // note uattrs have a smaller size to help debugging for (unsigned u = 0; u < M; u++) { @@ -5532,7 +5532,7 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == N); for (unsigned j = 0; j < N; j++) { - lfsr_rbyd_lookup(&lfs, &rbyd, j, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, j, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, names[j % 6], 4) == 0); @@ -5593,13 +5593,13 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -5607,7 +5607,7 @@ code = ''' lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -5623,7 +5623,7 @@ code = ''' assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -5643,7 +5643,7 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -5659,7 +5659,7 @@ code = ''' assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -5704,7 +5704,7 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( @@ -5712,7 +5712,7 @@ code = ''' LFSR_DATA_BUF("\xaa\xaa", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR( @@ -5721,7 +5721,7 @@ code = ''' lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -5737,7 +5737,7 @@ code = ''' assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -5757,7 +5757,7 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -5773,7 +5773,7 @@ code = ''' assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -5795,7 +5795,7 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( @@ -5803,7 +5803,7 @@ code = ''' LFSR_DATA_BUF("\xbb\xbb", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( @@ -5812,7 +5812,7 @@ code = ''' lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -5828,7 +5828,7 @@ code = ''' assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -5848,7 +5848,7 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -5864,7 +5864,7 @@ code = ''' assert(memcmp(buffer, "\xaa\xaa", 2) == 0); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; @@ -5950,7 +5950,7 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)))) => 0; // note uattrs have a smaller size to help debugging for (unsigned u = 0; u < M; u++) { @@ -5970,7 +5970,7 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == j); assert(lfsr_data_size(data_) == 4); @@ -6040,7 +6040,7 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF(names[j % 6], 4)))) => 0; // note uattrs have a smaller size to help debugging for (unsigned u = 0; u < M; u++) { @@ -6096,7 +6096,7 @@ code = ''' // check that all tags have been updated lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; for (unsigned j = 0; j < N; j++) { - lfsr_rbyd_lookup(&lfs, &rbyd, j, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, j, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, names[j % 6], 4) == 0); @@ -6207,7 +6207,7 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)))) => 0; // note uattrs have a smaller size to help debugging for (unsigned u = 0; u < M; u++) { @@ -6244,7 +6244,7 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], CFG->block_size) => 0; for (unsigned k = 0; k < N; k++) { - lfsr_rbyd_lookup(&lfs, &rbyd, k, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, k, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, names[k % 6], 4) == 0); @@ -6258,7 +6258,7 @@ code = ''' assert(err == LFS_ERR_NOENT); } else if (u == M-1) { assert(err == 0); - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == k+1); assert(lfsr_data_size(data_) == 4); } else { @@ -6288,7 +6288,7 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], CFG->block_size) => 0; for (unsigned k = 0; k < N; k++) { - lfsr_rbyd_lookup(&lfs, &rbyd, k, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, k, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, names[k % 6], 4) == 0); @@ -6387,7 +6387,7 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF(names[j % 6], 4)))) => 0; // note uattrs have a smaller size to help debugging for (unsigned u = 0; u < M; u++) { @@ -6443,7 +6443,7 @@ code = ''' // check that all tags have been removed lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; for (unsigned j = 0; j < N; j++) { - lfsr_rbyd_lookup(&lfs, &rbyd, j, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, j, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, names[j % 6], 4) == 0); @@ -6529,7 +6529,7 @@ code = ''' // it should fail atomically struct lfsr_rattr rattrs[1+M]; rattrs[0] = LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF(names[x % 6], 4)); for (unsigned u = 0; u < M; u++) { rattrs[1+u] = LFSR_RATTR( @@ -6552,9 +6552,9 @@ code = ''' lfsr_data_t data_; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; for (uint16_t x = 0; x < rbyd.weight; x++) { - lfsr_rbyd_lookupnext(&lfs, &rbyd, x, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, x, LFSR_TAG_DATA, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == x); assert(lfsr_data_size(data_) == 4); @@ -6645,7 +6645,7 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)))) => 0; } @@ -6660,7 +6660,7 @@ code = ''' } for (unsigned j = 0; j < N; j++) { lfsr_rbyd_lookup(&lfs, &rbyd, - j, LFSR_TAG_REG, &data) => 0; + j, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, names[j % 6], 4) == 0); } @@ -6683,7 +6683,7 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == j); assert(lfsr_data_size(data_) == 4); @@ -6791,7 +6791,7 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)))) => 0; for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( @@ -6811,7 +6811,7 @@ code = ''' assert(memcmp(buffer, names[j % 6], 1) == 0); } for (unsigned j = 0; j < N; j++) { - lfsr_rbyd_lookup(&lfs, &rbyd, j, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, j, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, names[j % 6], 4) == 0); @@ -6841,7 +6841,7 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == j); assert(lfsr_data_size(data_) == 4); @@ -6911,27 +6911,27 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 1); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 1); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; // try to delete the other rid @@ -6939,27 +6939,27 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 1); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 1); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; // try to delete the largest of three @@ -6967,34 +6967,34 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_RATTRS( LFSR_RATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; // try to delete the smallest of three @@ -7002,34 +7002,34 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; // try to delete the middle @@ -7037,34 +7037,34 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; ''' @@ -7090,13 +7090,13 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -7105,26 +7105,26 @@ code = ''' LFSR_RATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 1); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 1); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; @@ -7134,13 +7134,13 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -7149,26 +7149,26 @@ code = ''' LFSR_RATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 1); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 1); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; @@ -7178,19 +7178,19 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xbb\xbb", 2)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -7199,38 +7199,38 @@ code = ''' LFSR_RATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; @@ -7240,19 +7240,19 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xbb\xbb", 2)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -7261,38 +7261,38 @@ code = ''' LFSR_RATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xcc\xcc", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xbb\xbb\xbb\xbb", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xbb\xbb", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xcc\xcc", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; @@ -7302,19 +7302,19 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xbb\xbb", 2)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -7323,38 +7323,38 @@ code = ''' LFSR_RATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xcc\xcc", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xcc\xcc", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; @@ -7392,7 +7392,7 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -7413,13 +7413,13 @@ code = ''' LFSR_TAG_ATTR(6), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xcc\xcc", 2)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -7454,7 +7454,7 @@ code = ''' LFSR_RATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -7475,7 +7475,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; @@ -7496,14 +7496,14 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -7524,7 +7524,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; @@ -7545,7 +7545,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; @@ -7553,11 +7553,11 @@ code = ''' // try to recreate lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -7578,10 +7578,10 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; @@ -7602,14 +7602,14 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -7630,10 +7630,10 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(3), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; @@ -7654,7 +7654,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; @@ -7690,7 +7690,7 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -7699,7 +7699,7 @@ code = ''' LFSR_TAG_ATTR(2), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -7739,14 +7739,14 @@ code = ''' LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_RATTR( - LFSR_TAG_REG, 0, + LFSR_TAG_DATA, 0, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -7764,7 +7764,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; @@ -7782,14 +7782,14 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -7807,7 +7807,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; @@ -7825,7 +7825,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; @@ -7833,11 +7833,11 @@ code = ''' // try to recreate lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -7855,10 +7855,10 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; @@ -7876,14 +7876,14 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -7901,10 +7901,10 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; @@ -7922,7 +7922,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(5), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; @@ -7958,7 +7958,7 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( LFSR_TAG_ATTR(3), 0, @@ -7967,7 +7967,7 @@ code = ''' LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -8024,7 +8024,7 @@ code = ''' LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_RATTR( - LFSR_TAG_REG, 0, + LFSR_TAG_DATA, 0, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_RATTRS( LFSR_RATTR( @@ -8042,7 +8042,7 @@ code = ''' LFSR_RATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -8069,7 +8069,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(8), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; @@ -8096,14 +8096,14 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(8), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -8130,7 +8130,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(8), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; @@ -8157,7 +8157,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(8), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; @@ -8165,11 +8165,11 @@ code = ''' // try to recreate lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -8196,10 +8196,10 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(8), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; @@ -8226,14 +8226,14 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(8), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -8260,10 +8260,10 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(8), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; @@ -8290,7 +8290,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(8), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; @@ -8329,7 +8329,7 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -8344,7 +8344,7 @@ code = ''' LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_RATTR( LFSR_TAG_ATTR(4), +1, @@ -8390,18 +8390,18 @@ code = ''' LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_RATTR( - LFSR_TAG_REG, 0, + LFSR_TAG_DATA, 0, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)), // propagate yellow LFSR_RATTR( - LFSR_TAG_REG, 0, + LFSR_TAG_DATA, 0, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -8422,7 +8422,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; @@ -8452,14 +8452,14 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(9), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -8480,7 +8480,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; @@ -8510,7 +8510,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(9), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; @@ -8518,11 +8518,11 @@ code = ''' // try to recreate lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -8543,10 +8543,10 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; @@ -8576,14 +8576,14 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(9), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -8604,10 +8604,10 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; @@ -8637,7 +8637,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(9), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; @@ -8676,7 +8676,7 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -8694,7 +8694,7 @@ code = ''' LFSR_TAG_ATTR(9), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_RATTR( LFSR_TAG_ATTR(2), +1, @@ -8724,7 +8724,7 @@ code = ''' LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_RATTR( - LFSR_TAG_REG, 0, + LFSR_TAG_DATA, 0, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( @@ -8748,7 +8748,7 @@ code = ''' LFSR_RATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -8778,7 +8778,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(9), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; @@ -8799,14 +8799,14 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -8836,7 +8836,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(9), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; @@ -8857,7 +8857,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; @@ -8865,11 +8865,11 @@ code = ''' // try to recreate lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -8899,10 +8899,10 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(9), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; @@ -8923,14 +8923,14 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -8960,10 +8960,10 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(9), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; @@ -8984,7 +8984,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; @@ -9023,7 +9023,7 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -9038,7 +9038,7 @@ code = ''' LFSR_TAG_ATTR(4), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_RATTR( LFSR_TAG_ATTR(2), +1, @@ -9078,7 +9078,7 @@ code = ''' LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_RATTR( - LFSR_TAG_REG, 0, + LFSR_TAG_DATA, 0, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR( @@ -9096,7 +9096,7 @@ code = ''' LFSR_RATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -9117,7 +9117,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; @@ -9141,14 +9141,14 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -9169,7 +9169,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; @@ -9193,7 +9193,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; @@ -9201,11 +9201,11 @@ code = ''' // try to recreate lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -9226,10 +9226,10 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; @@ -9253,14 +9253,14 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -9281,10 +9281,10 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; @@ -9308,7 +9308,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; @@ -9347,7 +9347,7 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -9395,7 +9395,7 @@ code = ''' LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_RATTR( - LFSR_TAG_REG, 0, + LFSR_TAG_DATA, 0, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( @@ -9409,18 +9409,18 @@ code = ''' LFSR_DATA_BUF("\xaa\xaa", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, 0, + LFSR_TAG_DATA, 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), // propagate yellow LFSR_RATTR( - LFSR_TAG_REG, 0, + LFSR_TAG_DATA, 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -9444,7 +9444,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; @@ -9465,14 +9465,14 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -9496,7 +9496,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; @@ -9517,7 +9517,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; @@ -9525,11 +9525,11 @@ code = ''' // try to recreate lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -9553,10 +9553,10 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; @@ -9577,14 +9577,14 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -9608,10 +9608,10 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(7), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; @@ -9632,7 +9632,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; @@ -9673,7 +9673,7 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -9700,7 +9700,7 @@ code = ''' LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("\xcc\xcc", 2)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -9758,11 +9758,11 @@ code = ''' LFSR_DATA_BUF("\xaa\xaa", 2)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, 0, + LFSR_TAG_DATA, 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), // propagate yellow LFSR_RATTR( - LFSR_TAG_REG, 0, + LFSR_TAG_DATA, 0, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( @@ -9787,7 +9787,7 @@ code = ''' LFSR_RATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -9832,7 +9832,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(14), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; @@ -9853,14 +9853,14 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -9905,7 +9905,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(14), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; @@ -9926,7 +9926,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; @@ -9934,11 +9934,11 @@ code = ''' // try to recreate lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -9983,10 +9983,10 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(14), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; @@ -10007,14 +10007,14 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -10059,10 +10059,10 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(14), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; @@ -10083,7 +10083,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; @@ -10124,7 +10124,7 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -10145,7 +10145,7 @@ code = ''' LFSR_TAG_ATTR(6), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -10218,7 +10218,7 @@ code = ''' LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xee\xee", 2)), LFSR_RATTR( - LFSR_TAG_REG, 0, + LFSR_TAG_DATA, 0, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_RATTRS( LFSR_RATTR( @@ -10236,7 +10236,7 @@ code = ''' LFSR_RATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -10257,7 +10257,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; @@ -10302,14 +10302,14 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(14), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -10330,7 +10330,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), &data) => 0; @@ -10375,7 +10375,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(14), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; @@ -10383,11 +10383,11 @@ code = ''' // try to recreate lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -10408,10 +10408,10 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; @@ -10456,14 +10456,14 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(14), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 3); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(1), &data) => 0; @@ -10484,10 +10484,10 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_ATTR(6), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xaa\xaa", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, "\xee\xee\xee\xee", 4) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(1), &data) => 0; @@ -10532,7 +10532,7 @@ code = ''' lfsr_rbyd_lookup(&lfs, &rbyd, 2, LFSR_TAG_ATTR(14), &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 2; assert(memcmp(buffer, "\xee\xee", 2) == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 3, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; @@ -10609,7 +10609,7 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)))) => 0; } assert(rbyd.weight == N); @@ -10640,7 +10640,7 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], CFG->block_size) => 0; assert(rbyd.weight == N-1); for (unsigned k = 0; k < N-1; k++) { - lfsr_rbyd_lookup(&lfs, &rbyd, k, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, k, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; if (k >= j) { assert(memcmp(buffer, names[(k+1) % 6], 4) == 0); @@ -10648,14 +10648,14 @@ code = ''' assert(memcmp(buffer, names[k % 6], 4) == 0); } } - lfsr_rbyd_lookup(&lfs, &rbyd, N-1, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, N-1, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; // 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_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF(names[j % 6], 6)))) => 0; assert(rbyd.weight == N); @@ -10663,11 +10663,11 @@ code = ''' assert(rbyd.weight == N); for (unsigned k = 0; k < N; k++) { if (k == j) { - lfsr_rbyd_lookup(&lfs, &rbyd, k, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, k, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 6) => 6; assert(memcmp(buffer, names[k % 6], 6) == 0); } else { - lfsr_rbyd_lookup(&lfs, &rbyd, k, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, k, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 6) => 4; assert(memcmp(buffer, names[k % 6], 4) == 0); } @@ -10771,7 +10771,7 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)))) => 0; // note uattrs have a smaller size to help debugging for (unsigned u = 0; u < M; u++) { @@ -10809,7 +10809,7 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], CFG->block_size) => 0; assert(rbyd.weight == N-1); for (unsigned k = 0; k < N-1; k++) { - lfsr_rbyd_lookup(&lfs, &rbyd, k, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, k, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; if (k >= j) { assert(memcmp(buffer, names[(k+1) % 6], 4) == 0); @@ -10828,7 +10828,7 @@ code = ''' } } } - lfsr_rbyd_lookup(&lfs, &rbyd, N-1, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, N-1, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, N-1, LFSR_TAG_ATTR(1), &data) => LFS_ERR_NOENT; @@ -10837,7 +10837,7 @@ code = ''' printf("--- create: %d ---\n", j); lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF(names[j % 6], 6)))) => 0; for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS( @@ -10851,7 +10851,7 @@ code = ''' assert(rbyd.weight == N); for (unsigned k = 0; k < N; k++) { if (k == j) { - lfsr_rbyd_lookup(&lfs, &rbyd, k, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, k, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 6) => 6; assert(memcmp(buffer, names[k % 6], 6) == 0); @@ -10862,7 +10862,7 @@ code = ''' assert(memcmp(buffer, names[k % 6], 3) == 0); } } else { - lfsr_rbyd_lookup(&lfs, &rbyd, k, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, k, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 6) => 4; assert(memcmp(buffer, names[k % 6], 4) == 0); @@ -10971,7 +10971,7 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)))) => 0; } assert(rbyd.weight == N); @@ -11008,7 +11008,7 @@ code = ''' for (unsigned k = 0; k < N-1; k++) { lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == k); assert(lfsr_data_size(data_) == 4); @@ -11101,7 +11101,7 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)))) => 0; // note uattrs have a smaller size to help debugging for (unsigned u = 0; u < M; u++) { @@ -11145,7 +11145,7 @@ code = ''' for (unsigned k = 0; k < N-1; k++) { lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, NULL, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == k); assert(lfsr_data_size(data_) == 4); @@ -11206,18 +11206,18 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; // create and delete two ids @@ -11225,22 +11225,22 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()), LFSR_RATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; // create and delete two ids in the other order @@ -11248,10 +11248,10 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; @@ -11259,12 +11259,12 @@ code = ''' LFSR_RATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; // create and delete three ids @@ -11272,13 +11272,13 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 2, LFSR_RATTRS( LFSR_RATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()), @@ -11286,12 +11286,12 @@ code = ''' LFSR_RATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; // create and delete three ids in the other order @@ -11299,13 +11299,13 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; @@ -11315,12 +11315,12 @@ code = ''' LFSR_RATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; ''' @@ -11346,7 +11346,7 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -11355,12 +11355,12 @@ code = ''' LFSR_RATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; // create and delete two ids @@ -11368,13 +11368,13 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -11384,12 +11384,12 @@ code = ''' LFSR_RATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; // create and delete two ids in the other order @@ -11397,13 +11397,13 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -11414,12 +11414,12 @@ code = ''' LFSR_RATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; // create and delete three ids @@ -11427,19 +11427,19 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xbb\xbb", 2)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -11450,12 +11450,12 @@ code = ''' LFSR_RATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; // create and delete three ids in the other order @@ -11463,19 +11463,19 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xaa\xaa", 2)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xbb\xbb", 2)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -11488,12 +11488,12 @@ code = ''' LFSR_RATTR(LFSR_TAG_RM, -1, LFSR_DATA_NULL()))) => 0; assert(rbyd.weight == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 0); - lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookup(&lfs, &rbyd, 0, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; ''' @@ -11541,7 +11541,7 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF(names[j % 6], 4)))) => 0; } assert(rbyd.weight == N); @@ -11600,24 +11600,24 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 0); lfsr_rbyd_lookup(&lfs, &rbyd, - LFSR_TAG_REG, 0, + LFSR_TAG_DATA, 0, &data) => LFS_ERR_NOENT; // try resuming from all tags being removed lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa\xaa\xaa", 6)))) => 0; assert(rbyd.weight == 1); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 1); lfsr_rbyd_lookup(&lfs, &rbyd, - 0, LFSR_TAG_REG, &data) => 0; + 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 6) => 6; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa\xaa\xaa", 6) == 0); lfsr_rbyd_lookup(&lfs, &rbyd, - 1, LFSR_TAG_REG, + 1, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; // keep track of the worst size @@ -11690,7 +11690,7 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_commit(&lfs, &rbyd, j, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF(names[j % 6], 4)))) => 0; // note uattrs have a smaller size to help debugging for (unsigned u = 0; u < M; u++) { @@ -11756,13 +11756,13 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 0); lfsr_rbyd_lookup(&lfs, &rbyd, - 0, LFSR_TAG_REG, + 0, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; // try resuming from all tags being removed lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa\xaa\xaa", 6)))) => 0; for (unsigned u = 0; u < M; u++) { lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( @@ -11775,7 +11775,7 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == 1); lfsr_rbyd_lookup(&lfs, &rbyd, - 0, LFSR_TAG_REG, &data) => 0; + 0, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 6) => 6; assert(memcmp(buffer, "\xaa\xaa\xaa\xaa\xaa\xaa", 6) == 0); for (unsigned u = 0; u < M; u++) { @@ -11785,7 +11785,7 @@ code = ''' assert(memcmp(buffer, "\xaa\xaa\xaa", 3) == 0); } lfsr_rbyd_lookup(&lfs, &rbyd, - 1, LFSR_TAG_REG, + 1, LFSR_TAG_DATA, &data) => LFS_ERR_NOENT; lfsr_rbyd_lookup(&lfs, &rbyd, 1, LFSR_TAG_ATTR(1), @@ -11883,7 +11883,7 @@ code = ''' // update our rbyd lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF(&(uint8_t){'a'+(i % 26)}, 1)))) => 0; } else { // update our sim @@ -11906,7 +11906,7 @@ code = ''' printf("]\n"); printf("rbyd: ["); for (lfs_ssize_t rid = 0; rid < (lfs_ssize_t)rbyd.weight; rid++) { - int err = lfsr_rbyd_lookup(&lfs, &rbyd, rid, LFSR_TAG_REG, + int err = lfsr_rbyd_lookup(&lfs, &rbyd, rid, LFSR_TAG_DATA, &data); if (!err) { lfs_ssize_t size = lfsr_data_read(&lfs, &data, buffer, 4); @@ -11922,7 +11922,7 @@ code = ''' assert(count == rbyd.weight); for (lfs_ssize_t rid = 0; rid < (lfs_ssize_t)count; rid++) { - lfsr_rbyd_lookup(&lfs, &rbyd, rid, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, rid, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 1; assert(memcmp(&sim[rid], buffer, 1) == 0); } @@ -11957,20 +11957,20 @@ code = ''' lfsr_bd_erase(&lfs, rbyd.blocks[0]) => 0; lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)))) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); @@ -11978,32 +11978,32 @@ code = ''' // make id2 with weight w2 lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +2, + LFSR_TAG_DATA, +2, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)))) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); @@ -12011,44 +12011,44 @@ code = ''' // make id5 with weight w3 lfsr_rbyd_commit(&lfs, &rbyd, 3, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +3, + LFSR_TAG_DATA, +3, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); @@ -12056,56 +12056,56 @@ code = ''' // make id9 with weight w4 lfsr_rbyd_commit(&lfs, &rbyd, 6, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +4, + LFSR_TAG_DATA, +4, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)))) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); assert(lfsr_data_size(data_) == 4); @@ -12113,68 +12113,68 @@ code = ''' // make id14 with weight w5 lfsr_rbyd_commit(&lfs, &rbyd, 10, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +5, + LFSR_TAG_DATA, +5, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)))) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 14, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 14, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 14); assert(weight_ == 5); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 14, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 14, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 14); assert(weight_ == 5); assert(lfsr_data_size(data_) == 4); @@ -12204,53 +12204,53 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, 0, LFSR_RATTRS( // make id0 with weight w1 LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), // make id2 with weight w2 LFSR_RATTR( - LFSR_TAG_REG, +2, + LFSR_TAG_DATA, +2, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), // make id5 with weight w3 LFSR_RATTR( - LFSR_TAG_REG, +3, + LFSR_TAG_DATA, +3, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), // make id9 with weight w4 LFSR_RATTR( - LFSR_TAG_REG, +4, + LFSR_TAG_DATA, +4, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)), // make id14 with weight w5 LFSR_RATTR( - LFSR_TAG_REG, +5, + LFSR_TAG_DATA, +5, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)))) => 0; // traverse, finding tags and weights lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 14); assert(weight_ == 5); assert(lfsr_data_size(data_) == 4); @@ -12260,31 +12260,31 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); assert(lfsr_data_size(data_) == 4); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 14); assert(weight_ == 5); assert(lfsr_data_size(data_) == 4); @@ -12361,21 +12361,21 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, rid*W, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +W, + LFSR_TAG_DATA, +W, LFSR_DATA_BUF(names[perm[j] % 6], 4)))) => 0; } lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], 0) => 0; assert(rbyd.weight == N*W); for (unsigned j = 0; j < N; j++) { - lfsr_rbyd_lookupnext(&lfs, &rbyd, j*W+W-1, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, j*W+W-1, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == j*W+W-1); assert(weight_ == W); assert(lfsr_data_size(data_) == 4); - lfsr_rbyd_lookup(&lfs, &rbyd, j*W+W-1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, j*W+W-1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, names[j % 6], 4) == 0); } @@ -12451,7 +12451,7 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, rid*W, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +W, + LFSR_TAG_DATA, +W, LFSR_DATA_BUF(names[perm[j] % 6], 4)))) => 0; } @@ -12463,7 +12463,7 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == j*W+W-1); assert(weight_ == W); assert(lfsr_data_size(data_) == 4); @@ -12505,7 +12505,7 @@ code = ''' LFSR_TAG_ATTR(3), 0, LFSR_DATA_BUF("unrelated", 9)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -12520,9 +12520,9 @@ code = ''' assert(rid_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); @@ -12546,9 +12546,9 @@ code = ''' assert(rid_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); @@ -12568,7 +12568,7 @@ code = ''' // make id2 with weight w2 lfsr_rbyd_commit(&lfs, &rbyd, 1, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -12586,9 +12586,9 @@ code = ''' assert(rid_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); @@ -12604,9 +12604,9 @@ code = ''' assert(rid_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); @@ -12630,9 +12630,9 @@ code = ''' assert(rid_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); @@ -12648,9 +12648,9 @@ code = ''' assert(rid_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); @@ -12670,7 +12670,7 @@ code = ''' // make id5 with weight w3 lfsr_rbyd_commit(&lfs, &rbyd, 3, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -12688,9 +12688,9 @@ code = ''' assert(rid_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); @@ -12706,9 +12706,9 @@ code = ''' assert(rid_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); @@ -12724,9 +12724,9 @@ code = ''' assert(rid_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); @@ -12750,9 +12750,9 @@ code = ''' assert(rid_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); @@ -12768,9 +12768,9 @@ code = ''' assert(rid_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); @@ -12786,9 +12786,9 @@ code = ''' assert(rid_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); @@ -12808,7 +12808,7 @@ code = ''' // make id9 with weight w4 lfsr_rbyd_commit(&lfs, &rbyd, 6, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -12826,9 +12826,9 @@ code = ''' assert(rid_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); @@ -12844,9 +12844,9 @@ code = ''' assert(rid_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); @@ -12862,9 +12862,9 @@ code = ''' assert(rid_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); @@ -12880,9 +12880,9 @@ code = ''' assert(rid_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); assert(lfsr_data_size(data_) == 4); @@ -12906,9 +12906,9 @@ code = ''' assert(rid_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); @@ -12924,9 +12924,9 @@ code = ''' assert(rid_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); @@ -12942,9 +12942,9 @@ code = ''' assert(rid_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); @@ -12960,9 +12960,9 @@ code = ''' assert(rid_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); assert(lfsr_data_size(data_) == 4); @@ -12982,7 +12982,7 @@ code = ''' // make id14 with weight w5 lfsr_rbyd_commit(&lfs, &rbyd, 10, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -13000,9 +13000,9 @@ code = ''' assert(rid_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); @@ -13018,9 +13018,9 @@ code = ''' assert(rid_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); @@ -13036,9 +13036,9 @@ code = ''' assert(rid_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); @@ -13054,9 +13054,9 @@ code = ''' assert(rid_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); assert(lfsr_data_size(data_) == 4); @@ -13072,9 +13072,9 @@ code = ''' assert(rid_ == 9); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 14, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 14, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 14); assert(weight_ == 5); assert(lfsr_data_size(data_) == 4); @@ -13098,9 +13098,9 @@ code = ''' assert(rid_ == -1); assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); @@ -13116,9 +13116,9 @@ code = ''' assert(rid_ == 0); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 2, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); @@ -13134,9 +13134,9 @@ code = ''' assert(rid_ == 2); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 5, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); @@ -13152,9 +13152,9 @@ code = ''' assert(rid_ == 5); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 9, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); assert(lfsr_data_size(data_) == 4); @@ -13170,9 +13170,9 @@ code = ''' assert(rid_ == 9); assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 14, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 14, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 14); assert(weight_ == 5); assert(lfsr_data_size(data_) == 4); @@ -13217,7 +13217,7 @@ code = ''' LFSR_DATA_BUF("unrelated", 9)), // make id0 with weight w1 LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -13227,7 +13227,7 @@ code = ''' LFSR_DATA_BUF("\xaa\xaa", 2)), // make id2 with weight w2 LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -13240,7 +13240,7 @@ code = ''' LFSR_DATA_BUF("\xbb\xbb", 2)), // make id5 with weight w3 LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -13253,7 +13253,7 @@ code = ''' LFSR_DATA_BUF("\xcc\xcc", 2)), // make id9 with weight w4 LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -13266,7 +13266,7 @@ code = ''' LFSR_DATA_BUF("\xdd\xdd", 2)), // make id14 with weight w5 LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xee\xee\xee\xee", 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -13287,7 +13287,7 @@ code = ''' assert(lfsr_data_size(data_) == 9); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); @@ -13305,7 +13305,7 @@ code = ''' assert(lfsr_data_size(data_) == 2); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); @@ -13323,7 +13323,7 @@ code = ''' assert(lfsr_data_size(data_) == 2); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); @@ -13341,7 +13341,7 @@ code = ''' assert(lfsr_data_size(data_) == 2); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); assert(lfsr_data_size(data_) == 4); @@ -13359,7 +13359,7 @@ code = ''' assert(lfsr_data_size(data_) == 2); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 14); assert(weight_ == 5); assert(lfsr_data_size(data_) == 4); @@ -13387,7 +13387,7 @@ code = ''' assert(lfsr_data_size(data_) == 9); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 0); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); @@ -13405,7 +13405,7 @@ code = ''' assert(lfsr_data_size(data_) == 2); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 2); assert(weight_ == 2); assert(lfsr_data_size(data_) == 4); @@ -13423,7 +13423,7 @@ code = ''' assert(lfsr_data_size(data_) == 2); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 5); assert(weight_ == 3); assert(lfsr_data_size(data_) == 4); @@ -13441,7 +13441,7 @@ code = ''' assert(lfsr_data_size(data_) == 2); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 9); assert(weight_ == 4); assert(lfsr_data_size(data_) == 4); @@ -13459,7 +13459,7 @@ code = ''' assert(lfsr_data_size(data_) == 2); lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == 14); assert(weight_ == 5); assert(lfsr_data_size(data_) == 4); @@ -13553,7 +13553,7 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, rid*W, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -13575,9 +13575,9 @@ code = ''' assert(weight_ == 0); assert(lfsr_data_size(data_) == 9); for (unsigned j = 0; j < N; j++) { - lfsr_rbyd_lookupnext(&lfs, &rbyd, j*W+W-1, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, j*W+W-1, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == j*W+W-1); assert(weight_ == W); assert(lfsr_data_size(data_) == 4); @@ -13594,7 +13594,7 @@ code = ''' assert(weight_ == 0); assert(lfsr_data_size(data_) == 2); - lfsr_rbyd_lookup(&lfs, &rbyd, j*W+W-1, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, j*W+W-1, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, names[j % 6], 4) == 0); } @@ -13675,7 +13675,7 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, rid*W, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)), LFSR_RATTR( LFSR_TAG_ATTR(1), 0, @@ -13702,7 +13702,7 @@ code = ''' for (unsigned j = 0; j < N; j++) { lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == j*W+W-1); assert(weight_ == W); assert(lfsr_data_size(data_) == 4); @@ -13802,7 +13802,7 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, rid*W, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +W, + LFSR_TAG_DATA, +W, LFSR_DATA_BUF(names[perm[j] % 6], 4)))) => 0; } assert(rbyd.weight == N*W); @@ -13834,23 +13834,23 @@ code = ''' assert(rbyd.weight == N*W+D); for (unsigned k = 0; k < N; k++) { if (k == j) { - lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1+D, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1+D, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == k*W+W-1+D); assert(weight_ == W+D); assert(lfsr_data_size(data_) == 4); } else if (k > j) { - lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1+D, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1+D, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == k*W+W-1+D); assert(weight_ == W); assert(lfsr_data_size(data_) == 4); } else { - lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == k*W+W-1); assert(weight_ == W); assert(lfsr_data_size(data_) == 4); @@ -13934,7 +13934,7 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, rid*W, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +W, + LFSR_TAG_DATA, +W, LFSR_DATA_BUF(names[perm[j] % 6], 4)))) => 0; } assert(rbyd.weight == N*W); @@ -13960,7 +13960,7 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, j*W+W-1, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_GROW | LFSR_TAG_REG, +D, + LFSR_TAG_GROW | LFSR_TAG_DATA, +D, LFSR_DATA_BUF(names[j % 6], 6)))) => 0; assert(rbyd.weight == N*W+D); @@ -13968,9 +13968,9 @@ code = ''' assert(rbyd.weight == N*W+D); for (unsigned k = 0; k < N; k++) { if (k == j) { - lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1+D, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1+D, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == k*W+W-1+D); assert(weight_ == W+D); assert(lfsr_data_size(data_) == 6); @@ -13979,9 +13979,9 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, 6) => 6; assert(memcmp(buffer, names[k % 6], 6) == 0); } else if (k > j) { - lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1+D, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1+D, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == k*W+W-1+D); assert(weight_ == W); assert(lfsr_data_size(data_) == 4); @@ -13990,9 +13990,9 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, 6) => 4; assert(memcmp(buffer, names[k % 6], 4) == 0); } else { - lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == k*W+W-1); assert(weight_ == W); assert(lfsr_data_size(data_) == 4); @@ -14235,7 +14235,7 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, rid*W, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +W, + LFSR_TAG_DATA, +W, LFSR_DATA_BUF(names[perm[j] % 6], 4)))) => 0; } assert(rbyd.weight == N*W); @@ -14267,23 +14267,23 @@ code = ''' assert(rbyd.weight == N*W-D); for (unsigned k = 0; k < N; k++) { if (k == j) { - lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1-D, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1-D, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == k*W+W-1-D); assert(weight_ == W-D); assert(lfsr_data_size(data_) == 4); } else if (k > j) { - lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1-D, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1-D, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == k*W+W-1-D); assert(weight_ == W); assert(lfsr_data_size(data_) == 4); } else { - lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == k*W+W-1); assert(weight_ == W); assert(lfsr_data_size(data_) == 4); @@ -14367,7 +14367,7 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, rid*W, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +W, + LFSR_TAG_DATA, +W, LFSR_DATA_BUF(names[perm[j] % 6], 4)))) => 0; } assert(rbyd.weight == N*W); @@ -14393,7 +14393,7 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, j*W+W-1, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_GROW | LFSR_TAG_REG, -D, + LFSR_TAG_GROW | LFSR_TAG_DATA, -D, LFSR_DATA_BUF(names[j % 6], 6)))) => 0; assert(rbyd.weight == N*W-D); @@ -14401,9 +14401,9 @@ code = ''' assert(rbyd.weight == N*W-D); for (unsigned k = 0; k < N; k++) { if (k == j) { - lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1-D, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1-D, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == k*W+W-1-D); assert(weight_ == W-D); assert(lfsr_data_size(data_) == 6); @@ -14412,9 +14412,9 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, 6) => 6; assert(memcmp(buffer, names[k % 6], 6) == 0); } else if (k > j) { - lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1-D, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1-D, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == k*W+W-1-D); assert(weight_ == W); assert(lfsr_data_size(data_) == 4); @@ -14423,9 +14423,9 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, 6) => 4; assert(memcmp(buffer, names[k % 6], 4) == 0); } else { - lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == k*W+W-1); assert(weight_ == W); assert(lfsr_data_size(data_) == 4); @@ -14667,7 +14667,7 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, rid*W, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +W, + LFSR_TAG_DATA, +W, LFSR_DATA_BUF(names[perm[j] % 6], 4)))) => 0; } assert(rbyd.weight == N*W); @@ -14699,9 +14699,9 @@ code = ''' assert(rbyd.weight == (N-1)*W); for (unsigned k = 0; k < N-1; k++) { if (k >= j) { - lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == k*W+W-1); assert(weight_ == W); assert(lfsr_data_size(data_) == 4); @@ -14710,9 +14710,9 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, 4) => 4; assert(memcmp(buffer, names[(k+1) % 6], 4) == 0); } else { - lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == k*W+W-1); assert(weight_ == W); assert(lfsr_data_size(data_) == 4); @@ -14727,7 +14727,7 @@ code = ''' printf("--- create: %d ---\n", j); lfsr_rbyd_commit(&lfs, &rbyd, j*W, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +W, + LFSR_TAG_DATA, +W, LFSR_DATA_BUF(names[j % 6], 6)))) => 0; assert(rbyd.weight == N*W); @@ -14735,9 +14735,9 @@ code = ''' assert(rbyd.weight == N*W); for (unsigned k = 0; k < N; k++) { if (k == j) { - lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == k*W+W-1); assert(weight_ == W); assert(lfsr_data_size(data_) == 6); @@ -14746,9 +14746,9 @@ code = ''' lfsr_data_read(&lfs, &data, buffer, 6) => 6; assert(memcmp(buffer, names[k % 6], 6) == 0); } else { - lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == k*W+W-1); assert(weight_ == W); assert(lfsr_data_size(data_) == 4); @@ -14831,7 +14831,7 @@ code = ''' lfsr_rbyd_commit(&lfs, &rbyd, rid*W, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +W, + LFSR_TAG_DATA, +W, LFSR_DATA_BUF(names[perm[j] % 6], 4)))) => 0; } assert(rbyd.weight == N*W); @@ -14865,9 +14865,9 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], CFG->block_size) => 0; assert(rbyd.weight == N*W); for (unsigned k = 0; k < N; k++) { - lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == k*W+W-1); assert(weight_ == W); assert(lfsr_data_size(data_) == 4); @@ -14898,9 +14898,9 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], CFG->block_size) => 0; assert(rbyd.weight == N*W); for (unsigned k = 0; k < N; k++) { - lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == k*W+W-1); assert(weight_ == W); assert(lfsr_data_size(data_) == 4); @@ -14926,9 +14926,9 @@ code = ''' lfsr_rbyd_fetch(&lfs, &rbyd, rbyd.blocks[0], CFG->block_size) => 0; assert(rbyd.weight == N*W); for (unsigned k = 0; k < N; k++) { - lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1, LFSR_TAG_REG, + lfsr_rbyd_lookupnext(&lfs, &rbyd, k*W+W-1, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(rid_ == k*W+W-1); assert(weight_ == W); assert(lfsr_data_size(data_) == 4); @@ -15033,7 +15033,7 @@ code = ''' // update our rbyd lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF(&(uint8_t){'a'+(i % 26)}, 1)))) => 0; } else if (op == 1) { // update our sim @@ -15080,7 +15080,7 @@ code = ''' printf("]\n"); printf("rbyd: ["); for (lfs_ssize_t rid = 0; rid < (lfs_ssize_t)rbyd.weight; rid++) { - int err = lfsr_rbyd_lookup(&lfs, &rbyd, rid, LFSR_TAG_REG, + int err = lfsr_rbyd_lookup(&lfs, &rbyd, rid, LFSR_TAG_DATA, &data); if (!err) { lfs_ssize_t size = lfsr_data_read(&lfs, &data, buffer, 4); @@ -15106,7 +15106,7 @@ code = ''' assert(count == rbyd.weight); for (lfs_ssize_t rid = 0; rid < (lfs_ssize_t)count; rid++) { - lfsr_rbyd_lookup(&lfs, &rbyd, rid, LFSR_TAG_REG, &data) => 0; + lfsr_rbyd_lookup(&lfs, &rbyd, rid, LFSR_TAG_DATA, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 1; assert(memcmp(&sim[rid*(M+1)], buffer, 1) == 0); } @@ -15208,7 +15208,7 @@ code = ''' // update our rbyd lfsr_rbyd_commit(&lfs, &rbyd, weighted_rid, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +weight, + LFSR_TAG_DATA, +weight, LFSR_DATA_BUF(&(uint8_t){'a'+(i % 26)}, 1)))) => 0; } else if (op == 1) { // get the correct weight from the sim @@ -15261,7 +15261,7 @@ code = ''' } int err = lfsr_rbyd_lookupnext(&lfs, &rbyd, - weighted_rid, LFSR_TAG_REG, + weighted_rid, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_); if (!err) { lfs_ssize_t size = lfsr_data_read(&lfs, &data_, buffer, 4); @@ -15294,7 +15294,7 @@ code = ''' } lfsr_rbyd_lookupnext(&lfs, &rbyd, - weighted_rid, LFSR_TAG_REG, + weighted_rid, LFSR_TAG_DATA, &rid_, &tag_, &weight_, &data_) => 0; lfsr_rbyd_lookup(&lfs, &rbyd, rid_, tag_, &data) => 0; lfsr_data_read(&lfs, &data, buffer, 4) => 1; @@ -15372,7 +15372,7 @@ code = ''' // give each rattr a subtype based on its rid + SHIFT lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)), LFSR_RATTR( LFSR_TAG_ATTR((perm[j] + SHIFT) & 0x7f), 0, @@ -15462,7 +15462,7 @@ code = ''' // give each rattr a subtype based on its rid + SHIFT lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)), LFSR_RATTR( LFSR_TAG_ATTR((perm[j] + SHIFT) & 0x7f), 0, @@ -15505,7 +15505,7 @@ code = ''' lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; assert(rid_ == k); - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); @@ -15606,7 +15606,7 @@ code = ''' // give each rattr a subtype based on its rid + SHIFT lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)), LFSR_RATTR( LFSR_TAG_ATTR((perm[j] + SHIFT) & 0x7f), 0, @@ -15650,7 +15650,7 @@ code = ''' lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; assert(rid_ == k); - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); @@ -15752,7 +15752,7 @@ code = ''' // give each rattr a subtype based on its rid + SHIFT lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)), LFSR_RATTR( LFSR_TAG_ATTR(0x7f & (perm[j] + SHIFT)), 0, @@ -15845,7 +15845,7 @@ code = ''' // give each rattr a subtype based on its rid + SHIFT lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)), LFSR_RATTR( LFSR_TAG_ATTR(0x7f & (perm[j] + SHIFT)), 0, @@ -15891,7 +15891,7 @@ code = ''' lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; assert(rid_ == k); - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); @@ -15999,7 +15999,7 @@ code = ''' // give each rattr a subtype based on its rid + SHIFT lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)), LFSR_RATTR( LFSR_TAG_ATTR(0x7f & (perm[j] + SHIFT)), 0, @@ -16046,7 +16046,7 @@ code = ''' lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; assert(rid_ == k); - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); @@ -16523,7 +16523,7 @@ code = ''' // give each rattr a subtype based on its rid + SHIFT lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)), LFSR_RATTR( LFSR_TAG_ATTR((perm[j] + SHIFT) & 0x7f), 0, @@ -16541,7 +16541,7 @@ code = ''' lfsr_rbyd_suplookup(&lfs, &rbyd, j, &tag_, &data_) => 0; - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(lfsr_data_size(data_) == 4); } } @@ -16613,7 +16613,7 @@ code = ''' // give each rattr a subtype based on its rid + SHIFT lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)), LFSR_RATTR( LFSR_TAG_ATTR((perm[j] + SHIFT) & 0x7f), 0, @@ -16657,7 +16657,7 @@ code = ''' lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; assert(rid_ == k); - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(weight_ == ((k == j+1) ? 2 : 1)); assert(lfsr_data_size(data_) == 4); @@ -16757,7 +16757,7 @@ code = ''' // give each rattr a subtype based on its rid + SHIFT lfsr_rbyd_commit(&lfs, &rbyd, rid, LFSR_RATTRS( LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF(names[perm[j] % 6], 4)), LFSR_RATTR( LFSR_TAG_ATTR((perm[j] + SHIFT) & 0x7f), 0, @@ -16810,7 +16810,7 @@ code = ''' lfsr_rbyd_lookupnext(&lfs, &rbyd, rid_, tag_+1, &rid_, &tag_, &weight_, &data_) => 0; assert(rid_ == k); - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); @@ -16981,10 +16981,10 @@ code = ''' LFSR_TAG_ATTR(0), 0, LFSR_DATA_BUF("\xaa\xaa\xaa\xaa", 4)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xcc\xcc\xcc\xcc", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( LFSR_RATTR( @@ -17005,14 +17005,14 @@ code = ''' lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, 0, &rid_, &tag_, &weight_, &data_) => 0; assert(rid_ == 0); - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); uint8_t rbuf[32]; lfsr_data_read(&lfs, &data_, rbuf, 32) => 4; assert(memcmp(rbuf, "\xcc\xcc\xcc\xcc", 4) == 0); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG+1, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_DATA+1, &rid_, &tag_, &weight_, &data_) => LFS_ERR_NOENT; ''' @@ -17110,7 +17110,7 @@ code = ''' LFSR_TAG_ATTR(1), 0, LFSR_DATA_BUF("\xbb\xbb\xbb\xbb", 4)), LFSR_RATTR( - LFSR_TAG_REG, +1, + LFSR_TAG_DATA, +1, LFSR_DATA_BUF("\xdd\xdd\xdd\xdd", 4)))) => 0; lfsr_rbyd_commit(&lfs, &rbyd, -1, LFSR_RATTRS( LFSR_RATTR( @@ -17143,13 +17143,13 @@ code = ''' lfsr_rbyd_lookupnext(&lfs, &rbyd, -1, LFSR_TAG_ATTR(2)+1, &rid_, &tag_, &weight_, &data_) => 0; assert(rid_ == 0); - assert(tag_ == LFSR_TAG_REG); + assert(tag_ == LFSR_TAG_DATA); assert(weight_ == 1); assert(lfsr_data_size(data_) == 4); lfsr_data_read(&lfs, &data_, rbuf, 32) => 4; assert(memcmp(rbuf, "\xdd\xdd\xdd\xdd", 4) == 0); - lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_REG+1, + lfsr_rbyd_lookupnext(&lfs, &rbyd, 0, LFSR_TAG_DATA+1, &rid_, &tag_, &weight_, &data_) => LFS_ERR_NOENT; '''