From: Thomas Rast <trast@inf.ethz.ch>
To: "René Scharfe" <rene.scharfe@lsrfire.ath.cx>
Cc: "Øyvind A. Holm" <sunny@sunbase.org>,
"Junio C Hamano" <gitster@pobox.com>,
git@vger.kernel.org, "Thomas Rast" <trast@student.ethz.ch>
Subject: Re: [PATCH 2/3] xdiff: avoid more compiler warnings with XDL_FAST_HASH on 32-bit machines
Date: Wed, 23 May 2012 10:30:38 +0200 [thread overview]
Message-ID: <8762bn7101.fsf@thomas.inf.ethz.ch> (raw)
In-Reply-To: <4FBBF8D7.7050701@lsrfire.ath.cx> ("René Scharfe"'s message of "Tue, 22 May 2012 22:36:39 +0200")
René Scharfe <rene.scharfe@lsrfire.ath.cx> writes:
> Hide literals that can cause compiler warnings for 32-bit architectures in
> expressions that evaluate to small numbers there. Some compilers warn that
> 0x0001020304050608 won't fit into a 32-bit long, others that shifting right
> by 56 bits clears a 32-bit value completely.
>
> The correct values are calculated in the 64-bit case, which is all that matters
> in this if-branch.
>
> Reported-by: Øyvind A. Holm <sunny@sunbase.org>
> Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Thanks for fixing this. As far as logic and review goes, both patches
Acked-by: Thomas Rast <trast@student.ethz.ch>
I haven't checked whether it actually fixes the warnings, however.
> ---
> xdiff/xutils.c | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
>
> diff --git a/xdiff/xutils.c b/xdiff/xutils.c
> index 8580da7..78549e3 100644
> --- a/xdiff/xutils.c
> +++ b/xdiff/xutils.c
> @@ -272,7 +272,13 @@ static inline long count_masked_bytes(unsigned long mask)
> * that works for the bytemasks without having to
> * mask them first.
> */
> - return mask * 0x0001020304050608 >> 56;
> + /*
> + * return mask * 0x0001020304050608 >> 56;
> + *
> + * Doing it like this avoids warnings on 32-bit machines.
> + */
> + long a = (REPEAT_BYTE(0x01) / 0xff + 1);
> + return mask * a >> (sizeof(long) * 7);
> } else {
> /*
> * Modified Carl Chatfield G+ version for 32-bit *
--
Thomas Rast
trast@{inf,student}.ethz.ch
next prev parent reply other threads:[~2012-05-23 8:30 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-16 23:31 tr/xdiff-fast-hash generates warnings and breaks tests Øyvind A. Holm
2012-05-17 7:11 ` René Scharfe
2012-05-17 9:33 ` Øyvind A. Holm
2012-05-17 16:23 ` Junio C Hamano
2012-05-17 18:40 ` René Scharfe
2012-05-19 14:17 ` Øyvind A. Holm
2012-05-22 20:36 ` [PATCH 1/3] xdiff: avoid compiler warnings with XDL_FAST_HASH on 32-bit machines René Scharfe
2012-05-22 20:36 ` [PATCH 2/3] xdiff: avoid more " René Scharfe
2012-05-23 8:30 ` Thomas Rast [this message]
2012-05-22 20:36 ` [PATCH 3/3] xdiff: import new 32-bit version of count_masked_bytes() René Scharfe
2012-05-25 15:18 ` Øyvind A. Holm
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8762bn7101.fsf@thomas.inf.ethz.ch \
--to=trast@inf.ethz.ch \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=rene.scharfe@lsrfire.ath.cx \
--cc=sunny@sunbase.org \
--cc=trast@student.ethz.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).