From: Aurelien Jarno <aurelien@aurel32.net>
Date: Mon, 18 May 2015 13:39:58 +0000 (+0200)
Subject: target-s390x: fix CC computation for LOAD POSITIVE instructions
X-Git-Tag: v2.4.0-rc0~97^2~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2aaa1940684a3bf2b381fd2a8ff26c287a05109d;p=thirdparty%2Fqemu.git

target-s390x: fix CC computation for LOAD POSITIVE instructions

LOAD POSITIVE instructions (LPR, LPGR and LPGFR) set the following
condition code:
  0: Result zero; no overflow
  1: --
  2: Result greater than zero; no overflow
  3: Overflow

The current code wrongly returns 1 instead of 2 in case of a result
greater than 0. This patches fixes that. This fixes the marshalling of
the value '0L' in Python.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Alexander Graf <agraf@suse.de>
---

diff --git a/target-s390x/cc_helper.c b/target-s390x/cc_helper.c
index 00bc883a8a7..bfce3f1e600 100644
--- a/target-s390x/cc_helper.c
+++ b/target-s390x/cc_helper.c
@@ -195,7 +195,7 @@ static uint32_t cc_calc_abs_64(int64_t dst)
     if ((uint64_t)dst == 0x8000000000000000ULL) {
         return 3;
     } else if (dst) {
-        return 1;
+        return 2;
     } else {
         return 0;
     }
@@ -296,7 +296,7 @@ static uint32_t cc_calc_abs_32(int32_t dst)
     if ((uint32_t)dst == 0x80000000UL) {
         return 3;
     } else if (dst) {
-        return 1;
+        return 2;
     } else {
         return 0;
     }