From patchwork Sat Sep 15 16:17:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 146786 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp1943263ljw; Sat, 15 Sep 2018 09:23:50 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZ2XtSIzJXBurGgM3lp0VopNzquuYxapmcuc/sI8b9XygO1b6bKdZmwz8afuxasd68KLm4P X-Received: by 2002:a37:6292:: with SMTP id w140-v6mr12285691qkb.258.1537028630513; Sat, 15 Sep 2018 09:23:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537028630; cv=none; d=google.com; s=arc-20160816; b=ciiuaEuirURPFPiCRZcWzQKDdgR4Gxih+zFW9X0VyJU4jXuc3gcqrk1HwMMBAyTkhY Z1cmZLEEeZDti9SzvJGawz0D8GDZid4YvThYCumXO9oH4/E6reaMfgMYs8rJYGEZMSzW rcRbJsXCUsPx41rCCkwltSYSXFifC8es3M4NFBbyBwLVl+g3PoK62I9kYS8LfSfPLAud fp5p8sq4xv++1UADLIDaUyzh8pZvEgKoRaBDvby1AxdDfYhaF3jOIc3GjgP4mkw5vKQr mhqRnzKbh2EW2WcqaBrkAn6p6q+nV3lGULcjrAy4NSE7qljrYy5oPXh9Xa0oxZS49wUj MhLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=k+TNqtjUjOGSK55CCIwBJa0g8BPa9U7tdVQTrJqAV3A=; b=0BKbT5V82II6DqJEWhlINXf5bT10yJNuKZRhdDjJBugLEg7jZJkeZzqMuud+oGrjmJ eKdJeCHP14f0cbaRsSYDbcJX8jl2sOUjjcpu3QCGn57wvb95UiB1JLUMCYt+f7nXmL6k fHfJ4vQA1ihFrak/VYTt7ldh1TsReENp0UudWKc054IFsaVhhMK0TyMrLOxLCQX088Ng 9p1zXfRRodODxagb2HF/Jv4gd5iy8va/HZemXWdwjlHlRsOn7Ku31PfbyQobcp5KkNj9 1o7dxtXEJHw0ef1ZnGKo+kSXjBpeU6zrD5GTNIyi6ojqm8XSUJ9a/80ojuM9WldfjJKg ONdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=cFBRopNE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id h35-v6si2805596qvi.283.2018.09.15.09.23.50 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 15 Sep 2018 09:23:50 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=cFBRopNE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:56124 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g1DMM-0001Y7-10 for patch@linaro.org; Sat, 15 Sep 2018 12:23:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60214) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g1DGd-0004Zv-W4 for qemu-devel@nongnu.org; Sat, 15 Sep 2018 12:17:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g1DGc-00043R-1c for qemu-devel@nongnu.org; Sat, 15 Sep 2018 12:17:55 -0400 Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]:43669) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g1DGb-00040p-4p for qemu-devel@nongnu.org; Sat, 15 Sep 2018 12:17:53 -0400 Received: by mail-pl1-x62c.google.com with SMTP id f66-v6so5523197plb.10 for ; Sat, 15 Sep 2018 09:17:53 -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=k+TNqtjUjOGSK55CCIwBJa0g8BPa9U7tdVQTrJqAV3A=; b=cFBRopNEZ0/35dSj2tylOXIiuAe/IORloKpns8/7dcTm67RLpfm9HIEBHf+LaCMusB jQGmbIqRHAN01h66xL8lC/kvQG+6S1aPBekLTmL3qAy00bMwHXjn3VrX6DR3FkPPoZpH JdKyqhvYD5Jeyzo9Tzq8qwZwcfg7LnL0zbDMM= 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=k+TNqtjUjOGSK55CCIwBJa0g8BPa9U7tdVQTrJqAV3A=; b=V9QvQlZyuETTf/0YZVmcA0PSPgNWXMbeyN3xP5cXzZUKeQ9zgSg+OWwX3MI8kCPsl5 5XMSANk9xnfZVD6rCLHO4CO7ENYl4M4AcQ2mKhyiOiNfGvbzxb/e2F5GzJC0h+UbUhNi icmKLDCQXcScbrjJCEyMVBSSaDwW9F4Ss0DV/fEcMU0zww/vj1FEdfHQ+o4LWIVCLQ5L qxke5o9e/P57iF7nwjKWJdxU4MP8Y2YNT7PKc3StYfsj5hCg3oLRRVpaSrYpUCTPiqB/ F6YcqBuNpvYTLZUBKePkWPST3jb/riqkivOEdRE9LdTjLDnv/HHyUYcNRULOA2l+R7Ru iDRA== X-Gm-Message-State: APzg51BoJRfkS5tb7DH3CLoWbJ334+BH8ZSASZpNz/Y1Ct1muXk/l4Gl yPd6TfPdkehH1LoTKrlckG91TcbS44M= X-Received: by 2002:a17:902:5a02:: with SMTP id q2-v6mr17487677pli.253.1537028271883; Sat, 15 Sep 2018 09:17:51 -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.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 15 Sep 2018 09:17:51 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 15 Sep 2018 09:17:33 -0700 Message-Id: <20180915161738.25257-9-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::62c Subject: [Qemu-devel] [PATCH 08/13] target/arm: Derive id_pfr0 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" ??? The assertion does fire for old cpus; they may be existing bugs. Signed-off-by: Richard Henderson --- target/arm/cpu.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) -- 2.17.1 diff --git a/target/arm/cpu.c b/target/arm/cpu.c index c227044946..0151c278e8 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -969,6 +969,29 @@ static uint32_t resolve_id_isar6(CPUARMState *env) return ret; } +static uint32_t resolve_id_pfr0(CPUARMState *env) +{ + uint32_t ret = 0; + + if (!arm_feature(env, ARM_FEATURE_M)) { + ret = deposit32(ret, 0, 4, 1); /* State0 -- A32 */ + } + if (arm_feature(env, ARM_FEATURE_THUMB2)) { + ret = deposit32(ret, 4, 4, 3); /* State1 -- T32 */ + } else if (arm_feature(env, ARM_FEATURE_V5)) { + ret = deposit32(ret, 4, 4, 1); /* State1 -- bl/blx only */ + } + if (arm_feature(env, ARM_FEATURE_JAZELLE)) { + ret = deposit32(ret, 8, 4, 1); /* State2 -- Jazelle */ + } + if (arm_feature(env, ARM_FEATURE_THUMB2EE)) { + ret = deposit32(ret, 12, 4, 1); /* State3 -- T32EE */ + } + /* RAS -- not implemented yet */ + + return ret; +} + static void resolve_id_regs(ARMCPU *cpu) { CPUARMState *env = &cpu->env; @@ -997,6 +1020,10 @@ static void resolve_id_regs(ARMCPU *cpu) cpu->id_isar5 = resolve_id_isar5(env); cpu->id_isar6 = resolve_id_isar6(env); + + orig = cpu->id_pfr0; + cpu->id_pfr0 = resolve_id_pfr0(env); + g_assert_cmphex(cpu->id_pfr0, ==, orig); } static void arm_cpu_realizefn(DeviceState *dev, Error **errp)