From nobody Sun Sep 28 17:07:44 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=1758033252; cv=none; d=zohomail.com; s=zohoarc; b=I2iSBueAq0DrLboa6uHwTtd+XqaBnM8JpVw7D2+kVhOWLfe2JO7iA4BKnlIsOeRUZFBgKhoPpTOvPL5UxrF0gPr83viRv+wtz10hdSUUVSOE0aT5A3e0hqXrq+jmc3SOe+YEi/rNTSF4lQyPcFr/sNSwrI76wLfJ257is6rUlXo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1758033252; 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=UIhMlSf7KJn7eRbwBzn/O5ACZwJPiK5MVS7jZdwVVVw=; b=Zs2pCTElhldj+1ktyK1C81UgBlQuRvXTvtXuQAK9qpKpCJyX1PpZCgx8Hq29S/we9eQYer/NEC3PbyiBLquKKkhv9J3dNMfFGad5WKjfAp+pSRlCFceXPmGgezBz22nZ/K3PqMHzdPHsXfD1NOqObKlF51PZ0JjJbrUnA8f5o4E= 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 175803325217814.832527326552281; Tue, 16 Sep 2025 07:34:12 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uyWas-0006Mt-5o; Tue, 16 Sep 2025 10:23:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uyWaL-0005o2-Qc for qemu-devel@nongnu.org; Tue, 16 Sep 2025 10:23:12 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uyWaC-0008MN-QO for qemu-devel@nongnu.org; Tue, 16 Sep 2025 10:23:06 -0400 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-2445826fd9dso65604325ad.3 for ; Tue, 16 Sep 2025 07:23:00 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2651d2df15esm73459905ad.45.2025.09.16.07.22.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Sep 2025 07:22:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1758032579; x=1758637379; 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=UIhMlSf7KJn7eRbwBzn/O5ACZwJPiK5MVS7jZdwVVVw=; b=v9jH6LPbj/XbN+c3m5f3wFzCcr5Tzgl7VZulHr1oxWhW4n9eiXUzTIb5n3sOec7lRG S/DgWTiW3DTh8F7va3OkJSQZ6PXcI7bzX2kxiIBQcgxb3ZCv+t5c+4v6QXHzU6X87e+k ouZripsyHyAg/uukcj9BkiWDkjkWZhgO8A7IL3hs/lGzHTHbhmb4TgjXEuhX3eCWzG54 pCAmqB/VXWXYPK42d1ywgbLwePVl1/3xUrF9H19dOOxxz3KfUUkxfve+G4eTFFe/RBpG f1aDpfVZaregoqpTDQloqhPrnW1VwiGLHIvn4JhM3GNUFSgS0BxCQikYzYVB2ZtRfy/O 7s+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758032579; x=1758637379; 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=UIhMlSf7KJn7eRbwBzn/O5ACZwJPiK5MVS7jZdwVVVw=; b=R/qLlW+i9oMlfOU1pS4Cw49IBHE8pSjATMycuzBFT/TAKnU0v20MvdoAl1usH+edKb ry7wMY92s8yOwv8CeYlwU+RQA/vS5IKQjYpRUfP+7xHPI0Tj4ayVMpfK2Wc3Iqth0zgC 5hIHeJHzXAPDOCUCdd8k0NbNNXoL2vEJHT9UTkH1uRBr669iVBH6u1q9PKb4MQvXKPbV OIDbRH9norqXhjHVHkr8Cux+5W+mUtRCGGzkoKq3qAZhnQm6+J0blcHLFGmOlAXuWZLo vhh4O4rB0kF71RH/sjnpL5QG8eyr1hOj3u7vC7oOjywHaRpeUBHOr94l2x1HQDFwYKVs RtaQ== X-Gm-Message-State: AOJu0Yytv5/gqWqc4EVaJm7+7sqWI1aIOn6ubcBJ3luTjd5nLruQl1by SdP2t6gewEMc5jHc7jeQp7ve5OxPlXjnNN/6ni7Xga101faci2GMxuq2MVFbUQnqO7KgZnDdXGt Krr6G X-Gm-Gg: ASbGncuNqvS3TWFT6DjvRU7SmYNebOR6FePRZYGFIoeRuWayM5HDk35g0Iz6+Uey+oZ F5S5gt/GQdcvtfAgzoyjLKfdRsWI1JXIPYexSbErYHlQ2grTGly381qQ9T8+toB4J+ZkmJamTUc aRZpbFtei00TS++4gsEBEZwpXSFbRWQd9riMNh3OdULpp7GIg4viikU4DRCUjpgKHnXWTAwju5X DqxsqHIr8FKUPdpwVwJGY/4oF+lRbSqKQKwfsyBLEgYNeZIObmmNQGUHbSGTFuJjnfhExMZ4rQR trCXpiX+bz91nFynmfCD1mDFJFmUO0Rs6RTCmkugGBKuJ1THcuGn4SmFUFjmdFNugOsQymb2amd 6nJ3AZ/6Kk70bb3iqg+WtI3v2L7Om X-Google-Smtp-Source: AGHT+IHzjU4+JGC8n0zdYlJI2SNOnIixnl8wWzV9ja29tNKh5/6zNe0CWnwn6Wk1edOqGef8h5tF/w== X-Received: by 2002:a17:903:478d:b0:264:8a8d:92dd with SMTP id d9443c01a7336-2648a8da428mr133264635ad.20.1758032578889; Tue, 16 Sep 2025 07:22:58 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, peter.maydell@linaro.org Subject: [PATCH v2 25/36] target/arm: Split out alloc_cpreg Date: Tue, 16 Sep 2025 07:22:26 -0700 Message-ID: <20250916142238.664316-26-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250916142238.664316-1-richard.henderson@linaro.org> References: <20250916142238.664316-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::636; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x636.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: 1758033254811116600 Content-Type: text/plain; charset="utf-8" Include provision for a name suffix. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- target/arm/helper.c | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index a5195e296d..7f55ea726d 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -7417,6 +7417,28 @@ void register_cp_regs_for_features(ARMCPU *cpu) #endif } =20 +/* + * Copy a ARMCPRegInfo structure, allocating it along with the name + * and an optional suffix to the name. + */ +static ARMCPRegInfo *alloc_cpreg(const ARMCPRegInfo *in, + const char *name, const char *suffix) +{ + size_t name_len =3D strlen(name); + size_t suff_len =3D suffix ? strlen(suffix) : 0; + ARMCPRegInfo *out =3D g_malloc(sizeof(*in) + name_len + suff_len + 1); + char *p =3D (char *)(out + 1); + + *out =3D *in; + out->name =3D p; + + memcpy(p, name, name_len + 1); + if (suffix) { + memcpy(p + name_len, suffix, suff_len + 1); + } + return out; +} + /* * Private utility function for define_one_arm_cp_reg(): * add a single reginfo struct to the hash table. @@ -7429,7 +7451,6 @@ static void add_cpreg_to_hashtable(ARMCPU *cpu, const= ARMCPRegInfo *r, CPUARMState *env =3D &cpu->env; ARMCPRegInfo *r2; bool ns =3D secstate & ARM_CP_SECSTATE_NS; - size_t name_len; =20 /* Overriding of an existing definition must be explicitly requested. = */ if (!(r->type & ARM_CP_OVERRIDE)) { @@ -7439,11 +7460,7 @@ static void add_cpreg_to_hashtable(ARMCPU *cpu, cons= t ARMCPRegInfo *r, } } =20 - /* Combine cpreg and name into one allocation. */ - name_len =3D strlen(name) + 1; - r2 =3D g_malloc(sizeof(*r2) + name_len); - *r2 =3D *r; - r2->name =3D memcpy(r2 + 1, name, name_len); + r2 =3D alloc_cpreg(r, name, NULL); =20 /* * Update fields to match the instantiation, overwiting wildcards --=20 2.43.0