From patchwork Wed Mar 17 15:34:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 403206 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp614155jai; Wed, 17 Mar 2021 09:07:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzFv+pCxyU88uSsiqP+qKM17+eyklccHQOaINFVXVnRGUZtQ4Wuwb16U/ErAZB1i6fuo8cY X-Received: by 2002:a92:c548:: with SMTP id a8mr3872464ilj.176.1615997220806; Wed, 17 Mar 2021 09:07:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615997220; cv=none; d=google.com; s=arc-20160816; b=AeajuPTc3sQ6gnZ/JY9Tz8S1NZpln9xR4d8zAWwtSLiycmglsfjVC7TOndt2qTp5SF YHiKOM11zAO+tv8nUW7XPTM8oYC6z/gGfpLGNXQo/jBvE0fFkFDy4iKJH4bqpu1dRlmk lTMrTldr1fF6HpnwfhEf3A7ioaScFmF5KdFMS+GK6l1orTCz/mc/CDVRVUV1E+cF3HDZ QRZb03iX0D8yi1tJwyw7sdVb0d5nONe8G78TmECIAvrjx3QRkFfJQshaAEmoe7UQ9JqT UAEG5/8jFRL0jLMB3kia1pOvt0Beu3Cw8k7a1og1lNJTG0RdB8MYc/QWcfJH1Vp8HUlr TDqA== 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=q8I1YCSoWNXxPVW6fLoHCz2kYQaXyDJJKMZjEFQ+AKY=; b=Yv9IZS7GavmN4Q19Gn739XcfDMbfyYETrdX/s30mfRQEkL9xcwc7TGaEC76/uXLKCJ 1OhrgiUcqqF7eZ3nQwxeNkQbdT4c8OyPfiEHJyuLRLOd8LSXX9Lxa6hkkL0SswsD6x9X XlX51vPE6f0r02Y6WujuakCDe5SP4zh08PRBo6vRlMtFUxwSw36JUIgbVKE8nd3qM9Jh dNPIq42ji865WIdZ2Z2+uxcJIi6gTtAyOYGZVZzEKTvqgUU5bc6xWK/7U3OQ6eFeTSrj pvBF4yurnNyGiBNOgdG0sHfwTKeom6LXbv1Jd/00nZ0MXCeb2sfwzDN+Uo5hz4jqy0+D z1Vw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=POpz4bqH; 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=pass (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 t136si16208494iof.90.2021.03.17.09.07.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Mar 2021 09:07:00 -0700 (PDT) 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=pass header.i=@linaro.org header.s=google header.b=POpz4bqH; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:54972 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMYhI-0005kp-5N for patch@linaro.org; Wed, 17 Mar 2021 12:07:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50246) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMYCn-0005JU-7H for qemu-devel@nongnu.org; Wed, 17 Mar 2021 11:35:29 -0400 Received: from mail-oi1-x22b.google.com ([2607:f8b0:4864:20::22b]:41841) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lMYCb-0007Hv-RN for qemu-devel@nongnu.org; Wed, 17 Mar 2021 11:35:28 -0400 Received: by mail-oi1-x22b.google.com with SMTP id y131so39323798oia.8 for ; Wed, 17 Mar 2021 08:35:17 -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 :mime-version:content-transfer-encoding; bh=q8I1YCSoWNXxPVW6fLoHCz2kYQaXyDJJKMZjEFQ+AKY=; b=POpz4bqHnU5KMw4PyfEoYttsa+Bq6eTR/UvNRsGkD9mU71UtArGIbrw2FBDn/hB83Q Iz0CfAklbi3HQhPZ4xhXJEu8jVNgV0B5qvT+WzFmZMHugwYeITDi4pKPtuZiaEt9Hm0d fkR4K1YvNZy1UOc84QYPjTscaKzuQmbwT57zdSP+C2Zz/H3NlgJRW9ISBPbaLxWlki9z /a1/55DvY44SMjNkgVzlU2vGzZ02mKSNRpnCcwVzxHnMGIQ70d227bhUkko59pv6Tiq/ Wr6tP19HNNpeg5zIbrKA/12ug+yr4ulhj8UzgUTfwd7FuvsUomLjWllzzMFyzX3ghhpZ Y1JA== 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=q8I1YCSoWNXxPVW6fLoHCz2kYQaXyDJJKMZjEFQ+AKY=; b=UUIaXXxQ6uqP+siakSA6zWHmV9D/LjUQNqGDR/M30Ikt0ISuSTjcoqk71wpLgwYN77 oXhczYePS7aDx6NgFRfqV3SBcT2UOwtzZlBsIulrLHDcwj779WwgbfNLck2BvjLdCF3b 8N7MucW7YlWcj2cTGLgOqrsSVMcSvi+S+S3wFdWVTaM3Z85R6um+dVItqMWHN7w551cn /eoIPqla+IKrrQfd8dw8dMBAJm+uAjXLz36K1uge9yceK+uFjSiTJ++qlsj52epDLaaR ja8xkH+9lupvnwnrY6EMHghdyXtiM9zKgq9aqpYZ9al1wDc+wZ2ZaQDY3bX7luA/oheD E4ow== X-Gm-Message-State: AOAM530XBHNp6M1a8lBtSFSK8AZbdCEWDMY9lflHHiNm2K4H9hbGwxMh rwS3vr/deIfi8mttrykGqR20LRsrDoi5XMLE X-Received: by 2002:a05:6808:313:: with SMTP id i19mr3070662oie.67.1615995316393; Wed, 17 Mar 2021 08:35:16 -0700 (PDT) Received: from localhost.localdomain (fixed-187-189-51-144.totalplay.net. [187.189.51.144]) by smtp.gmail.com with ESMTPSA id i11sm8271154otp.76.2021.03.17.08.35.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Mar 2021 08:35:16 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 30/38] tcg/tci: Split out tcg_out_op_rrrbb Date: Wed, 17 Mar 2021 09:34:36 -0600 Message-Id: <20210317153444.310566-31-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210317153444.310566-1-richard.henderson@linaro.org> References: <20210317153444.310566-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::22b; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x22b.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: peter.maydell@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- tcg/tci/tcg-target.c.inc | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) -- 2.25.1 diff --git a/tcg/tci/tcg-target.c.inc b/tcg/tci/tcg-target.c.inc index 8504e82e95..b153334dfb 100644 --- a/tcg/tci/tcg-target.c.inc +++ b/tcg/tci/tcg-target.c.inc @@ -369,6 +369,21 @@ static void tcg_out_op_rrrc(TCGContext *s, TCGOpcode op, old_code_ptr[1] = s->code_ptr - old_code_ptr; } +static void tcg_out_op_rrrbb(TCGContext *s, TCGOpcode op, TCGReg r0, + TCGReg r1, TCGReg r2, uint8_t b3, uint8_t b4) +{ + uint8_t *old_code_ptr = s->code_ptr; + + tcg_out_op_t(s, op); + tcg_out_r(s, r0); + tcg_out_r(s, r1); + tcg_out_r(s, r2); + tcg_out8(s, b3); + tcg_out8(s, b4); + + old_code_ptr[1] = s->code_ptr - old_code_ptr; +} + #if TCG_TARGET_REG_BITS == 32 static void tcg_out_op_rrrrrc(TCGContext *s, TCGOpcode op, TCGReg r0, TCGReg r1, TCGReg r2, @@ -538,7 +553,6 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args, break; CASE_32_64(deposit) /* Optional (TCG_TARGET_HAS_deposit_*). */ - tcg_out_op_t(s, opc); { TCGArg pos = args[3], len = args[4]; TCGArg max = opc == INDEX_op_deposit_i32 ? 32 : 64; @@ -546,13 +560,8 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args, tcg_debug_assert(pos < max); tcg_debug_assert(pos + len <= max); - tcg_out_r(s, args[0]); - tcg_out_r(s, args[1]); - tcg_out_r(s, args[2]); - tcg_out8(s, pos); - tcg_out8(s, len); + tcg_out_op_rrrbb(s, opc, args[0], args[1], args[2], pos, len); } - old_code_ptr[1] = s->code_ptr - old_code_ptr; break; CASE_32_64(brcond)