Re: [Qemu-devel] [PATCH qom-cpu] cpu-exec: Optimize X86CPU usage in cpu_exec()

[Andreas Färber]

Am 24.12.2013 03:52, schrieb Chen Fan:
> On Tue, 2013-12-24 at 03:38 +0100, Andreas Färber wrote:
>> Replace growing numbers of inline x86_env_get_cpu() with x86_cpu variable.
>>
>> Signed-off-by: Andreas Färber <address@hidden>
>> ---
>>  cpu-exec.c | 14 ++++++++++----
>>  1 file changed, 10 insertions(+), 4 deletions(-)
>>
>> diff --git a/cpu-exec.c b/cpu-exec.c
>> index 2711c58..f7a215c 100644
>> --- a/cpu-exec.c
>> +++ b/cpu-exec.c
>> @@ -206,6 +206,9 @@ int cpu_exec(CPUArchState *env)
>>        (defined(TARGET_M68K) || defined(TARGET_PPC) || 
>> defined(TARGET_S390X)))
>>      CPUClass *cc = CPU_GET_CLASS(cpu);
>>  #endif
>> +#ifdef TARGET_I386
>> +    X86CPU *x86_cpu = X86_CPU(cpu);
>> +#endif
> Hi, Andreas,
>    I think this defined grammar should correspond with other, of course
> it's correct also.

Yes, X86_CPU(cpu) == CPU(x86_cpu), so converting at CPU level seemed
more straightforward to me rather than going outwards from embedded env,
given that the number of casts is kept low (once at beginning).

>>      int ret, interrupt_request;
>>      TranslationBlock *tb;
>>      uint8_t *tc_ptr;
>> @@ -320,24 +323,24 @@ int cpu_exec(CPUArchState *env)
>>  #if !defined(CONFIG_USER_ONLY)
>>                      if (interrupt_request & CPU_INTERRUPT_POLL) {
>>                          cpu->interrupt_request &= ~CPU_INTERRUPT_POLL;
>> -                        apic_poll_irq(x86_env_get_cpu(env)->apic_state);
>> +                        apic_poll_irq(x86_cpu->apic_state);
>>                      }
>>  #endif
>>                      if (interrupt_request & CPU_INTERRUPT_INIT) {
>>                              cpu_svm_check_intercept_param(env, 
>> SVM_EXIT_INIT,
>>                                                            0);
>> -                            do_cpu_init(x86_env_get_cpu(env));
>> +                            do_cpu_init(x86_cpu);
>>                              env->exception_index = EXCP_HALTED;
>>                              cpu_loop_exit(env);
>>                      } else if (interrupt_request & CPU_INTERRUPT_SIPI) {
>> -                            do_cpu_sipi(x86_env_get_cpu(env));
>> +                            do_cpu_sipi(x86_cpu);
>>                      } else if (env->hflags2 & HF2_GIF_MASK) {
>>                          if ((interrupt_request & CPU_INTERRUPT_SMI) &&
>>                              !(env->hflags & HF_SMM_MASK)) {
>>                              cpu_svm_check_intercept_param(env, SVM_EXIT_SMI,
>>                                                            0);
>>                              cpu->interrupt_request &= ~CPU_INTERRUPT_SMI;
>> -                            do_smm_enter(x86_env_get_cpu(env));
>> +                            do_smm_enter(x86_cpu);
>>                              next_tb = 0;
>>                          } else if ((interrupt_request & CPU_INTERRUPT_NMI) 
>> &&
>>                                     !(env->hflags2 & HF2_NMI_MASK)) {
>> @@ -685,6 +688,9 @@ int cpu_exec(CPUArchState *env)
>>        (defined(TARGET_M68K) || defined(TARGET_PPC) || 
>> defined(TARGET_S390X)))
>>              cc = CPU_GET_CLASS(cpu);
>>  #endif
>> +#ifdef TARGET_I386
>> +            x86_cpu = X86_CPU(cpu);
>> +#endif
>>          }
>>      } /* for(;;) */
>>  
> Reviewed-by: Chen Fan <address@hidden>

Thanks, applied to qom-cpu:
https://github.com/afaerber/qemu-cpu/commits/qom-cpu

Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg