Unify gdb printf functions

Now that filtered and unfiltered output can be treated identically, we
can unify the printf family of functions.  This is done under the name
"gdb_printf".  Most of this patch was written by script.

1 files changed, 154 insertions, 154 deletions

diff --git a/gdb/csky-tdep.c b/gdb/csky-tdep.c
index 0d0381c..09e8fc5 100644
--- a/gdb/csky-tdep.c
+++ b/gdb/csky-tdep.c
@@ -72,10 +72,10 @@ static struct reggroup *prof_reggroup;
 static void
 print_savedreg_msg (int regno, int offsets[], bool print_continuing)
 {
-  fprintf_unfiltered (gdb_stdlog, "csky: r%d saved at offset 0x%x\n",
-		      regno, offsets[regno]);
+  gdb_printf (gdb_stdlog, "csky: r%d saved at offset 0x%x\n",
+	      regno, offsets[regno]);
   if (print_continuing)
-    fprintf_unfiltered (gdb_stdlog, "csky: continuing\n");
+    gdb_printf (gdb_stdlog, "csky: continuing\n");
 }
 
 /*  Check whether the instruction at ADDR is 16-bit or not.  */
@@ -342,10 +342,10 @@ csky_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
     {
       if (csky_debug)
 	{
-	  fprintf_unfiltered (gdb_stdlog,
-			      "csky: struct return in %s = %s\n",
-			      gdbarch_register_name (gdbarch, argreg),
-			      paddress (gdbarch, struct_addr));
+	  gdb_printf (gdb_stdlog,
+		      "csky: struct return in %s = %s\n",
+		      gdbarch_register_name (gdbarch, argreg),
+		      paddress (gdbarch, struct_addr));
 	}
       regcache_cooked_write_unsigned (regcache, argreg, struct_addr);
       argreg++;
@@ -533,10 +533,10 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
      saved (and where).  */
   if (csky_debug)
     {
-      fprintf_unfiltered (gdb_stdlog,
-			  "csky: Scanning prologue: start_pc = 0x%x,"
-			  "limit_pc = 0x%x\n", (unsigned int) start_pc,
-			  (unsigned int) limit_pc);
+      gdb_printf (gdb_stdlog,
+		  "csky: Scanning prologue: start_pc = 0x%x,"
+		  "limit_pc = 0x%x\n", (unsigned int) start_pc,
+		  (unsigned int) limit_pc);
     }
 
   /* Default to 16 bit instruction.  */
@@ -557,9 +557,9 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 	      int offset = CSKY_32_SUBI_IMM (insn);
 	      if (csky_debug)
 		{
-		  fprintf_unfiltered (gdb_stdlog,
-				      "csky: got subi sp,%d; continuing\n",
-				      offset);
+		  gdb_printf (gdb_stdlog,
+			      "csky: got subi sp,%d; continuing\n",
+			      offset);
 		}
 	      stacksize += offset;
 	      continue;
@@ -583,10 +583,10 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 	      reg_count = CSKY_32_STM_SIZE (insn);
 	      if (csky_debug)
 		{
-		  fprintf_unfiltered (gdb_stdlog,
-				      "csky: got stm r%d-r%d,(sp)\n",
-				      start_register,
-				      start_register + reg_count);
+		  gdb_printf (gdb_stdlog,
+			      "csky: got stm r%d-r%d,(sp)\n",
+			      start_register,
+			      start_register + reg_count);
 		}
 
 	      for (rn = start_register, offset = 0;
@@ -596,15 +596,15 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		  register_offsets[rn] = stacksize - offset;
 		  if (csky_debug)
 		    {
-		      fprintf_unfiltered (gdb_stdlog,
-					  "csky: r%d saved at 0x%x"
-					  " (offset %d)\n",
-					  rn, register_offsets[rn],
-					  offset);
+		      gdb_printf (gdb_stdlog,
+				  "csky: r%d saved at 0x%x"
+				  " (offset %d)\n",
+				  rn, register_offsets[rn],
+				  offset);
 		    }
 		}
 	      if (csky_debug)
-		fprintf_unfiltered (gdb_stdlog, "csky: continuing\n");
+		gdb_printf (gdb_stdlog, "csky: continuing\n");
 	      continue;
 	    }
 	  /* stw ry,(sp,disp).  */
