gdb: adjust formatting of pointers in gdbarch-gen.{c,h}

Omit the space after pointer types.  This is purely for aesthetic
reasons, so that the formatting matches what we would write by hand.

Change-Id: I391ad25f79e529bf38e40e7bf97345a9c096fb10
Approved-By: Tom Tromey <tom@tromey.com>

diff --git a/gdb/gdbarch-gen.c b/gdb/gdbarch-gen.c
index 79347b87053c6070432ae188469168b81e9cfad2..d822812e72c1a307b442b15cbec507b29c645c03 100644 (file)
--- a/gdb/gdbarch-gen.c
+++ b/gdb/gdbarch-gen.c
@@ -38,11 +38,11 @@ struct gdbarch
   registry<gdbarch> registry_fields;
 
   /* basic architectural information.  */
-  const struct bfd_arch_info * bfd_arch_info;
+  const struct bfd_arch_info *bfd_arch_info;
   enum bfd_endian byte_order;
   enum bfd_endian byte_order_for_code;
   enum gdb_osabi osabi;
-  const struct target_desc * target_desc;
+  const struct target_desc *target_desc;
 
   /* target specific vector.  */
   gdbarch_tdep_up tdep;
@@ -53,15 +53,15 @@ struct gdbarch
   int long_bit = 4*TARGET_CHAR_BIT;
   int long_long_bit = 2*4*TARGET_CHAR_BIT;
   int bfloat16_bit = 2*TARGET_CHAR_BIT;
-  const struct floatformat ** bfloat16_format = floatformats_bfloat16;
+  const struct floatformat **bfloat16_format = floatformats_bfloat16;
   int half_bit = 2*TARGET_CHAR_BIT;
-  const struct floatformat ** half_format = floatformats_ieee_half;
+  const struct floatformat **half_format = floatformats_ieee_half;
   int float_bit = 4*TARGET_CHAR_BIT;
-  const struct floatformat ** float_format = floatformats_ieee_single;
+  const struct floatformat **float_format = floatformats_ieee_single;
   int double_bit = 8*TARGET_CHAR_BIT;
-  const struct floatformat ** double_format = floatformats_ieee_double;
+  const struct floatformat **double_format = floatformats_ieee_double;
   int long_double_bit = 8*TARGET_CHAR_BIT;
-  const struct floatformat ** long_double_format = floatformats_ieee_double;
+  const struct floatformat **long_double_format = floatformats_ieee_double;
   int wchar_bit = 4*TARGET_CHAR_BIT;
   bool wchar_signed = true;
   gdbarch_floatformat_for_type_ftype *floatformat_for_type = default_floatformat_for_type;
@@ -181,7 +181,7 @@ struct gdbarch
   gdbarch_core_thread_name_ftype *core_thread_name = nullptr;
   gdbarch_core_xfer_siginfo_ftype *core_xfer_siginfo = nullptr;
   gdbarch_core_read_x86_xsave_layout_ftype *core_read_x86_xsave_layout = nullptr;
-  const char * gcore_bfd_target = nullptr;
+  const char *gcore_bfd_target = nullptr;
   bool vtable_function_descriptors = false;
   bool vbit_in_delta = false;
   ULONGEST max_insn_length = 0;
@@ -203,16 +203,16 @@ struct gdbarch
   gdbarch_get_siginfo_type_ftype *get_siginfo_type = nullptr;
   gdbarch_record_special_symbol_ftype *record_special_symbol = nullptr;
   gdbarch_get_syscall_number_ftype *get_syscall_number = nullptr;
-  const char * xml_syscall_file = nullptr;
-  struct syscalls_info * syscalls_info = nullptr;
-  const char *const * stap_integer_prefixes = nullptr;
-  const char *const * stap_integer_suffixes = nullptr;
-  const char *const * stap_register_prefixes = nullptr;
-  const char *const * stap_register_suffixes = nullptr;
-  const char *const * stap_register_indirection_prefixes = nullptr;
-  const char *const * stap_register_indirection_suffixes = nullptr;
-  const char * stap_gdb_register_prefix = nullptr;
-  const char * stap_gdb_register_suffix = nullptr;
+  const char *xml_syscall_file = nullptr;
+  struct syscalls_info *syscalls_info = nullptr;
+  const char *const *stap_integer_prefixes = nullptr;
+  const char *const *stap_integer_suffixes = nullptr;
+  const char *const *stap_register_prefixes = nullptr;
+  const char *const *stap_register_suffixes = nullptr;
+  const char *const *stap_register_indirection_prefixes = nullptr;
+  const char *const *stap_register_indirection_suffixes = nullptr;
+  const char *stap_gdb_register_prefix = nullptr;
+  const char *stap_gdb_register_suffix = nullptr;
   gdbarch_stap_is_single_operand_ftype *stap_is_single_operand = nullptr;
   gdbarch_stap_parse_special_token_ftype *stap_parse_special_token = nullptr;
   gdbarch_stap_adjust_register_ftype *stap_adjust_register = nullptr;
@@ -230,7 +230,7 @@ struct gdbarch
   gdbarch_gen_return_address_ftype *gen_return_address = default_gen_return_address;
   gdbarch_info_proc_ftype *info_proc = nullptr;
   gdbarch_core_info_proc_ftype *core_info_proc = nullptr;
-  struct ravenscar_arch_ops * ravenscar_ops = nullptr;
+  struct ravenscar_arch_ops *ravenscar_ops = nullptr;
   gdbarch_insn_is_call_ftype *insn_is_call = default_insn_is_call;
   gdbarch_insn_is_ret_ftype *insn_is_ret = default_insn_is_ret;
   gdbarch_insn_is_jump_ftype *insn_is_jump = default_insn_is_jump;
@@ -243,9 +243,9 @@ struct gdbarch
   gdbarch_gcc_target_options_ftype *gcc_target_options = default_gcc_target_options;
   gdbarch_gnu_triplet_regexp_ftype *gnu_triplet_regexp = default_gnu_triplet_regexp;
   gdbarch_addressable_memory_unit_size_ftype *addressable_memory_unit_size = default_addressable_memory_unit_size;
