From 7f6da53c341bd2fe3be378110cfebf3e18d4b603 Mon Sep 17 00:00:00 2001 From: Dave Tucker Date: Tue, 7 Jun 2022 15:51:45 +0100 Subject: [PATCH] bpf: Fix pt_regs for aarch64 (again) Signed-off-by: Dave Tucker --- bpf/aya-bpf/src/args.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bpf/aya-bpf/src/args.rs b/bpf/aya-bpf/src/args.rs index 2146e047..db361bc8 100644 --- a/bpf/aya-bpf/src/args.rs +++ b/bpf/aya-bpf/src/args.rs @@ -135,14 +135,14 @@ impl FromPtRegs for *const T { impl FromPtRegs for *const T { fn from_argument(ctx: &pt_regs, n: usize) -> Option { if n <= 7 { - Some(ctx.regs.regs[n] as *const _) + Some(ctx.regs[n] as *const _) } else { None } } fn from_retval(ctx: &pt_regs) -> Option { - Some(ctx.regs.regs[0] as *const _) + Some(ctx.regs[0] as *const _) } } @@ -184,14 +184,14 @@ impl FromPtRegs for *mut T { impl FromPtRegs for *mut T { fn from_argument(ctx: &pt_regs, n: usize) -> Option { if n <= 7 { - Some(ctx.regs.regs[n] as *mut _) + Some(ctx.regs[n] as *mut _) } else { None } } fn from_retval(ctx: &pt_regs) -> Option { - Some(ctx.regs.regs[0] as *mut _) + Some(ctx.regs[0] as *mut _) } } @@ -236,14 +236,14 @@ macro_rules! impl_from_pt_regs { impl FromPtRegs for $type { fn from_argument(ctx: &pt_regs, n: usize) -> Option { if n <= 7 { - Some(ctx.regs.regs[n] as *const $type as _) + Some(ctx.regs[n] as *const $type as _) } else { None } } fn from_retval(ctx: &pt_regs) -> Option { - Some(ctx.regs.regs[0] as *const $type as _) + Some(ctx.regs[0] as *const $type as _) } } };