Skip to contentSkip to conversation

termbits: Convert octal defines to hex

PATCH In review Ilpo Järvinen 3 participants 7 messages May 4, 2022 – May 5, 2022

Subsystems (7)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 termbits: Convert octal defines to hex

Many archs have termbits.h as octal numbers. It makes hard for humans to parse the magnitude of large numbers correctly and to compare with hex ones of the same define.

Convert octal values to hex.

First step is an automated conversion with:

for i in $(git ls-files | grep 'termbits\.h'); do

	awk --non-decimal-data '/^#define\s+[A-Z][A-Z0-9]*\s+0[0-9]/ {
		l=int(((length($3) - 1) * 3 + 3) / 4);
		repl = sprintf("0x%0" l "x", $3);
		print gensub(/[^[:blank:]]+/, repl, 3);
		next} {print}' $i > $i~;
	mv $i~ $i;

done

On top of that, some manual processing on alignment and number of zeros. In addition, small tweaks to formatting of a few comments on the same lines.

---

I prefer this to go in though Greg's tty tree.

 arch/alpha/include/uapi/asm/termbits.h   | 202 ++++++++++-----------
 arch/mips/include/uapi/asm/termbits.h    | 222 +++++++++++------------
 arch/parisc/include/uapi/asm/termbits.h  | 220 +++++++++++-----------
 arch/powerpc/include/uapi/asm/termbits.h | 202 ++++++++++-----------
 include/uapi/asm-generic/termbits.h      | 220 +++++++++++-----------
 5 files changed, 533 insertions(+), 533 deletions(-)
