From patchwork Wed Mar 19 13:44:58 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 874724 Delivered-To: patch@linaro.org Received: by 2002:a5d:6a90:0:b0:38f:210b:807b with SMTP id s16csp406895wru; Wed, 19 Mar 2025 06:46:28 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWj2y/5odGyTXhiCSRAcAA1aeAa6FCkCREECzvwj16zbNL1IyVF+WSlGGXxq/aQ68z13OywiQ==@linaro.org X-Google-Smtp-Source: AGHT+IEw+72vwxmG4JctuYqHvS6oxLIYpqZl/Rky8McSvfqNN2n+/0V8WOzTGZwYHHEhz8Xp+2LK X-Received: by 2002:a05:620a:444d:b0:7c5:57b2:2cb7 with SMTP id af79cd13be357-7c5a84a2d6bmr388130685a.56.1742391988188; Wed, 19 Mar 2025 06:46:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742391988; cv=none; d=google.com; s=arc-20240605; b=iHgb8Ej3Bo8sa5CIL5j6C4T7Dyrh3kjJVLel6fFKkSrg0k6nL8QJ0Tc3sguRLfig1I DIp8EBfK9mnTJ0h7tnBa8SWJ6tLihUAT0/JnYyuU1GboQ7klp4s+7zUb+4AjVG+00G17 BeDhsiP0ljOs3xUTSIMU0sGGWn9rqAiM/hzvsEIPnWNRqBX6ssuDypSFYO7A3MaUX4Bb R9fR3T7ewAkgMaMMhcUlv97UjfTTmYOuCzhKQyfdOKhrhEn2hLyt/NPt4ibglRmdDtwV wRdQOuBHJY9/tVXf0Jh4YIhSyYA41W62c09OKoc0PnS+j7N8fA0EMiCpc2ciY/yq7VJA /peQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=4Lkvodc73kqPvvWCS6V/G40kuyzwCLOWEJP7L4a0kMI=; fh=oQsvFjElslmUPxsR6fJkm0Ezna1Yj9KV/ql5u2IKgnk=; b=iYOvcYAlQT4DkROXhTc14VIM9AyOVryy4pCWbuK3t33ne6ikEZzKPgCfVVaa7AyFOz 4Vkj+9Ss9g2wUcI2b812EQe32Nkvxy0wc0NSNc9Igk++WLC+inpPUnEDd316JtGhrOhT KTX5UN/DvmgP2rlrOiLHC+/8wYs2FxQLS9lzHnt5XzaiH71Z6eirJ12enp/3ntIq1Ipa LJozPVNq8pF2a46AocUXG2YoViAWX0j5zKTn3E11oDGQ+2Q39F8+n0zzJjGxknM6bgj9 mgiqwgaXn8CcOzJumHc4ouLQelONJ9k5IX8FBmR+esdgLI4jUxT2GP+K45eiKJ0QVBnT AOow==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ugvzKWMT; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id af79cd13be357-7c573d340fdsi1450171385a.609.2025.03.19.06.46.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 Mar 2025 06:46:28 -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=ugvzKWMT; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tutjl-0002wt-LT; Wed, 19 Mar 2025 09:45:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tutji-0002tX-US for qemu-devel@nongnu.org; Wed, 19 Mar 2025 09:45:34 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tutjh-00042v-4a for qemu-devel@nongnu.org; Wed, 19 Mar 2025 09:45:34 -0400 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-43cf034d4abso48330345e9.3 for ; Wed, 19 Mar 2025 06:45:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742391930; x=1742996730; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4Lkvodc73kqPvvWCS6V/G40kuyzwCLOWEJP7L4a0kMI=; b=ugvzKWMTCQ8Er9xmw7/jgW4kDRCYYjnEyT5JV1UJRigy9c5qi2TcmrHXyVp2Ws3R/l 1XhixhcozlY2RHBk1ndTV6Neyfe/t8JOJ3FmnFhmCcor4rRt2rRrEhhZk8ZKf41no2gk dGg7Mw3zhQnaT02v4jsggBwaKp68qIzcGivir7fA4p/FQWytsFVhTxKW4C6/QUJssIGn cSjd56kXGxUFUkJhDOynWO4f7P3FzdkvkSmj6Vp/QCQxWK4uG//Lm8fb5qTgTSVQBzII HNRW/NcrFsJH+1fiXWXHNks1RzCQWGzIqquQD7sjBLCtJg1OBj1p1zJUtgg8/qq7wLHU 8Iew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742391930; x=1742996730; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4Lkvodc73kqPvvWCS6V/G40kuyzwCLOWEJP7L4a0kMI=; b=vQlEP41F9fzfrzElrwh392pky+tyegjsSogLCie4m2DOi8bUXhfdV+dnXrgldX9ysc ocx3FrnEG1ZSp+fnQoXiFnSzZOOUgeRBTTSKPTPdwnuuOnJvAKtcyhgOwVBo835w4W+z w3GIz/ORMwidbIb9MKaZ7t7IBdw9NkWGZaFIu2up/1AVMO3OXgYksw5c5sS47+XkDklV xithR/OXvDrT/X9NKllSZ0QW1Xl6eN3YjQmeSj9VTRiB+LMB1IH9GwntQZyhlWcMA8Ha /NCFU8R7JZuSTt4kE1UIYh07pNRAgy0PnSCGdfCPYlN4LEyhtngHOK/Qxc5dnFFiA4tW zAaQ== X-Gm-Message-State: AOJu0YwIA06zLLImh5RDYgLxxRYf+gHseJpnlVkWG7d+RB0WmYsQ3pyI Kr4tCgi1KSi+57G7lPAGnxL23CfWgswbwRX2hHWu2wtusF0L8c/VBdk7nDwoWI8bbopjnPd8ToH T X-Gm-Gg: ASbGncsdb9WU57ym3sZ1IsP5fSVszDOnYbW4S/2cnJvZ2jF7ZcyYFKcG6LAutwm1tEB w1kTz/vX2op3VvEMmvBEieleAlqWScnlb8bf3i69BAoNDRuqbSHXkqcCJF4rnCctORwd5p1B3Os Mlf0flVukU14aJPVLArWKQbZEIRMbQvdIeOoRVdRHSgoVgwTPtK5f7+cfmMHDcKgdzwXH+ExQlp sjXkFPSzaliUcqk9nQQByTkuDOFcX3QmKQTRryS+VZnfCX0r508bwBkflpVj8cA2jpku6YYdf+B UL6ILhGQAXheqBtF6Rcl8TUiYN4xp066Tj1OeNAE/5Orgzd3zcnnQsM+jtcgsLPmtcX2azYxdQg 1IK4l3o90OY5aLMjruaA= X-Received: by 2002:a05:6000:184d:b0:390:de58:d7fe with SMTP id ffacd0b85a97d-39973b0609cmr2662448f8f.51.1742391930175; Wed, 19 Mar 2025 06:45:30 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-395cb318af0sm21134199f8f.73.2025.03.19.06.45.29 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 19 Mar 2025 06:45:29 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Anton Johansson , Peter Maydell , Pierrick Bouvier , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?q?Daud=C3=A9?= Subject: [PATCH-for-10.1 04/12] tcg: Declare local 'insn_start_words' variable in tcg_gen_insn_start() Date: Wed, 19 Mar 2025 14:44:58 +0100 Message-ID: <20250319134507.45045-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250319134507.45045-1-philmd@linaro.org> References: <20250319134507.45045-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org In order to keep following commits simple, introduce the 'insn_start_words' local variable in tcg_gen_insn_start(). Signed-off-by: Philippe Mathieu-Daudé --- include/tcg/tcg-op.h | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/include/tcg/tcg-op.h b/include/tcg/tcg-op.h index 8938f386599..e0038e70a8d 100644 --- a/include/tcg/tcg-op.h +++ b/include/tcg/tcg-op.h @@ -25,20 +25,29 @@ #if TARGET_INSN_START_EXTRA_WORDS == 0 static inline void tcg_gen_insn_start(uint64_t pc) { - TCGOp *op = tcg_emit_op(INDEX_op_insn_start, 64 / TCG_TARGET_REG_BITS); + unsigned insn_start_words = 1; + TCGOp *op = tcg_emit_op(INDEX_op_insn_start, + insn_start_words * 64 / TCG_TARGET_REG_BITS); + tcg_set_insn_start_param(op, 0, pc); } #elif TARGET_INSN_START_EXTRA_WORDS == 1 static inline void tcg_gen_insn_start(uint64_t pc, uint64_t a1) { - TCGOp *op = tcg_emit_op(INDEX_op_insn_start, 2 * 64 / TCG_TARGET_REG_BITS); + unsigned insn_start_words = 1 + TARGET_INSN_START_EXTRA_WORDS; + TCGOp *op = tcg_emit_op(INDEX_op_insn_start, + insn_start_words * 64 / TCG_TARGET_REG_BITS); + tcg_set_insn_start_param(op, 0, pc); tcg_set_insn_start_param(op, 1, a1); } #elif TARGET_INSN_START_EXTRA_WORDS == 2 static inline void tcg_gen_insn_start(uint64_t pc, uint64_t a1, uint64_t a2) { - TCGOp *op = tcg_emit_op(INDEX_op_insn_start, 3 * 64 / TCG_TARGET_REG_BITS); + unsigned insn_start_words = 1 + TARGET_INSN_START_EXTRA_WORDS; + TCGOp *op = tcg_emit_op(INDEX_op_insn_start, + insn_start_words * 64 / TCG_TARGET_REG_BITS); + tcg_set_insn_start_param(op, 0, pc); tcg_set_insn_start_param(op, 1, a1); tcg_set_insn_start_param(op, 2, a2);