From c68ea49f5989c6110923f6abf98212578a5a4001 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Fri, 19 Jun 2015 14:09:13 +0545 Subject: [PATCH] gdb: bfin: use align helper --- gdb/ChangeLog | 5 +++++ gdb/bfin-tdep.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 86a8b482fcb..7ece6c75d9c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2021-01-04 Mike Frysinger + + * bfin-tdep.c (bfin_push_dummy_call): Use align_up. + (bfin_frame_align): Use align_down. + 2021-01-04 Tom de Vries * buildsym.c (buildsym_compunit::record_line): Filter out end-of-seq diff --git a/gdb/bfin-tdep.c b/gdb/bfin-tdep.c index fc3258a4619..963b0485a48 100644 --- a/gdb/bfin-tdep.c +++ b/gdb/bfin-tdep.c @@ -510,7 +510,7 @@ bfin_push_dummy_call (struct gdbarch *gdbarch, { struct type *value_type = value_enclosing_type (args[i]); - total_len += (TYPE_LENGTH (value_type) + 3) & ~3; + total_len += align_up (TYPE_LENGTH (value_type), 4); } /* At least twelve bytes of stack space must be allocated for the function's @@ -526,7 +526,7 @@ bfin_push_dummy_call (struct gdbarch *gdbarch, { struct type *value_type = value_enclosing_type (args[i]); struct type *arg_type = check_typedef (value_type); - int container_len = (TYPE_LENGTH (arg_type) + 3) & ~3; + int container_len = align_up (TYPE_LENGTH (arg_type), 4); sp -= container_len; write_memory (sp, value_contents (args[i]), container_len); @@ -759,7 +759,7 @@ static const struct frame_base bfin_frame_base = static CORE_ADDR bfin_frame_align (struct gdbarch *gdbarch, CORE_ADDR address) { - return (address & ~0x3); + return align_down (address, 4); } enum bfin_abi -- 2.30.2