-  const char * disassembler_options_implicit = nullptr;
-  std::string * disassembler_options = nullptr;
-  const disasm_options_and_args_t * valid_disassembler_options = nullptr;
+  const char *disassembler_options_implicit = nullptr;
+  std::string *disassembler_options = nullptr;
+  const disasm_options_and_args_t *valid_disassembler_options = nullptr;
   gdbarch_type_align_ftype *type_align = default_type_align;
   gdbarch_get_pc_address_flags_ftype *get_pc_address_flags = default_get_pc_address_flags;
   gdbarch_read_core_file_mappings_ftype *read_core_file_mappings = default_read_core_file_mappings;
@@ -1486,7 +1486,7 @@ gdbarch_bfloat16_format (struct gdbarch *gdbarch)
 
 void
 set_gdbarch_bfloat16_format (struct gdbarch *gdbarch,
-                            const struct floatformat ** bfloat16_format)
+                            const struct floatformat **bfloat16_format)
 {
   gdbarch->bfloat16_format = bfloat16_format;
 }
@@ -1520,7 +1520,7 @@ gdbarch_half_format (struct gdbarch *gdbarch)
 
 void
 set_gdbarch_half_format (struct gdbarch *gdbarch,
-                        const struct floatformat ** half_format)
+                        const struct floatformat **half_format)
 {
   gdbarch->half_format = half_format;
 }
@@ -1554,7 +1554,7 @@ gdbarch_float_format (struct gdbarch *gdbarch)
 
 void
 set_gdbarch_float_format (struct gdbarch *gdbarch,
-                         const struct floatformat ** float_format)
+                         const struct floatformat **float_format)
 {
   gdbarch->float_format = float_format;
 }
@@ -1588,7 +1588,7 @@ gdbarch_double_format (struct gdbarch *gdbarch)
 
 void
 set_gdbarch_double_format (struct gdbarch *gdbarch,
-                          const struct floatformat ** double_format)
+                          const struct floatformat **double_format)
 {
   gdbarch->double_format = double_format;
 }
@@ -1622,7 +1622,7 @@ gdbarch_long_double_format (struct gdbarch *gdbarch)
 
 void
 set_gdbarch_long_double_format (struct gdbarch *gdbarch,
-                               const struct floatformat ** long_double_format)
+                               const struct floatformat **long_double_format)
 {
   gdbarch->long_double_format = long_double_format;
 }
@@ -3912,7 +3912,7 @@ gdbarch_gcore_bfd_target (struct gdbarch *gdbarch)
 
 void
 set_gdbarch_gcore_bfd_target (struct gdbarch *gdbarch,
-                             const char * gcore_bfd_target)
+                             const char *gcore_bfd_target)
 {
   gdbarch->gcore_bfd_target = gcore_bfd_target;
 }
@@ -4372,7 +4372,7 @@ gdbarch_xml_syscall_file (struct gdbarch *gdbarch)
 
 void
 set_gdbarch_xml_syscall_file (struct gdbarch *gdbarch,
-                             const char * xml_syscall_file)
+                             const char *xml_syscall_file)
 {
   gdbarch->xml_syscall_file = xml_syscall_file;
 }
@@ -4389,7 +4389,7 @@ gdbarch_syscalls_info (struct gdbarch *gdbarch)
 
 void
 set_gdbarch_syscalls_info (struct gdbarch *gdbarch,
-                          struct syscalls_info * syscalls_info)
+                          struct syscalls_info *syscalls_info)
 {
   gdbarch->syscalls_info = syscalls_info;
 }
@@ -4406,7 +4406,7 @@ gdbarch_stap_integer_prefixes (struct gdbarch *gdbarch)
 
 void
 set_gdbarch_stap_integer_prefixes (struct gdbarch *gdbarch,
-                                  const char *const * stap_integer_prefixes)
+                                  const char *const *stap_integer_prefixes)
 {
   gdbarch->stap_integer_prefixes = stap_integer_prefixes;
 }
@@ -4423,7 +4423,7 @@ gdbarch_stap_integer_suffixes (struct gdbarch *gdbarch)
 
 void
 set_gdbarch_stap_integer_suffixes (struct gdbarch *gdbarch,
-                                  const char *const * stap_integer_suffixes)
+                                  const char *const *stap_integer_suffixes)
 {
   gdbarch->stap_integer_suffixes = stap_integer_suffixes;
 }
@@ -4440,7 +4440,7 @@ gdbarch_stap_register_prefixes (struct gdbarch *gdbarch)
 
 void
 set_gdbarch_stap_register_prefixes (struct gdbarch *gdbarch,
-                                   const char *const * stap_register_prefixes)
+                                   const char *const *stap_register_prefixes)
 {
   gdbarch->stap_register_prefixes = stap_register_prefixes;
 }
@@ -4457,7 +4457,7 @@ gdbarch_stap_register_suffixes (struct gdbarch *gdbarch)
 
 void
 set_gdbarch_stap_register_suffixes (struct gdbarch *gdbarch,
-                                   const char *const * stap_register_suffixes)
+                                   const char *const *stap_register_suffixes)
 {
   gdbarch->stap_register_suffixes = stap_register_suffixes;
 }
@@ -4474,7 +4474,7 @@ gdbarch_stap_register_indirection_prefixes (struct gdbarch *gdbarch)
 
 void
 set_gdbarch_stap_register_indirection_prefixes (struct gdbarch *gdbarch,
-                                               const char *const * stap_register_indirection_prefixes)
+                                               const char *const *stap_register_indirection_prefixes)
 {
   gdbarch->stap_register_indirection_prefixes = stap_register_indirection_prefixes;
 }
@@ -4491,7 +4491,7 @@ gdbarch_stap_register_indirection_suffixes (struct gdbarch *gdbarch)
 
 void
 set_gdbarch_stap_register_indirection_suffixes (struct gdbarch *gdbarch,
-                                               const char *const * stap_register_indirection_suffixes)
+                                               const char *const *stap_register_indirection_suffixes)
 {
   gdbarch->stap_register_indirection_suffixes = stap_register_indirection_suffixes;
 }
@@ -4508,7 +4508,7 @@ gdbarch_stap_gdb_register_prefix (struct gdbarch *gdbarch)
 
 void
 set_gdbarch_stap_gdb_register_prefix (struct gdbarch *gdbarch,
-                                     const char * stap_gdb_register_prefix)
+                                     const char *stap_gdb_register_prefix)
 {
   gdbarch->stap_gdb_register_prefix = stap_gdb_register_prefix;
 }
