From patchwork Wed Apr 30 23:06:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 886086 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp56809wrq; Wed, 30 Apr 2025 16:07:52 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU7rD6lr8v3krI9VRL5BxlcelS79AcJJyUyT33tGOqdkiw6KeoU0xsuIQq8rzNTL50pUP13mA==@linaro.org X-Google-Smtp-Source: AGHT+IH2uzqSsAzkrOSO93Nvd818Tcl1czzHA3d3hwMOk9kymHOazaEttXh9E3eyjT1eyDrTCk9w X-Received: by 2002:a05:620a:2904:b0:7c5:afc9:5144 with SMTP id af79cd13be357-7cacedd153emr39042285a.23.1746054472209; Wed, 30 Apr 2025 16:07:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746054472; cv=none; d=google.com; s=arc-20240605; b=OragBWZQvB5WdQHkBhPiMq5vbyklrT8DB6ioBULEAh1n73hRT2tyygmgkqzEbQXZCe 2DgRiUSxdGCZo/SUURjFo7FbD9Kd3Qxwo+kqP7doN5PWYlHITBZXP8n91YRxGMje2Wwv W6UOv60gw2R/20h6TKIha92aPFPLMPa0Hf+1jue0VyFNC5vpfMXo3wnKJl0PeGmUD+tJ kUAgvg7mjIJT7i0FizJweJlK/oJNGS0P+FGBElA/KY1s89435CmRwOBn0vI6stliFl90 xQPuQekhJQb6xux0+rnkoXtDfuc2A2aHH5G7FPZ9qQdCYrftL0YPt2P0lf5sxU2IMMx6 586g== 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:to:from :dkim-signature; bh=j9UcL+UexAzaPG1SzS7Ey5EkrsDUspO+0mY3N19ns74=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=MB7YgUTxh6MsD98xirA89r0lbyDvbJNx4CimrfkZtXZjOKWinToSp2CujM9Ul56RzS abN2KBFknLyqvItPhEOHVp5BblvnUuUFFyBKISSwjdfpolAJs50eqmvi4w/FM7FnObJf PyNfu2Yih/XXu75gAwI/ZbIk3+0lb6mgQbL+tFTb11dep1SXYVrXUmppCI7cEmDN/7wv EVv491CHBJLKcNUwuryyrH/fpS0PCTuIQ3vidI8jMqqyuKqLLuAuThoslx0+QJEopQUd Xh59EbCFegb4QjtxrtXW/Fg3Moob/OahUHDNojKv9eH45G2d394aB5nMUyDm5d1tTHxD pQUQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=lb48uafW; 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-7cacdf55a9csi34248985a.561.2025.04.30.16.07.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Apr 2025 16:07:52 -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=lb48uafW; 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 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) 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-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) 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) 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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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 */ -#ifndef TARGET_INSN_START_WORDS +#ifndef TCG_INSN_START_WORDS +#define TCG_INSN_START_WORDS -#include "cpu-param.h" +#define INSN_START_WORDS 3 -# 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 #include "tcg/tcg-op-common.h" +#include "tcg/insn-start-words.h" #include "exec/target_long.h" #ifndef TARGET_LONG_BITS @@ -23,24 +24,34 @@ # error #endif +#if INSN_START_WORDS != 3 +# error Mismatch with insn-start-words.h +#endif + #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); + 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, 0); + tcg_set_insn_start_param(op, 2, 0); } #elif TARGET_INSN_START_EXTRA_WORDS == 1 static inline void tcg_gen_insn_start(target_ulong pc, target_ulong a1) { - TCGOp *op = tcg_emit_op(INDEX_op_insn_start, 2 * 64 / TCG_TARGET_REG_BITS); + 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, 0); } #elif TARGET_INSN_START_EXTRA_WORDS == 2 static inline void tcg_gen_insn_start(target_ulong pc, target_ulong a1, target_ulong a2) { - TCGOp *op = tcg_emit_op(INDEX_op_insn_start, 3 * 64 / TCG_TARGET_REG_BITS); + 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); 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) #define DATA64_ARGS (TCG_TARGET_REG_BITS == 64 ? 1 : 2) -/* 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) DEF(exit_tb, 0, 0, 1, TCG_OPF_BB_EXIT | TCG_OPF_BB_END | TCG_OPF_NOT_PRESENT) DEF(goto_tb, 0, 0, 1, TCG_OPF_BB_EXIT | TCG_OPF_BB_END | TCG_OPF_NOT_PRESENT) 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" /* 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; TCGRegSet reserved_regs; @@ -582,18 +582,19 @@ static inline TCGv_vec temp_tcgv_vec(TCGTemp *t) return (TCGv_vec)temp_tcgv_i32(t); } -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]; } -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] = v; } -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 == 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) } } -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, uint64_t v) { + tcg_debug_assert(arg < INSN_START_WORDS); if (TCG_TARGET_REG_BITS == 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. - 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 insn. @@ -140,13 +140,13 @@ static int encode_search(TranslationBlock *tb, uint8_t *block) 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]); @@ -178,7 +178,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; } @@ -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 = 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); @@ -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 = cpu_unwind_data_from_tb(tb, host_pc, data); if (insns_left < 0) { @@ -349,7 +349,6 @@ TranslationBlock *tb_gen_code(CPUState *cpu, TCGTBCPUState s) tcg_ctx->page_mask = TARGET_PAGE_MASK; tcg_ctx->tlb_dyn_max_bits = CPU_TLB_DYN_MAX_BITS; #endif - tcg_ctx->insn_start_words = TARGET_INSN_START_WORDS; tcg_ctx->guest_mo = cpu->cc->tcg_ops->guest_default_memory_order; restart_translate: @@ -457,7 +456,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu, TCGTBCPUState s) 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); @@ -470,7 +469,7 @@ TranslationBlock *tb_gen_code(CPUState *cpu, TCGTBCPUState s) 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; 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 = 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 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, target_ulong rd, { OpenRISCCPU *cpu = env_archcpu(env); #ifndef CONFIG_USER_ONLY - uint64_t data[TARGET_INSN_START_WORDS]; + uint64_t data[INSN_START_WORDS]; MachineState *ms = MACHINE(qdev_get_machine()); CPUState *cs = 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, TranslationBlock *tb, const void *start) { struct debuginfo_query *q; - size_t insn, start_words; + size_t insn; uint64_t *gen_insn_data; if (!perfmap && !jitdump) { @@ -329,11 +329,10 @@ void perf_report_code(uint64_t guest_pc, TranslationBlock *tb, /* Query debuginfo for each guest instruction. */ gen_insn_data = tcg_ctx->gen_insn_data; - start_words = tcg_ctx->insn_start_words; for (insn = 0; insn < tb->icount; insn++) { /* FIXME: This replicates the restore_state_to_opc() logic. */ - q[insn].address = gen_insn_data[insn * start_words + 0]; + q[insn].address = gen_insn_data[insn * INSN_START_WORDS + 0]; if (tb_cflags(tb) & CF_PCREL) { q[insn].address |= (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); tcg_debug_assert(s->addr_type <= TCG_TYPE_REG); - tcg_debug_assert(s->insn_start_words > 0); } static TCGTemp *tcg_temp_alloc(TCGContext *s) @@ -2943,7 +2942,7 @@ void tcg_dump_ops(TCGContext *s, FILE *f, bool have_prefs) nb_oargs = 0; col += ne_fprintf(f, "\n ----"); - for (i = 0, k = s->insn_start_words; i < k; ++i) { + for (i = 0, k = INSN_START_WORDS; i < k; ++i) { col += 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, const TCGLabelQemuLdst *ldst, int tcg_gen_code(TCGContext *s, TranslationBlock *tb, uint64_t pc_start) { - int i, start_words, num_insns; + int i, num_insns; TCGOp *op; 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 = NULL; - start_words = s->insn_start_words; s->gen_insn_data = - tcg_malloc(sizeof(uint64_t) * s->gen_tb->icount * start_words); + tcg_malloc(sizeof(uint64_t) * s->gen_tb->icount * INSN_START_WORDS); tcg_out_tb_start(s); @@ -6969,8 +6967,8 @@ int tcg_gen_code(TCGContext *s, TranslationBlock *tb, uint64_t pc_start) assert(s->gen_insn_end_off[num_insns] == off); } num_insns++; - for (i = 0; i < start_words; ++i) { - s->gen_insn_data[num_insns * start_words + i] = + for (i = 0; i < INSN_START_WORDS; ++i) { + s->gen_insn_data[num_insns * INSN_START_WORDS + i] = tcg_get_insn_start_param(op, i); } break; From patchwork Wed Apr 30 23:06:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 886082 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp56710wrq; Wed, 30 Apr 2025 16:07:37 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUbrJsY2CGg9B0x9IGyWLYjoJsGBvoKSJUec458pDsq0NGKTPUMSVdHHs6SZqu9CD3sjzJAWQ==@linaro.org X-Google-Smtp-Source: AGHT+IHrb/rX/6Nd+HyjJD0DVBcx/6bPE1qzAa4+NtxrwF+n8/2AqieqzLsfd43GHrle9O3pQDzO X-Received: by 2002:a05:6214:2684:b0:6e8:f6d2:e074 with SMTP id 6a1803df08f44-6f4fe0ff61emr83246466d6.28.1746054456893; Wed, 30 Apr 2025 16:07:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746054456; cv=none; d=google.com; s=arc-20240605; b=dliTbjH4asgUq/n6E0dKtbN4thv5imZqAjtaYrMVuOtWs8m4hDCvCeQL+cpYZAevRt QdnryBqa3gQa7nz55KlmP3AquUtTrNIoen8iM/VFjPrE5Ckjy1KZgTZEx7tHOwNHTyvo +xOdLIbgxool435amawHXm2+jMCt7LCVIGZ9ECeGGt2oZMJ/bguHKe/Si/Wz8BmCWQtw p5+2cW8TybJhi9sStgtHBMrUmoG2v8vC8nq4jVxhLooK9EIdLUcnJbR/qXq59o1bm7Ni x0rr3VzCUkMv2D5bMqu6pTti23JZ2dS9lHG62s/QdIlcD3vUQSKmzd0z1/ev/U2KQ/r5 gXXQ== 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=AYLcw77q0drDQnqkv5fH2XhRnVGB7EFd56psZWVXXSQ=; fh=ZjaPNYKUQmQtR6uATRX8FLXG2zWGBgyu8P/Wz1b3nXI=; b=L/dZ84NNMsb100yCmenBGDAjGoLq4jfCJ7JyzTIlCIHKun2hX3goW3RvEr/MUbMnLw TKm66f3vzpZfp+hLnm9srOPNVvcJd/oU/BB0JqljCFI0EW7OhNT5Ml54a3a+6OKLke9K z81UNuaNSAh9Oi7I6X6u/ynr6n8hIBvxbSVlpr4dE4GEQJ15F6lNUHFN01CIil1k/yLM C9hZZ6LaF7YabXyqBlYds/cfj1HMyQhXqUO7/HiHQtEkCVN7vvI3sDl6rHupgf0m5Js/ VmCprQEDGQrzBsquSxKW3+ZtgqrAKY55Zzv38+SROaNPyarXmu7JodSjj0PIH6fOlrbM kYEw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=UCcS70t4; 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-6f4fe833045si26141046d6.508.2025.04.30.16.07.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Apr 2025 16:07:36 -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=UCcS70t4; 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 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) 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-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) 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) 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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daudé --- 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 |= (int64_t)(byte & 0x7f) << shift; shift += 7; } while (byte & 0x80); - if (shift < TARGET_LONG_BITS && (byte & 0x40)) { + if (shift < 64 && (byte & 0x40)) { val |= -(int64_t)1 << shift; } From patchwork Wed Apr 30 23:06:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 886085 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp56743wrq; Wed, 30 Apr 2025 16:07:42 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVlo10Qd3QVoBlchnGSU53kycvrJ4DvuS9KA8tYDKuFJMdpR47poRkcf/WjzGPiokNqOo5IDg==@linaro.org X-Google-Smtp-Source: AGHT+IEAXtNJkQYFKvvuZMeJ6/V1U4k7x7kbkAU75wA4E3WnX+Zy0Qf83wTkCTqSttaTpqiEzlF4 X-Received: by 2002:a05:622a:480e:b0:476:9296:80a9 with SMTP id d75a77b69052e-48ae8003d63mr17814421cf.25.1746054462003; Wed, 30 Apr 2025 16:07:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746054461; cv=none; d=google.com; s=arc-20240605; b=DRcAmOif25Luszm1PofjnZS65iLfpq2DG0b/I/Mnvzvk7Nbh5hRs0HiRL/WRmmrGPJ mLO53eHF6boxenk2sfDVDYCsQS4Coimnqs3uobByMU7SH6t9jBoe6/veuTA0LZfD9ljd 9uf37inYB4vs9cg/efyals53my9Oc9wZx18hF4P9QxCBzIfOIJ3lzDYztkBdWztlNUNl 4L/nFJESgKI4NTVJwZtiL0H9oMDGCrC24afDQeTriAxycVfz+kCtdHSKHm3xZNRmEccr C+CuTQS5Ltz/q9RFRd1lbHMWh7PY0uKHt5g4ISIWgMJIC2kxFChK4JriPkaBH26DLGxF FCOA== 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:to:from :dkim-signature; bh=3WaB8ulU2dMi9YjFSsDNWzjp+rLier7nhupyaS/o3ZU=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=dPUSfSOqHGliFsm2ma7KiFQABEHNwMT3fGS3Y3Jc2c0+AE/DjhfQ2+K4hDtMSt6fdH PV7c2mCgltdUmgPz7yhBies3ekYHnsv3hhXRu5/zmKIhyNRyR0Phq2/fJPfJ76DAL8SU FbTltedFQeE+mShFAwDB6MmxsDdvumYJzoejN1+G03qKkF3fSvmsITTNT2Ud6LhVJyfE CzEh96JZnMTTlJJHSfDHfWIx+j1nv6KAww/7/0y7SDNXPXeks+szv1FDn0/hFoEchEgV 2Pkfy9sMzAYdBRTwifF8yfKrHOICdtsrnuFcTB8r1sI51O50LzWifXFdmFvOWdT2nFxJ EVRA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=A9dnc9a6; 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-6f4fe7bb73asi27712816d6.244.2025.04.30.16.07.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Apr 2025 16:07:41 -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=A9dnc9a6; 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 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) 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-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) 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) 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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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, TCGTBCPUState s) } tcg_ctx->gen_tb = tb; - tcg_ctx->addr_type = TARGET_LONG_BITS == 32 ? TCG_TYPE_I32 : TCG_TYPE_I64; + tcg_ctx->addr_type = target_long_bits() == 32 ? TCG_TYPE_I32 : TCG_TYPE_I64; #ifdef CONFIG_SOFTMMU tcg_ctx->page_bits = TARGET_PAGE_BITS; tcg_ctx->page_mask = TARGET_PAGE_MASK; From patchwork Wed Apr 30 23:06:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 886081 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp56708wrq; Wed, 30 Apr 2025 16:07:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWnJpPLoRp2K4glpuE3xjRzRLNigr9v6RLs3SCSEsJE7XOjyJ1WJ7ucaPXJc8m3/1DVN8ExRw==@linaro.org X-Google-Smtp-Source: AGHT+IFLiBvDWaz4P3STYIxccaAwFNw7YLaMdD7l0qOG6eLs4ooy2+U1YRn3lJ0l8cips8eTzPTr X-Received: by 2002:a05:622a:544e:b0:477:6f6d:533e with SMTP id d75a77b69052e-48b203938e0mr4753581cf.3.1746054456710; Wed, 30 Apr 2025 16:07:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746054456; cv=none; d=google.com; s=arc-20240605; b=KGO1JXksTlIp2/RTg9mz1YJKAOLDou3NRYnxmzedxvtqH/mlIIcw+mArH6k0Igm+I1 V6aN2SElpmcRMCE+QA+l0KV1EyfQL5lDtQ8eDly87SY9NCYpug1j1wJOimzdtNOjRz6E NdeVIMePBRU5q/f4jml1LvTGTS1ima2CQjSQ49kxAghGDmDh8LsZrWeJ5A+lnqycmthy xfcoUgZLfqhK81fdxbSMCwfx6Au/cuEaL1dSHiJ3oyp3v7pTHqCsRM56zHMIpUcdLmoe h0fSMgUOu68JecJf/huPMpWFx31zhQOtrIDHoRAD+Ku9Pua4LUuF/e1vC6rvRJ/Cc/s2 Intg== 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:to:from :dkim-signature; bh=JQMSsVL5Qlj5plf+juQAIXCjkfEY+x7lY+AAGxAAiXU=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=XwBen4VJG/2KnJ99lTmOodwMzdVOdqv6Wn7Pjjo7yu7RqBWTJ9+rugXA8iv17fAEFo XpBoAyM6dFfPgmu8SN1/6I9vCPjZwgkppMHKJbi9O9F6Ba347tn71EPyGNG8tEdVRwlr KsJG+2WMyuCV/kTrQ7tLd2fUoxgUZOxx9FDiDoE3cA92HBNraDdRO5H/eCmV7ZAsC3kK qXMFtKYfkMWeYkC+nd8rZzGp7jHYLLlq8p35ften3I1bJx53S+mlr/ezRZUUkh0KnAZx pskKOjsuiGg5kSUEnWFq3XxbrMzIMIIestihbESjP8z9Rsv7AUrnLjZjLRLeCwtwBYE+ 5VaQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nSec6mJt; 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-48b0906db14si3709201cf.562.2025.04.30.16.07.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Apr 2025 16:07:36 -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=nSec6mJt; 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 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) 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-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) 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) 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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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 >= 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" TBContext tb_ctx; 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 = 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) From patchwork Wed Apr 30 23:06:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 886083 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp56711wrq; Wed, 30 Apr 2025 16:07:37 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXrcZB7G59epP1bhPec9wTDe8usaCflcc5vPYr5WPHMMC4d+KK8vgY6FcSEcWVgf7iCREbj7w==@linaro.org X-Google-Smtp-Source: AGHT+IEWMo6Szr7FdNfphi77CnjQy0PbXO7ZQOlw4d75YLXPvAQoMNMwhc+PmNGErCHhDmpylG4P X-Received: by 2002:a05:6214:cc8:b0:6e8:fa72:be51 with SMTP id 6a1803df08f44-6f50a9155e2mr9860826d6.19.1746054456903; Wed, 30 Apr 2025 16:07:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746054456; cv=none; d=google.com; s=arc-20240605; b=lcz1FJ2bsSHh+Ob9IxNBZiKPhDFTk56uWaNADdx7B8qXhr31rlkgge/j3IPP4iTtuo 9eYgKX8B/WOBZWpmkAUfpYWSqXsH9aI0wc4YRtpLcHAmapz//Dq/bWAAK/boTRPyKTHz p3Ze/0YE6j6xlXA4LBSnjuHwttcSvbtYidhOXWhfCWN1zVJJqmaH7JsycRNuuIKUQkf4 vIiXOB9bigawGC42sUvS+HUmpY84yTL5qwC8JWr+CxlbDSnzHv7fKRzkcDNdx914L1Vw GK0yenFBQUVaz8vY4Z0BpplIWEFRag8EKweIRChgRYYvZ/kI3P5WUW9T9L5fmP/aafS8 tPbQ== 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:to:from :dkim-signature; bh=xMaU5nrZM5+S10tBG1u5byuDyb2bEX1pAEZKHt2spGs=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=SjzYl4vnA6RWT10KWnlo98F0WJ6rE5WIwzncdBCvYV7H7tJSsJIjsHiOZfa2t7cibY 5LQB3tSueUrQNLn191eGpOox0vbmntBUNgXWvNamx+j3X6e/Fm6TFeQPvCqv5KWRQ2Ou +mdbo4QMqslDdHvryikq14xwq4G0CeuGuNPtugRIIv7CoVB2p6/UPQba435EQUdZmVcK /bELm6YvmWZ78ANPEcFSyIoKQ9gGko+UveBivlHOEgV/pf4SRwRuWF6yGQgCsAlFGa/s 1FQEowNx1gFCvTMjJC9foEOF2MUOYcWkTDWJJ1R0mxWTmKyOCT0IJe3mDKr9JbRA/9bA giJA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Nmxhxib1; 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-6f4fe813a45si25929526d6.372.2025.04.30.16.07.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Apr 2025 16:07:36 -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=Nmxhxib1; 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 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) 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-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) 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) 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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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" 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) tcg_specific_ss = 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) From patchwork Wed Apr 30 23:06:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 886087 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp56917wrq; Wed, 30 Apr 2025 16:08:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXnYea6lCE0/Gpi4vJKjUsALSCuJn8kTtc4yhFvQCBJUl+gFDskRMvOMU2toUyjX+m3Vam0GA==@linaro.org X-Google-Smtp-Source: AGHT+IHbdqS5B+IyW7b3qZVllMpQGWdi9Wam790vlUXojfR+UP2tc9gUIaBanDaPc+B28d8XqQ+G X-Received: by 2002:a05:622a:4105:b0:476:8fcb:9aa3 with SMTP id d75a77b69052e-489e4a8c6dcmr83997111cf.13.1746054488775; Wed, 30 Apr 2025 16:08:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746054488; cv=none; d=google.com; s=arc-20240605; b=UKpQ7b79yDk8m65eQtub9DVa78hD49gnwdt7KhB0sfzG2iWcaNlatDHnEF+4+vo161 ez6HnpIQZagO1y0E1knPMt1pkkxLDLbM/pn2Sm2ekSkLqizi+Tsx4Eip3wwuSJSAAk0z EcLY3MG5mcgYIv7A5zOTCLLoXGBq83n3gaHK1tKqmHS5eZe+v4DA2ZXKZkKjTC1u1nRg rHRBjFvgfT7CvgaqyoERT8tQVKl74Laz8N6T041YvlqIc5Oe0QehrkS6WV78itCGIdm2 x6aKFI1svPn/W9kCdJXVQSqeFEvZdUQbXfW4gbY11aqVCCSIdfXbOOw0bov/fdztegwE 2V0A== 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:to:from :dkim-signature; bh=LT3GsVAW+K3YxYOzK2RrjUaER8kwWH4wBwdfp6giJSE=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=kI5gcSUNXb57skH0o0rLd3PLGTv/fpoCPtLk2mPJYWuBL5fE6sRxfQYD/56Ia+odX4 9fAuS9WXy3rlhKp0mOVYXGRSzdC6FqW57UZ3MWxUypC5ezvRmn1Qauu7Vwi5uvsBIhEn o6M59MKx8sr9TGaC/Qt+Z4dN1TAmotMC6MaVX7WOLmI4O2eUUQ8MxXn4ujtX7vjfYPs5 diy3CS3inLnN47YLNVRZR6m8NNOi0bNGKUt3ZWFwTr6YEsBWfO2hgkxICaSfSYC/n3Bw L9KV8zfuqtOlOtKeuXbXta4tkjHOkCdALaB+bb/EUhjIYiqT+OTdtOyW5V6lT5cIYiY3 bTWw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WoiVWTzn; 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-48b0661b484si3836561cf.13.2025.04.30.16.08.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 30 Apr 2025 16:08:08 -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=WoiVWTzn; 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 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) 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-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) 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) 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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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 -#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" + /** * adjust_signal_pc: @@ -46,7 +44,7 @@ MMUAccessType adjust_signal_pc(uintptr_t *pc, bool is_write); * 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); /** * 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); @@ -73,7 +71,7 @@ G_NORETURN void cpu_loop_exit_sigsegv(CPUState *cpu, target_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); 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_write) * 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 -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 = cpu->cc->tcg_ops; @@ -766,7 +766,7 @@ void cpu_loop_exit_sigsegv(CPUState *cpu, target_ulong addr, cpu_loop_exit_restore(cpu, ra); } -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 = cpu->cc->tcg_ops;