From ba2bbac4c15aa296e36308d98ff5ef5c767f64aa Mon Sep 17 00:00:00 2001 From: Andrew Turner Date: Tue, 15 Nov 2022 12:32:59 +0000 Subject: [PATCH] Revert "Check alignment of fp in unwind_frame" Fix the build as is_aligned doesn't exist in FreeBSD. This reverts commit 40e0fa10f58d90744c2857b57adf0ddbce1a1e1c. --- sys/arm64/arm64/unwind.c | 3 +-- sys/riscv/riscv/unwind.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sys/arm64/arm64/unwind.c b/sys/arm64/arm64/unwind.c index 81431e10949..470b64c0054 100644 --- a/sys/arm64/arm64/unwind.c +++ b/sys/arm64/arm64/unwind.c @@ -41,8 +41,7 @@ unwind_frame(struct thread *td, struct unwind_state *frame) fp = frame->fp; - if (!is_aligned(fp, sizeof(fp)) || - !kstack_contains(td, fp, sizeof(fp) * 2)) + if (!kstack_contains(td, fp, sizeof(uintptr_t) * 2)) return (false); /* FP to previous frame (X29) */ diff --git a/sys/riscv/riscv/unwind.c b/sys/riscv/riscv/unwind.c index a66ffebcdc3..9efb1fef945 100644 --- a/sys/riscv/riscv/unwind.c +++ b/sys/riscv/riscv/unwind.c @@ -47,8 +47,7 @@ unwind_frame(struct thread *td, struct unwind_state *frame) fp = frame->fp; - if (!is_aligned(fp, sizeof(fp)) || - !kstack_contains(td, fp - sizeof(fp) * 2, sizeof(fp) * 2)) + if (!kstack_contains(td, fp - sizeof(fp) * 2, sizeof(fp) * 2)) return (false); frame->sp = fp;