From nobody Mon Feb 9 05:41:58 2026 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; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1500041002540663.4827496349324; Fri, 14 Jul 2017 07:03:22 -0700 (PDT) Received: from localhost ([::1]:38171 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dW1Bc-0003T5-Tq for importer@patchew.org; Fri, 14 Jul 2017 10:03:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41311) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dW11w-0001lG-LL for qemu-devel@nongnu.org; Fri, 14 Jul 2017 09:53:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dW11v-0001ag-6m for qemu-devel@nongnu.org; Fri, 14 Jul 2017 09:53:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35480) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dW11u-0001aJ-U5 for qemu-devel@nongnu.org; Fri, 14 Jul 2017 09:53:15 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C16C1C0587E7; Fri, 14 Jul 2017 13:53:13 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.34.112.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8483F6062B; Fri, 14 Jul 2017 13:53:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com C16C1C0587E7 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=imammedo@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com C16C1C0587E7 From: Igor Mammedov To: qemu-devel@nongnu.org Date: Fri, 14 Jul 2017 15:52:00 +0200 Message-Id: <1500040339-119465-10-git-send-email-imammedo@redhat.com> In-Reply-To: <1500040339-119465-1-git-send-email-imammedo@redhat.com> References: <1500040339-119465-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 14 Jul 2017 13:53:14 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 09/28] sparc: replace custom cpu feature parsing with cpu_legacy_parse_featurestr() 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 , Eduardo Habkost , Riku Voipio , Mark Cave-Ayland , Laurent Vivier , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Artyom Tarasenko Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" with features converted to properties we can reuse shared with x86 cpu_legacy_parse_featurestr() for features parsing and drop legacy parser that manipulated CPU directly. With that in place and sparc_cpu_parse_features() providing generic CPUClass::parse_features callback, the cpu_sparc_init() will do the same job as cpu_generic_init() so replace content of cpu_sparc_init() with it. Signed-off-by: Igor Mammedov --- CC: Riku Voipio CC: Laurent Vivier CC: Mark Cave-Ayland CC: Artyom Tarasenko --- default-configs/sparc-bsd-user.mak | 1 + default-configs/sparc-linux-user.mak | 1 + default-configs/sparc-softmmu.mak | 1 + default-configs/sparc32plus-linux-user.mak | 1 + default-configs/sparc64-bsd-user.mak | 1 + default-configs/sparc64-linux-user.mak | 1 + default-configs/sparc64-softmmu.mak | 1 + target/sparc/cpu.c | 160 ++++---------------------= ---- 8 files changed, 27 insertions(+), 140 deletions(-) diff --git a/default-configs/sparc-bsd-user.mak b/default-configs/sparc-bsd= -user.mak index 21e0950..caea9ea 100644 --- a/default-configs/sparc-bsd-user.mak +++ b/default-configs/sparc-bsd-user.mak @@ -1 +1,2 @@ # Default configuration for sparc-bsd-user +CONFIG_LEGACY_CPU_FEATURES=3Dy diff --git a/default-configs/sparc-linux-user.mak b/default-configs/sparc-l= inux-user.mak index 9c716d1..0f23504 100644 --- a/default-configs/sparc-linux-user.mak +++ b/default-configs/sparc-linux-user.mak @@ -1 +1,2 @@ # Default configuration for sparc-linux-user +CONFIG_LEGACY_CPU_FEATURES=3Dy diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-soft= mmu.mak index 004b0f4..d8fa9fd 100644 --- a/default-configs/sparc-softmmu.mak +++ b/default-configs/sparc-softmmu.mak @@ -18,3 +18,4 @@ CONFIG_GRLIB=3Dy CONFIG_STP2000=3Dy CONFIG_ECCMEMCTL=3Dy CONFIG_SUN4M=3Dy +CONFIG_LEGACY_CPU_FEATURES=3Dy diff --git a/default-configs/sparc32plus-linux-user.mak b/default-configs/s= parc32plus-linux-user.mak index 432e880..e3cc16b 100644 --- a/default-configs/sparc32plus-linux-user.mak +++ b/default-configs/sparc32plus-linux-user.mak @@ -1 +1,2 @@ # Default configuration for sparc32plus-linux-user +CONFIG_LEGACY_CPU_FEATURES=3Dy diff --git a/default-configs/sparc64-bsd-user.mak b/default-configs/sparc64= -bsd-user.mak index b8b9eea..25bfa1f 100644 --- a/default-configs/sparc64-bsd-user.mak +++ b/default-configs/sparc64-bsd-user.mak @@ -1 +1,2 @@ # Default configuration for sparc64-bsd-user +CONFIG_LEGACY_CPU_FEATURES=3Dy diff --git a/default-configs/sparc64-linux-user.mak b/default-configs/sparc= 64-linux-user.mak index bf1bdd6..7c8a9f0 100644 --- a/default-configs/sparc64-linux-user.mak +++ b/default-configs/sparc64-linux-user.mak @@ -1 +1,2 @@ # Default configuration for sparc64-linux-user +CONFIG_LEGACY_CPU_FEATURES=3Dy diff --git a/default-configs/sparc64-softmmu.mak b/default-configs/sparc64-= softmmu.mak index d07876a..658546a 100644 --- a/default-configs/sparc64-softmmu.mak +++ b/default-configs/sparc64-softmmu.mak @@ -16,3 +16,4 @@ CONFIG_MC146818RTC=3Dy CONFIG_ISA_TESTDEV=3Dy CONFIG_EMPTY_SLOT=3Dy CONFIG_SUN4V_RTC=3Dy +CONFIG_LEGACY_CPU_FEATURES=3Dy diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index cb13540..1271b7f 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -104,51 +104,23 @@ static void cpu_sparc_disas_set_info(CPUState *cpu, d= isassemble_info *info) #endif } =20 -static void sparc_cpu_parse_features(CPUState *cs, char *features, - Error **errp); +/* Compatibily hack to maintain legacy +-feat semantic, + * where +-feat overwrites any feature set by + * feat=3Don|feat even if the later is parsed after +-feat + * (i.e. "-float,float=3Don" will result in "float" disabled) + */ +static GList *plus_features, *minus_features; =20 -static int cpu_sparc_register(SPARCCPU *cpu, const char *cpu_model) +static void sparc_cpu_parse_features(const char *typename, char *features, + Error **errp) { - char *s =3D g_strdup(cpu_model); - char *featurestr =3D strtok(s, ","); - Error *err =3D NULL; - - featurestr =3D strtok(NULL, ","); - sparc_cpu_parse_features(CPU(cpu), featurestr, &err); - g_free(s); - if (err) { - error_report_err(err); - return -1; - } - - return 0; + cpu_legacy_parse_featurestr(typename, features, + &plus_features, &minus_features, errp); } =20 SPARCCPU *cpu_sparc_init(const char *cpu_model) { - SPARCCPU *cpu; - ObjectClass *oc; - char *str, *name; - - str =3D g_strdup(cpu_model); - name =3D strtok(str, ","); - oc =3D cpu_class_by_name(TYPE_SPARC_CPU, name); - if (oc =3D=3D NULL) { - g_free(str); - return NULL; - } - g_free(str); - - cpu =3D SPARC_CPU(object_new(object_class_get_name(oc))); - - if (cpu_sparc_register(cpu, cpu_model) < 0) { - object_unref(OBJECT(cpu)); - return NULL; - } - - object_property_set_bool(OBJECT(cpu), true, "realized", NULL); - - return cpu; + return SPARC_CPU(cpu_generic_init(TYPE_SPARC_CPU, cpu_model)); } =20 void cpu_sparc_set_id(CPUSPARCState *env, unsigned int cpu) @@ -529,107 +501,6 @@ static void print_features(FILE *f, fprintf_function = cpu_fprintf, } } =20 -static void add_flagname_to_bitmaps(const char *flagname, uint32_t *featur= es) -{ - unsigned int i; - - for (i =3D 0; i < ARRAY_SIZE(feature_name); i++) { - if (feature_name[i] && !strcmp(flagname, feature_name[i])) { - *features |=3D 1 << i; - return; - } - } - error_report("CPU feature %s not found", flagname); -} - -static void sparc_cpu_parse_features(CPUState *cs, char *features, - Error **errp) -{ - SPARCCPU *cpu =3D SPARC_CPU(cs); - sparc_def_t *cpu_def =3D &cpu->env.def; - char *featurestr; - uint32_t plus_features =3D 0; - uint32_t minus_features =3D 0; - uint64_t iu_version; - uint32_t fpu_version, mmu_version, nwindows; - - featurestr =3D features ? strtok(features, ",") : NULL; - while (featurestr) { - char *val; - - if (featurestr[0] =3D=3D '+') { - add_flagname_to_bitmaps(featurestr + 1, &plus_features); - } else if (featurestr[0] =3D=3D '-') { - add_flagname_to_bitmaps(featurestr + 1, &minus_features); - } else if ((val =3D strchr(featurestr, '=3D'))) { - *val =3D 0; val++; - if (!strcmp(featurestr, "iu_version")) { - char *err; - - iu_version =3D strtoll(val, &err, 0); - if (!*val || *err) { - error_setg(errp, "bad numerical value %s", val); - return; - } - cpu_def->iu_version =3D iu_version; -#ifdef DEBUG_FEATURES - fprintf(stderr, "iu_version %" PRIx64 "\n", iu_version); -#endif - } else if (!strcmp(featurestr, "fpu_version")) { - char *err; - - fpu_version =3D strtol(val, &err, 0); - if (!*val || *err) { - error_setg(errp, "bad numerical value %s", val); - return; - } - cpu_def->fpu_version =3D fpu_version; -#ifdef DEBUG_FEATURES - fprintf(stderr, "fpu_version %x\n", fpu_version); -#endif - } else if (!strcmp(featurestr, "mmu_version")) { - char *err; - - mmu_version =3D strtol(val, &err, 0); - if (!*val || *err) { - error_setg(errp, "bad numerical value %s", val); - return; - } - cpu_def->mmu_version =3D mmu_version; -#ifdef DEBUG_FEATURES - fprintf(stderr, "mmu_version %x\n", mmu_version); -#endif - } else if (!strcmp(featurestr, "nwindows")) { - char *err; - - nwindows =3D strtol(val, &err, 0); - if (!*val || *err || nwindows > MAX_NWINDOWS || - nwindows < MIN_NWINDOWS) { - error_setg(errp, "bad numerical value %s", val); - return; - } - cpu_def->nwindows =3D nwindows; -#ifdef DEBUG_FEATURES - fprintf(stderr, "nwindows %d\n", nwindows); -#endif - } else { - error_setg(errp, "unrecognized feature %s", featurestr); - return; - } - } else { - error_setg(errp, "feature string `%s' not in format " - "(+feature|-feature|feature=3Dxyz)", features= tr); - return; - } - featurestr =3D strtok(NULL, ","); - } - cpu_def->features |=3D plus_features; - cpu_def->features &=3D ~minus_features; -#ifdef DEBUG_FEATURES - print_features(stderr, fprintf, cpu_def->features, NULL); -#endif -} - void sparc_cpu_list(FILE *f, fprintf_function cpu_fprintf) { unsigned int i; @@ -806,6 +677,14 @@ static void sparc_cpu_realizefn(DeviceState *dev, Erro= r **errp) SPARCCPU *cpu =3D SPARC_CPU(dev); CPUSPARCState *env =3D &cpu->env; =20 + if (cpu_legacy_apply_features(OBJECT(cpu), plus_features, true, errp))= { + return; + } + + if (cpu_legacy_apply_features(OBJECT(cpu), minus_features, false, errp= )) { + return; + } + #if defined(CONFIG_USER_ONLY) if ((env->def.features & CPU_FEATURE_FLOAT)) { env->def.features |=3D CPU_FEATURE_FLOAT128; @@ -932,6 +811,7 @@ static void sparc_cpu_class_init(ObjectClass *oc, void = *data) cc->reset =3D sparc_cpu_reset; =20 cc->class_by_name =3D sparc_cpu_class_by_name; + cc->parse_features =3D sparc_cpu_parse_features; cc->has_work =3D sparc_cpu_has_work; cc->do_interrupt =3D sparc_cpu_do_interrupt; cc->cpu_exec_interrupt =3D sparc_cpu_exec_interrupt; --=20 2.7.4