From patchwork Wed Mar 19 13:44:55 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: 874723 Delivered-To: patch@linaro.org Received: by 2002:a5d:6a90:0:b0:38f:210b:807b with SMTP id s16csp406700wru; Wed, 19 Mar 2025 06:46:01 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV5h4Hjvr2vOP7OfFjN9IbqWhiJOmwja6D4YL0AHtXuJnqy+Qo4Uf6eRXxitpdSAtKMAup6Og==@linaro.org X-Google-Smtp-Source: AGHT+IEP/wPLrJ5gGhZt+FU/twy4SDz63yTHtlHGu+3DX72yC4oVpMjvxzrTtV/7apNF500BGHP8 X-Received: by 2002:a05:6102:e13:b0:4bd:3519:44be with SMTP id ada2fe7eead31-4c4ec681b3bmr1715160137.15.1742391961298; Wed, 19 Mar 2025 06:46:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742391961; cv=none; d=google.com; s=arc-20240605; b=dLnzsWqJKmVezRRzbL/uj0IS6ZxRS56BDaE17ISGz6eAAwcBlcPqz+QHVYedkWcfS3 25NQOrzcylcN/dC3RZyaKDfE0DNxIafYA69ugI7Fx3RkuEt6grt0w3QNBs6KFk60WfO2 redzU/gNqZTuM7ZXTyBr2zp3lxsh7FtfrW66mciQathEhI9qDdwU/okG+IGD/jJ8p4+6 cJJ1WMuXOulX4oMgJuK2QnfMOMk0zhiXfXmBnyXzCgqHWxDUm66bq2xAGxAYELOy8SbO WXohHufV054Yr1cw51NdiZ9vwC3lxBrjYdgLdAOcgS3QLFEA4+/zzQmGGEyQMQ3fRpXI DqKg== 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=7eJxBU8sS6BBgMJn+fAfo2vd2fc/VM4cRvoTrtUG6dA=; fh=oQsvFjElslmUPxsR6fJkm0Ezna1Yj9KV/ql5u2IKgnk=; b=jiCj6IkPyLo+SjEEReeaYs7gzsmpAxvU+ol4pVoAaSp5xc8HSU0VIw7RRvpCiGJVFy hH7uwRr1sguhm2aJHlR7S7R+6H+ywMgW3rZEfi30ZBTc+FkvwbBbf+3RbmGwrSZWrTvE IqZwFUGMq46hhz0i3IerNaYfLZ5Rtqx8UnEF1unBfJTgnDlq2QxaXrRt9oP+XAJh+TgC gwmKTyMESI56jxhW+ZpX9IBHmBR58QsAfG6Ffzq/zQyU6wFhA4iEHbeSQtBwgk96tDHm nGQk1UIC8Pol4Ja6Ojo0n8e/5Z3vvfIt0AgwL3Q6IIpadFJu/uRTbbOBr9BlxvYcGpgN /4Mw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=LKPPc57P; 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 ada2fe7eead31-4c374b02982si3494474137.503.2025.03.19.06.46.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 Mar 2025 06:46:01 -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=LKPPc57P; 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 1tutjZ-0002ei-Cv; Wed, 19 Mar 2025 09:45:25 -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 1tutjS-0002ZI-4E for qemu-devel@nongnu.org; Wed, 19 Mar 2025 09:45:18 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tutjP-0003u1-Lk for qemu-devel@nongnu.org; Wed, 19 Mar 2025 09:45:17 -0400 Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-3912e96c8e8so4446988f8f.2 for ; Wed, 19 Mar 2025 06:45:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742391914; x=1742996714; 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=7eJxBU8sS6BBgMJn+fAfo2vd2fc/VM4cRvoTrtUG6dA=; b=LKPPc57PoBGWn0IRjSLzNr2WZlEMkPoHzzz2mMkzr0cwFic6l1nqMVM2QIS8BhNWhN 32+Xc+UsCi7l0qiiuxa5IGlFRliOgP7f/nbmqgFle8qOsPTdi6C/WIxglG8wl3iTdDJ+ xNtgULV6wrpwXyt+o0RLXkMHpkhvcMGVlTdSZsO+w+372+M5QCqovmEq3V7sauNuzc+6 3vR9YW2u8Lte3Q4I32QB9yezTLP8w/pLLeQDEbUke2LIm1HtC+du7zkrhza37SuqZjK4 dxjvCE1mHSHcXDOAk0AN2BLrpZuvRkmY4jIlhzxCvCv/7wajM/jQQvf1dEc020k0EHal 1gbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742391914; x=1742996714; 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=7eJxBU8sS6BBgMJn+fAfo2vd2fc/VM4cRvoTrtUG6dA=; b=OcJVJHh0oBpyBpXYfhaWT39vXRaFGUxrR4hqN/DF9It6U7tGRoCWJrbDowTUNheAEO viYS1lqrFDP6U3B/UVSla9s9SfHGMqPiAKY/qJAaR/aJagL2CUyEJlUPlKpzMmz+ML4O gwQXsIKn+cjCsDxEKWaJB0fOWURkM6gVc0+bLwgFUz3HNaJ8sCX5v8JOORbrjfVti4vo papO2HvsKQ/1kife2jRu1vgfBG904oMm1RIkRCYvhveI9Hf3WDDGxh5gmQBmK1TkqYOR xECJX2k4yB2AVJ6WGPCntLLDdD5tzRgMWSJB3HS3yIZoz0+rssWKMeIgVhFL+h4v0wlb pjGQ== X-Gm-Message-State: AOJu0YxKLxphxB3hps4bwyM8f5EMfYjVnqsFzv6x0Eh7n2gc92shiWFr TaQaheq3ZlH68RCtahu/QEgVb/aF1QbpY4+yJYInGZpgar+l5hH3eGK8t/bMy5uFwqqc3CVHeJg b X-Gm-Gg: ASbGncvYOl/a3nWSElGirGdFcca31JVlxIZabUhiS8bbn5YOWUdNp6VNKR6f3ETMtcB ACDEOEg3ShkAPiV8hkJHghK7tgFF08KZF4URvZH9AI4nJoEIu1tWOi9QurY1YJKBfP+vTg3fr6m 7KRqNq5dAEK1c8Bo0kPWl+19Wy/YOj3q9ef7XADYATQsnMDj7S4GinZQ5OM7IoVcMicv413eMf9 pMBuu4lr2SvpjMjjqx6DecfcEPpq0sfbPLUwFELmAl9rYNEeLFgdhfrOZDwNzgvRh97YxFMbESq AH9sLqukdPumwa5eZiwftbTrWOHW0BCUW6laC9YK7vn1Da7QxVjXFmP4aPQ4cnMCR2eeGHNTRMj omj35Tbvf1uMLbR6TWNQ= X-Received: by 2002:a5d:47a7:0:b0:385:ee40:2d88 with SMTP id ffacd0b85a97d-399739b63c5mr2556386f8f.3.1742391913538; Wed, 19 Mar 2025 06:45:13 -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-395c8975afesm20592484f8f.47.2025.03.19.06.45.12 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 19 Mar 2025 06:45:13 -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 01/12] tcg: Declare TARGET_INSN_START_EXTRA_WORDS in 'cpu-param.h' Date: Wed, 19 Mar 2025 14:44:55 +0100 Message-ID: <20250319134507.45045-2-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::435; envelope-from=philmd@linaro.org; helo=mail-wr1-x435.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 To avoid including the huge "cpu.h" for a simple definition, move TARGET_INSN_START_EXTRA_WORDS to "cpu-param.h". Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson --- target/arm/cpu-param.h | 14 ++++++++++++++ target/arm/cpu.h | 14 -------------- target/hppa/cpu-param.h | 2 ++ target/hppa/cpu.h | 2 -- target/i386/cpu-param.h | 2 ++ target/i386/cpu.h | 2 -- target/m68k/cpu-param.h | 2 ++ target/m68k/cpu.h | 2 -- target/microblaze/cpu-param.h | 2 ++ target/microblaze/cpu.h | 2 -- target/mips/cpu-param.h | 2 ++ target/mips/cpu.h | 2 -- target/openrisc/cpu-param.h | 2 ++ target/openrisc/cpu.h | 2 -- target/riscv/cpu-param.h | 8 ++++++++ target/riscv/cpu.h | 6 ------ target/s390x/cpu-param.h | 2 ++ target/s390x/cpu.h | 2 -- target/sh4/cpu-param.h | 2 ++ target/sh4/cpu.h | 2 -- target/sparc/cpu-param.h | 2 ++ target/sparc/cpu.h | 1 - 22 files changed, 40 insertions(+), 37 deletions(-) diff --git a/target/arm/cpu-param.h b/target/arm/cpu-param.h index 896b35bd6d5..ed1f0b16e51 100644 --- a/target/arm/cpu-param.h +++ b/target/arm/cpu-param.h @@ -38,6 +38,20 @@ # define TARGET_PAGE_BITS_MIN 10 #endif /* !CONFIG_USER_ONLY */ +/* ARM-specific extra insn start words: + * 1: Conditional execution bits + * 2: Partial exception syndrome for data aborts + */ +#define TARGET_INSN_START_EXTRA_WORDS 2 + +/* The 2nd extra word holding syndrome info for data aborts does not use + * the upper 6 bits nor the lower 13 bits. We mask and shift it down to + * help the sleb128 encoder do a better job. + * When restoring the CPU state, we shift it back up. + */ +#define ARM_INSN_START_WORD2_MASK ((1 << 26) - 1) +#define ARM_INSN_START_WORD2_SHIFT 13 + /* ARM processors have a weak memory model */ #define TCG_GUEST_DEFAULT_MO (0) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index a8177c6c2e8..537359ff30b 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -100,20 +100,6 @@ #define offsetofhigh32(S, M) (offsetof(S, M) + sizeof(uint32_t)) #endif -/* ARM-specific extra insn start words: - * 1: Conditional execution bits - * 2: Partial exception syndrome for data aborts - */ -#define TARGET_INSN_START_EXTRA_WORDS 2 - -/* The 2nd extra word holding syndrome info for data aborts does not use - * the upper 6 bits nor the lower 13 bits. We mask and shift it down to - * help the sleb128 encoder do a better job. - * When restoring the CPU state, we shift it back up. - */ -#define ARM_INSN_START_WORD2_MASK ((1 << 26) - 1) -#define ARM_INSN_START_WORD2_SHIFT 13 - /* We currently assume float and double are IEEE single and double precision respectively. Doing runtime conversions is tricky because VFP registers may contain diff --git a/target/hppa/cpu-param.h b/target/hppa/cpu-param.h index 7ed6b5741e7..68ed84e84af 100644 --- a/target/hppa/cpu-param.h +++ b/target/hppa/cpu-param.h @@ -19,6 +19,8 @@ #define TARGET_PAGE_BITS 12 +#define TARGET_INSN_START_EXTRA_WORDS 2 + /* PA-RISC 1.x processors have a strong memory model. */ /* * ??? While we do not yet implement PA-RISC 2.0, those processors have diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index 7be4a1d3800..f289843c299 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -45,8 +45,6 @@ #define PRIV_KERNEL 0 #define PRIV_USER 3 -#define TARGET_INSN_START_EXTRA_WORDS 2 - /* No need to flush MMU_ABS*_IDX */ #define HPPA_MMU_FLUSH_MASK \ (1 << MMU_KERNEL_IDX | 1 << MMU_KERNEL_P_IDX | \ diff --git a/target/i386/cpu-param.h b/target/i386/cpu-param.h index b0e884c5d70..0c8efce8619 100644 --- a/target/i386/cpu-param.h +++ b/target/i386/cpu-param.h @@ -22,6 +22,8 @@ #endif #define TARGET_PAGE_BITS 12 +#define TARGET_INSN_START_EXTRA_WORDS 1 + /* The x86 has a strong memory model with some store-after-load re-ordering */ #define TCG_GUEST_DEFAULT_MO (TCG_MO_ALL & ~TCG_MO_ST_LD) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 76f24446a55..f2cae1b066e 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1610,8 +1610,6 @@ typedef struct { #define MAX_FIXED_COUNTERS 3 #define MAX_GP_COUNTERS (MSR_IA32_PERF_STATUS - MSR_P6_EVNTSEL0) -#define TARGET_INSN_START_EXTRA_WORDS 1 - #define NB_OPMASK_REGS 8 /* CPU can't have 0xFFFFFFFF APIC ID, use that value to distinguish diff --git a/target/m68k/cpu-param.h b/target/m68k/cpu-param.h index 7afbf6d302d..256a2b5f8b2 100644 --- a/target/m68k/cpu-param.h +++ b/target/m68k/cpu-param.h @@ -17,4 +17,6 @@ #define TARGET_PHYS_ADDR_SPACE_BITS 32 #define TARGET_VIRT_ADDR_SPACE_BITS 32 +#define TARGET_INSN_START_EXTRA_WORDS 1 + #endif diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index ddb0f29f4a3..b6cc38f700e 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -76,8 +76,6 @@ #define M68K_MAX_TTR 2 #define TTR(type, index) ttr[((type & ACCESS_CODE) == ACCESS_CODE) * 2 + index] -#define TARGET_INSN_START_EXTRA_WORDS 1 - typedef CPU_LDoubleU FPReg; typedef struct CPUArchState { diff --git a/target/microblaze/cpu-param.h b/target/microblaze/cpu-param.h index c866ec6c149..5d55e0e3c4a 100644 --- a/target/microblaze/cpu-param.h +++ b/target/microblaze/cpu-param.h @@ -27,6 +27,8 @@ /* FIXME: MB uses variable pages down to 1K but linux only uses 4k. */ #define TARGET_PAGE_BITS 12 +#define TARGET_INSN_START_EXTRA_WORDS 1 + /* MicroBlaze is always in-order. */ #define TCG_GUEST_DEFAULT_MO TCG_MO_ALL diff --git a/target/microblaze/cpu.h b/target/microblaze/cpu.h index e44ddd53078..552e9646e95 100644 --- a/target/microblaze/cpu.h +++ b/target/microblaze/cpu.h @@ -231,8 +231,6 @@ typedef struct CPUArchState CPUMBState; #define STREAM_CONTROL (1 << 3) #define STREAM_NONBLOCK (1 << 4) -#define TARGET_INSN_START_EXTRA_WORDS 1 - /* use-non-secure property masks */ #define USE_NON_SECURE_M_AXI_DP_MASK 0x1 #define USE_NON_SECURE_M_AXI_IP_MASK 0x2 diff --git a/target/mips/cpu-param.h b/target/mips/cpu-param.h index 11b3ac0ac63..b953f993b25 100644 --- a/target/mips/cpu-param.h +++ b/target/mips/cpu-param.h @@ -25,6 +25,8 @@ #define TARGET_PAGE_BITS_MIN 12 #endif +#define TARGET_INSN_START_EXTRA_WORDS 2 + #define TCG_GUEST_DEFAULT_MO (0) #endif diff --git a/target/mips/cpu.h b/target/mips/cpu.h index f6877ece8b4..6545f0b4cd4 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -98,8 +98,6 @@ struct CPUMIPSFPUContext { #define FP_UNIMPLEMENTED 32 }; -#define TARGET_INSN_START_EXTRA_WORDS 2 - typedef struct CPUMIPSMVPContext CPUMIPSMVPContext; struct CPUMIPSMVPContext { int32_t CP0_MVPControl; diff --git a/target/openrisc/cpu-param.h b/target/openrisc/cpu-param.h index 37627f2c394..7ea0ecb55a6 100644 --- a/target/openrisc/cpu-param.h +++ b/target/openrisc/cpu-param.h @@ -12,6 +12,8 @@ #define TARGET_PHYS_ADDR_SPACE_BITS 32 #define TARGET_VIRT_ADDR_SPACE_BITS 32 +#define TARGET_INSN_START_EXTRA_WORDS 1 + #define TCG_GUEST_DEFAULT_MO (0) #endif diff --git a/target/openrisc/cpu.h b/target/openrisc/cpu.h index b97d2ffdd26..ae6d6a77910 100644 --- a/target/openrisc/cpu.h +++ b/target/openrisc/cpu.h @@ -38,8 +38,6 @@ struct OpenRISCCPUClass { ResettablePhases parent_phases; }; -#define TARGET_INSN_START_EXTRA_WORDS 1 - enum { MMU_NOMMU_IDX = 0, MMU_SUPERVISOR_IDX = 1, diff --git a/target/riscv/cpu-param.h b/target/riscv/cpu-param.h index fba30e966a8..ff4ba81965a 100644 --- a/target/riscv/cpu-param.h +++ b/target/riscv/cpu-param.h @@ -16,6 +16,14 @@ # define TARGET_VIRT_ADDR_SPACE_BITS 32 /* sv32 */ #endif #define TARGET_PAGE_BITS 12 /* 4 KiB Pages */ + +/* + * RISC-V-specific extra insn start words: + * 1: Original instruction opcode + * 2: more information about instruction + */ +#define TARGET_INSN_START_EXTRA_WORDS 2 + /* * The current MMU Modes are: * - U mode 0b000 diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 7de19b41836..b432e31fb6d 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -43,12 +43,6 @@ typedef struct CPUArchState CPURISCVState; # define TYPE_RISCV_CPU_BASE TYPE_RISCV_CPU_BASE64 #endif -/* - * RISC-V-specific extra insn start words: - * 1: Original instruction opcode - * 2: more information about instruction - */ -#define TARGET_INSN_START_EXTRA_WORDS 2 /* * b0: Whether a instruction always raise a store AMO or not. */ diff --git a/target/s390x/cpu-param.h b/target/s390x/cpu-param.h index 5c331ec424c..a8a4377f4ff 100644 --- a/target/s390x/cpu-param.h +++ b/target/s390x/cpu-param.h @@ -12,6 +12,8 @@ #define TARGET_PHYS_ADDR_SPACE_BITS 64 #define TARGET_VIRT_ADDR_SPACE_BITS 64 +#define TARGET_INSN_START_EXTRA_WORDS 2 + /* * The z/Architecture has a strong memory model with some * store-after-load re-ordering. diff --git a/target/s390x/cpu.h b/target/s390x/cpu.h index 5b7992deda6..057c33e0225 100644 --- a/target/s390x/cpu.h +++ b/target/s390x/cpu.h @@ -35,8 +35,6 @@ #define TARGET_HAS_PRECISE_SMC -#define TARGET_INSN_START_EXTRA_WORDS 2 - #define MMU_USER_IDX 0 #define S390_MAX_CPUS 248 diff --git a/target/sh4/cpu-param.h b/target/sh4/cpu-param.h index 2b6e11dd0ac..f328715ee86 100644 --- a/target/sh4/cpu-param.h +++ b/target/sh4/cpu-param.h @@ -16,4 +16,6 @@ # define TARGET_VIRT_ADDR_SPACE_BITS 32 #endif +#define TARGET_INSN_START_EXTRA_WORDS 1 + #endif diff --git a/target/sh4/cpu.h b/target/sh4/cpu.h index d536d5d7154..3ece180ff63 100644 --- a/target/sh4/cpu.h +++ b/target/sh4/cpu.h @@ -125,8 +125,6 @@ typedef struct tlb_t { #define UTLB_SIZE 64 #define ITLB_SIZE 4 -#define TARGET_INSN_START_EXTRA_WORDS 1 - enum sh_features { SH_FEATURE_SH4A = 1, SH_FEATURE_BCR3_AND_BCR4 = 2, diff --git a/target/sparc/cpu-param.h b/target/sparc/cpu-param.h index 6952ee2b826..62d47b804bb 100644 --- a/target/sparc/cpu-param.h +++ b/target/sparc/cpu-param.h @@ -21,6 +21,8 @@ # define TARGET_VIRT_ADDR_SPACE_BITS 32 #endif +#define TARGET_INSN_START_EXTRA_WORDS 1 + /* * From Oracle SPARC Architecture 2015: * diff --git a/target/sparc/cpu.h b/target/sparc/cpu.h index 462bcb6c0e6..d5e8378e6c0 100644 --- a/target/sparc/cpu.h +++ b/target/sparc/cpu.h @@ -221,7 +221,6 @@ typedef struct trap_state { uint32_t tt; } trap_state; #endif -#define TARGET_INSN_START_EXTRA_WORDS 1 typedef struct sparc_def_t { const char *name; From patchwork Wed Mar 19 13:44:56 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: 874721 Delivered-To: patch@linaro.org Received: by 2002:a5d:6a90:0:b0:38f:210b:807b with SMTP id s16csp406576wru; Wed, 19 Mar 2025 06:45:44 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXXrMlQsLJg33paIIfGt3GdVzafBP6cT2VKIjanpTnbcOfVbse3ch32qnm6ruSdPh+U4RKabQ==@linaro.org X-Google-Smtp-Source: AGHT+IGsTxPYhS/5f76i27wQWKhHpRgKSQxVovG/1SFZSghnlYi6fuGUiG5b1zdYkAcVHZFGNLyp X-Received: by 2002:a05:6122:891:b0:520:61ee:c815 with SMTP id 71dfb90a1353d-525892a41aamr1547100e0c.10.1742391944697; Wed, 19 Mar 2025 06:45:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742391944; cv=none; d=google.com; s=arc-20240605; b=QSkasB5J/llYOj1/vNo/A8XmOf9q1gWBJsDjsnkSH3ErOc+/+G3qvcr5W7N4Bry9Py t7NGGpDZIH90nAMWgPuQ4a8LMRlPE2oypH6YInfl91X2vOff/kpjIaVbUFf91hAQOL5r ROtCG2QlyI6ETYYWQYvdUiLhz6V0XroxU5v/vTyJJIoNIHrTl0Q64MbkRV7nalg0nx8p iVopdjaXlNrWwMiZY5R3JQc9b69pRvn41dALssi6e77A0IxL4oRUQwu+fxBqJ732DL7N Y5AG9Ntwm2GaI4EfOxrzSM/Y+TlIgLQ/ZR+xFaFtJPCRM/Js6mH4RZKGAybkBdOQwScH OOFA== 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=krg3MvTmntonI2/Wohd27AtoieJZs7YNIWzT3yjluvQ=; fh=oQsvFjElslmUPxsR6fJkm0Ezna1Yj9KV/ql5u2IKgnk=; b=d+E2SoSMCFxox/6d1O8zQl/ckKiHghYVTyA2wK6XNlDxa1z6tCSfVYIMpqW4E0pe3W 763t5XCzL1y5ER8s+wJRnI+F0Mhw+GfFJJIEMEf831J8gmPj/SUqOtnhlv4CfRqDTzLY 2TO+MMj1emdfBp0RFQtoQkCKTB9Fz1CO++WyG9WjoGDOvYY7QFHwgrM4qo5a+HigNzmk 48fXz5GQ5M04NJETod1Oj4Xpx6Je96HmUmteJyjjYUWM1v2bas4qQWUthwxNtmHn7dm/ KK4GAkKfb7WYp/qfeMFoOf1NNSki7W94Cj10YQYh/nGuB83qPTqTo2uqBLVq6VaNBAlJ zVuQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="DZKgoF/a"; 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 71dfb90a1353d-5243a5a168fsi3804795e0c.103.2025.03.19.06.45.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 Mar 2025 06:45:44 -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="DZKgoF/a"; 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 1tutjb-0002gD-5g; Wed, 19 Mar 2025 09:45:27 -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 1tutjW-0002dO-Fq for qemu-devel@nongnu.org; Wed, 19 Mar 2025 09:45:22 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tutjU-00040u-Cj for qemu-devel@nongnu.org; Wed, 19 Mar 2025 09:45:22 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-43cf034d4abso48326985e9.3 for ; Wed, 19 Mar 2025 06:45:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742391918; x=1742996718; 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=krg3MvTmntonI2/Wohd27AtoieJZs7YNIWzT3yjluvQ=; b=DZKgoF/ax2orvua7FtAsBoeA55vkfc4eSQsz3MBkFUtqR32GE7NLZtEv4sJl43cCGk OFVIQ1OOP3I06N4Id7fr4EQCs7cB34uE5D71oE5DLzIfbtJpS+OqcGU6IO1zySQ4gDCC 80S6NUMOpvoq5RWlxVYk3RHfUbl2A4M4+DLGmIIvMKU7I61mtvIjrG8j19UFCS1oWfjg w3j7ptJ9Kj0Er5NEWJROU/V+mlnXI1p/XYke8y2oqUNwju6TtVawtLTrwI61/EQ5V8VW WH1j3Ea4giPIDwwY87qb9SScjAn4URNQHvPcGmgMDOg7Gic2SoOzp/Z9m3Y7ObPnHy6m L8pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742391918; x=1742996718; 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=krg3MvTmntonI2/Wohd27AtoieJZs7YNIWzT3yjluvQ=; b=DYlQwh95tvaNGeJUnhPxJRRo73ulEgVB8FMmeooRvKSIEW3QnPsCGBdIfy4MWW4+Wm M7v3OB1dbANXafwPfV0+JIA2vwZB1vcozyClehgnvTBZ8xGLq5d404YSwX4GWUa5NCVb 8ZhYwxLXVZYHthgkunz4/vEe9jPW2hJDSirZIamlUPCcGgrsedIsaQ4+kQTUmVvzIUEL MXTfOdm+KWKUaGVE6tB5bdJdLljFeSWZXKjDVUd9zg6CNv0SIEPa76G4z2p9RVW2p41j TourEXlocbCcgF7qHXlXwvA7/54cXL4i+fNqzsl6VoUI523JkORWahJKx/vQslwEjmee LNCw== X-Gm-Message-State: AOJu0Yx430pICWY5UWS7TpjLoRCoKxoitAY/Poe3a3rTAS4C8j1U7wXE tzHl01x+tZIqZDO76TqLmAwa2ecLD1YDmzBrGQnEhXQiqZK0fb80qa8PgxdrQeLtpogn2QCnta9 8 X-Gm-Gg: ASbGncu3mER6zVVJWEUPkT3qlfwIMxFmALdwsBz3qHCpdzDsSrYWlKrQmxp5mcUt97P AbJ5C/ztDxButloAzQT2S0WY9U7+KLJmEPB42ybNESm3A/auGfxUbTn5tVBZIWsC+Tficgolikz CtYaZK8ou7NmOEf+o2xa6bZjgpXKh59gc70NAWBN4NApP9jLsv81O8jui7DKuh/qO4OHpJsde8c ag7SwvIBrmMis6nchxNrrwEyzGJMGgp4kerr0TCJ3fgkI95EnOMjbFvP6L4yuYzx0VBhFJatkMu 9IODyqp03EQVg2hZhOQoMtCmVjqQ5ILWpfzKhtb8N2rG6wPNweDg6GZScdS8c/cntw41Ejek41Z 6rFEAs8HQs8oDnujNBt3iq4VtADiH8Q== X-Received: by 2002:a05:6000:1847:b0:391:268:64a1 with SMTP id ffacd0b85a97d-39973b06e56mr2916073f8f.48.1742391918091; Wed, 19 Mar 2025 06:45:18 -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-395c8975b83sm21695849f8f.52.2025.03.19.06.45.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 19 Mar 2025 06:45:17 -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 02/12] tcg: Always define TARGET_INSN_START_EXTRA_WORDS Date: Wed, 19 Mar 2025 14:44:56 +0100 Message-ID: <20250319134507.45045-3-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::331; envelope-from=philmd@linaro.org; helo=mail-wm1-x331.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 50c18bd326d..394c191da8d 100644 --- a/include/tcg/insn-start-words.h +++ b/include/tcg/insn-start-words.h @@ -8,10 +8,6 @@ #include "cpu.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 a02850583bd..5dfddf995d6 100644 --- a/include/tcg/tcg-op.h +++ b/include/tcg/tcg-op.h @@ -22,7 +22,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 ff06e41497a..c89d3ad52b6 100644 --- a/target/alpha/cpu-param.h +++ b/target/alpha/cpu-param.h @@ -25,6 +25,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 81f3f49ee1f..0417f8dcccb 100644 --- a/target/avr/cpu-param.h +++ b/target/avr/cpu-param.h @@ -31,6 +31,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 6c4525fdf3c..9cb26cefd5d 100644 --- a/target/ppc/cpu-param.h +++ b/target/ppc/cpu-param.h @@ -38,6 +38,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) From patchwork Wed Mar 19 13:44:57 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: 874731 Delivered-To: patch@linaro.org Received: by 2002:a5d:6a90:0:b0:38f:210b:807b with SMTP id s16csp407963wru; Wed, 19 Mar 2025 06:48:32 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXFxnUMqvdZCD5XE4arxKe+j5KvJ2AnIggg0SSXMlWnEk/+BYptY++Ig0EnqIQXqiDfS0ZgBw==@linaro.org X-Google-Smtp-Source: AGHT+IGfUOhHPsmU5Bd3dxfSwuCC34dBRJEKM1RYjlYTV3ji9TSnfDJGelDRvDUCu+Ra++ju5nJO X-Received: by 2002:a05:6214:d62:b0:6e6:6c18:3ab7 with SMTP id 6a1803df08f44-6eb293b5b6emr46711066d6.27.1742392112503; Wed, 19 Mar 2025 06:48:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742392112; cv=none; d=google.com; s=arc-20240605; b=V7cu2hNhfSOVuCxCvw4xiEnGlsL4NhB6CUKQdZ4tBkvyWgLW73SeOEcsn5sSNc9C+z 5HsBjWSobL8M4nI5PD0BqoAi+wtQ6sucNbD1FR0fCADuDVkFv1qRz7cTc3xpsju52ywk CITIloOiADWN2tJ+WsGM4i5P9W5QODjd5TDjpFPzA8Don2qa92xIchpNOiGrPHdlCtLm g3XDwCZF1W6fzSjzbIwMAKkXyKmBlvt9AqFuEcwBPfjicgnJ/yxOG83uyZCG5umoBFXH /++3AU6+G05oF23U3q7Q6sHfqFZhJSBBp0xA4mUq5VjfmTNUZu2nsPYBZhuSiW4gf9mr AnYQ== 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=eS9IoYBKjFns/3rxGigGeIdEfqxRX4ylTtuMFHv8VkA=; fh=oQsvFjElslmUPxsR6fJkm0Ezna1Yj9KV/ql5u2IKgnk=; b=ENt6P+bKvvIIX9sdrdETtBqRgq4FUlwGMmwfuVXaRVjuECy0XYueSSPsJO1xnxKpqS nRs11qpzKz68+PQHmroM36WPc4fEJfzAvD+lq4ZWc0ORR7S9rYwF0yP0h9c/tj/fe/Gh q4QtQzz9wlwPDaC3ubDOF+M6P0X0kz/i4tUL3PHANU9jG98OWYO9DUPPYNX8qZsGBK2i pyEWS/DzRE8cK0XuPp65/OjvTW1lLP4S+UInIQUREl9ccEgsLg9YSbEh9K1s8ERpK29z dTIVVN8/ZXoBDIp6VDPV7cpapt1thQR9NKkPhps9SM1dHpkANP6z7Mta1gWGlDIRLGE2 8axw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=g1aCG5LC; 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-6eade1ddd7asi142732266d6.40.2025.03.19.06.48.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 Mar 2025 06:48: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=g1aCG5LC; 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 1tutjg-0002nt-KE; Wed, 19 Mar 2025 09:45:32 -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 1tutjd-0002kU-Ll for qemu-devel@nongnu.org; Wed, 19 Mar 2025 09:45:29 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tutjb-00042D-Hh for qemu-devel@nongnu.org; Wed, 19 Mar 2025 09:45:29 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-43cf628cb14so5189585e9.1 for ; Wed, 19 Mar 2025 06:45:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742391926; x=1742996726; 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=eS9IoYBKjFns/3rxGigGeIdEfqxRX4ylTtuMFHv8VkA=; b=g1aCG5LCBlTHchn35XKeE5zfr4h5tbNPdWKRPdx9K0easlZcKGEtfu87eRj4xurFli ZDCVywiI5Hjg/IQ3gVA1J+9eZdJ1FI5ZFtOP3qtrG+zMoNldn71HhLNmx0oKWEJzrLih md4Y0BoTYCkjDNrxEe0tp1e3F0Bh2S0XDC27qnhVGI04n9CfAgTESd5+n1PDoTbjI77Y rZ9t268EGNojVraYuifyfA9Ku6TR+fK8KVkEWC1ip5GzfHCSKtn5F8wNA2q9SLS5g8Hz 4wAm91QZRLcHndNI0Jf/nJXFWQMsmH4I/B0gBmAkfni0mXB4lPFjM7xvYlmfl8xMK0j0 1KXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742391926; x=1742996726; 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=eS9IoYBKjFns/3rxGigGeIdEfqxRX4ylTtuMFHv8VkA=; b=d1d5tIN/ORlTxRIDOuAGI77sP7yoYs5pPHrtCxjrZ4qWnfrwXHr2f4lCYsxHIBNxRI xCaBnIRcZ4x6OKWxu4vjciFGpPg+5/qF/3fUonZ2OSF3lO5zSQWEojEAC32HdeIveUHg oYsPe/qAouYnwGAqwgU8HDKpKmHEyPLf96zxrl0sKM+9RQFEutNUCM1rEdHFRDw6Pta4 KgbCWGaR2mOK7AYv/eI5aO3BEszBAXDVwlVEOkkBVqg0Iur4ejvI2cNXX4vFs2yImNzp OujwFNa9ftS6Kl+0LPp/TtoHlE8oEKl5c0BxjKkyvU7blTCr8RL7HviSsaS9rqClfrx4 tqeQ== X-Gm-Message-State: AOJu0YyrkwqSP08z+6Lj6NVG0ZxXOrVOGrNijtYk6LQQqk7dl8/ot/Kb va6QVu/5WKd0bhSiAAp5vnKZEBd/kbiS9pYWcbw/us8CWaNdVJCJRwIHLrL3veZskxpjO0tn4pe / X-Gm-Gg: ASbGncvKvE2b0PxNfEYIAOPQ4sKDO0M6YqxjpmFdv+tyKOCwGCSdG2L4QR0WMurGjB8 VO/sxTD/R/KpXJL6n5wpvXG3x4zB+5wQnVK+gkQ9LnEZ/1HSNhAepIqDnH5hGwBWsITxiT12Zf2 /68slNWRdJsSRR7LLuF/tWwl85CxIbfymsieObLAadWQD38h6euz6obA+8JigaYcw8CeuKSD6zJ XvDBiqQ+uz+yul1cOsEYaS9t/v/myrc+HZo8iNjDXZ6jEVlWsFHMVExI2RjrP7kYzHsVN2OzVDH lObcm0u79zkCViu4qG0TZ6oHRveFURQ37nBrMlXH9tGll9BTcjdYWD4ER0s0QXB3hrfWCE6/jXH jqlK1irdnfr6BTydi7vc60Pqc+nLPCQ== X-Received: by 2002:a05:600c:44d3:b0:43b:baf7:76e4 with SMTP id 5b1f17b1804b1-43d3b95f719mr55577325e9.1.1742391922725; Wed, 19 Mar 2025 06:45:22 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d43f43cbasm19134775e9.9.2025.03.19.06.45.21 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 19 Mar 2025 06:45:22 -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 03/12] tcg: Have tcg_gen_insn_start() take uint64_t arguments Date: Wed, 19 Mar 2025 14:44:57 +0100 Message-ID: <20250319134507.45045-4-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::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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 Since restore_state_to_opc()'s rework in commits d29256896..04f105758 and TCGContext::gen_insn_data[] widened in commit c9ad8d27caa ("tcg: Widen gen_insn_data to uint64_t"), tcg_set_insn_start_param()'s 3rd argument is uint64_t, not target_ulong. Use the same type signature for tcg_gen_insn_start(). Signed-off-by: Philippe Mathieu-Daudé --- include/tcg/tcg-op.h | 7 +++---- accel/tcg/translate-all.c | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/tcg/tcg-op.h b/include/tcg/tcg-op.h index 5dfddf995d6..8938f386599 100644 --- a/include/tcg/tcg-op.h +++ b/include/tcg/tcg-op.h @@ -23,21 +23,20 @@ #endif #if TARGET_INSN_START_EXTRA_WORDS == 0 -static inline void tcg_gen_insn_start(target_ulong pc) +static inline void tcg_gen_insn_start(uint64_t pc) { TCGOp *op = tcg_emit_op(INDEX_op_insn_start, 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(target_ulong pc, target_ulong a1) +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); 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(target_ulong pc, target_ulong a1, - target_ulong a2) +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); tcg_set_insn_start_param(op, 0, pc); diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 82bc16bd535..a857aefd756 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -117,7 +117,7 @@ static int64_t decode_sleb128(const uint8_t **pp) /* Encode the data collected about the instructions while compiling TB. Place the data at BLOCK, and return the number of bytes consumed. - The logical table consists of TARGET_INSN_START_WORDS target_ulong's, + The logical table consists of TARGET_INSN_START_WORDS uint64_t's, which come from the target's insn_start data, followed by a uintptr_t which comes from the host pc of the end of the code implementing the insn. 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); From patchwork Wed Mar 19 13:44:59 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: 874725 Delivered-To: patch@linaro.org Received: by 2002:a5d:6a90:0:b0:38f:210b:807b with SMTP id s16csp406959wru; Wed, 19 Mar 2025 06:46:37 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWvMjT4TTgIlmUwhmzzXMKon0V4hE86Zj/DUA8auTfO5onj5i0auWpfVVAzooz4IGH7/Ye0ag==@linaro.org X-Google-Smtp-Source: AGHT+IFlj5PkcBXy3YW4VilorueTot96ib1FsMC1//3PwoUqahr3ICNlHmn9zRbf1PL39uN6bqQx X-Received: by 2002:a05:620a:4415:b0:7c5:5edb:f4d5 with SMTP id af79cd13be357-7c5a8283c6fmr330261685a.2.1742391997174; Wed, 19 Mar 2025 06:46:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742391997; cv=none; d=google.com; s=arc-20240605; b=MXF1/0aDbtzyfdSGUUQMy2wrowxfW1sMVXvUHFBUsMIxk78v6O9ejf9Xi2WU2dpn8G ICsjkW00hWZ6UMNGeQWe6Zww3pljwLPqtksEYlNgn6vIA+KikBCn7R3AdKFVPBdXOl6J 11dmefP3O8ReUCKqvzxj2Tna+JS15MSUIE8P4VJ0qyPvgWc1sN5f8xahs9c4AZnoR3F6 Ov72CMUtX1toBrnwde/Gon0Rl3J06jj9R5dNFkfD7MPKp4nQNIHJS0krnK+9NsCCbd+P pq91cwg4z5gySeZA8wVEy8HQjjsfJj5kFs8EzGCtTNNGQIuXGv39/pzyQYwKIxktMt6K w+8w== 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=E7leHVcf9fCZ+ZDskvBL1qGPxfR0Xmsc8quxcgvFRhU=; fh=oQsvFjElslmUPxsR6fJkm0Ezna1Yj9KV/ql5u2IKgnk=; b=fhpMOseGjpB9HFTGrL8u9EiXIuDFyG4ddLC0wJAjgO+d2WkVF339RgMuD0sA42bwHE X2tdpE5CvlcbyzxO+y1mjjB3ASwjzPmsZcgyk07OGgi/gHBiu/pQ9Qy2za5olV76wCWy Vo8GdnnP4MLirtarTnhFlaMDHtZp+6/24aj67vW2KhEIR9waKqh8rmWHwgkyXqOd6swl GP2zr2Uos3oceAfQFl/6G/s7n5xkB8EL4YfJt1/eYlovWkF9dLklkV4qYEi41uQogKSK TcOT5sQdPG0zJ2nltR1n/GWCn2Tmr2yLEQW+XV8LEf5G2Rc/Xthi7VkWu1ZnblkULbHe Vx4A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gwVXHqhe; 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-7c5ad3ba6desi67128685a.432.2025.03.19.06.46.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 Mar 2025 06:46:37 -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=gwVXHqhe; 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 1tutjq-00036p-Bh; Wed, 19 Mar 2025 09:45:42 -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 1tutjm-00031X-Kb for qemu-devel@nongnu.org; Wed, 19 Mar 2025 09:45:39 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tutjk-00043G-RI for qemu-devel@nongnu.org; Wed, 19 Mar 2025 09:45:38 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-43bb6b0b898so45642785e9.1 for ; Wed, 19 Mar 2025 06:45:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742391935; x=1742996735; 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=E7leHVcf9fCZ+ZDskvBL1qGPxfR0Xmsc8quxcgvFRhU=; b=gwVXHqheWO+2cJs/O40M6tvlIKgayHExS7VEm7y0VKwcAdD/bImUm0puMO5oCEDEL5 aPuvW7XFmoftAoBIKZ8ziMQALeNMIV7OU5go+iYCoJgpaIqQ5sNulCbprbrIn+ooR/1g TzeI2SC7vMQFERVg/DxMXewCkEojYxkdf6ITdInRevlW2vboRRJyfFR3JuHEUR5esNGO YLYTCg+oOsT5O9G565Wj9vjDeCHFLPM7NOFX6JX5AWpzxPiB+WF+uDIrzl+m0QUUaj6T Ml4qyYMg3O7ec13umpUtfIwps6etLWNBgthe7vIIc0DL7a8xixnfmeWBIDVA1Vgm2VYl hJtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742391935; x=1742996735; 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=E7leHVcf9fCZ+ZDskvBL1qGPxfR0Xmsc8quxcgvFRhU=; b=Sz+1j0QzxbQV0/bpxGzq2Tellg7nl8mw3R+WOu+Dx3aNE6nK07oGq9F8Qm2WYDY1ZJ Q8yUbunPe4Lh75vvQGnRpT3oG2KG67+vR7lFQ4GfP1eH8oTz0rMPDcOY8Erb6E0SL9H6 bsZUgPlK80yqXtkBcGAmyI3zqEf/Jj3/EJvFkvZdkfl71fa5nAgTBbHkV1Xan0L4/xbO 1BHqDTLxk70cilnGp8eUlBi869kny2DCAIVSZGBy0W5yGbIsakA4/wNNA1Anjxpte1NA ZnKiXmK6o7dDyTSikQCXb1SgYy89ApLfjPCDqxKjCENsWfjXt4S3SCkuNMVVP8uiLc4/ ZwkA== X-Gm-Message-State: AOJu0YwiyFG/upWEeoMBqEV4Boi4GrCRfRwBZxvu1dhrBjoUPCfWKuYn RMTdyIKYwzweRDPS5mnT707mZvDf9aGbc4fRseXP84Wo6twbJzN8ZGYUxZkrRVPjuMahBNcuyS2 U X-Gm-Gg: ASbGncsh+jIGXP0SXnyEtVtervFDEsP6J8np1l4YD8Zx9e6x3uQfbK8O79MffH5GWw7 YhaMvDZ5pkzSkR9AHBwJW/qZmPDZDqVcau6XuQx9ySHOC+CIJIG8HTNyo0NiWOeIt/kw05nvAmT uiuRllsdm4RiWD51sSomE1MDyvjLJJhlvCjDWp2rbYtejriYYYmyW5gqw72WExOolxwM2wLh+J0 5SwBn8Ak67cVgCm+ZziK4GCWqptPFRrAtOJo83dT8xl9jePeldvnFYZncDp3Y6cHHWHPJmGyRcq hMayNbxmUTNsCkFwko9Zg+IsiS7Fajq/yYRK9py8IgL4U+W7d9PoIyjQNNld7YEl6W7SmfDwJ1g SRNnFyh8hwCl9cvY4rUQ= X-Received: by 2002:a05:6000:1fa4:b0:391:2e0f:efce with SMTP id ffacd0b85a97d-399739b40a8mr2548739f8f.1.1742391934883; Wed, 19 Mar 2025 06:45:34 -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-395c7df3512sm21857199f8f.12.2025.03.19.06.45.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 19 Mar 2025 06:45:34 -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 05/12] tcg: Use TCGContext::insn_start_words in tcg_gen_insn_start() Date: Wed, 19 Mar 2025 14:44:59 +0100 Message-ID: <20250319134507.45045-6-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::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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 tb_gen_code() we set TCGContext::insn_start_words to TARGET_INSN_START_WORDS: 290 TranslationBlock *tb_gen_code(...) 293 { ... 351 tcg_ctx->insn_start_words = TARGET_INSN_START_WORDS; This definition is expanded to: 11 # define TARGET_INSN_START_WORDS (1 + TARGET_INSN_START_EXTRA_WORDS) Directly use the identical tcg_ctx->insn_start_words variable. Signed-off-by: Philippe Mathieu-Daudé --- include/tcg/tcg-op.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/tcg/tcg-op.h b/include/tcg/tcg-op.h index e0038e70a8d..1f0d3b95304 100644 --- a/include/tcg/tcg-op.h +++ b/include/tcg/tcg-op.h @@ -25,7 +25,7 @@ #if TARGET_INSN_START_EXTRA_WORDS == 0 static inline void tcg_gen_insn_start(uint64_t pc) { - unsigned insn_start_words = 1; + unsigned insn_start_words = tcg_ctx->insn_start_words; TCGOp *op = tcg_emit_op(INDEX_op_insn_start, insn_start_words * 64 / TCG_TARGET_REG_BITS); @@ -34,7 +34,7 @@ static inline void tcg_gen_insn_start(uint64_t pc) #elif TARGET_INSN_START_EXTRA_WORDS == 1 static inline void tcg_gen_insn_start(uint64_t pc, uint64_t a1) { - unsigned insn_start_words = 1 + TARGET_INSN_START_EXTRA_WORDS; + unsigned insn_start_words = tcg_ctx->insn_start_words; TCGOp *op = tcg_emit_op(INDEX_op_insn_start, insn_start_words * 64 / TCG_TARGET_REG_BITS); @@ -44,7 +44,7 @@ static inline void tcg_gen_insn_start(uint64_t pc, uint64_t a1) #elif TARGET_INSN_START_EXTRA_WORDS == 2 static inline void tcg_gen_insn_start(uint64_t pc, uint64_t a1, uint64_t a2) { - unsigned insn_start_words = 1 + TARGET_INSN_START_EXTRA_WORDS; + unsigned insn_start_words = tcg_ctx->insn_start_words; TCGOp *op = tcg_emit_op(INDEX_op_insn_start, insn_start_words * 64 / TCG_TARGET_REG_BITS); From patchwork Wed Mar 19 13:45:00 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: 874727 Delivered-To: patch@linaro.org Received: by 2002:a5d:6a90:0:b0:38f:210b:807b with SMTP id s16csp407125wru; Wed, 19 Mar 2025 06:46:54 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW5wYLCASC07+0QqiGmoRaCoa5FdCtWw9d6720mUpxJQPRfeVNIgtGt+0vP+zo/LHJjJop3ZA==@linaro.org X-Google-Smtp-Source: AGHT+IEGjQfhMdXXymt5lfRgi5hdhXKJLbFyYoa13FaG+auxYKkBmt4A9F90o+xOOg6w3Srloc4Z X-Received: by 2002:a05:622a:230f:b0:476:5fd5:4de7 with SMTP id d75a77b69052e-477083a68bemr45513751cf.41.1742392014131; Wed, 19 Mar 2025 06:46:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742392014; cv=none; d=google.com; s=arc-20240605; b=cVmTL2Jfq4dL/ZrgLJ+oVk8/Cdm/2TEdaB90NKuoqUJoRe6tqKBtMvSu6fU2mSwmOo ZKJQv8Ew4+QFtOVsnGnQNeDgxziFeKjZcKNb/ndwwmMCOFs9xzq7AOuWT3t0ePW8yiZN udXhwH4qTT1cqAwElA1wqy3jP7OG+znE3z6f0rkRT9ivSglgButsHK4G++1WIEh33ux0 pMHIJ8pVe9Xvq89TdeWK3l1CSGFsaXpqCSIiOPLJRygnUmFxtbPj7Z/UxvohueyZnHNg e7WdDru5Y80o/cUL6Yh/cs81WmAuK+Qh6Lu+Ev9caH4QhoT7AOzFsGX7s2G/KkR8qmrv o/qg== 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=pD8YI+wp8fAxGYCXUbWnDA857RwLaG+OiY+C78OOnko=; fh=oQsvFjElslmUPxsR6fJkm0Ezna1Yj9KV/ql5u2IKgnk=; b=Sgvu3CGYtmuprDwWJSIbn3nL5VhgALMD9YStqgZeXZzBZudbhJGUOfxnwCbYFDOfld 55MI3Zm9+pQvw5f9pQgPOEiLe7U3ipdCPI1DKJMHFMPwQ2Z8JUBvkFO7Z7zUv5oHUeM6 9Jof4k8bMKGLzoZNEu54swqCo6fS0sCdYd/tb+mNtmszwK2xzkoLMFabhu7252CZXFyM fVAxNv9WV0hWiTC5m6rzGzpFTbB6VS/Kw1/ohGgwkfwUgqpyTma7w3vNBOw7qSNZh0Re YyJC0n7Qtfi7LrQVbrzOt2LzWC2pundw37CPeoDUpklSk1qHPm3boMr3mN26wcZyaMW1 2ryw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=mDi72MQq; 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 d75a77b69052e-476bb887c2asi136398451cf.668.2025.03.19.06.46.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 Mar 2025 06:46:54 -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=mDi72MQq; 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 1tutju-0003JM-RI; Wed, 19 Mar 2025 09:45:47 -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 1tutjr-0003BY-J3 for qemu-devel@nongnu.org; Wed, 19 Mar 2025 09:45:43 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tutjp-00043r-EJ for qemu-devel@nongnu.org; Wed, 19 Mar 2025 09:45:43 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-43d04dc73b7so46008515e9.3 for ; Wed, 19 Mar 2025 06:45:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742391939; x=1742996739; 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=pD8YI+wp8fAxGYCXUbWnDA857RwLaG+OiY+C78OOnko=; b=mDi72MQqymkWS7J3ocE66/1GdZSI3L44auqHOU2bTmCR/NXov57zhGJyIw68e72EXd Mtnu1bBLZpIkWW/8pSVvqnfJ1+/ByhF6tm2WgVboX6m/3lAKWYvrZbooKFD5VPmPT1Gx YBTM58RDrox9uv6sPk7J0RENvykmjtqZXB7Bo29DLBqOIjYr+dy64kd0Nqz1fqCnvgDP 3b2i/ynj84Ja9j3KhyFj49CGcaxYjAzoeJdWlbfk5kPBSptxwrIX6XCFQG+T0SZWW1S1 KBLPy0apqOnILd55AzrYhSc5LQPXrl7hY3V/we9JyWG9XC/vUsjKzob3x3HRNLZIQZBC wZmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742391939; x=1742996739; 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=pD8YI+wp8fAxGYCXUbWnDA857RwLaG+OiY+C78OOnko=; b=Br40DFa6htosJ0+WQDY96z52CbuGqdEneFy6rMO4nAdzuXb1K/d2tx+AgS0N5zkYUK DoRwAx8LVbrz1jh5y1GWJVXk/7e5kre2Gf8TSotMIeH1pbUOt8qyCDSIMCN0xJqoJmWJ ORvmS0stBX1We2d/WBAPIfVfisRmmrhDo5YPbxcnmsMEufSpKKpAXXIn58sdAc35y1a3 xoR1i8bbagfDvKBm0EHEXkVArzUNCD8vTg3pttQBkcoTO06XwdwPI1UM0LkjqkjP92Hr l4klmabMGOGKkI4q/1AV/ZGfI5rUgHireuc8m8kWfLog/66iB+nqn7J9KtDBiAsZrGEI QRkw== X-Gm-Message-State: AOJu0Yx42EGcmJn84KDQ5NlENgXjSvLkiodOQ+fM/4Y6qXe6+6sJkaD9 lTNmPNxZudyIvpD+cvoZDcNaWquJ6XdwfRhb3bQsupMQZNQT2ib2MBlchLeIrSsQbXlOBsp7c0l c X-Gm-Gg: ASbGncuAGZXu3RHrdbRm5SzaS0jTlkRwyv0mH7e9CqiQ/npfiQqZXcO7GWoGa5b4M3j +fXpT8GYJil2mGCuG696aikJutkytWlnK5TbzWf73lKJI19CWbXQuXQRvCrl2BLCUs7IEih0Yqo t2ZnTazOdngfmfielMjR2VQ1sBXzHxhTGQl6aHNu07pWHG7fWPmFJZXClbbGYVavIUOn5fDSEw+ NtxSVfl8qSUWIG2NjqCcQ2O/qnWx3d0RYLHSQpnLnFWoTNHRn9U9OrNLyUUQuaBCBZfAPNvovPZ QXH8UNu4WlMEUK0175BGXBI3KQ3r6bPq3lB9H9joaGhi1L5xLCMRIuW52UjT+qZ7V/jaS0JUyOp 9B/qWkSZmzAdHGJefmmc= X-Received: by 2002:a05:600c:83c3:b0:43d:2230:300f with SMTP id 5b1f17b1804b1-43d436ca01emr29911785e9.0.1742391939470; Wed, 19 Mar 2025 06:45:39 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d440eda26sm19201125e9.36.2025.03.19.06.45.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 19 Mar 2025 06:45:39 -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 06/12] tcg: Use TCGContext::insn_start_words in translate-all.c methods Date: Wed, 19 Mar 2025 14:45:00 +0100 Message-ID: <20250319134507.45045-7-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::32f; envelope-from=philmd@linaro.org; helo=mail-wm1-x32f.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 Replace TARGET_INSN_START_WORDS -> tcg_ctx->insn_start_words (see previous commit for justification). Signed-off-by: Philippe Mathieu-Daudé --- accel/tcg/translate-all.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index a857aefd756..54bba995a04 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -131,19 +131,20 @@ static int encode_search(TranslationBlock *tb, uint8_t *block) uint8_t *highwater = tcg_ctx->code_gen_highwater; uint64_t *insn_data = tcg_ctx->gen_insn_data; uint16_t *insn_end_off = tcg_ctx->gen_insn_end_off; + unsigned insn_start_words = tcg_ctx->insn_start_words; uint8_t *p = block; int i, j, n; for (i = 0, n = tb->icount; i < n; ++i) { uint64_t prev, curr; - for (j = 0; j < TARGET_INSN_START_WORDS; ++j) { + for (j = 0; j < insn_start_words; ++j) { if (i == 0) { prev = (!(tb_cflags(tb) & CF_PCREL) && j == 0 ? tb->pc : 0); } else { - prev = insn_data[(i - 1) * TARGET_INSN_START_WORDS + j]; + prev = insn_data[(i - 1) * insn_start_words + j]; } - curr = insn_data[i * TARGET_INSN_START_WORDS + j]; + curr = insn_data[i * insn_start_words + j]; p = encode_sleb128(p, curr - prev); } prev = (i == 0 ? 0 : insn_end_off[i - 1]); @@ -167,6 +168,7 @@ static int cpu_unwind_data_from_tb(TranslationBlock *tb, uintptr_t host_pc, { uintptr_t iter_pc = (uintptr_t)tb->tc.ptr; const uint8_t *p = tb->tc.ptr + tb->tc.size; + unsigned insn_start_words = tcg_ctx->insn_start_words; int i, j, num_insns = tb->icount; host_pc -= GETPC_ADJ; @@ -175,7 +177,7 @@ static int cpu_unwind_data_from_tb(TranslationBlock *tb, uintptr_t host_pc, return -1; } - memset(data, 0, sizeof(uint64_t) * TARGET_INSN_START_WORDS); + memset(data, 0, sizeof(uint64_t) * insn_start_words); if (!(tb_cflags(tb) & CF_PCREL)) { data[0] = tb->pc; } @@ -185,7 +187,7 @@ static int cpu_unwind_data_from_tb(TranslationBlock *tb, uintptr_t host_pc, * at which the end of the insn exceeds host_pc. */ for (i = 0; i < num_insns; ++i) { - for (j = 0; j < TARGET_INSN_START_WORDS; ++j) { + for (j = 0; j < insn_start_words; ++j) { data[j] += decode_sleb128(&p); } iter_pc += decode_sleb128(&p); @@ -443,6 +445,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu, if (logfile) { int code_size, data_size; const tcg_target_ulong *rx_data_gen_ptr; + unsigned insn_start_words = tcg_ctx->insn_start_words; size_t chunk_start; int insn = 0; @@ -460,7 +463,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu, fprintf(logfile, "OUT: [size=%d]\n", gen_code_size); fprintf(logfile, " -- guest addr 0x%016" PRIx64 " + tb prologue\n", - tcg_ctx->gen_insn_data[insn * TARGET_INSN_START_WORDS]); + tcg_ctx->gen_insn_data[insn * insn_start_words]); chunk_start = tcg_ctx->gen_insn_end_off[insn]; disas(logfile, tb->tc.ptr, chunk_start); @@ -473,7 +476,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu, size_t chunk_end = tcg_ctx->gen_insn_end_off[insn]; if (chunk_end > chunk_start) { fprintf(logfile, " -- guest addr 0x%016" PRIx64 "\n", - tcg_ctx->gen_insn_data[insn * TARGET_INSN_START_WORDS]); + tcg_ctx->gen_insn_data[insn * insn_start_words]); disas(logfile, tb->tc.ptr + chunk_start, chunk_end - chunk_start); chunk_start = chunk_end; From patchwork Wed Mar 19 13:45:01 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: 874726 Delivered-To: patch@linaro.org Received: by 2002:a5d:6a90:0:b0:38f:210b:807b with SMTP id s16csp407122wru; Wed, 19 Mar 2025 06:46:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUZceIIyKE6KVV8WRy/PRoyI7A46CFRgH10xTApG3NS5cTbIgTNBAQ1csLriyw3BvGfceVKIA==@linaro.org X-Google-Smtp-Source: AGHT+IH9CvH/U5si8isMY8aFaMNVOkNdeDZCGLpR1ETc0lmEsuZdi99Dt48WAL4RDBudMgYE8cfM X-Received: by 2002:a05:620a:31a8:b0:7c5:4194:bbcc with SMTP id af79cd13be357-7c5a83d29a7mr297508985a.29.1742392013612; Wed, 19 Mar 2025 06:46:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742392013; cv=none; d=google.com; s=arc-20240605; b=Y5skzrHGYVc1myzecUpkRiq+SECtYkibvbNBxGXSt/aNlU1TZjUtxgytxGuMboD8pl WNZoMa/9XbE9UhpX2OUxZZazQxiRs5O9cWEbeNkjYsDTBMjE6lP5x09hhue40aPAynsL Cbg8Nkx2SzEFw0ikbjviaGBgMrt7ViCmwxiRXBy7A1xHCU+kGj+FcfqkcrtqC1pyPSNT 3pWfpfH+G34wQVVV9PvUgiaak9gV2/jKXkc9gNXPEsUT8hWUgSr64DDUThdGx8daR8VC T4MQfYqbwp5mXct9FHs6nI2liPl+ksjvqG4QA1PEPVr+/+h9k0KTi9XonupBJnewbHWM twfw== 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=7+uCNdGR7Q/g7PWEHJ64I2sH/b8RzXSLv7jzZO24+jg=; fh=oQsvFjElslmUPxsR6fJkm0Ezna1Yj9KV/ql5u2IKgnk=; b=Pj0vtqhb9l5bJ+c+TWwZ5D3w6yvr9RpLaxI3us8SXv9MuU2/WyJEt1Skayw38mTYUR jDaojecUV4ZS0uHEFXwypoth+B0xqrAst2DsCblpuIaGN0joX7cgmK+ymGF+OFCpbddD REj+Cfg8aMXfzpltY28F6HkIQ1ncJOhb2nJTnfxJAXWD/FYWAAQrWzuKcp5H1BF9XuAL +pnJhxvcoU6WwL4W8Qx8lSsaY8k+G5UGRMpYS6+W/MA/9ukva2oQm1Wf12akyDKAS2My yXbhF5nnp+oPm9GnM2gI9qRbu17sVRQ/Fs/SJY3yfpJzOmd2dXJvFIP+E832FYB3SueN LMiw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=z81AiAA8; 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-7c573d342c5si1384550485a.635.2025.03.19.06.46.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 Mar 2025 06:46:53 -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=z81AiAA8; 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 1tutk6-0003Uo-Ss; Wed, 19 Mar 2025 09:45:59 -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 1tutjw-0003LU-8z for qemu-devel@nongnu.org; Wed, 19 Mar 2025 09:45:50 -0400 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tutjt-000448-VN for qemu-devel@nongnu.org; Wed, 19 Mar 2025 09:45:47 -0400 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-43cfecdd8b2so33504605e9.2 for ; Wed, 19 Mar 2025 06:45:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742391944; x=1742996744; 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=7+uCNdGR7Q/g7PWEHJ64I2sH/b8RzXSLv7jzZO24+jg=; b=z81AiAA88CtFA/u66YLSXWl6B92M1iKMX4SswGvwyLXJgP1u3jgx8DbRnHDjhBGd5U dCmELXfPITs10wH3Bzn0W4wWZtCXHPbK86KJ91Z9sqwwKdHiuq3+HlPcnJcEiDa6oGdw RvDA61yOLCqq6Utk0Pup4+miwEv8XCqU6lhZFSm8WDtokXadHgPY7c9wDe1OXqBC07ek r2pP+5uRKlzXR5f8YoYc1C6sVT7JLxNRh/05JSAT5eLUnwzplHa/NTpbj5B1558y2gd0 9i5pPD+y0Zwc4zAfSiA7ycG0uRc9rJxpaE5O/5G3CNJjBBY055iUZBfh4o9+iMUhSzjv fH+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742391944; x=1742996744; 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=7+uCNdGR7Q/g7PWEHJ64I2sH/b8RzXSLv7jzZO24+jg=; b=M8fBbCv4kMwVG/CpJzKZYjKwFBuOX0jDt/HBvhRpQHT8bws5gvRVqXm1dkUNIlE+lY lNO7+xRngbZHPGDdo5XFOr2lqKWe+yLUU49TLAbLQIeEOylbgcFIEAywmOU9WBFKKGeO 8Q/X4kwOMYjR4KCkILhTERRlUXo3HUV9qDg6JxrP5cFnaa/jzgKkmmaNicXBq8vxx2ZF Puj35cGCMSGveF2v4I6nuSheHw2C/SxbV+eOPD4z6Vj16WMOrYoOYtelfLD8jz1GD30q ma4TF3R797lEi/EgbZ6P65CejNVQZZEI/fKvN/boSiaGb1kXFRmPbCii/hiXM3OhnCxj 9yHg== X-Gm-Message-State: AOJu0Yz28Vqp0JddVUestbtiMtUJYrVQxiscRjHDre/sRDCdvVFhPw2j 5Bfz0qV7ELEqGDSoorKyu7GfAxryPQvo2ZCK9FuB4WAH17r3tMY7Pjf5tQ/C5sQ1S/7NVFSsAW7 c X-Gm-Gg: ASbGncsLVQxGCrG7Th8BGtr80wJQhkFDSFxdLtneL9et+wLmfYa9k7sZACQ4bliczfY W5Xq807BXFtAAmpIyCnB51UwLYTZ+HmnkQ4+85J5OrdY3seomZh3Y7oTULz9NWUFVBnPJpJ4m4x GTdQmX9hQ+bPLs9ledobfRnuHVwyQCG8Sc46R5u7Q19UtZoY/AScBpld03a8zewnuKMPFPwKxC4 ijxBT8nsDUfNDDsNVy3Rbd1mfuBtuFAlJdguu9pkROoaa96C7tJTTyitTgqdd8fTuQTpE8JKbs4 c9KIdMYsxwAzCWtaVRLow5C5ucwkFgJAOBdZ2A0+1GouvLhYQnHnRVeAx2Lou2g+M5Us2CJd4lr Ww+Mf2fHJG51BcJBEoMM= X-Received: by 2002:a05:600c:3d17:b0:43d:b51:46fb with SMTP id 5b1f17b1804b1-43d4378617dmr26394205e9.2.1742391944101; Wed, 19 Mar 2025 06:45:44 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d43f43ed6sm19274365e9.13.2025.03.19.06.45.43 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 19 Mar 2025 06:45:43 -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 07/12] tcg: Check TARGET_INSN_START_EXTRA_WORDS range at runtime Date: Wed, 19 Mar 2025 14:45:01 +0100 Message-ID: <20250319134507.45045-8-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::330; envelope-from=philmd@linaro.org; helo=mail-wm1-x330.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 Define TARGET_INSN_START_WORDS_MAX and use it to check TARGET_INSN_START_EXTRA_WORDS at runtime in tb_gen_code(). Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daudé --- include/tcg/tcg-op.h | 4 +--- include/tcg/tcg.h | 2 ++ accel/tcg/translate-all.c | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/tcg/tcg-op.h b/include/tcg/tcg-op.h index 1f0d3b95304..0915043adf8 100644 --- a/include/tcg/tcg-op.h +++ b/include/tcg/tcg-op.h @@ -41,7 +41,7 @@ static inline void tcg_gen_insn_start(uint64_t pc, uint64_t a1) tcg_set_insn_start_param(op, 0, pc); tcg_set_insn_start_param(op, 1, a1); } -#elif TARGET_INSN_START_EXTRA_WORDS == 2 +#elif TARGET_INSN_START_EXTRA_WORDS >= 2 static inline void tcg_gen_insn_start(uint64_t pc, uint64_t a1, uint64_t a2) { unsigned insn_start_words = tcg_ctx->insn_start_words; @@ -52,8 +52,6 @@ static inline void tcg_gen_insn_start(uint64_t pc, uint64_t a1, uint64_t a2) tcg_set_insn_start_param(op, 1, a1); tcg_set_insn_start_param(op, 2, a2); } -#else -#error Unhandled TARGET_INSN_START_EXTRA_WORDS value #endif #if TARGET_LONG_BITS == 32 diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h index 84d99508b65..92a23e10218 100644 --- a/include/tcg/tcg.h +++ b/include/tcg/tcg.h @@ -577,6 +577,8 @@ static inline TCGv_vec temp_tcgv_vec(TCGTemp *t) return (TCGv_vec)temp_tcgv_i32(t); } +#define TARGET_INSN_START_WORDS_MAX 3 + static inline TCGArg tcg_get_insn_param(TCGOp *op, int arg) { return op->args[arg]; diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 54bba995a04..5e2a89dc474 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -66,6 +66,7 @@ #include "internal-target.h" #include "tcg/perf.h" #include "tcg/insn-start-words.h" +#include "tcg/tcg-op.h" TBContext tb_ctx; @@ -351,6 +352,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu, tcg_ctx->tlb_dyn_max_bits = CPU_TLB_DYN_MAX_BITS; #endif tcg_ctx->insn_start_words = TARGET_INSN_START_WORDS; + tcg_debug_assert(tcg_ctx->insn_start_words <= TARGET_INSN_START_WORDS_MAX); #ifdef TCG_GUEST_DEFAULT_MO tcg_ctx->guest_mo = TCG_GUEST_DEFAULT_MO; #else From patchwork Wed Mar 19 13:45:02 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: 874728 Delivered-To: patch@linaro.org Received: by 2002:a5d:6a90:0:b0:38f:210b:807b with SMTP id s16csp407259wru; Wed, 19 Mar 2025 06:47:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVkS6ORjX9/Km/9JGftO0c6q0K2i9yr7GZ0CkFoovu8YiwFyQVMu79gl7bDwe8I5AmrGM6yrQ==@linaro.org X-Google-Smtp-Source: AGHT+IGqHLLS2J9YTid2AWjTBwJhKflqTyGN8ekhDVo7TBJ7NJUxvZuTYeB/6oCyZdKvUShtFbtT X-Received: by 2002:ad4:5d41:0:b0:6e8:9e9c:d20f with SMTP id 6a1803df08f44-6eb2938b7d5mr47702916d6.21.1742392030138; Wed, 19 Mar 2025 06:47:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742392030; cv=none; d=google.com; s=arc-20240605; b=gHwhUggjka7mtX/3xznntt68nyty2/uWbPqA1PyvHksH6PGK/0erENqa6wm4OU2bu4 5lNbfdM8LsJ44z/gEw1cTPDSEdeaYXjQrNlQO7MnmqC0zI3Rl7z1QAX0T7Ja1dJkhsSl krsq8nuTgF/+tzSs/SDkTI3kirHIJ6izHmgLdVS86izWfWuDkxcNch2aRw1KawVqAyH5 dSsFt2XKeSJhnWereO1Q7gw07MSMcyw1icpQq/8YiaDREdTRxQlcSniiNmdFoG32N1N9 ryjAwUbTiEVomcG9U9VcVHuwdnrfA0IB1tFb2/KLfCQjiOXzm+aXkf2dekfKFPpmKz42 4ccg== 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=SPrx/qQq0qEoYxnErEWIYikr7yzsC+mHkGeoZcaDE8c=; fh=oQsvFjElslmUPxsR6fJkm0Ezna1Yj9KV/ql5u2IKgnk=; b=h7dhCLi4Xbme/QwR20ij+knpgJu+h9oDaj4/0hZ4eloV2B0r/5NAPZ3QkCSCRGTn49 J6hjMNjCiq1shgA9pyvyYmXuW3GmZLP0KzaEdytRwdCDixnGsz1EE6jSoNkoslqIF3XM 5UJDCPoQeZCoBCHF13tuNvc8DWGK6xf6TtWtEq08VADBe8E1uY8+Pj7nzttuK8uIEP8q 77BFegZjWX8+MAWVNW/j3IbG9ievEy/SmV4dgCPAed40lFrZIaoopGhJsYvj/ZZy8i6M ausqIcBeu+/Ppai3WPLM6Sh0qfgnYh/MwczIEd+sQroKXFfCjkXKEnRqMdf/f4QvQ2g3 1zKQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=PsPKZDPF; 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-6eade36968esi150273946d6.391.2025.03.19.06.47.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 Mar 2025 06:47:10 -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=PsPKZDPF; 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 1tutkz-0004EB-7z; Wed, 19 Mar 2025 09:46:54 -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 1tutk0-0003N3-Pm for qemu-devel@nongnu.org; Wed, 19 Mar 2025 09:45:54 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tutjy-00044L-T9 for qemu-devel@nongnu.org; Wed, 19 Mar 2025 09:45:52 -0400 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-43cf034d4abso48336815e9.3 for ; Wed, 19 Mar 2025 06:45:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742391949; x=1742996749; 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=SPrx/qQq0qEoYxnErEWIYikr7yzsC+mHkGeoZcaDE8c=; b=PsPKZDPFcKqX9hO8xoDauVoZ4E8+IuRJSbDoiFdflhJ/FUlwYPp8iTmqkYUDP/9xGH 1LXQboeBOeNZZSUd19ZGPUp1tQ/PiXcuyz52bpiNdgvTaPi537w9jDMRCk3wwzwGNVyK cYXpfbxSP2LuqLjK36MD6ApF1abt9OFbnQlJza19MkrXL2y63bAAbW2fqLXndZWSnuex w6zdyBvPuW0ddcgjgsTl5pVYvTL+qzvkClFYNSld5qCA7gletaL9blrbIWC1cgWHXuVr k7dJq0hReAjBIMeiE8GE4EXoY5JnOhDjneBCri6Hkw5QPUPy8FSRlQ5Ghne9zl7kIYDD YVXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742391949; x=1742996749; 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=SPrx/qQq0qEoYxnErEWIYikr7yzsC+mHkGeoZcaDE8c=; b=pVySWzoKYN/APZRW0v/dl8jqtORb63+Nm/VwG9Y/ioPzYu1qcJ93ayRJFX0r/BDctE yyRvvx7n+Bs0nn/V7JnHGcuwBCZNS2uLxJi2PxfHrthvCayEGBygD2Efva1gS1LK8fyC KmA5HeZsaICu+EiarAKR+r25an8xLp8/GQSk2ZpOh3OzSsuMkvZiIdpmX3lmvsFm42to AERIFrHkPHDqj+JJQOE9N5O0Q31P+8qyUIDNBcUehwbKIRLUAahcQmOTsitLBMxo8drR ES7HUYxmElWpauENsGzjl2a0D0jiUNtFvxL5Lc44OSlKNf9MYU2X90S+36TXVR6B3ejG Pl+Q== X-Gm-Message-State: AOJu0YzD9r70jvyJAJNsHkxA6A8pUEOmEKYsb0rmVqQpjHCLIr78yG3M ILolJ78xPrS9AHxFFZfBn52w6QU/yz95wIAN2viWbzzhadV28VGrT9XUqYVJiulHgu8AEdHDXWc o X-Gm-Gg: ASbGncshxdDsihO5ZTDY9YUz3j5O3Xa6rJczdzkysDnWrBQsDEQLTfgHo4oykHl6VzZ 2su8/it1I/aaGm1msoB6zKDX9BUSYfWqUn4IUZX8OJAkWIvkukNd091U3RKta5yfc5ANgAyP6vU BwaXfiy+aT1FStbdy+ahmuI99Ma+IiIyeHHmtGPbmE/JEW1geRetRQSBlNFLdL78kErKMeoL67n XgyFUf3ESP2uSd4XdiKxH9/36R+n0Mij4lgN5yjwhU5tqSnn6oEHNJ6aNlqL/vp2XOzxrt2s/t5 WAqUUW+C4bMq9GGsvxsrY/GYf7q9jW9UvQQgSvsGFehUyHjR/gi61LQFjIkFr+dzgpnHEMiDaLK 8U/i/nqQ6UsY/T24fWXo= X-Received: by 2002:a05:600c:b8f:b0:43c:f470:7605 with SMTP id 5b1f17b1804b1-43d4379505amr29533475e9.12.1742391948777; Wed, 19 Mar 2025 06:45:48 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d43f37665sm19623035e9.2.2025.03.19.06.45.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 19 Mar 2025 06:45:48 -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 08/12] tcg: Declare arrays using TARGET_INSN_START_WORDS_MAX Date: Wed, 19 Mar 2025 14:45:02 +0100 Message-ID: <20250319134507.45045-9-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::332; envelope-from=philmd@linaro.org; helo=mail-wm1-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.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 Prefer the target-agnostic TARGET_INSN_START_WORDS_MAX definition over the target-specific TARGET_INSN_START_WORDS. The former is guaranty to hold the latter. Signed-off-by: Philippe Mathieu-Daudé --- accel/tcg/translate-all.c | 2 +- target/i386/helper.c | 3 ++- target/openrisc/sys_helper.c | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 5e2a89dc474..2f8cf6db144 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -206,7 +206,7 @@ static int cpu_unwind_data_from_tb(TranslationBlock *tb, uintptr_t host_pc, void cpu_restore_state_from_tb(CPUState *cpu, TranslationBlock *tb, uintptr_t host_pc) { - uint64_t data[TARGET_INSN_START_WORDS]; + uint64_t data[TARGET_INSN_START_WORDS_MAX]; int insns_left = cpu_unwind_data_from_tb(tb, host_pc, data); if (insns_left < 0) { diff --git a/target/i386/helper.c b/target/i386/helper.c index c07b1b16ea1..90e113c8b5a 100644 --- a/target/i386/helper.c +++ b/target/i386/helper.c @@ -31,6 +31,7 @@ #include "qemu/log.h" #ifdef CONFIG_TCG #include "tcg/insn-start-words.h" +#include "tcg/tcg.h" #endif void cpu_sync_avx_hflag(CPUX86State *env) @@ -524,7 +525,7 @@ void cpu_x86_inject_mce(Monitor *mon, X86CPU *cpu, int bank, static inline target_ulong get_memio_eip(CPUX86State *env) { #ifdef CONFIG_TCG - uint64_t data[TARGET_INSN_START_WORDS]; + uint64_t data[TARGET_INSN_START_WORDS_MAX]; CPUState *cs = env_cpu(env); if (!cpu_unwind_state_data(cs, cs->mem_io_pc, data)) { diff --git a/target/openrisc/sys_helper.c b/target/openrisc/sys_helper.c index 21bc137ccca..cf521461954 100644 --- a/target/openrisc/sys_helper.c +++ b/target/openrisc/sys_helper.c @@ -28,6 +28,7 @@ #include "hw/boards.h" #endif #include "tcg/insn-start-words.h" +#include "tcg/tcg.h" #define TO_SPR(group, number) (((group) << 11) + (number)) @@ -218,7 +219,7 @@ target_ulong HELPER(mfspr)(CPUOpenRISCState *env, target_ulong rd, { OpenRISCCPU *cpu = env_archcpu(env); #ifndef CONFIG_USER_ONLY - uint64_t data[TARGET_INSN_START_WORDS]; + uint64_t data[TARGET_INSN_START_WORDS_MAX]; MachineState *ms = MACHINE(qdev_get_machine()); CPUState *cs = env_cpu(env); int idx; From patchwork Wed Mar 19 13:45:03 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: 874733 Delivered-To: patch@linaro.org Received: by 2002:a5d:6a90:0:b0:38f:210b:807b with SMTP id s16csp408928wru; Wed, 19 Mar 2025 06:50:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX+WnI2/7PIEIeJWdmXmVx8GbfWoBiS7Bm375RvhX6nB5DfUr5/YZu6xxd3Pa8Mfn2RtGCZ7g==@linaro.org X-Google-Smtp-Source: AGHT+IH2p+gqX9Nhv0Nxi9VEaxVs/zZKwW1XaBWITI+sWKfW4brHIdkphEmEjs/WHx1G2jW7Cb0f X-Received: by 2002:a05:620a:c4b:b0:7b7:142d:53a8 with SMTP id af79cd13be357-7c5a7daca21mr374615585a.19.1742392230162; Wed, 19 Mar 2025 06:50:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742392230; cv=none; d=google.com; s=arc-20240605; b=W33jv5Z0ClLsOA7FUo1Ve7dT/f8Wu+qQTmzu9Hwtou2RJix2Q7OVlM4CPeJsl9b5oJ 0N+JEoobpjyJN/E44TnFvyUeUBw9XEvN52qDBZb4/dwlrYwsFDE3etj7qKVkUxsVXNU8 PMpO3LY080efzhYKPrCioZmts9FsQaHOxYd++twXrM1Jo5nckQF0Mu8EeOznJwB3Ah4B HXLar0y00G+A8iHzwAdIJc96hMXXYRZ8I+AsI1wTXg2iMN59tf/hu4lBrR4iR+itKxVe J/B/io6/pTvT56ECZkPzot1+8uCucq70/OFEEg74oZJnGNgCYwtgpeHQ7Gkz5XW7tot/ U9TA== 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=0iduta05yw16WNoxlZ2Qk6hI45690lcV/AnGwn0ABIE=; fh=oQsvFjElslmUPxsR6fJkm0Ezna1Yj9KV/ql5u2IKgnk=; b=NAgRiCr6LqncJMnpiRypwyvjI/nBU7KyH4X37AAN1kAQJ43hRcpD/QIG9PIdWMb0zJ tWwyx3Y9QzS6bU7JP/HMPizxJA6e6OCeQ5l3XwqJ1i99PZmQLBWr/zQ8he/jSNgOjkll 9mMIx3MYPiuSBYPh8sGeH5JaKHqPkdMGTQBvRR346esyidJoBq875XBO5ECnX3BMoxhj 3em9roPX551b6Qi/pywOqP9J4L3OGUzubO2fU+Gxhd/jlLi85+vjgu9fVOZh80/7XfRz tHAPg2KfGHey7xHAo9bnnZcKBzCsByUkNfNxBCkELdAuG9VD9/rFPNjatoatCLzaWWqC z2Ww==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BVsuNliA; 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-7c573b97fecsi1359194885a.148.2025.03.19.06.50.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 Mar 2025 06:50:30 -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=BVsuNliA; 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 1tutl4-0004cU-Gr; Wed, 19 Mar 2025 09:46:58 -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 1tutk7-0003ZO-Fb for qemu-devel@nongnu.org; Wed, 19 Mar 2025 09:46:02 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tutk3-00044x-Bj for qemu-devel@nongnu.org; Wed, 19 Mar 2025 09:45:57 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-43cf58eea0fso24294485e9.0 for ; Wed, 19 Mar 2025 06:45:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742391953; x=1742996753; 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=0iduta05yw16WNoxlZ2Qk6hI45690lcV/AnGwn0ABIE=; b=BVsuNliAPBphT3Dl8o7GtdtkP4UfN3kV3qStr/lg/so4InV3/mp5M8gM3/MHYWdCO2 9RAIHsOWkVHpRiMZChzrdI58hAbmMtd222Shh74uaCcbmlXuNkkYytVs4nz6yjdgok9K ozn+bIXSzIady2ULbhCT1FAvP+TgqoqK9zDIFnbSDEDlvPWMrLXR3lOI+obmGCkzUR+b vDj1sDwnEgEoWDfC0WWwi5u9aX4Fibv4cwyMkKsb7Ja5eZhkVfstIAOF67rRsuGyfvkd FU0OC5WWnX9QtGnETaFbUBoFGJRo/NoYRTLyMFNQK3i695JjIBVNDFfWcE3TuQiM+G1Z FOFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742391953; x=1742996753; 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=0iduta05yw16WNoxlZ2Qk6hI45690lcV/AnGwn0ABIE=; b=UR96pmzKsDv1Amw5QOBxbzVoOZbpNMm1FMGRzol00GVqbdijjuVKkiUSj39SWzGIqs 9Ht3pPU76peCEh0d4qKziVZhITcpiodmguCdkorOVA7CdxeA4cwuds6Yd1qa81HU1sRo aq4u8+B5hPhsI2Gv9rtMNG16NEzh29W9wtCrD9ziSQ19MKLlKiYUrFUMpISxLjeLdaBG /Wf6s27lG3kXpnhOU4WVc5lNfoHqI0ePaNVVq5sNKHloqEHKt7rVxhjgWvcZZrGstWhx pNXgEtTbmHKXSaIqFZdTMfbJAExmKJX3ajnXlXRnYg+2jTwvkcNSQNIMJr6F2kogHgHy 3jwQ== X-Gm-Message-State: AOJu0YxJtvqaWnTi8fC13ZQDRXoNDgoFvbmRDfohQB7rEVXtxrRAye6I /iR3ijqeWEdTmouwnQjJ4g7G0ATyKq0LtFTm0vK69fTrqCwSPU3EjyQnjUJT3vqMfKu4oJFVk5U i X-Gm-Gg: ASbGnctIu0nWCmcnuAf+2H6tFcN7V5e5CKTMhcYsNRqCDu0O0MQSczPMBmzlwH7rTDe 1CLW1xCPFgxWx3S/r5vsphVjoacCP8AS1UM756vYzMUT/69Lwx//Oy5UXR2gJhsypqeYxO4863w +oXbcUbLAEWWBZheIk4jebMlhyxM14JpOiknysCTlsRiLgUf/2FqYYMP8EdzNgbi1RGs1d7IF2o hOcF9P+KIoNzBvgMriUUdyMJDSv8dAOF6OuZBCQ9znqEaSRFIhHbr/Q98IuEM6LKGFPQcTTOpWR GXLMkK7SxDsppYWmbAWAey1fZVwdWPxbvGItqL8RteKVe/HMz+3X0oGb3YkvN2S8KfBPAluSHDG g71dF2ZP+7O8NxGLv7Pw= X-Received: by 2002:a05:600c:1da9:b0:43b:ca39:6c75 with SMTP id 5b1f17b1804b1-43d43793160mr29149685e9.16.1742391953364; Wed, 19 Mar 2025 06:45:53 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d43f864d4sm19661645e9.37.2025.03.19.06.45.52 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 19 Mar 2025 06:45:52 -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 09/12] tcg: Restrict TARGET_INSN_START_WORDS definition to translate-all.c Date: Wed, 19 Mar 2025 14:45:03 +0100 Message-ID: <20250319134507.45045-10-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::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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 TARGET_INSN_START_WORDS is now only used within translate-all.c, move its declaration there. "tcg/insn-start-words.h" header being now empty, remove it. Signed-off-by: Philippe Mathieu-Daudé --- include/tcg/insn-start-words.h | 13 ------------- accel/tcg/translate-all.c | 3 ++- target/i386/helper.c | 1 - target/openrisc/sys_helper.c | 1 - 4 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 include/tcg/insn-start-words.h diff --git a/include/tcg/insn-start-words.h b/include/tcg/insn-start-words.h deleted file mode 100644 index 394c191da8d..00000000000 --- a/include/tcg/insn-start-words.h +++ /dev/null @@ -1,13 +0,0 @@ -/* SPDX-License-Identifier: MIT */ -/* - * Define TARGET_INSN_START_WORDS - * Copyright (c) 2008 Fabrice Bellard - */ - -#ifndef TARGET_INSN_START_WORDS - -#include "cpu.h" - -# define TARGET_INSN_START_WORDS (1 + TARGET_INSN_START_EXTRA_WORDS) - -#endif /* TARGET_INSN_START_WORDS */ diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 2f8cf6db144..fc55a75a3cf 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -65,11 +65,12 @@ #include "internal-common.h" #include "internal-target.h" #include "tcg/perf.h" -#include "tcg/insn-start-words.h" #include "tcg/tcg-op.h" TBContext tb_ctx; +#define TARGET_INSN_START_WORDS (1 + TARGET_INSN_START_EXTRA_WORDS) + /* * Encode VAL as a signed leb128 sequence at P. * Return P incremented past the encoded value. diff --git a/target/i386/helper.c b/target/i386/helper.c index 90e113c8b5a..1f819fbff65 100644 --- a/target/i386/helper.c +++ b/target/i386/helper.c @@ -30,7 +30,6 @@ #endif #include "qemu/log.h" #ifdef CONFIG_TCG -#include "tcg/insn-start-words.h" #include "tcg/tcg.h" #endif diff --git a/target/openrisc/sys_helper.c b/target/openrisc/sys_helper.c index cf521461954..9da2bebbd5b 100644 --- a/target/openrisc/sys_helper.c +++ b/target/openrisc/sys_helper.c @@ -27,7 +27,6 @@ #ifndef CONFIG_USER_ONLY #include "hw/boards.h" #endif -#include "tcg/insn-start-words.h" #include "tcg/tcg.h" #define TO_SPR(group, number) (((group) << 11) + (number)) From patchwork Wed Mar 19 13:45: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: 874730 Delivered-To: patch@linaro.org Received: by 2002:a5d:6a90:0:b0:38f:210b:807b with SMTP id s16csp407913wru; Wed, 19 Mar 2025 06:48:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUVc3tWEHg+BSwX+4oa3TLedv4I8JVrOaRW0J/cxCYlCqBm3AeXagErhjI8pcXSn+PeMmsN1Q==@linaro.org X-Google-Smtp-Source: AGHT+IF6RdoaxVYqhPEnUaBkfgmhuvjvqbRzvQwed8yfKI2qhMQajmzhNUyIFbX10rHUtZ6Mooaa X-Received: by 2002:a05:620a:19a5:b0:7c5:674c:eec9 with SMTP id af79cd13be357-7c5a83ca85bmr292928485a.28.1742392106462; Wed, 19 Mar 2025 06:48:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742392106; cv=none; d=google.com; s=arc-20240605; b=J6lOa3BNGU0TG2VmAmqnJCDKrgKHcqFPg5FVn4Fq0/FsYJEHefWCpDBw4QjE+vw9Zq ohxsyRK8u3KDDNCppzE77ySlQruL0iq5k878zRYxY9WmB+ewtms7RiODW/SM52ArFUEU QvO0ykl1gtzk5WV+4aaWa1goLWthgvoB/FesdnbVGECrRyl3AO1PthKmr2uNj2nOjYma GUwKwTSolY8mM+OFogIsnH37B+4GGmsspbc5T+BVNiI+jrsaqenm64IjDI3fqlTPSQOm gxqUamQrCDkj3o8Tu0UY+SVsvXy1R7cAGGOwVoFx9EVXbLJZ2cK9vlS0VXJ/hTVq1pHX r3cQ== 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=adKcjdToncFNSb7FtMey2mB2jyzU5Dr+yeVuZvMoV7M=; fh=oQsvFjElslmUPxsR6fJkm0Ezna1Yj9KV/ql5u2IKgnk=; b=gHNBeXiUaSwOGLW0odLlsY7wdT+iXi2oxHqmn7B3B9HHipmm7Xk7287SmcnTl06YMs NkYCcQnS7UL9ArT9yFL2N2L3B0rH44vtm/x4QEOTjtZ1o+gLJmZZ02W5nKW66AYxmfG/ ntfeunXbvaJ6hdvPX5soHtVzrOI6NsdPgTWyFON7hufjzKJerlpAqe1eyw+t+EFl7Sg4 GYIED7zkrCJDAjH7wTn8X//mhFh/nsc/a42CW5dY2hmf057VizyLlNT0SwVNm2e3D733 sQ/3mW43Vim6X7RXU0E9DANlNtpwT/FBFH8/VrglcxrhZWsWSp12XXhBMAsllWv6Fzkg W2aA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=CS0rW8zI; 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 ESMTP id af79cd13be357-7c573b73092si1409865785a.43.2025.03.19.06.48.26 for ; Wed, 19 Mar 2025 06:48:26 -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=CS0rW8zI; 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 1tutl0-0004IO-Jl; Wed, 19 Mar 2025 09:46:54 -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 1tutkD-0003lX-LK for qemu-devel@nongnu.org; Wed, 19 Mar 2025 09:46:07 -0400 Received: from mail-wr1-x432.google.com ([2a00:1450:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tutkB-00047b-NX for qemu-devel@nongnu.org; Wed, 19 Mar 2025 09:46:05 -0400 Received: by mail-wr1-x432.google.com with SMTP id ffacd0b85a97d-3914a5def6bso3815947f8f.1 for ; Wed, 19 Mar 2025 06:46:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742391961; x=1742996761; 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=adKcjdToncFNSb7FtMey2mB2jyzU5Dr+yeVuZvMoV7M=; b=CS0rW8zIwLB0HACM0jYNy01jBs/70pOjGg/LkmB6fc7iu2t7+tkL7ZMryOzNVjcRzl BAe05fYBTC6SKLvnlR6kO48Tl8L4C2tdigme+HbFn4NYpPex08wZuE9MmX6/B7p836uz 8mRjtYrAkQ38QI2ouyN6KjaS7VmkfrGk1a/AV3uShJZfs5UfDVzKaU6ZdnBwSRSzlx74 3WjrXLFMiojQZ0CfvbboJEflc0Of1rUj+G8eTHu+6kUp5IL6ENmvcq822bkDM1WtXMat rmM8cJyISTqnIFheLb6uPL2W/IizB9mItYTALTTZn51oYjB4hN7v5twjtrKa22IeAdQ6 tO4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742391961; x=1742996761; 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=adKcjdToncFNSb7FtMey2mB2jyzU5Dr+yeVuZvMoV7M=; b=FRXNg8i7ALZoccZH31o6Ow3P27O4bYKcE8U7kYd4+qjpROSTvZ2j9sKPdf5B2db4KU 711h4ijAoP1BolqswkJy2a2bNss/E2Y30OwvoVtKbF+9NMSL2HacSw2/9+uwiTyNO2Ig 323h0FEfbu11L0BtHLRNyFTioJj4VfVBBaRCGt/97JjLxlnQsNKR45WFDMGSkGbSbD79 TZtKP26d+ZlW/K7EB9dBeY2+vh0r+mvFaSBMqTO1OJQsdvAeTCAPofEtpLV5W307tMaG 3U2GXQ8umz3SDLH18LMW0T2oBQqRgT+A4Mf4rCq8xrcOR5gNZ47XcrgFA/9GWqYph9Tm OFjw== X-Gm-Message-State: AOJu0YxVP44mZsh/uMYDBDW/WvYJo/hEOowQiPKxGcGP02FN2jDwUbKr u9UL8wJZew0lPPJa9KYHhwzNykk//yC323xxk3sUnt2vE0rf9OSAy95Bok+FPBnyeENhUrQWl9n g X-Gm-Gg: ASbGnct6Q9CvDhodJJ+F10mYyX9Q8DHiDmEdVva2USwsNO9fhy7dvjq1D4DlJWf3KvV zA98emKoz0fGke70T6R0WGSRO3OyOgmW+sWFtGZA1TpXugZfhDhSHDneatTuOuGha/WMdz6Va5t M1N5TGk2q50spARtF5n2ZgYQ7X9sZ0ncMsmurbtyAxtX4AtZ4qGKIGKqVVWNFPkSFjrcM1CMsCK HSAr63jyaDgheL0JFvM/kgK8WkjCyf8CuvOQdDTjOlx1aC0U3aNkK0NrTiunS59RVXk3cG2JSfr 8yeQIEzZbzXtLLz8BX6WUv4tQ5llRBVVPbzIZMxWoULdL6fykLvoLBFUQn4p4S3TynyGwDYpY8B xkQ1BPoGmbWVPNkP47Ho= X-Received: by 2002:a05:6000:1844:b0:391:31c8:ba58 with SMTP id ffacd0b85a97d-399739b64fcmr2590852f8f.10.1742391957999; Wed, 19 Mar 2025 06:45:57 -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-395c7df31f6sm20958392f8f.6.2025.03.19.06.45.57 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 19 Mar 2025 06:45:57 -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 10/12] tcg: Unify tcg_gen_insn_start() to handle 1 or 2 arguments Date: Wed, 19 Mar 2025 14:45:04 +0100 Message-ID: <20250319134507.45045-11-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::432; envelope-from=philmd@linaro.org; helo=mail-wr1-x432.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 Merge the tcg_gen_insn_start() definition using 1 extra word with the definition using 2, using a2=0 in callers. Signed-off-by: Philippe Mathieu-Daudé --- include/tcg/tcg-op.h | 16 ++++------------ target/i386/tcg/translate.c | 2 +- target/m68k/translate.c | 2 +- target/microblaze/translate.c | 2 +- target/openrisc/translate.c | 2 +- target/sh4/translate.c | 2 +- target/sparc/translate.c | 2 +- 7 files changed, 10 insertions(+), 18 deletions(-) diff --git a/include/tcg/tcg-op.h b/include/tcg/tcg-op.h index 0915043adf8..df234d4e1e0 100644 --- a/include/tcg/tcg-op.h +++ b/include/tcg/tcg-op.h @@ -31,17 +31,7 @@ static inline void tcg_gen_insn_start(uint64_t pc) 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) -{ - unsigned insn_start_words = tcg_ctx->insn_start_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 +#elif TARGET_INSN_START_EXTRA_WORDS >= 1 static inline void tcg_gen_insn_start(uint64_t pc, uint64_t a1, uint64_t a2) { unsigned insn_start_words = tcg_ctx->insn_start_words; @@ -50,7 +40,9 @@ static inline void tcg_gen_insn_start(uint64_t pc, uint64_t a1, uint64_t a2) tcg_set_insn_start_param(op, 0, pc); tcg_set_insn_start_param(op, 1, a1); - tcg_set_insn_start_param(op, 2, a2); + if (insn_start_words > 2) { + tcg_set_insn_start_param(op, 2, a2); + } } #endif diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index a8935f487aa..0f1e72b1bc0 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -3766,7 +3766,7 @@ static void i386_tr_insn_start(DisasContextBase *dcbase, CPUState *cpu) if (tb_cflags(dcbase->tb) & CF_PCREL) { pc_arg &= ~TARGET_PAGE_MASK; } - tcg_gen_insn_start(pc_arg, dc->cc_op); + tcg_gen_insn_start(pc_arg, dc->cc_op, 0); } static void i386_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu) diff --git a/target/m68k/translate.c b/target/m68k/translate.c index dec2967fce4..9f7052aa6b5 100644 --- a/target/m68k/translate.c +++ b/target/m68k/translate.c @@ -6037,7 +6037,7 @@ static void m68k_tr_tb_start(DisasContextBase *dcbase, CPUState *cpu) static void m68k_tr_insn_start(DisasContextBase *dcbase, CPUState *cpu) { DisasContext *dc = container_of(dcbase, DisasContext, base); - tcg_gen_insn_start(dc->base.pc_next, dc->cc_op); + tcg_gen_insn_start(dc->base.pc_next, dc->cc_op, 0); } static void m68k_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu) diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c index b54e5ac4b2f..d256b317cfb 100644 --- a/target/microblaze/translate.c +++ b/target/microblaze/translate.c @@ -1631,7 +1631,7 @@ static void mb_tr_insn_start(DisasContextBase *dcb, CPUState *cs) { DisasContext *dc = container_of(dcb, DisasContext, base); - tcg_gen_insn_start(dc->base.pc_next, dc->tb_flags & ~MSR_TB_MASK); + tcg_gen_insn_start(dc->base.pc_next, dc->tb_flags & ~MSR_TB_MASK, 0); } static void mb_tr_translate_insn(DisasContextBase *dcb, CPUState *cs) diff --git a/target/openrisc/translate.c b/target/openrisc/translate.c index 7a6af183ae2..ff720e7fb6b 100644 --- a/target/openrisc/translate.c +++ b/target/openrisc/translate.c @@ -1558,7 +1558,7 @@ static void openrisc_tr_insn_start(DisasContextBase *dcbase, CPUState *cs) DisasContext *dc = container_of(dcbase, DisasContext, base); tcg_gen_insn_start(dc->base.pc_next, (dc->delayed_branch ? 1 : 0) - | (dc->base.num_insns > 1 ? 2 : 0)); + | (dc->base.num_insns > 1 ? 2 : 0), 0); } static void openrisc_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs) diff --git a/target/sh4/translate.c b/target/sh4/translate.c index bcdd5588183..f140080c08c 100644 --- a/target/sh4/translate.c +++ b/target/sh4/translate.c @@ -2248,7 +2248,7 @@ static void sh4_tr_insn_start(DisasContextBase *dcbase, CPUState *cs) { DisasContext *ctx = container_of(dcbase, DisasContext, base); - tcg_gen_insn_start(ctx->base.pc_next, ctx->envflags); + tcg_gen_insn_start(ctx->base.pc_next, ctx->envflags, 0); } static void sh4_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs) diff --git a/target/sparc/translate.c b/target/sparc/translate.c index bfe63649db2..a775f425658 100644 --- a/target/sparc/translate.c +++ b/target/sparc/translate.c @@ -5725,7 +5725,7 @@ static void sparc_tr_insn_start(DisasContextBase *dcbase, CPUState *cs) g_assert_not_reached(); } } - tcg_gen_insn_start(dc->pc, npc); + tcg_gen_insn_start(dc->pc, npc, 0); } static void sparc_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs) From patchwork Wed Mar 19 13:45:05 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: 874732 Delivered-To: patch@linaro.org Received: by 2002:a5d:6a90:0:b0:38f:210b:807b with SMTP id s16csp408581wru; Wed, 19 Mar 2025 06:49:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVtrBBgF+rgiTFvbjabMZS5+KWMD6Dx2h4vNC+o6tb+elqG9jMSXfGs5a2E2TLmzevqsGdPuQ==@linaro.org X-Google-Smtp-Source: AGHT+IGPz1gu6iUkts2AA3Ezg96hVUMs1SfzkuFYRqpWTtS7xakSV7OI18KSnIJZ6rCQ42AM8LK8 X-Received: by 2002:a05:620a:4883:b0:7c5:4be5:b0b1 with SMTP id af79cd13be357-7c5a84a8c9emr440487585a.35.1742392189783; Wed, 19 Mar 2025 06:49:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742392189; cv=none; d=google.com; s=arc-20240605; b=L/FlsvjeIrzKYM0GIU/4jMAOdrHfVX3AG7sqHlKSzBWR9Jjds3x/0/dI8IRrJ15S25 QUwz8kApiXM1FWKSaZA7UqGjZoZ6uq3CaZZh1KT1tiIHjx4P+VEI6tcr+dyvqzOWc+8u MbkR0ogVgcCtay+ggiO1fbU25zEcTpFXO801nAa++UGdMUWjQ6cxPwhyR+TF6fuzUFVb MAetugzawWuEggSzDIntg8p/X1Q56rxcfTLcvZE/hzHkeMOpfLEpkjkNQ+NsLDcq93dZ ddj3TwwN8n97WebWNJ9LhJ6udr6Iiu4b1i3eyRdketEmsPZyk3h4SCI/dagr7DdaaVAm cr7A== 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=giq5jVWaUOn7Cy+Hw51AnglHBMySE1InchxU7/kS33s=; fh=oQsvFjElslmUPxsR6fJkm0Ezna1Yj9KV/ql5u2IKgnk=; b=i5xlcPNLAgo3zF0FcTjOEYnYePtPRAWE61ZVzn1conpEG+tTZcXUn9XeC46dzQl4ij wiSV0v4+qemS8PTygZausl7MP7KutEJUJqAQy9X2HRujxvjyvL2s33BWoaCxR7bJK7NP yk6w1fO+zxxqxJc3al1lVaAPQn5YtOk5Jl37hQuP76a4Oq5qbU3niOY9JGg5kqpGXOAr iG/LxblvXzPRUekI47PtRzAgrNN4vIYzKablPONASyLEhXDYoX11DvfAmqajelVIWEU+ VKAh0uYRdGWvu3igR89LeNszaL3Fe88By36zk8rovtvtNH63/JaaGoZ3OfU2tN1cruji OMSA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="O1R/6uBH"; 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-7c573d1d06bsi1372736285a.581.2025.03.19.06.49.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 Mar 2025 06:49:49 -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="O1R/6uBH"; 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 1tutl4-0004df-Vm; Wed, 19 Mar 2025 09:46:59 -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 1tutkI-0003n9-F2 for qemu-devel@nongnu.org; Wed, 19 Mar 2025 09:46:13 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tutkG-00048f-9n for qemu-devel@nongnu.org; Wed, 19 Mar 2025 09:46:10 -0400 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-3913fdd003bso414940f8f.1 for ; Wed, 19 Mar 2025 06:46:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742391966; x=1742996766; 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=giq5jVWaUOn7Cy+Hw51AnglHBMySE1InchxU7/kS33s=; b=O1R/6uBH+i2igYFfMo5PK8/wZF6/mVztD37pLm48XHaRsmX20ZnbNkwgPP7nBzCUfO fP3V7nxcbgYDTYnsBGjXlYHD73MF0d/l0zpaoRJYSqDKZT6kKcwFz5E1gauCEyA9h4OW KrKZtEHotvdnw/h+YoQ76gMZvh0RpPjUApMinaI8IPMoyvqG1vCJeOhkm8GocBxMoqzT VwPozpRGwvH3nwnGxH1qft48pT/kqcAkS/c8veJAPaq7PUPI63COPQUTZqlO+TpsrWDF lhVpqvPyVb11JWpyrB9Gri4sPqGfWwnTOGL1XqmFFQLUIfQz9xx8O39ta8F2F9YQsmza Z7uA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742391966; x=1742996766; 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=giq5jVWaUOn7Cy+Hw51AnglHBMySE1InchxU7/kS33s=; b=YSosoWVHVFsgA+5lkSRFgWnz5lD6gHodqrZcmMOc3a3MbcNl81TrgAQhbzpgsG3rco 49YHlkb+f1+inWUYJwWMhNi/n9aK7J24T+NOicHqo7cYD5diWmuKFl/Yt51FboGpemTX wMp9+qr7YGP2dbUL993ecZ6UotyA9uXqB+x67Y3oyX9xi77Nn6rRYbMmgFUdab50coe5 3Y7AZNHRqQandmlchzv412QotSQykyGDM1ermPd67yt38gZfaYvkxqAEiDY+M0n2p8Ea RGWQipqPIhEhaY23wnFBv19paJzTXRCiVcWaaXTYznKSTOiR+UZGfEKwfEqi/7t6BST6 PATg== X-Gm-Message-State: AOJu0YzYacPP5eRX7n9hYsg+BqtXewntwygaszaCXfAYr98av6dOTQ57 R4hgKuzyaMlN6P2/wnvNxoXDfsEJp16OqMlMKkZ6bJI+yEsgfTDNf3dQWLdBIZDrrqC3H2a5YNN 3 X-Gm-Gg: ASbGncsJfOcmnVyWKflwEaijrYJGpA52xo6eRTbvm4NfnL9S08bO7qFXTE1snLPCzSd IX4mLwXhtNOeiBdT4W9eu6c83fH+urj/G+WhIGZDgjFGOT413Vcw8q+b7pF1Ssq9pmQyPibCJYs Jx+X8EUcmb48kKdLZz2vdhQh5Jdw4UQZ4dGckoonjfVkYOJWbbWDtjvGByGybIiR1zSELdnTiMs 1Gmmk+I9fgurr9HpaVksVf1N3GISujpCGgLX0AQQw4Bv60iX/i0YJgU+mr3gSCJvRgJEbK2Lrdb ONQjtHetAKWQAFNHkqbzsyA327+zlrsQC98x/hjfX0kqMapz8pAMuUzxfBnNqApuLV92WI2gKX8 JXBqfYujpaxhbv3FCrG8= X-Received: by 2002:a5d:47c1:0:b0:391:39fb:a4d3 with SMTP id ffacd0b85a97d-39973bf74a7mr2064119f8f.4.1742391966240; Wed, 19 Mar 2025 06:46:06 -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-395cb40cdd0sm21104325f8f.77.2025.03.19.06.46.05 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 19 Mar 2025 06:46:05 -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 11/12] tcg: Unify tcg_gen_insn_start() to handle 0 or 2 arguments Date: Wed, 19 Mar 2025 14:45:05 +0100 Message-ID: <20250319134507.45045-12-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::429; envelope-from=philmd@linaro.org; helo=mail-wr1-x429.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 Merge the tcg_gen_insn_start() definition using no extra word with the definition using 2, using a1=0 and a2=0 in callers. Signed-off-by: Philippe Mathieu-Daudé --- include/tcg/tcg-op.h | 15 +++------------ target/alpha/translate.c | 4 ++-- target/avr/translate.c | 2 +- target/loongarch/tcg/translate.c | 2 +- target/ppc/translate.c | 2 +- target/rx/translate.c | 2 +- target/tricore/translate.c | 2 +- target/xtensa/translate.c | 2 +- 8 files changed, 11 insertions(+), 20 deletions(-) diff --git a/include/tcg/tcg-op.h b/include/tcg/tcg-op.h index df234d4e1e0..cf177a1fd3b 100644 --- a/include/tcg/tcg-op.h +++ b/include/tcg/tcg-op.h @@ -22,16 +22,6 @@ # error #endif -#if TARGET_INSN_START_EXTRA_WORDS == 0 -static inline void tcg_gen_insn_start(uint64_t pc) -{ - unsigned insn_start_words = tcg_ctx->insn_start_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); -} -#elif TARGET_INSN_START_EXTRA_WORDS >= 1 static inline void tcg_gen_insn_start(uint64_t pc, uint64_t a1, uint64_t a2) { unsigned insn_start_words = tcg_ctx->insn_start_words; @@ -39,12 +29,13 @@ static inline void tcg_gen_insn_start(uint64_t pc, uint64_t a1, uint64_t a2) insn_start_words * 64 / TCG_TARGET_REG_BITS); tcg_set_insn_start_param(op, 0, pc); - tcg_set_insn_start_param(op, 1, a1); + if (insn_start_words > 1) { + tcg_set_insn_start_param(op, 1, a1); + } if (insn_start_words > 2) { tcg_set_insn_start_param(op, 2, a2); } } -#endif #if TARGET_LONG_BITS == 32 typedef TCGv_i32 TCGv; diff --git a/target/alpha/translate.c b/target/alpha/translate.c index 2156c022146..6586ad0a69a 100644 --- a/target/alpha/translate.c +++ b/target/alpha/translate.c @@ -2905,9 +2905,9 @@ static void alpha_tr_insn_start(DisasContextBase *dcbase, CPUState *cpu) DisasContext *ctx = container_of(dcbase, DisasContext, base); if (ctx->pcrel) { - tcg_gen_insn_start(dcbase->pc_next & ~TARGET_PAGE_MASK); + tcg_gen_insn_start(dcbase->pc_next & ~TARGET_PAGE_MASK, 0, 0); } else { - tcg_gen_insn_start(dcbase->pc_next); + tcg_gen_insn_start(dcbase->pc_next, 0, 0); } } diff --git a/target/avr/translate.c b/target/avr/translate.c index 4ab71d8138b..c4f1a446467 100644 --- a/target/avr/translate.c +++ b/target/avr/translate.c @@ -2686,7 +2686,7 @@ static void avr_tr_insn_start(DisasContextBase *dcbase, CPUState *cs) { DisasContext *ctx = container_of(dcbase, DisasContext, base); - tcg_gen_insn_start(ctx->npc); + tcg_gen_insn_start(ctx->npc, 0, 0); } static void avr_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs) diff --git a/target/loongarch/tcg/translate.c b/target/loongarch/tcg/translate.c index e59e4ed25b1..ee359e804af 100644 --- a/target/loongarch/tcg/translate.c +++ b/target/loongarch/tcg/translate.c @@ -158,7 +158,7 @@ static void loongarch_tr_insn_start(DisasContextBase *dcbase, CPUState *cs) { DisasContext *ctx = container_of(dcbase, DisasContext, base); - tcg_gen_insn_start(ctx->base.pc_next); + tcg_gen_insn_start(ctx->base.pc_next, 0, 0); } /* diff --git a/target/ppc/translate.c b/target/ppc/translate.c index a52cbc869ae..70458526282 100644 --- a/target/ppc/translate.c +++ b/target/ppc/translate.c @@ -6558,7 +6558,7 @@ static void ppc_tr_tb_start(DisasContextBase *db, CPUState *cs) static void ppc_tr_insn_start(DisasContextBase *dcbase, CPUState *cs) { - tcg_gen_insn_start(dcbase->pc_next); + tcg_gen_insn_start(dcbase->pc_next, 0, 0); } static bool is_prefix_insn(DisasContext *ctx, uint32_t insn) diff --git a/target/rx/translate.c b/target/rx/translate.c index bbda703be86..16a865bd40f 100644 --- a/target/rx/translate.c +++ b/target/rx/translate.c @@ -2210,7 +2210,7 @@ static void rx_tr_insn_start(DisasContextBase *dcbase, CPUState *cs) { DisasContext *ctx = container_of(dcbase, DisasContext, base); - tcg_gen_insn_start(ctx->base.pc_next); + tcg_gen_insn_start(ctx->base.pc_next, 0, 0); } static void rx_tr_translate_insn(DisasContextBase *dcbase, CPUState *cs) diff --git a/target/tricore/translate.c b/target/tricore/translate.c index 6819b776686..636137a5f73 100644 --- a/target/tricore/translate.c +++ b/target/tricore/translate.c @@ -8376,7 +8376,7 @@ static void tricore_tr_insn_start(DisasContextBase *dcbase, CPUState *cpu) { DisasContext *ctx = container_of(dcbase, DisasContext, base); - tcg_gen_insn_start(ctx->base.pc_next); + tcg_gen_insn_start(ctx->base.pc_next, 0, 0); } static bool insn_crosses_page(CPUTriCoreState *env, DisasContext *ctx) diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c index 4f02cefde34..888752f2279 100644 --- a/target/xtensa/translate.c +++ b/target/xtensa/translate.c @@ -1159,7 +1159,7 @@ static void xtensa_tr_tb_start(DisasContextBase *dcbase, CPUState *cpu) static void xtensa_tr_insn_start(DisasContextBase *dcbase, CPUState *cpu) { - tcg_gen_insn_start(dcbase->pc_next); + tcg_gen_insn_start(dcbase->pc_next, 0, 0); } static void xtensa_tr_translate_insn(DisasContextBase *dcbase, CPUState *cpu) From patchwork Wed Mar 19 13:45:06 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: 874729 Delivered-To: patch@linaro.org Received: by 2002:a5d:6a90:0:b0:38f:210b:807b with SMTP id s16csp407520wru; Wed, 19 Mar 2025 06:47:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUq3BpOLjNTyzQCReJwqSkSIzrPi08u+uH6ftIG/8XNf6yOd3aoE2ODsmJfm5ahCeAuQFH5ZQ==@linaro.org X-Google-Smtp-Source: AGHT+IEPq+fhlIqaA1/Hh+1LmR4M1D6cB2QMMTOxm5Jr5jGklXe8MDfmTpPlXutQopjyuKwBbaph X-Received: by 2002:ad4:5ca6:0:b0:6e8:f4d3:e8a5 with SMTP id 6a1803df08f44-6eb2928f340mr38624516d6.15.1742392058081; Wed, 19 Mar 2025 06:47:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1742392058; cv=none; d=google.com; s=arc-20240605; b=iSdb2vDExKWVZVA3VanMNTrPRw/Oj0rgQd/qp2NXCqmQb3KdzKdh8ciTGhOvDFsK7j WJR1PbyruNZEWi1iRD/cIB/W0Cs6CC+URmScWZWhInd8MzBWEfZtvaEQFXlx5TL6GiM/ iUCXNORvJqaJn7hUJl7S5Pn8dznId90hI5y8jitq8EkkyDNwV914oHo+oBpMFQZRLUsO I0eGrpyGKoF/Q+sTaSLeqisQOrlFHc01yPENKRGyH5cLVExy2ynYklptFe0A3Ot6MahW EWp9f5Imh325LWm9YIsBj+bNAQUb0AltvBFlrivWAWa5oYOzh+N2aHea7tJvxfxBY49u YOzQ== 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=32mireliZ/dTP04oYHZ+DYdxeMqjsmJC3DhlT1EPop4=; fh=oQsvFjElslmUPxsR6fJkm0Ezna1Yj9KV/ql5u2IKgnk=; b=GH74+mf/JrveCevuPLxz+tV0blKxmgYh7UmiGg3EuzDA6foJI4TxZzcuTNEsUc+/Dw qt+3jGKeJvwWchBh1buLKoc13qybxMcsYjlGe7QIzeaFFWeC7uv6fGRJgV0ugOZQ3zfc 8lZZrV6IevG5ZFWSnkhSzAoQHwAD7MVfQWzsxwyrq76mG+5WsNaMo6zOA6MRTwX/VOjG tGXT+9cm0QV40tnAkvViQ/W2raBoyBtKR/tSjpDL4h+hH0a6Xa2RrnhiM1bHBh+LqqbR YX2FJ7n4qB+ViHNmPcxFLaTkk9HYhwTYBmf5pGQloIUS0IWUj4NROGh5u+k7pmt+OVWk njKQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=D5uOYWQb; 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-6eade37072fsi138405796d6.467.2025.03.19.06.47.37 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 19 Mar 2025 06:47:38 -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=D5uOYWQb; 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 1tutlC-00058z-9v; Wed, 19 Mar 2025 09:47:06 -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 1tutkM-0003ob-Ux for qemu-devel@nongnu.org; Wed, 19 Mar 2025 09:46:19 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tutkL-0004Jw-1C for qemu-devel@nongnu.org; Wed, 19 Mar 2025 09:46:14 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-43cef035a3bso32780645e9.1 for ; Wed, 19 Mar 2025 06:46:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1742391971; x=1742996771; 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=32mireliZ/dTP04oYHZ+DYdxeMqjsmJC3DhlT1EPop4=; b=D5uOYWQbgSLrxu6lXueZbRnA646xpJtAWS6eWmrEG54ZyC/SvkQ03o6gpD/kWFIYD9 IwX8Dq7ZD5NQHmY0Q2uLVyqPEuJ/JWPIFRifhQiMeQZSb4+Zqp7M8ZjekyXW1umoGL4G cVKgSIj6ZRRnBvYXp7fAy2dNuOoZtaGeDlC9+4PqpH/6Ssdwh7ualAQPGaTxLw939jKM z3lnzapAsVHxp3KHQQaCXhIfZIpmh2NWvYvSrpikBB/++ytS0QoxYjTBeJ4PBNPlyYge ZCrAxnG6ho2IDB0lTzHq2EsUdxaHIz7uGQ2O9oerTav57m+ZM1JDoVdMBTX4NZos8EbR JqZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742391971; x=1742996771; 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=32mireliZ/dTP04oYHZ+DYdxeMqjsmJC3DhlT1EPop4=; b=xB+ADuw92M4sTCCUHhGkWoKeCS9WbrFXoJkGWT1ZCkQ5b6zMeVr4bgFw5SAS5DM4BH 9wXzBt7kSc9KfoA+XvvG05IXnGada9xkcg0FQFhyTd+dfv3Sok8HPXXxYajr6YFOxHac tYkpK7Pz37JOXcr+sOQ2YRJtWcN2qfZ3X5buBIw1S68RB7oDlwN4ubjh9Bch+1/3jsoE 9ybM1dqsu/C+r5ds7VaaoyFkRl8GZVdM4uuGbSlyrvqDQsb8a6H0cKFNASsibu8nIGkX /UFF6Et49CQ2Jj5WGcsbVxB7zy62UZ3zPboUGebKezJZDDBTpf+dueHcPqcGJoAwFimm WY2A== X-Gm-Message-State: AOJu0Yxj+pzsuZoJ8JCGInKNf9TK3VLi3PrOrpI55s9NmiWmU5LOXwyb mFz240Z16bP+M9Gb46sKdUX6kjv05ljdQF3uA8DNJKyVWUDNrTHw5teOIPxaPC710XLs5r8JoQB f X-Gm-Gg: ASbGncvSuo5XixZ6F8v2mCCVdCg9Wb90DicBpf6G/ciAlruzfXXSv3bMRiZyubX7h9d KphVQJqscYZIG9bG4fly04iAtDcfVSNgl9OfgYHdkV4KaWeNhk2AlA0vZEC/xy3q6WzkAKgNyNa QJ67W3k0Tk2eiUF5CpLqTljBZaZhER+WD4+ceq9OsbI3NnLqIADDYGYfo2rJ0iWM2RAnXIEQ7Ui CIoBmVJAQYQOAlQQs+d/T64aYRRf/ShBl/rbIvz005rE2GWLXsk3voFGaTX/Lqi98RNGRpRnHWY 8ENkq9XEfprH8u+ZAcfeM+PHfVPK02pEBD0g7P4PccUXFDie1+LHt2SJg5D+oBYFaRkwyggHpcN thSCKRPUBuP+/7yYmtK8= X-Received: by 2002:a05:600c:3594:b0:43c:fb36:d296 with SMTP id 5b1f17b1804b1-43d4383d0e7mr20984915e9.25.1742391971041; Wed, 19 Mar 2025 06:46:11 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43d4863b4a7sm3162555e9.8.2025.03.19.06.46.10 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 19 Mar 2025 06:46:10 -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 12/12] tcg: Uninline tcg_gen_insn_start() Date: Wed, 19 Mar 2025 14:45:06 +0100 Message-ID: <20250319134507.45045-13-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::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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 tcg_gen_insn_start() is now common to all TCG frontends. We don't need to keep it inlined, move it to tcg.c. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée --- include/tcg/tcg-op.h | 15 --------------- include/tcg/tcg.h | 2 ++ tcg/tcg.c | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/include/tcg/tcg-op.h b/include/tcg/tcg-op.h index cf177a1fd3b..470cb46225e 100644 --- a/include/tcg/tcg-op.h +++ b/include/tcg/tcg-op.h @@ -22,21 +22,6 @@ # error #endif -static inline void tcg_gen_insn_start(uint64_t pc, uint64_t a1, uint64_t a2) -{ - unsigned insn_start_words = tcg_ctx->insn_start_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); - if (insn_start_words > 1) { - tcg_set_insn_start_param(op, 1, a1); - } - if (insn_start_words > 2) { - tcg_set_insn_start_param(op, 2, a2); - } -} - #if TARGET_LONG_BITS == 32 typedef TCGv_i32 TCGv; #define tcg_temp_new() tcg_temp_new_i32() diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h index 92a23e10218..d87d900bf81 100644 --- a/include/tcg/tcg.h +++ b/include/tcg/tcg.h @@ -609,6 +609,8 @@ static inline void tcg_set_insn_start_param(TCGOp *op, int arg, uint64_t v) } } +void tcg_gen_insn_start(uint64_t pc, uint64_t a1, uint64_t a2); + /* The last op that was emitted. */ static inline TCGOp *tcg_last_op(void) { diff --git a/tcg/tcg.c b/tcg/tcg.c index e8950df2ad3..904f858e4dc 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -3468,6 +3468,21 @@ TCGOp *tcg_op_insert_after(TCGContext *s, TCGOp *old_op, return new_op; } +void tcg_gen_insn_start(uint64_t pc, uint64_t a1, uint64_t a2) +{ + unsigned insn_start_words = tcg_ctx->insn_start_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); + if (insn_start_words > 1) { + tcg_set_insn_start_param(op, 1, a1); + } + if (insn_start_words > 2) { + tcg_set_insn_start_param(op, 2, a2); + } +} + static void move_label_uses(TCGLabel *to, TCGLabel *from) { TCGLabelUse *u;