2022-06-07 18:03:31

by Jiri Slaby

Subject: [PATCH 09/36] tty/vt: consolemap: use | for binary addition

Unicode letters are composed as a bit shifts and sums of three values.
Use "|" and not "+" for these bit operations. The former is indeed more
appropriate.

Signed-off-by: Jiri Slaby <[email protected]>
---
drivers/tty/vt/consolemap.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c
index f97081e01b71..016c1a0b4290 100644
--- a/drivers/tty/vt/consolemap.c
+++ b/drivers/tty/vt/consolemap.c
@@ -265,7 +265,7 @@ static void set_inverse_trans_unicode(struct vc_data *conp,
glyph = p2[k];
if (glyph >= 0 && glyph < MAX_GLYPH
&& q[glyph] < 32)
- q[glyph] = (i << 11) + (j << 6) + k;
+ q[glyph] = (i << 11) | (j << 6) | k;
}
}
}
@@ -788,7 +788,7 @@ int con_get_unimap(struct vc_data *vc, ushort ct, ushort __user *uct, struct uni
continue;
if (ect < ct) {
unilist[ect].unicode =
- (i<<11)+(j<<6)+k;
+ (i<<11) | (j<<6) | k;
unilist[ect].fontpos = *p2;
}
ect++;
--
2.36.1

2022-06-08 05:41:53

by Ilpo Järvinen

Subject: Re: [PATCH 09/36] tty/vt: consolemap: use | for binary addition

On Tue, 7 Jun 2022, Jiri Slaby wrote:

> Unicode letters are composed as a bit shifts and sums of three values.
> Use "|" and not "+" for these bit operations. The former is indeed more
> appropriate.
>
> Signed-off-by: Jiri Slaby <[email protected]>

Reviewed-by: Ilpo J?rvinen <[email protected]>

> ---
> drivers/tty/vt/consolemap.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/tty/vt/consolemap.c b/drivers/tty/vt/consolemap.c
> index f97081e01b71..016c1a0b4290 100644
> --- a/drivers/tty/vt/consolemap.c
> +++ b/drivers/tty/vt/consolemap.c
> @@ -265,7 +265,7 @@ static void set_inverse_trans_unicode(struct vc_data *conp,
> glyph = p2[k];
> if (glyph >= 0 && glyph < MAX_GLYPH
> && q[glyph] < 32)
> - q[glyph] = (i << 11) + (j << 6) + k;
> + q[glyph] = (i << 11) | (j << 6) | k;
> }
> }
> }
> @@ -788,7 +788,7 @@ int con_get_unimap(struct vc_data *vc, ushort ct, ushort __user *uct, struct uni
> continue;
> if (ect < ct) {
> unilist[ect].unicode =
> - (i<<11)+(j<<6)+k;
> + (i<<11) | (j<<6) | k;

I'd have added also the spaces around <<.

--
i.