The branch stable/14 has been updated by kib:
URL:
https://cgit.FreeBSD.org/src/commit/?id=7a1723912e4fd97726c6fa55a9f86b7b4772af64
commit 7a1723912e4fd97726c6fa55a9f86b7b4772af64
Author: Konstantin Belousov <k...@freebsd.org>
AuthorDate: 2024-09-11 00:35:43 +0000
Commit: Konstantin Belousov <k...@freebsd.org>
CommitDate: 2024-09-23 13:03:06 +0000
amd64 la57_trampoline: stop using %rdx to remember original %cr0
(cherry picked from commit 9a49c98bafbea2a896f72defe7d9f2b65a474c41)
---
sys/amd64/amd64/locore.S | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S
index a51e5047fe54..86db0f76b22b 100644
--- a/sys/amd64/amd64/locore.S
+++ b/sys/amd64/amd64/locore.S
@@ -93,9 +93,10 @@ ENTRY(btext)
ENTRY(la57_trampoline)
movq %rsp,%r11
movq %rbx,%r10
+ movq %rbp,%r9
leaq la57_trampoline_end(%rip),%rsp
- movq %cr0,%rdx
+ movq %cr0,%rbp
lgdtq la57_trampoline_gdt_desc(%rip)
pushq $(2<<3)
@@ -109,7 +110,7 @@ ENTRY(la57_trampoline)
l1: movl $(3<<3),%eax
movl %eax,%ss
- movl %edx,%eax
+ movl %ebp,%eax
andl $~CR0_PG,%eax
movl %eax,%cr0
@@ -118,7 +119,7 @@ l1: movl $(3<<3),%eax
movl %eax,%cr4
movl %edi,%cr3
- movl %edx,%cr0
+ movl %ebp,%cr0
jmp 1f
1: pushl $(1<<3)
@@ -128,6 +129,7 @@ l1: movl $(3<<3),%eax
l2: movq %r11,%rsp
movq %r10,%rbx
+ movq %r9,%rbp
retq
.p2align 4,0
ENTRY(la57_trampoline_gdt_desc)
