|
@@ -2105,16 +2105,10 @@ static int em_iret(struct x86_emulate_ctxt *ctxt)
|
|
|
static int em_jmp_far(struct x86_emulate_ctxt *ctxt)
|
|
|
{
|
|
|
int rc;
|
|
|
- unsigned short sel, old_sel;
|
|
|
- struct desc_struct old_desc, new_desc;
|
|
|
- const struct x86_emulate_ops *ops = ctxt->ops;
|
|
|
+ unsigned short sel;
|
|
|
+ struct desc_struct new_desc;
|
|
|
u8 cpl = ctxt->ops->cpl(ctxt);
|
|
|
|
|
|
- /* Assignment of RIP may only fail in 64-bit mode */
|
|
|
- if (ctxt->mode == X86EMUL_MODE_PROT64)
|
|
|
- ops->get_segment(ctxt, &old_sel, &old_desc, NULL,
|
|
|
- VCPU_SREG_CS);
|
|
|
-
|
|
|
memcpy(&sel, ctxt->src.valptr + ctxt->op_bytes, 2);
|
|
|
|
|
|
rc = __load_segment_descriptor(ctxt, sel, VCPU_SREG_CS, cpl,
|
|
@@ -2124,12 +2118,10 @@ static int em_jmp_far(struct x86_emulate_ctxt *ctxt)
|
|
|
return rc;
|
|
|
|
|
|
rc = assign_eip_far(ctxt, ctxt->src.val, &new_desc);
|
|
|
- if (rc != X86EMUL_CONTINUE) {
|
|
|
- WARN_ON(ctxt->mode != X86EMUL_MODE_PROT64);
|
|
|
- /* assigning eip failed; restore the old cs */
|
|
|
- ops->set_segment(ctxt, old_sel, &old_desc, 0, VCPU_SREG_CS);
|
|
|
- return rc;
|
|
|
- }
|
|
|
+ /* Error handling is not implemented. */
|
|
|
+ if (rc != X86EMUL_CONTINUE)
|
|
|
+ return X86EMUL_UNHANDLEABLE;
|
|
|
+
|
|
|
return rc;
|
|
|
}
|
|
|
|
|
@@ -2189,14 +2181,8 @@ static int em_ret_far(struct x86_emulate_ctxt *ctxt)
|
|
|
{
|
|
|
int rc;
|
|
|
unsigned long eip, cs;
|
|
|
- u16 old_cs;
|
|
|
int cpl = ctxt->ops->cpl(ctxt);
|
|
|
- struct desc_struct old_desc, new_desc;
|
|
|
- const struct x86_emulate_ops *ops = ctxt->ops;
|
|
|
-
|
|
|
- if (ctxt->mode == X86EMUL_MODE_PROT64)
|
|
|
- ops->get_segment(ctxt, &old_cs, &old_desc, NULL,
|
|
|
- VCPU_SREG_CS);
|
|
|
+ struct desc_struct new_desc;
|
|
|
|
|
|
rc = emulate_pop(ctxt, &eip, ctxt->op_bytes);
|
|
|
if (rc != X86EMUL_CONTINUE)
|
|
@@ -2213,10 +2199,10 @@ static int em_ret_far(struct x86_emulate_ctxt *ctxt)
|
|
|
if (rc != X86EMUL_CONTINUE)
|
|
|
return rc;
|
|
|
rc = assign_eip_far(ctxt, eip, &new_desc);
|
|
|
- if (rc != X86EMUL_CONTINUE) {
|
|
|
- WARN_ON(ctxt->mode != X86EMUL_MODE_PROT64);
|
|
|
- ops->set_segment(ctxt, old_cs, &old_desc, 0, VCPU_SREG_CS);
|
|
|
- }
|
|
|
+ /* Error handling is not implemented. */
|
|
|
+ if (rc != X86EMUL_CONTINUE)
|
|
|
+ return X86EMUL_UNHANDLEABLE;
|
|
|
+
|
|
|
return rc;
|
|
|
}
|
|
|
|