diff options
| author | liguang | 2013-05-28 10:20:59 +0200 |
|---|---|---|
| committer | Blue Swirl | 2013-06-15 19:48:38 +0200 |
| commit | 4b34e3ad83588602834c05c0d59a0d2973e9f48c (patch) | |
| tree | b0ef2c3786a17fd2b1c44d0a3576faa140749fb0 /target-i386/seg_helper.c | |
| parent | Merge branch 'realize-isa.v2' of git://github.com/afaerber/qemu-cpu (diff) | |
| download | qemu-4b34e3ad83588602834c05c0d59a0d2973e9f48c.tar.gz qemu-4b34e3ad83588602834c05c0d59a0d2973e9f48c.tar.xz qemu-4b34e3ad83588602834c05c0d59a0d2973e9f48c.zip | |
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/seg_helper.c')
| -rw-r--r-- | target-i386/seg_helper.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target-i386/seg_helper.c b/target-i386/seg_helper.c index 906e4f3d20..719b7bb396 100644 --- a/target-i386/seg_helper.c +++ b/target-i386/seg_helper.c @@ -324,7 +324,7 @@ static void switch_tss(CPUX86State *env, int tss_selector, /* 32 bit */ cpu_stl_kernel(env, env->tr.base + 0x20, next_eip); cpu_stl_kernel(env, env->tr.base + 0x24, old_eflags); - cpu_stl_kernel(env, env->tr.base + (0x28 + 0 * 4), EAX); + cpu_stl_kernel(env, env->tr.base + (0x28 + 0 * 4), env->regs[R_EAX]); cpu_stl_kernel(env, env->tr.base + (0x28 + 1 * 4), ECX); cpu_stl_kernel(env, env->tr.base + (0x28 + 2 * 4), EDX); cpu_stl_kernel(env, env->tr.base + (0x28 + 3 * 4), EBX); @@ -340,7 +340,7 @@ static void switch_tss(CPUX86State *env, int tss_selector, /* 16 bit */ cpu_stw_kernel(env, env->tr.base + 0x0e, next_eip); cpu_stw_kernel(env, env->tr.base + 0x10, old_eflags); - cpu_stw_kernel(env, env->tr.base + (0x12 + 0 * 2), EAX); + cpu_stw_kernel(env, env->tr.base + (0x12 + 0 * 2), env->regs[R_EAX]); cpu_stw_kernel(env, env->tr.base + (0x12 + 1 * 2), ECX); cpu_stw_kernel(env, env->tr.base + (0x12 + 2 * 2), EDX); cpu_stw_kernel(env, env->tr.base + (0x12 + 3 * 2), EBX); @@ -396,7 +396,7 @@ static void switch_tss(CPUX86State *env, int tss_selector, } cpu_load_eflags(env, new_eflags, eflags_mask); /* XXX: what to do in 16 bit case? */ - EAX = new_regs[0]; + env->regs[R_EAX] = new_regs[0]; ECX = new_regs[1]; EDX = new_regs[2]; EBX = new_regs[3]; @@ -1175,7 +1175,7 @@ static void do_interrupt_all(CPUX86State *env, int intno, int is_int, if (intno == 0x0e) { qemu_log(" CR2=" TARGET_FMT_lx, env->cr[2]); } else { - qemu_log(" EAX=" TARGET_FMT_lx, EAX); + qemu_log(" env->regs[R_EAX]=" TARGET_FMT_lx, env->regs[R_EAX]); } qemu_log("\n"); log_cpu_state(env, CPU_DUMP_CCOP); |