From nobody Fri Nov 7 09:09:01 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1537028753936517.9619629806541; Sat, 15 Sep 2018 09:25:53 -0700 (PDT) Received: from localhost ([::1]:56135 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g1DOK-0002p8-CQ for importer@patchew.org; Sat, 15 Sep 2018 12:25:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60281) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g1DGi-0004eU-9R for qemu-devel@nongnu.org; Sat, 15 Sep 2018 12:18:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g1DGh-0004AO-Kv for qemu-devel@nongnu.org; Sat, 15 Sep 2018 12:18:00 -0400 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]:44997) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g1DGh-000495-F4 for qemu-devel@nongnu.org; Sat, 15 Sep 2018 12:17:59 -0400 Received: by mail-pf1-x442.google.com with SMTP id k21-v6so5647300pff.11 for ; Sat, 15 Sep 2018 09:17:59 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-8-179.tukw.qwest.net. [97.113.8.179]) by smtp.gmail.com with ESMTPSA id k26-v6sm18648793pfb.167.2018.09.15.09.17.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 15 Sep 2018 09:17:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=X4EBL1pJUwLy43RkKPhPWRfdseJ9dJR7+HfbclZf6GE=; b=fY+nUk7euNgsLtHa6HQMXO9a+wTlclX94wVpsIOQSjCH85BfuQJfEcNpNduR/F7LUE 6SpeknHvHVYT177mYcLZoEI7rjwbb/3iFf1Ova3YiXj8GGUCkimZVkqEXk2ksibgBvCX 3jRhneVwEVzH3XNs1d4JzLnCKrjUx1+sb+VuM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=X4EBL1pJUwLy43RkKPhPWRfdseJ9dJR7+HfbclZf6GE=; b=G997DztWyq2faj+QZ/kWL8Lqi1t4H+OmRYzu/LgFXTnnavkbcZbhyOAFMJhyzI1hdq 8zYZDfkRViiuFDowJqv5164Jqlrv7W5og+EwPlPHiuKipFGGMApOA+oA3KZ4Q9uqeZ2l 7qeoY47B9hbouPyG6Zdr+h4k94X3ZAL4NeLX8KLcVaLTNQEfr1COPWQEgHN8w8OFLz2D fsn2f31rTIWrIFWMTHHtms74BLPybFGjcNQooNNA8WOJvuTnAYkq/0ndIOVfMKCJAqKe 51TbFgRMIQH6JII13kNsboQNZA8S2kXND4klk8DvJzyoxihPtfPndnGqLbBJcwKEVqHZ bfzg== X-Gm-Message-State: APzg51Aa/aIoYuw+53RynpsTcnupxmOgtT4o+7q/IxqoUkVwTdRUdirU 96+U+kOocskE6Wei32knvuIZ/sTYGX4= X-Google-Smtp-Source: ANB0VdYKqpc/0ymWgCzh951bbetfBWLi1gAVLs8ulSQbfeATAi2UIXCX5lxsfkdTLgngJ5qNps5xGA== X-Received: by 2002:a65:448a:: with SMTP id l10-v6mr16938909pgq.382.1537028278224; Sat, 15 Sep 2018 09:17:58 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 15 Sep 2018 09:17:38 -0700 Message-Id: <20180915161738.25257-14-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180915161738.25257-1-richard.henderson@linaro.org> References: <20180915161738.25257-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::442 Subject: [Qemu-devel] [PATCH 13/13] target/arm: Remove assertions from resolve_id_regs X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This is a prerequisite to removing the now-redundant initializations from within the individual cpus. Signed-off-by: Richard Henderson --- target/arm/cpu.c | 41 +++++++---------------------------------- 1 file changed, 7 insertions(+), 34 deletions(-) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 2ec71104c9..79103926a4 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -1108,49 +1108,22 @@ static uint64_t resolve_id_aa64pfr0(CPUARMState *en= v) static void resolve_id_regs(ARMCPU *cpu) { CPUARMState *env =3D &cpu->env; - uint64_t orig; =20 - orig =3D cpu->id_isar0; - cpu->id_isar0 =3D resolve_id_isar0(env, orig); - g_assert_cmphex(cpu->id_isar0, =3D=3D, orig); - - orig =3D cpu->id_isar1; + cpu->id_isar0 =3D resolve_id_isar0(env, cpu->id_isar0); cpu->id_isar1 =3D resolve_id_isar1(env); - g_assert_cmphex(cpu->id_isar1, =3D=3D, orig); - - orig =3D cpu->id_isar2; - cpu->id_isar2 =3D resolve_id_isar2(env, orig); - g_assert_cmphex(cpu->id_isar2, =3D=3D, orig); - - orig =3D cpu->id_isar3; + cpu->id_isar2 =3D resolve_id_isar2(env, cpu->id_isar2); cpu->id_isar3 =3D resolve_id_isar3(env); - g_assert_cmphex(cpu->id_isar3, =3D=3D, orig); - - orig =3D cpu->id_isar4; cpu->id_isar4 =3D resolve_id_isar4(env); - /* Willfully ignore the SWP_frac field. */ - g_assert_cmphex(cpu->id_isar4 & 0x0fffffff, =3D=3D, orig & 0x0fffffff); - cpu->id_isar5 =3D resolve_id_isar5(env); cpu->id_isar6 =3D resolve_id_isar6(env); - - orig =3D cpu->id_pfr0; cpu->id_pfr0 =3D resolve_id_pfr0(env); - g_assert_cmphex(cpu->id_pfr0, =3D=3D, orig); - - orig =3D cpu->id_pfr1; cpu->id_pfr1 =3D resolve_id_pfr1(env); - g_assert_cmphex(cpu->id_pfr1, =3D=3D, orig); =20 - orig =3D cpu->id_aa64isar0; - cpu->id_aa64isar0 =3D resolve_id_aa64isar0(env); - g_assert_cmphex(cpu->id_aa64isar0, =3D=3D, orig); - - cpu->id_aa64isar1 =3D resolve_id_aa64isar1(env); - - orig =3D cpu->id_aa64pfr0; - cpu->id_aa64pfr0 =3D resolve_id_aa64pfr0(env); - g_assert_cmphex(cpu->id_aa64pfr0, =3D=3D, orig); + if (arm_feature(env, ARM_FEATURE_AARCH64)) { + cpu->id_aa64isar0 =3D resolve_id_aa64isar0(env); + cpu->id_aa64isar1 =3D resolve_id_aa64isar1(env); + cpu->id_aa64pfr0 =3D resolve_id_aa64pfr0(env); + } } =20 static void arm_cpu_realizefn(DeviceState *dev, Error **errp) --=20 2.17.1