From patchwork Wed Mar 17 15:34:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 403208 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp616566jai; Wed, 17 Mar 2021 09:09:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyIRpD4LB3n395HU/oX/Y2lL4ZRR3dr0K5pGfSk2p0BNOf6oeWoiT//dyC+wN7NWEMEZ10Q X-Received: by 2002:a05:6e02:589:: with SMTP id c9mr8425854ils.73.1615997372364; Wed, 17 Mar 2021 09:09:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615997372; cv=none; d=google.com; s=arc-20160816; b=ZqsbkihcctoZ8cFH4E6A8drVmtvlK81RZjJUQdnrMjZroYvA0qKCUr7KqSmrtDiTrc +HqCXPPIuyFKFeO9wiYSTy5BEinFMR78e91SCeo0assk2h6KQWo9/me70lf228PKipbD /AApExrRD3TGmx8hHJMLDXB8sjfwD1atPu3kLcSkcNwLc9Vz+e2I4jxu5T3E4cJQr0aB IBo3N68zRrEJso6/YdLS2ZmEYWjXnHTWC2d6e6Ye7KDuydLo40PvvgZ+ylizxVBc5efL cF+S9V8b2df671AW7YSV0jWwkIn7qUWC2XOpNQNEB42R1Yi3IP9u7mTuTWQCX+u99z7U gWOw== 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=9gOc+vBqXpfUn2Q8eNd5OOU1iZ9hXi0uS626WbgV7Zk=; b=0x5d4MqCELf6acAsP2AAfruRnEm/jPn6X0k/UYfNfElpqGlPMA6nHblsWpEfoDGXV0 Sc+giLa+JtJaTthwqgtHWxp4gPftWJhK0zDEQLvA2S3UkDcclecn9KCwkCZVHVCMECkI nlMX6Zd16A32SoZl5dRLI6Ha/Ep5Wy1Gg8wUMwqNq2VgrGOi0k6iwalP6r7tqZ1I5vxf 8YpxbXC7CgyGmgIowqi/+OuF5Wr0nS50Fqsh/0oMDFwD9Wf8CjkbnPoXMMun8IPU8KYS gP5Csd7KZ289ot47ueOz2NGlXHV7jBf8TILrpFjIS5R7fdHacVx6uYCNj177puuVIEot rEnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zGPUcW4C; 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 x7si13113715ill.136.2021.03.17.09.09.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Mar 2021 09:09:32 -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=zGPUcW4C; 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]:33886 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMYjj-0000kB-PG for patch@linaro.org; Wed, 17 Mar 2021 12:09:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50232) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMYCl-0005JO-FV for qemu-devel@nongnu.org; Wed, 17 Mar 2021 11:35:29 -0400 Received: from mail-ot1-x332.google.com ([2607:f8b0:4864:20::332]:34309) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lMYCY-0007G8-3b for qemu-devel@nongnu.org; Wed, 17 Mar 2021 11:35:24 -0400 Received: by mail-ot1-x332.google.com with SMTP id k14-20020a9d7dce0000b02901b866632f29so2183674otn.1 for ; Wed, 17 Mar 2021 08:35:12 -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=9gOc+vBqXpfUn2Q8eNd5OOU1iZ9hXi0uS626WbgV7Zk=; b=zGPUcW4C+D3jLTbjKQcxrpUkmWrZAOkXAd/xgMjxQXZISUISPNSOdm6EIF4SwA3be8 BShzd8KdUrQXL55mMCEFtPsiuXspOT/67k8LS4ObjaCL54rk7PlssExyJ3UlMtqrQVqp DsjlhnB3SV4HbFuULrqBJuiFi7BjOOMG+EqAjwaItZ4fYn8VXVPkRgymZ8zdG1mIOJ8R rmEetQo/eTz+1qjbT/6gHHIuPHl3an451nkP4s9OgqqhICPehqqRN10+57vN6qjtxj6E VdOSguYF8FlrFfT0/rq6M0Jx0og5keVCWq1x2TuvdQSXF21W/ak7dV7OdH/d3m9QSWQh Xykg== 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=9gOc+vBqXpfUn2Q8eNd5OOU1iZ9hXi0uS626WbgV7Zk=; b=i/wnVUYqV8NqL0OnrdfFLy7jIrFa9nEytUzMEJlSebW9BY/a/2dwcaOBZTwB/Qo9dc +V/p9JOPwAnx62mLWGFjS5bXCyuVmG6HEoY8Qt8HVRpM0Zm4qpLbpmeIk7FwA8ByR3OI QR4fdEF4WjlvxkPyKuGaqxnlA0YLBbXhl9AUrWT2KCRTOWoqzP+RV2gshphWnOZLKJcf 6PrmPJRoC8w/x4cBjRl42Uob9GbXKNUvlAV6logJRN6v9dGmMXtcZp8hqUjTAIicL1Ye RcBSOkPlqVjoHb/x4zizjR1bPGRnkTY6TL5geywZaoj2Wbk4VnNyhamhwMicEsi2C6M+ Wrrw== X-Gm-Message-State: AOAM533wpBSfXTQQQ3pN0rGpg0xc+rTc0YsikYiBP5fi9/NwCoIIaKxl 7+seofUVNnSkGiK+q+cxb+4M915keTSEb1v8 X-Received: by 2002:a9d:1b49:: with SMTP id l67mr3888152otl.83.1615995311443; Wed, 17 Mar 2021 08:35:11 -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.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Mar 2021 08:35:11 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 25/38] tcg/tci: Split out tcg_out_op_p Date: Wed, 17 Mar 2021 09:34:31 -0600 Message-Id: <20210317153444.310566-26-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::332; envelope-from=richard.henderson@linaro.org; helo=mail-ot1-x332.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 | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) -- 2.25.1 diff --git a/tcg/tci/tcg-target.c.inc b/tcg/tci/tcg-target.c.inc index bf2733d42b..85c5ab5a08 100644 --- a/tcg/tci/tcg-target.c.inc +++ b/tcg/tci/tcg-target.c.inc @@ -307,6 +307,16 @@ static void tcg_out_op_l(TCGContext *s, TCGOpcode op, TCGLabel *l0) old_code_ptr[1] = s->code_ptr - old_code_ptr; } +static void tcg_out_op_p(TCGContext *s, TCGOpcode op, void *p0) +{ + uint8_t *old_code_ptr = s->code_ptr; + + tcg_out_op_t(s, op); + tcg_out_i(s, (uintptr_t)p0); + + 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) { @@ -403,17 +413,13 @@ static void tcg_out_op(TCGContext *s, TCGOpcode opc, const TCGArg *args, switch (opc) { case INDEX_op_exit_tb: - tcg_out_op_t(s, opc); - tcg_out_i(s, args[0]); - old_code_ptr[1] = s->code_ptr - old_code_ptr; + tcg_out_op_p(s, opc, (void *)args[0]); break; case INDEX_op_goto_tb: tcg_debug_assert(s->tb_jmp_insn_offset == 0); /* indirect jump method. */ - tcg_out_op_t(s, opc); - tcg_out_i(s, (uintptr_t)(s->tb_jmp_target_addr + args[0])); - old_code_ptr[1] = s->code_ptr - old_code_ptr; + tcg_out_op_p(s, opc, s->tb_jmp_target_addr + args[0]); set_jmp_reset_offset(s, args[0]); break;