@@ -814,19 +814,19 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		  stacksize += num * 4;
 		  if (csky_debug)
 		    {
-		      fprintf_unfiltered (gdb_stdlog,
-					  "csky: push regs_array: r16-r%d\n",
-					  16 + num - 1);
+		      gdb_printf (gdb_stdlog,
+				  "csky: push regs_array: r16-r%d\n",
+				  16 + num - 1);
 		    }
 		  for (rn = 16; rn <= 16 + num - 1; rn++)
 		    {
 		       register_offsets[rn] = stacksize - tmp;
 		       if (csky_debug)
 			 {
-			   fprintf_unfiltered (gdb_stdlog,
-					       "csky: r%d saved at 0x%x"
-					       " (offset %d)\n", rn,
-					       register_offsets[rn], tmp);
+			   gdb_printf (gdb_stdlog,
+				       "csky: r%d saved at 0x%x"
+				       " (offset %d)\n", rn,
+				       register_offsets[rn], tmp);
 			 }
 		       tmp += 4;
 		    }
@@ -845,19 +845,19 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		  stacksize += num * 4;
 		  if (csky_debug)
 		    {
-		      fprintf_unfiltered (gdb_stdlog,
-					  "csky: push regs_array: r4-r%d\n",
-					  4 + num - 1);
+		      gdb_printf (gdb_stdlog,
+				  "csky: push regs_array: r4-r%d\n",
+				  4 + num - 1);
 		    }
 		  for (rn = 4; rn <= 4 + num - 1; rn++)
 		    {
 		       register_offsets[rn] = stacksize - tmp;
 		       if (csky_debug)
 			 {
-			   fprintf_unfiltered (gdb_stdlog,
-					       "csky: r%d saved at 0x%x"
-					       " (offset %d)\n", rn,
-					       register_offsets[rn], tmp);
+			   gdb_printf (gdb_stdlog,
+				       "csky: r%d saved at 0x%x"
+				       " (offset %d)\n", rn,
+				       register_offsets[rn], tmp);
 			 }
 			tmp += 4;
 		    }
@@ -865,7 +865,7 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 
 	      framesize = stacksize;
 	      if (csky_debug)
-		fprintf_unfiltered (gdb_stdlog, "csky: continuing\n");
+		gdb_printf (gdb_stdlog, "csky: continuing\n");
 	      continue;
 	    }
 	  else if (CSKY_32_IS_LRW4 (insn) || CSKY_32_IS_MOVI4 (insn)
@@ -877,8 +877,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 
 	      if (csky_debug)
 		{
-		  fprintf_unfiltered (gdb_stdlog,
-				      "csky: looking at large frame\n");
+		  gdb_printf (gdb_stdlog,
+			      "csky: looking at large frame\n");
 		}
 	      if (CSKY_32_IS_LRW4 (insn))
 		{
@@ -900,12 +900,12 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 
 	      if (csky_debug)
 		{
-		  fprintf_unfiltered (gdb_stdlog,
-				      "csky: base stacksize=0x%x\n", adjust);
+		  gdb_printf (gdb_stdlog,
+			      "csky: base stacksize=0x%x\n", adjust);
 
 		  /* May have zero or more insns which modify r4.  */
-		  fprintf_unfiltered (gdb_stdlog,
-				      "csky: looking for r4 adjusters...\n");
+		  gdb_printf (gdb_stdlog,
+			      "csky: looking for r4 adjusters...\n");
 		}
 
 	      offset = 4;
@@ -918,8 +918,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		      adjust += imm;
 		      if (csky_debug)
 			{
-			  fprintf_unfiltered (gdb_stdlog,
-					      "csky: addi r4,%d\n", imm);
+			  gdb_printf (gdb_stdlog,
+				      "csky: addi r4,%d\n", imm);
 			}
 		    }
 		  else if (CSKY_32_IS_SUBI4 (insn2))
@@ -928,8 +928,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		      adjust -= imm;
 		      if (csky_debug)
 			{
-			  fprintf_unfiltered (gdb_stdlog,
-					      "csky: subi r4,%d\n", imm);
+			  gdb_printf (gdb_stdlog,
+				      "csky: subi r4,%d\n", imm);
 			}
 		    }
 		  else if (CSKY_32_IS_NOR4 (insn2))