@@ -4525,7 +4525,7 @@ gdbarch_stap_gdb_register_suffix (struct gdbarch *gdbarch)
 
 void
 set_gdbarch_stap_gdb_register_suffix (struct gdbarch *gdbarch,
-                                     const char * stap_gdb_register_suffix)
+                                     const char *stap_gdb_register_suffix)
 {
   gdbarch->stap_gdb_register_suffix = stap_gdb_register_suffix;
 }
@@ -4894,7 +4894,7 @@ gdbarch_ravenscar_ops (struct gdbarch *gdbarch)
 
 void
 set_gdbarch_ravenscar_ops (struct gdbarch *gdbarch,
-                          struct ravenscar_arch_ops * ravenscar_ops)
+                          struct ravenscar_arch_ops *ravenscar_ops)
 {
   gdbarch->ravenscar_ops = ravenscar_ops;
 }
@@ -5122,7 +5122,7 @@ gdbarch_disassembler_options_implicit (struct gdbarch *gdbarch)
 
 void
 set_gdbarch_disassembler_options_implicit (struct gdbarch *gdbarch,
-                                          const char * disassembler_options_implicit)
+                                          const char *disassembler_options_implicit)
 {
   gdbarch->disassembler_options_implicit = disassembler_options_implicit;
 }
@@ -5139,7 +5139,7 @@ gdbarch_disassembler_options (struct gdbarch *gdbarch)
 
 void
 set_gdbarch_disassembler_options (struct gdbarch *gdbarch,
-                                 std::string * disassembler_options)
+                                 std::string *disassembler_options)
 {
   gdbarch->disassembler_options = disassembler_options;
 }
@@ -5156,7 +5156,7 @@ gdbarch_valid_disassembler_options (struct gdbarch *gdbarch)
 
 void
 set_gdbarch_valid_disassembler_options (struct gdbarch *gdbarch,
-                                       const disasm_options_and_args_t * valid_disassembler_options)
+                                       const disasm_options_and_args_t *valid_disassembler_options)
 {
   gdbarch->valid_disassembler_options = valid_disassembler_options;
 }

diff --git a/gdb/gdbarch-gen.h b/gdb/gdbarch-gen.h
index 44e424e9420e4871ab4736bf848d92a8799a0a49..73e6b94a0cb1183470336c4864e2b9dd595f1201 100644 (file)
--- a/gdb/gdbarch-gen.h
+++ b/gdb/gdbarch-gen.h
@@ -28,7 +28,7 @@
 
 /* The following are pre-initialized by GDBARCH.  */
 
-extern const struct bfd_arch_info * gdbarch_bfd_arch_info (struct gdbarch *gdbarch);
+extern const struct bfd_arch_info *gdbarch_bfd_arch_info (struct gdbarch *gdbarch);
 /* set_gdbarch_bfd_arch_info() - not applicable - pre-initialized.  */
 
 extern enum bfd_endian gdbarch_byte_order (struct gdbarch *gdbarch);
@@ -40,7 +40,7 @@ extern enum bfd_endian gdbarch_byte_order_for_code (struct gdbarch *gdbarch);
 extern enum gdb_osabi gdbarch_osabi (struct gdbarch *gdbarch);
 /* set_gdbarch_osabi() - not applicable - pre-initialized.  */
 
-extern const struct target_desc * gdbarch_target_desc (struct gdbarch *gdbarch);
+extern const struct target_desc *gdbarch_target_desc (struct gdbarch *gdbarch);
 /* set_gdbarch_target_desc() - not applicable - pre-initialized.  */
 
 
