KVM: emulate AAM, XLAT, SALC
Subsystems (2)
Paolo Bonzini
maintainerv2 cover KVM: emulate AAM, XLAT, SALC
These three instructions are not emulated, but can be found in real mode code.
These are also good for stable, but they conflict before 3.9 and are not really useful since emulate_invalid_guest_state defaulted to false. So I'm not marking them for earlier releases.
Paolo Bonzini (3):
KVM: emulator: emulate AAM
KVM: emulator: emulate XLAT
KVM: emulator: emulate SALC
arch/x86/kvm/emulate.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-)
Signature · 1 line
1.8.1.4
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [PATCH v2 2/3] KVM: emulator: emulate XLAT
Quoted 41 lines · Paolo Bonzini
This is used by SGABIOS, KVM breaks with emulate_invalid_guest_state=1. It is just a MOV in disguise, with a funny source address.
Reported-by Jun'ichi Nomura <[email protected]>Cc [email protected] # 3.9Signed-off-by Paolo Bonzini <[email protected]>--- arch/x86/kvm/emulate.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)arch/x86/kvm/emulate.c +4
-1@@ -60,6 +60,7 @@#define OpGS 25ull/* GS */ #define OpMem8 26ull/* 8-bit zero extended memory operand */ #define OpImm64 27ull/* Sign extended 16/32/64-bit immediate */ +#define OpXLat 28ull/* memory at BX/EBX/RBX + zero-extended AL */ #define OpBits 5/* Width of operand field */ #define OpMask ((1ull << OpBits) - 1)@@ -99,6 +100,7 @@#define SrcImmUByte (OpImmUByte << SrcShift)#define SrcImmU (OpImmU << SrcShift)#define SrcSI (OpSI << SrcShift) +#define SrcXLat (OpXLat << SrcShift)#define SrcImmFAddr (OpImmFAddr << SrcShift)#define SrcMemFAddr (OpMemFAddr << SrcShift)#define SrcAcc (OpAcc << SrcShift)@@ -3949,7 +3951,8 @@ static const struct opcode opcode_table[256] = {G (Src2One | ByteOp, group2),G (Src2One, group2),G (Src2CL | ByteOp, group2),G (Src2CL, group2),I (DstAcc | SrcImmUByte | No64, em_aam), -I (DstAcc | SrcImmUByte | No64, em_aad),N ,N , +I (DstAcc | SrcImmUByte | No64, em_aad),N , +I (DstAcc | SrcXLat | ByteOp, em_mov),/* 0xD8 - 0xDF */ N ,E (0 , &escape_d9),N ,E (0 , &escape_db),N ,E (0 , &escape_dd),N ,N , /* 0xE0 - 0xE7 */
arch/x86/kvm/emulate.c static int decode_operand(struct x86_emulate_ctxt *ctxt, struct operand *op, · line 4213
Quoted 4 lines
arch/x86/kvm/emulate.c +1
-0@@ -4207,6 +4210,17 @@ static int decode_operand(struct x86_emulate_ctxt *ctxt, struct operand *op, op->val =0 ; op->count =1 ;break ; +case OpXLat:
Sigh, obviously this is not reusable by any other instruction. So many waisted transistor :(
arch/x86/kvm/emulate.c static int decode_operand(struct x86_emulate_ctxt *ctxt, struct operand *op, · line 4222
Quoted 9 lines
arch/x86/kvm/emulate.c +9
-0+ op->type =OP_MEM ; + op->bytes = (ctxt->d & ByteOp) ?1 : ctxt->op_bytes; + op->addr.mem.ea = +register_address (ctxt, +reg_read (ctxt,VCPU_REGS_RBX ) + + (reg_read (ctxt,VCPU_REGS_RAX ) &0xff )); + op->addr.mem.seg =seg_override (ctxt); + op->val =0 ; + op->count =1 ;
The count is set only for decoding that is used by string instructions. I can drop it while applying.
Quoted 7 lines
arch/x86/kvm/emulate.c +1
-0+break ;case OpImmFAddr: op->type =OP_IMM ; op->addr.mem.ea = ctxt->_eip;Signature · 1 line
1.8.1.4
--
Gleb.
Paolo Bonzini
maintainerRe: [PATCH v2 2/3] KVM: emulator: emulate XLAT
Il 09/05/2013 12:03, Gleb Natapov ha scritto:
Quoted 40 lines · Paolo Bonzini
Quoted 39 lines
This is used by SGABIOS, KVM breaks with emulate_invalid_guest_state=1. It is just a MOV in disguise, with a funny source address.
Reported-by Jun'ichi Nomura <[email protected]>Cc [email protected] # 3.9Signed-off-by Paolo Bonzini <[email protected]>--- arch/x86/kvm/emulate.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)arch/x86/kvm/emulate.c +4
-1@@ -60,6 +60,7 @@#define OpGS 25ull/* GS */ #define OpMem8 26ull/* 8-bit zero extended memory operand */ #define OpImm64 27ull/* Sign extended 16/32/64-bit immediate */ +#define OpXLat 28ull/* memory at BX/EBX/RBX + zero-extended AL */ #define OpBits 5/* Width of operand field */ #define OpMask ((1ull << OpBits) - 1)@@ -99,6 +100,7 @@#define SrcImmUByte (OpImmUByte << SrcShift)#define SrcImmU (OpImmU << SrcShift)#define SrcSI (OpSI << SrcShift) +#define SrcXLat (OpXLat << SrcShift)#define SrcImmFAddr (OpImmFAddr << SrcShift)#define SrcMemFAddr (OpMemFAddr << SrcShift)#define SrcAcc (OpAcc << SrcShift)@@ -3949,7 +3951,8 @@ static const struct opcode opcode_table[256] = {G (Src2One | ByteOp, group2),G (Src2One, group2),G (Src2CL | ByteOp, group2),G (Src2CL, group2),I (DstAcc | SrcImmUByte | No64, em_aam), -I (DstAcc | SrcImmUByte | No64, em_aad),N ,N , +I (DstAcc | SrcImmUByte | No64, em_aad),N , +I (DstAcc | SrcXLat | ByteOp, em_mov),/* 0xD8 - 0xDF */ N, E(0, &escape_d9), N, E(0, &escape_db), N, E(0, &escape_dd), N, N,
Quoted 8 lines
arch/x86/kvm/emulate.c static int decode_operand(struct x86_emulate_ctxt *ctxt, struct operand *op, · line 4213
Quoted 6 lines
arch/x86/kvm/emulate.c +1
-0/* 0xE0 - 0xE7 */ @@ -4207,6 +4210,17 @@ static int decode_operand(struct x86_emulate_ctxt *ctxt, struct operand *op, op->val =0 ; op->count =1 ;break ; +case OpXLat:Sigh, obviously this is not reusable by any other instruction. So many waisted transistor :(
And a precious op value too, we only have 3 left. :/
Quoted 11 lines
arch/x86/kvm/emulate.c static int decode_operand(struct x86_emulate_ctxt *ctxt, struct operand *op, · line 4222
Quoted 9 lines
arch/x86/kvm/emulate.c +9
-0+ op->type =OP_MEM ; + op->bytes = (ctxt->d & ByteOp) ?1 : ctxt->op_bytes; + op->addr.mem.ea = +register_address (ctxt, +reg_read (ctxt,VCPU_REGS_RBX ) + + (reg_read (ctxt,VCPU_REGS_RAX ) &0xff )); + op->addr.mem.seg =seg_override (ctxt); + op->val =0 ; + op->count =1 ;The count is set only for decoding that is used by string instructions. I can drop it while applying.
Thanks!
Paolo
Quoted 11 lines
Quoted 7 lines
arch/x86/kvm/emulate.c +1
-0+break ;case OpImmFAddr: op->type =OP_IMM ; op->addr.mem.ea = ctxt->_eip;Signature · 1 line
1.8.1.4--
Gleb.
Gleb Natapov
AppliedQuoted 12 lines · Paolo Bonzini
These three instructions are not emulated, but can be found in real mode code.
These are also good for stable, but they conflict before 3.9 and are not really useful since
emulate_invalid_guest_statedefaulted to false. So I'm not marking them for earlier releases.Paolo Bonzini (3):
KVM: emulator: emulate AAM
KVM: emulator: emulate XLAT
KVM: emulator: emulate SALC
Applied, thanks.
Quoted 5 lines
arch/x86/kvm/emulate.c | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-)Signature · 1 line
1.8.1.4
--
Gleb.