gdb: bfin: use align helper

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 86a8b482fcbf894a0a5fbfbdf18f80fa54dc8b29..7ece6c75d9cd9df119b1f44d69cc5faf3b5c7c41 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2021-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+       * bfin-tdep.c (bfin_push_dummy_call): Use align_up.
+       (bfin_frame_align): Use align_down.
+
 2021-01-04  Tom de Vries  <tdevries@suse.de>
 
        * buildsym.c (buildsym_compunit::record_line): Filter out end-of-seq

diff --git a/gdb/bfin-tdep.c b/gdb/bfin-tdep.c
index fc3258a4619a82fcfd66f0b07dc141a5c2a32637..963b0485a48a4ed91c04197cff8d095ac8e2a4ac 100644 (file)
--- 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