AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix android roll

Browse Source 
Guarding loads of 8-15 with defined(__AVX2__) should prevent errors
like these:

    external/skia/src/jumper/SkJumper_stages_lowp.cpp:287:46: error:
    'memcpy' called with size bigger than buffer
            case 12: memcpy(&v, ptr, 12*sizeof(T)); break;

The loads of 8-15 were of course unreachable, given the &(N-1) == &7.

Change-Id: Ifcb5c177c6909e1df55cb564779a4d6610ff7b32
Reviewed-on: https://skia-review.googlesource.com/46521
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>
This commit is contained in:
Mike Klein 2017-09-14 09:16:34 -04:00 committed by Skia Commit-Bot
parent 5f567c78dd
commit f419c44193
3 changed files with 5705 additions and 5696 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5698
src/jumper/SkJumper_generated.S
View File

File diff suppressed because it is too large Load Diff

5699
src/jumper/SkJumper_generated_win.S
View File

File diff suppressed because it is too large Load Diff

4
src/jumper/SkJumper_stages_lowp.cpp
View File

@ -281,6 +281,7 @@ SI V load(const T* ptr, size_t tail) {
V v = 0; V v = 0;
switch (tail & (N-1)) { switch (tail & (N-1)) {
case 0: memcpy(&v, ptr, sizeof(v)); break; case 0: memcpy(&v, ptr, sizeof(v)); break;
#if defined(__AVX2__)
case 15: v[14] = ptr[14]; case 15: v[14] = ptr[14];
case 14: v[13] = ptr[13]; case 14: v[13] = ptr[13];
case 13: v[12] = ptr[12]; case 13: v[12] = ptr[12];
@ -289,6 +290,7 @@ SI V load(const T* ptr, size_t tail) {
case 10: v[ 9] = ptr[ 9]; case 10: v[ 9] = ptr[ 9];
case 9: v[ 8] = ptr[ 8]; case 9: v[ 8] = ptr[ 8];
case 8: memcpy(&v, ptr, 8*sizeof(T)); break; case 8: memcpy(&v, ptr, 8*sizeof(T)); break;
#endif
case 7: v[ 6] = ptr[ 6]; case 7: v[ 6] = ptr[ 6];
case 6: v[ 5] = ptr[ 5]; case 6: v[ 5] = ptr[ 5];
case 5: v[ 4] = ptr[ 4]; case 5: v[ 4] = ptr[ 4];
@ -303,6 +305,7 @@ template <typename V, typename T>
SI void store(T* ptr, size_t tail, V v) { SI void store(T* ptr, size_t tail, V v) {
switch (tail & (N-1)) { switch (tail & (N-1)) {
case 0: memcpy(ptr, &v, sizeof(v)); break; case 0: memcpy(ptr, &v, sizeof(v)); break;
#if defined(__AVX2__)
case 15: ptr[14] = v[14]; case 15: ptr[14] = v[14];
case 14: ptr[13] = v[13]; case 14: ptr[13] = v[13];
case 13: ptr[12] = v[12]; case 13: ptr[12] = v[12];
@ -311,6 +314,7 @@ SI void store(T* ptr, size_t tail, V v) {
case 10: ptr[ 9] = v[ 9]; case 10: ptr[ 9] = v[ 9];
case 9: ptr[ 8] = v[ 8]; case 9: ptr[ 8] = v[ 8];
case 8: memcpy(ptr, &v, 8*sizeof(T)); break; case 8: memcpy(ptr, &v, 8*sizeof(T)); break;
#endif
case 7: ptr[ 6] = v[ 6]; case 7: ptr[ 6] = v[ 6];
case 6: ptr[ 5] = v[ 5]; case 6: ptr[ 5] = v[ 5];
case 5: ptr[ 4] = v[ 4]; case 5: ptr[ 4] = v[ 4];