arch/alpha/include/uapi/asm/termbits.h +101 -101
index 4575ba34a0ea..30dc7ff777b8 100644
@@ -72,57 +72,57 @@ struct ktermios {
 #define VTIME 17
 
 /* c_iflag bits */
-#define IGNBRK	0000001
-#define BRKINT	0000002
-#define IGNPAR	0000004
-#define PARMRK	0000010
-#define INPCK	0000020
-#define ISTRIP	0000040
-#define INLCR	0000100
-#define IGNCR	0000200
-#define ICRNL	0000400
-#define IXON	0001000
-#define IXOFF	0002000
-#define IXANY	0004000
-#define IUCLC	0010000
-#define IMAXBEL	0020000
-#define IUTF8	0040000
+#define IGNBRK	0x00001
+#define BRKINT	0x00002
+#define IGNPAR	0x00004
+#define PARMRK	0x00008
+#define INPCK	0x00010
+#define ISTRIP	0x00020
+#define INLCR	0x00040
+#define IGNCR	0x00080
+#define ICRNL	0x00100
+#define IXON	0x00200
+#define IXOFF	0x00400
+#define IXANY	0x00800
+#define IUCLC	0x01000
+#define IMAXBEL	0x02000
+#define IUTF8	0x04000
 
 /* c_oflag bits */
-#define OPOST	0000001
-#define ONLCR	0000002
-#define OLCUC	0000004
-
-#define OCRNL	0000010
-#define ONOCR	0000020
-#define ONLRET	0000040
-
-#define OFILL	00000100
-#define OFDEL	00000200
-#define NLDLY	00001400
-#define   NL0	00000000
-#define   NL1	00000400
-#define   NL2	00001000
-#define   NL3	00001400
-#define TABDLY	00006000
-#define   TAB0	00000000
-#define   TAB1	00002000
-#define   TAB2	00004000
-#define   TAB3	00006000
-#define CRDLY	00030000
-#define   CR0	00000000
-#define   CR1	00010000
-#define   CR2	00020000
-#define   CR3	00030000
-#define FFDLY	00040000
-#define   FF0	00000000
-#define   FF1	00040000
-#define BSDLY	00100000
-#define   BS0	00000000
-#define   BS1	00100000
-#define VTDLY	00200000
-#define   VT0	00000000
-#define   VT1	00200000
+#define OPOST	0x00001
+#define ONLCR	0x00002
+#define OLCUC	0x00004
+
+#define OCRNL	0x00008
+#define ONOCR	0x00010
+#define ONLRET	0x00020
+
+#define OFILL	0x000040
+#define OFDEL	0x000080
+#define NLDLY	0x000300
+#define   NL0	0x000000
+#define   NL1	0x000100
+#define   NL2	0x000200
+#define   NL3	0x000300
+#define TABDLY	0x000c00
+#define   TAB0	0x000000
+#define   TAB1	0x000400
+#define   TAB2	0x000800
+#define   TAB3	0x000c00
+#define CRDLY	0x003000
+#define   CR0	0x000000
+#define   CR1	0x001000
+#define   CR2	0x002000
+#define   CR3	0x003000
+#define FFDLY	0x004000
+#define   FF0	0x000000
+#define   FF1	0x004000
+#define BSDLY	0x008000
+#define   BS0	0x000000
+#define   BS1	0x008000
+#define VTDLY	0x010000
+#define   VT0	0x000000
+#define   VT1	0x010000
 /*
  * Should be equivalent to TAB3, see description of TAB3 in
  * POSIX.1-2008, Ch. 11.2.3 "Output Modes"
@@ -130,60 +130,60 @@ struct ktermios {
 #define XTABS	TAB3
 
 /* c_cflag bit meaning */
-#define CBAUD	0000037
-#define  B0	0000000		/* hang up */
-#define  B50	0000001
-#define  B75	0000002
-#define  B110	0000003
-#define  B134	0000004
-#define  B150	0000005
-#define  B200	0000006
-#define  B300	0000007
-#define  B600	0000010
-#define  B1200	0000011
-#define  B1800	0000012
-#define  B2400	0000013
-#define  B4800	0000014
-#define  B9600	0000015
-#define  B19200	0000016
-#define  B38400	0000017
+#define CBAUD		0x0000001f
+#define  B0		0x00000000	/* hang up */
+#define  B50		0x00000001
+#define  B75		0x00000002
+#define  B110		0x00000003
+#define  B134		0x00000004
+#define  B150		0x00000005
+#define  B200		0x00000006
+#define  B300		0x00000007
+#define  B600		0x00000008
+#define  B1200		0x00000009
+#define  B1800		0x0000000a
+#define  B2400		0x0000000b
+#define  B4800		0x0000000c
+#define  B9600		0x0000000d
+#define  B19200		0x0000000e
+#define  B38400		0x0000000f
 #define EXTA B19200
 #define EXTB B38400
-#define CBAUDEX 0000000
-#define  B57600   00020
-#define  B115200  00021
-#define  B230400  00022
-#define  B460800  00023
-#define  B500000  00024
-#define  B576000  00025
-#define  B921600  00026
-#define B1000000  00027
-#define B1152000  00030
-#define B1500000  00031
-#define B2000000  00032
-#define B2500000  00033
-#define B3000000  00034
-#define B3500000  00035
-#define B4000000  00036
-#define BOTHER    00037
-
-#define CSIZE	00001400
-#define   CS5	00000000
-#define   CS6	00000400
-#define   CS7	00001000
-#define   CS8	00001400
-
-#define CSTOPB	00002000
-#define CREAD	00004000
-#define PARENB	00010000
-#define PARODD	00020000
-#define HUPCL	00040000
-
-#define CLOCAL	00100000
-#define CMSPAR	  010000000000		/* mark or space (stick) parity */
-#define CRTSCTS	  020000000000		/* flow control */
-
-#define CIBAUD	07600000
+#define CBAUDEX		0x00000000
+#define  B57600		0x00000010
+#define  B115200	0x00000011
+#define  B230400	0x00000012
+#define  B460800	0x00000013
+#define  B500000	0x00000014
+#define  B576000	0x00000015
+#define  B921600	0x00000016
+#define B1000000	0x00000017
+#define B1152000	0x00000018
+#define B1500000	0x00000019
+#define B2000000	0x0000001a
+#define B2500000	0x0000001b
+#define B3000000	0x0000001c
+#define B3500000	0x0000001d
+#define B4000000	0x0000001e
+#define BOTHER		0x0000001f
+
+#define CSIZE		0x00000300
+#define   CS5		0x00000000
+#define   CS6		0x00000100
+#define   CS7		0x00000200
+#define   CS8		0x00000300
+
+#define CSTOPB		0x00000400
+#define CREAD		0x00000800
+#define PARENB		0x00001000
+#define PARODD		0x00002000
+#define HUPCL		0x00004000
+
+#define CLOCAL		0x00008000
+#define CMSPAR		0x40000000	/* mark or space (stick) parity */
+#define CRTSCTS		0x80000000	/* flow control */
+
+#define CIBAUD		0x1f0000
 #define IBSHIFT	16
 
 /* c_lflag bits */
arch/mips/include/uapi/asm/termbits.h +111 -111

242 lines not on this page · raw message

arch/parisc/include/uapi/asm/termbits.h +110 -110

237 lines not on this page · raw message

arch/powerpc/include/uapi/asm/termbits.h +101 -101

216 lines not on this page · raw message

include/uapi/asm-generic/termbits.h +110 -110

236 lines not on this page · raw message

Signature · 1 line
2.30.2
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 16 lines · Ilpo Järvinen

Many archs have termbits.h as octal numbers. It makes hard for humans to parse the magnitude of large numbers correctly and to compare with hex ones of the same define.

Convert octal values to hex.

First step is an automated conversion with:

for i in $(git ls-files | grep 'termbits\.h'); do

        awk --non-decimal-data '/^#define\s+[A-Z][A-Z0-9]*\s+0[0-9]/ {
                l=int(((length($3) - 1) * 3 + 3) / 4);
                repl = sprintf("0x%0" l "x", $3);
                print gensub(/[^[:blank:]]+/, repl, 3);
                next} {print}' $i > $i~;
        mv $i~ $i;
