diff options
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/gdbarch.h | 2 | ||||
| -rwxr-xr-x | gdb/gdbarch.sh | 183 |
3 files changed, 90 insertions, 99 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a125a22..b3adc5e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2004-08-08 Andrew Cagney <cagney@gnu.org> + * gdbarch.sh: Delete "fmt" and "attrib" fields. Always use %s to + print. Improve script's error messages. + * gdbarch.h: Re-generate. + * gdbarch.sh (pformat): New function. (float_format, double_format, long_double_format): List with bit members. Use pformat when printing. diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index f7af9f0..791a1cd 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -143,7 +143,7 @@ extern void set_gdbarch_long_long_bit (struct gdbarch *gdbarch, int long_long_bi /* The ABI default bit-size and format for "float", "double", and "long double". These bit/format pairs should eventually be combined into - a single object. */ + a single object. For the moment, just initialize them as a pair. */ extern int gdbarch_float_bit (struct gdbarch *gdbarch); extern void set_gdbarch_float_bit (struct gdbarch *gdbarch, int float_bit); diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index bde13b9..2e2e3d3 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -44,7 +44,7 @@ compare_new () # Format of the input table -read="class macro returntype function formal actual attrib staticdefault predefault postdefault invalid_p fmt print garbage_at_eol" +read="class macro returntype function formal actual staticdefault predefault postdefault invalid_p print garbage_at_eol" do_read () { @@ -109,7 +109,7 @@ EOF [mM] ) if test "${macro}" != "" then - echo "${macro}: Multi-arch yet macro" 1>&2 + echo "Error: Function ${function} multi-arch yet macro ${macro} supplied" 1>&2 kill $$ exit 1 fi @@ -276,11 +276,6 @@ do # match the FORMAL list given above. Functions with out # arguments leave this blank. - attrib ) : ;; - - # Any GCC attributes that should be attached to the function - # declaration. At present this field is unused. - staticdefault ) : ;; # To help with the GDB startup a static gdbarch object is @@ -349,20 +344,13 @@ do # See also PREDEFAULT and POSTDEFAULT. - fmt ) : ;; - - # printf style format string that can be used to print out the - # MEMBER. Sometimes "%s" is useful. For functions, this is - # ignored and the function address is printed. - - # If FMT is empty, ``%ld'' is used. - print ) : ;; - # An optional equation that casts MEMBER to a value suitable - # for formatting by FMT. + # An optional expression that convers MEMBER to a value + # suitable for formatting using %s. - # If PRINT is empty, ``(long)'' is used. + # If PRINT is empty, paddr_nz (for CORE_ADDR) or paddr_d + # (anything else) is used. garbage_at_eol ) : ;; @@ -379,35 +367,35 @@ function_list () { # See below (DOCO) for description of each field cat <<EOF -i:TARGET_ARCHITECTURE:const struct bfd_arch_info *:bfd_arch_info::::&bfd_default_arch_struct::::%s:TARGET_ARCHITECTURE->printable_name +i:TARGET_ARCHITECTURE:const struct bfd_arch_info *:bfd_arch_info:::&bfd_default_arch_struct::::TARGET_ARCHITECTURE->printable_name # -i:TARGET_BYTE_ORDER:int:byte_order::::BFD_ENDIAN_BIG +i:TARGET_BYTE_ORDER:int:byte_order:::BFD_ENDIAN_BIG # -i:TARGET_OSABI:enum gdb_osabi:osabi::::GDB_OSABI_UNKNOWN +i:TARGET_OSABI:enum gdb_osabi:osabi:::GDB_OSABI_UNKNOWN # Number of bits in a char or unsigned char for the target machine. # Just like CHAR_BIT in <limits.h> but describes the target machine. # v:TARGET_CHAR_BIT:int:char_bit::::8 * sizeof (char):8::0: # # Number of bits in a short or unsigned short for the target machine. -v:TARGET_SHORT_BIT:int:short_bit::::8 * sizeof (short):2*TARGET_CHAR_BIT::0 +v:TARGET_SHORT_BIT:int:short_bit:::8 * sizeof (short):2*TARGET_CHAR_BIT::0 # Number of bits in an int or unsigned int for the target machine. -v:TARGET_INT_BIT:int:int_bit::::8 * sizeof (int):4*TARGET_CHAR_BIT::0 +v:TARGET_INT_BIT:int:int_bit:::8 * sizeof (int):4*TARGET_CHAR_BIT::0 # Number of bits in a long or unsigned long for the target machine. -v:TARGET_LONG_BIT:int:long_bit::::8 * sizeof (long):4*TARGET_CHAR_BIT::0 +v:TARGET_LONG_BIT:int:long_bit:::8 * sizeof (long):4*TARGET_CHAR_BIT::0 # Number of bits in a long long or unsigned long long for the target # machine. -v:TARGET_LONG_LONG_BIT:int:long_long_bit::::8 * sizeof (LONGEST):2*TARGET_LONG_BIT::0 +v:TARGET_LONG_LONG_BIT:int:long_long_bit:::8 * sizeof (LONGEST):2*TARGET_LONG_BIT::0 # The ABI default bit-size and format for "float", "double", and "long # double". These bit/format pairs should eventually be combined into # a single object. For the moment, just initialize them as a pair. -v:TARGET_FLOAT_BIT:int:float_bit::::8 * sizeof (float):4*TARGET_CHAR_BIT::0 -v:TARGET_FLOAT_FORMAT:const struct floatformat *:float_format::::::default_float_format (current_gdbarch)::%s:pformat (current_gdbarch->float_format) -v:TARGET_DOUBLE_BIT:int:double_bit::::8 * sizeof (double):8*TARGET_CHAR_BIT::0 -v:TARGET_DOUBLE_FORMAT:const struct floatformat *:double_format::::::default_double_format (current_gdbarch)::%s:pformat (current_gdbarch->double_format) -v:TARGET_LONG_DOUBLE_BIT:int:long_double_bit::::8 * sizeof (long double):8*TARGET_CHAR_BIT::0 -v:TARGET_LONG_DOUBLE_FORMAT:const struct floatformat *:long_double_format::::::default_double_format (current_gdbarch)::%s:pformat (current_gdbarch->long_double_format) +v:TARGET_FLOAT_BIT:int:float_bit:::8 * sizeof (float):4*TARGET_CHAR_BIT::0 +v:TARGET_FLOAT_FORMAT:const struct floatformat *:float_format:::::default_float_format (current_gdbarch)::pformat (current_gdbarch->float_format) +v:TARGET_DOUBLE_BIT:int:double_bit:::8 * sizeof (double):8*TARGET_CHAR_BIT::0 +v:TARGET_DOUBLE_FORMAT:const struct floatformat *:double_format:::::default_double_format (current_gdbarch)::pformat (current_gdbarch->double_format) +v:TARGET_LONG_DOUBLE_BIT:int:long_double_bit:::8 * sizeof (long double):8*TARGET_CHAR_BIT::0 +v:TARGET_LONG_DOUBLE_FORMAT:const struct floatformat *:long_double_format:::::default_double_format (current_gdbarch)::pformat (current_gdbarch->long_double_format) # For most targets, a pointer on the target and its representation as an # address in GDB have the same size and "look the same". For such a @@ -418,51 +406,51 @@ v:TARGET_LONG_DOUBLE_FORMAT:const struct floatformat *:long_double_format::::::d # also need to set POINTER_TO_ADDRESS and ADDRESS_TO_POINTER as well. # # ptr_bit is the size of a pointer on the target -v:TARGET_PTR_BIT:int:ptr_bit::::8 * sizeof (void*):TARGET_INT_BIT::0 +v:TARGET_PTR_BIT:int:ptr_bit:::8 * sizeof (void*):TARGET_INT_BIT::0 # addr_bit is the size of a target address as represented in gdb -v:TARGET_ADDR_BIT:int:addr_bit::::8 * sizeof (void*):0:TARGET_PTR_BIT: +v:TARGET_ADDR_BIT:int:addr_bit:::8 * sizeof (void*):0:TARGET_PTR_BIT: # Number of bits in a BFD_VMA for the target object file format. -v:TARGET_BFD_VMA_BIT:int:bfd_vma_bit::::8 * sizeof (void*):TARGET_ARCHITECTURE->bits_per_address::0 +v:TARGET_BFD_VMA_BIT:int:bfd_vma_bit:::8 * sizeof (void*):TARGET_ARCHITECTURE->bits_per_address::0 # # One if \`char' acts like \`signed char', zero if \`unsigned char'. -v:TARGET_CHAR_SIGNED:int:char_signed::::1:-1:1:::: +v:TARGET_CHAR_SIGNED:int:char_signed:::1:-1:1 # F:TARGET_READ_PC:CORE_ADDR:read_pc:ptid_t ptid:ptid -f:TARGET_WRITE_PC:void:write_pc:CORE_ADDR val, ptid_t ptid:val, ptid::0:generic_target_write_pc::0 +f:TARGET_WRITE_PC:void:write_pc:CORE_ADDR val, ptid_t ptid:val, ptid:0:generic_target_write_pc::0 # UNWIND_SP is a direct replacement for TARGET_READ_SP. F:TARGET_READ_SP:CORE_ADDR:read_sp:void # Function for getting target's idea of a frame pointer. FIXME: GDB's # whole scheme for dealing with "frames" and "frame pointers" needs a # serious shakedown. -f:TARGET_VIRTUAL_FRAME_POINTER:void:virtual_frame_pointer:CORE_ADDR pc, int *frame_regnum, LONGEST *frame_offset:pc, frame_regnum, frame_offset::0:legacy_virtual_frame_pointer::0 +f:TARGET_VIRTUAL_FRAME_POINTER:void:virtual_frame_pointer:CORE_ADDR pc, int *frame_regnum, LONGEST *frame_offset:pc, frame_regnum, frame_offset:0:legacy_virtual_frame_pointer::0 # M::void:pseudo_register_read:struct regcache *regcache, int cookednum, void *buf:regcache, cookednum, buf M::void:pseudo_register_write:struct regcache *regcache, int cookednum, const void *buf:regcache, cookednum, buf # -v:=:int:num_regs::::0:-1 +v:=:int:num_regs:::0:-1 # This macro gives the number of pseudo-registers that live in the # register namespace but do not get fetched or stored on the target. # These pseudo-registers may be aliases for other registers, # combinations of other registers, or they may be computed by GDB. -v:=:int:num_pseudo_regs::::0:0::0::: +v:=:int:num_pseudo_regs:::0:0::0 # GDB's standard (or well known) register numbers. These can map onto # a real register or a pseudo (computed) register or not be defined at # all (-1). # SP_REGNUM will hopefully be replaced by UNWIND_SP. -v:=:int:sp_regnum::::-1:-1::0 -v:=:int:pc_regnum::::-1:-1::0 -v:=:int:ps_regnum::::-1:-1::0 -v:=:int:fp0_regnum::::0:-1::0 +v:=:int:sp_regnum:::-1:-1::0 +v:=:int:pc_regnum:::-1:-1::0 +v:=:int:ps_regnum:::-1:-1::0 +v:=:int:fp0_regnum:::0:-1::0 # Convert stab register number (from \`r\' declaration) to a gdb REGNUM. -f:=:int:stab_reg_to_regnum:int stab_regnr:stab_regnr:::no_op_reg_to_regnum::0 +f:=:int:stab_reg_to_regnum:int stab_regnr:stab_regnr::no_op_reg_to_regnum::0 # Provide a default mapping from a ecoff register number to a gdb REGNUM. -f:=:int:ecoff_reg_to_regnum:int ecoff_regnr:ecoff_regnr:::no_op_reg_to_regnum::0 +f:=:int:ecoff_reg_to_regnum:int ecoff_regnr:ecoff_regnr::no_op_reg_to_regnum::0 # Provide a default mapping from a DWARF register number to a gdb REGNUM. -f:=:int:dwarf_reg_to_regnum:int dwarf_regnr:dwarf_regnr:::no_op_reg_to_regnum::0 +f:=:int:dwarf_reg_to_regnum:int dwarf_regnr:dwarf_regnr::no_op_reg_to_regnum::0 # Convert from an sdb register number to an internal gdb register number. -f:=:int:sdb_reg_to_regnum:int sdb_regnr:sdb_regnr:::no_op_reg_to_regnum::0 -f:=:int:dwarf2_reg_to_regnum:int dwarf2_regnr:dwarf2_regnr:::no_op_reg_to_regnum::0 +f:=:int:sdb_reg_to_regnum:int sdb_regnr:sdb_regnr::no_op_reg_to_regnum::0 +f:=:int:dwarf2_reg_to_regnum:int dwarf2_regnr:dwarf2_regnr::no_op_reg_to_regnum::0 f:=:const char *:register_name:int regnr:regnr # REGISTER_TYPE is a direct replacement for DEPRECATED_REGISTER_VIRTUAL_TYPE. @@ -474,13 +462,13 @@ M::struct type *:register_type:int reg_nr:reg_nr # consequence, even when the predicate is false, the corresponding # function works. This simplifies the migration process - old code, # calling DEPRECATED_REGISTER_BYTE, doesn't need to be modified. -F:=:int:deprecated_register_byte:int reg_nr:reg_nr::generic_register_byte:generic_register_byte +F:=:int:deprecated_register_byte:int reg_nr:reg_nr:generic_register_byte:generic_register_byte # See gdbint.texinfo, and PUSH_DUMMY_CALL. M::struct frame_id:unwind_dummy_id:struct frame_info *info:info # Implement UNWIND_DUMMY_ID and PUSH_DUMMY_CALL, then delete # DEPRECATED_FP_REGNUM. -v:=:int:deprecated_fp_regnum::::-1:-1::0 +v:=:int:deprecated_fp_regnum:::-1:-1::0 # See gdbint.texinfo. See infcall.c. New, all singing all dancing, # replacement for DEPRECATED_PUSH_ARGUMENTS. @@ -489,29 +477,29 @@ M::CORE_ADDR:push_dummy_call:struct value *function, struct regcache *regcache, F:=:CORE_ADDR:deprecated_push_arguments:int nargs, struct value **args, CORE_ADDR sp, int struct_return, CORE_ADDR struct_addr:nargs, args, sp, struct_return, struct_addr # DEPRECATED_REGISTER_SIZE can be deleted. v:=:int:deprecated_register_size -v:=:int:call_dummy_location:::::AT_ENTRY_POINT::0 +v:=:int:call_dummy_location::::AT_ENTRY_POINT::0 M::CORE_ADDR:push_dummy_code:CORE_ADDR sp, CORE_ADDR funaddr, int using_gcc, struct value **args, int nargs, struct type *value_type, CORE_ADDR *real_pc, CORE_ADDR *bp_addr:sp, funaddr, using_gcc, args, nargs, value_type, real_pc, bp_addr -m::void:print_registers_info:struct ui_file *file, struct frame_info *frame, int regnum, int all:file, frame, regnum, all:::default_print_registers_info::0 +m::void:print_registers_info:struct ui_file *file, struct frame_info *frame, int regnum, int all:file, frame, regnum, all::default_print_registers_info::0 M::void:print_float_info:struct ui_file *file, struct frame_info *frame, const char *args:file, frame, args M::void:print_vector_info:struct ui_file *file, struct frame_info *frame, const char *args:file, frame, args # MAP a GDB RAW register number onto a simulator register number. See # also include/...-sim.h. -f:=:int:register_sim_regno:int reg_nr:reg_nr:::legacy_register_sim_regno::0 +f:=:int:register_sim_regno:int reg_nr:reg_nr::legacy_register_sim_regno::0 F:=:int:register_bytes_ok:long nr_bytes:nr_bytes -f:=:int:cannot_fetch_register:int regnum:regnum:::cannot_register_not::0 -f:=:int:cannot_store_register:int regnum:regnum:::cannot_register_not::0 +f:=:int:cannot_fetch_register:int regnum:regnum::cannot_register_not::0 +f:=:int:cannot_store_register:int regnum:regnum::cannot_register_not::0 # setjmp/longjmp support. F:=:int:get_longjmp_target:CORE_ADDR *pc:pc # v:=:int:believe_pcc_promotion::::::: # -f:=:int:convert_register_p:int regnum, struct type *type:regnum, type::0:generic_convert_register_p::0 -f:=:void:register_to_value:struct frame_info *frame, int regnum, struct type *type, void *buf:frame, regnum, type, buf::0 -f:=:void:value_to_register:struct frame_info *frame, int regnum, struct type *type, const void *buf:frame, regnum, type, buf::0 +f:=:int:convert_register_p:int regnum, struct type *type:regnum, type:0:generic_convert_register_p::0 +f:=:void:register_to_value:struct frame_info *frame, int regnum, struct type *type, void *buf:frame, regnum, type, buf:0 +f:=:void:value_to_register:struct frame_info *frame, int regnum, struct type *type, const void *buf:frame, regnum, type, buf:0 # -f:=:CORE_ADDR:pointer_to_address:struct type *type, const void *buf:type, buf:::unsigned_pointer_to_address::0 -f:=:void:address_to_pointer:struct type *type, void *buf, CORE_ADDR addr:type, buf, addr:::unsigned_address_to_pointer::0 +f:=:CORE_ADDR:pointer_to_address:struct type *type, const void *buf:type, buf::unsigned_pointer_to_address::0 +f:=:void:address_to_pointer:struct type *type, void *buf, CORE_ADDR addr:type, buf, addr::unsigned_address_to_pointer::0 F:=:CORE_ADDR:integer_to_address:struct type *type, void *buf:type, buf # # NOTE: cagney/2003-03-24: Replaced by PUSH_ARGUMENTS. @@ -525,18 +513,18 @@ F:=:void:deprecated_store_struct_return:CORE_ADDR addr, CORE_ADDR sp:addr, sp # the predicate with default hack to avoid calling STORE_RETURN_VALUE # (via legacy_return_value), when a small struct is involved. -M::enum return_value_convention:return_value:struct type *valtype, struct regcache *regcache, void *readbuf, const void *writebuf:valtype, regcache, readbuf, writebuf:::legacy_return_value +M::enum return_value_convention:return_value:struct type *valtype, struct regcache *regcache, void *readbuf, const void *writebuf:valtype, regcache, readbuf, writebuf::legacy_return_value # The deprecated methods EXTRACT_RETURN_VALUE, STORE_RETURN_VALUE, # DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS and # DEPRECATED_USE_STRUCT_CONVENTION have all been folded into # RETURN_VALUE. -f:=:void:extract_return_value:struct type *type, struct regcache *regcache, void *valbuf:type, regcache, valbuf:::legacy_extract_return_value::0 -f:=:void:store_return_value:struct type *type, struct regcache *regcache, const void *valbuf:type, regcache, valbuf:::legacy_store_return_value::0 +f:=:void:extract_return_value:struct type *type, struct regcache *regcache, void *valbuf:type, regcache, valbuf::legacy_extract_return_value::0 +f:=:void:store_return_value:struct type *type, struct regcache *regcache, const void *valbuf:type, regcache, valbuf::legacy_store_return_value::0 f:=:void:deprecated_extract_return_value:struct type *type, char *regbuf, char *valbuf:type, regbuf, valbuf f:=:void:deprecated_store_return_value:struct type *type, char *valbuf:type, valbuf -f:=:int:deprecated_use_struct_convention:int gcc_p, struct type *value_type:gcc_p, value_type:::generic_use_struct_convention::0 +f:=:int:deprecated_use_struct_convention:int gcc_p, struct type *value_type:gcc_p, value_type::generic_use_struct_convention::0 # As of 2004-01-17 only the 32-bit SPARC ABI has been identified as an # ABI suitable for the implementation of a robust extract @@ -560,13 +548,13 @@ f:=:int:deprecated_use_struct_convention:int gcc_p, struct type *value_type:gcc_ F:=:CORE_ADDR:deprecated_extract_struct_value_address:struct regcache *regcache:regcache # -f:=:CORE_ADDR:skip_prologue:CORE_ADDR ip:ip::0:0 -f:=:int:inner_than:CORE_ADDR lhs, CORE_ADDR rhs:lhs, rhs::0:0 -f:=:const unsigned char *:breakpoint_from_pc:CORE_ADDR *pcptr, int *lenptr:pcptr, lenptr:::0: +f:=:CORE_ADDR:skip_prologue:CORE_ADDR ip:ip:0:0 +f:=:int:inner_than:CORE_ADDR lhs, CORE_ADDR rhs:lhs, rhs:0:0 +f:=:const unsigned char *:breakpoint_from_pc:CORE_ADDR *pcptr, int *lenptr:pcptr, lenptr::0: M::CORE_ADDR:adjust_breakpoint_address:CORE_ADDR bpaddr:bpaddr -f:=:int:memory_insert_breakpoint:CORE_ADDR addr, char *contents_cache:addr, contents_cache::0:default_memory_insert_breakpoint::0 -f:=:int:memory_remove_breakpoint:CORE_ADDR addr, char *contents_cache:addr, contents_cache::0:default_memory_remove_breakpoint::0 -v:=:CORE_ADDR:decr_pc_after_break::::0:::0 +f:=:int:memory_insert_breakpoint:CORE_ADDR addr, char *contents_cache:addr, contents_cache:0:default_memory_insert_breakpoint::0 +f:=:int:memory_remove_breakpoint:CORE_ADDR addr, char *contents_cache:addr, contents_cache:0:default_memory_remove_breakpoint::0 +v:=:CORE_ADDR:decr_pc_after_break:::0:::0 # A function can be addressed by either it's "pointer" (possibly a # descriptor address) or "entry point" (first executable instruction). @@ -576,11 +564,11 @@ v:=:CORE_ADDR:decr_pc_after_break::::0:::0 # corresponds to the "function pointer" and the function's start # corresponds to the "function entry point" - and hence is redundant. -v:=:CORE_ADDR:deprecated_function_start_offset::::0:::0 +v:=:CORE_ADDR:deprecated_function_start_offset:::0:::0 -m::void:remote_translate_xfer_address:struct regcache *regcache, CORE_ADDR gdb_addr, int gdb_len, CORE_ADDR *rem_addr, int *rem_len:regcache, gdb_addr, gdb_len, rem_addr, rem_len:::generic_remote_translate_xfer_address::0 +m::void:remote_translate_xfer_address:struct regcache *regcache, CORE_ADDR gdb_addr, int gdb_len, CORE_ADDR *rem_addr, int *rem_len:regcache, gdb_addr, gdb_len, rem_addr, rem_len::generic_remote_translate_xfer_address::0 # -v:=:CORE_ADDR:frame_args_skip::::0:::0 +v:=:CORE_ADDR:frame_args_skip:::0:::0 M::CORE_ADDR:unwind_pc:struct frame_info *next_frame:next_frame M::CORE_ADDR:unwind_sp:struct frame_info *next_frame:next_frame # DEPRECATED_FRAME_LOCALS_ADDRESS as been replaced by the per-frame @@ -597,10 +585,10 @@ M::CORE_ADDR:frame_align:CORE_ADDR address:address # DEPRECATED_REG_STRUCT_HAS_ADDR has been replaced by # stabs_argument_has_addr. F:=:int:deprecated_reg_struct_has_addr:int gcc_p, struct type *type:gcc_p, type -m::int:stabs_argument_has_addr:struct type *type:type:::default_stabs_argument_has_addr::0 +m::int:stabs_argument_has_addr:struct type *type:type::default_stabs_argument_has_addr::0 v:=:int:frame_red_zone_size # -m::CORE_ADDR:convert_from_func_ptr_addr:CORE_ADDR addr, struct target_ops *targ:addr, targ:::convert_from_func_ptr_addr_identity::0 +m::CORE_ADDR:convert_from_func_ptr_addr:CORE_ADDR addr, struct target_ops *targ:addr, targ::convert_from_func_ptr_addr_identity::0 # On some machines there are bits in addresses which are not really # part of the address, but are used by the kernel, the hardware, etc. # for special purposes. ADDR_BITS_REMOVE takes out any such bits so @@ -610,10 +598,10 @@ m::CORE_ADDR:convert_from_func_ptr_addr:CORE_ADDR addr, struct target_ops *targ: # being a few stray bits in the PC which would mislead us, not as some # sort of generic thing to handle alignment or segmentation (it's # possible it should be in TARGET_READ_PC instead). -f:=:CORE_ADDR:addr_bits_remove:CORE_ADDR addr:addr:::core_addr_identity::0 +f:=:CORE_ADDR:addr_bits_remove:CORE_ADDR addr:addr::core_addr_identity::0 # It is not at all clear why SMASH_TEXT_ADDRESS is not folded into # ADDR_BITS_REMOVE. -f:=:CORE_ADDR:smash_text_address:CORE_ADDR addr:addr:::core_addr_identity::0 +f:=:CORE_ADDR:smash_text_address:CORE_ADDR addr:addr::core_addr_identity::0 # FIXME/cagney/2001-01-18: This should be split in two. A target method that indicates if # the target needs software single step. An ISA method to implement it. # @@ -625,21 +613,21 @@ f:=:CORE_ADDR:smash_text_address:CORE_ADDR addr:addr:::core_addr_identity::0 F:=:void:software_single_step:enum target_signal sig, int insert_breakpoints_p:sig, insert_breakpoints_p # FIXME: cagney/2003-08-28: Need to find a better way of selecting the # disassembler. Perhaps objdump can handle it? -f:TARGET_PRINT_INSN:int:print_insn:bfd_vma vma, struct disassemble_info *info:vma, info:::0: -f:=:CORE_ADDR:skip_trampoline_code:CORE_ADDR pc:pc:::generic_skip_trampoline_code::0 +f:TARGET_PRINT_INSN:int:print_insn:bfd_vma vma, struct disassemble_info *info:vma, info::0: +f:=:CORE_ADDR:skip_trampoline_code:CORE_ADDR pc:pc::generic_skip_trampoline_code::0 # If IN_SOLIB_DYNSYM_RESOLVE_CODE returns true, and SKIP_SOLIB_RESOLVER # evaluates non-zero, this is the address where the debugger will place # a step-resume breakpoint to get us past the dynamic linker. -m::CORE_ADDR:skip_solib_resolver:CORE_ADDR pc:pc:::generic_skip_solib_resolver::0 +m::CORE_ADDR:skip_solib_resolver:CORE_ADDR pc:pc::generic_skip_solib_resolver::0 # For SVR4 shared libraries, each call goes through a small piece of # trampoline code in the ".plt" section. IN_SOLIB_CALL_TRAMPOLINE evaluates # to nonzero if we are currently stopped in one of these. -f:=:int:in_solib_call_trampoline:CORE_ADDR pc, char *name:pc, name:::generic_in_solib_call_trampoline::0 +f:=:int:in_solib_call_trampoline:CORE_ADDR pc, char *name:pc, name::generic_in_solib_call_trampoline::0 # Some systems also have trampoline code for returning from shared libs. -f:=:int:in_solib_return_trampoline:CORE_ADDR pc, char *name:pc, name:::generic_in_solib_return_trampoline::0 +f:=:int:in_solib_return_trampoline:CORE_ADDR pc, char *name:pc, name::generic_in_solib_return_trampoline::0 # A target might have problems with watchpoints as soon as the stack # frame of the current function has been destroyed. This mostly happens @@ -650,7 +638,7 @@ f:=:int:in_solib_return_trampoline:CORE_ADDR pc, char *name:pc, name:::generic_i # already been invalidated regardless of the value of addr. Targets # which don't suffer from that problem could just let this functionality # untouched. -m::int:in_function_epilogue_p:CORE_ADDR addr:addr::0:generic_in_function_epilogue_p::0 +m::int:in_function_epilogue_p:CORE_ADDR addr:addr:0:generic_in_function_epilogue_p::0 # Given a vector of command-line arguments, return a newly allocated # string which, when passed to the create_inferior function, will be # parsed (on Unix systems, by the shell) to yield the same vector. @@ -659,17 +647,17 @@ m::int:in_function_epilogue_p:CORE_ADDR addr:addr::0:generic_in_function_epilogu # command-line arguments. # ARGC is the number of elements in the vector. # ARGV is an array of strings, one per argument. -m::char *:construct_inferior_arguments:int argc, char **argv:argc, argv:::construct_inferior_arguments::0 -f:=:void:elf_make_msymbol_special:asymbol *sym, struct minimal_symbol *msym:sym, msym:::default_elf_make_msymbol_special::0 -f:=:void:coff_make_msymbol_special:int val, struct minimal_symbol *msym:val, msym:::default_coff_make_msymbol_special::0 -v:=:const char *:name_of_malloc::::"malloc":"malloc"::0:%s:NAME_OF_MALLOC -v:=:int:cannot_step_breakpoint::::0:0::0 -v:=:int:have_nonsteppable_watchpoint::::0:0::0 +m::char *:construct_inferior_arguments:int argc, char **argv:argc, argv::construct_inferior_arguments::0 +f:=:void:elf_make_msymbol_special:asymbol *sym, struct minimal_symbol *msym:sym, msym::default_elf_make_msymbol_special::0 +f:=:void:coff_make_msymbol_special:int val, struct minimal_symbol *msym:val, msym::default_coff_make_msymbol_special::0 +v:=:const char *:name_of_malloc:::"malloc":"malloc"::0:NAME_OF_MALLOC +v:=:int:cannot_step_breakpoint:::0:0::0 +v:=:int:have_nonsteppable_watchpoint:::0:0::0 F:=:int:address_class_type_flags:int byte_size, int dwarf2_addr_class:byte_size, dwarf2_addr_class M::const char *:address_class_type_flags_to_name:int type_flags:type_flags M::int:address_class_name_to_type_flags:const char *name, int *type_flags_ptr:name, type_flags_ptr # Is a register in a group -m::int:register_reggroup_p:int regnum, struct reggroup *reggroup:regnum, reggroup:::default_register_reggroup_p::0 +m::int:register_reggroup_p:int regnum, struct reggroup *reggroup:regnum, reggroup::default_register_reggroup_p::0 # Fetch the pointer to the ith function argument. F:=:CORE_ADDR:fetch_pointer_argument:struct frame_info *frame, int argi, struct type *type:frame, argi, type @@ -686,7 +674,7 @@ exec > new-gdbarch.log function_list | while do_read do cat <<EOF -${class} ${returntype} ${function} ($formal)${attrib} +${class} ${returntype} ${function} ($formal) EOF for r in ${read} do @@ -709,7 +697,7 @@ EOF if class_is_predicate_p ; then : elif test "x${predefault}" = "x" then - echo "Error: pure multi-arch function must have a predefault" 1>&2 + echo "Error: pure multi-arch function ${function} must have a predefault" 1>&2 kill $$ exit 1 fi @@ -1277,7 +1265,7 @@ do printf " ${returntype} ${function};\n" elif class_is_function_p then - printf " gdbarch_${function}_ftype *${function}${attrib};\n" + printf " gdbarch_${function}_ftype *${function};\n" fi done printf "};\n" @@ -1554,18 +1542,17 @@ do printf " (long) current_gdbarch->${function});\n" else # It is a variable - case "${fmt}:${print}:${returntype}" in - ::CORE_ADDR ) + case "${print}:${returntype}" in + :CORE_ADDR ) fmt="0x%s" print="paddr_nz (current_gdbarch->${function})" ;; - ::* ) + :* ) fmt="%s" print="paddr_d (current_gdbarch->${function})" ;; * ) - test "${fmt}" || fmt="%ld" - test "${print}" || print="(long) (current_gdbarch->${function})" + fmt="%s" ;; esac printf " fprintf_unfiltered (file,\n" |