Module Name:    src
Committed By:   joerg
Date:           Mon Apr 23 22:53:04 UTC 2018

Modified Files:
        src/sys/arch/amd64/amd64: locore.S

Log Message:
Adjust Xsyscall_svs to not use movq for 64bit immediates either.


To generate a diff of this commit:
cvs rdiff -u -r1.164 -r1.165 src/sys/arch/amd64/amd64/locore.S

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/amd64/amd64/locore.S
diff -u src/sys/arch/amd64/amd64/locore.S:1.164 src/sys/arch/amd64/amd64/locore.S:1.165
--- src/sys/arch/amd64/amd64/locore.S:1.164	Sat Apr 21 23:25:01 2018
+++ src/sys/arch/amd64/amd64/locore.S	Mon Apr 23 22:53:04 2018
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.164 2018/04/21 23:25:01 joerg Exp $	*/
+/*	$NetBSD: locore.S,v 1.165 2018/04/23 22:53:04 joerg Exp $	*/
 
 /*
  * Copyright-o-rama!
@@ -1388,8 +1388,8 @@ IDTVEC(\name)
 
 	/* Get the LWP's kernel stack pointer in %rax */
 	.if	\is_svs
-		movq	%rax,SVS_UTLS+UTLS_SCRATCH
-		movq	SVS_UTLS+UTLS_RSP0,%rax
+		movabs	%rax,SVS_UTLS+UTLS_SCRATCH
+		movabs	SVS_UTLS+UTLS_RSP0,%rax
 	.else
 		movq	%rax,CPUVAR(SCRATCH)
 		movq	CPUVAR(CURLWP),%rax
@@ -1407,7 +1407,7 @@ IDTVEC(\name)
 
 	/* Restore %rax */
 	.if	\is_svs
-		movq	SVS_UTLS+UTLS_SCRATCH,%rax
+		movabs	SVS_UTLS+UTLS_SCRATCH,%rax
 	.else
 		movq	CPUVAR(SCRATCH),%rax
 	.endif

Reply via email to