[binutils-gdb] gdb: NULL -> nullptr in gdbarch-gen.c

Simon Marchi via Gdb-cvs <[email protected]>
Newsgroups gmane.comp.gdb.cvs
Message-ID <[email protected]>
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=b207295384f185bf0979b0c7ba6101184b9705f7

commit b207295384f185bf0979b0c7ba6101184b9705f7
Author: Simon Marchi <[email protected]>
Date:   Fri Feb 27 15:05:29 2026 -0500

    gdb: NULL -> nullptr in gdbarch-gen.c
    
    Use nullptr instead of NULL throughout gdbarch-gen.c (not the comments
    though).
    
    Change-Id: I35d5589e69f436c9312f81d24c37e40e33c70142
    Approved-By: Tom Tromey <[email protected]>

Diff:
---
 gdb/gdbarch-gen.c | 834 +++++++++++++++++++++++++++---------------------------
 gdb/gdbarch.py    |  14 +-
 2 files changed, 424 insertions(+), 424 deletions(-)

diff --git a/gdb/gdbarch-gen.c b/gdb/gdbarch-gen.c
index f8b2530fffb..1becb9702de 100644
--- a/gdb/gdbarch-gen.c
+++ b/gdb/gdbarch-gen.c
@@ -289,7 +289,7 @@ verify_gdbarch (struct gdbarch *gdbarch)
   /* fundamental */
   if (gdbarch->byte_order == BFD_ENDIAN_UNKNOWN)
     log.puts ("\n\tbyte-order");
-  if (gdbarch->bfd_arch_info == NULL)
+  if (gdbarch->bfd_arch_info == nullptr)
     log.puts ("\n\tbfd_arch_info");
   /* Check those that need to be defined for the given multi-arch level.  */
   /* Skip verify of short_bit, invalid_p == 0.  */
@@ -1339,7 +1339,7 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file)
   gdb_printf (file,
 	      "gdbarch_dump: get_shadow_stack_pointer = <%s>\n",
 	      host_address_to_string (gdbarch->get_shadow_stack_pointer));
-  if (gdbarch->dump_tdep != NULL)
+  if (gdbarch->dump_tdep != nullptr)
     gdbarch->dump_tdep (gdbarch, file);
 }
 
