From nobody Sun Sep 28 17:04:11 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=1756256901; cv=none; d=zohomail.com; s=zohoarc; b=hf6+kYjo+XTDpKP9b3X/4lQbRw36ttP+RuG2v9I0+Xeo340nvIUXnR4doBKHHxhB3iokxcnPPXn9WUALs58qG78teWSYgvmSjazSgqaeX1it3RodnJWp7zF4iRjrgYTdxe6YmhRL4Iz4Kft60nFB7MdNpZER7dDi5sdl19WC1+g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756256901; 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=9aps/5dRSIQxJoI5rTRRJw0UjbyCrM2YzxlFedWAMQo=; b=X/AEpY/n7sAdLOdJBPmpUk2AWRLZ2/K39xndtAjdzxHakBQMITD/H0OerFa9jttzBmdul7CEc0kB/0oPI22pvnfstdWsNb2MiZO+sUgd6YTvfJafNM7vOvYZtHSoFL2+3wXxrN4aisvAEksNjVk/lpB8aQ4K9BOb4nHvE8b6bvo= 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 1756256901020363.3994612679387; Tue, 26 Aug 2025 18:08:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ur4cJ-0003qX-W8; Tue, 26 Aug 2025 21:06:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ur4bZ-0003l1-Qm for qemu-devel@nongnu.org; Tue, 26 Aug 2025 21:05:41 -0400 Received: from mail-pj1-x102a.google.com ([2607:f8b0:4864:20::102a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ur4bX-0007Hi-MA for qemu-devel@nongnu.org; Tue, 26 Aug 2025 21:05:37 -0400 Received: by mail-pj1-x102a.google.com with SMTP id 98e67ed59e1d1-32567465cddso2854346a91.0 for ; Tue, 26 Aug 2025 18:05:35 -0700 (PDT) Received: from stoup.. ([144.6.121.55]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7720274534esm1419241b3a.47.2025.08.26.18.05.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Aug 2025 18:05:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1756256734; x=1756861534; 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=9aps/5dRSIQxJoI5rTRRJw0UjbyCrM2YzxlFedWAMQo=; b=bE2b6rp97dc77zCnHTFKNDWNdDNlb2ZA3AbfAaPSOsatJKqE9V5SD+Qoxkc/Gkb2TS /OiNk/w983CM7vGun16PAF8MCoJ/7isTVh9vGr8sA4Ch6lvIB4gmFD4DPHmXMlZzLXpW Divj+sM3JdVsaGvzbhf4IbJfFGgQlTYZuMSFPuYQihM2ehnGHc1WaMqIKv0Dy5HXcyUY CKxkiIjA6le2srIpiXvuAwqYxKvqWP1463r9SiO0TXb0As9vAKWFP5+FpIV/L46cqQqt qijwhuXHKli62k0GTBMbAZl3R0HgQR+5svhEllflDkY6U3mRiqG8WPpRIbuegNHAVYkR STfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756256734; x=1756861534; 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=9aps/5dRSIQxJoI5rTRRJw0UjbyCrM2YzxlFedWAMQo=; b=V8vHnKv/fZaYpdX+vtEPzwJ9CNVNmhSSbH9laJLwP84+6FjXfA6KbTgrmBf2C9mACD vk0Mc9UxOR9bw90QqSkgKcK77NU/wrqUAvSuteEH0il1QAEsYymuOKe2VRxuAjRPMYMK Qy+Ny7qmZqYK/RBlRf6HZ6CMpZeamobnftEcc+vRkW+cBRlt6J0C9C48tivbm67vGuhd wR+Dv9QG+vG6sdsubiDoO8zXoYINBSWNlL7nAySFZkneJ7oudwCAZcgzgCIPXL3g3fR+ ChN9CiDmNRN7RzX5JqWNuXhyBiaGuCLd4eyYuqxY2b3+k5EW57yRrWUtbfsQaB5FebVC qRzg== X-Gm-Message-State: AOJu0YyT3PeoQBq7z12KGZ5iMkU8IR0WAFx7GTWqE/XxTNLyO8Xup4T3 WxRJtxwLZDwT1PQmLl18N1xGceTIkE9zqwtzY6u2cC6S4dtMAnwFHXjdrrEdGcuo0HBmXeOv5Yo yOkM1qwI= X-Gm-Gg: ASbGncsCl06S1H78oAc2lOhrH9sCxWkK4vH01+Ir5D8lx0kgudARxnjLtpVub+JEUdI qZ7DztYZIzlY7UZZ1+XMSZQJdPae0ljU3c7RrJEbub8ZSh3VEmALaeaMElsiASXkU0IE2rb3a/T ywOI7mQVwlUtbQRmN+NGXp2XkqZ+CjBl6sGtVPZIg8MhgS4XtycPNuKrWjIh9xiFPxxoVtPVl2X pTHd9U9QlBl9ZYp2aJU0zrccddSw1No/iTn9EAbu46kxdFmB4yJ33Im0g1NssWM3Okcok1byr2e M2tzGE+bR5f1hdOtVsjT6i0k00G+ajIvarWHXrYGGUYDhSRwtkQaP/EMRHtAI1vLwiHKf/FEHRP QjbpoVMm9vGqAyqGtbkzBPjqEhC4uBC4n4ReW X-Google-Smtp-Source: AGHT+IH90EsGhqOkJUhrZ8ZiuhrpO0NZDQQtod664p79QlxpnXbqAScPmseFRvmeKtfzDtn9Hv8wZA== X-Received: by 2002:a17:90b:57c4:b0:321:c37e:e325 with SMTP id 98e67ed59e1d1-32515ec8ce9mr24809462a91.12.1756256733852; Tue, 26 Aug 2025 18:05:33 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH 5/7] target/arm/hvf: Remove hvf_sreg_match.key Date: Wed, 27 Aug 2025 11:03:54 +1000 Message-ID: <20250827010453.4059782-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250827010453.4059782-1-richard.henderson@linaro.org> References: <20250827010453.4059782-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::102a; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102a.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: 1756256902444124100 Content-Type: text/plain; charset="utf-8" Use conversion functions instead of table lookup. Signed-off-by: Richard Henderson --- target/arm/hvf/hvf.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/target/arm/hvf/hvf.c b/target/arm/hvf/hvf.c index 2577dc1c0c..46e52e8d34 100644 --- a/target/arm/hvf/hvf.c +++ b/target/arm/hvf/hvf.c @@ -152,9 +152,6 @@ void hvf_arm_init_debug(void) g_array_sized_new(true, true, sizeof(HWWatchpoint), max_hw_wps); } =20 -#define HVF_SYSREG(crn, crm, op0, op1, op2) \ - ENCODE_AA64_CP_REG(CP_REG_ARM64_SYSREG_CP, crn, crm, op0, op1, op2) - #define SYSREG_OP0_SHIFT 20 #define SYSREG_OP0_MASK 0x3 #define SYSREG_OP0(sysreg) ((sysreg >> SYSREG_OP0_SHIFT) & SYSREG_OP0_M= ASK) @@ -399,7 +396,6 @@ static const struct hvf_reg_match hvf_fpreg_match[] =3D= { =20 struct hvf_sreg_match { int reg; - uint32_t key; uint32_t cp_idx; }; =20 @@ -423,8 +419,7 @@ struct hvf_sreg_match { =20 #undef DEF_SYSREG =20 -#define DEF_SYSREG(HVF_ID, crn, crm, op0, op1, op2) \ - { HVF_ID, HVF_SYSREG(crn, crm, op0, op1, op2) }, +#define DEF_SYSREG(HVF_ID, crn, crm, op0, op1, op2) { HVF_ID }, =20 static struct hvf_sreg_match hvf_sreg_match[] =3D { #include "sysreg.c.inc" @@ -469,13 +464,16 @@ int hvf_get_registers(CPUState *cpu) pstate_write(env, val); =20 for (i =3D 0; i < ARRAY_SIZE(hvf_sreg_match); i++) { + int hvf_id =3D hvf_sreg_match[i].reg; + uint64_t kvm_id =3D HVF_TO_KVMID(hvf_id); + if (hvf_sreg_match[i].cp_idx =3D=3D -1) { continue; } =20 if (cpu->accel->guest_debug_enabled) { /* Handle debug registers */ - switch (hvf_sreg_match[i].reg) { + switch (hvf_id) { case HV_SYS_REG_DBGBVR0_EL1: case HV_SYS_REG_DBGBCR0_EL1: case HV_SYS_REG_DBGWVR0_EL1: @@ -549,8 +547,10 @@ int hvf_get_registers(CPUState *cpu) * vCPU but simply keep the values from the previous * environment. */ - const ARMCPRegInfo *ri; - ri =3D get_arm_cp_reginfo(arm_cpu->cp_regs, hvf_sreg_match= [i].key); + uint32_t key =3D kvm_to_cpreg_id(kvm_id); + const ARMCPRegInfo *ri =3D + get_arm_cp_reginfo(arm_cpu->cp_regs, key); + val =3D read_raw_cp_reg(env, ri); =20 arm_cpu->cpreg_values[hvf_sreg_match[i].cp_idx] =3D val; @@ -559,7 +559,7 @@ int hvf_get_registers(CPUState *cpu) } } =20 - ret =3D hv_vcpu_get_sys_reg(cpu->accel->fd, hvf_sreg_match[i].reg,= &val); + ret =3D hv_vcpu_get_sys_reg(cpu->accel->fd, hvf_id, &val); assert_hvf_ok(ret); =20 arm_cpu->cpreg_values[hvf_sreg_match[i].cp_idx] =3D val; @@ -606,13 +606,15 @@ int hvf_put_registers(CPUState *cpu) =20 assert(write_cpustate_to_list(arm_cpu, false)); for (i =3D 0; i < ARRAY_SIZE(hvf_sreg_match); i++) { + int hvf_id =3D hvf_sreg_match[i].reg; + if (hvf_sreg_match[i].cp_idx =3D=3D -1) { continue; } =20 if (cpu->accel->guest_debug_enabled) { /* Handle debug registers */ - switch (hvf_sreg_match[i].reg) { + switch (hvf_id) { case HV_SYS_REG_DBGBVR0_EL1: case HV_SYS_REG_DBGBCR0_EL1: case HV_SYS_REG_DBGWVR0_EL1: @@ -687,7 +689,7 @@ int hvf_put_registers(CPUState *cpu) } =20 val =3D arm_cpu->cpreg_values[hvf_sreg_match[i].cp_idx]; - ret =3D hv_vcpu_set_sys_reg(cpu->accel->fd, hvf_sreg_match[i].reg,= val); + ret =3D hv_vcpu_set_sys_reg(cpu->accel->fd, hvf_id, val); assert_hvf_ok(ret); } =20 @@ -922,14 +924,15 @@ int hvf_arch_init_vcpu(CPUState *cpu) =20 /* Populate cp list for all known sysregs */ for (i =3D 0; i < sregs_match_len; i++) { - const ARMCPRegInfo *ri; - uint32_t key =3D hvf_sreg_match[i].key; + int hvf_id =3D hvf_sreg_match[i].reg; + uint64_t kvm_id =3D HVF_TO_KVMID(hvf_id); + uint32_t key =3D kvm_to_cpreg_id(kvm_id); + const ARMCPRegInfo *ri =3D get_arm_cp_reginfo(arm_cpu->cp_regs, ke= y); =20 - ri =3D get_arm_cp_reginfo(arm_cpu->cp_regs, key); if (ri) { assert(!(ri->type & ARM_CP_NO_RAW)); hvf_sreg_match[i].cp_idx =3D sregs_cnt; - arm_cpu->cpreg_indexes[sregs_cnt++] =3D cpreg_to_kvm_id(key); + arm_cpu->cpreg_indexes[sregs_cnt++] =3D kvm_id; } else { hvf_sreg_match[i].cp_idx =3D -1; } --=20 2.43.0