From: Gabriel F. T. Gomes Date: Tue, 12 Apr 2016 16:11:29 +0000 (-0300) Subject: powerpc: Fix operand prefixes X-Git-Tag: glibc-2.24~288 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb3b8a4924502e508d5b353ed75f39826d2c9466;p=thirdparty%2Fglibc.git powerpc: Fix operand prefixes The file sysdeps/powerpc/sysdeps.h defines aliases for condition register operands. E.g.: 'cr7' means condition register 7. On the one hand, this increases readability, as it makes it easier for readers to know whether the operand is a condition register, a general purpose register or an immediate. On the other hand, this permits that condition registers be written as if they were general purpose, and vice-versa, thus reducing the readability of the code. This commit removes some of these unintentional misuses. The changes have no effect on the final code. Checked with objdump. --- diff --git a/ChangeLog b/ChangeLog index d5f56c9c9bf..8fcb047815f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2016-05-04 Gabriel F. T. Gomes + + * sysdeps/powerpc/powerpc64/power8/strncpy.S: Fix use of condition + registers specifiers where general purpose registers specifiers should + have been used. + 2016-05-04 Florian Weimer [BZ #19779] diff --git a/sysdeps/powerpc/powerpc64/power8/strncpy.S b/sysdeps/powerpc/powerpc64/power8/strncpy.S index 0bb3bd46d71..437edeb7159 100644 --- a/sysdeps/powerpc/powerpc64/power8/strncpy.S +++ b/sysdeps/powerpc/powerpc64/power8/strncpy.S @@ -294,7 +294,7 @@ L(pagecross): #endif orc r9,r7,r9 /* Mask bits that are not part of the string. */ - li cr7,0 + li r7,0 cmpb r9,r9,r7 /* Check for null bytes in DWORD1. */ cmpdi cr7,r9,0 bne cr7,L(short_path_prepare_2) @@ -305,14 +305,14 @@ L(pagecross): /* For next checks we have aligned address, so we check for more three doublewords to make sure we can read 16 unaligned bytes to start the bulk copy with 16 aligned addresses. */ - ld cr7,8(r11) + ld r7,8(r11) cmpb r9,r7,r9 cmpdi cr7,r9,0 bne cr7,L(short_path_prepare_2) - addi cr7,r8,-8 + addi r7,r8,-8 cmpldi cr7,r7,8 ble cr7,L(short_path_prepare_2) - ld cr7,16(r11) + ld r7,16(r11) cmpb r9,r7,r9 cmpdi cr7,r9,0 bne cr7,L(short_path_prepare_2)