| From 63b533bf1a5f58aebca4ce7a0f717e321485d8f3 Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st> |
| Date: Sun, 26 Apr 2020 05:02:14 +0300 |
| Subject: [PATCH] arm: Fix the clang specific version of the assembly (#556) |
| |
| Also fix the same error in the comment for the non-clang case. |
| That typo there seems to have existed since the code was written |
| in that form, in e7f15f60e86 - and when the clang specific codepath |
| was added in e3d2812ce43, the typo in the comment made it into the |
| actual code. |
| --- |
| src/arm/sysv.S | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| diff --git a/src/arm/sysv.S b/src/arm/sysv.S |
| index 63180a4..74bc53f 100644 |
| --- a/src/arm/sysv.S |
| +++ b/src/arm/sysv.S |
| @@ -129,11 +129,11 @@ ARM_FUNC_START(ffi_call_VFP) |
| |
| cmp r3, #3 @ load only d0 if possible |
| #ifdef __clang__ |
| - vldrle d0, [sp] |
| - vldmgt sp, {d0-d7} |
| + vldrle d0, [r0] |
| + vldmgt r0, {d0-d7} |
| #else |
| - ldcle p11, cr0, [r0] @ vldrle d0, [sp] |
| - ldcgt p11, cr0, [r0], {16} @ vldmgt sp, {d0-d7} |
| + ldcle p11, cr0, [r0] @ vldrle d0, [r0] |
| + ldcgt p11, cr0, [r0], {16} @ vldmgt r0, {d0-d7} |
| #endif |
| add r0, r0, #64 @ discard the vfp register args |
| /* FALLTHRU */ |
| -- |
| 2.30.0.windows.2 |
| |