From patchwork Thu May 5 09:11:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 569948 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:66c4:0:0:0:0 with SMTP id x4csp637117mal; Thu, 5 May 2022 03:40:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy4ibTyByonj/JNqqviUE+/nn+kmDXn4G+bTMRqRkTZlXX5UF4RQRxSUlIfK/BzfGxoTWBO X-Received: by 2002:a05:622a:406:b0:2f3:4f4e:a75 with SMTP id n6-20020a05622a040600b002f34f4e0a75mr23350472qtx.495.1651747212195; Thu, 05 May 2022 03:40:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651747212; cv=none; d=google.com; s=arc-20160816; b=doGsbEv5uqFRq20voqDuh4IubN3Z1d8/s1rTEDQHQ3UCDHa5DbgpP1Xo0SrftiAa/0 EJbKrZ5bUIioqVEdvP86Fe05TFIPjt3SnEG/uwQLlH9g2yhcci/kq1FXohUzuNvzOdQr u/l7neaMzppJEYIJaKFsOAs8VFdKgxioMG2n/OF/6dR4Kw6fFRmD+jsJEeF8I4gXCCZq 8dU8Xci9qMQNXpqt+K0Xuis/5VJdbu7F0MoEn1GXNDRcvDKJq08B2uG68WYuKnPvyzjO PYzUj/SxyER6VTUw+FwmfTmJoD5FmQ6OmloNsS7Nr4KiQrtbK/pNNHf+VH73CnLi6tDn WyDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; 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=W8ytmsmn3zVtAhYPboUfBL7b0W6ZRe4BJqXc5Vj3xX4=; b=oGdT3yK5XFXxhBZE8e8p2YrNu4U9Iduucxzq7jXiWzelDmNVUArFj93xod+uVZVxdD +i1YtAkAGtGIbWYBxuQPmdeT1iXHsgJv9qTTKCsBjCoEccFelRzUCbLAiClO3uVQhNB0 Rko8egxgwiK8NrzRunuGTurDTvUCTUOyUFSMDfHXy8voLLFFKMbRhH4jK2iGUefXFkng riMYg8u7gDLDstPKbcR7SQYFJXY29ESG7DdJqQ4dVlGYXxDFCzK13PJhlYRXwmdsaD5j duSczDJcRXiAY7p0IRsYWf3ZDzKukeKkkHAufkC4Ej0ftI33pvcuwQToM4yh2bG2pGo8 +vVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zFiiWBkq; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d7-20020a056214184700b0045a8c637036si534834qvy.522.2022.05.05.03.40.12 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 May 2022 03:40:12 -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=zFiiWBkq; 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 Received: from localhost ([::1]:52412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nmYu3-0004J9-O5 for patch@linaro.org; Thu, 05 May 2022 06:40:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38758) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nmXWr-0005Gf-7D for qemu-devel@nongnu.org; Thu, 05 May 2022 05:12:09 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:35728) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nmXWp-0003Hq-0O for qemu-devel@nongnu.org; Thu, 05 May 2022 05:12:08 -0400 Received: by mail-wr1-x436.google.com with SMTP id j15so5248983wrb.2 for ; Thu, 05 May 2022 02:12:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=W8ytmsmn3zVtAhYPboUfBL7b0W6ZRe4BJqXc5Vj3xX4=; b=zFiiWBkq8fnF8dVkVi03MYDwdZlhu92NT2zZQ328Y9Z2MZfrRePJAaua42XgFsR1pX TLqiFYyvSF8NaZmo1DkZY+IbVSjuFypydvrxHeGQYUxrd5HO+q7CYwLpGwJVkBE5RmU6 xDzvhCHhV/ymIhyxR/MNuEahjj4TvO1sdlYX3YfaGLjQa0PP+MWtbzp5JEUM/VwKRJBV Px2fdcy7ANI4bIHQ2av5c+4iLn2Axqsz5+8j+/oMHlXjAy8TY42k16FigCx2S3zDA31Z GzZHM7r5J0XM/b02zgxXpW3CQH/bUuIXmmWttz7/tFnv34vQgqffFlcra+vA0kyW+ojm y1Dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=W8ytmsmn3zVtAhYPboUfBL7b0W6ZRe4BJqXc5Vj3xX4=; b=SzzkMANYobWaO6Ki6Kd51e7ayQNZ6hiRlzyaw008UH3lKH1DCi22gs40/pxZztf4ro /sakdTyI1sQh2rtaeQImBAXntc9DqnewWNPzZHoPbVlE1QhLGWd9IJZG0ygeXRZABe3m iaE9tI8wgtdDZ9euKLiMuUXTLev/vvvPqlk3tJrPx+2YIbDS02nVbE3YDgaf3IkqW9Z3 O+Guwjo8v6E4Ndfo/CT6mIHJubV8xT2aS36ZSiUSTDk5On8MjwymDT5iMfhgeoRPfMnM 6/EQ0FlcPwrJ1ks8BPZzvyvo5sqk1Khlm8MhhunPNs+AMt3YSKJU9slCJz7LNsn9jxo1 gSWg== X-Gm-Message-State: AOAM5319h7SnCcxqvoNDKLMPVltg4ln6wYU6uYwM+F7y8mZ4falxo9jP Lqcm9SfqaPeXgRAajKs6WhzjH/vzimmENw== X-Received: by 2002:a5d:5960:0:b0:20c:5a12:20ed with SMTP id e32-20020a5d5960000000b0020c5a1220edmr16943406wri.303.1651741926119; Thu, 05 May 2022 02:12:06 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id j14-20020adfe50e000000b0020c6a524fd5sm841612wrm.99.2022.05.05.02.12.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 May 2022 02:12:05 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 18/23] target/arm: Perform override check early in add_cpreg_to_hashtable Date: Thu, 5 May 2022 10:11:42 +0100 Message-Id: <20220505091147.2657652-19-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220505091147.2657652-1-peter.maydell@linaro.org> References: <20220505091147.2657652-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-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, T_SCC_BODY_TEXT_LINE=-0.01 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" From: Richard Henderson Perform the override check early, so that it is still done even when we decide to discard an unreachable cpreg. Use assert not printf+abort. Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell Message-id: 20220501055028.646596-18-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/helper.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 941b777dea9..fa1e7bd462c 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -8538,6 +8538,14 @@ static void add_cpreg_to_hashtable(ARMCPU *cpu, const ARMCPRegInfo *r, g_assert_not_reached(); } + /* Overriding of an existing definition must be explicitly requested. */ + if (!(r->type & ARM_CP_OVERRIDE)) { + const ARMCPRegInfo *oldreg = get_arm_cp_reginfo(cpu->cp_regs, key); + if (oldreg) { + assert(oldreg->type & ARM_CP_OVERRIDE); + } + } + /* Combine cpreg and name into one allocation. */ name_len = strlen(name) + 1; r2 = g_malloc(sizeof(*r2) + name_len); @@ -8622,20 +8630,6 @@ static void add_cpreg_to_hashtable(ARMCPU *cpu, const ARMCPRegInfo *r, assert(!raw_accessors_invalid(r2)); } - /* Overriding of an existing definition must be explicitly - * requested. - */ - if (!(r->type & ARM_CP_OVERRIDE)) { - const ARMCPRegInfo *oldreg = get_arm_cp_reginfo(cpu->cp_regs, key); - if (oldreg && !(oldreg->type & ARM_CP_OVERRIDE)) { - fprintf(stderr, "Register redefined: cp=%d %d bit " - "crn=%d crm=%d opc1=%d opc2=%d, " - "was %s, now %s\n", r2->cp, 32 + 32 * is64, - r2->crn, r2->crm, r2->opc1, r2->opc2, - oldreg->name, r2->name); - g_assert_not_reached(); - } - } g_hash_table_insert(cpu->cp_regs, (gpointer)(uintptr_t)key, r2); }