From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1KQp1Z-0003ww-Jf
	for qemu-devel@nongnu.org; Wed, 06 Aug 2008 15:50:21 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1KQp1Y-0003wP-Hj
	for qemu-devel@nongnu.org; Wed, 06 Aug 2008 15:50:21 -0400
Received: from [199.232.76.173] (port=48772 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1KQp1Y-0003wL-As
	for qemu-devel@nongnu.org; Wed, 06 Aug 2008 15:50:20 -0400
Received: from savannah.gnu.org ([199.232.41.3]:50079 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <blauwirbel@gmail.com>)
	id 1KQp1X-0007Jg-SA
	for qemu-devel@nongnu.org; Wed, 06 Aug 2008 15:50:20 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <blauwirbel@gmail.com>) id 1KQp1V-0007vr-Q2
	for qemu-devel@nongnu.org; Wed, 06 Aug 2008 19:50:17 +0000
Received: from blueswir1 by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <blueswir1@savannah.gnu.org>) id 1KQp1V-0007vm-70
	for qemu-devel@nongnu.org; Wed, 06 Aug 2008 19:50:17 +0000
MIME-Version: 1.0
Errors-To: blueswir1
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Blue Swirl <blauwirbel@gmail.com>
Message-Id: <E1KQp1V-0007vm-70@cvs.savannah.gnu.org>
Date: Wed, 06 Aug 2008 19:50:17 +0000
Subject: [Qemu-devel] [4992] Fix faligndata (Vince Weaver)
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 4992
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4992
Author:   blueswir1
Date:     2008-08-06 19:50:16 +0000 (Wed, 06 Aug 2008)

Log Message:
-----------
Fix faligndata (Vince Weaver)

Modified Paths:
--------------
    trunk/target-sparc/op_helper.c

Modified: trunk/target-sparc/op_helper.c
===================================================================
--- trunk/target-sparc/op_helper.c	2008-08-06 18:16:08 UTC (rev 4991)
+++ trunk/target-sparc/op_helper.c	2008-08-06 19:50:16 UTC (rev 4992)
@@ -234,7 +234,10 @@
     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;
 }