@@ -937,8 +937,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		      adjust = ~adjust;
 		      if (csky_debug)
 			{
-			  fprintf_unfiltered (gdb_stdlog,
-					      "csky: nor r4,r4,r4\n");
+			  gdb_printf (gdb_stdlog,
+				      "csky: nor r4,r4,r4\n");
 			}
 		    }
 		  else if (CSKY_32_IS_ROTLI4 (insn2))
@@ -949,8 +949,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		      adjust |= temp;
 		      if (csky_debug)
 			{
-			  fprintf_unfiltered (gdb_stdlog,
-					      "csky: rotli r4,r4,%d\n", imm);
+			  gdb_printf (gdb_stdlog,
+				      "csky: rotli r4,r4,%d\n", imm);
 			}
 		    }
 		  else if (CSKY_32_IS_LISI4 (insn2))
@@ -959,8 +959,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		      adjust <<= imm;
 		      if (csky_debug)
 			{
-			  fprintf_unfiltered (gdb_stdlog,
-					      "csky: lsli r4,r4,%d\n", imm);
+			  gdb_printf (gdb_stdlog,
+				      "csky: lsli r4,r4,%d\n", imm);
 			}
 		    }
 		  else if (CSKY_32_IS_BSETI4 (insn2))
@@ -969,8 +969,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		      adjust |= (1 << imm);
 		      if (csky_debug)
 			{
-			  fprintf_unfiltered (gdb_stdlog,
-					      "csky: bseti r4,r4 %d\n", imm);
+			  gdb_printf (gdb_stdlog,
+				      "csky: bseti r4,r4 %d\n", imm);
 			}
 		    }
 		  else if (CSKY_32_IS_BCLRI4 (insn2))
@@ -979,8 +979,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		      adjust &= ~(1 << imm);
 		      if (csky_debug)
 			{
-			  fprintf_unfiltered (gdb_stdlog,
-					      "csky: bclri r4,r4 %d\n", imm);
+			  gdb_printf (gdb_stdlog,
+				      "csky: bclri r4,r4 %d\n", imm);
 			}
 		    }
 		  else if (CSKY_32_IS_IXH4 (insn2))
@@ -988,8 +988,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		      adjust *= 3;
 		      if (csky_debug)
 			{
-			  fprintf_unfiltered (gdb_stdlog,
-					      "csky: ixh r4,r4,r4\n");
+			  gdb_printf (gdb_stdlog,
+				      "csky: ixh r4,r4,r4\n");
 			}
 		    }
 		  else if (CSKY_32_IS_IXW4 (insn2))
@@ -997,8 +997,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		      adjust *= 5;
 		      if (csky_debug)
 			{
-			  fprintf_unfiltered (gdb_stdlog,
-					      "csky: ixw r4,r4,r4\n");
+			  gdb_printf (gdb_stdlog,
+				      "csky: ixw r4,r4,r4\n");
 			}
 		    }
 		  else if (CSKY_16_IS_ADDI4 (insn2))
@@ -1007,8 +1007,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		      adjust += imm;
 		      if (csky_debug)
 			{
-			  fprintf_unfiltered (gdb_stdlog,
-					      "csky: addi r4,%d\n", imm);
+			  gdb_printf (gdb_stdlog,
+				      "csky: addi r4,%d\n", imm);
 			}
 		    }
 		  else if (CSKY_16_IS_SUBI4 (insn2))
