From patchwork Mon Jan 19 22:30:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Bellows X-Patchwork-Id: 430718 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7E9F5140119 for ; Tue, 20 Jan 2015 09:31:35 +1100 (AEDT) Received: from localhost ([::1]:40066 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDKr7-0004AZ-LS for incoming@patchwork.ozlabs.org; Mon, 19 Jan 2015 17:31:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57849) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDKqV-00038B-Ca for qemu-devel@nongnu.org; Mon, 19 Jan 2015 17:30:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YDKqQ-0003QU-Qb for qemu-devel@nongnu.org; Mon, 19 Jan 2015 17:30:55 -0500 Received: from mail-pd0-f182.google.com ([209.85.192.182]:49594) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YDKqQ-0003QP-Kq for qemu-devel@nongnu.org; Mon, 19 Jan 2015 17:30:50 -0500 Received: by mail-pd0-f182.google.com with SMTP id y10so27518580pdj.13 for ; Mon, 19 Jan 2015 14:30:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9hHVcgZU6o3ekOowKyVODv8h1CrT5P9RA4BMjYmP65o=; b=GuiX6XPD057OjkblLPADL464r/puTCu6BmGt5S2tF4Amuo0wRIjfZ5BqGTc2mD9luy Bch6AmWfVBGKbLmuUa2So6mV+5Zt0X1EQBzRBjxfU/lFyhbt3z+gjBKV5X77ql7nUUXI +DeVQ8K+44VCQFfZ0xWh0OHFZc50+P5cyklz7Ha8Gfu12auOjfmFyXsF7y+jVOEEMEjS JxU/HsSvDF8yJEanQ+HH3sRYxiG2G+4aReHNiiUzycu50XUkkG+DNGhk2pgOlLnKlsWO rGZPwZarN+foHo9aKaehF5MiuF2gzFcTJe5GplAg57ivk5BmIDb1LGKtHnHD4OzCP/IF dPyA== X-Gm-Message-State: ALoCoQmLHKbe1rD33phwoBFOiSYg2wNzc2azw8nYjY4H5uishwEZWpOHX8u16ELTM+OhiHAZ/3Tl X-Received: by 10.68.202.194 with SMTP id kk2mr47844676pbc.41.1421706649725; Mon, 19 Jan 2015 14:30:49 -0800 (PST) Received: from gbellows-linaro.qualcomm.com (rrcs-67-52-129-61.west.biz.rr.com. [67.52.129.61]) by mx.google.com with ESMTPSA id rl10sm985994pbb.67.2015.01.19.14.30.48 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 19 Jan 2015 14:30:48 -0800 (PST) From: Greg Bellows To: qemu-devel@nongnu.org, peter.maydell@linaro.org, christoffer.dall@linaro.org Date: Mon, 19 Jan 2015 16:30:17 -0600 Message-Id: <1421706621-23731-2-git-send-email-greg.bellows@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1421706621-23731-1-git-send-email-greg.bellows@linaro.org> References: <1421706621-23731-1-git-send-email-greg.bellows@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.192.182 Cc: Greg Bellows Subject: [Qemu-devel] [PATCH 1/5] target-arm: Add ARM CPU feature parsing X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Adds a CPU feature parsing function and assigns to the CPU class. The only feature added was "-aarch64" which disabled the AArch64 execution state on a 64-bit ARM CPU. Also adds stripping of features from CPU model string in acquiring the ARM CPU by name. Signed-off-by: Greg Bellows --- target-arm/cpu.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/target-arm/cpu.c b/target-arm/cpu.c index 285947f..f327dd7 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -514,13 +514,17 @@ static ObjectClass *arm_cpu_class_by_name(const char *cpu_model) { ObjectClass *oc; char *typename; + char *cpuname; if (!cpu_model) { return NULL; } - typename = g_strdup_printf("%s-" TYPE_ARM_CPU, cpu_model); + cpuname = g_strdup(cpu_model); + cpuname = strtok(cpuname, ","); + typename = g_strdup_printf("%s-" TYPE_ARM_CPU, cpuname); oc = object_class_by_name(typename); + g_free(cpuname); g_free(typename); if (!oc || !object_class_dynamic_cast(oc, TYPE_ARM_CPU) || object_class_is_abstract(oc)) { @@ -1163,6 +1167,44 @@ static Property arm_cpu_properties[] = { DEFINE_PROP_END_OF_LIST() }; +static void arm_cpu_parse_features(CPUState *cs, char *features, + Error **errp) +{ + ARMCPU *cpu = ARM_CPU(cs); + char *featurestr; + + featurestr = features ? strtok(features, ",") : NULL; + while (featurestr) { + if (featurestr[0] == '-') { + if (!strcmp(featurestr+1, "aarch64")) { + /* If AArch64 is disabled then we need to unset the feature */ + unset_feature(&cpu->env, ARM_FEATURE_AARCH64); + } else { + /* Everyting else is unsupported */ + error_setg(errp, "unsupported CPU property '%s'", + &featurestr[1]); + return; + } + } else if (featurestr[0] == '+') { + /* No '+' properties supported yet */ + error_setg(errp, "unsupported CPU property '%s'", + &featurestr[1]); + return; + } else if (g_strstr_len(featurestr, -1, "=")) { + /* No '=' properties supported yet */ + char *prop = strtok(featurestr, "="); + error_setg(errp, "unsupported CPU property '%s'", prop); + return; + } else { + /* Everything else is a bad format */ + error_setg(errp, "CPU property string '%s' not in format " + "(+feature|-feature|feature=xyz)", featurestr); + return; + } + featurestr = strtok(NULL, ","); + } +} + static void arm_cpu_class_init(ObjectClass *oc, void *data) { ARMCPUClass *acc = ARM_CPU_CLASS(oc); @@ -1183,6 +1225,7 @@ static void arm_cpu_class_init(ObjectClass *oc, void *data) cc->set_pc = arm_cpu_set_pc; cc->gdb_read_register = arm_cpu_gdb_read_register; cc->gdb_write_register = arm_cpu_gdb_write_register; + cc->parse_features = arm_cpu_parse_features; #ifdef CONFIG_USER_ONLY cc->handle_mmu_fault = arm_cpu_handle_mmu_fault; #else