diff options
| author | Matt Turner <mattst88@gmail.com> | 2011-08-04 17:47:51 -0400 |
|---|---|---|
| committer | Matt Turner <mattst88@gmail.com> | 2011-08-04 18:08:04 -0400 |
| commit | 07c114e0f196d420afb568c80f100dc56624edd5 (patch) | |
| tree | 187743f45d4e3630a3863cba4a28f652d82c77e0 | |
| parent | 8edbc7e7ccb38cade201bb396db650aff9f8a45e (diff) | |
Use lswapl() in cpswapl macro
Small reduction in text size:
text data bss dec hex filename
1866284 52136 78040 1996460 1e76ac ./hw/xfree86/Xorg
1863788 52136 78040 1993964 1e6cec ./hw/xfree86/Xorg
and the number of bswap instructions increases from 5 to 131.
lswaps is not used in cpswaps because it actually increases the code size.
Signed-off-by: Matt Turner <mattst88@gmail.com>
| -rw-r--r-- | include/misc.h | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/include/misc.h b/include/misc.h index ebfbc1a69..d2b5e115d 100644 --- a/include/misc.h +++ b/include/misc.h @@ -282,18 +282,21 @@ void __attribute__((error("wrong sized variable passed to swap"))) wrong_size(vo } while (0) /* copy 32-bit value from src to dst byteswapping on the way */ -#define cpswapl(src, dst) { \ - if (sizeof((src)) != 4 || sizeof((dst)) != 4) wrong_size();\ - ((char *)&(dst))[0] = ((char *) &(src))[3];\ - ((char *)&(dst))[1] = ((char *) &(src))[2];\ - ((char *)&(dst))[2] = ((char *) &(src))[1];\ - ((char *)&(dst))[3] = ((char *) &(src))[0]; } +#define cpswapl(src, dst) \ + do { \ + if (sizeof((src)) != 4 || sizeof((dst)) != 4) \ + wrong_size(); \ + (dst) = lswapl((src)); \ + } while (0) /* copy short from src to dst byteswapping on the way */ -#define cpswaps(src, dst) { \ - if (sizeof((src)) != 2 || sizeof((dst)) != 2) wrong_size();\ - ((char *) &(dst))[0] = ((char *) &(src))[1];\ - ((char *) &(dst))[1] = ((char *) &(src))[0]; } +#define cpswaps(src, dst) \ + do { \ + if (sizeof((src)) != 2 || sizeof((dst)) != 2) \ + wrong_size(); \ + ((char *) &(dst))[0] = ((char *) &(src))[1]; \ + ((char *) &(dst))[1] = ((char *) &(src))[0]; \ + } while (0) extern _X_EXPORT void SwapLongs( CARD32 *list, |