diff options
| author | liguang <lig.fnst@cn.fujitsu.com> | 2013-05-28 16:20:59 +0800 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2013-06-15 17:48:38 +0000 |
| commit | 4b34e3ad83588602834c05c0d59a0d2973e9f48c (patch) | |
| tree | b0ef2c3786a17fd2b1c44d0a3576faa140749fb0 /target-i386/misc_helper.c | |
| parent | 371a775dc18ece3ff7d77328d1ee28cb2d473706 (diff) | |
target-i386/helper: remove EAX macro
Signed-off-by: liguang <lig.fnst@cn.fujitsu.com>
Reviewed-by: Andreas Färber <afaerber@suse.de>
Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'target-i386/misc_helper.c')
| -rw-r--r-- | target-i386/misc_helper.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target-i386/misc_helper.c b/target-i386/misc_helper.c index ec834fc67e..a6a787fbc9 100644 --- a/target-i386/misc_helper.c +++ b/target-i386/misc_helper.c @@ -122,8 +122,8 @@ void helper_cpuid(CPUX86State *env) cpu_svm_check_intercept_param(env, SVM_EXIT_CPUID, 0); - cpu_x86_cpuid(env, (uint32_t)EAX, (uint32_t)ECX, &eax, &ebx, &ecx, &edx); - EAX = eax; + cpu_x86_cpuid(env, (uint32_t)env->regs[R_EAX], (uint32_t)ECX, &eax, &ebx, &ecx, &edx); + env->regs[R_EAX] = eax; EBX = ebx; ECX = ecx; EDX = edx; @@ -234,7 +234,7 @@ void helper_rdtsc(CPUX86State *env) cpu_svm_check_intercept_param(env, SVM_EXIT_RDTSC, 0); val = cpu_get_tsc(env) + env->tsc_offset; - EAX = (uint32_t)(val); + env->regs[R_EAX] = (uint32_t)(val); EDX = (uint32_t)(val >> 32); } @@ -271,7 +271,7 @@ void helper_wrmsr(CPUX86State *env) cpu_svm_check_intercept_param(env, SVM_EXIT_MSR, 1); - val = ((uint32_t)EAX) | ((uint64_t)((uint32_t)EDX) << 32); + val = ((uint32_t)env->regs[R_EAX]) | ((uint64_t)((uint32_t)EDX) << 32); switch ((uint32_t)ECX) { case MSR_IA32_SYSENTER_CS: @@ -548,7 +548,7 @@ void helper_rdmsr(CPUX86State *env) val = 0; break; } - EAX = (uint32_t)(val); + env->regs[R_EAX] = (uint32_t)(val); EDX = (uint32_t)(val >> 32); } #endif |