@@ -1347,7 +1347,7 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file)
 const struct bfd_arch_info *
 gdbarch_bfd_arch_info (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_bfd_arch_info called\n");
   return gdbarch->bfd_arch_info;
@@ -1356,7 +1356,7 @@ gdbarch_bfd_arch_info (struct gdbarch *gdbarch)
 enum bfd_endian
 gdbarch_byte_order (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_byte_order called\n");
   return gdbarch->byte_order;
@@ -1365,7 +1365,7 @@ gdbarch_byte_order (struct gdbarch *gdbarch)
 enum bfd_endian
 gdbarch_byte_order_for_code (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_byte_order_for_code called\n");
   return gdbarch->byte_order_for_code;
@@ -1374,7 +1374,7 @@ gdbarch_byte_order_for_code (struct gdbarch *gdbarch)
 enum gdb_osabi
 gdbarch_osabi (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_osabi called\n");
   return gdbarch->osabi;
@@ -1383,7 +1383,7 @@ gdbarch_osabi (struct gdbarch *gdbarch)
 const struct target_desc *
 gdbarch_target_desc (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_target_desc called\n");
   return gdbarch->target_desc;
@@ -1392,7 +1392,7 @@ gdbarch_target_desc (struct gdbarch *gdbarch)
 int
 gdbarch_short_bit (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of short_bit, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_short_bit called\n");
@@ -1409,7 +1409,7 @@ set_gdbarch_short_bit (struct gdbarch *gdbarch,
 int
 gdbarch_int_bit (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of int_bit, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_int_bit called\n");
@@ -1426,7 +1426,7 @@ set_gdbarch_int_bit (struct gdbarch *gdbarch,
 int
 gdbarch_long_bit (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of long_bit, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_long_bit called\n");
@@ -1443,7 +1443,7 @@ set_gdbarch_long_bit (struct gdbarch *gdbarch,
 int
 gdbarch_long_long_bit (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of long_long_bit, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_long_long_bit called\n");
@@ -1460,7 +1460,7 @@ set_gdbarch_long_long_bit (struct gdbarch *gdbarch,
 int
 gdbarch_bfloat16_bit (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of bfloat16_bit, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_bfloat16_bit called\n");
@@ -1477,7 +1477,7 @@ set_gdbarch_bfloat16_bit (struct gdbarch *gdbarch,
 const struct floatformat **
 gdbarch_bfloat16_format (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of bfloat16_format, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_bfloat16_format called\n");
@@ -1494,7 +1494,7 @@ set_gdbarch_bfloat16_format (struct gdbarch *gdbarch,
 int
 gdbarch_half_bit (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of half_bit, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_half_bit called\n");
@@ -1511,7 +1511,7 @@ set_gdbarch_half_bit (struct gdbarch *gdbarch,
 const struct floatformat **
 gdbarch_half_format (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of half_format, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_half_format called\n");
@@ -1528,7 +1528,7 @@ set_gdbarch_half_format (struct gdbarch *gdbarch,
 int
 gdbarch_float_bit (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of float_bit, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_float_bit called\n");
@@ -1545,7 +1545,7 @@ set_gdbarch_float_bit (struct gdbarch *gdbarch,
 const struct floatformat **
 gdbarch_float_format (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of float_format, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_float_format called\n");
@@ -1562,7 +1562,7 @@ set_gdbarch_float_format (struct gdbarch *gdbarch,
 int
 gdbarch_double_bit (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of double_bit, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_double_bit called\n");
@@ -1579,7 +1579,7 @@ set_gdbarch_double_bit (struct gdbarch *gdbarch,
 const struct floatformat **
 gdbarch_double_format (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of double_format, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_double_format called\n");
@@ -1596,7 +1596,7 @@ set_gdbarch_double_format (struct gdbarch *gdbarch,
 int
 gdbarch_long_double_bit (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of long_double_bit, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_long_double_bit called\n");
@@ -1613,7 +1613,7 @@ set_gdbarch_long_double_bit (struct gdbarch *gdbarch,
 const struct floatformat **
 gdbarch_long_double_format (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of long_double_format, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_long_double_format called\n");
@@ -1630,7 +1630,7 @@ set_gdbarch_long_double_format (struct gdbarch *gdbarch,
 int
 gdbarch_wchar_bit (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of wchar_bit, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_wchar_bit called\n");
@@ -1647,7 +1647,7 @@ set_gdbarch_wchar_bit (struct gdbarch *gdbarch,
 bool
 gdbarch_wchar_signed (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of wchar_signed, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_wchar_signed called\n");
@@ -1664,8 +1664,8 @@ set_gdbarch_wchar_signed (struct gdbarch *gdbarch,
 const struct floatformat **
 gdbarch_floatformat_for_type (struct gdbarch *gdbarch, const char *name, int length)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->floatformat_for_type != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->floatformat_for_type != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_floatformat_for_type called\n");
   return gdbarch->floatformat_for_type (gdbarch, name, length);
@@ -1681,7 +1681,7 @@ set_gdbarch_floatformat_for_type (struct gdbarch *gdbarch,
 int
 gdbarch_ptr_bit (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of ptr_bit, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_ptr_bit called\n");
@@ -1698,7 +1698,7 @@ set_gdbarch_ptr_bit (struct gdbarch *gdbarch,
 int
 gdbarch_addr_bit (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Check variable changed from its initial value.  */
   gdb_assert (gdbarch->addr_bit != 0);
   if (gdbarch_debug >= 2)
@@ -1716,7 +1716,7 @@ set_gdbarch_addr_bit (struct gdbarch *gdbarch,
 int
 gdbarch_dwarf2_addr_size (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Check variable changed from its initial value.  */
   gdb_assert (gdbarch->dwarf2_addr_size != 0);
   if (gdbarch_debug >= 2)
@@ -1734,7 +1734,7 @@ set_gdbarch_dwarf2_addr_size (struct gdbarch *gdbarch,
 bool
 gdbarch_char_signed (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of char_signed, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_char_signed called\n");
@@ -1751,15 +1751,15 @@ set_gdbarch_char_signed (struct gdbarch *gdbarch,
 bool
 gdbarch_read_pc_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->read_pc != nullptr;
 }
 
 CORE_ADDR
 gdbarch_read_pc (struct gdbarch *gdbarch, readable_regcache *regcache)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->read_pc != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->read_pc != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_read_pc called\n");
   return gdbarch->read_pc (regcache);
@@ -1775,15 +1775,15 @@ set_gdbarch_read_pc (struct gdbarch *gdbarch,
 bool
 gdbarch_write_pc_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->write_pc != nullptr;
 }
 
 void
 gdbarch_write_pc (struct gdbarch *gdbarch, struct regcache *regcache, CORE_ADDR val)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->write_pc != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->write_pc != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_write_pc called\n");
   gdbarch->write_pc (regcache, val);
@@ -1799,8 +1799,8 @@ set_gdbarch_write_pc (struct gdbarch *gdbarch,
 void
 gdbarch_virtual_frame_pointer (struct gdbarch *gdbarch, CORE_ADDR pc, int *frame_regnum, LONGEST *frame_offset)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->virtual_frame_pointer != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->virtual_frame_pointer != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_virtual_frame_pointer called\n");
   gdbarch->virtual_frame_pointer (gdbarch, pc, frame_regnum, frame_offset);
@@ -1816,15 +1816,15 @@ set_gdbarch_virtual_frame_pointer (struct gdbarch *gdbarch,
 bool
 gdbarch_pseudo_register_read_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->pseudo_register_read != nullptr;
 }
 
 enum register_status
 gdbarch_pseudo_register_read (struct gdbarch *gdbarch, readable_regcache *regcache, int cookednum, gdb_byte *buf)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->pseudo_register_read != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->pseudo_register_read != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_pseudo_register_read called\n");
   return gdbarch->pseudo_register_read (gdbarch, regcache, cookednum, buf);
@@ -1840,15 +1840,15 @@ set_gdbarch_pseudo_register_read (struct gdbarch *gdbarch,
 bool
 gdbarch_pseudo_register_read_value_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->pseudo_register_read_value != nullptr;
 }
 
 struct value *
 gdbarch_pseudo_register_read_value (struct gdbarch *gdbarch, const frame_info_ptr &next_frame, int cookednum)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->pseudo_register_read_value != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->pseudo_register_read_value != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_pseudo_register_read_value called\n");
   return gdbarch->pseudo_register_read_value (gdbarch, next_frame, cookednum);
@@ -1864,15 +1864,15 @@ set_gdbarch_pseudo_register_read_value (struct gdbarch *gdbarch,
 bool
 gdbarch_pseudo_register_write_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->pseudo_register_write != nullptr;
 }
 
 void
 gdbarch_pseudo_register_write (struct gdbarch *gdbarch, const frame_info_ptr &next_frame, int pseudo_reg_num, gdb::array_view<const gdb_byte> buf)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->pseudo_register_write != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->pseudo_register_write != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_pseudo_register_write called\n");
   gdbarch->pseudo_register_write (gdbarch, next_frame, pseudo_reg_num, buf);
@@ -1888,8 +1888,8 @@ set_gdbarch_pseudo_register_write (struct gdbarch *gdbarch,
 void
 gdbarch_deprecated_pseudo_register_write (struct gdbarch *gdbarch, struct regcache *regcache, int cookednum, const gdb_byte *buf)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->deprecated_pseudo_register_write != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->deprecated_pseudo_register_write != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_deprecated_pseudo_register_write called\n");
   gdbarch->deprecated_pseudo_register_write (gdbarch, regcache, cookednum, buf);
@@ -1905,7 +1905,7 @@ set_gdbarch_deprecated_pseudo_register_write (struct gdbarch *gdbarch,
 int
 gdbarch_num_regs (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Check variable changed from its initial value.  */
   gdb_assert (gdbarch->num_regs != -1);
   if (gdbarch_debug >= 2)
@@ -1923,7 +1923,7 @@ set_gdbarch_num_regs (struct gdbarch *gdbarch,
 int
 gdbarch_num_pseudo_regs (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of num_pseudo_regs, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_num_pseudo_regs called\n");
@@ -1940,15 +1940,15 @@ set_gdbarch_num_pseudo_regs (struct gdbarch *gdbarch,
 bool
 gdbarch_ax_pseudo_register_collect_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->ax_pseudo_register_collect != nullptr;
 }
 
 void
 gdbarch_ax_pseudo_register_collect (struct gdbarch *gdbarch, struct agent_expr *ax, int reg)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->ax_pseudo_register_collect != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->ax_pseudo_register_collect != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_ax_pseudo_register_collect called\n");
   gdbarch->ax_pseudo_register_collect (gdbarch, ax, reg);
@@ -1964,15 +1964,15 @@ set_gdbarch_ax_pseudo_register_collect (struct gdbarch *gdbarch,
 bool
 gdbarch_ax_pseudo_register_push_stack_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->ax_pseudo_register_push_stack != nullptr;
 }
 
 bool
 gdbarch_ax_pseudo_register_push_stack (struct gdbarch *gdbarch, struct agent_expr *ax, int reg)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->ax_pseudo_register_push_stack != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->ax_pseudo_register_push_stack != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_ax_pseudo_register_push_stack called\n");
   return gdbarch->ax_pseudo_register_push_stack (gdbarch, ax, reg);
@@ -1988,15 +1988,15 @@ set_gdbarch_ax_pseudo_register_push_stack (struct gdbarch *gdbarch,
 bool
 gdbarch_report_signal_info_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->report_signal_info != nullptr;
 }
 
 void
 gdbarch_report_signal_info (struct gdbarch *gdbarch, struct ui_out *uiout, enum gdb_signal siggnal)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->report_signal_info != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->report_signal_info != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_report_signal_info called\n");
   gdbarch->report_signal_info (gdbarch, uiout, siggnal);
@@ -2012,7 +2012,7 @@ set_gdbarch_report_signal_info (struct gdbarch *gdbarch,
 int
 gdbarch_sp_regnum (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of sp_regnum, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_sp_regnum called\n");
@@ -2029,7 +2029,7 @@ set_gdbarch_sp_regnum (struct gdbarch *gdbarch,
 int
 gdbarch_pc_regnum (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of pc_regnum, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_pc_regnum called\n");
@@ -2046,7 +2046,7 @@ set_gdbarch_pc_regnum (struct gdbarch *gdbarch,
 int
 gdbarch_ps_regnum (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of ps_regnum, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_ps_regnum called\n");
@@ -2063,7 +2063,7 @@ set_gdbarch_ps_regnum (struct gdbarch *gdbarch,
 int
 gdbarch_fp0_regnum (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of fp0_regnum, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_fp0_regnum called\n");
@@ -2080,8 +2080,8 @@ set_gdbarch_fp0_regnum (struct gdbarch *gdbarch,
 int
 gdbarch_dwarf2_reg_to_regnum (struct gdbarch *gdbarch, int dwarf2_regnr)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->dwarf2_reg_to_regnum != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->dwarf2_reg_to_regnum != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_dwarf2_reg_to_regnum called\n");
   return gdbarch->dwarf2_reg_to_regnum (gdbarch, dwarf2_regnr);
@@ -2097,8 +2097,8 @@ set_gdbarch_dwarf2_reg_to_regnum (struct gdbarch *gdbarch,
 const char *
 gdbarch_register_name (struct gdbarch *gdbarch, int regnr)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->register_name != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->register_name != nullptr);
   gdb_assert (regnr >= 0);
   gdb_assert (regnr < gdbarch_num_cooked_regs (gdbarch));
   if (gdbarch_debug >= 2)
@@ -2118,8 +2118,8 @@ set_gdbarch_register_name (struct gdbarch *gdbarch,
 struct type *
 gdbarch_register_type (struct gdbarch *gdbarch, int reg_nr)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->register_type != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->register_type != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_register_type called\n");
   return gdbarch->register_type (gdbarch, reg_nr);
@@ -2135,8 +2135,8 @@ set_gdbarch_register_type (struct gdbarch *gdbarch,
 struct frame_id
 gdbarch_dummy_id (struct gdbarch *gdbarch, const frame_info_ptr &this_frame)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->dummy_id != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->dummy_id != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_dummy_id called\n");
   return gdbarch->dummy_id (gdbarch, this_frame);
@@ -2152,7 +2152,7 @@ set_gdbarch_dummy_id (struct gdbarch *gdbarch,
 int
 gdbarch_deprecated_fp_regnum (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of deprecated_fp_regnum, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_deprecated_fp_regnum called\n");
@@ -2169,15 +2169,15 @@ set_gdbarch_deprecated_fp_regnum (struct gdbarch *gdbarch,
 bool
 gdbarch_push_dummy_call_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->push_dummy_call != nullptr;
 }
 
 CORE_ADDR
 gdbarch_push_dummy_call (struct gdbarch *gdbarch, struct value *function, struct regcache *regcache, CORE_ADDR bp_addr, int nargs, struct value **args, CORE_ADDR sp, function_call_return_method return_method, CORE_ADDR struct_addr)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->push_dummy_call != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->push_dummy_call != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_push_dummy_call called\n");
   return gdbarch->push_dummy_call (gdbarch, function, regcache, bp_addr, nargs, args, sp, return_method, struct_addr);
@@ -2193,7 +2193,7 @@ set_gdbarch_push_dummy_call (struct gdbarch *gdbarch,
 enum call_dummy_location_type
 gdbarch_call_dummy_location (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of call_dummy_location, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_call_dummy_location called\n");
@@ -2210,15 +2210,15 @@ set_gdbarch_call_dummy_location (struct gdbarch *gdbarch,
 bool
 gdbarch_push_dummy_code_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->push_dummy_code != nullptr;
 }
 
 CORE_ADDR
 gdbarch_push_dummy_code (struct gdbarch *gdbarch, CORE_ADDR sp, CORE_ADDR funaddr, struct value **args, int nargs, struct type *value_type, CORE_ADDR *real_pc, CORE_ADDR *bp_addr, struct regcache *regcache)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->push_dummy_code != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->push_dummy_code != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_push_dummy_code called\n");
   return gdbarch->push_dummy_code (gdbarch, sp, funaddr, args, nargs, value_type, real_pc, bp_addr, regcache);
@@ -2234,8 +2234,8 @@ set_gdbarch_push_dummy_code (struct gdbarch *gdbarch,
 bool
 gdbarch_code_of_frame_writable (struct gdbarch *gdbarch, const frame_info_ptr &frame)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->code_of_frame_writable != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->code_of_frame_writable != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_code_of_frame_writable called\n");
   return gdbarch->code_of_frame_writable (gdbarch, frame);
@@ -2251,8 +2251,8 @@ set_gdbarch_code_of_frame_writable (struct gdbarch *gdbarch,
 void
 gdbarch_print_registers_info (struct gdbarch *gdbarch, struct ui_file *file, const frame_info_ptr &frame, int regnum, int all)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->print_registers_info != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->print_registers_info != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_print_registers_info called\n");
   gdbarch->print_registers_info (gdbarch, file, frame, regnum, all);
@@ -2268,8 +2268,8 @@ set_gdbarch_print_registers_info (struct gdbarch *gdbarch,
 void
 gdbarch_print_float_info (struct gdbarch *gdbarch, struct ui_file *file, const frame_info_ptr &frame, const char *args)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->print_float_info != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->print_float_info != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_print_float_info called\n");
   gdbarch->print_float_info (gdbarch, file, frame, args);
@@ -2285,8 +2285,8 @@ set_gdbarch_print_float_info (struct gdbarch *gdbarch,
 int
 gdbarch_register_sim_regno (struct gdbarch *gdbarch, int reg_nr)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->register_sim_regno != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->register_sim_regno != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_register_sim_regno called\n");
   return gdbarch->register_sim_regno (gdbarch, reg_nr);
@@ -2302,8 +2302,8 @@ set_gdbarch_register_sim_regno (struct gdbarch *gdbarch,
 bool
 gdbarch_cannot_fetch_register (struct gdbarch *gdbarch, int regnum)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->cannot_fetch_register != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->cannot_fetch_register != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_cannot_fetch_register called\n");
   return gdbarch->cannot_fetch_register (gdbarch, regnum);
@@ -2319,8 +2319,8 @@ set_gdbarch_cannot_fetch_register (struct gdbarch *gdbarch,
 bool
 gdbarch_cannot_store_register (struct gdbarch *gdbarch, int regnum)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->cannot_store_register != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->cannot_store_register != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_cannot_store_register called\n");
   return gdbarch->cannot_store_register (gdbarch, regnum);
@@ -2336,15 +2336,15 @@ set_gdbarch_cannot_store_register (struct gdbarch *gdbarch,
 bool
 gdbarch_get_longjmp_target_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->get_longjmp_target != nullptr;
 }
 
 bool
 gdbarch_get_longjmp_target (struct gdbarch *gdbarch, const frame_info_ptr &frame, CORE_ADDR *pc)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->get_longjmp_target != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->get_longjmp_target != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_get_longjmp_target called\n");
   return gdbarch->get_longjmp_target (frame, pc);
@@ -2360,8 +2360,8 @@ set_gdbarch_get_longjmp_target (struct gdbarch *gdbarch,
 bool
 gdbarch_convert_register_p (struct gdbarch *gdbarch, int regnum, struct type *type)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->convert_register_p != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->convert_register_p != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_convert_register_p called\n");
   return gdbarch->convert_register_p (gdbarch, regnum, type);
@@ -2377,8 +2377,8 @@ set_gdbarch_convert_register_p (struct gdbarch *gdbarch,
 bool
 gdbarch_register_to_value (struct gdbarch *gdbarch, const frame_info_ptr &frame, int regnum, struct type *type, gdb_byte *buf, bool *optimizedp, bool *unavailablep)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->register_to_value != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->register_to_value != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_register_to_value called\n");
   return gdbarch->register_to_value (frame, regnum, type, buf, optimizedp, unavailablep);
@@ -2394,8 +2394,8 @@ set_gdbarch_register_to_value (struct gdbarch *gdbarch,
 void
 gdbarch_value_to_register (struct gdbarch *gdbarch, const frame_info_ptr &frame, int regnum, struct type *type, const gdb_byte *buf)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->value_to_register != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->value_to_register != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_value_to_register called\n");
   gdbarch->value_to_register (frame, regnum, type, buf);
@@ -2411,8 +2411,8 @@ set_gdbarch_value_to_register (struct gdbarch *gdbarch,
 struct value *
 gdbarch_value_from_register (struct gdbarch *gdbarch, struct type *type, int regnum, const frame_info_ptr &this_frame)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->value_from_register != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->value_from_register != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_value_from_register called\n");
   return gdbarch->value_from_register (gdbarch, type, regnum, this_frame);
@@ -2428,8 +2428,8 @@ set_gdbarch_value_from_register (struct gdbarch *gdbarch,
 ULONGEST
 gdbarch_dwarf2_reg_piece_offset (struct gdbarch *gdbarch, int regnum, ULONGEST size)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->dwarf2_reg_piece_offset != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->dwarf2_reg_piece_offset != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_dwarf2_reg_piece_offset called\n");
   return gdbarch->dwarf2_reg_piece_offset (gdbarch, regnum, size);
@@ -2445,8 +2445,8 @@ set_gdbarch_dwarf2_reg_piece_offset (struct gdbarch *gdbarch,
 CORE_ADDR
 gdbarch_pointer_to_address (struct gdbarch *gdbarch, struct type *type, const gdb_byte *buf)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->pointer_to_address != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->pointer_to_address != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_pointer_to_address called\n");
   return gdbarch->pointer_to_address (gdbarch, type, buf);
@@ -2462,8 +2462,8 @@ set_gdbarch_pointer_to_address (struct gdbarch *gdbarch,
 void
 gdbarch_address_to_pointer (struct gdbarch *gdbarch, struct type *type, gdb_byte *buf, CORE_ADDR addr)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->address_to_pointer != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->address_to_pointer != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_address_to_pointer called\n");
   gdbarch->address_to_pointer (gdbarch, type, buf, addr);
@@ -2479,15 +2479,15 @@ set_gdbarch_address_to_pointer (struct gdbarch *gdbarch,
 bool
 gdbarch_integer_to_address_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->integer_to_address != nullptr;
 }
 
 CORE_ADDR
 gdbarch_integer_to_address (struct gdbarch *gdbarch, struct type *type, const gdb_byte *buf)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->integer_to_address != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->integer_to_address != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_integer_to_address called\n");
   return gdbarch->integer_to_address (gdbarch, type, buf);
@@ -2510,8 +2510,8 @@ set_gdbarch_return_value (struct gdbarch *gdbarch,
 enum return_value_convention
 gdbarch_return_value_as_value (struct gdbarch *gdbarch, struct value *function, struct type *valtype, struct regcache *regcache, struct value **read_value, const gdb_byte *writebuf)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->return_value_as_value != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->return_value_as_value != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_return_value_as_value called\n");
   return gdbarch->return_value_as_value (gdbarch, function, valtype, regcache, read_value, writebuf);
@@ -2527,8 +2527,8 @@ set_gdbarch_return_value_as_value (struct gdbarch *gdbarch,
 CORE_ADDR
 gdbarch_get_return_buf_addr (struct gdbarch *gdbarch, struct type *val_type, const frame_info_ptr &cur_frame)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->get_return_buf_addr != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->get_return_buf_addr != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_get_return_buf_addr called\n");
   return gdbarch->get_return_buf_addr (val_type, cur_frame);
@@ -2544,8 +2544,8 @@ set_gdbarch_get_return_buf_addr (struct gdbarch *gdbarch,
 bool
 gdbarch_dwarf2_omit_typedef_p (struct gdbarch *gdbarch, struct type *target_type, const char *producer, const char *name)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->dwarf2_omit_typedef_p != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->dwarf2_omit_typedef_p != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_dwarf2_omit_typedef_p called\n");
   return gdbarch->dwarf2_omit_typedef_p (target_type, producer, name);
@@ -2561,8 +2561,8 @@ set_gdbarch_dwarf2_omit_typedef_p (struct gdbarch *gdbarch,
 CORE_ADDR
 gdbarch_update_call_site_pc (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->update_call_site_pc != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->update_call_site_pc != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_update_call_site_pc called\n");
   return gdbarch->update_call_site_pc (gdbarch, pc);
@@ -2578,8 +2578,8 @@ set_gdbarch_update_call_site_pc (struct gdbarch *gdbarch,
 bool
 gdbarch_return_in_first_hidden_param_p (struct gdbarch *gdbarch, struct type *type)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->return_in_first_hidden_param_p != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->return_in_first_hidden_param_p != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_return_in_first_hidden_param_p called\n");
   return gdbarch->return_in_first_hidden_param_p (gdbarch, type);
@@ -2595,8 +2595,8 @@ set_gdbarch_return_in_first_hidden_param_p (struct gdbarch *gdbarch,
 CORE_ADDR
 gdbarch_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR ip)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->skip_prologue != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->skip_prologue != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_skip_prologue called\n");
   return gdbarch->skip_prologue (gdbarch, ip);
@@ -2612,15 +2612,15 @@ set_gdbarch_skip_prologue (struct gdbarch *gdbarch,
 bool
 gdbarch_skip_main_prologue_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->skip_main_prologue != nullptr;
 }
 
 CORE_ADDR
 gdbarch_skip_main_prologue (struct gdbarch *gdbarch, CORE_ADDR ip)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->skip_main_prologue != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->skip_main_prologue != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_skip_main_prologue called\n");
   return gdbarch->skip_main_prologue (gdbarch, ip);
@@ -2636,15 +2636,15 @@ set_gdbarch_skip_main_prologue (struct gdbarch *gdbarch,
 bool
 gdbarch_skip_entrypoint_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->skip_entrypoint != nullptr;
 }
 
 CORE_ADDR
 gdbarch_skip_entrypoint (struct gdbarch *gdbarch, CORE_ADDR ip)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->skip_entrypoint != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->skip_entrypoint != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_skip_entrypoint called\n");
   return gdbarch->skip_entrypoint (gdbarch, ip);
@@ -2660,8 +2660,8 @@ set_gdbarch_skip_entrypoint (struct gdbarch *gdbarch,
 bool
 gdbarch_inner_than (struct gdbarch *gdbarch, CORE_ADDR lhs, CORE_ADDR rhs)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->inner_than != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->inner_than != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_inner_than called\n");
   return gdbarch->inner_than (lhs, rhs);
@@ -2677,8 +2677,8 @@ set_gdbarch_inner_than (struct gdbarch *gdbarch,
 const gdb_byte *
 gdbarch_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr, int *lenptr)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->breakpoint_from_pc != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->breakpoint_from_pc != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_breakpoint_from_pc called\n");
   return gdbarch->breakpoint_from_pc (gdbarch, pcptr, lenptr);
@@ -2694,8 +2694,8 @@ set_gdbarch_breakpoint_from_pc (struct gdbarch *gdbarch,
 int
 gdbarch_breakpoint_kind_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->breakpoint_kind_from_pc != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->breakpoint_kind_from_pc != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_breakpoint_kind_from_pc called\n");
   return gdbarch->breakpoint_kind_from_pc (gdbarch, pcptr);
@@ -2711,8 +2711,8 @@ set_gdbarch_breakpoint_kind_from_pc (struct gdbarch *gdbarch,
 const gdb_byte *
 gdbarch_sw_breakpoint_from_kind (struct gdbarch *gdbarch, int kind, int *size)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->sw_breakpoint_from_kind != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->sw_breakpoint_from_kind != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_sw_breakpoint_from_kind called\n");
   return gdbarch->sw_breakpoint_from_kind (gdbarch, kind, size);
@@ -2728,8 +2728,8 @@ set_gdbarch_sw_breakpoint_from_kind (struct gdbarch *gdbarch,
 int
 gdbarch_breakpoint_kind_from_current_state (struct gdbarch *gdbarch, struct regcache *regcache, CORE_ADDR *pcptr)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->breakpoint_kind_from_current_state != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->breakpoint_kind_from_current_state != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_breakpoint_kind_from_current_state called\n");
   return gdbarch->breakpoint_kind_from_current_state (gdbarch, regcache, pcptr);
@@ -2745,15 +2745,15 @@ set_gdbarch_breakpoint_kind_from_current_state (struct gdbarch *gdbarch,
 bool
 gdbarch_adjust_breakpoint_address_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->adjust_breakpoint_address != nullptr;
 }
 
 CORE_ADDR
 gdbarch_adjust_breakpoint_address (struct gdbarch *gdbarch, CORE_ADDR bpaddr)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->adjust_breakpoint_address != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->adjust_breakpoint_address != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_adjust_breakpoint_address called\n");
   return gdbarch->adjust_breakpoint_address (gdbarch, bpaddr);
@@ -2769,8 +2769,8 @@ set_gdbarch_adjust_breakpoint_address (struct gdbarch *gdbarch,
 int
 gdbarch_memory_insert_breakpoint (struct gdbarch *gdbarch, struct bp_target_info *bp_tgt)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->memory_insert_breakpoint != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->memory_insert_breakpoint != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_memory_insert_breakpoint called\n");
   return gdbarch->memory_insert_breakpoint (gdbarch, bp_tgt);
@@ -2786,8 +2786,8 @@ set_gdbarch_memory_insert_breakpoint (struct gdbarch *gdbarch,
 int
 gdbarch_memory_remove_breakpoint (struct gdbarch *gdbarch, struct bp_target_info *bp_tgt)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->memory_remove_breakpoint != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->memory_remove_breakpoint != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_memory_remove_breakpoint called\n");
   return gdbarch->memory_remove_breakpoint (gdbarch, bp_tgt);
@@ -2803,7 +2803,7 @@ set_gdbarch_memory_remove_breakpoint (struct gdbarch *gdbarch,
 CORE_ADDR
 gdbarch_decr_pc_after_break (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of decr_pc_after_break, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_decr_pc_after_break called\n");
@@ -2820,7 +2820,7 @@ set_gdbarch_decr_pc_after_break (struct gdbarch *gdbarch,
 CORE_ADDR
 gdbarch_deprecated_function_start_offset (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of deprecated_function_start_offset, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_deprecated_function_start_offset called\n");
@@ -2837,8 +2837,8 @@ set_gdbarch_deprecated_function_start_offset (struct gdbarch *gdbarch,
 int
 gdbarch_remote_register_number (struct gdbarch *gdbarch, int regno)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->remote_register_number != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->remote_register_number != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_remote_register_number called\n");
   return gdbarch->remote_register_number (gdbarch, regno);
@@ -2854,15 +2854,15 @@ set_gdbarch_remote_register_number (struct gdbarch *gdbarch,
 bool
 gdbarch_fetch_tls_load_module_address_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->fetch_tls_load_module_address != nullptr;
 }
 
 CORE_ADDR
 gdbarch_fetch_tls_load_module_address (struct gdbarch *gdbarch, struct objfile *objfile)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->fetch_tls_load_module_address != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->fetch_tls_load_module_address != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_fetch_tls_load_module_address called\n");
   return gdbarch->fetch_tls_load_module_address (objfile);
@@ -2878,15 +2878,15 @@ set_gdbarch_fetch_tls_load_module_address (struct gdbarch *gdbarch,
 bool
 gdbarch_get_thread_local_address_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->get_thread_local_address != nullptr;
 }
 
 CORE_ADDR
 gdbarch_get_thread_local_address (struct gdbarch *gdbarch, ptid_t ptid, CORE_ADDR lm_addr, CORE_ADDR offset)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->get_thread_local_address != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->get_thread_local_address != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_get_thread_local_address called\n");
   return gdbarch->get_thread_local_address (gdbarch, ptid, lm_addr, offset);
@@ -2902,7 +2902,7 @@ set_gdbarch_get_thread_local_address (struct gdbarch *gdbarch,
 CORE_ADDR
 gdbarch_frame_args_skip (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of frame_args_skip, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_frame_args_skip called\n");
@@ -2919,8 +2919,8 @@ set_gdbarch_frame_args_skip (struct gdbarch *gdbarch,
 CORE_ADDR
 gdbarch_unwind_pc (struct gdbarch *gdbarch, const frame_info_ptr &next_frame)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->unwind_pc != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->unwind_pc != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_unwind_pc called\n");
   return gdbarch->unwind_pc (gdbarch, next_frame);
@@ -2936,8 +2936,8 @@ set_gdbarch_unwind_pc (struct gdbarch *gdbarch,
 CORE_ADDR
 gdbarch_unwind_sp (struct gdbarch *gdbarch, const frame_info_ptr &next_frame)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->unwind_sp != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->unwind_sp != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_unwind_sp called\n");
   return gdbarch->unwind_sp (gdbarch, next_frame);
@@ -2953,15 +2953,15 @@ set_gdbarch_unwind_sp (struct gdbarch *gdbarch,
 bool
 gdbarch_frame_num_args_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->frame_num_args != nullptr;
 }
 
 int
 gdbarch_frame_num_args (struct gdbarch *gdbarch, const frame_info_ptr &frame)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->frame_num_args != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->frame_num_args != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_frame_num_args called\n");
   return gdbarch->frame_num_args (frame);
@@ -2977,15 +2977,15 @@ set_gdbarch_frame_num_args (struct gdbarch *gdbarch,
 bool
 gdbarch_frame_align_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->frame_align != nullptr;
 }
 
 CORE_ADDR
 gdbarch_frame_align (struct gdbarch *gdbarch, CORE_ADDR address)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->frame_align != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->frame_align != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_frame_align called\n");
   return gdbarch->frame_align (gdbarch, address);
@@ -3001,7 +3001,7 @@ set_gdbarch_frame_align (struct gdbarch *gdbarch,
 int
 gdbarch_frame_red_zone_size (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of frame_red_zone_size, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_frame_red_zone_size called\n");
@@ -3018,8 +3018,8 @@ set_gdbarch_frame_red_zone_size (struct gdbarch *gdbarch,
 CORE_ADDR
 gdbarch_convert_from_func_ptr_addr (struct gdbarch *gdbarch, CORE_ADDR addr, struct target_ops *targ)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->convert_from_func_ptr_addr != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->convert_from_func_ptr_addr != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_convert_from_func_ptr_addr called\n");
   return gdbarch->convert_from_func_ptr_addr (gdbarch, addr, targ);
@@ -3035,8 +3035,8 @@ set_gdbarch_convert_from_func_ptr_addr (struct gdbarch *gdbarch,
 CORE_ADDR
 gdbarch_addr_bits_remove (struct gdbarch *gdbarch, CORE_ADDR addr)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->addr_bits_remove != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->addr_bits_remove != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_addr_bits_remove called\n");
   return gdbarch->addr_bits_remove (gdbarch, addr);
@@ -3052,8 +3052,8 @@ set_gdbarch_addr_bits_remove (struct gdbarch *gdbarch,
 CORE_ADDR
 gdbarch_remove_non_address_bits_watchpoint (struct gdbarch *gdbarch, CORE_ADDR pointer)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->remove_non_address_bits_watchpoint != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->remove_non_address_bits_watchpoint != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_remove_non_address_bits_watchpoint called\n");
   return gdbarch->remove_non_address_bits_watchpoint (gdbarch, pointer);
@@ -3069,8 +3069,8 @@ set_gdbarch_remove_non_address_bits_watchpoint (struct gdbarch *gdbarch,
 CORE_ADDR
 gdbarch_remove_non_address_bits_breakpoint (struct gdbarch *gdbarch, CORE_ADDR pointer)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->remove_non_address_bits_breakpoint != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->remove_non_address_bits_breakpoint != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_remove_non_address_bits_breakpoint called\n");
   return gdbarch->remove_non_address_bits_breakpoint (gdbarch, pointer);
@@ -3086,8 +3086,8 @@ set_gdbarch_remove_non_address_bits_breakpoint (struct gdbarch *gdbarch,
 CORE_ADDR
 gdbarch_remove_non_address_bits_memory (struct gdbarch *gdbarch, CORE_ADDR pointer)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->remove_non_address_bits_memory != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->remove_non_address_bits_memory != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_remove_non_address_bits_memory called\n");
   return gdbarch->remove_non_address_bits_memory (gdbarch, pointer);
@@ -3103,8 +3103,8 @@ set_gdbarch_remove_non_address_bits_memory (struct gdbarch *gdbarch,
 std::string
 gdbarch_memtag_to_string (struct gdbarch *gdbarch, struct value *tag)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->memtag_to_string != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->memtag_to_string != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_memtag_to_string called\n");
   return gdbarch->memtag_to_string (gdbarch, tag);
@@ -3120,8 +3120,8 @@ set_gdbarch_memtag_to_string (struct gdbarch *gdbarch,
 bool
 gdbarch_tagged_address_p (struct gdbarch *gdbarch, CORE_ADDR address)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->tagged_address_p != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->tagged_address_p != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_tagged_address_p called\n");
   return gdbarch->tagged_address_p (gdbarch, address);
@@ -3137,8 +3137,8 @@ set_gdbarch_tagged_address_p (struct gdbarch *gdbarch,
 bool
 gdbarch_memtag_matches_p (struct gdbarch *gdbarch, struct value *address)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->memtag_matches_p != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->memtag_matches_p != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_memtag_matches_p called\n");
   return gdbarch->memtag_matches_p (gdbarch, address);
@@ -3154,8 +3154,8 @@ set_gdbarch_memtag_matches_p (struct gdbarch *gdbarch,
 bool
 gdbarch_set_memtags (struct gdbarch *gdbarch, struct value *address, size_t length, const gdb::byte_vector &tags, memtag_type tag_type)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->set_memtags != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->set_memtags != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_set_memtags called\n");
   return gdbarch->set_memtags (gdbarch, address, length, tags, tag_type);
@@ -3171,8 +3171,8 @@ set_gdbarch_set_memtags (struct gdbarch *gdbarch,
 struct value *
 gdbarch_get_memtag (struct gdbarch *gdbarch, struct value *address, memtag_type tag_type)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->get_memtag != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->get_memtag != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_get_memtag called\n");
   return gdbarch->get_memtag (gdbarch, address, tag_type);
@@ -3188,7 +3188,7 @@ set_gdbarch_get_memtag (struct gdbarch *gdbarch,
 CORE_ADDR
 gdbarch_memtag_granule_size (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of memtag_granule_size, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_memtag_granule_size called\n");
@@ -3205,15 +3205,15 @@ set_gdbarch_memtag_granule_size (struct gdbarch *gdbarch,
 bool
 gdbarch_get_next_pcs_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->get_next_pcs != nullptr;
 }
 
 std::vector<CORE_ADDR>
 gdbarch_get_next_pcs (struct gdbarch *gdbarch, struct regcache *regcache)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->get_next_pcs != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->get_next_pcs != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_get_next_pcs called\n");
   return gdbarch->get_next_pcs (regcache);
@@ -3229,15 +3229,15 @@ set_gdbarch_get_next_pcs (struct gdbarch *gdbarch,
 bool
 gdbarch_single_step_through_delay_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->single_step_through_delay != nullptr;
 }
 
 bool
 gdbarch_single_step_through_delay (struct gdbarch *gdbarch, const frame_info_ptr &frame)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->single_step_through_delay != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->single_step_through_delay != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_single_step_through_delay called\n");
   return gdbarch->single_step_through_delay (gdbarch, frame);
@@ -3253,8 +3253,8 @@ set_gdbarch_single_step_through_delay (struct gdbarch *gdbarch,
 int
 gdbarch_print_insn (struct gdbarch *gdbarch, bfd_vma vma, struct disassemble_info *info)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->print_insn != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->print_insn != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_print_insn called\n");
   return gdbarch->print_insn (vma, info);
@@ -3270,8 +3270,8 @@ set_gdbarch_print_insn (struct gdbarch *gdbarch,
 CORE_ADDR
 gdbarch_skip_trampoline_code (struct gdbarch *gdbarch, const frame_info_ptr &frame, CORE_ADDR pc)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->skip_trampoline_code != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->skip_trampoline_code != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_skip_trampoline_code called\n");
   return gdbarch->skip_trampoline_code (frame, pc);
@@ -3287,8 +3287,8 @@ set_gdbarch_skip_trampoline_code (struct gdbarch *gdbarch,
 solib_ops_up
 gdbarch_make_solib_ops (struct gdbarch *gdbarch, program_space *pspace)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->make_solib_ops != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->make_solib_ops != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_make_solib_ops called\n");
   return gdbarch->make_solib_ops (pspace);
@@ -3304,8 +3304,8 @@ set_gdbarch_make_solib_ops (struct gdbarch *gdbarch,
 CORE_ADDR
 gdbarch_skip_solib_resolver (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->skip_solib_resolver != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->skip_solib_resolver != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_skip_solib_resolver called\n");
   return gdbarch->skip_solib_resolver (gdbarch, pc);
@@ -3321,8 +3321,8 @@ set_gdbarch_skip_solib_resolver (struct gdbarch *gdbarch,
 bool
 gdbarch_in_solib_return_trampoline (struct gdbarch *gdbarch, CORE_ADDR pc, const char *name)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->in_solib_return_trampoline != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->in_solib_return_trampoline != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_in_solib_return_trampoline called\n");
   return gdbarch->in_solib_return_trampoline (gdbarch, pc, name);
@@ -3338,8 +3338,8 @@ set_gdbarch_in_solib_return_trampoline (struct gdbarch *gdbarch,
 bool
 gdbarch_in_indirect_branch_thunk (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->in_indirect_branch_thunk != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->in_indirect_branch_thunk != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_in_indirect_branch_thunk called\n");
   return gdbarch->in_indirect_branch_thunk (gdbarch, pc);
@@ -3355,8 +3355,8 @@ set_gdbarch_in_indirect_branch_thunk (struct gdbarch *gdbarch,
 bool
 gdbarch_stack_frame_destroyed_p (struct gdbarch *gdbarch, CORE_ADDR addr)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->stack_frame_destroyed_p != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->stack_frame_destroyed_p != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_stack_frame_destroyed_p called\n");
   return gdbarch->stack_frame_destroyed_p (gdbarch, addr);
@@ -3372,15 +3372,15 @@ set_gdbarch_stack_frame_destroyed_p (struct gdbarch *gdbarch,
 bool
 gdbarch_elf_make_msymbol_special_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->elf_make_msymbol_special != nullptr;
 }
 
 void
 gdbarch_elf_make_msymbol_special (struct gdbarch *gdbarch, const asymbol *sym, struct minimal_symbol *msym)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->elf_make_msymbol_special != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->elf_make_msymbol_special != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_elf_make_msymbol_special called\n");
   gdbarch->elf_make_msymbol_special (sym, msym);
@@ -3396,8 +3396,8 @@ set_gdbarch_elf_make_msymbol_special (struct gdbarch *gdbarch,
 void
 gdbarch_coff_make_msymbol_special (struct gdbarch *gdbarch, int val, struct minimal_symbol *msym)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->coff_make_msymbol_special != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->coff_make_msymbol_special != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_coff_make_msymbol_special called\n");
   gdbarch->coff_make_msymbol_special (val, msym);
@@ -3413,8 +3413,8 @@ set_gdbarch_coff_make_msymbol_special (struct gdbarch *gdbarch,
 void
 gdbarch_make_symbol_special (struct gdbarch *gdbarch, struct symbol *sym, struct objfile *objfile)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->make_symbol_special != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->make_symbol_special != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_make_symbol_special called\n");
   gdbarch->make_symbol_special (sym, objfile);
@@ -3430,8 +3430,8 @@ set_gdbarch_make_symbol_special (struct gdbarch *gdbarch,
 CORE_ADDR
 gdbarch_adjust_dwarf2_addr (struct gdbarch *gdbarch, CORE_ADDR pc)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->adjust_dwarf2_addr != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->adjust_dwarf2_addr != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_adjust_dwarf2_addr called\n");
   return gdbarch->adjust_dwarf2_addr (pc);
@@ -3447,8 +3447,8 @@ set_gdbarch_adjust_dwarf2_addr (struct gdbarch *gdbarch,
 CORE_ADDR
 gdbarch_adjust_dwarf2_line (struct gdbarch *gdbarch, CORE_ADDR addr, int rel)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->adjust_dwarf2_line != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->adjust_dwarf2_line != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_adjust_dwarf2_line called\n");
   return gdbarch->adjust_dwarf2_line (addr, rel);
@@ -3464,7 +3464,7 @@ set_gdbarch_adjust_dwarf2_line (struct gdbarch *gdbarch,
 bool
 gdbarch_cannot_step_breakpoint (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of cannot_step_breakpoint, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_cannot_step_breakpoint called\n");
@@ -3481,7 +3481,7 @@ set_gdbarch_cannot_step_breakpoint (struct gdbarch *gdbarch,
 bool
 gdbarch_have_nonsteppable_watchpoint (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of have_nonsteppable_watchpoint, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_have_nonsteppable_watchpoint called\n");
@@ -3498,15 +3498,15 @@ set_gdbarch_have_nonsteppable_watchpoint (struct gdbarch *gdbarch,
 bool
 gdbarch_address_class_type_flags_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->address_class_type_flags != nullptr;
 }
 
 type_instance_flags
 gdbarch_address_class_type_flags (struct gdbarch *gdbarch, int byte_size, int dwarf2_addr_class)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->address_class_type_flags != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->address_class_type_flags != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_address_class_type_flags called\n");
   return gdbarch->address_class_type_flags (byte_size, dwarf2_addr_class);
@@ -3522,15 +3522,15 @@ set_gdbarch_address_class_type_flags (struct gdbarch *gdbarch,
 bool
 gdbarch_address_class_type_flags_to_name_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->address_class_type_flags_to_name != nullptr;
 }
 
 const char *
 gdbarch_address_class_type_flags_to_name (struct gdbarch *gdbarch, type_instance_flags type_flags)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->address_class_type_flags_to_name != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->address_class_type_flags_to_name != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_address_class_type_flags_to_name called\n");
   return gdbarch->address_class_type_flags_to_name (gdbarch, type_flags);
@@ -3546,8 +3546,8 @@ set_gdbarch_address_class_type_flags_to_name (struct gdbarch *gdbarch,
 bool
 gdbarch_execute_dwarf_cfa_vendor_op (struct gdbarch *gdbarch, gdb_byte op, struct dwarf2_frame_state *fs)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->execute_dwarf_cfa_vendor_op != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->execute_dwarf_cfa_vendor_op != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_execute_dwarf_cfa_vendor_op called\n");
   return gdbarch->execute_dwarf_cfa_vendor_op (gdbarch, op, fs);
@@ -3563,15 +3563,15 @@ set_gdbarch_execute_dwarf_cfa_vendor_op (struct gdbarch *gdbarch,
 bool
 gdbarch_address_class_name_to_type_flags_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->address_class_name_to_type_flags != nullptr;
 }
 
 bool
 gdbarch_address_class_name_to_type_flags (struct gdbarch *gdbarch, const char *name, type_instance_flags *type_flags_ptr)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->address_class_name_to_type_flags != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->address_class_name_to_type_flags != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_address_class_name_to_type_flags called\n");
   return gdbarch->address_class_name_to_type_flags (gdbarch, name, type_flags_ptr);
@@ -3587,8 +3587,8 @@ set_gdbarch_address_class_name_to_type_flags (struct gdbarch *gdbarch,
 bool
 gdbarch_register_reggroup_p (struct gdbarch *gdbarch, int regnum, const struct reggroup *reggroup)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->register_reggroup_p != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->register_reggroup_p != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_register_reggroup_p called\n");
   return gdbarch->register_reggroup_p (gdbarch, regnum, reggroup);
@@ -3604,8 +3604,8 @@ set_gdbarch_register_reggroup_p (struct gdbarch *gdbarch,
 CORE_ADDR
 gdbarch_fetch_pointer_argument (struct gdbarch *gdbarch, const frame_info_ptr &frame, int argi, struct type *type)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->fetch_pointer_argument != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->fetch_pointer_argument != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_fetch_pointer_argument called\n");
   return gdbarch->fetch_pointer_argument (frame, argi, type);
@@ -3621,15 +3621,15 @@ set_gdbarch_fetch_pointer_argument (struct gdbarch *gdbarch,
 bool
 gdbarch_iterate_over_regset_sections_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->iterate_over_regset_sections != nullptr;
 }
 
 void
 gdbarch_iterate_over_regset_sections (struct gdbarch *gdbarch, iterate_over_regset_sections_cb *cb, void *cb_data, const struct regcache *regcache)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->iterate_over_regset_sections != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->iterate_over_regset_sections != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_iterate_over_regset_sections called\n");
   gdbarch->iterate_over_regset_sections (gdbarch, cb, cb_data, regcache);
@@ -3645,15 +3645,15 @@ set_gdbarch_iterate_over_regset_sections (struct gdbarch *gdbarch,
 bool
 gdbarch_make_corefile_notes_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->make_corefile_notes != nullptr;
 }
 
 gdb::unique_xmalloc_ptr<char>
 gdbarch_make_corefile_notes (struct gdbarch *gdbarch, bfd *obfd, int *note_size)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->make_corefile_notes != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->make_corefile_notes != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_make_corefile_notes called\n");
   return gdbarch->make_corefile_notes (gdbarch, obfd, note_size);
@@ -3669,15 +3669,15 @@ set_gdbarch_make_corefile_notes (struct gdbarch *gdbarch,
 bool
 gdbarch_find_memory_regions_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->find_memory_regions != nullptr;
 }
 
 bool
 gdbarch_find_memory_regions (struct gdbarch *gdbarch, find_memory_region_ftype func, void *data)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->find_memory_regions != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->find_memory_regions != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_find_memory_regions called\n");
   return gdbarch->find_memory_regions (gdbarch, func, data);
@@ -3693,8 +3693,8 @@ set_gdbarch_find_memory_regions (struct gdbarch *gdbarch,
 asection *
 gdbarch_create_memtag_section (struct gdbarch *gdbarch, bfd *obfd, CORE_ADDR address, size_t size)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->create_memtag_section != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->create_memtag_section != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_create_memtag_section called\n");
   return gdbarch->create_memtag_section (gdbarch, obfd, address, size);
@@ -3710,8 +3710,8 @@ set_gdbarch_create_memtag_section (struct gdbarch *gdbarch,
 bool
 gdbarch_fill_memtag_section (struct gdbarch *gdbarch, asection *osec)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->fill_memtag_section != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->fill_memtag_section != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_fill_memtag_section called\n");
   return gdbarch->fill_memtag_section (gdbarch, osec);
@@ -3727,15 +3727,15 @@ set_gdbarch_fill_memtag_section (struct gdbarch *gdbarch,
 bool
 gdbarch_decode_memtag_section_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->decode_memtag_section != nullptr;
 }
 
 gdb::byte_vector
 gdbarch_decode_memtag_section (struct gdbarch *gdbarch, bfd_section *section, int type, CORE_ADDR address, size_t length)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->decode_memtag_section != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->decode_memtag_section != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_decode_memtag_section called\n");
   return gdbarch->decode_memtag_section (gdbarch, section, type, address, length);
@@ -3751,15 +3751,15 @@ set_gdbarch_decode_memtag_section (struct gdbarch *gdbarch,
 bool
 gdbarch_core_xfer_shared_libraries_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->core_xfer_shared_libraries != nullptr;
 }
 
 ULONGEST
 gdbarch_core_xfer_shared_libraries (struct gdbarch *gdbarch, struct bfd &cbfd, gdb_byte *readbuf, ULONGEST offset, ULONGEST len)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->core_xfer_shared_libraries != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->core_xfer_shared_libraries != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_core_xfer_shared_libraries called\n");
   return gdbarch->core_xfer_shared_libraries (gdbarch, cbfd, readbuf, offset, len);
@@ -3775,15 +3775,15 @@ set_gdbarch_core_xfer_shared_libraries (struct gdbarch *gdbarch,
 bool
 gdbarch_core_xfer_shared_libraries_aix_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->core_xfer_shared_libraries_aix != nullptr;
 }
 
 ULONGEST
 gdbarch_core_xfer_shared_libraries_aix (struct gdbarch *gdbarch, struct bfd &cbfd, gdb_byte *readbuf, ULONGEST offset, ULONGEST len)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->core_xfer_shared_libraries_aix != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->core_xfer_shared_libraries_aix != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_core_xfer_shared_libraries_aix called\n");
   return gdbarch->core_xfer_shared_libraries_aix (gdbarch, cbfd, readbuf, offset, len);
@@ -3799,15 +3799,15 @@ set_gdbarch_core_xfer_shared_libraries_aix (struct gdbarch *gdbarch,
 bool
 gdbarch_core_pid_to_str_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->core_pid_to_str != nullptr;
 }
 
 std::string
 gdbarch_core_pid_to_str (struct gdbarch *gdbarch, ptid_t ptid)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->core_pid_to_str != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->core_pid_to_str != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_core_pid_to_str called\n");
   return gdbarch->core_pid_to_str (gdbarch, ptid);
@@ -3823,15 +3823,15 @@ set_gdbarch_core_pid_to_str (struct gdbarch *gdbarch,
 bool
 gdbarch_core_thread_name_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->core_thread_name != nullptr;
 }
 
 const char *
 gdbarch_core_thread_name (struct gdbarch *gdbarch, struct bfd &cbfd, struct thread_info *thr)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->core_thread_name != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->core_thread_name != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_core_thread_name called\n");
   return gdbarch->core_thread_name (gdbarch, cbfd, thr);
@@ -3847,15 +3847,15 @@ set_gdbarch_core_thread_name (struct gdbarch *gdbarch,
 bool
 gdbarch_core_xfer_siginfo_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->core_xfer_siginfo != nullptr;
 }
 
 LONGEST
 gdbarch_core_xfer_siginfo (struct gdbarch *gdbarch, struct bfd &cbfd, gdb_byte *readbuf, ULONGEST offset, ULONGEST len)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->core_xfer_siginfo != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->core_xfer_siginfo != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_core_xfer_siginfo called\n");
   return gdbarch->core_xfer_siginfo (gdbarch, cbfd, readbuf, offset, len);
@@ -3871,15 +3871,15 @@ set_gdbarch_core_xfer_siginfo (struct gdbarch *gdbarch,
 bool
 gdbarch_core_read_x86_xsave_layout_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->core_read_x86_xsave_layout != nullptr;
 }
 
 bool
 gdbarch_core_read_x86_xsave_layout (struct gdbarch *gdbarch, struct bfd &cbfd, x86_xsave_layout &xsave_layout)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->core_read_x86_xsave_layout != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->core_read_x86_xsave_layout != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_core_read_x86_xsave_layout called\n");
   return gdbarch->core_read_x86_xsave_layout (gdbarch, cbfd, xsave_layout);
@@ -3895,14 +3895,14 @@ set_gdbarch_core_read_x86_xsave_layout (struct gdbarch *gdbarch,
 bool
 gdbarch_gcore_bfd_target_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->gcore_bfd_target != nullptr;
 }
 
 const char *
 gdbarch_gcore_bfd_target (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Check predicate was used.  */
   gdb_assert (gdbarch_gcore_bfd_target_p (gdbarch));
   if (gdbarch_debug >= 2)
@@ -3920,7 +3920,7 @@ set_gdbarch_gcore_bfd_target (struct gdbarch *gdbarch,
 bool
 gdbarch_vtable_function_descriptors (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of vtable_function_descriptors, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_vtable_function_descriptors called\n");
@@ -3937,7 +3937,7 @@ set_gdbarch_vtable_function_descriptors (struct gdbarch *gdbarch,
 bool
 gdbarch_vbit_in_delta (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of vbit_in_delta, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_vbit_in_delta called\n");
@@ -3954,14 +3954,14 @@ set_gdbarch_vbit_in_delta (struct gdbarch *gdbarch,
 bool
 gdbarch_max_insn_length_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->max_insn_length != 0;
 }
 
 ULONGEST
 gdbarch_max_insn_length (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Check predicate was used.  */
   gdb_assert (gdbarch_max_insn_length_p (gdbarch));
   if (gdbarch_debug >= 2)
@@ -3979,8 +3979,8 @@ set_gdbarch_max_insn_length (struct gdbarch *gdbarch,
 displaced_step_copy_insn_closure_up
 gdbarch_displaced_step_copy_insn (struct gdbarch *gdbarch, CORE_ADDR from, CORE_ADDR to, struct regcache *regs)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->displaced_step_copy_insn != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->displaced_step_copy_insn != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_displaced_step_copy_insn called\n");
   return gdbarch->displaced_step_copy_insn (gdbarch, from, to, regs);
@@ -3996,8 +3996,8 @@ set_gdbarch_displaced_step_copy_insn (struct gdbarch *gdbarch,
 bool
 gdbarch_displaced_step_hw_singlestep (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->displaced_step_hw_singlestep != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->displaced_step_hw_singlestep != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_displaced_step_hw_singlestep called\n");
   return gdbarch->displaced_step_hw_singlestep (gdbarch);
@@ -4013,8 +4013,8 @@ set_gdbarch_displaced_step_hw_singlestep (struct gdbarch *gdbarch,
 void
 gdbarch_displaced_step_fixup (struct gdbarch *gdbarch, struct displaced_step_copy_insn_closure *closure, CORE_ADDR from, CORE_ADDR to, struct regcache *regs, bool completed_p)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->displaced_step_fixup != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->displaced_step_fixup != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_displaced_step_fixup called\n");
   gdbarch->displaced_step_fixup (gdbarch, closure, from, to, regs, completed_p);
@@ -4030,15 +4030,15 @@ set_gdbarch_displaced_step_fixup (struct gdbarch *gdbarch,
 bool
 gdbarch_displaced_step_prepare_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->displaced_step_prepare != nullptr;
 }
 
 displaced_step_prepare_status
 gdbarch_displaced_step_prepare (struct gdbarch *gdbarch, thread_info *thread, CORE_ADDR &displaced_pc)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->displaced_step_prepare != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->displaced_step_prepare != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_displaced_step_prepare called\n");
   return gdbarch->displaced_step_prepare (gdbarch, thread, displaced_pc);
@@ -4054,8 +4054,8 @@ set_gdbarch_displaced_step_prepare (struct gdbarch *gdbarch,
 displaced_step_finish_status
 gdbarch_displaced_step_finish (struct gdbarch *gdbarch, thread_info *thread, const target_waitstatus &ws)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->displaced_step_finish != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->displaced_step_finish != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_displaced_step_finish called\n");
   return gdbarch->displaced_step_finish (gdbarch, thread, ws);
@@ -4071,15 +4071,15 @@ set_gdbarch_displaced_step_finish (struct gdbarch *gdbarch,
 bool
 gdbarch_displaced_step_copy_insn_closure_by_addr_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->displaced_step_copy_insn_closure_by_addr != nullptr;
 }
 
 const displaced_step_copy_insn_closure *
 gdbarch_displaced_step_copy_insn_closure_by_addr (struct gdbarch *gdbarch, inferior *inf, CORE_ADDR addr)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->displaced_step_copy_insn_closure_by_addr != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->displaced_step_copy_insn_closure_by_addr != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_displaced_step_copy_insn_closure_by_addr called\n");
   return gdbarch->displaced_step_copy_insn_closure_by_addr (inf, addr);
@@ -4095,8 +4095,8 @@ set_gdbarch_displaced_step_copy_insn_closure_by_addr (struct gdbarch *gdbarch,
 void
 gdbarch_displaced_step_restore_all_in_ptid (struct gdbarch *gdbarch, inferior *parent_inf, ptid_t child_ptid)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->displaced_step_restore_all_in_ptid != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->displaced_step_restore_all_in_ptid != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_displaced_step_restore_all_in_ptid called\n");
   gdbarch->displaced_step_restore_all_in_ptid (parent_inf, child_ptid);
@@ -4112,7 +4112,7 @@ set_gdbarch_displaced_step_restore_all_in_ptid (struct gdbarch *gdbarch,
 ULONGEST
 gdbarch_displaced_step_buffer_length (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Check variable is valid.  */
   gdb_assert (!(gdbarch->displaced_step_buffer_length < gdbarch->max_insn_length));
   if (gdbarch_debug >= 2)
@@ -4130,8 +4130,8 @@ set_gdbarch_displaced_step_buffer_length (struct gdbarch *gdbarch,
 void
 gdbarch_relocate_instruction (struct gdbarch *gdbarch, CORE_ADDR *to, CORE_ADDR from)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->relocate_instruction != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->relocate_instruction != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_relocate_instruction called\n");
   gdbarch->relocate_instruction (gdbarch, to, from);
@@ -4147,15 +4147,15 @@ set_gdbarch_relocate_instruction (struct gdbarch *gdbarch,
 bool
 gdbarch_overlay_update_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->overlay_update != nullptr;
 }
 
 void
 gdbarch_overlay_update (struct gdbarch *gdbarch, struct obj_section *osect)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->overlay_update != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->overlay_update != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_overlay_update called\n");
   gdbarch->overlay_update (osect);
@@ -4171,15 +4171,15 @@ set_gdbarch_overlay_update (struct gdbarch *gdbarch,
 bool
 gdbarch_core_read_description_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->core_read_description != nullptr;
 }
 
 const struct target_desc *
 gdbarch_core_read_description (struct gdbarch *gdbarch, struct target_ops *target, bfd *abfd)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->core_read_description != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->core_read_description != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_core_read_description called\n");
   return gdbarch->core_read_description (gdbarch, target, abfd);
@@ -4195,15 +4195,15 @@ set_gdbarch_core_read_description (struct gdbarch *gdbarch,
 bool
 gdbarch_process_record_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->process_record != nullptr;
 }
 
 int
 gdbarch_process_record (struct gdbarch *gdbarch, struct regcache *regcache, CORE_ADDR addr)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->process_record != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->process_record != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_process_record called\n");
   return gdbarch->process_record (gdbarch, regcache, addr);
@@ -4219,15 +4219,15 @@ set_gdbarch_process_record (struct gdbarch *gdbarch,
 bool
 gdbarch_process_record_signal_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->process_record_signal != nullptr;
 }
 
 int
 gdbarch_process_record_signal (struct gdbarch *gdbarch, struct regcache *regcache, enum gdb_signal signal)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->process_record_signal != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->process_record_signal != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_process_record_signal called\n");
   return gdbarch->process_record_signal (gdbarch, regcache, signal);
@@ -4243,15 +4243,15 @@ set_gdbarch_process_record_signal (struct gdbarch *gdbarch,
 bool
 gdbarch_gdb_signal_from_target_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->gdb_signal_from_target != nullptr;
 }
 
 enum gdb_signal
 gdbarch_gdb_signal_from_target (struct gdbarch *gdbarch, int signo)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->gdb_signal_from_target != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->gdb_signal_from_target != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_gdb_signal_from_target called\n");
   return gdbarch->gdb_signal_from_target (gdbarch, signo);
@@ -4267,15 +4267,15 @@ set_gdbarch_gdb_signal_from_target (struct gdbarch *gdbarch,
 bool
 gdbarch_gdb_signal_to_target_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->gdb_signal_to_target != nullptr;
 }
 
 int
 gdbarch_gdb_signal_to_target (struct gdbarch *gdbarch, enum gdb_signal signal)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->gdb_signal_to_target != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->gdb_signal_to_target != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_gdb_signal_to_target called\n");
   return gdbarch->gdb_signal_to_target (gdbarch, signal);
@@ -4291,15 +4291,15 @@ set_gdbarch_gdb_signal_to_target (struct gdbarch *gdbarch,
 bool
 gdbarch_get_siginfo_type_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->get_siginfo_type != nullptr;
 }
 
 struct type *
 gdbarch_get_siginfo_type (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->get_siginfo_type != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->get_siginfo_type != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_get_siginfo_type called\n");
   return gdbarch->get_siginfo_type (gdbarch);
@@ -4315,15 +4315,15 @@ set_gdbarch_get_siginfo_type (struct gdbarch *gdbarch,
 bool
 gdbarch_record_special_symbol_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->record_special_symbol != nullptr;
 }
 
 void
 gdbarch_record_special_symbol (struct gdbarch *gdbarch, struct objfile *objfile, const asymbol *sym)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->record_special_symbol != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->record_special_symbol != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_record_special_symbol called\n");
   gdbarch->record_special_symbol (gdbarch, objfile, sym);
@@ -4339,15 +4339,15 @@ set_gdbarch_record_special_symbol (struct gdbarch *gdbarch,
 bool
 gdbarch_get_syscall_number_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->get_syscall_number != nullptr;
 }
 
 LONGEST
 gdbarch_get_syscall_number (struct gdbarch *gdbarch, thread_info *thread)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->get_syscall_number != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->get_syscall_number != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_get_syscall_number called\n");
   return gdbarch->get_syscall_number (gdbarch, thread);
@@ -4363,7 +4363,7 @@ set_gdbarch_get_syscall_number (struct gdbarch *gdbarch,
 const char *
 gdbarch_xml_syscall_file (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of xml_syscall_file, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_xml_syscall_file called\n");
@@ -4380,7 +4380,7 @@ set_gdbarch_xml_syscall_file (struct gdbarch *gdbarch,
 struct syscalls_info *
 gdbarch_syscalls_info (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of syscalls_info, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_syscalls_info called\n");
@@ -4397,7 +4397,7 @@ set_gdbarch_syscalls_info (struct gdbarch *gdbarch,
 const char *const *
 gdbarch_stap_integer_prefixes (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of stap_integer_prefixes, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_stap_integer_prefixes called\n");
@@ -4414,7 +4414,7 @@ set_gdbarch_stap_integer_prefixes (struct gdbarch *gdbarch,
 const char *const *
 gdbarch_stap_integer_suffixes (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of stap_integer_suffixes, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_stap_integer_suffixes called\n");
@@ -4431,7 +4431,7 @@ set_gdbarch_stap_integer_suffixes (struct gdbarch *gdbarch,
 const char *const *
 gdbarch_stap_register_prefixes (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of stap_register_prefixes, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_stap_register_prefixes called\n");
@@ -4448,7 +4448,7 @@ set_gdbarch_stap_register_prefixes (struct gdbarch *gdbarch,
 const char *const *
 gdbarch_stap_register_suffixes (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of stap_register_suffixes, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_stap_register_suffixes called\n");
@@ -4465,7 +4465,7 @@ set_gdbarch_stap_register_suffixes (struct gdbarch *gdbarch,
 const char *const *
 gdbarch_stap_register_indirection_prefixes (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of stap_register_indirection_prefixes, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_stap_register_indirection_prefixes called\n");
@@ -4482,7 +4482,7 @@ set_gdbarch_stap_register_indirection_prefixes (struct gdbarch *gdbarch,
 const char *const *
 gdbarch_stap_register_indirection_suffixes (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of stap_register_indirection_suffixes, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_stap_register_indirection_suffixes called\n");
@@ -4499,7 +4499,7 @@ set_gdbarch_stap_register_indirection_suffixes (struct gdbarch *gdbarch,
 const char *
 gdbarch_stap_gdb_register_prefix (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of stap_gdb_register_prefix, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_stap_gdb_register_prefix called\n");
@@ -4516,7 +4516,7 @@ set_gdbarch_stap_gdb_register_prefix (struct gdbarch *gdbarch,
 const char *
 gdbarch_stap_gdb_register_suffix (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of stap_gdb_register_suffix, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_stap_gdb_register_suffix called\n");
@@ -4533,15 +4533,15 @@ set_gdbarch_stap_gdb_register_suffix (struct gdbarch *gdbarch,
 bool
 gdbarch_stap_is_single_operand_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->stap_is_single_operand != nullptr;
 }
 
 bool
 gdbarch_stap_is_single_operand (struct gdbarch *gdbarch, const char *s)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->stap_is_single_operand != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->stap_is_single_operand != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_stap_is_single_operand called\n");
   return gdbarch->stap_is_single_operand (gdbarch, s);
@@ -4557,15 +4557,15 @@ set_gdbarch_stap_is_single_operand (struct gdbarch *gdbarch,
 bool
 gdbarch_stap_parse_special_token_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->stap_parse_special_token != nullptr;
 }
 
 expr::operation_up
 gdbarch_stap_parse_special_token (struct gdbarch *gdbarch, struct stap_parse_info *p)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->stap_parse_special_token != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->stap_parse_special_token != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_stap_parse_special_token called\n");
   return gdbarch->stap_parse_special_token (gdbarch, p);
@@ -4581,15 +4581,15 @@ set_gdbarch_stap_parse_special_token (struct gdbarch *gdbarch,
 bool
 gdbarch_stap_adjust_register_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->stap_adjust_register != nullptr;
 }
 
 std::string
 gdbarch_stap_adjust_register (struct gdbarch *gdbarch, struct stap_parse_info *p, const std::string &regname, int regnum)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->stap_adjust_register != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->stap_adjust_register != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_stap_adjust_register called\n");
   return gdbarch->stap_adjust_register (gdbarch, p, regname, regnum);
@@ -4605,15 +4605,15 @@ set_gdbarch_stap_adjust_register (struct gdbarch *gdbarch,
 bool
 gdbarch_dtrace_parse_probe_argument_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->dtrace_parse_probe_argument != nullptr;
 }
 
 expr::operation_up
 gdbarch_dtrace_parse_probe_argument (struct gdbarch *gdbarch, int narg)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->dtrace_parse_probe_argument != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->dtrace_parse_probe_argument != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_dtrace_parse_probe_argument called\n");
   return gdbarch->dtrace_parse_probe_argument (gdbarch, narg);
@@ -4629,15 +4629,15 @@ set_gdbarch_dtrace_parse_probe_argument (struct gdbarch *gdbarch,
 bool
 gdbarch_dtrace_probe_is_enabled_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->dtrace_probe_is_enabled != nullptr;
 }
 
 bool
 gdbarch_dtrace_probe_is_enabled (struct gdbarch *gdbarch, CORE_ADDR addr)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->dtrace_probe_is_enabled != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->dtrace_probe_is_enabled != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_dtrace_probe_is_enabled called\n");
   return gdbarch->dtrace_probe_is_enabled (gdbarch, addr);
@@ -4653,15 +4653,15 @@ set_gdbarch_dtrace_probe_is_enabled (struct gdbarch *gdbarch,
 bool
 gdbarch_dtrace_enable_probe_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->dtrace_enable_probe != nullptr;
 }
 
 void
 gdbarch_dtrace_enable_probe (struct gdbarch *gdbarch, CORE_ADDR addr)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->dtrace_enable_probe != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->dtrace_enable_probe != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_dtrace_enable_probe called\n");
   gdbarch->dtrace_enable_probe (gdbarch, addr);
@@ -4677,15 +4677,15 @@ set_gdbarch_dtrace_enable_probe (struct gdbarch *gdbarch,
 bool
 gdbarch_dtrace_disable_probe_p (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   return gdbarch->dtrace_disable_probe != nullptr;
 }
 
 void
 gdbarch_dtrace_disable_probe (struct gdbarch *gdbarch, CORE_ADDR addr)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->dtrace_disable_probe != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->dtrace_disable_probe != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_dtrace_disable_probe called\n");
   gdbarch->dtrace_disable_probe (gdbarch, addr);
@@ -4701,7 +4701,7 @@ set_gdbarch_dtrace_disable_probe (struct gdbarch *gdbarch,
 bool
 gdbarch_has_global_solist (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of has_global_solist, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_has_global_solist called\n");
@@ -4718,7 +4718,7 @@ set_gdbarch_has_global_solist (struct gdbarch *gdbarch,
 bool
 gdbarch_has_global_breakpoints (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of has_global_breakpoints, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_has_global_breakpoints called\n");
@@ -4735,8 +4735,8 @@ set_gdbarch_has_global_breakpoints (struct gdbarch *gdbarch,
 bool
 gdbarch_has_shared_address_space (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->has_shared_address_space != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->has_shared_address_space != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_has_shared_address_space called\n");
   return gdbarch->has_shared_address_space (gdbarch);
@@ -4752,8 +4752,8 @@ set_gdbarch_has_shared_address_space (struct gdbarch *gdbarch,
 bool
 gdbarch_fast_tracepoint_valid_at (struct gdbarch *gdbarch, CORE_ADDR addr, std::string *msg)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->fast_tracepoint_valid_at != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->fast_tracepoint_valid_at != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_fast_tracepoint_valid_at called\n");
   return gdbarch->fast_tracepoint_valid_at (gdbarch, addr, msg);
@@ -4769,8 +4769,8 @@ set_gdbarch_fast_tracepoint_valid_at (struct gdbarch *gdbarch,
 void
 gdbarch_guess_tracepoint_registers (struct gdbarch *gdbarch, struct regcache *regcache, CORE_ADDR addr)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->guess_tracepoint_registers != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->guess_tracepoint_registers != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_guess_tracepoint_registers called\n");
   gdbarch->guess_tracepoint_registers (gdbarch, regcache, addr);
@@ -4786,8 +4786,8 @@ set_gdbarch_guess_tracepoint_registers (struct gdbarch *gdbarch,
 const char *
 gdbarch_auto_wide_charset (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
-  gdb_assert (gdbarch->auto_wide_charset != NULL);
+  gdb_assert (gdbarch != nullptr);
+  gdb_assert (gdbarch->auto_wide_charset != nullptr);
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_auto_wide_charset called\n");
   return gdbarch->auto_wide_charset ();
@@ -4803,7 +4803,7 @@ set_gdbarch_auto_wide_charset (struct gdbarch *gdbarch,
 bool
 gdbarch_has_dos_based_file_system (struct gdbarch *gdbarch)
 {
-  gdb_assert (gdbarch != NULL);
+  gdb_assert (gdbarch != nullptr);
   /* Skip verify of has_dos_based_file_system, invalid_p == 0.  */
   if (gdbarch_debug >= 2)
     gdb_printf (gdb_stdlog, "gdbarch_has_dos_based_file_system called\n");
@@ -4820,8 +4820,8 @@ set_gdbarch_has_dos_based_file_system (struct gdbarch *gdbarch,
 void
 gdbarch_gen_return_address (struct gdbarch *gdbarch, struct agent_expr *ax, struct axs_value *value, CORE_ADDR scope)
 {
-  gdb_assert (gdbarch != NULL);
-  gd[...]

[diff truncated at 100000 bytes]
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.