From patchwork Fri Apr 5 18:47:41 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 234257 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 667352C00E7 for ; Sat, 6 Apr 2013 05:54:09 +1100 (EST) Received: from localhost ([::1]:39776 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UOBm3-00079T-MN for incoming@patchwork.ozlabs.org; Fri, 05 Apr 2013 14:54:07 -0400 Received: from eggs.gnu.org ([208.118.235.92]:51538) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UOBgj-0005RF-Pu for qemu-devel@nongnu.org; Fri, 05 Apr 2013 14:48:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UOBgg-0003tD-86 for qemu-devel@nongnu.org; Fri, 05 Apr 2013 14:48:37 -0400 Received: from mail-qc0-x22e.google.com ([2607:f8b0:400d:c01::22e]:34546) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UOBgf-0003t6-UT for qemu-devel@nongnu.org; Fri, 05 Apr 2013 14:48:34 -0400 Received: by mail-qc0-f174.google.com with SMTP id z24so1024197qcq.19 for ; Fri, 05 Apr 2013 11:48:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=7iAwve3lBMuph50DfhRv5NFdG4ktYBMVL2MWpmRtzCQ=; b=vNYuGeg+lTv7A+9Dz2mZ8IQaCv+j2zssZt9LAKphB2cuvC895uF3Kd9i4PswpQr2B/ 0EuokuHTS6hWuK88DvP3ImS3QAaT3vQCrEJl4TojYBCdW/R3mC+jGlSsbZgHa407rAPJ H6qZkgjeQR2xk6E3vR0KiGQLfH3vnO2x7xjR1ySHvNfcWl1Xaj6spwsBjmRYrJHAQy0Y bBfkMHIdPDcB+bIgZCU5mbdF7zWrtzmIvOZVDbFBgTxwr+pF7wLi6L/7PhRfrzJwGdVm TeUTXfu4uQETuQmuL+Y9Tjwb4SFE5pewOfM2eXvGN8WvNQ4u3tIO8xiip/gYTVhqROKm B+bQ== X-Received: by 10.49.97.130 with SMTP id ea2mr10737382qeb.23.1365187713592; Fri, 05 Apr 2013 11:48:33 -0700 (PDT) Received: from pebble.com (107-1-53-7-ip-static.hfc.comcastbusiness.net. [107.1.53.7]) by mx.google.com with ESMTPS id k8sm14592771qej.2.2013.04.05.11.48.32 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 05 Apr 2013 11:48:32 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 5 Apr 2013 13:47:41 -0500 Message-Id: <1365187661-17023-14-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1365187661-17023-1-git-send-email-rth@twiddle.net> References: <1365187661-17023-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400d:c01::22e Cc: aliguori@us.ibm.com, aurelien@aurel32.net Subject: [Qemu-devel] [PULL v2 13/13] tcg-s390: Fix merge error in tgen_brcond X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org When the TCG condition codes were re-organized last year, we failed to update all of the "old-style" tests for unsigned. Signed-off-by: Richard Henderson --- tcg/s390/tcg-target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tcg/s390/tcg-target.c b/tcg/s390/tcg-target.c index 8e660b3..7d6f777 100644 --- a/tcg/s390/tcg-target.c +++ b/tcg/s390/tcg-target.c @@ -1231,7 +1231,7 @@ static void tgen_brcond(TCGContext *s, TCGType type, TCGCond c, int cc; if (facilities & FACILITY_GEN_INST_EXT) { - bool is_unsigned = (c > TCG_COND_GT); + bool is_unsigned = is_unsigned_cond(c); bool in_range; S390Opcode opc;