@@ -1017,8 +1017,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		      adjust -= imm;
 		      if (csky_debug)
 			{
-			  fprintf_unfiltered (gdb_stdlog,
-					      "csky: subi r4,%d\n", imm);
+			  gdb_printf (gdb_stdlog,
+				      "csky: subi r4,%d\n", imm);
 			}
 		    }
 		  else if (CSKY_16_IS_NOR4 (insn2))
@@ -1026,8 +1026,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		      adjust = ~adjust;
 		      if (csky_debug)
 			{
-			  fprintf_unfiltered (gdb_stdlog,
-					      "csky: nor r4,r4\n");
+			  gdb_printf (gdb_stdlog,
+				      "csky: nor r4,r4\n");
 			}
 		    }
 		  else if (CSKY_16_IS_BSETI4 (insn2))
@@ -1036,8 +1036,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		      adjust |= (1 << imm);
 		      if (csky_debug)
 			{
-			  fprintf_unfiltered (gdb_stdlog,
-					      "csky: bseti r4, %d\n", imm);
+			  gdb_printf (gdb_stdlog,
+				      "csky: bseti r4, %d\n", imm);
 			}
 		    }
 		  else if (CSKY_16_IS_BCLRI4 (insn2))
@@ -1046,8 +1046,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		      adjust &= ~(1 << imm);
 		      if (csky_debug)
 			{
-			  fprintf_unfiltered (gdb_stdlog,
-					      "csky: bclri r4, %d\n", imm);
+			  gdb_printf (gdb_stdlog,
+				      "csky: bclri r4, %d\n", imm);
 			}
 		    }
 		  else if (CSKY_16_IS_LSLI4 (insn2))
@@ -1056,8 +1056,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		      adjust <<= imm;
 		      if (csky_debug)
 			{
-			  fprintf_unfiltered (gdb_stdlog,
-					      "csky: lsli r4,r4, %d\n", imm);
+			  gdb_printf (gdb_stdlog,
+				      "csky: lsli r4,r4, %d\n", imm);
 			}
 		    }
 
@@ -1067,8 +1067,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 
 	      if (csky_debug)
 		{
-		  fprintf_unfiltered (gdb_stdlog, "csky: done looking for"
-				      " r4 adjusters\n");
+		  gdb_printf (gdb_stdlog, "csky: done looking for"
+			      " r4 adjusters\n");
 		}
 
 	      /* If the next insn adjusts the stack pointer, we keep
@@ -1080,14 +1080,14 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		  stacksize += adjust;
 		  if (csky_debug)
 		    {
-		      fprintf_unfiltered (gdb_stdlog,
-					  "csky: found stack adjustment of"
-					  " 0x%x bytes.\n", adjust);
-		      fprintf_unfiltered (gdb_stdlog,
-					  "csky: skipping to new address %s\n",
-					  core_addr_to_string_nz (addr));
-		      fprintf_unfiltered (gdb_stdlog,
-					  "csky: continuing\n");
+		      gdb_printf (gdb_stdlog,
+				  "csky: found stack adjustment of"
+				  " 0x%x bytes.\n", adjust);
+		      gdb_printf (gdb_stdlog,
+				  "csky: skipping to new address %s\n",
+				  core_addr_to_string_nz (addr));
+		      gdb_printf (gdb_stdlog,
+				  "csky: continuing\n");
 		    }
 		  continue;
 		}
@@ -1096,9 +1096,9 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		 anything.  */
 	      if (csky_debug)
 		{
-		  fprintf_unfiltered (gdb_stdlog,
-				      "csky: no subu sp,sp,r4; NOT altering"
-				      " stacksize.\n");
+		  gdb_printf (gdb_stdlog,
+			      "csky: no subu sp,sp,r4; NOT altering"
+			      " stacksize.\n");
 		}
 	      break;
 	    }
@@ -1113,9 +1113,9 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 	      int offset = CSKY_16_SUBI_IMM (insn);
 	      if (csky_debug)
 		{
-		  fprintf_unfiltered (gdb_stdlog,
-				      "csky: got subi r0,%d; continuing\n",
-				      offset);
+		  gdb_printf (gdb_stdlog,
+			      "csky: got subi r0,%d; continuing\n",
+			      offset);
 		}
 	      stacksize += offset;
 	      continue;
