target-i386: Small code cleanup
cover target-i386: Small code cleanup
Just two small code cleanups in target-i386/cpu.c.
Patch 1/2 changes behavior of "-cpu ?" to not print feature names in reverse order anymore. Patch 2/2 doesn't introduce any behavior changes.
Eduardo Habkost (2):
target-i386: Simplify listflags() function
target-i386: Eliminate unnecessary get_cpuid_vendor() function
target-i386/cpu.c | 62 ++++++++++++++++++------------------------------------- 1 file changed, 20 insertions(+), 42 deletions(-)
Signature · 1 line
2.1.0
PATCH 1/2 target-i386: Simplify listflags() function
listflags() had lots of unnecessary complexity. Instead of printing to a buffer that will be immediately printed, simply call the printing function directly. Also, remove the fbits and flags arguments that were always set to the same value. Also, there's no need to list the flags in reverse order.
--- target-i386/cpu.c | 42 ++++++++++++++---------------------------- 1 file changed, 14 insertions(+), 28 deletions(-)
target-i386/cpu.c +14 -28
@@ -1911,34 +1911,19 @@ static void x86_cpu_parse_featurestr(CPUState *cs, char *features, } } -/* generate a composite string into buf of all cpuid names in featureset -* selected by fbits. indicate truncation at bufsize in the event of overflow. -* if flags, suppress names undefined in featureset. +/* Print all cpuid feature names in featureset */ -static void listflags (char *buf,int bufsize,uint32_t fbits, -const char **featureset,uint32_t flags) -{ -const char **p = &featureset[31 ]; -char *q, *b, bit; -int nc; - - b =4 <= bufsize ? buf + (bufsize -=3 ) -1 :NULL ; - *buf ='\0' ; -for (q = buf, bit =31 ; fbits && bufsize; --p, fbits &= ~(1 << bit), --bit) -if (fbits &1 << bit && (*p || !flags)) { -if (*p) - nc =snprintf (q, bufsize,"%s%s" , q == buf ?"" :" " , *p); -else - nc =snprintf (q, bufsize,"%s[%d]" , q == buf ?"" :" " , bit); -if (bufsize <= nc) { -if (b) { -memcpy (b,"..." ,sizeof ("..." )); - } -return ; - } - q += nc; - bufsize -= nc; +static void listflags (FILE *f,fprintf_function print,const char **featureset) +{ +int bit; +bool first = true; + +for (bit =0 ; bit <32 ; bit++) { +if (featureset[bit]) { +"%s%s" , first ?"" :" " , featureset[bit]); + first = false; } + } }/* generate CPU information. */
@@ -1963,8 +1948,9 @@ void x86_cpu_list(FILE *f, fprintf_function cpu_fprintf)for (i =0 ; i <ARRAY_SIZE (feature_word_info); i++) {FeatureWordInfo *fw = &feature_word_info[i]; -listflags (buf,sizeof (buf), (uint32_t )~0 , fw->feat_names,1 ); - (*cpu_fprintf)(f," %s\n" , buf); + (*cpu_fprintf)(f," " ); +listflags (f, cpu_fprintf, fw->feat_names); + (*cpu_fprintf)(f,"\n" ); } }
Signature · 1 line
2.1.0
Re: [Qemu-devel] [PATCH 1/2] target-i386: Simplify listflags() function
Quoted 64 lines · Eduardo Habkost
listflags()had lots of unnecessary complexity. Instead of printing to a buffer that will be immediately printed, simply call the printing function directly. Also, remove the fbits and flags arguments that were always set to the same value. Also, there's no need to list the flags in reverse order.Signed-off-by Eduardo Habkost <[email protected]>--- target-i386/cpu.c | 42 ++++++++++++++---------------------------- 1 file changed, 14 insertions(+), 28 deletions(-)target-i386/cpu.c +11
-26@@ -1911,34 +1911,19 @@ static void x86_cpu_parse_featurestr(CPUState *cs, char *features, } } -/* generate a composite string into buf of all cpuid names in featureset -* selected by fbits. indicate truncation at bufsize in the event of overflow. -* if flags, suppress names undefined in featureset. +/* Print all cpuid feature names in featureset */ -static void listflags (char *buf,int bufsize,uint32_t fbits, -const char **featureset,uint32_t flags) -{ -const char **p = &featureset[31 ]; -char *q, *b, bit; -int nc; - - b =4 <= bufsize ? buf + (bufsize -=3 ) -1 :NULL ; - *buf ='\0' ; -for (q = buf, bit =31 ; fbits && bufsize; --p, fbits &= ~(1 << bit), --bit) -if (fbits &1 << bit && (*p || !flags)) { -if (*p) - nc =snprintf (q, bufsize,"%s%s" , q == buf ?"" :" " , *p); -else - nc =snprintf (q, bufsize,"%s[%d]" , q == buf ?"" :" " , bit); -if (bufsize <= nc) { -if (b) { -memcpy (b,"..." ,sizeof ("..." )); - } -return ; - } - q += nc; - bufsize -= nc; +static void listflags (FILE *f,fprintf_function print,const char **featureset) +{ +int bit; +bool first = true; + +for (bit =0 ; bit <32 ; bit++) { +if (featureset[bit]) { +"%s%s" , first ?"" :" " , featureset[bit]); + first = false; } + } }/* generate CPU information. */ @@ -1963,8 +1948,9 @@ void x86_cpu_list(FILE *f, fprintf_function cpu_fprintf)for (i =0 ; i <ARRAY_SIZE (feature_word_info); i++) {
target-i386/cpu.c void x86_cpu_list(FILE *f, fprintf_function cpu_fprintf) · line 1956
Quoted 10 lines
target-i386/cpu.c +3
-2FeatureWordInfo *fw = &feature_word_info[i]; -listflags (buf,sizeof (buf), (uint32_t )~0 , fw->feat_names,1 ); - (*cpu_fprintf)(f," %s\n" , buf); + (*cpu_fprintf)(f," " ); +listflags (f, cpu_fprintf, fw->feat_names); + (*cpu_fprintf)(f,"\n" ); } }
PATCH 2/2 target-i386: Eliminate unnecessary get_cpuid_vendor() function
In reply to Eduardo HabkostThe function was used in only two places. In one of them, the function made the code less readable by requiring temporary te[bcd]x variables. In the other one we can simply inline the existing code.
--- target-i386/cpu.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-)
target-i386/cpu.c +6 -14
@@ -2214,14 +2214,6 @@ void x86_cpudef_setup(void) } } -static void get_cpuid_vendor (CPUX86State *env,uint32_t *ebx, -uint32_t *ecx,uint32_t *edx) -{ - *ebx = env->cpuid_vendor1; - *edx = env->cpuid_vendor2; - *ecx = env->cpuid_vendor3; -} -void cpu_x86_cpuid (CPUX86State *env,uint32_t index,uint32_t count,uint32_t *eax,uint32_t *ebx,uint32_t *ecx,uint32_t *edx)
@@ -2255,7 +2247,9 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,switch (index) {case 0 : *eax = env->cpuid_level; -get_cpuid_vendor (env, ebx, ecx, edx); + *ebx = env->cpuid_vendor1; + *edx = env->cpuid_vendor2; + *ecx = env->cpuid_vendor3;break ;case 1 : *eax = env->cpuid_version;
@@ -2448,11 +2442,9 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count,* So dont set it here for Intel to make Linux guests happy. */ if (cs->nr_cores * cs->nr_threads >1 ) { -uint32_t tebx, tecx, tedx; -get_cpuid_vendor (env, &tebx, &tecx, &tedx); -if (tebx !=CPUID_VENDOR_INTEL_1 || - tedx !=CPUID_VENDOR_INTEL_2 || - tecx !=CPUID_VENDOR_INTEL_3 ) { +if (env->cpuid_vendor1 !=CPUID_VENDOR_INTEL_1 || + env->cpuid_vendor2 !=CPUID_VENDOR_INTEL_2 || + env->cpuid_vendor3 !=CPUID_VENDOR_INTEL_3 ) { *ecx |=1 <<1 ;/* CmpLegacy bit */ } }
Signature · 1 line
2.1.0
Re: [Qemu-devel] [PATCH 2/2] target-i386: Eliminate unnecessary get_cpuid_vendor() function
Am 03.02.2015 um 19:08 schrieb Eduardo Habkost:
Quoted 5 lines
The function was used in only two places. In one of them, the function made the code less readable by requiring temporary te[bcd]x variables. In the other one we can simply inline the existing code.
Signed-off-by Eduardo Habkost <[email protected]>
Andreas
Signature · 3 lines
SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Felix Imendörffer, Jane Smithard, Jennifer Guild, Dilip Upmanyu, Graham Norton; HRB 21284 (AG Nürnberg)
Quoted 4 lines · Eduardo Habkost
Just two small code cleanups in
target-i386/cpu.c.Patch 1/2 changes behavior of "-cpu ?" to not print feature names in reverse order anymore. Patch 2/2 doesn't introduce any behavior changes.
Andreas, just to confirm: is this series in your queue?
Quoted 12 lines
Eduardo Habkost (2):
target-i386: Simplifylistflags()function
target-i386: Eliminate unnecessaryget_cpuid_vendor()functiontarget-i386/cpu.c | 62 ++++++++++++++++++------------------------------------- 1 file changed, 20 insertions(+), 42 deletions(-)Signature · 1 line
2.1.0
Signature · 1 line
Eduardo
Am 04.03.2015 um 13:28 schrieb Eduardo Habkost:
Quoted 7 lines · Eduardo Habkost
Quoted 4 lines
Just two small code cleanups in
target-i386/cpu.c.Patch 1/2 changes behavior of "-cpu ?" to not print feature names in reverse order anymore. Patch 2/2 doesn't introduce any behavior changes.
Andreas, just to confirm: is this series in your queue?
No, this is perfectly within target-i386 scope, so please keep it in your queue for resubmission.
Thanks,
Andreas
Quoted 6 lines
Quoted 6 lines
Eduardo Habkost (2):
target-i386: Simplifylistflags()function
target-i386: Eliminate unnecessaryget_cpuid_vendor()functiontarget-i386/cpu.c | 62 ++++++++++++++++++------------------------------------- 1 file changed, 20 insertions(+), 42 deletions(-)
Signature · 3 lines
SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Felix Imendörffer, Jane Smithard, Jennifer Guild, Dilip Upmanyu, Graham Norton; HRB 21284 (AG Nürnberg)