Quoted 7 lines

done

On top of that, some manual processing on alignment and number of zeros. In addition, small tweaks to formatting of a few comments on the same lines.

Good idea!

I assume you already checked if additional file contents can be shared across architectures? I think I've tried in the past but didn't really get anywhere with
that.

After applying the patch locally, I still see a bunch of whitespace differences in the
changed lines if I run

vimdiff arch/*/include/uapi/asm/termbits.h include/uapi/asm-generic/termbits.h

I think this mostly because you left the sparc version alone (it already uses hex constants), but it may be nice to edit this a little more to make the actual differences stick out more.

Quoted 1 line

I prefer this to go in though Greg's tty tree.

#2 lore raw
Quoted 37 lines · Arnd Bergmann
Quoted 16 lines · Ilpo Järvinen

Many archs have termbits.h as octal numbers. It makes hard for humans to parse the magnitude of large numbers correctly and to compare with hex ones of the same define.

Convert octal values to hex.

First step is an automated conversion with:

for i in $(git ls-files | grep 'termbits\.h'); do

        awk --non-decimal-data '/^#define\s+[A-Z][A-Z0-9]*\s+0[0-9]/ {
                l=int(((length($3) - 1) * 3 + 3) / 4);
                repl = sprintf("0x%0" l "x", $3);
                print gensub(/[^[:blank:]]+/, repl, 3);
                next} {print}' $i > $i~;
        mv $i~ $i;
Quoted 7 lines

done

On top of that, some manual processing on alignment and number of zeros. In addition, small tweaks to formatting of a few comments on the same lines.

Good idea!

I assume you already checked if additional file contents can be shared across architectures? I think I've tried in the past but didn't really get anywhere with
that.

After applying the patch locally, I still see a bunch of whitespace differences in the
changed lines if I run

Quoted 5 lines

vimdiff arch/*/include/uapi/asm/termbits.h include/uapi/asm-generic/termbits.h

I think this mostly because you left the sparc version alone (it already uses hex constants), but it may be nice to edit this a little more to make the actual differences stick out more.

I took a look on further harmonizing, however, it turned out to be not that simple. This is basically the pipeline I use to further cleanup the differences and remove comments if you want to play yourself, just remove stages from the tail to get the intermediate datas (gawk is required for --non-decimal-data):

