git: ba2bbac4c15a - main - Revert "Check alignment of fp in unwind_frame"
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 15 Nov 2022 12:38:04 UTC
The branch main has been updated by andrew:
URL: https://cgit.FreeBSD.org/src/commit/?id=ba2bbac4c15aa296e36308d98ff5ef5c767f64aa
commit ba2bbac4c15aa296e36308d98ff5ef5c767f64aa
Author: Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2022-11-15 12:32:59 +0000
Commit: Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2022-11-15 12:33:39 +0000
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 81431e109494..470b64c00540 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 a66ffebcdc35..9efb1fef9451 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;