Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
KVM: x86: Introduce EM_ASM_3WCL
Replace the FASTOP3WCL instructions.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Sean Christopherson <seanjc@google.com>
Link: https://lkml.kernel.org/r/20250714103440.513865075@infradead.org
+19
-6
+19
-6
arch/x86/kvm/emulate.c
+19
-6
arch/x86/kvm/emulate.c
···
302
302
#define __EM_ASM_2(op, dst, src) \
303
303
__EM_ASM(#op " %%" #src ", %%" #dst " \n\t")
304
304
305
+
#define __EM_ASM_3(op, dst, src, src2) \
306
+
__EM_ASM(#op " %%" #src2 ", %%" #src ", %%" #dst " \n\t")
307
+
305
308
#define EM_ASM_END \
306
309
} \
307
310
ctxt->eflags = (ctxt->eflags & ~EFLAGS_MASK) | (flags & EFLAGS_MASK); \
···
373
370
case 4: __EM_ASM_2(op##l, eax, cl); break; \
374
371
ON64(case 8: __EM_ASM_2(op##q, rax, cl); break;) \
375
372
EM_ASM_END
373
+
374
+
/* 3-operand, using "a" (dst), "d" (src) and CL (src2) */
375
+
#define EM_ASM_3WCL(op) \
376
+
EM_ASM_START(op) \
377
+
case 1: break; \
378
+
case 2: __EM_ASM_3(op##w, ax, dx, cl); break; \
379
+
case 4: __EM_ASM_3(op##l, eax, edx, cl); break; \
380
+
ON64(case 8: __EM_ASM_3(op##q, rax, rdx, cl); break;) \
381
+
EM_ASM_END
382
+
376
383
377
384
/*
378
385
* fastop functions have a special calling convention:
···
1110
1097
EM_ASM_1SRC2EX(div, div_ex);
1111
1098
EM_ASM_1SRC2EX(idiv, idiv_ex);
1112
1099
1113
-
FASTOP3WCL(shld);
1114
-
FASTOP3WCL(shrd);
1100
+
EM_ASM_3WCL(shld);
1101
+
EM_ASM_3WCL(shrd);
1115
1102
1116
1103
EM_ASM_2W(imul);
1117
1104
···
4509
4496
I(Stack | Src2FS, em_push_sreg), I(Stack | Src2FS, em_pop_sreg),
4510
4497
II(ImplicitOps, em_cpuid, cpuid),
4511
4498
I(DstMem | SrcReg | ModRM | BitOp | NoWrite, em_bt),
4512
-
F(DstMem | SrcReg | Src2ImmByte | ModRM, em_shld),
4513
-
F(DstMem | SrcReg | Src2CL | ModRM, em_shld), N, N,
4499
+
I(DstMem | SrcReg | Src2ImmByte | ModRM, em_shld),
4500
+
I(DstMem | SrcReg | Src2CL | ModRM, em_shld), N, N,
4514
4501
/* 0xA8 - 0xAF */
4515
4502
I(Stack | Src2GS, em_push_sreg), I(Stack | Src2GS, em_pop_sreg),
4516
4503
II(EmulateOnUD | ImplicitOps, em_rsm, rsm),
4517
4504
I(DstMem | SrcReg | ModRM | BitOp | Lock | PageTable, em_bts),
4518
-
F(DstMem | SrcReg | Src2ImmByte | ModRM, em_shrd),
4519
-
F(DstMem | SrcReg | Src2CL | ModRM, em_shrd),
4505
+
I(DstMem | SrcReg | Src2ImmByte | ModRM, em_shrd),
4506
+
I(DstMem | SrcReg | Src2CL | ModRM, em_shrd),
4520
4507
GD(0, &group15), I(DstReg | SrcMem | ModRM, em_imul),
4521
4508
/* 0xB0 - 0xB7 */
4522
4509
I2bv(DstMem | SrcReg | ModRM | Lock | PageTable | SrcWrite, em_cmpxchg),