From 1fc2f672a290123aabcdbd70f5778734c0bad66c Mon Sep 17 00:00:00 2001 From: Christopher Haster Date: Tue, 24 Oct 2023 22:34:21 -0500 Subject: [PATCH] Tweaked tag encoding a bit post-slice to make space for becksum tags --- lfs.c | 16 ++++++++++------ scripts/dbgbtree.py | 14 +++++++------- scripts/dbglfs.py | 14 +++++++------- scripts/dbgmtree.py | 14 +++++++------- scripts/dbgrbyd.py | 14 +++++++------- 5 files changed, 38 insertions(+), 34 deletions(-) diff --git a/lfs.c b/lfs.c index 989850ef..c5ccb6c0 100644 --- a/lfs.c +++ b/lfs.c @@ -583,7 +583,7 @@ enum lfsr_tag_type { // the null tag is reserved LFSR_TAG_NULL = 0x0000, - // "normal" tags + // config tags LFSR_TAG_CONFIG = 0x0000, LFSR_TAG_MAGIC = 0x0003, LFSR_TAG_VERSION = 0x0004, @@ -598,26 +598,30 @@ enum lfsr_tag_type { LFSR_TAG_UTAGLIMIT = 0x000d, LFSR_TAG_UATTRLIMIT = 0x000e, + // global-state tags LFSR_TAG_GSTATE = 0x0100, LFSR_TAG_GRM = 0x0100, + // name tags LFSR_TAG_NAME = 0x0200, LFSR_TAG_BNAME = 0x0200, LFSR_TAG_BOOKMARK = 0x0201, LFSR_TAG_REG = 0x0202, LFSR_TAG_DIR = 0x0203, + // struct tags LFSR_TAG_STRUCT = 0x0300, LFSR_TAG_DATA = 0x0300, - LFSR_TAG_TRUNK = 0x0308, - LFSR_TAG_DID = 0x030c, - LFSR_TAG_BLOCK = 0x0310, - LFSR_TAG_BTREE = 0x0314, + LFSR_TAG_TRUNK = 0x0304, + LFSR_TAG_BLOCK = 0x0308, + LFSR_TAG_BTREE = 0x030c, + LFSR_TAG_BRANCH = 0x031c, LFSR_TAG_MDIR = 0x0321, LFSR_TAG_MTREE = 0x0324, LFSR_TAG_MROOT = 0x0329, - LFSR_TAG_BRANCH = 0x032c, + LFSR_TAG_DID = 0x032c, + // user/sys attributes LFSR_TAG_UATTR = 0x0400, LFSR_TAG_SATTR = 0x0600, diff --git a/scripts/dbgbtree.py b/scripts/dbgbtree.py index 064bfe43..3329c8fa 100755 --- a/scripts/dbgbtree.py +++ b/scripts/dbgbtree.py @@ -31,14 +31,14 @@ TAG_REG = 0x0202 TAG_DIR = 0x0203 TAG_STRUCT = 0x0300 TAG_DATA = 0x0300 -TAG_TRUNK = 0x0308 -TAG_DID = 0x030c -TAG_BLOCK = 0x0310 -TAG_BTREE = 0x0314 +TAG_TRUNK = 0x0304 +TAG_BLOCK = 0x0308 +TAG_BTREE = 0x030c +TAG_BRANCH = 0x031c TAG_MDIR = 0x0321 TAG_MTREE = 0x0324 TAG_MROOT = 0x0329 -TAG_BRANCH = 0x032c +TAG_DID = 0x032c TAG_UATTR = 0x0400 TAG_SATTR = 0x0600 TAG_SHRUB = 0x1000 @@ -178,13 +178,13 @@ def tagrepr(tag, w, size, off=None): 'shrub' if tag & TAG_SHRUB else '', 'data' if (tag & 0xfff) == TAG_DATA else 'trunk' if (tag & 0xfff) == TAG_TRUNK - else 'did' if (tag & 0xfff) == TAG_DID else 'block' if (tag & 0xfff) == TAG_BLOCK else 'btree' if (tag & 0xfff) == TAG_BTREE + else 'branch' if (tag & 0xfff) == TAG_BRANCH else 'mdir' if (tag & 0xfff) == TAG_MDIR else 'mtree' if (tag & 0xfff) == TAG_MTREE else 'mroot' if (tag & 0xfff) == TAG_MROOT - else 'branch' if (tag & 0xfff) == TAG_BRANCH + else 'did' if (tag & 0xfff) == TAG_DID else 'struct 0x%02x' % (tag & 0xff), ' w%d' % w if w else '', size) diff --git a/scripts/dbglfs.py b/scripts/dbglfs.py index 9f329551..cbf3aa50 100755 --- a/scripts/dbglfs.py +++ b/scripts/dbglfs.py @@ -32,14 +32,14 @@ TAG_REG = 0x0202 TAG_DIR = 0x0203 TAG_STRUCT = 0x0300 TAG_DATA = 0x0300 -TAG_TRUNK = 0x0308 -TAG_DID = 0x030c -TAG_BLOCK = 0x0310 -TAG_BTREE = 0x0314 +TAG_TRUNK = 0x0304 +TAG_BLOCK = 0x0308 +TAG_BTREE = 0x030c +TAG_BRANCH = 0x031c TAG_MDIR = 0x0321 TAG_MTREE = 0x0324 TAG_MROOT = 0x0329 -TAG_BRANCH = 0x032c +TAG_DID = 0x032c TAG_UATTR = 0x0400 TAG_SATTR = 0x0600 TAG_SHRUB = 0x1000 @@ -194,13 +194,13 @@ def tagrepr(tag, w, size, off=None): 'shrub' if tag & TAG_SHRUB else '', 'data' if (tag & 0xfff) == TAG_DATA else 'trunk' if (tag & 0xfff) == TAG_TRUNK - else 'did' if (tag & 0xfff) == TAG_DID else 'block' if (tag & 0xfff) == TAG_BLOCK else 'btree' if (tag & 0xfff) == TAG_BTREE + else 'branch' if (tag & 0xfff) == TAG_BRANCH else 'mdir' if (tag & 0xfff) == TAG_MDIR else 'mtree' if (tag & 0xfff) == TAG_MTREE else 'mroot' if (tag & 0xfff) == TAG_MROOT - else 'branch' if (tag & 0xfff) == TAG_BRANCH + else 'did' if (tag & 0xfff) == TAG_DID else 'struct 0x%02x' % (tag & 0xff), ' w%d' % w if w else '', size) diff --git a/scripts/dbgmtree.py b/scripts/dbgmtree.py index 733a3412..b1d65cf8 100755 --- a/scripts/dbgmtree.py +++ b/scripts/dbgmtree.py @@ -31,14 +31,14 @@ TAG_REG = 0x0202 TAG_DIR = 0x0203 TAG_STRUCT = 0x0300 TAG_DATA = 0x0300 -TAG_TRUNK = 0x0308 -TAG_DID = 0x030c -TAG_BLOCK = 0x0310 -TAG_BTREE = 0x0314 +TAG_TRUNK = 0x0304 +TAG_BLOCK = 0x0308 +TAG_BTREE = 0x030c +TAG_BRANCH = 0x031c TAG_MDIR = 0x0321 TAG_MTREE = 0x0324 TAG_MROOT = 0x0329 -TAG_BRANCH = 0x032c +TAG_DID = 0x032c TAG_UATTR = 0x0400 TAG_SATTR = 0x0600 TAG_SHRUB = 0x1000 @@ -193,13 +193,13 @@ def tagrepr(tag, w, size, off=None): 'shrub' if tag & TAG_SHRUB else '', 'data' if (tag & 0xfff) == TAG_DATA else 'trunk' if (tag & 0xfff) == TAG_TRUNK - else 'did' if (tag & 0xfff) == TAG_DID else 'block' if (tag & 0xfff) == TAG_BLOCK else 'btree' if (tag & 0xfff) == TAG_BTREE + else 'branch' if (tag & 0xfff) == TAG_BRANCH else 'mdir' if (tag & 0xfff) == TAG_MDIR else 'mtree' if (tag & 0xfff) == TAG_MTREE else 'mroot' if (tag & 0xfff) == TAG_MROOT - else 'branch' if (tag & 0xfff) == TAG_BRANCH + else 'did' if (tag & 0xfff) == TAG_DID else 'struct 0x%02x' % (tag & 0xff), ' w%d' % w if w else '', size) diff --git a/scripts/dbgrbyd.py b/scripts/dbgrbyd.py index 6d5cb742..54454065 100755 --- a/scripts/dbgrbyd.py +++ b/scripts/dbgrbyd.py @@ -40,14 +40,14 @@ TAG_REG = 0x0202 TAG_DIR = 0x0203 TAG_STRUCT = 0x0300 TAG_DATA = 0x0300 -TAG_TRUNK = 0x0308 -TAG_DID = 0x030c -TAG_BLOCK = 0x0310 -TAG_BTREE = 0x0314 +TAG_TRUNK = 0x0304 +TAG_BLOCK = 0x0308 +TAG_BTREE = 0x030c +TAG_BRANCH = 0x031c TAG_MDIR = 0x0321 TAG_MTREE = 0x0324 TAG_MROOT = 0x0329 -TAG_BRANCH = 0x032c +TAG_DID = 0x032c TAG_UATTR = 0x0400 TAG_SATTR = 0x0600 TAG_SHRUB = 0x1000 @@ -180,13 +180,13 @@ def tagrepr(tag, w, size, off=None): 'shrub' if tag & TAG_SHRUB else '', 'data' if (tag & 0xfff) == TAG_DATA else 'trunk' if (tag & 0xfff) == TAG_TRUNK - else 'did' if (tag & 0xfff) == TAG_DID else 'block' if (tag & 0xfff) == TAG_BLOCK else 'btree' if (tag & 0xfff) == TAG_BTREE + else 'branch' if (tag & 0xfff) == TAG_BRANCH else 'mdir' if (tag & 0xfff) == TAG_MDIR else 'mtree' if (tag & 0xfff) == TAG_MTREE else 'mroot' if (tag & 0xfff) == TAG_MROOT - else 'branch' if (tag & 0xfff) == TAG_BRANCH + else 'did' if (tag & 0xfff) == TAG_DID else 'struct 0x%02x' % (tag & 0xff), ' w%d' % w if w else '', size)