The branch main has been updated by andrew:
URL:
https://cgit.FreeBSD.org/src/commit/?id=a7c5c88cb29ff512467a6599f1b4d8e2b8817480
commit a7c5c88cb29ff512467a6599f1b4d8e2b8817480
Author: Andrew Turner <and...@freebsd.org>
AuthorDate: 2024-10-15 08:30:17 +0000
Commit: Andrew Turner <and...@freebsd.org>
CommitDate: 2024-10-15 17:24:42 +0000
arm64: Stop trashing x28 in savectx
While here make it return void, we don't set any useful return value
and nothing checks for it.
Sponsored by: Arm Ltd
---
sys/arm64/arm64/swtch.S | 10 ++++------
sys/arm64/include/pcb.h | 2 +-
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/sys/arm64/arm64/swtch.S b/sys/arm64/arm64/swtch.S
index 6af70ca839a0..c683a7e25314 100644
--- a/sys/arm64/arm64/swtch.S
+++ b/sys/arm64/arm64/swtch.S
@@ -267,14 +267,12 @@ ENTRY(savectx)
mrs x6, tpidr_el0
stp x5, x6, [x0, #PCB_SP]
- /* Store the VFP registers */
#ifdef VFP
- mov x28, lr
- bl vfp_save_state_savectx
- mov lr, x28
-#endif
-
+ /* Store the VFP registers */
+ b vfp_save_state_savectx
+#else
ret
+#endif
END(savectx)
GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL)
diff --git a/sys/arm64/include/pcb.h b/sys/arm64/include/pcb.h
index 273b53cdc6cf..c0feb1149cf5 100644
--- a/sys/arm64/include/pcb.h
+++ b/sys/arm64/include/pcb.h
@@ -85,7 +85,7 @@ struct pcb {
#ifdef _KERNEL
void makectx(struct trapframe *tf, struct pcb *pcb);
-int savectx(struct pcb *pcb) __returns_twice;
+void savectx(struct pcb *pcb) __returns_twice;
#endif
#endif /* !LOCORE */
