[xsrc/trunk]: xsrc/external/mit/xf86-video-ati/dist/src PR 48569: avoid unali...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/xsrc/rev/e1c47e20e677
branches:  trunk
changeset: 10480:e1c47e20e677
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Mar 22 10:18:19 2020 +0000

description:
PR 48569: avoid unaligned access. OK mrg@

diffstat:

 external/mit/xf86-video-ati/dist/src/radeon_accel.c |  25 ++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)

diffs (35 lines):

diff -r fe3711cf92e6 -r e1c47e20e677 external/mit/xf86-video-ati/dist/src/radeon_accel.c
--- a/external/mit/xf86-video-ati/dist/src/radeon_accel.c       Sun Mar 08 18:27:51 2020 +0000
+++ b/external/mit/xf86-video-ati/dist/src/radeon_accel.c       Sun Mar 22 10:18:19 2020 +0000
@@ -960,7 +960,30 @@
            return;
         }
     case RADEON_HOST_DATA_SWAP_32BIT:
-        {
+       if (((uintptr_t)dst & 1) || ((uintptr_t)src & 1)) {
+           uint8_t *d = (uint8_t *)dst;
+           uint8_t *s = (uint8_t *)src;
+           unsigned int nwords = size >> 2;
+
+           for (; nwords > 0; --nwords, d+=4, s+=4) {
+               d[0] = s[3];
+               d[1] = s[2];
+               d[2] = s[1];
+               d[3] = s[0];
+           }
+           return;
+        } else if (((uintptr_t)dst & 3) || ((uintptr_t)src & 3)) {
+           /* copy 16bit wise */
+           uint16_t *d = (uint16_t *)dst;
+           uint16_t *s = (uint16_t *)src;
+           unsigned int nwords = size >> 2;
+
+           for (; nwords > 0; --nwords, d+=2, s+=2) {
+               d[0] = ((s[1] >> 8) & 0xff) | ((s[1] & 0xff) << 8);
+               d[1] = ((s[0] >> 8) & 0xff) | ((s[0] & 0xff) << 8);
+           }
+           return;
+       } else {
            unsigned int *d = (unsigned int *)dst;
            unsigned int *s = (unsigned int *)src;
            unsigned int nwords = size >> 2;