diff options
| author | Ben Murdoch <benm@google.com> | 2014-12-09 15:13:19 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-12-09 15:13:19 +0000 |
| commit | 99ac155aef9c2349d399360973c0e049cb92b906 (patch) | |
| tree | 7184a3c630afcb0b1a0048d25cf825e4905aaa1a | |
| parent | 95f06ba6a33dd0b2e3d099bd692bef749afcaef5 (diff) | |
| download | skia-lollipop-mr1-wfc-release.tar.gz | |
Cherry pick "Avoid crash on some 64b ARM NEON platforms."android-5.1.1_r5android-5.1.1_r28android-5.1.1_r22android-5.1.1_r17android-5.1.1_r12lollipop-mr1-wfc-releaselollipop-mr1-dev
Bug: 18297786
Original Description:
Avoid crash on some 64b ARM NEON platforms.
The compiler may choose to use x30 for a local loop counter;
ensure it's saved. Patch from kevin.petit@arm.com,
verified by benm@google.com.
R=djsollen@google.com
Committed:
https://skia.googlesource.com/skia/+/414867c00463e1405ce2234cf7591b1788d20b9f
Change-Id: Ib1c4b33a1cf9b957b01684470e9d719b730b31be
| -rw-r--r-- | src/opts/SkXfermode_opts_arm_neon.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/opts/SkXfermode_opts_arm_neon.cpp b/src/opts/SkXfermode_opts_arm_neon.cpp index dca58eb53..f6fbcd356 100644 --- a/src/opts/SkXfermode_opts_arm_neon.cpp +++ b/src/opts/SkXfermode_opts_arm_neon.cpp @@ -824,6 +824,7 @@ void SkNEONProcCoeffXfermode::xfer32(SkPMColor* SK_RESTRICT dst, */ "x0", "x1", "x2", "x3", "x4", "x5", "x6", "x7", "x8", "x9", "x10", "x11", "x12", "x13", "x14", "x15", "x16", "x17", "x18", + "x30", /* x30 implicitly clobbered by blr */ "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v16", "v17", "v18", "v19", "v20", "v21", "v22", "v23", "v24", "v25", "v26", "v27", "v28", "v29", "v30", "v31" |