$ git ls-files | grep 'termbits\.h' | xargs grep -h -e '#define' | awk --non-decimal-data '{if (NF < 3) {next}; printf("#define %s\t0x%08x\n", $2, $3)}' | sort | uniq -c | sort | awk '{print $1}' | uniq -c
     82 1
     74 2
     14 3
     58 4
     11 5
     54 6

So only 54 are the same for all archs (non-numeric defines such as EXT[AB] will appear as 0x0 but at least those two seem the same across archs anyway):

      6 #define B0      0x00000000
      6 #define B110    0x00000003
      6 #define B1200   0x00000009
      6 #define B134    0x00000004
      6 #define B150    0x00000005
      6 #define B1800   0x0000000a
      6 #define B19200  0x0000000e
      6 #define B200    0x00000006
      6 #define B2400   0x0000000b
      6 #define B300    0x00000007
      6 #define B38400  0x0000000f
      6 #define B4800   0x0000000c
      6 #define B50     0x00000001
      6 #define B600    0x00000008
      6 #define B75     0x00000002
      6 #define B9600   0x0000000d
      6 #define BRKINT  0x00000002
      6 #define BS0     0x00000000
      6 #define CMSPAR  0x40000000
      6 #define CR0     0x00000000
      6 #define CRTSCTS 0x80000000
      6 #define CS5     0x00000000
      6 #define ECHO    0x00000008
      6 #define EXTA    0x00000000
      6 #define EXTB    0x00000000
      6 #define FF0     0x00000000
      6 #define IBSHIFT 0x00000010
      6 #define ICRNL   0x00000100
      6 #define IGNBRK  0x00000001
      6 #define IGNCR   0x00000080
      6 #define IGNPAR  0x00000004
      6 #define INLCR   0x00000040
      6 #define INPCK   0x00000010
      6 #define ISTRIP  0x00000020
      6 #define IXANY   0x00000800
      6 #define NL0     0x00000000
      6 #define NL1     0x00000100
      6 #define OCRNL   0x00000008
      6 #define OFDEL   0x00000080
      6 #define OFILL   0x00000040
      6 #define ONLRET  0x00000020
      6 #define ONOCR   0x00000010
      6 #define OPOST   0x00000001
      6 #define PARMRK  0x00000008
      6 #define TAB0    0x00000000
      6 #define TCIFLUSH        0x00000000
      6 #define TCIOFF  0x00000002
      6 #define TCIOFLUSH       0x00000002
      6 #define TCION   0x00000003
      6 #define TCOFLUSH        0x00000001
      6 #define TCOOFF  0x00000000
      6 #define TCOON   0x00000001
      6 #define TCSANOW 0x00000000
      6 #define VT0     0x00000000

Sadly for the others, it just tends to be that one or two are different from the rest.

Signature · 1 line
 i.
maintainer
#3 lore raw
Quoted 13 lines · Ilpo Järvinen
Quoted 11 lines · Arnd Bergmann
Quoted 1 line · Ilpo Järvinen

After applying the patch locally, I still see a bunch of whitespace differences in the
changed lines if I run

vimdiff arch/*/include/uapi/asm/termbits.h include/uapi/asm-generic/termbits.h

I think this mostly because you left the sparc version alone (it already uses hex constants), but it may be nice to edit this a little more to make the actual differences stick out more.

Quoted 5 lines

I took a look on further harmonizing, however, it turned out to be not that simple. This is basically the pipeline I use to further cleanup the differences and remove comments if you want to play yourself, just remove stages from the tail to get the intermediate datas (gawk is required for --non-decimal-data):

I've played around with it some more to adjust the number of leading zeroes and the type of whitespace. This is what I ended up with on top of your patch: https://pastebin.com/raw/pkDPaKN1

Feel free to fold it into yours.

Arnd

#4 lore raw
Quoted 21 lines · Arnd Bergmann
Quoted 13 lines · Ilpo Järvinen
Quoted 11 lines · Arnd Bergmann
Quoted 1 line · Ilpo Järvinen

After applying the patch locally, I still see a bunch of whitespace differences in the
changed lines if I run

vimdiff arch/*/include/uapi/asm/termbits.h include/uapi/asm-generic/termbits.h

