Module Name: src
Committed By: joerg
Date: Sat Apr 21 23:25:01 UTC 2018
Modified Files:
src/sys/arch/amd64/amd64: locore.S
Log Message:
Do not use movq for loading arbitrary 64bit immediates. The ISA
restricts it to 32bit immediates.
To generate a diff of this commit:
cvs rdiff -u -r1.163 -r1.164 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.163 src/sys/arch/amd64/amd64/locore.S:1.164
--- src/sys/arch/amd64/amd64/locore.S:1.163 Fri Mar 30 09:53:08 2018
+++ src/sys/arch/amd64/amd64/locore.S Sat Apr 21 23:25:01 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.163 2018/03/30 09:53:08 maxv Exp $ */
+/* $NetBSD: locore.S,v 1.164 2018/04/21 23:25:01 joerg Exp $ */
/*
* Copyright-o-rama!
@@ -1616,7 +1616,7 @@ END(intrfastexit)
.globl nosvs_leave_altstack, nosvs_leave_altstack_end
LABEL(svs_enter)
- movq SVS_UTLS+UTLS_KPDIRPA,%rax
+ movabs SVS_UTLS+UTLS_KPDIRPA,%rax
movq %rax,%cr3
movq CPUVAR(KRSP0),%rsp
LABEL(svs_enter_end)
@@ -1624,7 +1624,7 @@ LABEL(svs_enter_end)
LABEL(svs_enter_altstack)
testb $SEL_UPL,TF_CS(%rsp)
jz 1234f
- movq SVS_UTLS+UTLS_KPDIRPA,%rax
+ movabs SVS_UTLS+UTLS_KPDIRPA,%rax
movq %rax,%cr3
1234:
LABEL(svs_enter_altstack_end)
