From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH 3/5] hvmloader/tests: use .code64 in 64bit snippets Date: Tue, 29 Jul 2014 15:29:59 +0100 Message-ID: <1406644201-9850-4-git-send-email-andrew.cooper3@citrix.com> References: <1406644201-9850-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1406644201-9850-1-git-send-email-andrew.cooper3@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Xen-devel Cc: Keir Fraser , Ian Campbell , Andrew Cooper , Ian Jackson , Tim Deegan , Jan Beulich List-Id: xen-devel@lists.xenproject.org No functional change, but makes the code rather more legible. Signed-off-by: Andrew Cooper CC: Keir Fraser CC: Jan Beulich CC: Tim Deegan CC: Ian Campbell CC: Ian Jackson --- tools/firmware/hvmloader/tests.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/firmware/hvmloader/tests.c b/tools/firmware/hvmloader/tests.c index 52772aa..37d16f8 100644 --- a/tools/firmware/hvmloader/tests.c +++ b/tools/firmware/hvmloader/tests.c @@ -170,12 +170,14 @@ static int shadow_gs_test(void) /* Push LRETQ stack frame. */ "pushl $0; pushl $"STR(SEL_CODE32)"; pushl $0; pushl $2f; " /* Jump to 64-bit mode. */ - "ljmp $"STR(SEL_CODE64)",$1f; 1: " + "ljmp $"STR(SEL_CODE64)",$1f; " + ".code64; 1: " /* Swap GS_BASE and SHADOW_GS_BASE */ - ".byte 0x0f,0x01,0xf8; " /* SWAPGS */ + "swapgs; " /* Jump to 32-bit mode. */ - ".byte 0x89, 0xe4; " /* MOV ESP,ESP */ - ".byte 0x48, 0xcb; 2: " /* LRETQ */ + "movl %%esp,%%esp; " + "lretq; " + ".code32; 2:" /* Read SHADOW_GS_BASE: should now contain 2 */ "mov $0xc0000102,%%ecx; rdmsr; mov %%eax,%%ebx; " /* CR0.PG=0 */ -- 1.7.10.4