@@ -1160,19 +1160,19 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		  offset += num * 4;
 		  if (csky_debug)
 		    {
-		      fprintf_unfiltered (gdb_stdlog,
-					  "csky: push regs_array: r4-r%d\n",
-					  4 + num - 1);
+		      gdb_printf (gdb_stdlog,
+				  "csky: push regs_array: r4-r%d\n",
+				  4 + num - 1);
 		    }
 		  for (rn = 4; rn <= 4 + num - 1; rn++)
 		    {
 		       register_offsets[rn] = stacksize - tmp;
 		       if (csky_debug)
 			 {
-			   fprintf_unfiltered (gdb_stdlog,
-					       "csky: r%d saved at 0x%x"
-					       " (offset %d)\n", rn,
-					       register_offsets[rn], offset);
+			   gdb_printf (gdb_stdlog,
+				       "csky: r%d saved at 0x%x"
+				       " (offset %d)\n", rn,
+				       register_offsets[rn], offset);
 			 }
 		       tmp += 4;
 		    }
@@ -1180,7 +1180,7 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 
 	      framesize = stacksize;
 	      if (csky_debug)
-		fprintf_unfiltered (gdb_stdlog, "csky: continuing\n");
+		gdb_printf (gdb_stdlog, "csky: continuing\n");
 	      continue;
 	    }
 	  else if (CSKY_16_IS_LRW4 (insn) || CSKY_16_IS_MOVI4 (insn))
@@ -1190,8 +1190,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 
 	      if (csky_debug)
 		{
-		  fprintf_unfiltered (gdb_stdlog,
-				      "csky: looking at large frame\n");
+		  gdb_printf (gdb_stdlog,
+			      "csky: looking at large frame\n");
 		}
 	      if (CSKY_16_IS_LRW4 (insn))
 		{
@@ -1209,15 +1209,15 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 
 	      if (csky_debug)
 		{
-		  fprintf_unfiltered (gdb_stdlog,
-				      "csky: base stacksize=0x%x\n", adjust);
+		  gdb_printf (gdb_stdlog,
+			      "csky: base stacksize=0x%x\n", adjust);
 		}
 
 	      /* May have zero or more instructions which modify r4.  */
 	      if (csky_debug)
 		{
-		  fprintf_unfiltered (gdb_stdlog,
-				      "csky: looking for r4 adjusters...\n");
+		  gdb_printf (gdb_stdlog,
+			      "csky: looking for r4 adjusters...\n");
 		}
 	      int offset = 2;
 	      insn_len = csky_get_insn (gdbarch, addr + offset, &insn2);
@@ -1229,8 +1229,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		      adjust += imm;
 		      if (csky_debug)
 			{
-			  fprintf_unfiltered (gdb_stdlog,
-					      "csky: addi r4,%d\n", imm);
+			  gdb_printf (gdb_stdlog,
+				      "csky: addi r4,%d\n", imm);
 			}
 		    }
 		  else if (CSKY_32_IS_SUBI4 (insn2))
@@ -1239,8 +1239,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		      adjust -= imm;
 		      if (csky_debug)
 			{
-			  fprintf_unfiltered (gdb_stdlog,
-					      "csky: subi r4,%d\n", imm);
+			  gdb_printf (gdb_stdlog,
+				      "csky: subi r4,%d\n", imm);
 			}
 		    }
 		  else if (CSKY_32_IS_NOR4 (insn2))
@@ -1248,8 +1248,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		      adjust = ~adjust;
 		      if (csky_debug)
 			{
-			  fprintf_unfiltered (gdb_stdlog,
-					      "csky: nor r4,r4,r4\n");
+			  gdb_printf (gdb_stdlog,
+				      "csky: nor r4,r4,r4\n");
 			}
 		    }
 		  else if (CSKY_32_IS_ROTLI4 (insn2))
