gdb/arm: Unwind Non-Secure callbacks from Secure

[binutils-gdb.git] / gdb / nios2-tdep.c

diff --git a/gdb/nios2-tdep.c b/gdb/nios2-tdep.c
index 706b579ef174c80176aa72ba5926ca67821a114d..159d31b2d0fe5a507b1f2abfcf4861aca6f21366 100644 (file)
--- a/gdb/nios2-tdep.c
+++ b/gdb/nios2-tdep.c
@@ -1,5 +1,5 @@
 /* Target-machine dependent code for Nios II, for GDB.
-   Copyright (C) 2012-2021 Free Software Foundation, Inc.
+   Copyright (C) 2012-2022 Free Software Foundation, Inc.
    Contributed by Peter Brookes (pbrookes@altera.com)
    and Andrew Draper (adraper@altera.com).
    Contributed by Mentor Graphics, Inc.
@@ -1222,10 +1222,10 @@ nios2_analyze_prologue (struct gdbarch *gdbarch, const CORE_ADDR start_pc,
   int innermost = (this_frame ? (frame_relative_level (this_frame) == 0) : 1);
 
   if (nios2_debug)
-    fprintf_unfiltered (gdb_stdlog,
-                       "{ nios2_analyze_prologue start=%s, current=%s ",
-                       paddress (gdbarch, start_pc),
-                       paddress (gdbarch, current_pc));
+    gdb_printf (gdb_stdlog,
+               "{ nios2_analyze_prologue start=%s, current=%s ",
+               paddress (gdbarch, start_pc),
+               paddress (gdbarch, current_pc));
 
   /* Set up the default values of the registers.  */
   nios2_setup_default (cache);
@@ -1252,7 +1252,7 @@ nios2_analyze_prologue (struct gdbarch *gdbarch, const CORE_ADDR start_pc,
          memcpy (temp_value, value, sizeof (temp_value));
          value = temp_value;
          if (nios2_debug)
-           fprintf_unfiltered (gdb_stdlog, "*");
+           gdb_printf (gdb_stdlog, "*");
        }
 
       op = nios2_fetch_insn (gdbarch, pc, &insn);
@@ -1265,9 +1265,9 @@ nios2_analyze_prologue (struct gdbarch *gdbarch, const CORE_ADDR start_pc,
       if (nios2_debug)
        {
          if (op->size == 2)
-           fprintf_unfiltered (gdb_stdlog, "[%04X]", insn & 0xffff);
+           gdb_printf (gdb_stdlog, "[%04X]", insn & 0xffff);
          else
-           fprintf_unfiltered (gdb_stdlog, "[%08X]", insn);
+           gdb_printf (gdb_stdlog, "[%08X]", insn);
        }
 
       /* The following instructions can appear in the prologue.  */
@@ -1554,7 +1554,7 @@ nios2_analyze_prologue (struct gdbarch *gdbarch, const CORE_ADDR start_pc,
     cache->return_regnum = NIOS2_EA_REGNUM;
 
   if (nios2_debug)
-    fprintf_unfiltered (gdb_stdlog, "\n-> retreg=%d, ", cache->return_regnum);
+    gdb_printf (gdb_stdlog, "\n-> retreg=%d, ", cache->return_regnum);
 
   if (cache->reg_value[NIOS2_FP_REGNUM].reg == NIOS2_SP_REGNUM)
     /* If the FP now holds an offset from the CFA then this is a
@@ -1571,7 +1571,7 @@ nios2_analyze_prologue (struct gdbarch *gdbarch, const CORE_ADDR start_pc,
       /* Somehow the stack pointer has been corrupted.
         We can't return.  */
       if (nios2_debug)
-       fprintf_unfiltered (gdb_stdlog, "<can't reach cfa> }\n");
+       gdb_printf (gdb_stdlog, "<can't reach cfa> }\n");
       return 0;
     }
 
@@ -1598,7 +1598,7 @@ nios2_analyze_prologue (struct gdbarch *gdbarch, const CORE_ADDR start_pc,
          if (ra == current_pc)
            {
              if (nios2_debug)
-               fprintf_unfiltered
+               gdb_printf
                  (gdb_stdlog,
                   "<noreturn ADJUST %s, r31@r%d+?>, r%d@r%d+?> }\n",
                   paddress (gdbarch, cache->reg_value[base_reg].offset),
@@ -1660,8 +1660,8 @@ nios2_analyze_prologue (struct gdbarch *gdbarch, const CORE_ADDR start_pc,
     }
 
   if (nios2_debug)
-    fprintf_unfiltered (gdb_stdlog, "cfa=%s }\n",
-                       paddress (gdbarch, cache->cfa));
+    gdb_printf (gdb_stdlog, "cfa=%s }\n",
+               paddress (gdbarch, cache->cfa));
 
   return prologue_end;
 }