diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2014-06-11 14:34:33 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2014-06-11 15:29:56 +0100 |
| commit | 5705e66a329273c478f6ecd8f41b8f5633095581 (patch) | |
| tree | e8e282e71a7a51aba1cd960e39e562518a3a8731 | |
| parent | b41a51e0f54c983ef72bc31125419382d666d48c (diff) | |
sna: Add some DBG to the memmove path
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/blt.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/sna/blt.c b/src/sna/blt.c index f861f65e..b61f88b2 100644 --- a/src/sna/blt.c +++ b/src/sna/blt.c @@ -796,6 +796,7 @@ memmove_box(const void *src, void *dst, const BoxRec *box, int dx, int dy) { +#define FORCE_MEMMOVE 0 union { uint8_t u8; uint16_t u16; @@ -808,6 +809,7 @@ memmove_box(const void *src, void *dst, assert(src); assert(dst); + assert(src != dst); assert(bpp >= 8); assert(box->x2 > box->x1); assert(box->y2 > box->y1); @@ -821,10 +823,11 @@ memmove_box(const void *src, void *dst, width = box->y1 * stride + box->x1 * bpp; src_bytes = (const uint8_t *)src + width; dst_bytes = (uint8_t *)dst + width; + assert(dst_bytes != src_bytes); width = (box->x2 - box->x1) * bpp; height = (box->y2 - box->y1); - assert(width <= 8*stride); + assert(width <= stride); if (width == stride) { width *= height; height = 1; @@ -865,8 +868,9 @@ memmove_box(const void *src, void *dst, break; default: - if (dst_bytes < src_bytes + width && - src_bytes < dst_bytes + width) { + if (FORCE_MEMMOVE || + (dst_bytes < src_bytes + width && + src_bytes < dst_bytes + width)) { do { memmove(dst_bytes, src_bytes, width); src_bytes += stride; @@ -919,8 +923,9 @@ memmove_box(const void *src, void *dst, break; default: - if (dst_bytes < src_bytes + width && - src_bytes < dst_bytes + width) { + if (FORCE_MEMMOVE || + (dst_bytes < src_bytes + width && + src_bytes < dst_bytes + width)) { do { memmove(dst_bytes, src_bytes, width); src_bytes -= stride; |