svn commit: r368135 - stable/12/sys/amd64/vmm/amd

[Peter Grehan]

Author: grehan
Date: Sun Nov 29 00:54:13 2020
New Revision: 368135
URL: https://svnweb.freebsd.org/changeset/base/368135

Log:
  MFC r368047
   Remove manual instruction encodings for VMLOAD, VMRUN, and VMSAVE.

Modified:
  stable/12/sys/amd64/vmm/amd/svm_support.S
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/amd64/vmm/amd/svm_support.S
==============================================================================
--- stable/12/sys/amd64/vmm/amd/svm_support.S	Sun Nov 29 00:49:14 2020	(r368134)
+++ stable/12/sys/amd64/vmm/amd/svm_support.S	Sun Nov 29 00:54:13 2020	(r368135)
@@ -39,10 +39,6 @@
 #define	VENTER  push %rbp ; mov %rsp,%rbp
 #define	VLEAVE  pop %rbp
 
-#define	VMLOAD	.byte 0x0f, 0x01, 0xda
-#define	VMRUN	.byte 0x0f, 0x01, 0xd8
-#define	VMSAVE	.byte 0x0f, 0x01, 0xdb
-
 /*
  * svm_launch(uint64_t vmcb, struct svm_regctx *gctx, struct pcpu *pcpu)
  * %rdi: physical address of VMCB
@@ -91,9 +87,9 @@ ENTRY(svm_launch)
 	movq SCTX_RDI(%rsi), %rdi
 	movq SCTX_RSI(%rsi), %rsi	/* %rsi must be restored last */
 
-	VMLOAD
-	VMRUN
-	VMSAVE
+	vmload %rax
+	vmrun %rax
+	vmsave %rax
 
 	pop %rax		/* pop guest context pointer from the stack */