From 4836ce7d438c48b3526626f2e8b4d6cf36f903e6 Mon Sep 17 00:00:00 2001 From: Eugene Myers Date: Wed, 29 Jan 2020 18:49:48 -0500 Subject: [PATCH] Fix for problem in restore order for AsmVmLaunch & AsmVmResume Restore of rdi and rsi were reversed with respect to the vmexit. --- Stm/StmPkg/Library/StmLib/x64/AsmVmLaunch.s | 4 ++-- Stm/StmPkg/Library/StmLib/x64/AsmVmResume.s | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Stm/StmPkg/Library/StmLib/x64/AsmVmLaunch.s b/Stm/StmPkg/Library/StmLib/x64/AsmVmLaunch.s index ed8b9dd..cc83cbc 100644 --- a/Stm/StmPkg/Library/StmLib/x64/AsmVmLaunch.s +++ b/Stm/StmPkg/Library/StmLib/x64/AsmVmLaunch.s @@ -29,8 +29,8 @@ ASM_PFX(AsmVmLaunch): movq 16(%rcx), %rdx movq 24(%rcx), %rbx movq 40(%rcx), %rbp - movq 48(%rcx), %rdi - movq 56(%rcx), %rsi + movq 48(%rcx), %rsi + movq 56(%rcx), %rdi movq 64(%rcx), %r8 movq 72(%rcx), %r9 movq 80(%rcx), %r10 diff --git a/Stm/StmPkg/Library/StmLib/x64/AsmVmResume.s b/Stm/StmPkg/Library/StmLib/x64/AsmVmResume.s index b515aa4..5f4548f 100644 --- a/Stm/StmPkg/Library/StmLib/x64/AsmVmResume.s +++ b/Stm/StmPkg/Library/StmLib/x64/AsmVmResume.s @@ -29,8 +29,8 @@ ASM_PFX(AsmVmResume): movq 16(%rcx), %rdx movq 24(%rcx), %rbx movq 40(%rcx), %rbp - movq 48(%rcx), %rdi - movq 56(%rcx), %rsi + movq 48(%rcx), %rsi + movq 56(%rcx), %rdi movq 64(%rcx), %r8 movq 72(%rcx), %r9 movq 80(%rcx), %r10