From nobody Wed Nov 27 06:53:45 2024 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 ARC-Seal: i=1; a=rsa-sha256; t=1700765642; cv=none; d=zohomail.com; s=zohoarc; b=FDDYJ0zh5XVKMPhMAyZRYflCOEX6RlhSlwP0I9O3xwNrAD1SRqK+f03Ag8l2c1bz305LTHOXOCSt2qCYxika/ke/uNYPLSysaOKVhnHbbXdqybVt5p/Wp/aNSlAM9oenWCapFgqVc8dLdM1Q2355qxmg6q4dobUmGTln3ML4Knw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1700765642; 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=bA9SrnLTVc37f7jGZJNj8vJFWvRNsa04ovjAxVnaKYE=; b=SlM0RWsG931awy4HrU69s3oGq8WlRDwslUPpxy8w/u1gGIMcAgDZ7Grs0ZWHswK1UnFmUd78N9fMj/EM6B5LcOKRGYXur6/D7CwwGwCafU9PNyg/rLmY1RdJi3tQ4zGdXv5m28kIu44E7vBKDnikW5/xBZHTOKhd/tvjEj40+FQ= 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1700765642924300.7446546727109; Thu, 23 Nov 2023 10:54:02 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r6EoG-0000Cz-Oa; Thu, 23 Nov 2023 13:52:20 -0500 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 1r6EoD-0008OJ-0D for qemu-devel@nongnu.org; Thu, 23 Nov 2023 13:52:17 -0500 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r6EoB-0000DJ-0d for qemu-devel@nongnu.org; Thu, 23 Nov 2023 13:52:16 -0500 Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-6cbc8199a2aso957792b3a.1 for ; Thu, 23 Nov 2023 10:52:14 -0800 (PST) Received: from grind.. ([2804:7f0:bdcd:fb00:6501:2693:db52:c621]) by smtp.gmail.com with ESMTPSA id u4-20020a17090282c400b001bb1f0605b2sm1662638plz.214.2023.11.23.10.52.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 10:52:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1700765532; x=1701370332; 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=bA9SrnLTVc37f7jGZJNj8vJFWvRNsa04ovjAxVnaKYE=; b=BDSpf9YfsaBurnx1pZOzsaLuBREIiIiROyiPhPfHlS0AHNGHvmG+khZvUMSJFN+Ni5 tnsMHjyDPUJilhemNVxB1WxluD9EjU+NhD3rANNe2JQFARpJUEI+dNH4hyRXzE5fDM9N tb4Svwz6Lnr6nmZ3nwpfRdlrJfmaoBdYgOurGYbG4/hgV3EHjFV65vIEMqBpC5HoeVFC 5nQY9+gkYRHz2gfokCGHsIWSKG92tmXpYx4l1fQFI6xBJFI+c15Aeo/uFqYL1JbUVE7G YzZK168yy79YU3dGh1PvWASkXC5E/wJ/mGGjEwhi/8wF1TyBzOY1pYNIbiNTP8pvUfGW VRig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700765532; x=1701370332; 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=bA9SrnLTVc37f7jGZJNj8vJFWvRNsa04ovjAxVnaKYE=; b=CjE91KMWh8DDWy90I2b1oDcVF3nD96f3hWyP4mtr+XW5hVreLy9YwkjG5arSJw6G0t BrEdLQEogrczWTxKr8hZGFK6rDsXHu6P4UmuyZEgs3wmsukiW9grAcrxPCuzTVWxsbh6 2bgJaeo4DyYQ4vuXbrJmybDqk6xAU5XgLlAAMod6rhQD2+nB7mOqc841QW0PoApcM3cF PBoHuYW9bDEjMhvKniIzU2nAJvo68dOCEAZYSKZThspv4yB4AY7ZJZlcPxkljBePyPfJ 7Kqk8yEcaOGu0JO+/6lYKKoR6jvoJAMMCQXXX9ENeD44Sp3N/kztPXRA1xIxDd4K7V+p 8lUQ== X-Gm-Message-State: AOJu0YxAccws6yqYidrhWuP0AR51Z0y7LTiZKNDjDGTtqEuj/VVCVlul H9QmxGlV7xLgrYE+54ik1eJ6MpAxxuqlr5mTBg0= X-Google-Smtp-Source: AGHT+IETaMvUzgCJt+fNUrO0E/B+pZp1AoK1muFpU+gsh9Y4CB7vvRKSXRXr29N1kj6Xq90ZR09+0w== X-Received: by 2002:a05:6a20:549a:b0:187:2e65:9cc9 with SMTP id i26-20020a056a20549a00b001872e659cc9mr317939pzk.56.1700765532122; Thu, 23 Nov 2023 10:52:12 -0800 (PST) From: Daniel Henrique Barboza To: qemu-devel@nongnu.org Cc: qemu-riscv@nongnu.org, alistair.francis@wdc.com, bmeng@tinylab.org, liwei1518@gmail.com, zhiwei_liu@linux.alibaba.com, palmer@rivosinc.com, ajones@ventanamicro.com, Daniel Henrique Barboza Subject: [PATCH for-9.0 v11 14/18] target/riscv/tcg: add hash table insert helpers Date: Thu, 23 Nov 2023 15:51:18 -0300 Message-ID: <20231123185122.1100436-15-dbarboza@ventanamicro.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231123185122.1100436-1-dbarboza@ventanamicro.com> References: <20231123185122.1100436-1-dbarboza@ventanamicro.com> 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::430; envelope-from=dbarboza@ventanamicro.com; helo=mail-pf1-x430.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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 @ventanamicro.com) X-ZM-MESSAGEID: 1700765643828100014 Content-Type: text/plain; charset="utf-8" Previous patches added several g_hash_table_insert() patterns. Add two helpers, one for each user hash, to make the code cleaner. Signed-off-by: Daniel Henrique Barboza Reviewed-by: Andrew Jones --- target/riscv/tcg/tcg-cpu.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/target/riscv/tcg/tcg-cpu.c b/target/riscv/tcg/tcg-cpu.c index 092742c2b7..c248944f24 100644 --- a/target/riscv/tcg/tcg-cpu.c +++ b/target/riscv/tcg/tcg-cpu.c @@ -42,6 +42,18 @@ static bool cpu_cfg_ext_is_user_set(uint32_t ext_offset) GUINT_TO_POINTER(ext_offset)); } =20 +static void cpu_cfg_ext_add_user_opt(uint32_t ext_offset, bool value) +{ + g_hash_table_insert(multi_ext_user_opts, GUINT_TO_POINTER(ext_offset), + (gpointer)value); +} + +static void cpu_misa_ext_add_user_opt(uint32_t bit, bool value) +{ + g_hash_table_insert(misa_ext_user_opts, GUINT_TO_POINTER(bit), + (gpointer)value); +} + static void riscv_cpu_write_misa_bit(RISCVCPU *cpu, uint32_t bit, bool enabled) { @@ -822,9 +834,7 @@ static void cpu_set_misa_ext_cfg(Object *obj, Visitor *= v, const char *name, return; } =20 - g_hash_table_insert(misa_ext_user_opts, - GUINT_TO_POINTER(misa_bit), - (gpointer)value); + cpu_misa_ext_add_user_opt(misa_bit, value); =20 prev_val =3D env->misa_ext & misa_bit; =20 @@ -961,9 +971,7 @@ static void cpu_set_profile(Object *obj, Visitor *v, co= nst char *name, continue; } =20 - g_hash_table_insert(misa_ext_user_opts, - GUINT_TO_POINTER(bit), - (gpointer)value); + cpu_misa_ext_add_user_opt(bit, profile->enabled); riscv_cpu_write_misa_bit(cpu, bit, profile->enabled); } =20 @@ -978,9 +986,7 @@ static void cpu_set_profile(Object *obj, Visitor *v, co= nst char *name, cpu_validate_multi_ext_priv_ver(&cpu->env, ext_offset); } =20 - g_hash_table_insert(multi_ext_user_opts, - GUINT_TO_POINTER(ext_offset), - (gpointer)profile->enabled); + cpu_cfg_ext_add_user_opt(ext_offset, profile->enabled); isa_ext_update_enabled(cpu, ext_offset, profile->enabled); } } @@ -1043,9 +1049,7 @@ static void cpu_set_multi_ext_cfg(Object *obj, Visito= r *v, const char *name, multi_ext_cfg->name, lower); } =20 - g_hash_table_insert(multi_ext_user_opts, - GUINT_TO_POINTER(multi_ext_cfg->offset), - (gpointer)value); + cpu_cfg_ext_add_user_opt(multi_ext_cfg->offset, value); =20 prev_val =3D isa_ext_is_enabled(cpu, multi_ext_cfg->offset); =20 --=20 2.41.0