|
 |
00c0d4 |
From 82c7441f04e3c2a653ee29672731e040a1799c6b Mon Sep 17 00:00:00 2001
|
|
|
00c0d4 |
From: Matheus Castanho <msc@linux.ibm.com>
|
|
|
00c0d4 |
Date: Tue, 7 Jun 2022 10:27:26 -0300
|
|
|
00c0d4 |
Subject: powerpc: Fix VSX register number on __strncpy_power9 [BZ #29197]
|
|
|
00c0d4 |
|
|
|
00c0d4 |
__strncpy_power9 initializes VR 18 with zeroes to be used throughout the
|
|
|
00c0d4 |
code, including when zero-padding the destination string. However, the
|
|
|
00c0d4 |
v18 reference was mistakenly being used for stxv and stxvl, which take a
|
|
|
00c0d4 |
VSX vector as operand. The code ended up using the uninitialized VSR 18
|
|
|
00c0d4 |
register by mistake.
|
|
|
00c0d4 |
|
|
|
00c0d4 |
Both occurrences have been changed to use the proper VSX number for VR 18
|
|
|
00c0d4 |
(i.e. VSR 50).
|
|
|
00c0d4 |
|
|
|
00c0d4 |
Tested on powerpc, powerpc64 and powerpc64le.
|
|
|
00c0d4 |
|
|
|
00c0d4 |
Signed-off-by: Kewen Lin <linkw@gcc.gnu.org>
|
|
|
00c0d4 |
(cherry picked from commit 0218463dd8265ed937622f88ac68c7d984fe0cfc)
|
|
|
00c0d4 |
|
|
|
00c0d4 |
diff --git a/sysdeps/powerpc/powerpc64/le/power9/strncpy.S b/sysdeps/powerpc/powerpc64/le/power9/strncpy.S
|
|
|
00c0d4 |
index 291941c1e5..5421525ace 100644
|
|
|
00c0d4 |
--- a/sysdeps/powerpc/powerpc64/le/power9/strncpy.S
|
|
|
00c0d4 |
+++ b/sysdeps/powerpc/powerpc64/le/power9/strncpy.S
|
|
|
00c0d4 |
@@ -352,7 +352,7 @@ L(zero_padding_loop):
|
|
|
00c0d4 |
cmpldi cr6,r5,16 /* Check if length was reached. */
|
|
|
00c0d4 |
ble cr6,L(zero_padding_end)
|
|
|
00c0d4 |
|
|
|
00c0d4 |
- stxv v18,0(r11)
|
|
|
00c0d4 |
+ stxv 32+v18,0(r11)
|
|
|
00c0d4 |
addi r11,r11,16
|
|
|
00c0d4 |
addi r5,r5,-16
|
|
|
00c0d4 |
|
|
|
00c0d4 |
@@ -360,7 +360,7 @@ L(zero_padding_loop):
|
|
|
00c0d4 |
|
|
|
00c0d4 |
L(zero_padding_end):
|
|
|
00c0d4 |
sldi r10,r5,56 /* stxvl wants size in top 8 bits */
|
|
|
00c0d4 |
- stxvl v18,r11,r10 /* Partial store */
|
|
|
00c0d4 |
+ stxvl 32+v18,r11,r10 /* Partial store */
|
|
|
00c0d4 |
blr
|
|
|
00c0d4 |
|
|
|
00c0d4 |
.align 4
|