@@ -1260,8 +1260,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		      adjust |= temp;
 		      if (csky_debug)
 			{
-			  fprintf_unfiltered (gdb_stdlog,
-					      "csky: rotli r4,r4,%d\n", imm);
+			  gdb_printf (gdb_stdlog,
+				      "csky: rotli r4,r4,%d\n", imm);
 			}
 		    }
 		  else if (CSKY_32_IS_LISI4 (insn2))
@@ -1270,8 +1270,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		      adjust <<= imm;
 		      if (csky_debug)
 			{
-			  fprintf_unfiltered (gdb_stdlog,
-					      "csky: lsli r4,r4,%d\n", imm);
+			  gdb_printf (gdb_stdlog,
+				      "csky: lsli r4,r4,%d\n", imm);
 			}
 		    }
 		  else if (CSKY_32_IS_BSETI4 (insn2))
@@ -1280,8 +1280,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		      adjust |= (1 << imm);
 		      if (csky_debug)
 			{
-			  fprintf_unfiltered (gdb_stdlog,
-					      "csky: bseti r4,r4 %d\n", imm);
+			  gdb_printf (gdb_stdlog,
+				      "csky: bseti r4,r4 %d\n", imm);
 			}
 		    }
 		  else if (CSKY_32_IS_BCLRI4 (insn2))
@@ -1290,8 +1290,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		      adjust &= ~(1 << imm);
 		      if (csky_debug)
 			{
-			  fprintf_unfiltered (gdb_stdlog,
-					      "csky: bclri r4,r4 %d\n", imm);
+			  gdb_printf (gdb_stdlog,
+				      "csky: bclri r4,r4 %d\n", imm);
 			}
 		    }
 		  else if (CSKY_32_IS_IXH4 (insn2))
@@ -1299,8 +1299,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		      adjust *= 3;
 		      if (csky_debug)
 			{
-			  fprintf_unfiltered (gdb_stdlog,
-					      "csky: ixh r4,r4,r4\n");
+			  gdb_printf (gdb_stdlog,
+				      "csky: ixh r4,r4,r4\n");
 			}
 		    }
 		  else if (CSKY_32_IS_IXW4 (insn2))
@@ -1308,8 +1308,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		      adjust *= 5;
 		      if (csky_debug)
 			{
-			  fprintf_unfiltered (gdb_stdlog,
-					      "csky: ixw r4,r4,r4\n");
+			  gdb_printf (gdb_stdlog,
+				      "csky: ixw r4,r4,r4\n");
 			}
 		    }
 		  else if (CSKY_16_IS_ADDI4 (insn2))
@@ -1318,8 +1318,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		      adjust += imm;
 		      if (csky_debug)
 			{
-			  fprintf_unfiltered (gdb_stdlog,
-					      "csky: addi r4,%d\n", imm);
+			  gdb_printf (gdb_stdlog,
+				      "csky: addi r4,%d\n", imm);
 			}
 		    }
 		  else if (CSKY_16_IS_SUBI4 (insn2))
@@ -1328,8 +1328,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		      adjust -= imm;
 		      if (csky_debug)
 			{
-			  fprintf_unfiltered (gdb_stdlog,
-					      "csky: subi r4,%d\n", imm);
+			  gdb_printf (gdb_stdlog,
+				      "csky: subi r4,%d\n", imm);
 			}
 		    }
 		  else if (CSKY_16_IS_NOR4 (insn2))
@@ -1337,8 +1337,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		      adjust = ~adjust;
 		      if (csky_debug)
 			{
-			  fprintf_unfiltered (gdb_stdlog,
-					      "csky: nor r4,r4\n");
+			  gdb_printf (gdb_stdlog,
+				      "csky: nor r4,r4\n");
 			}
 		    }
 		  else if (CSKY_16_IS_BSETI4 (insn2))
@@ -1347,8 +1347,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		      adjust |= (1 << imm);
 		      if (csky_debug)
 			{
-			  fprintf_unfiltered (gdb_stdlog,
-					      "csky: bseti r4, %d\n", imm);
+			  gdb_printf (gdb_stdlog,
+				      "csky: bseti r4, %d\n", imm);
 			}
 		    }
 		  else if (CSKY_16_IS_BCLRI4 (insn2))
