From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Michael Ellerman <michael@ellerman.id.au>
Cc: nfont@linux.vnet.ibm.com, linuxppc-dev@ozlabs.org
Subject: Re: [PATCH] lsprop: Fixes to work correctly when built little endian
Date: Tue, 08 Jan 2013 13:12:29 +1100 [thread overview]
Message-ID: <1357611149.16285.54.camel@pasglop> (raw)
In-Reply-To: <1357532610-19416-1-git-send-email-michael@ellerman.id.au>
On Mon, 2013-01-07 at 15:23 +1100, Michael Ellerman wrote:
> Add and use dt_swap_int() to byte swap on little endian.
>
> Also declare buf as unsigned char, so that we don't sign extend when
> printing values from it.
>
> Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
> ---
>
> Ben, based on your patch, can you add your s-o-b? :
> https://lists.ozlabs.org/pipermail/linuxppc-dev/2008-May/056088.html
I didn't know powerpc-utils required sob's :-)
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
> ---
> src/lsprop.c | 17 ++++++++++++++---
> 1 file changed, 14 insertions(+), 3 deletions(-)
>
> diff --git a/src/lsprop.c b/src/lsprop.c
> index 5969a97..38a8fa5 100644
> --- a/src/lsprop.c
> +++ b/src/lsprop.c
> @@ -13,11 +13,22 @@
> #include <sys/stat.h>
> #include <sys/types.h>
> #include <dirent.h>
> +#include <endian.h>
> +#include <byteswap.h>
> +
> +static inline unsigned int dt_swap_int(unsigned int data)
> +{
> +#if __BYTE_ORDER == __LITTLE_ENDIAN
> + return bswap_32(data);
> +#else
> + return data;
> +#endif
> +}
>
> int recurse;
> int maxbytes = 128;
> int words_per_line = 0;
> -char *buf;
> +unsigned char *buf;
>
> void lsprop(FILE *f, char *name);
> void lsdir(char *name);
> @@ -183,7 +194,7 @@ void lsprop(FILE *f, char *name)
> } else if ((n & 3) == 0) {
> nw = n >> 2;
> if (nw == 1) {
> - i = *(int *)buf;
> + i = dt_swap_int(*(int *)buf);
> printf(" %.8x", i);
> if (i > -0x10000 && !(i >= 0 && i <= 9))
> printf(" (%d)", i);
> @@ -201,7 +212,7 @@ void lsprop(FILE *f, char *name)
> if (i != 0)
> printf("\n\t\t");
> for (j = 0; j < npl && i + j < nw; ++j)
> - printf(" %.8x", ((unsigned int *)buf)[i+j]);
> + printf(" %.8x", dt_swap_int(((unsigned int *)buf)[i+j]));
> }
> }
> } else {
next prev parent reply other threads:[~2013-01-08 2:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-07 4:23 [PATCH] lsprop: Fixes to work correctly when built little endian Michael Ellerman
2013-01-08 2:12 ` Benjamin Herrenschmidt [this message]
2013-01-08 3:55 ` Nathan Fontenot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1357611149.16285.54.camel@pasglop \
--to=benh@kernel.crashing.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=michael@ellerman.id.au \
--cc=nfont@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).