diff mbox

misplaced parenthesis?

Message ID 1e3eba760906230753l4e14a025y6bc07a753999483e@mail.gmail.com (mailing list archive)
State Accepted
Delegated to: kyle mcmartin
Headers show

Commit Message

Randolph Chung June 23, 2009, 2:53 p.m. UTC
Here's an updated patch:

Reported-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Randolph Chung <tausq@parisc-linux.org>



On Mon, May 18, 2009 at 9:42 AM, Randolph Chung<randolph@tausq.org> wrote:
> The wrong version of course produces different code....
>
> the original and the corrected one may produce different code depending on
> how the compiler schedules things.
>
> randolph
>
> Matt Turner wrote:
>>
>> Does gcc produce different code for the three variations?
>>
>> Matt
>>
>> On Sat, May 16, 2009 at 12:14 AM, Randolph Chung <randolph@tausq.org>
>> wrote:
>>
>>>
>>> This is a bit confusingly written, but your patch does not appear to be
>>> correct.
>>>
>>> == has higher precedence than &, so you are basically changing it to:
>>> if (likely(t1 & 1))
>>>
>>> it really should be
>>>
>>> -       if (likely(t1 & (sizeof(unsigned int)-1)) == 0) {
>>> +       if (likely((t1 & (sizeof(unsigned int)-1)) == 0)) {
>>>
>>> randolph
>>>
>>>
>>> Roel Kluin wrote:
>>>
>>>>
>>>> Fix misplaced parenthesis.
>>>>
>>>> Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
>>>> ---
>>>> I think this is what was intended? Note that this patch may affect
>>>> profiling.
>>>>
>>>> diff --git a/arch/parisc/lib/memcpy.c b/arch/parisc/lib/memcpy.c
>>>> index bbda909..30207b0 100644
>>>> --- a/arch/parisc/lib/memcpy.c
>>>> +++ b/arch/parisc/lib/memcpy.c
>>>> @@ -405,7 +405,7 @@ byte_copy:
>>>>  unaligned_copy:
>>>>       /* possibly we are aligned on a word, but not on a double... */
>>>> -       if (likely(t1 & (sizeof(unsigned int)-1)) == 0) {
>>>> +       if (likely(t1 & (sizeof(unsigned int)-1) == 0)) {
>>>>               t2 = src & (sizeof(unsigned int) - 1);
>>>>                 if (unlikely(t2 != 0)) {
>>>> --
>>>> To unsubscribe from this list: send the line "unsubscribe linux-parisc"
>>>> in
>>>> the body of a message to majordomo@vger.kernel.org
>>>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>>>>
>>>>
>>>
>>> --
>>> To unsubscribe from this list: send the line "unsubscribe linux-parisc"
>>> in
>>> the body of a message to majordomo@vger.kernel.org
>>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>>>
>>>
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-parisc" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>>
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-parisc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Andrew Morton June 25, 2009, 8:29 p.m. UTC | #1
On Tue, 23 Jun 2009 22:53:26 +0800
Randolph Chung <randolph@tausq.org> wrote:

> Here's an updated patch:
> 
> Reported-by: Roel Kluin <roel.kluin@gmail.com>
> Signed-off-by: Randolph Chung <tausq@parisc-linux.org>
> 
> diff --git a/arch/parisc/lib/memcpy.c b/arch/parisc/lib/memcpy.c
> index 2d68431..827e535 100644
> --- a/arch/parisc/lib/memcpy.c
> +++ b/arch/parisc/lib/memcpy.c
> @@ -405,7 +405,7 @@ byte_copy:
> 
>  unaligned_copy:
>         /* possibly we are aligned on a word, but not on a double... */
> -       if (likely(t1 & (sizeof(unsigned int)-1)) == 0) {
> +       if (likely((t1 & (sizeof(unsigned int)-1)) == 0)) {
>                 t2 = src & (sizeof(unsigned int) - 1);
> 
>                 if (unlikely(t2 != 0)) {
> 

I think I'll delete this email.  If someone has a patch which they
think should be applied, please resend it with a changelog.

--
To unsubscribe from this list: send the line "unsubscribe linux-parisc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Randolph Chung June 26, 2009, 1:38 a.m. UTC | #2
Kyle has merged this into the parisc tree.

thanks
randolph

Andrew Morton wrote:
> On Tue, 23 Jun 2009 22:53:26 +0800
> Randolph Chung <randolph@tausq.org> wrote:
>
>   
>> Here's an updated patch:
>>
>> Reported-by: Roel Kluin <roel.kluin@gmail.com>
>> Signed-off-by: Randolph Chung <tausq@parisc-linux.org>
>>
>> diff --git a/arch/parisc/lib/memcpy.c b/arch/parisc/lib/memcpy.c
>> index 2d68431..827e535 100644
>> --- a/arch/parisc/lib/memcpy.c
>> +++ b/arch/parisc/lib/memcpy.c
>> @@ -405,7 +405,7 @@ byte_copy:
>>
>>  unaligned_copy:
>>         /* possibly we are aligned on a word, but not on a double... */
>> -       if (likely(t1 & (sizeof(unsigned int)-1)) == 0) {
>> +       if (likely((t1 & (sizeof(unsigned int)-1)) == 0)) {
>>                 t2 = src & (sizeof(unsigned int) - 1);
>>
>>                 if (unlikely(t2 != 0)) {
>>
>>     
>
> I think I'll delete this email.  If someone has a patch which they
> think should be applied, please resend it with a changelog.
>
>   

--
To unsubscribe from this list: send the line "unsubscribe linux-parisc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/parisc/lib/memcpy.c b/arch/parisc/lib/memcpy.c
index 2d68431..827e535 100644
--- a/arch/parisc/lib/memcpy.c
+++ b/arch/parisc/lib/memcpy.c
@@ -405,7 +405,7 @@  byte_copy:

 unaligned_copy:
        /* possibly we are aligned on a word, but not on a double... */
-       if (likely(t1 & (sizeof(unsigned int)-1)) == 0) {
+       if (likely((t1 & (sizeof(unsigned int)-1)) == 0)) {
                t2 = src & (sizeof(unsigned int) - 1);

                if (unlikely(t2 != 0)) {