| Message ID | 1503050939-227939-8-git-send-email-imammedo@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 08/18/2017 07:08 AM, Igor Mammedov wrote: > 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 <imammedo@redhat.com> Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > CC: Riku Voipio <riku.voipio@iki.fi> > CC: Laurent Vivier <laurent@vivier.eu> > CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > CC: Artyom Tarasenko <atar4qemu@gmail.com> > > v2: > * use new cpu_legacy_parse_featurestr() without > plus_features/minus_features > * drop cpu_legacy_apply_features() as it's been removed in > previuos patch and new cpu_legacy_parse_featurestr() > does its job > --- > 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 | 146 +---------------------------- > 8 files changed, 12 insertions(+), 141 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=y > diff --git a/default-configs/sparc-linux-user.mak b/default-configs/sparc-linux-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=y > diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak > index 004b0f4..d8fa9fd 100644 > --- a/default-configs/sparc-softmmu.mak > +++ b/default-configs/sparc-softmmu.mak > @@ -18,3 +18,4 @@ CONFIG_GRLIB=y > CONFIG_STP2000=y > CONFIG_ECCMEMCTL=y > CONFIG_SUN4M=y > +CONFIG_LEGACY_CPU_FEATURES=y > diff --git a/default-configs/sparc32plus-linux-user.mak b/default-configs/sparc32plus-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=y > 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=y > diff --git a/default-configs/sparc64-linux-user.mak b/default-configs/sparc64-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=y > 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=y > CONFIG_ISA_TESTDEV=y > CONFIG_EMPTY_SLOT=y > CONFIG_SUN4V_RTC=y > +CONFIG_LEGACY_CPU_FEATURES=y > diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c > index 7f74b1c..fd01cbf 100644 > --- a/target/sparc/cpu.c > +++ b/target/sparc/cpu.c > @@ -104,51 +104,15 @@ static void cpu_sparc_disas_set_info(CPUState *cpu, disassemble_info *info) > #endif > } > > -static void sparc_cpu_parse_features(CPUState *cs, char *features, > - Error **errp); > - > -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 = g_strdup(cpu_model); > - char *featurestr = strtok(s, ","); > - Error *err = NULL; > - > - featurestr = 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, errp); > } > > SPARCCPU *cpu_sparc_init(const char *cpu_model) > { > - SPARCCPU *cpu; > - ObjectClass *oc; > - char *str, *name; > - > - str = g_strdup(cpu_model); > - name = strtok(str, ","); > - oc = cpu_class_by_name(TYPE_SPARC_CPU, name); > - if (oc == NULL) { > - g_free(str); > - return NULL; > - } > - g_free(str); > - > - cpu = 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)); > } > > void cpu_sparc_set_id(CPUSPARCState *env, unsigned int cpu) > @@ -529,107 +493,6 @@ static void print_features(FILE *f, fprintf_function cpu_fprintf, > } > } > > -static void add_flagname_to_bitmaps(const char *flagname, uint32_t *features) > -{ > - unsigned int i; > - > - for (i = 0; i < ARRAY_SIZE(feature_name); i++) { > - if (feature_name[i] && !strcmp(flagname, feature_name[i])) { > - *features |= 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 = SPARC_CPU(cs); > - sparc_def_t *cpu_def = &cpu->env.def; > - char *featurestr; > - uint32_t plus_features = 0; > - uint32_t minus_features = 0; > - uint64_t iu_version; > - uint32_t fpu_version, mmu_version, nwindows; > - > - featurestr = features ? strtok(features, ",") : NULL; > - while (featurestr) { > - char *val; > - > - if (featurestr[0] == '+') { > - add_flagname_to_bitmaps(featurestr + 1, &plus_features); > - } else if (featurestr[0] == '-') { > - add_flagname_to_bitmaps(featurestr + 1, &minus_features); > - } else if ((val = strchr(featurestr, '='))) { > - *val = 0; val++; > - if (!strcmp(featurestr, "iu_version")) { > - char *err; > - > - iu_version = strtoll(val, &err, 0); > - if (!*val || *err) { > - error_setg(errp, "bad numerical value %s", val); > - return; > - } > - cpu_def->iu_version = iu_version; > -#ifdef DEBUG_FEATURES > - fprintf(stderr, "iu_version %" PRIx64 "\n", iu_version); > -#endif > - } else if (!strcmp(featurestr, "fpu_version")) { > - char *err; > - > - fpu_version = strtol(val, &err, 0); > - if (!*val || *err) { > - error_setg(errp, "bad numerical value %s", val); > - return; > - } > - cpu_def->fpu_version = fpu_version; > -#ifdef DEBUG_FEATURES > - fprintf(stderr, "fpu_version %x\n", fpu_version); > -#endif > - } else if (!strcmp(featurestr, "mmu_version")) { > - char *err; > - > - mmu_version = strtol(val, &err, 0); > - if (!*val || *err) { > - error_setg(errp, "bad numerical value %s", val); > - return; > - } > - cpu_def->mmu_version = mmu_version; > -#ifdef DEBUG_FEATURES > - fprintf(stderr, "mmu_version %x\n", mmu_version); > -#endif > - } else if (!strcmp(featurestr, "nwindows")) { > - char *err; > - > - nwindows = 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 = 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=xyz)", featurestr); > - return; > - } > - featurestr = strtok(NULL, ","); > - } > - cpu_def->features |= plus_features; > - cpu_def->features &= ~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; > @@ -932,6 +795,7 @@ static void sparc_cpu_class_init(ObjectClass *oc, void *data) > cc->reset = sparc_cpu_reset; > > cc->class_by_name = sparc_cpu_class_by_name; > + cc->parse_features = sparc_cpu_parse_features; > cc->has_work = sparc_cpu_has_work; > cc->do_interrupt = sparc_cpu_do_interrupt; > cc->cpu_exec_interrupt = sparc_cpu_exec_interrupt; >
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=y diff --git a/default-configs/sparc-linux-user.mak b/default-configs/sparc-linux-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=y diff --git a/default-configs/sparc-softmmu.mak b/default-configs/sparc-softmmu.mak index 004b0f4..d8fa9fd 100644 --- a/default-configs/sparc-softmmu.mak +++ b/default-configs/sparc-softmmu.mak @@ -18,3 +18,4 @@ CONFIG_GRLIB=y CONFIG_STP2000=y CONFIG_ECCMEMCTL=y CONFIG_SUN4M=y +CONFIG_LEGACY_CPU_FEATURES=y diff --git a/default-configs/sparc32plus-linux-user.mak b/default-configs/sparc32plus-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=y 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=y diff --git a/default-configs/sparc64-linux-user.mak b/default-configs/sparc64-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=y 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=y CONFIG_ISA_TESTDEV=y CONFIG_EMPTY_SLOT=y CONFIG_SUN4V_RTC=y +CONFIG_LEGACY_CPU_FEATURES=y diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c index 7f74b1c..fd01cbf 100644 --- a/target/sparc/cpu.c +++ b/target/sparc/cpu.c @@ -104,51 +104,15 @@ static void cpu_sparc_disas_set_info(CPUState *cpu, disassemble_info *info) #endif } -static void sparc_cpu_parse_features(CPUState *cs, char *features, - Error **errp); - -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 = g_strdup(cpu_model); - char *featurestr = strtok(s, ","); - Error *err = NULL; - - featurestr = 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, errp); } SPARCCPU *cpu_sparc_init(const char *cpu_model) { - SPARCCPU *cpu; - ObjectClass *oc; - char *str, *name; - - str = g_strdup(cpu_model); - name = strtok(str, ","); - oc = cpu_class_by_name(TYPE_SPARC_CPU, name); - if (oc == NULL) { - g_free(str); - return NULL; - } - g_free(str); - - cpu = 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)); } void cpu_sparc_set_id(CPUSPARCState *env, unsigned int cpu) @@ -529,107 +493,6 @@ static void print_features(FILE *f, fprintf_function cpu_fprintf, } } -static void add_flagname_to_bitmaps(const char *flagname, uint32_t *features) -{ - unsigned int i; - - for (i = 0; i < ARRAY_SIZE(feature_name); i++) { - if (feature_name[i] && !strcmp(flagname, feature_name[i])) { - *features |= 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 = SPARC_CPU(cs); - sparc_def_t *cpu_def = &cpu->env.def; - char *featurestr; - uint32_t plus_features = 0; - uint32_t minus_features = 0; - uint64_t iu_version; - uint32_t fpu_version, mmu_version, nwindows; - - featurestr = features ? strtok(features, ",") : NULL; - while (featurestr) { - char *val; - - if (featurestr[0] == '+') { - add_flagname_to_bitmaps(featurestr + 1, &plus_features); - } else if (featurestr[0] == '-') { - add_flagname_to_bitmaps(featurestr + 1, &minus_features); - } else if ((val = strchr(featurestr, '='))) { - *val = 0; val++; - if (!strcmp(featurestr, "iu_version")) { - char *err; - - iu_version = strtoll(val, &err, 0); - if (!*val || *err) { - error_setg(errp, "bad numerical value %s", val); - return; - } - cpu_def->iu_version = iu_version; -#ifdef DEBUG_FEATURES - fprintf(stderr, "iu_version %" PRIx64 "\n", iu_version); -#endif - } else if (!strcmp(featurestr, "fpu_version")) { - char *err; - - fpu_version = strtol(val, &err, 0); - if (!*val || *err) { - error_setg(errp, "bad numerical value %s", val); - return; - } - cpu_def->fpu_version = fpu_version; -#ifdef DEBUG_FEATURES - fprintf(stderr, "fpu_version %x\n", fpu_version); -#endif - } else if (!strcmp(featurestr, "mmu_version")) { - char *err; - - mmu_version = strtol(val, &err, 0); - if (!*val || *err) { - error_setg(errp, "bad numerical value %s", val); - return; - } - cpu_def->mmu_version = mmu_version; -#ifdef DEBUG_FEATURES - fprintf(stderr, "mmu_version %x\n", mmu_version); -#endif - } else if (!strcmp(featurestr, "nwindows")) { - char *err; - - nwindows = 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 = 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=xyz)", featurestr); - return; - } - featurestr = strtok(NULL, ","); - } - cpu_def->features |= plus_features; - cpu_def->features &= ~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; @@ -932,6 +795,7 @@ static void sparc_cpu_class_init(ObjectClass *oc, void *data) cc->reset = sparc_cpu_reset; cc->class_by_name = sparc_cpu_class_by_name; + cc->parse_features = sparc_cpu_parse_features; cc->has_work = sparc_cpu_has_work; cc->do_interrupt = sparc_cpu_do_interrupt; cc->cpu_exec_interrupt = sparc_cpu_exec_interrupt;
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 <imammedo@redhat.com> --- CC: Riku Voipio <riku.voipio@iki.fi> CC: Laurent Vivier <laurent@vivier.eu> CC: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> CC: Artyom Tarasenko <atar4qemu@gmail.com> v2: * use new cpu_legacy_parse_featurestr() without plus_features/minus_features * drop cpu_legacy_apply_features() as it's been removed in previuos patch and new cpu_legacy_parse_featurestr() does its job --- 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 | 146 +---------------------------- 8 files changed, 12 insertions(+), 141 deletions(-)