diff options
| author | Edgar E. Iglesias <edgar.iglesias@xilinx.com> | 2013-12-17 15:22:06 +1000 |
|---|---|---|
| committer | Edgar E. Iglesias <edgar.iglesias@xilinx.com> | 2014-02-11 22:57:32 +1000 |
| commit | 5ce5944dc0ffdc43c11b5cad11e526f699aabe4c (patch) | |
| tree | 5969aafd8a4716d4bc43422711c38b8182a13bc5 /target-i386 | |
| parent | 2198a121434b806636318d62c89595c1955e825a (diff) | |
| download | qemu-5ce5944dc0ffdc43c11b5cad11e526f699aabe4c.tar.gz | |
exec: Make stw_*_phys input an AddressSpace
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Diffstat (limited to 'target-i386')
| -rw-r--r-- | target-i386/smm_helper.c | 12 | ||||
| -rw-r--r-- | target-i386/svm_helper.c | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/target-i386/smm_helper.c b/target-i386/smm_helper.c index 88f6d7f7c2..71c64b2479 100644 --- a/target-i386/smm_helper.c +++ b/target-i386/smm_helper.c @@ -60,8 +60,8 @@ void do_smm_enter(X86CPU *cpu) for (i = 0; i < 6; i++) { dt = &env->segs[i]; offset = 0x7e00 + i * 16; - stw_phys(sm_state + offset, dt->selector); - stw_phys(sm_state + offset + 2, (dt->flags >> 8) & 0xf0ff); + stw_phys(cs->as, sm_state + offset, dt->selector); + stw_phys(cs->as, sm_state + offset + 2, (dt->flags >> 8) & 0xf0ff); stl_phys(cs->as, sm_state + offset + 4, dt->limit); stq_phys(cs->as, sm_state + offset + 8, dt->base); } @@ -69,18 +69,18 @@ void do_smm_enter(X86CPU *cpu) stq_phys(cs->as, sm_state + 0x7e68, env->gdt.base); stl_phys(cs->as, sm_state + 0x7e64, env->gdt.limit); - stw_phys(sm_state + 0x7e70, env->ldt.selector); + stw_phys(cs->as, sm_state + 0x7e70, env->ldt.selector); stq_phys(cs->as, sm_state + 0x7e78, env->ldt.base); stl_phys(cs->as, sm_state + 0x7e74, env->ldt.limit); - stw_phys(sm_state + 0x7e72, (env->ldt.flags >> 8) & 0xf0ff); + stw_phys(cs->as, sm_state + 0x7e72, (env->ldt.flags >> 8) & 0xf0ff); stq_phys(cs->as, sm_state + 0x7e88, env->idt.base); stl_phys(cs->as, sm_state + 0x7e84, env->idt.limit); - stw_phys(sm_state + 0x7e90, env->tr.selector); + stw_phys(cs->as, sm_state + 0x7e90, env->tr.selector); stq_phys(cs->as, sm_state + 0x7e98, env->tr.base); stl_phys(cs->as, sm_state + 0x7e94, env->tr.limit); - stw_phys(sm_state + 0x7e92, (env->tr.flags >> 8) & 0xf0ff); + stw_phys(cs->as, sm_state + 0x7e92, (env->tr.flags >> 8) & 0xf0ff); stq_phys(cs->as, sm_state + 0x7ed0, env->efer); diff --git a/target-i386/svm_helper.c b/target-i386/svm_helper.c index b9fd779b11..a86a99bca5 100644 --- a/target-i386/svm_helper.c +++ b/target-i386/svm_helper.c @@ -89,13 +89,13 @@ static inline void svm_save_seg(CPUX86State *env, hwaddr addr, const SegmentCache *sc) { CPUState *cs = ENV_GET_CPU(env); - stw_phys(addr + offsetof(struct vmcb_seg, selector), + stw_phys(cs->as, addr + offsetof(struct vmcb_seg, selector), sc->selector); stq_phys(cs->as, addr + offsetof(struct vmcb_seg, base), sc->base); stl_phys(cs->as, addr + offsetof(struct vmcb_seg, limit), sc->limit); - stw_phys(addr + offsetof(struct vmcb_seg, attrib), + stw_phys(cs->as, addr + offsetof(struct vmcb_seg, attrib), ((sc->flags >> 8) & 0xff) | ((sc->flags >> 12) & 0x0f00)); } |