| Message ID | 20210922045636.25206-7-imp@bsdimp.com |
|---|---|
| State | New |
| Headers | show |
| Series | bsd-user mmap fixes | expand |
On 9/21/21 9:56 PM, Warner Losh wrote: > Keep the shifted expression on one line. It's the same number of lines > and easier to read like this. > > Signed-off-by: Warner Losh <imp@bsdimp.com> > --- > bsd-user/mmap.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c > index bafbdacd31..8b763fffc3 100644 > --- a/bsd-user/mmap.c > +++ b/bsd-user/mmap.c > @@ -399,8 +399,8 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, > prot & PROT_WRITE ? 'w' : '-', > prot & PROT_EXEC ? 'x' : '-'); > if (flags & MAP_ALIGNMENT_MASK) { > - printf("MAP_ALIGNED(%u) ", (flags & MAP_ALIGNMENT_MASK) > - >> MAP_ALIGNMENT_SHIFT); > + printf("MAP_ALIGNED(%u) ", > + (flags & MAP_ALIGNMENT_MASK) >> MAP_ALIGNMENT_SHIFT); > } > if (flags & MAP_GUARD) { > printf("MAP_GUARD "); > I suppose. If you're touching these lines at all it might be better to convert them all to qemu_log, protected by CPU_LOG_PAGE. Then you can drop the ifdefs as well. r~
On Fri, Sep 24, 2021 at 5:59 AM Richard Henderson < richard.henderson@linaro.org> wrote: > On 9/21/21 9:56 PM, Warner Losh wrote: > > Keep the shifted expression on one line. It's the same number of lines > > and easier to read like this. > > > > Signed-off-by: Warner Losh <imp@bsdimp.com> > > --- > > bsd-user/mmap.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c > > index bafbdacd31..8b763fffc3 100644 > > --- a/bsd-user/mmap.c > > +++ b/bsd-user/mmap.c > > @@ -399,8 +399,8 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, > int prot, > > prot & PROT_WRITE ? 'w' : '-', > > prot & PROT_EXEC ? 'x' : '-'); > > if (flags & MAP_ALIGNMENT_MASK) { > > - printf("MAP_ALIGNED(%u) ", (flags & MAP_ALIGNMENT_MASK) > > - >> MAP_ALIGNMENT_SHIFT); > > + printf("MAP_ALIGNED(%u) ", > > + (flags & MAP_ALIGNMENT_MASK) >> MAP_ALIGNMENT_SHIFT); > > } > > if (flags & MAP_GUARD) { > > printf("MAP_GUARD "); > > > > I suppose. > > If you're touching these lines at all it might be better to convert them > all to qemu_log, > protected by CPU_LOG_PAGE. Then you can drop the ifdefs as well. > I'll drop this patch and add one that does that. I was resistant to doing that, so I thought I'd give it a few days to mull over. I bit the bullet and saw how trivial it really is, so there's nothing really to mull :). Warner
diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c index bafbdacd31..8b763fffc3 100644 --- a/bsd-user/mmap.c +++ b/bsd-user/mmap.c @@ -399,8 +399,8 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, prot & PROT_WRITE ? 'w' : '-', prot & PROT_EXEC ? 'x' : '-'); if (flags & MAP_ALIGNMENT_MASK) { - printf("MAP_ALIGNED(%u) ", (flags & MAP_ALIGNMENT_MASK) - >> MAP_ALIGNMENT_SHIFT); + printf("MAP_ALIGNED(%u) ", + (flags & MAP_ALIGNMENT_MASK) >> MAP_ALIGNMENT_SHIFT); } if (flags & MAP_GUARD) { printf("MAP_GUARD ");
Keep the shifted expression on one line. It's the same number of lines and easier to read like this. Signed-off-by: Warner Losh <imp@bsdimp.com> --- bsd-user/mmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)