From nobody Sat Nov 15 22:35:16 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1746054472; cv=none; d=zohomail.com; s=zohoarc; b=CTlUO7IOSWjvNzoDSn9Z3ZbPUtt1P/5RSESbR6/MfJECgkzGcb0o/Oip/5ETE0tD5F+psIeO2xK8EZ73tyLGVqhfEv5VujpGJFPANyKoX4OrAH0g+gGpZ96zfPl772J5CEnXejNS6fUZ7Ha/sQFLYpdfxVDUZHXMztNzELpQ4u4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746054472; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=j9UcL+UexAzaPG1SzS7Ey5EkrsDUspO+0mY3N19ns74=; b=gHgw6VhQSUh+0GLnGAQcyY4mIGOrzD7/9CBd7Ejk4Vbi6yqCoLXfAZeHLAz+94xE0+hZSOROgwe8x4qfskfXiRNnugtj/7/+Y18TSOP14sp7nltO96EgXE33wpirgKpuPo1q9ksogY3oSG7lN5mES3AO0Zyb29dxJ82AzugPIQQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1746054472338101.99711813740305; Wed, 30 Apr 2025 16:07:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAGVm-0001lM-UQ; Wed, 30 Apr 2025 19:06:43 -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 1uAGVj-0001ic-Gn for qemu-devel@nongnu.org; Wed, 30 Apr 2025 19:06:40 -0400 Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAGVf-0007Uj-L6 for qemu-devel@nongnu.org; Wed, 30 Apr 2025 19:06:39 -0400 Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-736c277331eso1528025b3a.1 for ; Wed, 30 Apr 2025 16:06:35 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74039a30e2fsm2323287b3a.103.2025.04.30.16.06.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 16:06:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746054394; x=1746659194; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=j9UcL+UexAzaPG1SzS7Ey5EkrsDUspO+0mY3N19ns74=; b=lb48uafWHr4unnirdf69q8VZqJl4R/qRtfpPndUdLRBYlXV2lqBMek4d+ZWV5+pCRz eDjD8DP67If4CiVoJiTX35Qu4qQ1gDCtm2L2yVOiabzqfFR1Wnr9vlJ1Qifa+gwri3Qj L3GVNAZFLDKIHtPJ+H6nAjvRoZWphjhqtcxXAfYP8oys6JwTndmtYPEUfTee6O/aklMb WK1t7fBbe0Hr7ru1P8Z2Tloqfxin1XZIioWBSTcXbTZkXqcshYxV+I7lGf3qFYWJqkn5 onvIE8MiB1xuXhtfCYdEYHXA1/BtkdfzEWo++qI161PRrNQZL7zUKtxnFSLMmcQx7h+Y g3YA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746054394; x=1746659194; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=j9UcL+UexAzaPG1SzS7Ey5EkrsDUspO+0mY3N19ns74=; b=sPe5aICslfJ3QbTrpr7srrVJapdxUgWpdrKDNzu5Y0w3rQCLurEkBqu/dh9jW5c/OP Yu98bkO7If+Bv5qnxemQ77ReEh5i4ktZmleZr4zzA6nPm44V5LIM01Fo+hoKUH0vLwdD MUMBw0YJxw070RQv56FX7Jj1w5ndpS8chitJLLbqnFHg1OFx7HCfcJJQOEQInecn9CUE eJ8k1fdI78ysMf2CsKTNUqGmGcuzCY55eGwsgowO1b7bWzk4QU8K1JlCN0QXauvh+jcp CGYMJ/Vk5obulugGKrtGhMvfnZeZUgH+yTK7L3mbLWHuKlOABSvYZO+Ji5UwZkaqlYVn XGgw== X-Gm-Message-State: AOJu0YztyfNcuFk3GHNLoMcdLjIfMLPwuO6s5bd4lgU2y4tRZ8k12ugV +XSRYPTYmLBSiUxqU4NAxiOTIvWb1B9klUZSlArATWUhA+e9QgbyFu4rs4A+Ab9+sVc2Ope+dPH n X-Gm-Gg: ASbGncuSPKnZmw2vfgTmnK9DE60roswMhc9Dh1/d2ML7n4QD1+jHp97YfEENgHcvsin AhkDV8eW+o2VJbr7PfMsrPeCl/1lpqG5GizbQ/9U9h/ZvOtTeVDGzuH9Sqk/Q2ZylvSsgm/EW5E h17C9U+GdXtqPYqbvOGB7sMxzOSQYtSa6ZPfDDwPWnaf4ixdnyU11NaXgqmuehEucgM8/KdhMc3 aUXZxX2eA0s6J1jhn8LHxwrPWVqRNRB52B1ttC9qeVMSB5zwKfcX2TfBUh7F83pBAe+oNjrn2lG tMZdLAtDLB0qD/oc1STNarQws2pWLS4taIVpuiX0uNKmTvw3e/85DTyXEQ/GJ/Y6ce1QZlE1jLs = X-Google-Smtp-Source: AGHT+IEgrEFXNLK9k3fn0SW6Af3GMVj4oWJ7xStLA1MEM7Ok5oJVtze+INkCLEY3GXZuEunyyYsQ8w== X-Received: by 2002:a05:6a21:3a88:b0:1f3:20be:c18a with SMTP id adf61e73a8af0-20bdc996bcfmr338524637.10.1746054393560; Wed, 30 Apr 2025 16:06:33 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 1/6] tcg: Define INSN_START_WORDS as constant 3 Date: Wed, 30 Apr 2025 16:06:26 -0700 Message-ID: <20250430230631.2571291-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250430230631.2571291-1-richard.henderson@linaro.org> References: <20250430230631.2571291-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::436; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x436.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1746054473172019000 Content-Type: text/plain; charset="utf-8" Use the same value for all targets. Rename TARGET_INSN_START_WORDS and do not depend on TARGET_INSN_START_EXTRA_WORDS. Remove TCGContext.insn_start_words. Signed-off-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- include/tcg/insn-start-words.h | 11 +++++------ include/tcg/tcg-op.h | 17 ++++++++++++++--- include/tcg/tcg-opc.h | 3 +-- include/tcg/tcg.h | 12 +++++++----- accel/tcg/translate-all.c | 19 +++++++++---------- target/i386/helper.c | 2 +- target/openrisc/sys_helper.c | 2 +- tcg/perf.c | 5 ++--- tcg/tcg.c | 12 +++++------- 9 files changed, 45 insertions(+), 38 deletions(-) diff --git a/include/tcg/insn-start-words.h b/include/tcg/insn-start-words.h index d416d19bcf..c52aec50a7 100644 --- a/include/tcg/insn-start-words.h +++ b/include/tcg/insn-start-words.h @@ -1,13 +1,12 @@ /* SPDX-License-Identifier: MIT */ /* - * Define TARGET_INSN_START_WORDS + * Define INSN_START_WORDS * Copyright (c) 2008 Fabrice Bellard */ =20 -#ifndef TARGET_INSN_START_WORDS +#ifndef TCG_INSN_START_WORDS +#define TCG_INSN_START_WORDS =20 -#include "cpu-param.h" +#define INSN_START_WORDS 3 =20 -# define TARGET_INSN_START_WORDS (1 + TARGET_INSN_START_EXTRA_WORDS) - -#endif /* TARGET_INSN_START_WORDS */ +#endif /* TCG_INSN_START_WORDS */ diff --git a/include/tcg/tcg-op.h b/include/tcg/tcg-op.h index 59d19755e6..c912578fdd 100644 --- a/include/tcg/tcg-op.h +++ b/include/tcg/tcg-op.h @@ -9,6 +9,7 @@ #define TCG_TCG_OP_H =20 #include "tcg/tcg-op-common.h" +#include "tcg/insn-start-words.h" #include "exec/target_long.h" =20 #ifndef TARGET_LONG_BITS @@ -23,24 +24,34 @@ # error #endif =20 +#if INSN_START_WORDS !=3D 3 +# error Mismatch with insn-start-words.h +#endif + #if TARGET_INSN_START_EXTRA_WORDS =3D=3D 0 static inline void tcg_gen_insn_start(target_ulong pc) { - TCGOp *op =3D tcg_emit_op(INDEX_op_insn_start, 64 / TCG_TARGET_REG_BIT= S); + TCGOp *op =3D 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, 0); + tcg_set_insn_start_param(op, 2, 0); } #elif TARGET_INSN_START_EXTRA_WORDS =3D=3D 1 static inline void tcg_gen_insn_start(target_ulong pc, target_ulong a1) { - TCGOp *op =3D tcg_emit_op(INDEX_op_insn_start, 2 * 64 / TCG_TARGET_REG= _BITS); + TCGOp *op =3D 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, 0); } #elif TARGET_INSN_START_EXTRA_WORDS =3D=3D 2 static inline void tcg_gen_insn_start(target_ulong pc, target_ulong a1, target_ulong a2) { - TCGOp *op =3D tcg_emit_op(INDEX_op_insn_start, 3 * 64 / TCG_TARGET_REG= _BITS); + TCGOp *op =3D 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); diff --git a/include/tcg/tcg-opc.h b/include/tcg/tcg-opc.h index 995b79383e..e988edd93a 100644 --- a/include/tcg/tcg-opc.h +++ b/include/tcg/tcg-opc.h @@ -114,8 +114,7 @@ DEF(extrh_i64_i32, 1, 1, 0, 0) =20 #define DATA64_ARGS (TCG_TARGET_REG_BITS =3D=3D 64 ? 1 : 2) =20 -/* There are tcg_ctx->insn_start_words here, not just one. */ -DEF(insn_start, 0, 0, DATA64_ARGS, TCG_OPF_NOT_PRESENT) +DEF(insn_start, 0, 0, DATA64_ARGS * INSN_START_WORDS, TCG_OPF_NOT_PRESENT) =20 DEF(exit_tb, 0, 0, 1, TCG_OPF_BB_EXIT | TCG_OPF_BB_END | TCG_OPF_NOT_PRESE= NT) DEF(goto_tb, 0, 0, 1, TCG_OPF_BB_EXIT | TCG_OPF_BB_END | TCG_OPF_NOT_PRESE= NT) diff --git a/include/tcg/tcg.h b/include/tcg/tcg.h index aa300a2f8b..a8c00c72cc 100644 --- a/include/tcg/tcg.h +++ b/include/tcg/tcg.h @@ -34,6 +34,7 @@ #include "tcg-target-reg-bits.h" #include "tcg-target.h" #include "tcg/tcg-cond.h" +#include "tcg/insn-start-words.h" #include "tcg/debug-assert.h" =20 /* XXX: make safe guess about sizes */ @@ -359,7 +360,6 @@ struct TCGContext { int page_mask; uint8_t page_bits; uint8_t tlb_dyn_max_bits; - uint8_t insn_start_words; TCGBar guest_mo; =20 TCGRegSet reserved_regs; @@ -582,18 +582,19 @@ static inline TCGv_vec temp_tcgv_vec(TCGTemp *t) return (TCGv_vec)temp_tcgv_i32(t); } =20 -static inline TCGArg tcg_get_insn_param(TCGOp *op, int arg) +static inline TCGArg tcg_get_insn_param(TCGOp *op, unsigned arg) { return op->args[arg]; } =20 -static inline void tcg_set_insn_param(TCGOp *op, int arg, TCGArg v) +static inline void tcg_set_insn_param(TCGOp *op, unsigned arg, TCGArg v) { op->args[arg] =3D v; } =20 -static inline uint64_t tcg_get_insn_start_param(TCGOp *op, int arg) +static inline uint64_t tcg_get_insn_start_param(TCGOp *op, unsigned arg) { + tcg_debug_assert(arg < INSN_START_WORDS); if (TCG_TARGET_REG_BITS =3D=3D 64) { return tcg_get_insn_param(op, arg); } else { @@ -602,8 +603,9 @@ static inline uint64_t tcg_get_insn_start_param(TCGOp *= op, int arg) } } =20 -static inline void tcg_set_insn_start_param(TCGOp *op, int arg, uint64_t v) +static inline void tcg_set_insn_start_param(TCGOp *op, unsigned arg, uint6= 4_t v) { + tcg_debug_assert(arg < INSN_START_WORDS); if (TCG_TARGET_REG_BITS =3D=3D 64) { tcg_set_insn_param(op, arg, v); } else { diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 7b0bd50904..fa4998b341 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -120,7 +120,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. =20 - The logical table consists of TARGET_INSN_START_WORDS target_ulong's, + The logical table consists of 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 in= sn. =20 @@ -140,13 +140,13 @@ static int encode_search(TranslationBlock *tb, uint8_= t *block) for (i =3D 0, n =3D tb->icount; i < n; ++i) { uint64_t prev, curr; =20 - for (j =3D 0; j < TARGET_INSN_START_WORDS; ++j) { + for (j =3D 0; j < INSN_START_WORDS; ++j) { if (i =3D=3D 0) { prev =3D (!(tb_cflags(tb) & CF_PCREL) && j =3D=3D 0 ? tb->= pc : 0); } else { - prev =3D insn_data[(i - 1) * TARGET_INSN_START_WORDS + j]; + prev =3D insn_data[(i - 1) * INSN_START_WORDS + j]; } - curr =3D insn_data[i * TARGET_INSN_START_WORDS + j]; + curr =3D insn_data[i * INSN_START_WORDS + j]; p =3D encode_sleb128(p, curr - prev); } prev =3D (i =3D=3D 0 ? 0 : insn_end_off[i - 1]); @@ -178,7 +178,7 @@ static int cpu_unwind_data_from_tb(TranslationBlock *tb= , uintptr_t host_pc, return -1; } =20 - 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] =3D tb->pc; } @@ -188,7 +188,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 =3D 0; i < num_insns; ++i) { - for (j =3D 0; j < TARGET_INSN_START_WORDS; ++j) { + for (j =3D 0; j < INSN_START_WORDS; ++j) { data[j] +=3D decode_sleb128(&p); } iter_pc +=3D decode_sleb128(&p); @@ -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[INSN_START_WORDS]; int insns_left =3D cpu_unwind_data_from_tb(tb, host_pc, data); =20 if (insns_left < 0) { @@ -349,7 +349,6 @@ TranslationBlock *tb_gen_code(CPUState *cpu, TCGTBCPUSt= ate s) tcg_ctx->page_mask =3D TARGET_PAGE_MASK; tcg_ctx->tlb_dyn_max_bits =3D CPU_TLB_DYN_MAX_BITS; #endif - tcg_ctx->insn_start_words =3D TARGET_INSN_START_WORDS; tcg_ctx->guest_mo =3D cpu->cc->tcg_ops->guest_default_memory_order; =20 restart_translate: @@ -457,7 +456,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu, TCGTBCPUSt= ate s) fprintf(logfile, "OUT: [size=3D%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 =3D tcg_ctx->gen_insn_end_off[insn]; disas(logfile, tb->tc.ptr, chunk_start); =20 @@ -470,7 +469,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu, TCGTBCPUSt= ate s) size_t chunk_end =3D 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_STAR= T_WORDS]); + tcg_ctx->gen_insn_data[insn * INSN_START_WORDS= ]); disas(logfile, tb->tc.ptr + chunk_start, chunk_end - chunk_start); chunk_start =3D chunk_end; diff --git a/target/i386/helper.c b/target/i386/helper.c index 197fdac7dd..e0aaed3c4c 100644 --- a/target/i386/helper.c +++ b/target/i386/helper.c @@ -526,7 +526,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[INSN_START_WORDS]; CPUState *cs =3D env_cpu(env); =20 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 951f8e247a..d96b41a01c 100644 --- a/target/openrisc/sys_helper.c +++ b/target/openrisc/sys_helper.c @@ -218,7 +218,7 @@ target_ulong HELPER(mfspr)(CPUOpenRISCState *env, targe= t_ulong rd, { OpenRISCCPU *cpu =3D env_archcpu(env); #ifndef CONFIG_USER_ONLY - uint64_t data[TARGET_INSN_START_WORDS]; + uint64_t data[INSN_START_WORDS]; MachineState *ms =3D MACHINE(qdev_get_machine()); CPUState *cs =3D env_cpu(env); int idx; diff --git a/tcg/perf.c b/tcg/perf.c index 412a987d95..4e8d2c1bee 100644 --- a/tcg/perf.c +++ b/tcg/perf.c @@ -313,7 +313,7 @@ void perf_report_code(uint64_t guest_pc, TranslationBlo= ck *tb, const void *start) { struct debuginfo_query *q; - size_t insn, start_words; + size_t insn; uint64_t *gen_insn_data; =20 if (!perfmap && !jitdump) { @@ -329,11 +329,10 @@ void perf_report_code(uint64_t guest_pc, TranslationB= lock *tb, =20 /* Query debuginfo for each guest instruction. */ gen_insn_data =3D tcg_ctx->gen_insn_data; - start_words =3D tcg_ctx->insn_start_words; =20 for (insn =3D 0; insn < tb->icount; insn++) { /* FIXME: This replicates the restore_state_to_opc() logic. */ - q[insn].address =3D gen_insn_data[insn * start_words + 0]; + q[insn].address =3D gen_insn_data[insn * INSN_START_WORDS + 0]; if (tb_cflags(tb) & CF_PCREL) { q[insn].address |=3D (guest_pc & qemu_target_page_mask()); } diff --git a/tcg/tcg.c b/tcg/tcg.c index c4e866e9c3..648333a9fb 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -1989,7 +1989,6 @@ void tcg_func_start(TCGContext *s) QSIMPLEQ_INIT(&s->labels); =20 tcg_debug_assert(s->addr_type <=3D TCG_TYPE_REG); - tcg_debug_assert(s->insn_start_words > 0); } =20 static TCGTemp *tcg_temp_alloc(TCGContext *s) @@ -2943,7 +2942,7 @@ void tcg_dump_ops(TCGContext *s, FILE *f, bool have_p= refs) nb_oargs =3D 0; col +=3D ne_fprintf(f, "\n ----"); =20 - for (i =3D 0, k =3D s->insn_start_words; i < k; ++i) { + for (i =3D 0, k =3D INSN_START_WORDS; i < k; ++i) { col +=3D ne_fprintf(f, " %016" PRIx64, tcg_get_insn_start_param(op, i)); } @@ -6835,7 +6834,7 @@ static void tcg_out_st_helper_args(TCGContext *s, con= st TCGLabelQemuLdst *ldst, =20 int tcg_gen_code(TCGContext *s, TranslationBlock *tb, uint64_t pc_start) { - int i, start_words, num_insns; + int i, num_insns; TCGOp *op; =20 if (unlikely(qemu_loglevel_mask(CPU_LOG_TB_OP) @@ -6925,9 +6924,8 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb,= uint64_t pc_start) QSIMPLEQ_INIT(&s->ldst_labels); s->pool_labels =3D NULL; =20 - start_words =3D s->insn_start_words; s->gen_insn_data =3D - tcg_malloc(sizeof(uint64_t) * s->gen_tb->icount * start_words); + tcg_malloc(sizeof(uint64_t) * s->gen_tb->icount * INSN_START_WORDS= ); =20 tcg_out_tb_start(s); =20 @@ -6969,8 +6967,8 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb,= uint64_t pc_start) assert(s->gen_insn_end_off[num_insns] =3D=3D off); } num_insns++; - for (i =3D 0; i < start_words; ++i) { - s->gen_insn_data[num_insns * start_words + i] =3D + for (i =3D 0; i < INSN_START_WORDS; ++i) { + s->gen_insn_data[num_insns * INSN_START_WORDS + i] =3D tcg_get_insn_start_param(op, i); } break; --=20 2.43.0 From nobody Sat Nov 15 22:35:16 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1746054457; cv=none; d=zohomail.com; s=zohoarc; b=NljBIhVcb8NvOOB+ofr6jlRCfsrkwT1Ko8QyAv7lnmDp7Fndaz8j6XeX5968jyHengGP7KVfQOrRCvvSyjRZ6+ZjsPRDwxAg1pckR6Hv7AYPdEMezTb3bX5m2XtSZpiNjguGQM5LDRxW6TRBfEY879QdpYZIC/GRIrpgPUwo1tU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746054457; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=AYLcw77q0drDQnqkv5fH2XhRnVGB7EFd56psZWVXXSQ=; b=J7kI3SlsYM1rQ5YzMtfCdJniKHfKDqz87yh1Dtlz5F49v7FFy3vSN3gCOgociT3rPESYBBjUcL3brb6FjAmhQSfNwmT58ggglsVeG3VrmshRUHGFSSvlr6cLEhm4TB/26VOCOVof4/IIVRcnV8ooymiUzYzzvE/Z5UDPsIYRzNk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1746054457105457.0259424126707; Wed, 30 Apr 2025 16:07:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAGVz-0001nJ-OH; Wed, 30 Apr 2025 19:06:56 -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 1uAGVi-0001hh-Pz for qemu-devel@nongnu.org; Wed, 30 Apr 2025 19:06:38 -0400 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAGVf-0007V9-Tq for qemu-devel@nongnu.org; Wed, 30 Apr 2025 19:06:38 -0400 Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-736bfa487c3so421470b3a.1 for ; Wed, 30 Apr 2025 16:06:35 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74039a30e2fsm2323287b3a.103.2025.04.30.16.06.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 16:06:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746054394; x=1746659194; 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=AYLcw77q0drDQnqkv5fH2XhRnVGB7EFd56psZWVXXSQ=; b=UCcS70t45pR+lIozrmNqYyaJ+EwpwFM5FemJA2JgPZPXlcJeB8GH7ScUnQqavyHrqZ LKLUEtelbaGzN/6Ax/vwVwef5uKf3G91hEMxG6I5880vMFmDTBqkrBbOZNPB7iAHUbIh q1CXE/sKG0exHb+gg2CNEncyFg9kY4f99ol5pM9e4S72m1A17XpImGGSIZ3of6NrdIVl wvkm2QWBM6zgZUkEkjvjWMwwrj8GSzCpd8PqYiU6U/VFGHg7iRljiyFfwX55VqpIO14a tpgZ1Ratdsi7CPMYVIoMGhvJIApDMntZamFXxD1XurprD6JZYh/c5hZCm65jhDRxz7bs EkwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746054394; x=1746659194; 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=AYLcw77q0drDQnqkv5fH2XhRnVGB7EFd56psZWVXXSQ=; b=TtbC3CbPCIXVVYOu5Az/3NeMl6p5zvQwSsUURZVuhxtakJmDG3FjNKwzBPBgmCIDUq 1NqmJIOc/aOuFplM8jvJE4UvwJxWHtAvvMfZ8bOGhVbkeCwRAaAAgh34dRCzmEyoMmP9 vhirbILWMTt3t4+6Aw99sAFgkLK3LEX9cXrftMIJqf3DcdUp0Tv+bpcZjQkqt2QYngvE 0Q4cIaE88QDYrLIidHNcLz8UJ1QfMxiHYG7FWeVRNzRo+pFRItEoIZYwWadinOY0nKfu 2kKS1uTE0DADqHiheZ80amZdm8bsLHUJ9IP/5lYeLqu+f9XFOatOx9yGb/v3EznPjNhy WudQ== X-Gm-Message-State: AOJu0Yzovl5kkEgR2IO/vfE+hUuLzmnisd3//fST3Qvmaknm9waK4FQD MMuU4crtY1PWKYd8iAT+vv2509m3un5hs25svsppAWrnuhaio6CrzDU1MXfgybOqyPRgEIcm9Aw X X-Gm-Gg: ASbGncuHDQmkFFfF/TfqsKv2UeJqG+3qHQUA4AQEIItb/VioEwAPZF/y4MMADzzT4LL kxVnVu4lo/J20gCXXNwo1K8F2evzfx0WANgAjzWsuRjJ4W1prgsvhJm4stoGCHt6klS5Eii1fDB zDLYKrCe1IyLz3Bea2mp1NMUm7uXht28Jo5P3anLJeS/KOA4DwYArjcHL69W6QC3xGDl4dU4dUa jT8UkJq9u2p+bmvFFX4Gq5qyuevE7iwfamaq9kVndOs4sJLVU32WVsrG8nDGe6KgLx2gDrtuRjP xNewODYC1Vt7ybzIW9Z5EwwT3pX3V87Ev7aNNujX6PVpoe9unrKUof5YWC1A3GEFUvgCMcR6Tzo = X-Google-Smtp-Source: AGHT+IFPfAcihB4qtMgBZ8eLfk/cjhfgx1AH4s9kGNRHa4zyr15xPVIeOxkQrDgmhUGuyPvHGi1AvA== X-Received: by 2002:a05:6a00:1909:b0:736:62a8:e52d with SMTP id d2e1a72fcca58-7403a7a4c90mr6599466b3a.12.1746054394368; Wed, 30 Apr 2025 16:06:34 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-stable@nongnu.org Subject: [PATCH 2/6] accel/tcg: Don't use TARGET_LONG_BITS in decode_sleb128 Date: Wed, 30 Apr 2025 16:06:27 -0700 Message-ID: <20250430230631.2571291-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250430230631.2571291-1-richard.henderson@linaro.org> References: <20250430230631.2571291-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42a; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42a.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1746054459762019100 Content-Type: text/plain; charset="utf-8" When we changed decode_sleb128 from target_long to int64_t, we failed to adjust the shift limit. Cc: qemu-stable@nongnu.org Fixes: c9ad8d27caa ("tcg: Widen gen_insn_data to uint64_t") Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Pierrick Bouvier --- accel/tcg/translate-all.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index fa4998b341..acf32e6c08 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -109,7 +109,7 @@ static int64_t decode_sleb128(const uint8_t **pp) val |=3D (int64_t)(byte & 0x7f) << shift; shift +=3D 7; } while (byte & 0x80); - if (shift < TARGET_LONG_BITS && (byte & 0x40)) { + if (shift < 64 && (byte & 0x40)) { val |=3D -(int64_t)1 << shift; } =20 --=20 2.43.0 From nobody Sat Nov 15 22:35:16 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1746054462; cv=none; d=zohomail.com; s=zohoarc; b=E5wqAYQMjLEOZ4jabcpW0AQFWWyUka6MBIPzN4JHbCNSSQLDQXsIVQNlZxiCSNrvFEVm3mbzSrH0xMHmu75pDfNGTmFiczWJPJsX+XQLVMF4nToGPvxf5WG0OHKMtIshGzG7G5zD+4jfyv3XO9EED0tNgoKZV2C1qc3ZFfax1VI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746054462; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=3WaB8ulU2dMi9YjFSsDNWzjp+rLier7nhupyaS/o3ZU=; b=aHdHIS8EMQ+PiZlG9v/Y+YCER++p16ATNPDUfiyr71c/9dHIj9RIWusLqBFRxvTm9hfUWKh1axp9SEAWESGQAkCfx743l2GYVzhtVE/XvIc59s5tDwl2kJhKHhgCY47vCM3S8NsrzaTPK84R3A/ILw+4ZYsiYS26CbraGW0CjiY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1746054462285976.146109089764; Wed, 30 Apr 2025 16:07:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAGVq-0001lx-4G; Wed, 30 Apr 2025 19:06: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 1uAGVi-0001hr-W0 for qemu-devel@nongnu.org; Wed, 30 Apr 2025 19:06:39 -0400 Received: from mail-pf1-x432.google.com ([2607:f8b0: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 1uAGVh-0007VJ-2W for qemu-devel@nongnu.org; Wed, 30 Apr 2025 19:06:38 -0400 Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-73bf1cef6ceso498582b3a.0 for ; Wed, 30 Apr 2025 16:06:36 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74039a30e2fsm2323287b3a.103.2025.04.30.16.06.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 16:06:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746054395; x=1746659195; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=3WaB8ulU2dMi9YjFSsDNWzjp+rLier7nhupyaS/o3ZU=; b=A9dnc9a6aTOfWAbOOOYSg1iJw4la47mmKfzKMhwcyYurHXYVeugoWWzEbD/figgU+7 c69TsquA9ZrFsTljDW+KosEmSu0hp897VUSv42DW0CD9/sxI3Ka+75Mbn1IX6r1akjJI ONi/uxoRBsrC/yDDNha6QMq+hgopegsMqX0bumOPDh5C6MQjpCcMaeROEjacEtT3AT5K 9mui7d3LL8rfWcq9gDfD/FUSnYOTrUJf36kEd3Bf8z6Vla6AlBrJPTcbm4CvqgP34sbk w/R910hi/Xz0zAcgO/ryIxZ7TOoHS7F0oMaNJur4Mj92/ZjXWnl0ydqzg3N4vlSIDWjm caTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746054395; x=1746659195; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3WaB8ulU2dMi9YjFSsDNWzjp+rLier7nhupyaS/o3ZU=; b=C99KOMXV36/w9ebwqHoe4DwW5rkkl2gsoIOK/3HRNJXR+uUqg40W2p78629WG7Argb uFrhkMkjNfIw4d/hBRqBvD+tQQSw6H6J2rMQch4HZ+MG+0Tt99eNTm+uDYuZZgzaJwAe L2ZgKIXGNuFffzPyxDcoQNLK7wtcatQxDX88UKvQpbyj/j+B9qJ3q2erpATWAfyAcgJf S6YwVIOqVibjZGq30+GIMUTwRePqvze1STTw4RY68hBSiEERYTFlvXoZcgQfULKIfMMZ qzwp63N+ApSO+Cju7OWW53OYpL9jXftlY0SrsWPPgQEXclaWs5mLObFxB3jweiO2Cb/i r2Iw== X-Gm-Message-State: AOJu0YxwJvOzI2UcmfuyXVT+tcTDDC4t6D6mbAnVLVLF4ny52jEpSBd3 4DMz/ucX7Sb93wWuUZROIsEaSxAI7VxEt5XykgVCj05UFNWsre1O2gpxpSeH6WHXfsmhilQ6DzL A X-Gm-Gg: ASbGnctcJwNZFgSwxIA0eY/+IN8ZmpXDmJ18MYCJBq/UKZ34rFK6/oG2kSYWd8xGYOV NHTVjlV9NH5nNzpY5z13yGT6dSsfCTqPuYj+i5kXM7KHWNE7kKEFqwwG/LO7e+KUBVi106ooYvu ZaSrpLABNYMwkgS0hofu7l1qfjnzSLDl2puFD1Bl1LfTsinU2sQ3fX8X3QtMxOYlN5UACmE9ZCX ve36c9GfntBZUZMSNAsf8lG+cOhIY9EQE2GFmWvhv53DPiFZEv36zICxrdyOEchr8ibTDOjk+ia +EtmULWl+VYafO4Z3e94rymblSc2FHvJ24sQ0Mn6VHulQh8DY0oIgt09kbeXe4jJY893EfXgIlc = X-Google-Smtp-Source: AGHT+IEdwwZ/PLAShXUYr1ptjiSI/d99uVOwW7OupHtEy2NwZi0N2eOujhyLOnVVDLtXN5jIC+7QYw== X-Received: by 2002:a05:6a20:1588:b0:1f5:8e94:2e81 with SMTP id adf61e73a8af0-20ba6a20782mr1378674637.9.1746054395110; Wed, 30 Apr 2025 16:06:35 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 3/6] accel/tcg: Use target_long_bits() in translate-all.c Date: Wed, 30 Apr 2025 16:06:28 -0700 Message-ID: <20250430230631.2571291-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250430230631.2571291-1-richard.henderson@linaro.org> References: <20250430230631.2571291-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::432; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1746054463116019000 Content-Type: text/plain; charset="utf-8" Signed-off-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- accel/tcg/translate-all.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index acf32e6c08..6b6e10be9d 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -54,6 +54,7 @@ #include "qemu/qemu-print.h" #include "qemu/main-loop.h" #include "qemu/cacheinfo.h" +#include "qemu/target-info.h" #include "qemu/timer.h" #include "exec/log.h" #include "exec/icount.h" @@ -343,7 +344,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu, TCGTBCPUSt= ate s) } =20 tcg_ctx->gen_tb =3D tb; - tcg_ctx->addr_type =3D TARGET_LONG_BITS =3D=3D 32 ? TCG_TYPE_I32 : TCG= _TYPE_I64; + tcg_ctx->addr_type =3D target_long_bits() =3D=3D 32 ? TCG_TYPE_I32 : T= CG_TYPE_I64; #ifdef CONFIG_SOFTMMU tcg_ctx->page_bits =3D TARGET_PAGE_BITS; tcg_ctx->page_mask =3D TARGET_PAGE_MASK; --=20 2.43.0 From nobody Sat Nov 15 22:35:16 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1746054457; cv=none; d=zohomail.com; s=zohoarc; b=Qhytq0vKpbrszETxICv6HImoBRwPNRJ4rcDemk0uuG3fzVq0vVrhHjcxZymSUhXIAvVn7pXkeO4+VA1xA3T5oYe1d6Ge/gy+MJD1fDLimFTOxohUJJ2GAIgExQoHMESAPy7dT0bpMyyGqieAOhl64Xxr5455YfM2Rh8DDAFGvaQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746054457; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=JQMSsVL5Qlj5plf+juQAIXCjkfEY+x7lY+AAGxAAiXU=; b=C1Ms4fS6JRNh+2KfNjC0YgmAE3MP25KodnJeyJNgbhgdJX1AyK5xi3+B8DWavC/QNYGUo/aa/xL3WprtSiiUXpXfxJ3Oq4NO79K35GSmCMX9vGG0sdgLNaJ5WKLuwuNt5jNwSw6apJGx3t1rQfZVSGSWCji4MaKzHGMg23bhTVo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1746054456964398.5152944814839; Wed, 30 Apr 2025 16:07:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAGVp-0001lr-9q; Wed, 30 Apr 2025 19:06:45 -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 1uAGVj-0001j3-Pf for qemu-devel@nongnu.org; Wed, 30 Apr 2025 19:06:40 -0400 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAGVh-0007VO-Cy for qemu-devel@nongnu.org; Wed, 30 Apr 2025 19:06:39 -0400 Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-736e52948ebso538025b3a.1 for ; Wed, 30 Apr 2025 16:06:36 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74039a30e2fsm2323287b3a.103.2025.04.30.16.06.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 16:06:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746054396; x=1746659196; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=JQMSsVL5Qlj5plf+juQAIXCjkfEY+x7lY+AAGxAAiXU=; b=nSec6mJtJgr8tmi7TAjS6j0e+hpWYI4s3SdXt3qXRFzzRntuF/JNcHorQonwklnoMw lZ3vrKzPbfUi5/TnlFH3QKTI0z9vliP1r4FuQ8ZlLh/aaznIpG8kC19tEcY/e16KwEYR 1lBIrS5Fxmw9GzF4UyADpy7mEFBRkRpp0Fmibe/gS3BKyR3G/zZcfzUfHs34FzOgpK1E 2cXfHi5rRDtMdcbezsguUtGqNM8DRR7bscGi5uCR4XPmCxxEA3/AohVKG9C0Tm3j0UkR ur4tz9kVh/jZ5CQTTkD36yqZwtgyt70HHC7Mw/HHB+y4NR/xb52PX0XF3Ff9l5/DyLVb RZPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746054396; x=1746659196; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JQMSsVL5Qlj5plf+juQAIXCjkfEY+x7lY+AAGxAAiXU=; b=v0jgl6kbpnMFEKuxyVi7zne2OUDHbogUw/INxKgCR4Sa37Vg5QDjvvyQqVU1krWoS4 BbzhYRV3XXX6lHWIAr56mQ4EKCketPA+FCgSZo9Ia/h8GQ9FuKb24+jEut9do8gGwEN+ NRg5ac3GtFeSpHSIunnRdUDZ6G9JKhSEFsEG0QYxfpZzgGb4mUvxhaJXvUpjdaetaoJ3 14jPcAJdlrA9AujcOBdWJAmMBCxPbf8rAeDBjoD8ID5fEh4z7B68wm0lyjs+Y7pdjGap 2HKyqJu49dQvVpDwR+KiW/3Kdj05Lr+kmVE+P74gc/wSgZ8PTeY9UzEShsQqharfP2LE lE1g== X-Gm-Message-State: AOJu0Yz1nDJs+iJGX6DHNETNGOFanUvj614Gf5yzdczMJU9cY2XyLQMW 5Ikqkt25R0PpclmbN4VS7Zb2n/8pc0LjJZAycHRp0wZ9lXXWmPnK7vfyRUKyNOXnSi7cNUuAIqn 6 X-Gm-Gg: ASbGnct77ewjcZ5h8E1WUa1vXF6QiTIVZuquh2qy0PzcGonoCGVhCUwldcir6tboYF9 ykFkweBzx/gbGGiv3mg2HOvpvPSr2+AbQUbIVmsTi9JW9ZDKjN/qW/tQVUqauhCNDZYSFwuTGBH IfyHHm+HChqxLGs7K7vqpqf2NsNgeSzlM2XyVw7aTIXsxHkAjXEThhLSaYm/f79rTNvwP8Z0wkC 2YWZUvlU91m4TO8igT+svMZCrl0LJIpGrqGRREvCpdvA5Zmyb3qi/m3Ni7+YCJ+edD/Ne8UmYGQ HT2xcWpmLhdcHtxIFB5Y1j/4ZsazQCoVm/CpumgFo6rn0+O80T9T+2sffgQpytKBZScLMYK5BfU = X-Google-Smtp-Source: AGHT+IGa75+rTqlB6U2gbH/010nm8GLmf5QG2C7y7qFQeekZ7he9GRxMNPpmD1HH7/inHFbiQQcaxw== X-Received: by 2002:a05:6a00:3915:b0:736:3768:6d74 with SMTP id d2e1a72fcca58-740491c9454mr501166b3a.7.1746054395738; Wed, 30 Apr 2025 16:06:35 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 4/6] accel/tcg: Build translate-all.c twice Date: Wed, 30 Apr 2025 16:06:29 -0700 Message-ID: <20250430230631.2571291-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250430230631.2571291-1-richard.henderson@linaro.org> References: <20250430230631.2571291-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42b; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42b.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1746054458066019100 Content-Type: text/plain; charset="utf-8" Remove lots and lots of unused headers. Signed-off-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- accel/tcg/translate-all.c | 32 -------------------------------- accel/tcg/meson.build | 2 +- 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 6b6e10be9d..451b383aa8 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -22,46 +22,15 @@ #include "trace.h" #include "disas/disas.h" #include "tcg/tcg.h" -#if defined(CONFIG_USER_ONLY) -#include "qemu.h" -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -#include -#if __FreeBSD_version >=3D 700104 -#define HAVE_KINFO_GETVMMAP -#define sigqueue sigqueue_freebsd /* avoid redefinition */ -#include -#include -#define _KERNEL -#include -#undef _KERNEL -#undef sigqueue -#include -#endif -#endif -#else -#include "system/ram_addr.h" -#endif - -#include "cpu-param.h" -#include "exec/cputlb.h" -#include "exec/page-protection.h" #include "exec/mmap-lock.h" #include "tb-internal.h" #include "tlb-bounds.h" -#include "exec/translator.h" #include "exec/tb-flush.h" -#include "qemu/bitmap.h" -#include "qemu/qemu-print.h" -#include "qemu/main-loop.h" #include "qemu/cacheinfo.h" #include "qemu/target-info.h" -#include "qemu/timer.h" #include "exec/log.h" #include "exec/icount.h" -#include "system/tcg.h" -#include "qapi/error.h" #include "accel/tcg/cpu-ops.h" -#include "accel/tcg/getpc.h" #include "tb-jmp-cache.h" #include "tb-hash.h" #include "tb-context.h" @@ -69,7 +38,6 @@ #include "internal-common.h" #include "tcg/perf.h" #include "tcg/insn-start-words.h" -#include "cpu.h" =20 TBContext tb_ctx; =20 diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build index 0bb089299b..7eb4619aea 100644 --- a/accel/tcg/meson.build +++ b/accel/tcg/meson.build @@ -10,6 +10,7 @@ tcg_ss.add(files( 'tcg-runtime.c', 'tcg-runtime-gvec.c', 'tb-maint.c', + 'translate-all.c', 'translator.c', )) if get_option('plugins') @@ -22,7 +23,6 @@ libsystem_ss.add_all(tcg_ss) tcg_specific_ss =3D ss.source_set() tcg_specific_ss.add(files( 'tcg-all.c', - 'translate-all.c', )) tcg_specific_ss.add(when: 'CONFIG_USER_ONLY', if_true: files('user-exec.c'= )) specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_specific_ss) --=20 2.43.0 From nobody Sat Nov 15 22:35:16 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1746054457; cv=none; d=zohomail.com; s=zohoarc; b=AcehkDkbjy0MP3a7p5qM70z263YDJCkhRkWfgZCRwOD5xSLTNPvYqpTKwspoCSSSRofpERl8AisNYVPIXBuWSIrkIuW+Bj0LmMHWGcMezox5j0/HhAXseVkNaXT7QC90wmKf7uyeF1VMbfROJuAFpVWHyeYvTNcIApbmDSi2Snc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746054457; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=xMaU5nrZM5+S10tBG1u5byuDyb2bEX1pAEZKHt2spGs=; b=gdFS5mmtF0prJemufOoUYyz6MUxu3JoRyPkwQK3jOd0/PEsNGtlUjasIlf+niQAPWZZIxM76b87Y6BvkV+vV2b/sIntP63LfuHd+mI+z3L8Mzd0t3X6g8tT9ut4HQyzLYYLpn1lxtzTjg2syJiGDhuwAH2+5HXqMcPVLAH2s8B4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1746054457085318.1952782510459; Wed, 30 Apr 2025 16:07:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAGVz-0001nG-Ns; Wed, 30 Apr 2025 19:06:56 -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 1uAGVk-0001jp-Bm for qemu-devel@nongnu.org; Wed, 30 Apr 2025 19:06:40 -0400 Received: from mail-pf1-x42d.google.com ([2607:f8b0:4864:20::42d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uAGVh-0007VT-Qy for qemu-devel@nongnu.org; Wed, 30 Apr 2025 19:06:39 -0400 Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-736e52948ebso538033b3a.1 for ; Wed, 30 Apr 2025 16:06:37 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74039a30e2fsm2323287b3a.103.2025.04.30.16.06.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 16:06:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746054396; x=1746659196; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=xMaU5nrZM5+S10tBG1u5byuDyb2bEX1pAEZKHt2spGs=; b=Nmxhxib1/QS0Lf+lH8iJSUtFflNK723L5rT9VA7VoYxUwAvpJh3heZy5q6FlZPF2vA NgMNr25D2+lvukZPa049fBS6xQtLAZfULXBc+HEoqHdg9rsvb5jX8tbT4SkOQcyibFpi ZesDtdFWHMD8WsD4Zn2rDAdeRWBESh4HFxxIxEH3fozhDcLWOB1pMMb5G5Xs++3aUgpq g0NgXy/UjdlT/5HBeqeJHmjJVTLMMT20P8NLICONSavT4yDS3CeKuEZlRqqvwVil0GRl 4+okT8wbOWOvZ+JKtgCYsn2WCmQoVaUphTeAnLO/IiMIwHD/TyTbbhF3tSZqUPKFwyMb Fukg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746054396; x=1746659196; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xMaU5nrZM5+S10tBG1u5byuDyb2bEX1pAEZKHt2spGs=; b=qr1tlDgp5zV/YG1eG7ID+4Bkz8zJf66jYdJUatV5qVqZrIcSXzQfL/BX/+CIYMuW4n 8vXJJgj4Ft36erpdkGLDMFnX4Za0TNM2OdGzKKEsuP4CY1wj5U/hXUtaaK6V67MUbBQj 4U3AM2f85yPVj7GBn1u5KfzuWfP1UTN1BQ5IQMbYDK04u+YCeEyXP3JL1N5u7dPcQcr9 l0bBz6PYSgBwL+916QX5MpFbeEHH0QxHympmUMd1cMR4CXziYzirY1YQ5eLXB2lbCnLC t/L3iLtTecitE+Z4g9yfjXyTMdvzQl0I1AuvBRboP6tZxFJMZMAWn228HaHAWEzXk7ai AY3Q== X-Gm-Message-State: AOJu0YztbyghhNA4lC8qEz8H2sxSSA41mUlG8xGQk20yuqhysFUjMge+ 2iIryAmkGbTR5udT+h8hxofrjtAxU+DI0AYNQGeVr2oohDasyySEhxGEfbB/TKcNtizlzkwLddX B X-Gm-Gg: ASbGncsOeOWrMbAZiZdVQQQU9XKpICWPlXUnhPMPimQgJ+mv4k9Hd0VGc+7LKkzD2PG T44AGiWfJHIDMcHW7WMTlvVdf0Q4p9hHUxj8SBn+nDngOBhuG3O9CfUnnnVfd33t1s7tCjWepvZ JwiTa6zATNQpuhUIFZ0PnLmgf00g5nXPJDvc0vJnbUaUUBZl3yclYCupitDlqASO1Kwn3BqJ1+R ibpMDNac0Uf7qT+hsLfzjjggV8kwH5MtNsk14bvVM7eNEFtj9AnG22F7rONw0kR4xedh7IE4yUB iLhTISTO/hL8i/aYfaQcQFurhA4k/Jiqhmwi1pT3ZpiGG1FzapeoJQo39JKSldXS1OvoQivVcGs = X-Google-Smtp-Source: AGHT+IEO/RxG9awda07Yx1ue/lcFte7OKURfpucGQExFxJovsNDXf/s4pc8IvzzDdj2hdaEk7rxJ4A== X-Received: by 2002:a05:6a20:c887:b0:1f5:8b9b:ab6a with SMTP id adf61e73a8af0-20bd6b4d8f5mr466232637.18.1746054396283; Wed, 30 Apr 2025 16:06:36 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 5/6] accel/tcg: Build tcg-all.c twice Date: Wed, 30 Apr 2025 16:06:30 -0700 Message-ID: <20250430230631.2571291-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250430230631.2571291-1-richard.henderson@linaro.org> References: <20250430230631.2571291-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::42d; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42d.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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1746054458034019100 Content-Type: text/plain; charset="utf-8" Remove some unused headers. Signed-off-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- accel/tcg/tcg-all.c | 6 +----- accel/tcg/meson.build | 4 +--- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/accel/tcg/tcg-all.c b/accel/tcg/tcg-all.c index 0ce34ac912..6e5dc333d5 100644 --- a/accel/tcg/tcg-all.c +++ b/accel/tcg/tcg-all.c @@ -36,15 +36,11 @@ #include "qapi/qapi-builtin-visit.h" #include "qemu/units.h" #include "qemu/target-info.h" -#if defined(CONFIG_USER_ONLY) -#include "hw/qdev-core.h" -#else +#ifndef CONFIG_USER_ONLY #include "hw/boards.h" -#include "system/tcg.h" #endif #include "accel/tcg/cpu-ops.h" #include "internal-common.h" -#include "cpu-param.h" =20 =20 struct TCGState { diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build index 7eb4619aea..d6bd304add 100644 --- a/accel/tcg/meson.build +++ b/accel/tcg/meson.build @@ -10,6 +10,7 @@ tcg_ss.add(files( 'tcg-runtime.c', 'tcg-runtime-gvec.c', 'tb-maint.c', + 'tcg-all.c', 'translate-all.c', 'translator.c', )) @@ -21,9 +22,6 @@ libuser_ss.add_all(tcg_ss) libsystem_ss.add_all(tcg_ss) =20 tcg_specific_ss =3D ss.source_set() -tcg_specific_ss.add(files( - 'tcg-all.c', -)) tcg_specific_ss.add(when: 'CONFIG_USER_ONLY', if_true: files('user-exec.c'= )) specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_specific_ss) =20 --=20 2.43.0 From nobody Sat Nov 15 22:35:16 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1746054489; cv=none; d=zohomail.com; s=zohoarc; b=ki3DybLHraAM+XeDcrQwVK9efLMYvwSEbG8hPjPzyJrqAjWHmNloZ3i/jT/JN1FNa9TUoDfMh3HN74F8AFFUwkakg+2pa5e7M6b0jUFKKVyuOGTs8aDC2jWwzLhIDVqmj63v1+NxUdkJHFKPz4yV8UPeRQuN/P6lVTO/Ir3dHcE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746054489; h=Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=LT3GsVAW+K3YxYOzK2RrjUaER8kwWH4wBwdfp6giJSE=; b=bXMJt+ON47YmN7zwro4Cz/GpT1Yr3GuLNlpD+c3jxmArfxUP159EQRgOEenLNxbJia4hagkqKiD/KOi5UPyeH5bnRDai4VdP9ZUFz7HHrSjRtDXEM/d3lf5XLa45LEVs+oOrStHq6V3xBrdsTkOV2X0+RljsATBoQVWtkan6Sxo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1746054489027266.9734333111036; Wed, 30 Apr 2025 16:08:09 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uAGW8-0001qj-9Z; Wed, 30 Apr 2025 19:07:04 -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 1uAGVl-0001l6-2y for qemu-devel@nongnu.org; Wed, 30 Apr 2025 19:06:41 -0400 Received: from mail-pf1-x432.google.com ([2607:f8b0: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 1uAGVi-0007Vb-B9 for qemu-devel@nongnu.org; Wed, 30 Apr 2025 19:06:40 -0400 Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-736c1138ae5so450078b3a.3 for ; Wed, 30 Apr 2025 16:06:37 -0700 (PDT) Received: from stoup.. (71-212-47-143.tukw.qwest.net. [71.212.47.143]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-74039a30e2fsm2323287b3a.103.2025.04.30.16.06.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Apr 2025 16:06:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746054397; x=1746659197; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=LT3GsVAW+K3YxYOzK2RrjUaER8kwWH4wBwdfp6giJSE=; b=WoiVWTznZNVzzj/X3wmz5+uuvk2DnecEhbfOHAdHfEBo8QFedM/7HihsTfxgw5LjTT Q3CTGrpsui7e1qKAa5WjYuyXR3OMc4FAK1G4eALo/vXr5nH0FDbUjlix13f3I5NzKihZ +6mds2qzlUcrwfbR+Sm1Dwy9tyc0CSy9T01NTNYPkr3TC2LN0PnbcGSjJ73jLwum1aKm wLA1se+iXYWhtirG1xp1UmgyCRbArke6Fy5pZ7YASxyiFZRr/WpY2gq0/mN9eANZI4D0 0ErW23LVGIqhHjU9xe1tJjb3BI9QKZRK3PRAzkbkZxOzjC/aKtFDvREj1u4gxhBVH71H RxLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746054397; x=1746659197; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LT3GsVAW+K3YxYOzK2RrjUaER8kwWH4wBwdfp6giJSE=; b=GCFa/uSsT5FWEtDeKOmTa+CFWcREcRVgYYGdUwVaLLH72R+AA7qDwsZoYkWud2X/J1 ohUhiqG38iHvygFep0go+n9N1aJksXx9IYiRfLIqj59e7aHjb4WYeNanlsuGOYMs9WjD 19/rhA5XILCT3/IRavWpUcS68S7EJIDo4O//onVPDljxsx2lXytWv6N9UxEtX0SJOMCS D6Xq/HBzufPBdlbzWAnOpUntRdHCJV9vpEGFRYRC5Gm46lidRrbl8+n/RqdjJNdLB2kN fApXqq7utuyC5idGsCGua6R+/fe/Wo/GQtwCGOn5u+uOio8lmBzF96ssPjfLdJlKhQ+0 waFg== X-Gm-Message-State: AOJu0YyJ8Jrmz6XmepJDbS0Jw/h/6IMa3FQpR3w9x2C3YqILZ93ETOs3 lhmK4rA1IgJXJ+8qRgNkNdxOgbo8cKmixdC/STez+rjLSZH4LmFBJk04QgiKTKLLRYuYC8dvFLl I X-Gm-Gg: ASbGnctqqRK4jU5GNIZSmV3QdygEwy+TWauM9EJwNa/wP0GMUPhNOvMrcG4chyhxS2P PT4ncvbPVFRYcOSMWm3TqvWqF6UggK7P6cXgqi8wMTvaHR7wMxDCItgoNWROkohtQSr/hdbvMQG u2b6Yd7f6bKJduoyizYolJoI3l53wOCGm+UNEWAEMyB6Y3fU0FL9ex1GcJXy/b34bpPnQhzulhF +LsQAa0w49lsvqc3UYyZ/OMuvTdEZaFzpHS3SOywYCH6QiaOghxcxRgFT4Hq8gXT3PEKAvztqkx AdMorufIHWjGC1i5QoA9ipz1QZlakCb68Ubq2tRRJEPZY1F38mbQL0pWVUnqcq1rV3i25opgOyx 8ENBq0uY7Bg== X-Google-Smtp-Source: AGHT+IEttPXf0c2cZtzi93xwm+WldaEXm2r5JHF3L+uImhCZYvLK/D7UdOGmnjJFoZCx+uGw7q0gOQ== X-Received: by 2002:a05:6a00:3a06:b0:736:5c8e:baaa with SMTP id d2e1a72fcca58-7403a75b4c4mr6766778b3a.2.1746054396900; Wed, 30 Apr 2025 16:06:36 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH 6/6] accel/tcg: Use vaddr in cpu_loop.h Date: Wed, 30 Apr 2025 16:06:31 -0700 Message-ID: <20250430230631.2571291-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250430230631.2571291-1-richard.henderson@linaro.org> References: <20250430230631.2571291-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::432; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1746054492907019100 Content-Type: text/plain; charset="utf-8" Use vaddr instead of abi_ptr or target_ulong for a guest address. Signed-off-by: Richard Henderson Reviewed-by: Pierrick Bouvier --- include/user/cpu_loop.h | 12 +++++------- accel/tcg/user-exec.c | 2 +- linux-user/signal.c | 4 ++-- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/include/user/cpu_loop.h b/include/user/cpu_loop.h index 589c66543f..ad8a1d711f 100644 --- a/include/user/cpu_loop.h +++ b/include/user/cpu_loop.h @@ -20,11 +20,9 @@ #ifndef USER_CPU_LOOP_H #define USER_CPU_LOOP_H =20 -#include "exec/abi_ptr.h" +#include "exec/vaddr.h" #include "exec/mmu-access-type.h" -#include "exec/log.h" -#include "exec/target_long.h" -#include "special-errno.h" + =20 /** * adjust_signal_pc: @@ -46,7 +44,7 @@ MMUAccessType adjust_signal_pc(uintptr_t *pc, bool is_wri= te); * Return true if the write fault has been handled, and should be re-tried. */ bool handle_sigsegv_accerr_write(CPUState *cpu, sigset_t *old_set, - uintptr_t host_pc, abi_ptr guest_addr); + uintptr_t host_pc, vaddr guest_addr); =20 /** * cpu_loop_exit_sigsegv: @@ -59,7 +57,7 @@ bool handle_sigsegv_accerr_write(CPUState *cpu, sigset_t = *old_set, * Use the TCGCPUOps hook to record cpu state, do guest operating system * specific things to raise SIGSEGV, and jump to the main cpu loop. */ -G_NORETURN void cpu_loop_exit_sigsegv(CPUState *cpu, target_ulong addr, +G_NORETURN void cpu_loop_exit_sigsegv(CPUState *cpu, vaddr addr, MMUAccessType access_type, bool maperr, uintptr_t ra); =20 @@ -73,7 +71,7 @@ G_NORETURN void cpu_loop_exit_sigsegv(CPUState *cpu, targ= et_ulong addr, * Use the TCGCPUOps hook to record cpu state, do guest operating system * specific things to raise SIGBUS, and jump to the main cpu loop. */ -G_NORETURN void cpu_loop_exit_sigbus(CPUState *cpu, target_ulong addr, +G_NORETURN void cpu_loop_exit_sigbus(CPUState *cpu, vaddr addr, MMUAccessType access_type, uintptr_t ra); =20 diff --git a/accel/tcg/user-exec.c b/accel/tcg/user-exec.c index 68e01fc584..e1f4c4eacf 100644 --- a/accel/tcg/user-exec.c +++ b/accel/tcg/user-exec.c @@ -126,7 +126,7 @@ MMUAccessType adjust_signal_pc(uintptr_t *pc, bool is_w= rite) * guest, we'd end up in an infinite loop of retrying the faulting access. */ bool handle_sigsegv_accerr_write(CPUState *cpu, sigset_t *old_set, - uintptr_t host_pc, abi_ptr guest_addr) + uintptr_t host_pc, vaddr guest_addr) { switch (page_unprotect(cpu, guest_addr, host_pc)) { case 0: diff --git a/linux-user/signal.c b/linux-user/signal.c index 4dafc2c3a2..cd0e7398aa 100644 --- a/linux-user/signal.c +++ b/linux-user/signal.c @@ -750,7 +750,7 @@ void force_sigsegv(int oldsig) } #endif =20 -void cpu_loop_exit_sigsegv(CPUState *cpu, target_ulong addr, +void cpu_loop_exit_sigsegv(CPUState *cpu, vaddr addr, MMUAccessType access_type, bool maperr, uintptr= _t ra) { const TCGCPUOps *tcg_ops =3D cpu->cc->tcg_ops; @@ -766,7 +766,7 @@ void cpu_loop_exit_sigsegv(CPUState *cpu, target_ulong = addr, cpu_loop_exit_restore(cpu, ra); } =20 -void cpu_loop_exit_sigbus(CPUState *cpu, target_ulong addr, +void cpu_loop_exit_sigbus(CPUState *cpu, vaddr addr, MMUAccessType access_type, uintptr_t ra) { const TCGCPUOps *tcg_ops =3D cpu->cc->tcg_ops; --=20 2.43.0