@@ -76,32 +76,32 @@ extern void set_gdbarch_long_long_bit (struct gdbarch *gdbarch, int long_long_bi
 extern int gdbarch_bfloat16_bit (struct gdbarch *gdbarch);
 extern void set_gdbarch_bfloat16_bit (struct gdbarch *gdbarch, int bfloat16_bit);
 
-extern const struct floatformat ** gdbarch_bfloat16_format (struct gdbarch *gdbarch);
-extern void set_gdbarch_bfloat16_format (struct gdbarch *gdbarch, const struct floatformat ** bfloat16_format);
+extern const struct floatformat **gdbarch_bfloat16_format (struct gdbarch *gdbarch);
+extern void set_gdbarch_bfloat16_format (struct gdbarch *gdbarch, const struct floatformat **bfloat16_format);
 
 extern int gdbarch_half_bit (struct gdbarch *gdbarch);
 extern void set_gdbarch_half_bit (struct gdbarch *gdbarch, int half_bit);
 
-extern const struct floatformat ** gdbarch_half_format (struct gdbarch *gdbarch);
-extern void set_gdbarch_half_format (struct gdbarch *gdbarch, const struct floatformat ** half_format);
+extern const struct floatformat **gdbarch_half_format (struct gdbarch *gdbarch);
+extern void set_gdbarch_half_format (struct gdbarch *gdbarch, const struct floatformat **half_format);
 
 extern int gdbarch_float_bit (struct gdbarch *gdbarch);
 extern void set_gdbarch_float_bit (struct gdbarch *gdbarch, int float_bit);
 
-extern const struct floatformat ** gdbarch_float_format (struct gdbarch *gdbarch);
-extern void set_gdbarch_float_format (struct gdbarch *gdbarch, const struct floatformat ** float_format);
+extern const struct floatformat **gdbarch_float_format (struct gdbarch *gdbarch);
+extern void set_gdbarch_float_format (struct gdbarch *gdbarch, const struct floatformat **float_format);
 
 extern int gdbarch_double_bit (struct gdbarch *gdbarch);
 extern void set_gdbarch_double_bit (struct gdbarch *gdbarch, int double_bit);
 
-extern const struct floatformat ** gdbarch_double_format (struct gdbarch *gdbarch);
-extern void set_gdbarch_double_format (struct gdbarch *gdbarch, const struct floatformat ** double_format);
+extern const struct floatformat **gdbarch_double_format (struct gdbarch *gdbarch);
+extern void set_gdbarch_double_format (struct gdbarch *gdbarch, const struct floatformat **double_format);
 
 extern int gdbarch_long_double_bit (struct gdbarch *gdbarch);
 extern void set_gdbarch_long_double_bit (struct gdbarch *gdbarch, int long_double_bit);
 
-extern const struct floatformat ** gdbarch_long_double_format (struct gdbarch *gdbarch);
-extern void set_gdbarch_long_double_format (struct gdbarch *gdbarch, const struct floatformat ** long_double_format);
+extern const struct floatformat **gdbarch_long_double_format (struct gdbarch *gdbarch);
+extern void set_gdbarch_long_double_format (struct gdbarch *gdbarch, const struct floatformat **long_double_format);
 
 /* The ABI default bit-size for "wchar_t".  wchar_t is a built-in type
    starting with C++11. */
@@ -120,8 +120,8 @@ extern void set_gdbarch_wchar_signed (struct gdbarch *gdbarch, bool wchar_signed
    NAME, if non-NULL, is the type name, which may be used to distinguish
    different target formats of the same length. */
 
-typedef const struct floatformat ** (gdbarch_floatformat_for_type_ftype) (struct gdbarch *gdbarch, const char *name, int length);
-extern const struct floatformat ** gdbarch_floatformat_for_type (struct gdbarch *gdbarch, const char *name, int length);
+typedef const struct floatformat **(gdbarch_floatformat_for_type_ftype) (struct gdbarch *gdbarch, const char *name, int length);
+extern const struct floatformat **gdbarch_floatformat_for_type (struct gdbarch *gdbarch, const char *name, int length);
 extern void set_gdbarch_floatformat_for_type (struct gdbarch *gdbarch, gdbarch_floatformat_for_type_ftype *floatformat_for_type);
 
 /* For most targets, a pointer on the target and its representation as an
@@ -200,8 +200,8 @@ extern void set_gdbarch_pseudo_register_read (struct gdbarch *gdbarch, gdbarch_p
 
 extern bool gdbarch_pseudo_register_read_value_p (struct gdbarch *gdbarch);
 
-typedef struct value * (gdbarch_pseudo_register_read_value_ftype) (struct gdbarch *gdbarch, const frame_info_ptr &next_frame, int cookednum);
-extern struct value * gdbarch_pseudo_register_read_value (struct gdbarch *gdbarch, const frame_info_ptr &next_frame, int cookednum);
+typedef struct value *(gdbarch_pseudo_register_read_value_ftype) (struct gdbarch *gdbarch, const frame_info_ptr &next_frame, int cookednum);
+extern struct value *gdbarch_pseudo_register_read_value (struct gdbarch *gdbarch, const frame_info_ptr &next_frame, int cookednum);
 extern void set_gdbarch_pseudo_register_read_value (struct gdbarch *gdbarch, gdbarch_pseudo_register_read_value_ftype *pseudo_register_read_value);
 
 /* Write bytes in BUF to pseudo register with number PSEUDO_REG_NUM.
@@ -299,16 +299,16 @@ extern void set_gdbarch_dwarf2_reg_to_regnum (struct gdbarch *gdbarch, gdbarch_d
    GDBARCH, then this function will return an empty string, this function
    should never return nullptr. */
 
-typedef const char * (gdbarch_register_name_ftype) (struct gdbarch *gdbarch, int regnr);
-extern const char * gdbarch_register_name (struct gdbarch *gdbarch, int regnr);
+typedef const char *(gdbarch_register_name_ftype) (struct gdbarch *gdbarch, int regnr);
+extern const char *gdbarch_register_name (struct gdbarch *gdbarch, int regnr);
 extern void set_gdbarch_register_name (struct gdbarch *gdbarch, gdbarch_register_name_ftype *register_name);
 
 /* Return the type of a register specified by the architecture.  Only
    the register cache should call this function directly; others should
    use "register_type". */
 
-typedef struct type * (gdbarch_register_type_ftype) (struct gdbarch *gdbarch, int reg_nr);
-extern struct type * gdbarch_register_type (struct gdbarch *gdbarch, int reg_nr);
+typedef struct type *(gdbarch_register_type_ftype) (struct gdbarch *gdbarch, int reg_nr);
+extern struct type *gdbarch_register_type (struct gdbarch *gdbarch, int reg_nr);
 extern void set_gdbarch_register_type (struct gdbarch *gdbarch, gdbarch_register_type_ftype *register_type);
 
 /* Generate a dummy frame_id for THIS_FRAME assuming that the frame is
@@ -402,8 +402,8 @@ extern void set_gdbarch_value_to_register (struct gdbarch *gdbarch, gdbarch_valu
    allocate and return a struct value with all value attributes
    (but not the value contents) filled in. */
 
-typedef struct value * (gdbarch_value_from_register_ftype) (struct gdbarch *gdbarch, struct type *type, int regnum, const frame_info_ptr &this_frame);
-extern struct value * gdbarch_value_from_register (struct gdbarch *gdbarch, struct type *type, int regnum, const frame_info_ptr &this_frame);
+typedef struct value *(gdbarch_value_from_register_ftype) (struct gdbarch *gdbarch, struct type *type, int regnum, const frame_info_ptr &this_frame);
+extern struct value *gdbarch_value_from_register (struct gdbarch *gdbarch, struct type *type, int regnum, const frame_info_ptr &this_frame);
 extern void set_gdbarch_value_from_register (struct gdbarch *gdbarch, gdbarch_value_from_register_ftype *value_from_register);
 
 /* For a DW_OP_piece located in a register, but not occupying the
@@ -535,8 +535,8 @@ typedef bool (gdbarch_inner_than_ftype) (CORE_ADDR lhs, CORE_ADDR rhs);
 extern bool gdbarch_inner_than (struct gdbarch *gdbarch, CORE_ADDR lhs, CORE_ADDR rhs);
 extern void set_gdbarch_inner_than (struct gdbarch *gdbarch, gdbarch_inner_than_ftype *inner_than);
 
-typedef const gdb_byte * (gdbarch_breakpoint_from_pc_ftype) (struct gdbarch *gdbarch, CORE_ADDR *pcptr, int *lenptr);
-extern const gdb_byte * gdbarch_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr, int *lenptr);
+typedef const gdb_byte *(gdbarch_breakpoint_from_pc_ftype) (struct gdbarch *gdbarch, CORE_ADDR *pcptr, int *lenptr);
+extern const gdb_byte *gdbarch_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr, int *lenptr);
 extern void set_gdbarch_breakpoint_from_pc (struct gdbarch *gdbarch, gdbarch_breakpoint_from_pc_ftype *breakpoint_from_pc);
 
 /* Return the breakpoint kind for this target based on *PCPTR. */
@@ -549,8 +549,8 @@ extern void set_gdbarch_breakpoint_kind_from_pc (struct gdbarch *gdbarch, gdbarc
    specific meaning like the Z0 kind parameter.
    SIZE is set to the software breakpoint's length in memory. */
 
-typedef const gdb_byte * (gdbarch_sw_breakpoint_from_kind_ftype) (struct gdbarch *gdbarch, int kind, int *size);
-extern const gdb_byte * gdbarch_sw_breakpoint_from_kind (struct gdbarch *gdbarch, int kind, int *size);
+typedef const gdb_byte *(gdbarch_sw_breakpoint_from_kind_ftype) (struct gdbarch *gdbarch, int kind, int *size);
+extern const gdb_byte *gdbarch_sw_breakpoint_from_kind (struct gdbarch *gdbarch, int kind, int *size);
 extern void set_gdbarch_sw_breakpoint_from_kind (struct gdbarch *gdbarch, gdbarch_sw_breakpoint_from_kind_ftype *sw_breakpoint_from_kind);
 
 /* Return the breakpoint kind for this target based on the current
@@ -736,8 +736,8 @@ extern void set_gdbarch_set_memtags (struct gdbarch *gdbarch, gdbarch_set_memtag
 /* Return the tag of type TAG_TYPE associated with the memory address ADDRESS,
    assuming ADDRESS is tagged. */
 
-typedef struct value * (gdbarch_get_memtag_ftype) (struct gdbarch *gdbarch, struct value *address, memtag_type tag_type);
-extern struct value * gdbarch_get_memtag (struct gdbarch *gdbarch, struct value *address, memtag_type tag_type);
+typedef struct value *(gdbarch_get_memtag_ftype) (struct gdbarch *gdbarch, struct value *address, memtag_type tag_type);
+extern struct value *gdbarch_get_memtag (struct gdbarch *gdbarch, struct value *address, memtag_type tag_type);
 extern void set_gdbarch_get_memtag (struct gdbarch *gdbarch, gdbarch_get_memtag_ftype *get_memtag);
 
 /* memtag_granule_size is the size of the allocation tag granule, for
@@ -904,8 +904,8 @@ extern void set_gdbarch_address_class_type_flags (struct gdbarch *gdbarch, gdbar
 
 extern bool gdbarch_address_class_type_flags_to_name_p (struct gdbarch *gdbarch);
 
-typedef const char * (gdbarch_address_class_type_flags_to_name_ftype) (struct gdbarch *gdbarch, type_instance_flags type_flags);
-extern const char * gdbarch_address_class_type_flags_to_name (struct gdbarch *gdbarch, type_instance_flags type_flags);
+typedef const char *(gdbarch_address_class_type_flags_to_name_ftype) (struct gdbarch *gdbarch, type_instance_flags type_flags);
+extern const char *gdbarch_address_class_type_flags_to_name (struct gdbarch *gdbarch, type_instance_flags type_flags);
 extern void set_gdbarch_address_class_type_flags_to_name (struct gdbarch *gdbarch, gdbarch_address_class_type_flags_to_name_ftype *address_class_type_flags_to_name);
 
 /* Execute vendor-specific DWARF Call Frame Instruction.  OP is the instruction.
@@ -968,8 +968,8 @@ extern void set_gdbarch_find_memory_regions (struct gdbarch *gdbarch, gdbarch_fi
 
 /* Given a bfd OBFD, segment ADDRESS and SIZE, create a memory tag section to be dumped to a core file */
 
-typedef asection * (gdbarch_create_memtag_section_ftype) (struct gdbarch *gdbarch, bfd *obfd, CORE_ADDR address, size_t size);
-extern asection * gdbarch_create_memtag_section (struct gdbarch *gdbarch, bfd *obfd, CORE_ADDR address, size_t size);
+typedef asection *(gdbarch_create_memtag_section_ftype) (struct gdbarch *gdbarch, bfd *obfd, CORE_ADDR address, size_t size);
+extern asection *gdbarch_create_memtag_section (struct gdbarch *gdbarch, bfd *obfd, CORE_ADDR address, size_t size);
 extern void set_gdbarch_create_memtag_section (struct gdbarch *gdbarch, gdbarch_create_memtag_section_ftype *create_memtag_section);
 
 /* Given a memory tag section OSEC, fill OSEC's contents with the appropriate tag data */
@@ -1021,8 +1021,8 @@ extern void set_gdbarch_core_pid_to_str (struct gdbarch *gdbarch, gdbarch_core_p
 
 extern bool gdbarch_core_thread_name_p (struct gdbarch *gdbarch);
 
-typedef const char * (gdbarch_core_thread_name_ftype) (struct gdbarch *gdbarch, struct bfd &cbfd, struct thread_info *thr);
-extern const char * gdbarch_core_thread_name (struct gdbarch *gdbarch, struct bfd &cbfd, struct thread_info *thr);
+typedef const char *(gdbarch_core_thread_name_ftype) (struct gdbarch *gdbarch, struct bfd &cbfd, struct thread_info *thr);
+extern const char *gdbarch_core_thread_name (struct gdbarch *gdbarch, struct bfd &cbfd, struct thread_info *thr);
 extern void set_gdbarch_core_thread_name (struct gdbarch *gdbarch, gdbarch_core_thread_name_ftype *core_thread_name);
 
 /* Read offset OFFSET of TARGET_OBJECT_SIGNAL_INFO signal information
@@ -1048,8 +1048,8 @@ extern void set_gdbarch_core_read_x86_xsave_layout (struct gdbarch *gdbarch, gdb
 
 extern bool gdbarch_gcore_bfd_target_p (struct gdbarch *gdbarch);
 
-extern const char * gdbarch_gcore_bfd_target (struct gdbarch *gdbarch);
-extern void set_gdbarch_gcore_bfd_target (struct gdbarch *gdbarch, const char * gcore_bfd_target);
+extern const char *gdbarch_gcore_bfd_target (struct gdbarch *gdbarch);
+extern void set_gdbarch_gcore_bfd_target (struct gdbarch *gdbarch, const char *gcore_bfd_target);
 
 /* If the elements of C++ vtables are in-place function descriptors rather
    than normal function pointers (which may point to code or a descriptor),
@@ -1166,8 +1166,8 @@ extern void set_gdbarch_displaced_step_finish (struct gdbarch *gdbarch, gdbarch_
 
 extern bool gdbarch_displaced_step_copy_insn_closure_by_addr_p (struct gdbarch *gdbarch);
 
-typedef const displaced_step_copy_insn_closure * (gdbarch_displaced_step_copy_insn_closure_by_addr_ftype) (inferior *inf, CORE_ADDR addr);
-extern const displaced_step_copy_insn_closure * gdbarch_displaced_step_copy_insn_closure_by_addr (struct gdbarch *gdbarch, inferior *inf, CORE_ADDR addr);
+typedef const displaced_step_copy_insn_closure *(gdbarch_displaced_step_copy_insn_closure_by_addr_ftype) (inferior *inf, CORE_ADDR addr);
+extern const displaced_step_copy_insn_closure *gdbarch_displaced_step_copy_insn_closure_by_addr (struct gdbarch *gdbarch, inferior *inf, CORE_ADDR addr);
 extern void set_gdbarch_displaced_step_copy_insn_closure_by_addr (struct gdbarch *gdbarch, gdbarch_displaced_step_copy_insn_closure_by_addr_ftype *displaced_step_copy_insn_closure_by_addr);
 
 /* PARENT_INF has forked and CHILD_PTID is the ptid of the child.  Restore the
@@ -1211,8 +1211,8 @@ extern void set_gdbarch_overlay_update (struct gdbarch *gdbarch, gdbarch_overlay
 
 extern bool gdbarch_core_read_description_p (struct gdbarch *gdbarch);
 
-typedef const struct target_desc * (gdbarch_core_read_description_ftype) (struct gdbarch *gdbarch, struct target_ops *target, bfd *abfd);
-extern const struct target_desc * gdbarch_core_read_description (struct gdbarch *gdbarch, struct target_ops *target, bfd *abfd);
+typedef const struct target_desc *(gdbarch_core_read_description_ftype) (struct gdbarch *gdbarch, struct target_ops *target, bfd *abfd);
+extern const struct target_desc *gdbarch_core_read_description (struct gdbarch *gdbarch, struct target_ops *target, bfd *abfd);
 extern void set_gdbarch_core_read_description (struct gdbarch *gdbarch, gdbarch_core_read_description_ftype *core_read_description);
 
 /* Parse the instruction at ADDR storing in the record execution log
@@ -1269,8 +1269,8 @@ extern void set_gdbarch_gdb_signal_to_target (struct gdbarch *gdbarch, gdbarch_g
 
 extern bool gdbarch_get_siginfo_type_p (struct gdbarch *gdbarch);
 
-typedef struct type * (gdbarch_get_siginfo_type_ftype) (struct gdbarch *gdbarch);
-extern struct type * gdbarch_get_siginfo_type (struct gdbarch *gdbarch);
+typedef struct type *(gdbarch_get_siginfo_type_ftype) (struct gdbarch *gdbarch);
+extern struct type *gdbarch_get_siginfo_type (struct gdbarch *gdbarch);
 extern void set_gdbarch_get_siginfo_type (struct gdbarch *gdbarch, gdbarch_get_siginfo_type_ftype *get_siginfo_type);
 
 /* Record architecture-specific information from the symbol table. */
@@ -1292,13 +1292,13 @@ extern void set_gdbarch_get_syscall_number (struct gdbarch *gdbarch, gdbarch_get
 
 /* The filename of the XML syscall for this architecture. */
 
-extern const char * gdbarch_xml_syscall_file (struct gdbarch *gdbarch);
-extern void set_gdbarch_xml_syscall_file (struct gdbarch *gdbarch, const char * xml_syscall_file);
+extern const char *gdbarch_xml_syscall_file (struct gdbarch *gdbarch);
+extern void set_gdbarch_xml_syscall_file (struct gdbarch *gdbarch, const char *xml_syscall_file);
 
 /* Information about system calls from this architecture */
 
-extern struct syscalls_info * gdbarch_syscalls_info (struct gdbarch *gdbarch);
-extern void set_gdbarch_syscalls_info (struct gdbarch *gdbarch, struct syscalls_info * syscalls_info);
+extern struct syscalls_info *gdbarch_syscalls_info (struct gdbarch *gdbarch);
+extern void set_gdbarch_syscalls_info (struct gdbarch *gdbarch, struct syscalls_info *syscalls_info);
 
 /* SystemTap related fields and functions.
    A NULL-terminated array of prefixes used to mark an integer constant
@@ -1309,14 +1309,14 @@ extern void set_gdbarch_syscalls_info (struct gdbarch *gdbarch, struct syscalls_
 
    in this case, this prefix would be the character `$'. */
 
-extern const char *const * gdbarch_stap_integer_prefixes (struct gdbarch *gdbarch);
-extern void set_gdbarch_stap_integer_prefixes (struct gdbarch *gdbarch, const char *const * stap_integer_prefixes);
+extern const char *const *gdbarch_stap_integer_prefixes (struct gdbarch *gdbarch);
+extern void set_gdbarch_stap_integer_prefixes (struct gdbarch *gdbarch, const char *const *stap_integer_prefixes);
 
 /* A NULL-terminated array of suffixes used to mark an integer constant
    on the architecture's assembly. */
 
-extern const char *const * gdbarch_stap_integer_suffixes (struct gdbarch *gdbarch);
-extern void set_gdbarch_stap_integer_suffixes (struct gdbarch *gdbarch, const char *const * stap_integer_suffixes);
+extern const char *const *gdbarch_stap_integer_suffixes (struct gdbarch *gdbarch);
+extern void set_gdbarch_stap_integer_suffixes (struct gdbarch *gdbarch, const char *const *stap_integer_suffixes);
 
 /* A NULL-terminated array of prefixes used to mark a register name on
    the architecture's assembly.
@@ -1326,14 +1326,14 @@ extern void set_gdbarch_stap_integer_suffixes (struct gdbarch *gdbarch, const ch
 
    in this case, this prefix would be the character `%'. */
 
-extern const char *const * gdbarch_stap_register_prefixes (struct gdbarch *gdbarch);
-extern void set_gdbarch_stap_register_prefixes (struct gdbarch *gdbarch, const char *const * stap_register_prefixes);
+extern const char *const *gdbarch_stap_register_prefixes (struct gdbarch *gdbarch);
+extern void set_gdbarch_stap_register_prefixes (struct gdbarch *gdbarch, const char *const *stap_register_prefixes);
 
 /* A NULL-terminated array of suffixes used to mark a register name on
    the architecture's assembly. */
 
-extern const char *const * gdbarch_stap_register_suffixes (struct gdbarch *gdbarch);
-extern void set_gdbarch_stap_register_suffixes (struct gdbarch *gdbarch, const char *const * stap_register_suffixes);
+extern const char *const *gdbarch_stap_register_suffixes (struct gdbarch *gdbarch);
+extern void set_gdbarch_stap_register_suffixes (struct gdbarch *gdbarch, const char *const *stap_register_suffixes);
 
 /* A NULL-terminated array of prefixes used to mark a register
    indirection on the architecture's assembly.
@@ -1346,8 +1346,8 @@ extern void set_gdbarch_stap_register_suffixes (struct gdbarch *gdbarch, const c
    Please note that we use the indirection prefix also for register
    displacement, e.g., `4(%eax)' on x86. */
 
-extern const char *const * gdbarch_stap_register_indirection_prefixes (struct gdbarch *gdbarch);
-extern void set_gdbarch_stap_register_indirection_prefixes (struct gdbarch *gdbarch, const char *const * stap_register_indirection_prefixes);
+extern const char *const *gdbarch_stap_register_indirection_prefixes (struct gdbarch *gdbarch);
+extern void set_gdbarch_stap_register_indirection_prefixes (struct gdbarch *gdbarch, const char *const *stap_register_indirection_prefixes);
 
 /* A NULL-terminated array of suffixes used to mark a register
    indirection on the architecture's assembly.
@@ -1360,8 +1360,8 @@ extern void set_gdbarch_stap_register_indirection_prefixes (struct gdbarch *gdba
    Please note that we use the indirection suffix also for register
    displacement, e.g., `4(%eax)' on x86. */
 
-extern const char *const * gdbarch_stap_register_indirection_suffixes (struct gdbarch *gdbarch);
-extern void set_gdbarch_stap_register_indirection_suffixes (struct gdbarch *gdbarch, const char *const * stap_register_indirection_suffixes);
+extern const char *const *gdbarch_stap_register_indirection_suffixes (struct gdbarch *gdbarch);
+extern void set_gdbarch_stap_register_indirection_suffixes (struct gdbarch *gdbarch, const char *const *stap_register_indirection_suffixes);
 
 /* Prefix(es) used to name a register using GDB's nomenclature.
 
@@ -1370,13 +1370,13 @@ extern void set_gdbarch_stap_register_indirection_suffixes (struct gdbarch *gdba
    inside GDB this same register has an `r' appended to its name, so the 10th
    register would be represented as `r10' internally. */
 
-extern const char * gdbarch_stap_gdb_register_prefix (struct gdbarch *gdbarch);
-extern void set_gdbarch_stap_gdb_register_prefix (struct gdbarch *gdbarch, const char * stap_gdb_register_prefix);
+extern const char *gdbarch_stap_gdb_register_prefix (struct gdbarch *gdbarch);
+extern void set_gdbarch_stap_gdb_register_prefix (struct gdbarch *gdbarch, const char *stap_gdb_register_prefix);
 
 /* Suffix used to name a register using GDB's nomenclature. */
 
-extern const char * gdbarch_stap_gdb_register_suffix (struct gdbarch *gdbarch);
-extern void set_gdbarch_stap_gdb_register_suffix (struct gdbarch *gdbarch, const char * stap_gdb_register_suffix);
+extern const char *gdbarch_stap_gdb_register_suffix (struct gdbarch *gdbarch);
+extern void set_gdbarch_stap_gdb_register_suffix (struct gdbarch *gdbarch, const char *stap_gdb_register_suffix);
 
 /* Check if S is a single operand.
 
@@ -1530,8 +1530,8 @@ extern void set_gdbarch_guess_tracepoint_registers (struct gdbarch *gdbarch, gdb
 
 /* Return the "auto" target wide charset. */
 
-typedef const char * (gdbarch_auto_wide_charset_ftype) ();
-extern const char * gdbarch_auto_wide_charset (struct gdbarch *gdbarch);
+typedef const char *(gdbarch_auto_wide_charset_ftype) ();
+extern const char *gdbarch_auto_wide_charset (struct gdbarch *gdbarch);
 extern void set_gdbarch_auto_wide_charset (struct gdbarch *gdbarch, gdbarch_auto_wide_charset_ftype *auto_wide_charset);
 
 /* If true, the target OS has DOS-based file system semantics.  That
@@ -1571,8 +1571,8 @@ extern void set_gdbarch_core_info_proc (struct gdbarch *gdbarch, gdbarch_core_in
 
 /* Ravenscar arch-dependent ops. */
 
-extern struct ravenscar_arch_ops * gdbarch_ravenscar_ops (struct gdbarch *gdbarch);
-extern void set_gdbarch_ravenscar_ops (struct gdbarch *gdbarch, struct ravenscar_arch_ops * ravenscar_ops);
+extern struct ravenscar_arch_ops *gdbarch_ravenscar_ops (struct gdbarch *gdbarch);
+extern void set_gdbarch_ravenscar_ops (struct gdbarch *gdbarch, struct ravenscar_arch_ops *ravenscar_ops);
 
 /* Return true if the instruction at ADDR is a call; false otherwise. */
 
@@ -1656,8 +1656,8 @@ extern void set_gdbarch_gcc_target_options (struct gdbarch *gdbarch, gdbarch_gcc
    returns the BFD architecture name, which is correct in nearly every
    case. */
 
-typedef const char * (gdbarch_gnu_triplet_regexp_ftype) (struct gdbarch *gdbarch);
-extern const char * gdbarch_gnu_triplet_regexp (struct gdbarch *gdbarch);
+typedef const char *(gdbarch_gnu_triplet_regexp_ftype) (struct gdbarch *gdbarch);
+extern const char *gdbarch_gnu_triplet_regexp (struct gdbarch *gdbarch);
 extern void set_gdbarch_gnu_triplet_regexp (struct gdbarch *gdbarch, gdbarch_gnu_triplet_regexp_ftype *gnu_triplet_regexp);
 
 /* Return the size in 8-bit bytes of an addressable memory unit on this
@@ -1670,14 +1670,14 @@ extern void set_gdbarch_addressable_memory_unit_size (struct gdbarch *gdbarch, g
 
 /* Functions for allowing a target to modify its disassembler options. */
 
-extern const char * gdbarch_disassembler_options_implicit (struct gdbarch *gdbarch);
-extern void set_gdbarch_disassembler_options_implicit (struct gdbarch *gdbarch, const char * disassembler_options_implicit);
+extern const char *gdbarch_disassembler_options_implicit (struct gdbarch *gdbarch);
+extern void set_gdbarch_disassembler_options_implicit (struct gdbarch *gdbarch, const char *disassembler_options_implicit);
 
-extern std::string * gdbarch_disassembler_options (struct gdbarch *gdbarch);
-extern void set_gdbarch_disassembler_options (struct gdbarch *gdbarch, std::string * disassembler_options);
+extern std::string *gdbarch_disassembler_options (struct gdbarch *gdbarch);
+extern void set_gdbarch_disassembler_options (struct gdbarch *gdbarch, std::string *disassembler_options);
 
-extern const disasm_options_and_args_t * gdbarch_valid_disassembler_options (struct gdbarch *gdbarch);
-extern void set_gdbarch_valid_disassembler_options (struct gdbarch *gdbarch, const disasm_options_and_args_t * valid_disassembler_options);
+extern const disasm_options_and_args_t *gdbarch_valid_disassembler_options (struct gdbarch *gdbarch);
+extern void set_gdbarch_valid_disassembler_options (struct gdbarch *gdbarch, const disasm_options_and_args_t *valid_disassembler_options);
 
 /* Type alignment override method.  Return the architecture specific
    alignment required for TYPE.  If there is no special handling

diff --git a/gdb/gdbarch.py b/gdb/gdbarch.py
index d8d81d92c918fe66b31642f98cf390624a0607d2..514c6b18bd16c3d715220a6afe7b86e78b8ddc4e 100755 (executable)
--- a/gdb/gdbarch.py
+++ b/gdb/gdbarch.py
@@ -33,6 +33,15 @@ def indentation(n_columns: int):
     return "\t" * (n_columns // 8) + " " * (n_columns % 8)
 
 
+def maybe_space(c: Component):
+    """Return a space if the type of C does not end with a pointer,
+    otherwise return an empty string."""
+    if c.type.endswith("*"):
+        return ""
+    else:
+        return " "
+
+
 copyright = gdbcopyright.copyright(
     "gdbarch.py", "Dynamic architecture support for GDB, the GNU debugger."
 )
@@ -59,7 +68,7 @@ with open("gdbarch-gen.h", "w") as f:
     for c in filter(info, components):
         print(file=f)
         print(
-            f"""extern {c.type} gdbarch_{c.name} (struct gdbarch *gdbarch);
+            f"""extern {c.type}{maybe_space(c)}gdbarch_{c.name} (struct gdbarch *gdbarch);
 /* set_gdbarch_{c.name}() - not applicable - pre-initialized.  */""",
             file=f,
         )
@@ -96,22 +105,22 @@ with open("gdbarch-gen.h", "w") as f:
         print(file=f)
         if isinstance(c, Value):
             print(
-                f"extern {c.type} gdbarch_{c.name} (struct gdbarch *gdbarch);",
+                f"extern {c.type}{maybe_space(c)}gdbarch_{c.name} (struct gdbarch *gdbarch);",
                 file=f,
             )
             print(
-                f"extern void set_gdbarch_{c.name} (struct gdbarch *gdbarch, {c.type} {c.name});",
+                f"extern void set_gdbarch_{c.name} (struct gdbarch *gdbarch, {c.type}{maybe_space(c)}{c.name});",
                 file=f,
             )
         else:
             assert isinstance(c, Function)
             print(
-                f"typedef {c.type} ({c.ftype()}) ({c.param_list()});",
+                f"typedef {c.type}{maybe_space(c)}({c.ftype()}) ({c.param_list()});",
                 file=f,
             )
             if c.implement:
                 print(
-                    f"extern {c.type} gdbarch_{c.name} ({c.set_list()});",
+                    f"extern {c.type}{maybe_space(c)}gdbarch_{c.name} ({c.set_list()});",
                     file=f,
                 )
             print(
@@ -140,7 +149,7 @@ with open("gdbarch-gen.c", "w") as f:
     print(file=f)
     print("  /* basic architectural information.  */", file=f)
     for c in filter(info, components):
-        print(f"  {c.type} {c.name};", file=f)
+        print(f"  {c.type}{maybe_space(c)}{c.name};", file=f)
     print(file=f)
     print("  /* target specific vector.  */", file=f)
     print("  gdbarch_tdep_up tdep;", file=f)
@@ -150,7 +159,7 @@ with open("gdbarch-gen.c", "w") as f:
         if isinstance(c, Function):
             print(f"  gdbarch_{c.name}_ftype *", file=f, end="")
         else:
-            print(f"  {c.type} ", file=f, end="")
+            print(f"  {c.type}{maybe_space(c)}", file=f, end="")
         print(f"{c.name} = {c.init_value()};", file=f)
     print("};", file=f)
     print(file=f)
@@ -364,7 +373,10 @@ with open("gdbarch-gen.c", "w") as f:
             setter_name = f"set_gdbarch_{c.name}"
             print(f"{setter_name} (struct gdbarch *gdbarch,", file=f)
             indent_columns = len(f"{setter_name} (")
-            print(f"{indentation(indent_columns)}{c.type} {c.name})", file=f)
+            print(
+                f"{indentation(indent_columns)}{c.type}{maybe_space(c)}{c.name})",
+                file=f,
+            )
             print("{", file=f)
             print(f"  gdbarch->{c.name} = {c.name};", file=f)
             print("}", file=f)