I think this mostly because you left the sparc version alone (it already uses hex constants), but it may be nice to edit this a little more to make the actual differences stick out more.

Quoted 5 lines

I took a look on further harmonizing, however, it turned out to be not that simple. This is basically the pipeline I use to further cleanup the differences and remove comments if you want to play yourself, just remove stages from the tail to get the intermediate datas (gawk is required for --non-decimal-data):

Quoted 5 lines

I've played around with it some more to adjust the number of leading zeroes and the type of whitespace. This is what I ended up with on top of your patch: https://pastebin.com/raw/pkDPaKN1

Feel free to fold it into yours.

Ok thanks. With that it seems to go a bit beyond octal to hex conversion so I'll make a series out of it. The series will also introduce include/uapi/asm-generic/termbits-common.h for the most obvious intersection.

Signature · 1 line
 i.
maintainer
#5 lore raw
Quoted 26 lines · Ilpo Järvinen
Quoted 25 lines · Arnd Bergmann
Quoted 13 lines · Ilpo Järvinen
Quoted 11 lines · Arnd Bergmann
Quoted 1 line · Ilpo Järvinen

After applying the patch locally, I still see a bunch of whitespace differences in the
changed lines if I run

vimdiff arch/*/include/uapi/asm/termbits.h include/uapi/asm-generic/termbits.h

I think this mostly because you left the sparc version alone (it already uses hex constants), but it may be nice to edit this a little more to make the actual differences stick out more.

Quoted 5 lines

I took a look on further harmonizing, however, it turned out to be not that simple. This is basically the pipeline I use to further cleanup the differences and remove comments if you want to play yourself, just remove stages from the tail to get the intermediate datas (gawk is required for --non-decimal-data):

I've played around with it some more to adjust the number of leading zeroes and the type of whitespace. This is what I ended up with on top of your patch: https://pastebin.com/raw/pkDPaKN1

Quoted 6 lines
Quoted 1 line

Feel free to fold it into yours.

Ok thanks. With that it seems to go a bit beyond octal to hex conversion so I'll make a series out of it. The series will also introduce include/uapi/asm-generic/termbits-common.h for the most obvious intersection.

Ok, sounds good. Here's a retroactive

for my changes so you can put them into a separate patch. I assume you will change it some more in the process, so maybe retain your ownership and just mark the bits a 'Co-developed-by: Arnd...'.

Arnd

reviewer Acked-by on v1 1/1
#6 lore raw
In reply to Ilpo Järvinen
Quoted 22 lines · Ilpo Järvinen

Many archs have termbits.h as octal numbers. It makes hard for humans to parse the magnitude of large numbers correctly and to compare with hex ones of the same define.

Convert octal values to hex.

First step is an automated conversion with:

for i in $(git ls-files | grep 'termbits\.h'); do

	awk --non-decimal-data '/^#define\s+[A-Z][A-Z0-9]*\s+0[0-9]/ {
		l=int(((length($3) - 1) * 3 + 3) / 4);
		repl = sprintf("0x%0" l "x", $3);
		print gensub(/[^[:blank:]]+/, repl, 3);
		next} {print}' $i > $i~;
	mv $i~ $i;

done

On top of that, some manual processing on alignment and number of zeros. In addition, small tweaks to formatting of a few comments on the same lines.

Quoted 8 lines

---

I prefer this to go in though Greg's tty tree.

 arch/alpha/include/uapi/asm/termbits.h   | 202 ++++++++++-----------
 arch/mips/include/uapi/asm/termbits.h    | 222 +++++++++++------------
 arch/parisc/include/uapi/asm/termbits.h  | 220 +++++++++++-----------
 arch/powerpc/include/uapi/asm/termbits.h | 202 ++++++++++-----------

I ran some horrible awk/sed/python mess over the before and after and they seem to be numerically identical, so LGTM.

cheers