From patchwork Sat Sep 15 16:17:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 146780 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp1938935ljw; Sat, 15 Sep 2018 09:18:22 -0700 (PDT) X-Google-Smtp-Source: ANB0VdaRcFGrKrguY8xP5DNwQrb0ymFjezVuge+3HwWU6ryhMUzYFheKLUogxzsjxSW44ri1UERY X-Received: by 2002:a0c:eac3:: with SMTP id y3-v6mr12253359qvp.89.1537028302717; Sat, 15 Sep 2018 09:18:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537028302; cv=none; d=google.com; s=arc-20160816; b=VAaQBTVZQ9dWMw45Vj3bjT3wj9w2m4+MJwxPeYN9T/ZGrL68CvG1sH0kaFVOvYZUP2 FLyo11u7twjYfDoVCacjrfIhI33A8OJSV9VqCafc6YNdlGiiFoPhJkAvORNv9LxDaJss TKxLMFirGKCIqf9uqtQgqvni11zRuw9jd/n2wQhszWrYuhetCw8ABrkGk4GXDONSstVH xt99MrB0BfY7bgLg5FMaEUp9gQUdY7Lp5u86+gm3CuKrv6ppHT6RUqeWQLw7lHGcqyHk gTvYxJcLepWvTmK2k/bvs8SGd2DxCwv74Q68JZjae7Wk1N6ggQiD5dNb/LUdRwfvTqDO oGjg== 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=KmfQb6CgWMOtHBBehbdrq8gACsfnGvLxYEnfidsiT6o=; b=cpBIE7yNgKIRopOejObfPlLeKRIaAnjS65XFYrwpMVsGgqCLC+3LdxHDbNcgAdZi4J 2wRVLEx5DS22HVZ9pv/iXPAddqEwj3RYP/3kNjTKsk1wAc4OY9vlH/dIZNAiiVYVyBKW rGESY6FaLd4FPOL5ZPI32NxFW36tD9kS/BFJCQzhyCGXNwypkoywgzRL3Ti/CNcCq2C5 fN2XAU/mLQvwcxSOyONiOgIvfGACh39u8OrdkvhvYTVYqqlZ6SC1d/k30VVhdptoR8P4 a4rHZnGdLGPFk4OFyzvGHCGKnpvpJqPWWj6c9Ih0ieygD4SSrOKx9Va1B/g5oxCMy5IA LrWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=cg0g8gFl; 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 p92-v6si903980qva.55.2018.09.15.09.18.22 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 15 Sep 2018 09:18:22 -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=cg0g8gFl; 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]:56093 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g1DH4-0004XL-42 for patch@linaro.org; Sat, 15 Sep 2018 12:18:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60153) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g1DGZ-0004VY-Ce 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-0003wi-1m for qemu-devel@nongnu.org; Sat, 15 Sep 2018 12:17:51 -0400 Received: from mail-pl1-x641.google.com ([2607:f8b0:4864:20::641]:41556) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g1DGW-0003tW-57 for qemu-devel@nongnu.org; Sat, 15 Sep 2018 12:17:48 -0400 Received: by mail-pl1-x641.google.com with SMTP id b12-v6so5519591plr.8 for ; Sat, 15 Sep 2018 09:17:46 -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=KmfQb6CgWMOtHBBehbdrq8gACsfnGvLxYEnfidsiT6o=; b=cg0g8gFlOrjr6KNZ7eUiku6rAXXSvXddrkKoiHb4Pvm3C7kkMS8Elq53sKYP2XGB52 HPXe2c7fcKerfa7uV64K89OHdiDX+AufvF3X8c6t/PyDGFEn3t7nQNwOg57h9Z+k0Vm4 WjlX+gyL2AxJpKsXkQ9rbCNudjiDKBgHjEOns= 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=KmfQb6CgWMOtHBBehbdrq8gACsfnGvLxYEnfidsiT6o=; b=j6QDBzPHMCpaimqdE5rUb5aIKmlX5hajStIv3pn6fd2xD1tO3+KJ1Du8xbNL6PPIoQ 70pyS3dprjACc72a1liyx/Wh2Rc5TPcPBnQgxWPR1vuyYtj/vFAKApHNI3ZD0xrUl0lx qKyDkiu3XLtGQgvyjUZXx/paiDVoWhtj5SMNiDre0TT3JP1MxaJPnwQ6+YFT9DkDIwrR i+MyuLqb9mF7NRpkZMzsVz35JEXUKE2fudKFaOPBYCK1c1bAW9k6OF3nCoLk6bu5CMwL fU5RJ7Gpn8YM78J9K4Nn5vMjjS21pNzUERlZ2TaOZ6XminnwcQtLnI89I1CThnuJUBp2 y12A== X-Gm-Message-State: APzg51C2whDbRBI2HxzMr69+DiCeIvDU/OtT4mRzgWpOcNxb3HNZA7GS dcZqZOoSelMrTBxKI9U1HcqSpZ4N3Rc= X-Received: by 2002:a17:902:14e:: with SMTP id 72-v6mr17237775plb.299.1537028265120; Sat, 15 Sep 2018 09:17:45 -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.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 15 Sep 2018 09:17:44 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 15 Sep 2018 09:17:28 -0700 Message-Id: <20180915161738.25257-4-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::641 Subject: [Qemu-devel] [PATCH 03/13] target/arm: Derive id_isar1 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 quite a lot of cpus, ??? but quite a few of them appear to be existing bugs. Signed-off-by: Richard Henderson --- target/arm/cpu.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 44483e3dea..a477e722af 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -791,13 +791,48 @@ static uint32_t resolve_id_isar0(CPUARMState *env, uint32_t orig) return ret; } +static uint32_t resolve_id_isar1(CPUARMState *env) +{ + uint32_t ret = 0; + + if (arm_feature(env, ARM_FEATURE_V6)) { + ret = deposit32(ret, 0, 4, 1); /* Endian */ + if (!arm_feature(env, ARM_FEATURE_M)) { + ret = deposit32(ret, 4, 4, 1); /* Except */ + ret = deposit32(ret, 8, 4, 1); /* Except_AR */ + } + /* Extend */ + ret = deposit32(ret, 12, 4, + arm_feature(env, ARM_FEATURE_THUMB_DSP) ? 2 : 1); + } + if (arm_feature(env, ARM_FEATURE_THUMB2)) { + ret = deposit32(ret, 16, 4, 1); /* IfThen */ + ret = deposit32(ret, 20, 4, 1); /* Immediate */ + } + /* Interwork -- note we don't support pre-armv4t. */ + ret = deposit32(ret, 24, 4, + arm_feature(env, ARM_FEATURE_V7) + && !arm_feature(env, ARM_FEATURE_M) ? 3 : + arm_feature(env, ARM_FEATURE_V5) ? 2 : 1); + if (arm_feature(env, ARM_FEATURE_JAZELLE)) { + ret = deposit32(ret, 28, 4, 1); /* Jazelle */ + } + + return ret; +} + static void resolve_id_regs(ARMCPU *cpu) { CPUARMState *env = &cpu->env; uint64_t orig; - cpu->id_isar0 = resolve_id_isar0(env, orig = cpu->id_isar0); + orig = cpu->id_isar0; + cpu->id_isar0 = resolve_id_isar0(env, orig); g_assert_cmphex(cpu->id_isar0, ==, orig); + + orig = cpu->id_isar1; + cpu->id_isar1 = resolve_id_isar1(env); + g_assert_cmphex(cpu->id_isar1, ==, orig); } static void arm_cpu_realizefn(DeviceState *dev, Error **errp)