From patchwork Fri Nov 3 08:40:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 10039689 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 86E6E60384 for ; Fri, 3 Nov 2017 08:42:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 75B5E29551 for ; Fri, 3 Nov 2017 08:42:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6AA762955B; Fri, 3 Nov 2017 08:42:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E10282955E for ; Fri, 3 Nov 2017 08:42:12 +0000 (UTC) Received: from localhost ([::1]:35416 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eAXYK-0002Bn-3K for patchwork-qemu-devel@patchwork.kernel.org; Fri, 03 Nov 2017 04:42:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48438) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eAXX6-00029u-Ox for qemu-devel@nongnu.org; Fri, 03 Nov 2017 04:40:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eAXX4-0002Ri-9C for qemu-devel@nongnu.org; Fri, 03 Nov 2017 04:40:56 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:49386) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eAXX4-0002Qh-3O for qemu-devel@nongnu.org; Fri, 03 Nov 2017 04:40:54 -0400 Received: by mail-wm0-x242.google.com with SMTP id b189so3382390wmd.4 for ; Fri, 03 Nov 2017 01:40:53 -0700 (PDT) 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=xbCD6ZopTFgQK0anWBQ0BbvGGkrHG3DYaUP6xslNLEU=; b=GVU9HTCsZIQNjyhD3U8mCQsWMyWO6FSbo3uOAypnlKOShkOYKyhvVGygm1Ulk5Kjfl yx5MTS/VfvQcsyx+X/xAqO1KPBtgugK4OqsAU1DjcJzN7LjIVTi4/+KjSuweDC90Fvpk LCLCg/7A/jqiwAxgymYlcHEgOH3jss0RwwRAo= 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=xbCD6ZopTFgQK0anWBQ0BbvGGkrHG3DYaUP6xslNLEU=; b=ofZ+qkq50qNb4qJnURKXzXGjgGSu/9iqDADzYFQS4BuZbn9/G2mlzsNOZnaN0P3arr ZpfTnzwvR1PfV8LWoe4dG8MCmxtNh7l2W8LEaoSaWfWp0EkG4ZK3/Sk9QJeebaDqMLZy W2yFJYQcpbbx+9GgVZb/S1Lhf/ue9CIvy0QlMGZ0lzmRRgccTq35dq77sNCQWRnuz7sG qDV7Y8iQzMIuRTLS6ixh8oXAZ3MKPcGa+YgjUxlAjqxdkGXF1BH1GWK8ItbC/0OxzkuV 4QyKhSN97Zg1eHt82IRccIKq7BeBh1Pu5lvAL8+aC2L3RowEGabuJMBsWNsU+CJDBNgs RbvA== X-Gm-Message-State: AJaThX71by28gLRm61+HA1FMWs+1B0KhrjmtLquGleJxURpRW2uqqiEI tVdwRm3T62NhqinLIdax3k0X+bYcXhM= X-Google-Smtp-Source: ABhQp+TV9elW/myJ8O9AJvLKqJWubRcr8ojtwdQqyCr5e9jgemVO9V+aVgc0ZRK9HCzcIOTUDiiqhw== X-Received: by 10.28.95.70 with SMTP id t67mr4033712wmb.86.1509698452774; Fri, 03 Nov 2017 01:40:52 -0700 (PDT) Received: from cloudburst.twiddle.net.ASUS (p57A4515F.dip0.t-ipconnect.de. [87.164.81.95]) by smtp.gmail.com with ESMTPSA id e6sm12548347wrg.53.2017.11.03.01.40.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 03 Nov 2017 01:40:52 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 3 Nov 2017 09:40:45 +0100 Message-Id: <20171103084046.12821-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171103084046.12821-1-richard.henderson@linaro.org> References: <20171103084046.12821-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PULL 2/3] tcg/s390x: Use constant pool for prologue 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, qemu-s390x@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Rather than have separate code only used for guest_base, rely on a recent change to handle constant pool entries. Cc: qemu-s390x@nongnu.org Signed-off-by: Richard Henderson --- tcg/s390/tcg-target.inc.c | 44 ++++++++++++-------------------------------- 1 file changed, 12 insertions(+), 32 deletions(-) diff --git a/tcg/s390/tcg-target.inc.c b/tcg/s390/tcg-target.inc.c index 38a7cdab75..9af6dcef05 100644 --- a/tcg/s390/tcg-target.inc.c +++ b/tcg/s390/tcg-target.inc.c @@ -555,9 +555,6 @@ static void tcg_out_mov(TCGContext *s, TCGType type, TCGReg dst, TCGReg src) static const S390Opcode lli_insns[4] = { RI_LLILL, RI_LLILH, RI_LLIHL, RI_LLIHH }; -static const S390Opcode ii_insns[4] = { - RI_IILL, RI_IILH, RI_IIHL, RI_IIHH -}; static bool maybe_out_small_movi(TCGContext *s, TCGType type, TCGReg ret, tcg_target_long sval) @@ -647,36 +644,19 @@ static void tcg_out_movi_int(TCGContext *s, TCGType type, TCGReg ret, return; } - /* When allowed, stuff it in the constant pool. */ - if (!in_prologue) { - if (USE_REG_TB) { - tcg_out_insn(s, RXY, LG, ret, TCG_REG_TB, TCG_REG_NONE, 0); - new_pool_label(s, sval, R_390_20, s->code_ptr - 2, - -(intptr_t)s->code_gen_ptr); - } else { - tcg_out_insn(s, RIL, LGRL, ret, 0); - new_pool_label(s, sval, R_390_PC32DBL, s->code_ptr - 2, 2); - } - return; - } - - /* What's left is for the prologue, loading GUEST_BASE, and because - it failed to match above, is known to be a full 64-bit quantity. - We could try more than this, but it probably wouldn't pay off. */ - if (s390_facilities & FACILITY_EXT_IMM) { - tcg_out_insn(s, RIL, LLILF, ret, uval); - tcg_out_insn(s, RIL, IIHF, ret, uval >> 32); + /* Otherwise, stuff it in the constant pool. */ + if (s390_facilities & FACILITY_GEN_INST_EXT) { + tcg_out_insn(s, RIL, LGRL, ret, 0); + new_pool_label(s, sval, R_390_PC32DBL, s->code_ptr - 2, 2); + } else if (USE_REG_TB && !in_prologue) { + tcg_out_insn(s, RXY, LG, ret, TCG_REG_TB, TCG_REG_NONE, 0); + new_pool_label(s, sval, R_390_20, s->code_ptr - 2, + -(intptr_t)s->code_gen_ptr); } else { - const S390Opcode *insns = lli_insns; - int i; - - for (i = 0; i < 4; i++) { - uint16_t part = uval >> (16 * i); - if (part) { - tcg_out_insn_RI(s, insns[i], ret, part); - insns = ii_insns; - } - } + TCGReg base = ret ? ret : TCG_TMP0; + tcg_out_insn(s, RIL, LARL, base, 0); + new_pool_label(s, sval, R_390_PC32DBL, s->code_ptr - 2, 2); + tcg_out_insn(s, RXY, LG, ret, base, TCG_REG_NONE, 0); } }