yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-06-23 10:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

target-i386: Consolidate calls of object_property_parse() in x86_cpu_parse_featurestr

Browse source 
Backports commit f6750e959a397dea988efd4e488e1ff813011065 from qemu
This commit is contained in:
Eduardo Habkost 2018-02-24 18:53:09 -05:00 committed by Lioncash
parent 800b28483b
commit b918dd95f3
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 44 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
qemu/target-i386/cpu.c
View file

@ -2018,18 +2018,39 @@ static void x86_cpu_parse_featurestr(CPUState *cs, char *features,
memset(cpu->plus_features, 0, sizeof(cpu->plus_features)); memset(cpu->plus_features, 0, sizeof(cpu->plus_features));
memset(cpu->minus_features, 0, sizeof(cpu->minus_features)); memset(cpu->minus_features, 0, sizeof(cpu->minus_features));
featurestr = features ? strtok(features, ",") : NULL; if (!features) {
return;
}
while (featurestr) { for (featurestr = strtok(features, ",");
char *val; featurestr && !local_err;
featurestr = strtok(NULL, ",")) {
const char *name;
const char *val = NULL;
char *eq = NULL;
/* Compatibility syntax: */
if (featurestr[0] == '+') { if (featurestr[0] == '+') {
add_flagname_to_bitmaps(featurestr + 1, cpu->plus_features, &local_err); add_flagname_to_bitmaps(featurestr + 1, cpu->plus_features, &local_err);
continue;
} else if (featurestr[0] == '-') { } else if (featurestr[0] == '-') {
add_flagname_to_bitmaps(featurestr + 1, cpu->minus_features, &local_err); add_flagname_to_bitmaps(featurestr + 1, cpu->minus_features, &local_err);
} else if ((val = strchr(featurestr, '='))) { continue;
*val = 0; val++; }
eq = strchr(featurestr, '=');
if (eq) {
*eq++ = 0;
val = eq;
} else {
val = "on";
}
feat2prop(featurestr); feat2prop(featurestr);
if (!strcmp(featurestr, "tsc-freq")) { name = featurestr;
/* Special case: */
if (!strcmp(name, "tsc-freq")) {
int64_t tsc_freq; int64_t tsc_freq;
char *err; char *err;
char num[32]; char num[32];
@ -2041,18 +2062,15 @@ static void x86_cpu_parse_featurestr(CPUState *cs, char *features,
return; return;
} }
snprintf(num, sizeof(num), "%" PRId64, tsc_freq); snprintf(num, sizeof(num), "%" PRId64, tsc_freq);
object_property_parse(cs->uc, OBJECT(cpu), num, "tsc-frequency", val = num;
&local_err); name = "tsc-frequency";
} }
} else {
feat2prop(featurestr); object_property_parse(cs->uc, OBJECT(cpu), val, name, &local_err);
object_property_parse(cs->uc, OBJECT(cpu), "on", featurestr, &local_err);
} }
if (local_err) { if (local_err) {
error_propagate(errp, local_err); error_propagate(errp, local_err);
return;
}
featurestr = strtok(NULL, ",");
} }
} }