From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:37387) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UT1T1-00017R-9x for qemu-devel@nongnu.org; Thu, 18 Apr 2013 22:54:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UT1Sz-00009i-TB for qemu-devel@nongnu.org; Thu, 18 Apr 2013 22:54:27 -0400 Received: from [222.73.24.84] (port=7270 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UT1Sz-000098-IG for qemu-devel@nongnu.org; Thu, 18 Apr 2013 22:54:25 -0400 From: liguang Date: Fri, 19 Apr 2013 10:52:21 +0800 Message-Id: <1366339945-17151-3-git-send-email-lig.fnst@cn.fujitsu.com> In-Reply-To: <1366339945-17151-1-git-send-email-lig.fnst@cn.fujitsu.com> References: <1366339945-17151-1-git-send-email-lig.fnst@cn.fujitsu.com> Subject: [Qemu-devel] [PATCH 2/6] target-i386/smm_helper: replace env->eip with EIP List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, peter.maydell@linaro.org Cc: blauwirbel@gmail.com, pbonzini@redhat.com, aliguori@us.ibm.com, afaerber@suse.de, liguang Signed-off-by: liguang --- target-i386/smm_helper.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/target-i386/smm_helper.c b/target-i386/smm_helper.c index eea2fe9..ba79075 100644 --- a/target-i386/smm_helper.c +++ b/target-i386/smm_helper.c @@ -93,7 +93,7 @@ void do_smm_enter(CPUX86State *env) for (i = 8; i < 16; i++) { stq_phys(sm_state + 0x7ff8 - i * 8, env->regs[i]); } - stq_phys(sm_state + 0x7f78, env->eip); + stq_phys(sm_state + 0x7f78, EIP); stl_phys(sm_state + 0x7f70, cpu_compute_eflags(env)); stl_phys(sm_state + 0x7f68, env->dr[6]); stl_phys(sm_state + 0x7f60, env->dr[7]); @@ -108,7 +108,7 @@ void do_smm_enter(CPUX86State *env) stl_phys(sm_state + 0x7ffc, env->cr[0]); stl_phys(sm_state + 0x7ff8, env->cr[3]); stl_phys(sm_state + 0x7ff4, cpu_compute_eflags(env)); - stl_phys(sm_state + 0x7ff0, env->eip); + stl_phys(sm_state + 0x7ff0, EIP); stl_phys(sm_state + 0x7fec, EDI); stl_phys(sm_state + 0x7fe8, ESI); stl_phys(sm_state + 0x7fe4, EBP); @@ -160,7 +160,7 @@ void do_smm_enter(CPUX86State *env) #endif cpu_load_eflags(env, 0, ~(CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C | DF_MASK)); - env->eip = 0x00008000; + EIP = 0x00008000; cpu_x86_load_seg_cache(env, R_CS, (env->smbase >> 4) & 0xffff, env->smbase, 0xffffffff, 0); cpu_x86_load_seg_cache(env, R_DS, 0, 0, 0xffffffff, 0); @@ -224,7 +224,7 @@ void helper_rsm(CPUX86State *env) for (i = 8; i < 16; i++) { env->regs[i] = ldq_phys(sm_state + 0x7ff8 - i * 8); } - env->eip = ldq_phys(sm_state + 0x7f78); + EIP = ldq_phys(sm_state + 0x7f78); cpu_load_eflags(env, ldl_phys(sm_state + 0x7f70), ~(CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C | DF_MASK)); env->dr[6] = ldl_phys(sm_state + 0x7f68); @@ -243,7 +243,7 @@ void helper_rsm(CPUX86State *env) cpu_x86_update_cr3(env, ldl_phys(sm_state + 0x7ff8)); cpu_load_eflags(env, ldl_phys(sm_state + 0x7ff4), ~(CC_O | CC_S | CC_Z | CC_A | CC_P | CC_C | DF_MASK)); - env->eip = ldl_phys(sm_state + 0x7ff0); + EIP = ldl_phys(sm_state + 0x7ff0); EDI = ldl_phys(sm_state + 0x7fec); ESI = ldl_phys(sm_state + 0x7fe8); EBP = ldl_phys(sm_state + 0x7fe4); -- 1.7.2.5