On 3/12/2013 3:36 PM, Boris Chiu wrote:
> From: Brendan Doyle <[email protected]>
>
> Signed-off-by: Brendan Doyle <[email protected]>
> ---
> src/dump.c | 66
> +++++++++++++++++++++++++++++++++++++++++++++++++++--------
> 1 files changed, 57 insertions(+), 9 deletions(-)
>
> diff --git a/src/dump.c b/src/dump.c
> index 7f3ef7d..e83c363 100644
> --- a/src/dump.c
> +++ b/src/dump.c
> @@ -46,12 +46,24 @@
>
> void mad_dump_int(char *buf, int bufsz, void *val, int valsz)
> {
> + /*
> + * the val pointer passed to the dump routines are always 32 bit
> + * integers for valsz <= 4 and 64 bit integer for the rest. It is
> never
> + * uint8_t or uint16_t. This is because mad_decode_field always
> returns
> + * the values as 32 bit integer even if they are 8 bit or 16 bit
> fields.
> + */
> switch (valsz) {
> case 1:
> - snprintf(buf, bufsz, "%d", *(uint32_t *) val & 0xff);
> +#if defined(_BIG_ENDIAN)
> + val = ((uint8_t *)val) + 3;
> +#endif /* _BIG_ENDIAN */
I don't understand what's different about SPARC and PPC in terms of
this. These routines all work without this on PPC64 and PPC32.
At a minimum, should this be ifdef'd on something like both __sun and
__SVR4 rather than _BIG_ENDIAN ?
-- Hal
> + snprintf(buf, bufsz, "%d", *(uint8_t *) val & 0xff);
> break;
> case 2:
> - snprintf(buf, bufsz, "%d", *(uint32_t *) val & 0xffff);
> +#if defined(_BIG_ENDIAN)
> + val = ((uint16_t *)val) + 1;
> +#endif /* _BIG_ENDIAN */
> + snprintf(buf, bufsz, "%d", *(uint16_t *) val & 0xffff);
> break;
> case 3:
> case 4:
> @@ -71,12 +83,24 @@ void mad_dump_int(char *buf, int bufsz, void *val,
> int valsz)
>
> void mad_dump_uint(char *buf, int bufsz, void *val, int valsz)
> {
> + /*
> + * the val pointer passed to the dump routines are always 32 bit
> + * integers for valsz <= 4 and 64 bit integer for the rest. It is
> never
> + * uint8_t or uint16_t. This is because mad_decode_field always
> returns
> + * the values as 32 bit integer even if they are 8 bit or 16 bit
> fields.
> + */
> switch (valsz) {
> case 1:
> - snprintf(buf, bufsz, "%u", *(uint32_t *) val & 0xff);
> +#if defined(_BIG_ENDIAN)
> + val = ((uint8_t *)val) + 3;
> +#endif /* _BIG_ENDIAN */
> + snprintf(buf, bufsz, "%u", *(uint8_t *) val & 0xff);
> break;
> case 2:
> - snprintf(buf, bufsz, "%u", *(uint32_t *) val & 0xffff);
> +#if defined(_BIG_ENDIAN)
> + val = ((uint16_t *)val) + 1;
> +#endif /* _BIG_ENDIAN */
> + snprintf(buf, bufsz, "%u", *(uint16_t *) val & 0xffff);
> break;
> case 3:
> case 4:
> @@ -96,15 +120,27 @@ void mad_dump_uint(char *buf, int bufsz, void *val,
> int valsz)
>
> void mad_dump_hex(char *buf, int bufsz, void *val, int valsz)
> {
> + /*
> + * the val pointer passed to the dump routines are always 32 bit
> + * integers for valsz <= 4 and 64 bit integer for the rest. It is
> never
> + * uint8_t or uint16_t. This is because mad_decode_field always
> returns
> + * the values as 32 bit integer even if they are 8 bit or 16 bit
> fields.
> + */
> switch (valsz) {
> case 1:
> - snprintf(buf, bufsz, "0x%02x", *(uint32_t *) val & 0xff);
> +#if defined(_BIG_ENDIAN)
> + val = ((uint8_t *)val) + 3;
> +#endif /* _BIG_ENDIAN */
> + snprintf(buf, bufsz, "0x%02x", *(uint8_t *) val & 0xff);
> break;
> case 2:
> - snprintf(buf, bufsz, "0x%04x", *(uint32_t *) val & 0xffff);
> +#if defined(_BIG_ENDIAN)
> + val = ((uint16_t *)val) + 1;
> +#endif /* _BIG_ENDIAN */
> + snprintf(buf, bufsz, "0x%04x", *(uint16_t *) val & 0xffff);
> break;
> case 3:
> - snprintf(buf, bufsz, "0x%06x", *(uint32_t *) val & 0xffffff);
> + snprintf(buf, bufsz, "0x%x", *(uint32_t *) val & 0xffffff);
> break;
> case 4:
> snprintf(buf, bufsz, "0x%08x", *(uint32_t *) val);
> @@ -132,12 +168,24 @@ void mad_dump_hex(char *buf, int bufsz, void *val,
> int valsz)
>
> void mad_dump_rhex(char *buf, int bufsz, void *val, int valsz)
> {
> + /*
> + * the val pointer passed to the dump routines are always 32 bit
> + * integers for valsz <= 4 and 64 bit integer for the rest. It is
> never
> + * uint8_t or uint16_t. This is because mad_decode_field always
> returns
> + * the values as 32 bit integer even if they are 8 bit or 16 bit
> fields.
> + */
> switch (valsz) {
> case 1:
> - snprintf(buf, bufsz, "%02x", *(uint32_t *) val & 0xff);
> +#if defined(_BIG_ENDIAN)
> + val = ((uint8_t *)val) + 3;
> +#endif /* _BIG_ENDIAN */
> + snprintf(buf, bufsz, "%02x", *(uint8_t *) val & 0xff);
> break;
> case 2:
> - snprintf(buf, bufsz, "%04x", *(uint32_t *) val & 0xffff);
> +#if defined(_BIG_ENDIAN)
> + val = ((uint16_t *)val) + 1;
> +#endif /* _BIG_ENDIAN */
> + snprintf(buf, bufsz, "%04x", *(uint16_t *) val & 0xffff);
> break;
> case 3:
> snprintf(buf, bufsz, "%06x", *(uint32_t *) val & 0xffffff);
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
