summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2015-11-02 15:05:34 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2015-11-26 16:47:44 +0100
commit12a3567c4099be194b44987ac5d7d65b99bcfab7 (patch)
treed547e9aae99a9d48ec9559ec908a8b11bb41016d
parentbfc2a1a1f41c2861b20e8318c0541d0823427802 (diff)
downloadfocaccia-qemu-12a3567c4099be194b44987ac5d7d65b99bcfab7.tar.gz
focaccia-qemu-12a3567c4099be194b44987ac5d7d65b99bcfab7.zip
target-sparc: fix 32-bit truncation in fpackfix
This is reported by Coverity.  The algorithm description at
ftp://ftp.icm.edu.pl/packages/ggi/doc/hw/sparc/Sparc.pdf suggests
that the 32-bit parts of rs2, after the left shift, is treated
as a 64-bit integer.  Bits 32 and above are used to do the
saturating truncation.

Message-Id: <1446473134-4330-1-git-send-email-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--target-sparc/vis_helper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/target-sparc/vis_helper.c b/target-sparc/vis_helper.c
index 383cc8bdff..45fc7dbe81 100644
--- a/target-sparc/vis_helper.c
+++ b/target-sparc/vis_helper.c
@@ -447,7 +447,7 @@ uint32_t helper_fpackfix(uint64_t gsr, uint64_t rs2)
     for (word = 0; word < 2; word++) {
         uint32_t val;
         int32_t src = rs2 >> (word * 32);
-        int64_t scaled = src << scale;
+        int64_t scaled = (int64_t)src << scale;
         int64_t from_fixed = scaled >> 16;
 
         val = (from_fixed < -32768 ? -32768 :