diff options
| author | liguang <lig.fnst@cn.fujitsu.com> | 2013-05-28 16:21:04 +0800 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2013-06-15 17:49:48 +0000 |
| commit | 08b3ded6bdc06ac6b9d1f700a1ee108f4ba4030f (patch) | |
| tree | bbc4cc9fb1da49061f11013a9798ee60e7fea061 /target-i386/smm_helper.c | |
| parent | c12dddd7918e3479d0b5b0a1b25588d557347171 (diff) | |
target-i386/helper: remove ESP 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/smm_helper.c')
| -rw-r--r-- | target-i386/smm_helper.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target-i386/smm_helper.c b/target-i386/smm_helper.c index 4bd73eb297..50c5d99578 100644 --- a/target-i386/smm_helper.c +++ b/target-i386/smm_helper.c @@ -86,7 +86,7 @@ void do_smm_enter(CPUX86State *env) stq_phys(sm_state + 0x7ff0, env->regs[R_ECX]); 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 + 0x7fd8, env->regs[R_ESP]); stq_phys(sm_state + 0x7fd0, env->regs[R_EBP]); stq_phys(sm_state + 0x7fc8, ESI); stq_phys(sm_state + 0x7fc0, EDI); @@ -112,7 +112,7 @@ void do_smm_enter(CPUX86State *env) stl_phys(sm_state + 0x7fec, EDI); stl_phys(sm_state + 0x7fe8, ESI); stl_phys(sm_state + 0x7fe4, env->regs[R_EBP]); - stl_phys(sm_state + 0x7fe0, ESP); + stl_phys(sm_state + 0x7fe0, env->regs[R_ESP]); stl_phys(sm_state + 0x7fdc, env->regs[R_EBX]); stl_phys(sm_state + 0x7fd8, env->regs[R_EDX]); stl_phys(sm_state + 0x7fd4, env->regs[R_ECX]); @@ -217,7 +217,7 @@ void helper_rsm(CPUX86State *env) env->regs[R_ECX] = ldq_phys(sm_state + 0x7ff0); env->regs[R_EDX] = ldq_phys(sm_state + 0x7fe8); env->regs[R_EBX] = ldq_phys(sm_state + 0x7fe0); - ESP = ldq_phys(sm_state + 0x7fd8); + env->regs[R_ESP] = ldq_phys(sm_state + 0x7fd8); env->regs[R_EBP] = ldq_phys(sm_state + 0x7fd0); ESI = ldq_phys(sm_state + 0x7fc8); EDI = ldq_phys(sm_state + 0x7fc0); @@ -247,7 +247,7 @@ void helper_rsm(CPUX86State *env) EDI = ldl_phys(sm_state + 0x7fec); ESI = ldl_phys(sm_state + 0x7fe8); env->regs[R_EBP] = ldl_phys(sm_state + 0x7fe4); - ESP = ldl_phys(sm_state + 0x7fe0); + env->regs[R_ESP] = ldl_phys(sm_state + 0x7fe0); env->regs[R_EBX] = ldl_phys(sm_state + 0x7fdc); env->regs[R_EDX] = ldl_phys(sm_state + 0x7fd8); env->regs[R_ECX] = ldl_phys(sm_state + 0x7fd4); |