diff options
| author | Steve Kondik <shade@chemlab.org> | 2013-02-27 22:42:36 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-02-27 22:42:36 -0800 |
| commit | a8ce1a0f1e5d1bcfa4d1da94ae2e01f0f9203c32 (patch) | |
| tree | 3bcfaf8b2d4842e40223583f1d64501aabfe1f67 | |
| parent | ad673c1cb9dd151fd4e74380c4ba82c1fefb580b (diff) | |
| download | external_skia-a8ce1a0f1e5d1bcfa4d1da94ae2e01f0f9203c32.zip external_skia-a8ce1a0f1e5d1bcfa4d1da94ae2e01f0f9203c32.tar.gz external_skia-a8ce1a0f1e5d1bcfa4d1da94ae2e01f0f9203c32.tar.bz2 | |
Revert "memcpy_76(): add support for non-ARM architectures"
This reverts commit ad673c1cb9dd151fd4e74380c4ba82c1fefb580b.
| -rw-r--r-- | src/core/SkPaint.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp index d45bdba..a701ba5 100644 --- a/src/core/SkPaint.cpp +++ b/src/core/SkPaint.cpp @@ -150,8 +150,7 @@ SkPaint::SkPaint() { extern "C" { //Hard coded copy with size of 76 bytes. This will avoid the extra cost //of size checking branching in generic memcpy code - inline void memcpy_76(int* dst, const int* src) { -#if defined(__CPU_ARCH_ARM) + inline void memcpy_76(int* src, int* dst) { __asm__ volatile ("cpy r4, %1 \n" "cpy r5, %0 \n" "ldm r4!, {r0-r3} \n" @@ -168,12 +167,8 @@ extern "C" { : : "r" (src), "r" (dst) : "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r12"); -#else - memcpy(dst, src, 76); -#endif } } - SkPaint::SkPaint(const SkPaint& src) { //Note: need to update this when SkPaint struture/size is changed! if(sizeof(src) == 76){ |