From 81ccfbccd02a4211039c6e2fe2eb9fea7769b12b Mon Sep 17 00:00:00 2001 From: Christopher Haster Date: Tue, 23 Apr 2024 17:08:09 -0500 Subject: [PATCH] Dropped -x/--device from dbg*.py scripts This hasn't really proven useful. At one point showing the cksums in dbgrbyd.py was useful, but this is now possible and easier with dbgblock.py -x/--cksum. --- scripts/dbgbtree.py | 12 ----------- scripts/dbglfs.py | 51 --------------------------------------------- scripts/dbgmtree.py | 20 ------------------ scripts/dbgrbyd.py | 25 ---------------------- 4 files changed, 108 deletions(-) diff --git a/scripts/dbgbtree.py b/scripts/dbgbtree.py index 23791ddf..837699b0 100755 --- a/scripts/dbgbtree.py +++ b/scripts/dbgbtree.py @@ -926,14 +926,6 @@ def main(disk, roots=None, *, else '')) prbyd = rbyd - # show in-device representation - if args.get('device'): - print('%9s %*s%*s %04x %08x %07x' % ( - '', - t_width, '', - 2*w_width+1, '', - tag, w if i == 0 else 0, len(data))) - # show on-disk encoding of tags/data if args.get('raw'): for o, line in enumerate(xxd(rbyd.data[j:j+d])): @@ -1050,10 +1042,6 @@ if __name__ == "__main__": '-r', '--raw', action='store_true', help="Show the raw data including tag encodings.") - parser.add_argument( - '-x', '--device', - action='store_true', - help="Show the device-side representation of tags.") parser.add_argument( '-T', '--no-truncate', action='store_true', diff --git a/scripts/dbglfs.py b/scripts/dbglfs.py index 8f651016..f24ab967 100755 --- a/scripts/dbglfs.py +++ b/scripts/dbglfs.py @@ -1460,15 +1460,6 @@ def dbg_fstruct(f, block_size, mdir, rid, tag, j, d, data, *, else '')) prbyd = rbyd - # show in-device representation - if args.get('device'): - print('%11s %*s %*s%s%04x %08x %07x' % ( - '', - m_width, '', - t_width, '', - '%*s ' % (2*w_width+1, ''), - tag, w if i == 0 else 0, len(data))) - # show on-disk encoding of tags/data if args.get('raw'): for o, line in enumerate(xxd(rbyd.data[j:j+d])): @@ -1522,16 +1513,6 @@ def dbg_fstruct(f, block_size, mdir, rid, tag, j, d, data, *, '\x1b[m' if color and notes else '')) prbyd = rbyd - # show in-device representation - if args.get('device'): - _, j, d, data_ = bptr - print('%11s %*s %*s%s%04x %08x %07x' % ( - '', - m_width, '', - t_width, '', - '%*s ' % (2*w_width+1, ''), - tag, w, len(data_))) - # show on-disk encoding of tags/bptr/data if args.get('raw'): _, j, d, data_ = bptr @@ -1911,13 +1892,6 @@ def main(disk, mroots=None, *, if not args.get('raw') and not args.get('no_truncate') else '')) - # show in-device representation - if args.get('device'): - print('%11s %*s %04x %08x %07x' % ( - '', - 2*w_width+1, '', - tag, 0, len(data))) - # show on-disk encoding if args.get('raw') or args.get('no_truncate'): for o, line in enumerate(xxd(data)): @@ -1937,13 +1911,6 @@ def main(disk, mroots=None, *, if not args.get('raw') and not args.get('no_truncate') else '')) - # show in-device representation - if args.get('device'): - print('%11s %*s %04x %08x %07x' % ( - '', - 2*w_width+1, '', - tag, 0, len(data))) - # show on-disk encoding if args.get('raw') or args.get('no_truncate'): for o, line in enumerate(xxd(data)): @@ -1967,13 +1934,6 @@ def main(disk, mroots=None, *, and not args.get('no_truncate') else '', '\x1b[m' if color else '')) - # show in-device representation - if args.get('device'): - print('%11s %*s %04x %08x %07x' % ( - '', - 2*w_width+1, '', - tag, 0, len(data))) - # show on-disk encoding if args.get('raw'): for o, line in enumerate(xxd(mdir.data[j:j+d])): @@ -2097,13 +2057,6 @@ def main(disk, mroots=None, *, and not args.get('no_truncate') else '')) - # show in-device representation - if args.get('device'): - print('%11s %*s %04x %08x %07x' % ( - '', - 2*w_width+1, '', - tag_, w_, len(data))) - # show on-disk encoding if args.get('raw'): for o, line in enumerate(xxd(mdir.data[j:j+d])): @@ -2236,10 +2189,6 @@ if __name__ == "__main__": '-r', '--raw', action='store_true', help="Show the raw data including tag encodings.") - parser.add_argument( - '-x', '--device', - action='store_true', - help="Show the device-side representation of tags.") parser.add_argument( '-T', '--no-truncate', action='store_true', diff --git a/scripts/dbgmtree.py b/scripts/dbgmtree.py index 062632e6..b719e93b 100755 --- a/scripts/dbgmtree.py +++ b/scripts/dbgmtree.py @@ -1416,14 +1416,6 @@ def main(disk, mroots=None, *, and not args.get('no_truncate') else ''))) - # show in-device representation - if args.get('device'): - print('%11s %*s%*s %04x %08x %07x' % ( - '', - t_width, '', - 2*w_width+1, '', - tag, w, len(data))); - # show on-disk encoding of tags if args.get('raw'): for o, line in enumerate(xxd(mdir.data[j:j+d])): @@ -1471,14 +1463,6 @@ def main(disk, mroots=None, *, else '')) prbyd = rbyd - # show in-device representation - if args.get('device'): - print('%11s %*s%*s %04x %08x %07x' % ( - '', - t_width, '', - 2*w_width+1, '', - tag, w if i == 0 else 0, len(data))); - # show on-disk encoding of tags/data if args.get('raw'): for o, line in enumerate(xxd(rbyd.data[j:j+d])): @@ -1701,10 +1685,6 @@ if __name__ == "__main__": '-r', '--raw', action='store_true', help="Show the raw data including tag encodings.") - parser.add_argument( - '-x', '--device', - action='store_true', - help="Show the device-side representation of tags.") parser.add_argument( '-T', '--no-truncate', action='store_true', diff --git a/scripts/dbgrbyd.py b/scripts/dbgrbyd.py index cc7a8046..b75d73c3 100755 --- a/scripts/dbgrbyd.py +++ b/scripts/dbgrbyd.py @@ -577,19 +577,6 @@ def dbg_log(data, block_size, rev, eoff, weight, *, ' %s' % jumprepr(j) if args.get('jumps') and not notes else '')) - # show in-device representation, including some extra - # cksum/parity info - if args.get('device'): - print('%s%8s %*s%*s %-*s %08x %x%s' % ( - '\x1b[90m' if color and j >= eoff else '', - '', - lifetime_width, '', - 2*w_width+1, '', - 21+w_width, '%04x %08x %07x' % (tag, w, size), - cksum, - popc(cksum) & 1, - '\x1b[m' if color and j >= eoff else '')) - # show on-disk encoding of tags if args.get('raw'): for o, line in enumerate(xxd(data[j:j+d])): @@ -851,14 +838,6 @@ def dbg_tree(data, block_size, rev, trunk, weight, *, if not args.get('raw') and not args.get('no_truncate') and not tag & TAG_ALT else '')) - # show in-device representation - if args.get('device'): - print('%8s %*s%*s %04x %08x %07x' % ( - '', - t_width, '', - 2*w_width+1, '', - tag, w, size)) - # show on-disk encoding of tags if args.get('raw'): for o, line in enumerate(xxd(data[j:j+d])): @@ -1081,10 +1060,6 @@ if __name__ == "__main__": '-r', '--raw', action='store_true', help="Show the raw data including tag encodings.") - parser.add_argument( - '-x', '--device', - action='store_true', - help="Show the device-side representation of tags.") parser.add_argument( '-T', '--no-truncate', action='store_true',