From patchwork Wed Feb 17 20:20:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 383906 Delivered-To: patch@linaro.org Received: by 2002:a02:c80e:0:0:0:0:0 with SMTP id p14csp3139310jao; Wed, 17 Feb 2021 13:13:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJxXxLm/ahgiCC2kxJ7NTEVqOzLTAtuiIF4UMXggFi2Rh3Qis7YCSMLjnLcZVIymZY0xTTN8 X-Received: by 2002:a25:cb8a:: with SMTP id b132mr2292588ybg.58.1613596421133; Wed, 17 Feb 2021 13:13:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1613596421; cv=none; d=google.com; s=arc-20160816; b=OuapV+q5dkRHdbeST7hklJuQ59S9lEb+0X/vsG4ImKPsiKw0CtykHap9rAfYQsl2Om 0/FLS5gpylPTJOeX5pvEHSFTExtsY+ygo9/HqYm0HJzF8r3iogurMHBftUe+PzfdZjxi AqV6To6hWw86/Pq5YC7yNIYEEckrfoWZavf98JlAz0Tw/1HUUq53UuLTkhkz9ryRg9cL L0wy7cmavl9AbAPVrnIBizvqZ1+B6cJrPiktQuu8krAXdkhQarpgVNbmS3UEP/m2X+y2 7gxBiX7z/0w7e5BiV8c7MLXPyDj0hwo2CcTmVq5qgyqxsopmHCT8hTu88fTRKeaRe+kq M1bA== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=Kpfe6JZmwXM15Cw7O9Ulgnnkm0DVoqv1s4+DGCwKajc=; b=BrWrB74XBU7AYPeWoTfy8hQkkb+tgtbDIjU5dbtaacmNpNuJRgx7vEaU/Uuqu76arX /AGOejW3wJdNPUJ4BbhhQnToEX6dA5s3A1X6GOvprvYSexejXuYGFRUJcZ4+HmMIbpeR K1Z2iuoVnp+fj8rYBlAHc8l3/4vqShWzCLcutyM88DkaWAurPSfx585y7CRK6IQPJp3Z wlH14MWafZJrAqvQn1jt3YLpAcYcoh3ja2CRT8ak0n2TIqLXIZfW5Y216Z+f5MzQMqwk ulYLH63SVd6MZ3PisjRksJnVnJsA25WrqIYxwo0uzC5W03sbz7UI3aIcRXDBmztr4Ezm BbcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=sw3uO+4P; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id y10si3928296ybe.5.2021.02.17.13.13.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Feb 2021 13:13:41 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=sw3uO+4P; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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]:59406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lCU8i-0001m1-Le for patch@linaro.org; Wed, 17 Feb 2021 16:13:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33332) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lCTMV-00018R-NB for qemu-devel@nongnu.org; Wed, 17 Feb 2021 15:23:51 -0500 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]:37101) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lCTMU-0007cZ-4a for qemu-devel@nongnu.org; Wed, 17 Feb 2021 15:23:51 -0500 Received: by mail-pl1-x631.google.com with SMTP id d15so8039313plh.4 for ; Wed, 17 Feb 2021 12:23:49 -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 :mime-version:content-transfer-encoding; bh=Kpfe6JZmwXM15Cw7O9Ulgnnkm0DVoqv1s4+DGCwKajc=; b=sw3uO+4Pc571fxp22wc+dRQWWY/hHiIjpfm15qKE/kIViK6iyATF6i85Pzovx8wSu9 LuPRJLtJ9KwmXeBKKI/CDNiJTjpKKl1+FXJ9HQdH4fFz+xjfp9OjgNBI9otqw7F07EJh CEd+zdRffqp14ks4C7wT9LcGBrnpYKlaYz/3xfeaE/IEjnJibQqmGlMMvGIxxlLQYh3u Vr0KWo+ZwYVqvj1VexRl2xYisM6cRua/GP3wTOuHKjPHfXonPb6hXu4tTcKp4NFGFldP y8Ni61QzUBjkcwnljqiGsvgmxPnIli7ObNSQwPhkZ9DIMQ60E3jNy9bhvBU8y8umbW43 x51A== 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:mime-version:content-transfer-encoding; bh=Kpfe6JZmwXM15Cw7O9Ulgnnkm0DVoqv1s4+DGCwKajc=; b=WQrpyatDh8GxCGq3IHNuqLj2avV2rleRAxLnKL7KkwBF4+7ygKJneS4UazbdnczksS lMLTqaOclBc3MuVzuvSYFRL6zJxdoUXtrPrcuyiys5pzZcoEm2AdMm9nHEyPWnWuHLkh 6nBa9YhRN53RT4/D4H8xEddPPSrs76eVYRJMyzJXlUR8ACcZ2w8mNzzpAAFnR1l2jg8T qXNkkwBFS/j9bFqwfRKryzR1x0SW0stqMhD/nJeyQGEPh7j2is9VeG9yLXlLwCbX5Swn zS8i0wTpeHBc+YWSoZJgA/InPrpmf8Qetq5D1TdvGhOBImBEsNoWFFihECllryCmh5AM Kt1g== X-Gm-Message-State: AOAM530w7KrJzHeRn83zZR8YROiflkrHhijljV1sdzZOed9euvbYbkOL iGWGkX8yt+ifkEn0mRt/RyVMmeb1m1VcWA== X-Received: by 2002:a17:90a:ee96:: with SMTP id i22mr514322pjz.157.1613593428986; Wed, 17 Feb 2021 12:23:48 -0800 (PST) Received: from localhost.localdomain (047-051-160-125.biz.spectrum.com. [47.51.160.125]) by smtp.gmail.com with ESMTPSA id v126sm3232038pfv.163.2021.02.17.12.23.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Feb 2021 12:23:48 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v4 45/71] tcg/tci: Split out tcg_out_op_rr Date: Wed, 17 Feb 2021 12:20:10 -0800 Message-Id: <20210217202036.1724901-46-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210217202036.1724901-1-richard.henderson@linaro.org> References: <20210217202036.1724901-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::631; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x631.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: sw@weilnetz.de, alex.bennee@linaro.org, f4bug@amsat.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" At the same time, validate the type argument in tcg_out_mov. Signed-off-by: Richard Henderson --- tcg/tci/tcg-target.c.inc | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) -- 2.25.1 diff --git a/tcg/tci/tcg-target.c.inc b/tcg/tci/tcg-target.c.inc index cb0cbbb8da..272e3ca70b 100644 --- a/tcg/tci/tcg-target.c.inc +++ b/tcg/tci/tcg-target.c.inc @@ -303,6 +303,17 @@ static void tcg_out_op_p(TCGContext *s, TCGOpcode op, void *p0) old_code_ptr[1] = s->code_ptr - old_code_ptr; } +static void tcg_out_op_rr(TCGContext *s, TCGOpcode op, TCGReg r0, TCGReg r1) +{ + uint8_t *old_code_ptr = s->code_ptr; + + tcg_out_op_t(s, op); + tcg_out_r(s, r0); + tcg_out_r(s, r1); + + old_code_ptr[1] = s->code_ptr - old_code_ptr; +} + static void tcg_out_op_rrs(TCGContext *s, TCGOpcode op, TCGReg r0, TCGReg r1, intptr_t i2) { @@ -337,16 +348,18 @@ static void tcg_out_ld(TCGContext *s, TCGType type, TCGReg val, TCGReg base, static bool tcg_out_mov(TCGContext *s, TCGType type, TCGReg ret, TCGReg arg) { - uint8_t *old_code_ptr = s->code_ptr; - tcg_debug_assert(ret != arg); -#if TCG_TARGET_REG_BITS == 32 - tcg_out_op_t(s, INDEX_op_mov_i32); -#else - tcg_out_op_t(s, INDEX_op_mov_i64); + switch (type) { + case TCG_TYPE_I32: + tcg_out_op_rr(s, INDEX_op_mov_i32, ret, arg); + break; +#if TCG_TARGET_REG_BITS == 64 + case TCG_TYPE_I64: + tcg_out_op_rr(s, INDEX_op_mov_i64, ret, arg); + break; #endif - tcg_out_r(s, ret); - tcg_out_r(s, arg); - old_code_ptr[1] = s->code_ptr - old_code_ptr; + default: + g_assert_not_reached(); + } return true; } @@ -534,10 +547,7 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args, CASE_32_64(bswap16) /* Optional (TCG_TARGET_HAS_bswap16_*). */ CASE_32_64(bswap32) /* Optional (TCG_TARGET_HAS_bswap32_*). */ CASE_64(bswap64) /* Optional (TCG_TARGET_HAS_bswap64_i64). */ - tcg_out_op_t(s, opc); - tcg_out_r(s, args[0]); - tcg_out_r(s, args[1]); - old_code_ptr[1] = s->code_ptr - old_code_ptr; + tcg_out_op_rr(s, opc, args[0], args[1]); break; #if TCG_TARGET_REG_BITS == 32