From patchwork Tue Jan 16 16:45:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 124742 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp1075527lje; Tue, 16 Jan 2018 08:46:37 -0800 (PST) X-Google-Smtp-Source: ACJfBosnZh+1iI1ZO9ChSurNC0Cq2j5dtqEW/IafREoSt5mSLHL9k1TmOtLn8uWscNKO9LuRecMK X-Received: by 10.129.212.72 with SMTP id g8mr21418924ywl.90.1516121197384; Tue, 16 Jan 2018 08:46:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516121197; cv=none; d=google.com; s=arc-20160816; b=SFpyWDBbR0jGmhLUEbvKFsWkYCc0Mey25WCp5OnHT/K4bRK5/7pcK0h4oFkaZGJN7C +9r58B5Lhoe9/1Wg1tA0o+RBCyx+On7o+A/VRsTtpNr9nJJaNk/iIiC803OCxBqPuCT9 OUNZ2704WQ/cfBRNTGg9kPMVabdRs/iQiHop5DGuGuWcOBgbR9ht+OlF5tOI2InXv897 B979mcxWReK6EVtfMQK5TVMJLoNbYbwRS66ih68377BiGZt+C2yEuJYtGNeA2yC0OYnq vbY0K/bc/xX4NaABBGScAN0TqnE6ZCo27ZRKkAiF0Q0qEsot1Bot5y7o1v91JZ4keABJ zrVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=6NsXEr3flB7sBkwFuqOd8m3pcuQPwR79IBEPep8/0tE=; b=1Kt6X+YFsKacUYemjjkckUWj0FBgfjIYxWZQE2Ds9cyehJVUWMBvlNqou/9j4gPkVg j2pijo41Nir+OGPaR18qw5/rFZTE76bjMDGqtqjE8lyNi8Dl23QjQZGdQanAxktxRJpj mg+P+RNypTyt4QNqQdjwncqJZHwCY1uOL1Wswm0snuP/FIdHYb/ZhTk9NxIBekEDV+ya cMkm/i0gn4v+/SgXOufYVyv6jpK11woUrkRHpPQsWxgVzyZV3J/GjusMDGeqJmM0F1FZ NSMBJf/w1n07REM+TDi4EScJNkzPa4tD+XymaDqAtBECTGtwqVA2LmYGRLfUX9Mpb6np rQuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UT1akP8b; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id r18si580084ybj.635.2018.01.16.08.46.37 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 16 Jan 2018 08:46:37 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UT1akP8b; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:48214 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebUNg-0000UZ-Ka for patch@linaro.org; Tue, 16 Jan 2018 11:46:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52071) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebUNG-0000U0-B4 for qemu-devel@nongnu.org; Tue, 16 Jan 2018 11:46:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebUNC-0008NO-MQ for qemu-devel@nongnu.org; Tue, 16 Jan 2018 11:46:10 -0500 Received: from mail-pf0-x242.google.com ([2607:f8b0:400e:c00::242]:39642) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ebUNC-0008M2-Ef for qemu-devel@nongnu.org; Tue, 16 Jan 2018 11:46:06 -0500 Received: by mail-pf0-x242.google.com with SMTP id e11so9976601pff.6 for ; Tue, 16 Jan 2018 08:46:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6NsXEr3flB7sBkwFuqOd8m3pcuQPwR79IBEPep8/0tE=; b=UT1akP8bizUIqvSYHFEZz4m66sGKbgh7LxXoRkqzy9tPfxXOyslibJdlwh/PKpL0Lt iF98IGrg87bDOiZHBZfitmnzppPur3SCjMU36TksQn5LtSuKipNPgE5SzFnl4H/NY7mZ FR14aNnTMsQ4AeinjaCYpqUZUKTyZQ+BDZl1o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6NsXEr3flB7sBkwFuqOd8m3pcuQPwR79IBEPep8/0tE=; b=OKmqiV/uHxBazk+83o2+Igg+bMwbMjaivbgj76Z3G8EMdrsmprmgYvIuVKccVeBHXl GStya8m/ibbegPpfQFmlLKPwZP4kBxNUovg/PgvPUtNFYk5E37dj1FrZFg8+tjf/ab1d PskTu0u5FkInaHSbC/ZfRPO1Ew3JNgI8aY23vyeaGVb6oaCgq2jwts4eHF0S7SUphdqJ MNTEcB4bsq5OLMiQDXppfkGXt7uepB6xps0sBlEgoU1BwD5EfBx/iyc0oUT/up4YNUIL 8NMxhcNWjo+vTrh0lzTuFon9hWw93mdZW7O5MhGsRwogq2ZSc5A3/bcEWaUlvZ737zFo JHAw== X-Gm-Message-State: AKGB3mIXGnYGrtrDMRoDmuihUYwNIQiar59A+38vPYLKxamPT6xrp4Iz AtoZJ3ODFaCd7IwQsOUpCNiF98lPFrU= X-Received: by 10.99.97.69 with SMTP id v66mr28033366pgb.307.1516121165075; Tue, 16 Jan 2018 08:46:05 -0800 (PST) Received: from cloudburst.twiddle.net.com (24-181-135-57.dhcp.knwc.wa.charter.com. [24.181.135.57]) by smtp.gmail.com with ESMTPSA id y7sm3875780pfe.48.2018.01.16.08.46.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Jan 2018 08:46:04 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 16 Jan 2018 08:45:57 -0800 Message-Id: <20180116164600.7480-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180116164600.7480-1-richard.henderson@linaro.org> References: <20180116164600.7480-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::242 Subject: [Qemu-devel] [PULL v2 1/4] tcg/arm: Fix double-word comparisons X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The code sequence we were generating was only good for unsigned comparisons. For signed comparisions, use the sequence from gcc. Fixes booting of ppc64 firmware, with a patch changing the code sequence for ppc comparisons. Tested-by: Michael Roth Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- tcg/arm/tcg-target.inc.c | 86 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 60 insertions(+), 26 deletions(-) -- 2.14.3 diff --git a/tcg/arm/tcg-target.inc.c b/tcg/arm/tcg-target.inc.c index 98a12535a5..d7b09e8e0c 100644 --- a/tcg/arm/tcg-target.inc.c +++ b/tcg/arm/tcg-target.inc.c @@ -1103,6 +1103,56 @@ static inline void tcg_out_mb(TCGContext *s, TCGArg a0) } } +static TCGCond tcg_out_cmp2(TCGContext *s, const TCGArg *args, + const int *const_args) +{ + TCGReg al = args[0]; + TCGReg ah = args[1]; + TCGArg bl = args[2]; + TCGArg bh = args[3]; + TCGCond cond = args[4]; + int const_bl = const_args[2]; + int const_bh = const_args[3]; + + switch (cond) { + case TCG_COND_EQ: + case TCG_COND_NE: + case TCG_COND_LTU: + case TCG_COND_LEU: + case TCG_COND_GTU: + case TCG_COND_GEU: + /* We perform a conditional comparision. If the high half is + equal, then overwrite the flags with the comparison of the + low half. The resulting flags cover the whole. */ + tcg_out_dat_rI(s, COND_AL, ARITH_CMP, 0, ah, bh, const_bh); + tcg_out_dat_rI(s, COND_EQ, ARITH_CMP, 0, al, bl, const_bl); + return cond; + + case TCG_COND_LT: + case TCG_COND_GE: + /* We perform a double-word subtraction and examine the result. + We do not actually need the result of the subtract, so the + low part "subtract" is a compare. For the high half we have + no choice but to compute into a temporary. */ + tcg_out_dat_rI(s, COND_AL, ARITH_CMP, 0, al, bl, const_bl); + tcg_out_dat_rI(s, COND_AL, ARITH_SBC | TO_CPSR, + TCG_REG_TMP, ah, bh, const_bh); + return cond; + + case TCG_COND_LE: + case TCG_COND_GT: + /* Similar, but with swapped arguments, via reversed subtract. */ + tcg_out_dat_rI(s, COND_AL, ARITH_RSB | TO_CPSR, + TCG_REG_TMP, al, bl, const_bl); + tcg_out_dat_rI(s, COND_AL, ARITH_RSC | TO_CPSR, + TCG_REG_TMP, ah, bh, const_bh); + return tcg_swap_cond(cond); + + default: + g_assert_not_reached(); + } +} + #ifdef CONFIG_SOFTMMU #include "tcg-ldst.inc.c" @@ -1964,22 +2014,6 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc, tcg_out_goto_label(s, tcg_cond_to_arm_cond[args[2]], arg_label(args[3])); break; - case INDEX_op_brcond2_i32: - /* The resulting conditions are: - * TCG_COND_EQ --> a0 == a2 && a1 == a3, - * TCG_COND_NE --> (a0 != a2 && a1 == a3) || a1 != a3, - * TCG_COND_LT(U) --> (a0 < a2 && a1 == a3) || a1 < a3, - * TCG_COND_GE(U) --> (a0 >= a2 && a1 == a3) || (a1 >= a3 && a1 != a3), - * TCG_COND_LE(U) --> (a0 <= a2 && a1 == a3) || (a1 <= a3 && a1 != a3), - * TCG_COND_GT(U) --> (a0 > a2 && a1 == a3) || a1 > a3, - */ - tcg_out_dat_rIN(s, COND_AL, ARITH_CMP, ARITH_CMN, 0, - args[1], args[3], const_args[3]); - tcg_out_dat_rIN(s, COND_EQ, ARITH_CMP, ARITH_CMN, 0, - args[0], args[2], const_args[2]); - tcg_out_goto_label(s, tcg_cond_to_arm_cond[args[4]], - arg_label(args[5])); - break; case INDEX_op_setcond_i32: tcg_out_dat_rIN(s, COND_AL, ARITH_CMP, ARITH_CMN, 0, args[1], args[2], const_args[2]); @@ -1988,15 +2022,15 @@ static inline void tcg_out_op(TCGContext *s, TCGOpcode opc, tcg_out_dat_imm(s, tcg_cond_to_arm_cond[tcg_invert_cond(args[3])], ARITH_MOV, args[0], 0, 0); break; + + case INDEX_op_brcond2_i32: + c = tcg_out_cmp2(s, args, const_args); + tcg_out_goto_label(s, tcg_cond_to_arm_cond[c], arg_label(args[5])); + break; case INDEX_op_setcond2_i32: - /* See brcond2_i32 comment */ - tcg_out_dat_rIN(s, COND_AL, ARITH_CMP, ARITH_CMN, 0, - args[2], args[4], const_args[4]); - tcg_out_dat_rIN(s, COND_EQ, ARITH_CMP, ARITH_CMN, 0, - args[1], args[3], const_args[3]); - tcg_out_dat_imm(s, tcg_cond_to_arm_cond[args[5]], - ARITH_MOV, args[0], 0, 1); - tcg_out_dat_imm(s, tcg_cond_to_arm_cond[tcg_invert_cond(args[5])], + c = tcg_out_cmp2(s, args + 1, const_args + 1); + tcg_out_dat_imm(s, tcg_cond_to_arm_cond[c], ARITH_MOV, args[0], 0, 1); + tcg_out_dat_imm(s, tcg_cond_to_arm_cond[tcg_invert_cond(c)], ARITH_MOV, args[0], 0, 0); break; @@ -2093,9 +2127,9 @@ static const TCGTargetOpDef *tcg_target_op_def(TCGOpcode op) static const TCGTargetOpDef sub2 = { .args_ct_str = { "r", "r", "rI", "rI", "rIN", "rIK" } }; static const TCGTargetOpDef br2 - = { .args_ct_str = { "r", "r", "rIN", "rIN" } }; + = { .args_ct_str = { "r", "r", "rI", "rI" } }; static const TCGTargetOpDef setc2 - = { .args_ct_str = { "r", "r", "r", "rIN", "rIN" } }; + = { .args_ct_str = { "r", "r", "r", "rI", "rI" } }; switch (op) { case INDEX_op_goto_ptr: