From 06057e6f6ce06b92d552a851a91f9d6ca250970c Mon Sep 17 00:00:00 2001 From: blueswir1 Date: Wed, 6 Aug 2008 19:50:16 +0000 Subject: [PATCH] Fix faligndata (Vince Weaver) git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4992 c046a42c-6fe2-441c-8c8c-71466251a162 --- target-sparc/op_helper.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/target-sparc/op_helper.c b/target-sparc/op_helper.c index f8f94ac..3cc4f50 100644 --- a/target-sparc/op_helper.c +++ b/target-sparc/op_helper.c @@ -234,7 +234,10 @@ void helper_faligndata(void) uint64_t tmp; tmp = (*((uint64_t *)&DT0)) << ((env->gsr & 7) * 8); - tmp |= (*((uint64_t *)&DT1)) >> (64 - (env->gsr & 7) * 8); + /* on many architectures a shift of 64 does nothing */ + if ((env->gsr & 7) != 0) { + tmp |= (*((uint64_t *)&DT1)) >> (64 - (env->gsr & 7) * 8); + } *((uint64_t *)&DT0) = tmp; } -- 1.7.9.5