From patchwork Wed Mar 17 15:34:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 403178 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp590111jai; Wed, 17 Mar 2021 08:40:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyRhGaxfzA9phyphAjhwfqzyASYxWmCAouyJtUVL6B7VQZGVgu6wknqrbipkJtzsEex0bOo X-Received: by 2002:a5e:8c16:: with SMTP id n22mr7243719ioj.156.1615995607553; Wed, 17 Mar 2021 08:40:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615995607; cv=none; d=google.com; s=arc-20160816; b=R0shj+wS5g4RpWMthGT1Zkh5jF1mFdEnhOAPP97s7rvRZew7d3p/S8Si+uzO3M3rtb 5mxHCy1NKmlEMuCt5fOZ0Svz9ZBrJA/O/pO14/7lr3pmQ/4bjkRnhZ7Vx7btu7aplPeP K4ji45U6Qy4Yl9uKHYPSpTc8ImN+WB9iOM8VXjEvAka2qGq6HnwHmL5+FXrOR0tUmSXj vYwZg3LBs+Dm9kR7fx1zRWN7qUsygqKZSoJmCXDzT3tf+cE/X0GVVtnl3wqvvtZl/p00 DPn9s7M19jzbA894lFKWtzuzZh8JNSUVfk5Z36G9JfvZJfkwbe5dTz08zZ7aEYPscw0H wkfQ== 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=lSwlVqv+bYwCmjyRbzooomYXoWGY1C+FBIkfgRk17YM=; b=DIPfXA8H/9Wh3gMgIXX9UfmthZMsJwyuRTXNqCgdBl95SsldMM1SqJfEYHTmo1U4pd r+KPIMq/dCsg5qWtuoQIX9pWWVnkaIW/Fui1kivLi5A82LMR0OSi2NbQyADm9/bq2Sv/ Ipw8Oq3nFu35iY4Ng/GRVVWxnSDT7LoAUjw9LDBw6WOSl3FF2Abph7kexGEQQieDeVq4 KbQpGVeuv1rcDHc/VQ9g22pjMi5+sW00w8wF+1nbSj9ifoa+N1VFkLTIOzZ5lXQySBOX wk79u7cUM4MOY54ozmTIhh/Wxd2Zw5O2fbtzbFqgCgVRXjN1mNZh8faxFIX6SB355yBb Gyjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZUc1jutq; 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 q11si16523535iod.66.2021.03.17.08.40.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 17 Mar 2021 08:40:07 -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=ZUc1jutq; 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]:41126 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lMYHG-0000sP-RE for patch@linaro.org; Wed, 17 Mar 2021 11:40:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49804) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lMYCL-00051I-CU for qemu-devel@nongnu.org; Wed, 17 Mar 2021 11:35:01 -0400 Received: from mail-oi1-x230.google.com ([2607:f8b0:4864:20::230]:43433) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lMYCE-00076L-A7 for qemu-devel@nongnu.org; Wed, 17 Mar 2021 11:35:01 -0400 Received: by mail-oi1-x230.google.com with SMTP id y7so2813366oih.10 for ; Wed, 17 Mar 2021 08:34: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 :mime-version:content-transfer-encoding; bh=lSwlVqv+bYwCmjyRbzooomYXoWGY1C+FBIkfgRk17YM=; b=ZUc1jutqJTJEw51HjKMHPnzFZZCw9JdjeiTzOq1MuY/9r5BEPIfE/0ne+vb7+voqG3 FquRIrgSnjEbgphAGNF/KKpbwXuymL31Db+miMW4PEvksCqrpiwzAHChg5eMfH5My+Tf F8h2MOH5Mby9oW+X4XPQ5sCXt2k818WT1GvNArKOWv/QXT4hQbJaFyoCabxiq/1/SzWJ feBArb2UHCPX/d3GoMxIHHI7y+v61rjA0T3ENQK2utnBbdFakW5bAnErVCYY+Nee6W1T PHsiV9b2OYBhNkE56iLc7BGQTQ1Rb6El9vmwF4VwssToOQabJPXP5LHQk0aju+DCPyec kBxg== 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=lSwlVqv+bYwCmjyRbzooomYXoWGY1C+FBIkfgRk17YM=; b=M+AsdeIKbNx38yPwoiNCqaq7K/kG952ngdI5SOolnsCX7+r4NrwNhbqk3Rb8ciIAH2 /URdN2n0gDmCirsGCZ/LmEL2KF7ZEPEUrzZ3HotOIoI3sUYKQBZAbbYfv6YlBk/p81KG nQzTr4ZK3kbwsDPGgfy5txSmt4EUJKq9m1w30Sf2WCXpI/ewJKjJivUR9zK2Sp75iXdj p0arYEU/zfpBpUsFYSTcEvpcBHu13NqYv59sW0dgOtc64OXWKbYSyXyBKzhMBBqVXKMi 7oQmITLzqkU1Iu0ZSW50AcNfcg5CW2lfQu2WI8g2Eh03+IPX+3Y5IpwGNv1Y6VRjJFQq k90A== X-Gm-Message-State: AOAM530YN+3E7NRKbekcLbbdgyBZf5BSAy8PXX0xkL4V8lrlT3XqM769 lYRa73A2qL1+Kx1rnlixPmoyW9+DnUDAxhje X-Received: by 2002:a05:6808:904:: with SMTP id w4mr3125133oih.1.1615995293131; Wed, 17 Mar 2021 08:34:53 -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.34.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Mar 2021 08:34:52 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 07/38] tcg/tci: Split out tci_args_l Date: Wed, 17 Mar 2021 09:34:13 -0600 Message-Id: <20210317153444.310566-8-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::230; envelope-from=richard.henderson@linaro.org; helo=mail-oi1-x230.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.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) -- 2.25.1 diff --git a/tcg/tci.c b/tcg/tci.c index dd9bcd74f3..e323351b75 100644 --- a/tcg/tci.c +++ b/tcg/tci.c @@ -181,10 +181,16 @@ static tcg_target_ulong tci_read_label(const uint8_t **tb_ptr) * where arguments is a sequence of * * c = condition (TCGCond) + * l = label or pointer * r = register * s = signed ldst offset */ +static void tci_args_l(const uint8_t **tb_ptr, void **l0) +{ + *l0 = (void *)tci_read_label(tb_ptr); +} + static void tci_args_rr(const uint8_t **tb_ptr, TCGReg *r0, TCGReg *r1) { @@ -418,9 +424,9 @@ uintptr_t QEMU_DISABLE_CFI tcg_qemu_tb_exec(CPUArchState *env, #endif break; case INDEX_op_br: - label = tci_read_label(&tb_ptr); + tci_args_l(&tb_ptr, &ptr); tci_assert(tb_ptr == old_code_ptr + op_size); - tb_ptr = (uint8_t *)label; + tb_ptr = ptr; continue; case INDEX_op_setcond_i32: tci_args_rrrc(&tb_ptr, &r0, &r1, &r2, &condition);