From patchwork Thu Apr 3 22:04:04 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: 877975 Delivered-To: patch@linaro.org Received: by 2002:a5d:6dae:0:b0:38f:210b:807b with SMTP id u14csp3496865wrs; Thu, 3 Apr 2025 15:09:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXRnOrUJJRkrOucZfv43ags/6IOWpK0W8wPUUuadq8x+6bEhz1h2Tsar+SIHth+nxizZW0+9A==@linaro.org X-Google-Smtp-Source: AGHT+IEyKcEQJfqZKc94fEy8ss2CoGnhMJp/lNEdLeqVOLgVY7Bpd5DUrgXkad3QNxgGqbpw1fMp X-Received: by 2002:a05:6214:e61:b0:6e1:6c94:b5c5 with SMTP id 6a1803df08f44-6f00de715e2mr12106386d6.4.1743718162629; Thu, 03 Apr 2025 15:09:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1743718162; cv=none; d=google.com; s=arc-20240605; b=g6S2MJrnKRpcTELF79hl4b8y3TeoeBOSROghgkpZGZVzrYEFUVa/pbM0vfyldQFh+S atiRemUZj8T8ItVjRgvvnUrezNQn2FQsHxBI7FOyTpsKtXPtdNpLRxQ/o31NP3tGld0S 5s+hFFHcv6b4U7EXrw+Wgb7ryWTCQ+0Cv2l0FVXYKvqEGJ2tfOvfRaAe49wOyWFg9PmL 8IPgsYDAh8AiW47KDA0K6BQoz04AvnxYZg6kpNaKd5YsXYMYe56VqBBJG8ZpoX40/T0+ 1gAzX/R499vPvbzs3C3OCAcYR0rwmGsKF0+7aPCai9zbVS+dyHnTBbz01TCF6wBwk7PG TRGg== 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=GGrFJ4R/UrCSTPkLctl7uvnpTFEBVznWA25W+AuvYOI=; fh=rZke+MZrIrDt/hwqaS/+8O6yNmgq91iuHd+wefmqvE4=; b=UJLMxyQ+5YmAgdQ3CWqA/oLAYcZ39rDNzFTOUPEL6WBwYxtCW0W636DnsCHIBQGNdi T+a0XFBTWmRKzz4khU9SnfBYz+K/5YlirLlKxfy47+Zwrk87z2tQ4pnqgk9x+swJ43yX HfjQ0WzVpf49cXKI7GWu97RSdKH5UxKWwoWakZtpIUtOb9kkRXWQ2y1Jp3dYyPl8CA+/ as9pTX4G7w4qWHzHXyiFmp1zltvwjCjwzCNNBoaqkzKhC7MOQHtfCnD/NIsHXofdy0FF 96UkDSB8wqQ7ILbIAY7S8HDRH/k3BWlauF4amwW9mF6+SBI8sGVZhkxOoKZz3dMsI5Bm KGhw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=kroefLfL; 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 6a1803df08f44-6ef0efc57bcsi19293886d6.94.2025.04.03.15.09.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 03 Apr 2025 15:09:22 -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=kroefLfL; 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 1u0Sg4-0008Fk-Hc; Thu, 03 Apr 2025 18:04:48 -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 1u0Sg1-0008Ex-K4 for qemu-devel@nongnu.org; Thu, 03 Apr 2025 18:04:45 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u0Sfz-0003kY-L7 for qemu-devel@nongnu.org; Thu, 03 Apr 2025 18:04:45 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-3996af42857so1720502f8f.0 for ; Thu, 03 Apr 2025 15:04:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1743717882; x=1744322682; 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=GGrFJ4R/UrCSTPkLctl7uvnpTFEBVznWA25W+AuvYOI=; b=kroefLfLWs4XvRTkD5kxLBpYsE6r9NEBlwZgsn7vWVLbYLntuXJUkT9jV+BRbaCMFK F11gqZZHz0JfKeSilWoo5uJg6Iki1+FU0WoiZZ71jeKJ151TFSplCemm5B6jkdzwpdK+ pNydrZx0vBcPFJVELqPeRn0EmrQKdDFaXi6ejCFTJsGUS4VC4ig135QAUdoKLDetWJr6 IsLfAGpHUcb1C2mZgFTLF85+g1LvjKXysTYcS4t3wZnWci6tFaaqp3rw7cV5Fmi74aw7 qyID4SrDvNC2Wx6726/ecUmrpnoy1084M/uI61p/tCOebFYVWTBY+z0pT+zftVGRFJfV gwUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743717882; x=1744322682; 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=GGrFJ4R/UrCSTPkLctl7uvnpTFEBVznWA25W+AuvYOI=; b=RTzNRTqyoRmt1Xaw0RLA1PAJn7t5EH6/TmzcJjT4rAU/OX3HjbAvr+IjCFkocSyGue rrUf0IdjJ2t6+qVbaT0ZijZiewr7wsHjxLhokCvnN/lOiAk8FbW4KbKQR4lYEXk1mSqq 80t2xkuwNKWad8hGBwpqlfbPah5agXbMsWILeBAZS3lva/v3J8iEj9SUES3v2xq718BT wDhBggMm5hrXtgyxVYv5HWvalYWEqhWYlsYYxynMNFTNtR5B6WSPTHjA+1wcOA1o9A4H u6e6eHZ+GdUKjuwYA/AWflYSVsOoLfSgU3BDvcy18RTp1csqSfjCqbNu/PVTJXJy8xUI yTRw== X-Gm-Message-State: AOJu0YyihWPjqaBUnVOsIBCCrBPAQ9EorEcl/rZWSN/2AcvO6nkGpoMy 84/X+XrMP7pnq3A0et4xcK9YDa32jJeBo40H3+vjrSArqTG+D2T27v56T4ZgbV0aL8ByUkcLoFd U X-Gm-Gg: ASbGncu77oxrW71f5Xdne5vTJgigqc7mn/bqd+BLtW4duXJp34JX8ULD2y89oBLMrJx cZy4BS3aNEvwVSBSRBoGW2WhSUEtiPfW8SOpj+73XHuI9kR0eKnH6rImRSXb7Es8qCpPMMC2iNs MDIHZOvtRgrOGuk1ZLhwlzSeh0YeUcJfk7enpZLf/5aznn8qiaqUAsjRidPAQqv+5iKQY7bXeSx +6YKP4Q30JkagsPjoAsK/0pyxLD/0dkZhPhgMg3joHTrz+Pm0NrJp0wONVmN5lLo463n1Y1KxTD lGBdfa47fcgOjvTzZkfQsKiS9rNMWeOInXLykyYHzvrO1tHwTOyKZB71g9VYz9jB7Ge3U9sNPGB 9d4FHqVAW2bwz15WLwvFuCi4o X-Received: by 2002:a5d:5f8e:0:b0:39b:32fc:c025 with SMTP id ffacd0b85a97d-39c2e5f50f4mr3901408f8f.2.1743717881841; Thu, 03 Apr 2025 15:04:41 -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-39c30096861sm2867966f8f.14.2025.04.03.15.04.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 03 Apr 2025 15:04:41 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Pierrick Bouvier Subject: [PATCH-for-10.1 v3 04/19] tcg: Always define TARGET_INSN_START_EXTRA_WORDS Date: Fri, 4 Apr 2025 00:04:04 +0200 Message-ID: <20250403220420.78937-5-philmd@linaro.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250403220420.78937-1-philmd@linaro.org> References: <20250403220420.78937-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=philmd@linaro.org; helo=mail-wr1-x436.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 Do not define TARGET_INSN_START_EXTRA_WORDS under the hood, have each target explicitly define it. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- include/tcg/insn-start-words.h | 4 ---- include/tcg/tcg-op.h | 2 +- target/alpha/cpu-param.h | 2 ++ target/avr/cpu-param.h | 2 ++ target/hexagon/cpu-param.h | 2 ++ target/loongarch/cpu-param.h | 2 ++ target/ppc/cpu-param.h | 2 ++ target/rx/cpu-param.h | 2 ++ target/tricore/cpu-param.h | 2 ++ target/xtensa/cpu-param.h | 2 ++ 10 files changed, 17 insertions(+), 5 deletions(-) diff --git a/include/tcg/insn-start-words.h b/include/tcg/insn-start-words.h index c439c09f2fe..d416d19bcf9 100644 --- a/include/tcg/insn-start-words.h +++ b/include/tcg/insn-start-words.h @@ -8,10 +8,6 @@ #include "cpu-param.h" -#ifndef TARGET_INSN_START_EXTRA_WORDS -# define TARGET_INSN_START_WORDS 1 -#else # define TARGET_INSN_START_WORDS (1 + TARGET_INSN_START_EXTRA_WORDS) -#endif #endif /* TARGET_INSN_START_WORDS */ diff --git a/include/tcg/tcg-op.h b/include/tcg/tcg-op.h index bc46b5570c4..cded92a4479 100644 --- a/include/tcg/tcg-op.h +++ b/include/tcg/tcg-op.h @@ -23,7 +23,7 @@ # error #endif -#ifndef TARGET_INSN_START_EXTRA_WORDS +#if TARGET_INSN_START_EXTRA_WORDS == 0 static inline void tcg_gen_insn_start(target_ulong pc) { TCGOp *op = tcg_emit_op(INDEX_op_insn_start, 64 / TCG_TARGET_REG_BITS); diff --git a/target/alpha/cpu-param.h b/target/alpha/cpu-param.h index 63989e71c06..dd44feb1793 100644 --- a/target/alpha/cpu-param.h +++ b/target/alpha/cpu-param.h @@ -24,6 +24,8 @@ # define TARGET_VIRT_ADDR_SPACE_BITS (30 + TARGET_PAGE_BITS) #endif +#define TARGET_INSN_START_EXTRA_WORDS 0 + /* Alpha processors have a weak memory model */ #define TCG_GUEST_DEFAULT_MO (0) diff --git a/target/avr/cpu-param.h b/target/avr/cpu-param.h index f5248ce9e79..9d37848d97d 100644 --- a/target/avr/cpu-param.h +++ b/target/avr/cpu-param.h @@ -25,6 +25,8 @@ #define TARGET_PHYS_ADDR_SPACE_BITS 24 #define TARGET_VIRT_ADDR_SPACE_BITS 24 +#define TARGET_INSN_START_EXTRA_WORDS 0 + #define TCG_GUEST_DEFAULT_MO 0 #endif diff --git a/target/hexagon/cpu-param.h b/target/hexagon/cpu-param.h index 45ee7b46409..635d509e743 100644 --- a/target/hexagon/cpu-param.h +++ b/target/hexagon/cpu-param.h @@ -23,4 +23,6 @@ #define TARGET_PHYS_ADDR_SPACE_BITS 36 #define TARGET_VIRT_ADDR_SPACE_BITS 32 +#define TARGET_INSN_START_EXTRA_WORDS 0 + #endif diff --git a/target/loongarch/cpu-param.h b/target/loongarch/cpu-param.h index 52437946e56..dbe414bb35a 100644 --- a/target/loongarch/cpu-param.h +++ b/target/loongarch/cpu-param.h @@ -13,6 +13,8 @@ #define TARGET_PAGE_BITS 12 +#define TARGET_INSN_START_EXTRA_WORDS 0 + #define TCG_GUEST_DEFAULT_MO (0) #endif diff --git a/target/ppc/cpu-param.h b/target/ppc/cpu-param.h index 553ad2f4c6a..d0651d2ac89 100644 --- a/target/ppc/cpu-param.h +++ b/target/ppc/cpu-param.h @@ -37,6 +37,8 @@ # define TARGET_PAGE_BITS 12 #endif +#define TARGET_INSN_START_EXTRA_WORDS 0 + #define TCG_GUEST_DEFAULT_MO 0 #endif diff --git a/target/rx/cpu-param.h b/target/rx/cpu-param.h index ef1970a09e9..84934f3bcaf 100644 --- a/target/rx/cpu-param.h +++ b/target/rx/cpu-param.h @@ -24,4 +24,6 @@ #define TARGET_PHYS_ADDR_SPACE_BITS 32 #define TARGET_VIRT_ADDR_SPACE_BITS 32 +#define TARGET_INSN_START_EXTRA_WORDS 0 + #endif diff --git a/target/tricore/cpu-param.h b/target/tricore/cpu-param.h index 790242ef3d2..eb33a67c419 100644 --- a/target/tricore/cpu-param.h +++ b/target/tricore/cpu-param.h @@ -12,4 +12,6 @@ #define TARGET_PHYS_ADDR_SPACE_BITS 32 #define TARGET_VIRT_ADDR_SPACE_BITS 32 +#define TARGET_INSN_START_EXTRA_WORDS 0 + #endif diff --git a/target/xtensa/cpu-param.h b/target/xtensa/cpu-param.h index 5e4848ad059..e7cb747aaae 100644 --- a/target/xtensa/cpu-param.h +++ b/target/xtensa/cpu-param.h @@ -16,6 +16,8 @@ #define TARGET_VIRT_ADDR_SPACE_BITS 32 #endif +#define TARGET_INSN_START_EXTRA_WORDS 0 + /* Xtensa processors have a weak memory model */ #define TCG_GUEST_DEFAULT_MO (0)