[Qemu-devel] [4992] Fix faligndata (Vince Weaver)

[Blue Swirl]

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;
 }