@@ -1357,8 +1357,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		      adjust &= ~(1 << imm);
 		      if (csky_debug)
 			{
-			  fprintf_unfiltered (gdb_stdlog,
-					      "csky: bclri r4, %d\n", imm);
+			  gdb_printf (gdb_stdlog,
+				      "csky: bclri r4, %d\n", imm);
 			}
 		    }
 		  else if (CSKY_16_IS_LSLI4 (insn2))
@@ -1367,8 +1367,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		      adjust <<= imm;
 		      if (csky_debug)
 			{
-			  fprintf_unfiltered (gdb_stdlog,
-					      "csky: lsli r4,r4, %d\n", imm);
+			  gdb_printf (gdb_stdlog,
+				      "csky: lsli r4,r4, %d\n", imm);
 			}
 		    }
 
@@ -1378,8 +1378,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 
 	      if (csky_debug)
 		{
-		  fprintf_unfiltered (gdb_stdlog, "csky: "
-				      "done looking for r4 adjusters\n");
+		  gdb_printf (gdb_stdlog, "csky: "
+			      "done looking for r4 adjusters\n");
 		}
 
 	      /* If the next instruction adjusts the stack pointer, we keep
@@ -1391,13 +1391,13 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		  stacksize += adjust;
 		  if (csky_debug)
 		    {
-		      fprintf_unfiltered (gdb_stdlog, "csky: "
-					  "found stack adjustment of 0x%x"
-					  " bytes.\n", adjust);
-		      fprintf_unfiltered (gdb_stdlog, "csky: "
-					  "skipping to new address %s\n",
-					  core_addr_to_string_nz (addr));
-		      fprintf_unfiltered (gdb_stdlog, "csky: continuing\n");
+		      gdb_printf (gdb_stdlog, "csky: "
+				  "found stack adjustment of 0x%x"
+				  " bytes.\n", adjust);
+		      gdb_printf (gdb_stdlog, "csky: "
+				  "skipping to new address %s\n",
+				  core_addr_to_string_nz (addr));
+		      gdb_printf (gdb_stdlog, "csky: continuing\n");
 		    }
 		  continue;
 		}
@@ -1406,8 +1406,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		 anything.  */
 	      if (csky_debug)
 		{
-		  fprintf_unfiltered (gdb_stdlog, "csky: no subu sp,r4; "
-				      "NOT altering stacksize.\n");
+		  gdb_printf (gdb_stdlog, "csky: no subu sp,r4; "
+			      "NOT altering stacksize.\n");
 		}
 	      break;
 	    }
@@ -1416,8 +1416,8 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
       /* This is not a prologue instruction, so stop here.  */
       if (csky_debug)
 	{
-	  fprintf_unfiltered (gdb_stdlog, "csky: insn is not a prologue"
-			      " insn -- ending scan\n");
+	  gdb_printf (gdb_stdlog, "csky: insn is not a prologue"
+		      " insn -- ending scan\n");
 	}
       break;
     }
@@ -1455,12 +1455,12 @@ csky_analyze_prologue (struct gdbarch *gdbarch,
 		{
 		  CORE_ADDR rn_value = read_memory_unsigned_integer (
 		    this_cache->saved_regs[rn].addr (), 4, byte_order);
-		  fprintf_unfiltered (gdb_stdlog, "Saved register %s "
-				      "stored at 0x%08lx, value=0x%08lx\n",
-				      csky_register_names[rn],
-				      (unsigned long)
-					this_cache->saved_regs[rn].addr (),
-				      (unsigned long) rn_value);
+		  gdb_printf (gdb_stdlog, "Saved register %s "
+			      "stored at 0x%08lx, value=0x%08lx\n",
+			      csky_register_names[rn],
+			      (unsigned long)
+			      this_cache->saved_regs[rn].addr (),
+			      (unsigned long) rn_value);
 		}
 	    }
 	}