KVM: x86 emulator: emulate RETF imm
PATCH v2 1/1 KVM: x86 emulator: emulate RETF imm
Opcode CA
This gets used by a DOS based NetWare guest.
Signed-off-by Bruce Rogers <[email protected]>
--- arch/x86/kvm/emulate.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-)
arch/x86/kvm/emulate.c +13 -1
@@ -2025,6 +2025,17 @@ static int em_ret_far(struct x86_emulate_ctxt *ctxt)return rc; } +static int em_ret_far_imm (struct x86_emulate_ctxt *ctxt) +{ +int rc; + + rc =em_ret_far (ctxt); +if (rc !=X86EMUL_CONTINUE ) +return rc; +rsp_increment (ctxt, ctxt->src.val); +return X86EMUL_CONTINUE ; +} +static int em_cmpxchg (struct x86_emulate_ctxt *ctxt) {/* Save real source value, then compare EAX against destination. */
@@ -3763,7 +3774,8 @@ static const struct opcode opcode_table[256] = {G (ByteOp, group11),G (0 , group11),/* 0xC8 - 0xCF */ I (Stack | SrcImmU16 | Src2ImmByte, em_enter),I (Stack, em_leave), -N ,I (ImplicitOps | Stack, em_ret_far), +I (ImplicitOps | Stack | SrcImmU16, em_ret_far_imm), +I (ImplicitOps | Stack, em_ret_far),D (ImplicitOps),DI (SrcImmByte, intn), D(ImplicitOps | No64), II(ImplicitOps, em_iret, iret),/* 0xD0 - 0xD7 */
Signature · 1 line
1.7.7
Quoted 5 lines · Bruce Rogers
Opcode CA
This gets used by a DOS based NetWare guest.
Signed-off-by Bruce Rogers <[email protected]>
Reviewed-by Gleb Natapov <[email protected]>
Quoted 38 lines
--- arch/x86/kvm/emulate.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-)arch/x86/kvm/emulate.c +13
-1@@ -2025,6 +2025,17 @@ static int em_ret_far(struct x86_emulate_ctxt *ctxt)return rc; } +static int em_ret_far_imm (struct x86_emulate_ctxt *ctxt) +{ +int rc; + + rc =em_ret_far (ctxt); +if (rc !=X86EMUL_CONTINUE ) +return rc; +rsp_increment (ctxt, ctxt->src.val); +return X86EMUL_CONTINUE ; +} +static int em_cmpxchg (struct x86_emulate_ctxt *ctxt) {/* Save real source value, then compare EAX against destination. */ @@ -3763,7 +3774,8 @@ static const struct opcode opcode_table[256] = {G (ByteOp, group11),G (0 , group11),/* 0xC8 - 0xCF */ I (Stack | SrcImmU16 | Src2ImmByte, em_enter),I (Stack, em_leave), -N ,I (ImplicitOps | Stack, em_ret_far), +I (ImplicitOps | Stack | SrcImmU16, em_ret_far_imm), +I (ImplicitOps | Stack, em_ret_far),D (ImplicitOps),DI (SrcImmByte, intn), D(ImplicitOps | No64), II(ImplicitOps, em_iret, iret),/* 0xD0 - 0xD7 */ Signature · 1 line
1.7.7
--
Gleb.
Il 09/09/2013 17:40, Bruce Rogers ha scritto:
Quoted 33 lines
Opcode CA
This gets used by a DOS based NetWare guest.
Signed-off-by Bruce Rogers <[email protected]>--- arch/x86/kvm/emulate.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-)arch/x86/kvm/emulate.c +11
-0@@ -2025,6 +2025,17 @@ static int em_ret_far(struct x86_emulate_ctxt *ctxt)return rc; } +static int em_ret_far_imm (struct x86_emulate_ctxt *ctxt) +{ +int rc; + + rc =em_ret_far (ctxt); +if (rc !=X86EMUL_CONTINUE ) +return rc; +rsp_increment (ctxt, ctxt->src.val); +return X86EMUL_CONTINUE ; +} +static int em_cmpxchg (struct x86_emulate_ctxt *ctxt) {/* Save real source value, then compare EAX against destination. */
arch/x86/kvm/emulate.c static const struct opcode opcode_table[256] = { · line 3781
Quoted 9 lines
arch/x86/kvm/emulate.c +2
-1@@ -3763,7 +3774,8 @@ static const struct opcode opcode_table[256] = {G (ByteOp, group11),G (0 , group11),/* 0xC8 - 0xCF */ I (Stack | SrcImmU16 | Src2ImmByte, em_enter),I (Stack, em_leave), -N ,I (ImplicitOps | Stack, em_ret_far), +I (ImplicitOps | Stack | SrcImmU16, em_ret_far_imm), +I (ImplicitOps | Stack, em_ret_far),D (ImplicitOps),DI (SrcImmByte, intn), D(ImplicitOps | No64), II(ImplicitOps, em_iret, iret),/* 0xD0 - 0xD7 */
Applied to kvm/queue for 3.12, thanks.