From patchwork Tue May 28 08:21:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: liguang X-Patchwork-Id: 246733 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BC7842C009C for ; Tue, 28 May 2013 18:24:24 +1000 (EST) Received: from localhost ([::1]:34244 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UhFCg-0006BF-S8 for incoming@patchwork.ozlabs.org; Tue, 28 May 2013 04:24:22 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59880) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UhFC2-000648-4b for qemu-devel@nongnu.org; Tue, 28 May 2013 04:23:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UhFBu-0001Wb-2c for qemu-devel@nongnu.org; Tue, 28 May 2013 04:23:42 -0400 Received: from [222.73.24.84] (port=20315 helo=song.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UhFBt-0001VY-Oy for qemu-devel@nongnu.org; Tue, 28 May 2013 04:23:34 -0400 X-IronPort-AV: E=Sophos;i="4.87,756,1363104000"; d="scan'208";a="7388313" Received: from unknown (HELO tang.cn.fujitsu.com) ([10.167.250.3]) by song.cn.fujitsu.com with ESMTP; 28 May 2013 16:20:38 +0800 Received: from fnstmail02.fnst.cn.fujitsu.com (tang.cn.fujitsu.com [127.0.0.1]) by tang.cn.fujitsu.com (8.14.3/8.13.1) with ESMTP id r4S8NRH7015532; Tue, 28 May 2013 16:23:28 +0800 Received: from liguang.fnst.cn.fujitsu.com ([10.167.233.147]) by fnstmail02.fnst.cn.fujitsu.com (Lotus Domino Release 8.5.3) with ESMTP id 2013052816220006-1588301 ; Tue, 28 May 2013 16:22:00 +0800 From: liguang To: qemu-devel@nongnu.org Date: Tue, 28 May 2013 16:21:06 +0800 Message-Id: <1369729270-9991-8-git-send-email-lig.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1369729270-9991-1-git-send-email-lig.fnst@cn.fujitsu.com> References: <1369729270-9991-1-git-send-email-lig.fnst@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/05/28 16:22:00, Serialize by Router on mailserver/fnst(Release 8.5.3|September 15, 2011) at 2013/05/28 16:22:00, Serialize complete at 2013/05/28 16:22:00 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 222.73.24.84 Cc: Peter Maydell , Anthony Liguori , Eduardo Habkost , Blue Swirl , Igor Mammedov , Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , liguang , Richard Henderson Subject: [Qemu-devel] [PATCH v4 08/12] target-i386/helper: remove EDI macro X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: liguang --- target-i386/cpu.h | 2 -- target-i386/seg_helper.c | 6 +++--- target-i386/smm_helper.c | 8 ++++---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/target-i386/cpu.h b/target-i386/cpu.h index e287290..585776a 100644 --- a/target-i386/cpu.h +++ b/target-i386/cpu.h @@ -1101,8 +1101,6 @@ static inline int cpu_mmu_index (CPUX86State *env) ? MMU_KSMAP_IDX : MMU_KERNEL_IDX; } -#undef EDI -#define EDI (env->regs[R_EDI]) #undef EIP #define EIP (env->eip) #define DF (env->df) diff --git a/target-i386/seg_helper.c b/target-i386/seg_helper.c index 0e02eda..8b2766d 100644 --- a/target-i386/seg_helper.c +++ b/target-i386/seg_helper.c @@ -331,7 +331,7 @@ static void switch_tss(CPUX86State *env, int tss_selector, cpu_stl_kernel(env, env->tr.base + (0x28 + 4 * 4), env->regs[R_ESP]); cpu_stl_kernel(env, env->tr.base + (0x28 + 5 * 4), env->regs[R_EBP]); cpu_stl_kernel(env, env->tr.base + (0x28 + 6 * 4), env->regs[R_ESI]); - cpu_stl_kernel(env, env->tr.base + (0x28 + 7 * 4), EDI); + cpu_stl_kernel(env, env->tr.base + (0x28 + 7 * 4), env->regs[R_EDI]); for (i = 0; i < 6; i++) { cpu_stw_kernel(env, env->tr.base + (0x48 + i * 4), env->segs[i].selector); @@ -347,7 +347,7 @@ static void switch_tss(CPUX86State *env, int tss_selector, cpu_stw_kernel(env, env->tr.base + (0x12 + 4 * 2), env->regs[R_ESP]); cpu_stw_kernel(env, env->tr.base + (0x12 + 5 * 2), env->regs[R_EBP]); cpu_stw_kernel(env, env->tr.base + (0x12 + 6 * 2), env->regs[R_ESI]); - cpu_stw_kernel(env, env->tr.base + (0x12 + 7 * 2), EDI); + cpu_stw_kernel(env, env->tr.base + (0x12 + 7 * 2), env->regs[R_EDI]); for (i = 0; i < 4; i++) { cpu_stw_kernel(env, env->tr.base + (0x22 + i * 4), env->segs[i].selector); @@ -403,7 +403,7 @@ static void switch_tss(CPUX86State *env, int tss_selector, env->regs[R_ESP] = new_regs[4]; env->regs[R_EBP] = new_regs[5]; env->regs[R_ESI] = new_regs[6]; - EDI = new_regs[7]; + env->regs[R_EDI] = new_regs[7]; if (new_eflags & VM_MASK) { for (i = 0; i < 6; i++) { load_seg_vm(env, i, new_segs[i]); diff --git a/target-i386/smm_helper.c b/target-i386/smm_helper.c index d051f03..2489573 100644 --- a/target-i386/smm_helper.c +++ b/target-i386/smm_helper.c @@ -89,7 +89,7 @@ void do_smm_enter(CPUX86State *env) stq_phys(sm_state + 0x7fd8, env->regs[R_ESP]); stq_phys(sm_state + 0x7fd0, env->regs[R_EBP]); stq_phys(sm_state + 0x7fc8, env->regs[R_ESI]); - stq_phys(sm_state + 0x7fc0, EDI); + stq_phys(sm_state + 0x7fc0, env->regs[R_EDI]); for (i = 8; i < 16; i++) { stq_phys(sm_state + 0x7ff8 - i * 8, env->regs[i]); } @@ -109,7 +109,7 @@ void do_smm_enter(CPUX86State *env) 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 + 0x7fec, EDI); + stl_phys(sm_state + 0x7fec, env->regs[R_EDI]); stl_phys(sm_state + 0x7fe8, env->regs[R_ESI]); stl_phys(sm_state + 0x7fe4, env->regs[R_EBP]); stl_phys(sm_state + 0x7fe0, env->regs[R_ESP]); @@ -220,7 +220,7 @@ void helper_rsm(CPUX86State *env) env->regs[R_ESP] = ldq_phys(sm_state + 0x7fd8); env->regs[R_EBP] = ldq_phys(sm_state + 0x7fd0); env->regs[R_ESI] = ldq_phys(sm_state + 0x7fc8); - EDI = ldq_phys(sm_state + 0x7fc0); + env->regs[R_EDI] = ldq_phys(sm_state + 0x7fc0); for (i = 8; i < 16; i++) { env->regs[i] = ldq_phys(sm_state + 0x7ff8 - i * 8); } @@ -244,7 +244,7 @@ void helper_rsm(CPUX86State *env) 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); - EDI = ldl_phys(sm_state + 0x7fec); + env->regs[R_EDI] = ldl_phys(sm_state + 0x7fec); env->regs[R_ESI] = ldl_phys(sm_state + 0x7fe8); env->regs[R_EBP] = ldl_phys(sm_state + 0x7fe4); env->regs[R_ESP] = ldl_phys(sm_state + 0x7fe0);