From nobody Fri Nov 7 09:09:02 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1537028406593460.26793825397795; Sat, 15 Sep 2018 09:20:06 -0700 (PDT) Received: from localhost ([::1]:56097 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g1DIf-0005hS-MR for importer@patchew.org; Sat, 15 Sep 2018 12:20:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60158) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g1DGZ-0004Vc-ED for qemu-devel@nongnu.org; Sat, 15 Sep 2018 12:17:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g1DGY-0003xJ-Az for qemu-devel@nongnu.org; Sat, 15 Sep 2018 12:17:51 -0400 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]:39259) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g1DGY-0003w9-3h for qemu-devel@nongnu.org; Sat, 15 Sep 2018 12:17:50 -0400 Received: by mail-pl1-x62b.google.com with SMTP id w14-v6so5512224plp.6 for ; Sat, 15 Sep 2018 09:17:49 -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.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 15 Sep 2018 09:17:47 -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=tvi/mbA94iRKAk5mttQm6rCEMmYUp5dXIsY8p9CRUYY=; b=TYY+fSxtXBcctqHueHLhbfJ2zyiljNNxvf1aNcrRuZaFNdreBwyWROyTMU9Fr9Q/G8 ABByykeFGDGAJjwB6reowt/XxAe+1HclVNvhOuRR25IwvYxDEykqhvulHejpABIr+ta9 W2sb1gRqerxzY/h3SxInGp6ujtPtXgOAUPNf4= 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=tvi/mbA94iRKAk5mttQm6rCEMmYUp5dXIsY8p9CRUYY=; b=FXdYGhWzyuM37yIqkfXO+gSgn1bDRUotorcwNOwSrQ2UewVNrk0eP8lKo/cUE5gJon bxSQXlEvGtqiZvy0qr6O65SLbkvyTsYwykAL6/b6UWM3OSkmMJ/yZj/JxB7NdtO8cvjp LOJgPo9dqCg5l0tmRoEpdNkVbddgYstnEnAeobfWx51XutngvqVZfJkon6hboVl4xDfI 2+LMTTLRO3T54ZdecrfvUiyAFk7418IJxRJ0cOVCT7XJw7VB6UgywRqFmufbRHAklKXW KHp9VIzTLnMADXHbQD7UHi4/E50EhhakK78rH78huEezr33kBlzPPOnYdJKK4nrf5FCg cvZQ== X-Gm-Message-State: APzg51AoD6GcevWi6c55bqEZ+vjFEvFQLtBrMBJdpH2y7hSRf09Veyqw 8ncjTQlwg8kGkf3c4uRxth7p7wHAtvo= X-Google-Smtp-Source: ANB0VdbmWctPO1HumJvcHo5I9H8k/DuZp6YdfgVoo+/d9ZURJVluToVBv5n7RBC+zQo9Fq7DO1x4qQ== X-Received: by 2002:a17:902:59ce:: with SMTP id d14-v6mr17330308plj.42.1537028267905; Sat, 15 Sep 2018 09:17:47 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 15 Sep 2018 09:17:30 -0700 Message-Id: <20180915161738.25257-6-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::62b Subject: [Qemu-devel] [PATCH 05/13] target/arm: Derive id_isar3 from features 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" ??? The assertion does fire for the old cpus; they may be existing bugs. Signed-off-by: Richard Henderson --- target/arm/cpu.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 379d6a08a4..2b199845fc 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -855,6 +855,38 @@ static uint32_t resolve_id_isar2(CPUARMState *env, uin= t32_t orig) return ret; } =20 +static uint32_t resolve_id_isar3(CPUARMState *env) +{ + uint32_t ret =3D 0; + + if (arm_feature(env, ARM_FEATURE_V5)) { + ret =3D deposit32(ret, 0, 4, 1); /* Saturate */ + } + if (arm_feature(env, ARM_FEATURE_V6)) { + ret =3D deposit32(ret, 4, 4, 3); /* SIMD */ + } + ret =3D deposit32(ret, 8, 4, 1); /* SVC -- no pre-armv4= t */ + /* SynchPrim */ + if (arm_feature(env, ARM_FEATURE_V6K)) { + ret =3D deposit32(ret, 12, 4, 2); /* ldrex, ldrexb, ldre= xd */ + } else if (arm_feature(env, ARM_FEATURE_V6)) { + ret =3D deposit32(ret, 12, 4, 1); /* ldrex only */ + } + if (arm_feature(env, ARM_FEATURE_THUMB2)) { + ret =3D deposit32(ret, 16, 4, 1); /* TabBranch */ + ret =3D deposit32(ret, 20, 4, 1); /* T32Copy */ + } + if (arm_feature(env, ARM_FEATURE_THUMB2) || + arm_feature(env, ARM_FEATURE_V6K)) { + ret =3D deposit32(ret, 24, 4, 1); /* TrueNOP */ + } + if (arm_feature(env, ARM_FEATURE_THUMB2EE)) { + ret =3D deposit32(ret, 28, 4, 1); /* T32EE */ + } + + return ret; +} + static void resolve_id_regs(ARMCPU *cpu) { CPUARMState *env =3D &cpu->env; @@ -871,6 +903,10 @@ static void resolve_id_regs(ARMCPU *cpu) 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_isar3 =3D resolve_id_isar3(env); + g_assert_cmphex(cpu->id_isar3, =3D=3D, orig); } =20 static void arm_cpu_realizefn(DeviceState *dev, Error **errp) --=20 2.17.1