From 00f5e6f21ea55046173a8a106b7654036888e9b3 Mon Sep 17 00:00:00 2001 From: liguang Date: Tue, 28 May 2013 16:21:02 +0800 Subject: target-i386/helper: remove EDX macro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liguang Reviewed-by: Andreas Färber Reviewed-by: Richard Henderson Signed-off-by: Blue Swirl --- target-i386/smm_helper.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'target-i386/smm_helper.c') diff --git a/target-i386/smm_helper.c b/target-i386/smm_helper.c index 952c728..5bc6802 100644 --- a/target-i386/smm_helper.c +++ b/target-i386/smm_helper.c @@ -84,7 +84,7 @@ void do_smm_enter(CPUX86State *env) stq_phys(sm_state + 0x7ff8, env->regs[R_EAX]); stq_phys(sm_state + 0x7ff0, env->regs[R_ECX]); - stq_phys(sm_state + 0x7fe8, EDX); + stq_phys(sm_state + 0x7fe8, env->regs[R_EDX]); stq_phys(sm_state + 0x7fe0, env->regs[R_EBX]); stq_phys(sm_state + 0x7fd8, ESP); stq_phys(sm_state + 0x7fd0, EBP); @@ -114,7 +114,7 @@ void do_smm_enter(CPUX86State *env) stl_phys(sm_state + 0x7fe4, EBP); stl_phys(sm_state + 0x7fe0, ESP); stl_phys(sm_state + 0x7fdc, env->regs[R_EBX]); - stl_phys(sm_state + 0x7fd8, EDX); + stl_phys(sm_state + 0x7fd8, env->regs[R_EDX]); stl_phys(sm_state + 0x7fd4, env->regs[R_ECX]); stl_phys(sm_state + 0x7fd0, env->regs[R_EAX]); stl_phys(sm_state + 0x7fcc, env->dr[6]); @@ -215,7 +215,7 @@ void helper_rsm(CPUX86State *env) env->regs[R_EAX] = ldq_phys(sm_state + 0x7ff8); env->regs[R_ECX] = ldq_phys(sm_state + 0x7ff0); - EDX = ldq_phys(sm_state + 0x7fe8); + env->regs[R_EDX] = ldq_phys(sm_state + 0x7fe8); env->regs[R_EBX] = ldq_phys(sm_state + 0x7fe0); ESP = ldq_phys(sm_state + 0x7fd8); EBP = ldq_phys(sm_state + 0x7fd0); @@ -249,7 +249,7 @@ void helper_rsm(CPUX86State *env) EBP = ldl_phys(sm_state + 0x7fe4); ESP = ldl_phys(sm_state + 0x7fe0); env->regs[R_EBX] = ldl_phys(sm_state + 0x7fdc); - EDX = ldl_phys(sm_state + 0x7fd8); + env->regs[R_EDX] = ldl_phys(sm_state + 0x7fd8); env->regs[R_ECX] = ldl_phys(sm_state + 0x7fd4); env->regs[R_EAX] = ldl_phys(sm_state + 0x7fd0); env->dr[6] = ldl_phys(sm_state + 0x7fcc); -- cgit v1.1