X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fgdbarch.sh;h=23998d5c9a6c15673ebbb7cb430531aedde06960;hb=3fd3d7d29c5ea6ba2dff07fe353bac80fefce363;hp=dfc102b489bd923e2399a9c3cc34bb9606c9e725;hpb=338d7c5c40ea1cd85be41c8a7f7b3d4d6f679978;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index dfc102b489..23998d5c9a 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -76,16 +76,36 @@ EOF fi done - test "${staticdefault}" || staticdefault=0 + case "${class}" in + m ) staticdefault="${predefault}" ;; + M ) staticdefault="0" ;; + * ) test "${staticdefault}" || staticdefault=0 ;; + esac # NOT YET: Breaks BELIEVE_PCC_PROMOTION and confuses non- # multi-arch defaults. # test "${predefault}" || predefault=0 + + # come up with a format, use a few guesses for variables + case ":${class}:${fmt}:${print}:" in + :[vV]::: ) + if [ "${returntype}" = int ] + then + fmt="%d" + print="${macro}" + elif [ "${returntype}" = long ] + then + fmt="%ld" + print="${macro}" + fi + ;; + esac test "${fmt}" || fmt="%ld" test "${print}" || print="(long) ${macro}" + case "${invalid_p}" in 0 ) valid_p=1 ;; "" ) - if [ "${predefault}" ] + if [ -n "${predefault}" ] then #invalid_p="gdbarch->${function} == ${predefault}" valid_p="gdbarch->${function} != ${predefault}" @@ -104,14 +124,14 @@ EOF # always a valid definition of MEMBER as this again # ensures consistency. - if [ "${postdefault}" != "" ] + if [ -n "${postdefault}" ] then fallbackdefault="${postdefault}" - elif [ "${predefault}" != "" ] + elif [ -n "${predefault}" ] then fallbackdefault="${predefault}" else - fallbackdefault="" + fallbackdefault="0" fi #NOT YET: See gdbarch.log for basic verification of @@ -120,7 +140,7 @@ EOF break fi done - if [ "${class}" ] + if [ -n "${class}" ] then true else @@ -131,28 +151,48 @@ EOF fallback_default_p () { - [ "${postdefault}" != "" -a "${invalid_p}" != "0" ] \ - || [ "${predefault}" != "" -a "${invalid_p}" = "0" ] + [ -n "${postdefault}" -a "x${invalid_p}" != "x0" ] \ + || [ -n "${predefault}" -a "x${invalid_p}" = "x0" ] } class_is_variable_p () { - [ "${class}" = "v" -o "${class}" = "V" ] + case "${class}" in + *v* | *V* ) true ;; + * ) false ;; + esac } class_is_function_p () { - [ "${class}" = "f" -o "${class}" = "F" ] + case "${class}" in + *f* | *F* | *m* | *M* ) true ;; + * ) false ;; + esac +} + +class_is_multiarch_p () +{ + case "${class}" in + *m* | *M* ) true ;; + * ) false ;; + esac } class_is_predicate_p () { - [ "${class}" = "F" -o "${class}" = "V" ] + case "${class}" in + *F* | *V* | *M* ) true ;; + * ) false ;; + esac } class_is_info_p () { - [ "${class}" = "i" ] + case "${class}" in + *i* ) true ;; + * ) false ;; + esac } @@ -174,6 +214,10 @@ do # hiding a variable + predicate to test variables validity # i -> set from info # hiding something from the ``struct info'' object + # m -> multi-arch function + # hiding a multi-arch function (parameterised with the architecture) + # M -> multi-arch function + predicate + # hiding a multi-arch function + predicate to test function validity level ) : ;; @@ -224,17 +268,19 @@ do predefault ) : ;; - # A initial value to assign to MEMBER of the freshly - # malloc()ed gdbarch object. After the gdbarch object has - # been initialized using PREDEFAULT, it is passed to the - # target code for further updates. + # An initial value to assign to MEMBER of the freshly + # malloc()ed gdbarch object. After initialization, the + # freshly malloc()ed object is passed to the target + # architecture code for further updates. # If PREDEFAULT is empty, zero is used. - # When POSTDEFAULT is empty, a non-empty PREDEFAULT and a zero - # INVALID_P will be used as default values when when - # multi-arch is disabled. Specify a zero PREDEFAULT function - # to make that fallback call internal_error(). + # A non-empty PREDEFAULT, an empty POSTDEFAULT and a zero + # INVALID_P are specified, PREDEFAULT will be used as the + # default for the non- multi-arch target. + + # A zero PREDEFAULT function will force the fallback to call + # internal_error(). # Variable declarations can refer to ``gdbarch'' which will # contain the current architecture. Care should be taken. @@ -242,9 +288,8 @@ do postdefault ) : ;; # A value to assign to MEMBER of the new gdbarch object should - # the target code fail to change the PREDEFAULT value. Also - # use POSTDEFAULT as the fallback value for the non- - # multi-arch case. + # the target architecture code fail to change the PREDEFAULT + # value. # If POSTDEFAULT is empty, no post update is performed. @@ -252,6 +297,11 @@ do # INVALID_P will be used to determine if MEMBER should be # changed to POSTDEFAULT. + # If a non-empty POSTDEFAULT and a zero INVALID_P are + # specified, POSTDEFAULT will be used as the default for the + # non- multi-arch target (regardless of the value of + # PREDEFAULT). + # You cannot specify both a zero INVALID_P and a POSTDEFAULT. # Variable declarations can refer to ``gdbarch'' which will @@ -315,7 +365,7 @@ function_list () cat <printable_name:TARGET_ARCHITECTURE != NULL # -i:2:TARGET_BYTE_ORDER:int:byte_order::::BIG_ENDIAN +i:2:TARGET_BYTE_ORDER:int:byte_order::::BFD_ENDIAN_BIG # Number of bits in a char or unsigned char for the target machine. # Just like CHAR_BIT in but describes the target machine. # v::TARGET_CHAR_BIT:int:char_bit::::8 * sizeof (char):8::0: @@ -350,14 +400,22 @@ 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::IEEE_FLOAT:int:ieee_float::::0:0::0::: +# One if \`char' acts like \`signed char', zero if \`unsigned char'. +v::TARGET_CHAR_SIGNED:int:char_signed::::1:-1:1:::: # -f::TARGET_READ_PC:CORE_ADDR:read_pc:int pid:pid::0:generic_target_read_pc::0 -f::TARGET_WRITE_PC:void:write_pc:CORE_ADDR val, int pid:val, pid::0:generic_target_write_pc::0 +f::TARGET_READ_PC:CORE_ADDR:read_pc:ptid_t ptid:ptid::0:generic_target_read_pc::0 +f::TARGET_WRITE_PC:void:write_pc:CORE_ADDR val, ptid_t ptid:val, ptid::0:generic_target_write_pc::0 f::TARGET_READ_FP:CORE_ADDR:read_fp:void:::0:generic_target_read_fp::0 f::TARGET_WRITE_FP:void:write_fp:CORE_ADDR val:val::0:generic_target_write_fp::0 f::TARGET_READ_SP:CORE_ADDR:read_sp:void:::0:generic_target_read_sp::0 f::TARGET_WRITE_SP:void:write_sp:CORE_ADDR val:val::0:generic_target_write_sp::0 +# 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 +# +M:::void:register_read:int regnum, char *buf:regnum, buf: +M:::void:register_write:int regnum, char *buf:regnum, buf: # v:2:NUM_REGS:int:num_regs::::0:-1 # This macro gives the number of pseudo-registers that live in the @@ -386,9 +444,9 @@ f:2:REGISTER_NAME:char *:register_name:int regnr:regnr:::legacy_register_name::0 v:2:REGISTER_SIZE:int:register_size::::0:-1 v:2:REGISTER_BYTES:int:register_bytes::::0:-1 f:2:REGISTER_BYTE:int:register_byte:int reg_nr:reg_nr::0:0 -f:2:REGISTER_RAW_SIZE:int:register_raw_size:int reg_nr:reg_nr::0:0 +f:2:REGISTER_RAW_SIZE:int:register_raw_size:int reg_nr:reg_nr::generic_register_raw_size:0 v:2:MAX_REGISTER_RAW_SIZE:int:max_register_raw_size::::0:-1 -f:2:REGISTER_VIRTUAL_SIZE:int:register_virtual_size:int reg_nr:reg_nr::0:0 +f:2:REGISTER_VIRTUAL_SIZE:int:register_virtual_size:int reg_nr:reg_nr::generic_register_virtual_size:0 v:2:MAX_REGISTER_VIRTUAL_SIZE:int:max_register_virtual_size::::0:-1 f:2:REGISTER_VIRTUAL_TYPE:struct type *:register_virtual_type:int reg_nr:reg_nr::0:0 f:2:DO_REGISTERS_INFO:void:do_registers_info:int reg_nr, int fpregs:reg_nr, fpregs:::do_registers_info::0 @@ -396,21 +454,25 @@ f:2:DO_REGISTERS_INFO:void:do_registers_info:int reg_nr, int fpregs:reg_nr, fpre # also include/...-sim.h. f:2:REGISTER_SIM_REGNO:int:register_sim_regno:int reg_nr:reg_nr:::default_register_sim_regno::0 F:2:REGISTER_BYTES_OK:int:register_bytes_ok:long nr_bytes:nr_bytes::0:0 +f:2:CANNOT_FETCH_REGISTER:int:cannot_fetch_register:int regnum:regnum:::cannot_register_not::0 +f:2:CANNOT_STORE_REGISTER:int:cannot_store_register:int regnum:regnum:::cannot_register_not::0 # v:1:USE_GENERIC_DUMMY_FRAMES:int:use_generic_dummy_frames::::0:-1 -v:2:CALL_DUMMY_LOCATION:int:call_dummy_location::::0:0 +v:1:CALL_DUMMY_LOCATION:int:call_dummy_location::::0:0 f:2:CALL_DUMMY_ADDRESS:CORE_ADDR:call_dummy_address:void:::0:0::gdbarch->call_dummy_location == AT_ENTRY_POINT && gdbarch->call_dummy_address == 0 v:2:CALL_DUMMY_START_OFFSET:CORE_ADDR:call_dummy_start_offset::::0:-1:::0x%08lx -v:2:CALL_DUMMY_BREAKPOINT_OFFSET:CORE_ADDR:call_dummy_breakpoint_offset::::0:-1:::0x%08lx::CALL_DUMMY_BREAKPOINT_OFFSET_P +v:2:CALL_DUMMY_BREAKPOINT_OFFSET:CORE_ADDR:call_dummy_breakpoint_offset::::0:-1::gdbarch->call_dummy_breakpoint_offset_p && gdbarch->call_dummy_breakpoint_offset == -1:0x%08lx::CALL_DUMMY_BREAKPOINT_OFFSET_P v:1:CALL_DUMMY_BREAKPOINT_OFFSET_P:int:call_dummy_breakpoint_offset_p::::0:-1 v:2:CALL_DUMMY_LENGTH:int:call_dummy_length::::0:-1:::::CALL_DUMMY_LOCATION == BEFORE_TEXT_END || CALL_DUMMY_LOCATION == AFTER_TEXT_END -f:2:PC_IN_CALL_DUMMY:int:pc_in_call_dummy:CORE_ADDR pc, CORE_ADDR sp, CORE_ADDR frame_address:pc, sp, frame_address::0:0 +f:1:PC_IN_CALL_DUMMY:int:pc_in_call_dummy:CORE_ADDR pc, CORE_ADDR sp, CORE_ADDR frame_address:pc, sp, frame_address::0:0 v:1:CALL_DUMMY_P:int:call_dummy_p::::0:-1 v:2:CALL_DUMMY_WORDS:LONGEST *:call_dummy_words::::0:legacy_call_dummy_words::0:0x%08lx v:2:SIZEOF_CALL_DUMMY_WORDS:int:sizeof_call_dummy_words::::0:legacy_sizeof_call_dummy_words::0:0x%08lx v:1:CALL_DUMMY_STACK_ADJUST_P:int:call_dummy_stack_adjust_p::::0:-1:::0x%08lx v:2:CALL_DUMMY_STACK_ADJUST:int:call_dummy_stack_adjust::::0:::gdbarch->call_dummy_stack_adjust_p && gdbarch->call_dummy_stack_adjust == 0:0x%08lx::CALL_DUMMY_STACK_ADJUST_P f:2:FIX_CALL_DUMMY:void:fix_call_dummy:char *dummy, CORE_ADDR pc, CORE_ADDR fun, int nargs, struct value **args, struct type *type, int gcc_p:dummy, pc, fun, nargs, args, type, gcc_p:::0 +f:2:INIT_FRAME_PC_FIRST:void:init_frame_pc_first:int fromleaf, struct frame_info *prev:fromleaf, prev:::init_frame_pc_noop::0 +f:2:INIT_FRAME_PC:void:init_frame_pc:int fromleaf, struct frame_info *prev:fromleaf, prev:::init_frame_pc_default::0 # v:2:BELIEVE_PCC_PROMOTION:int:believe_pcc_promotion::::::: v:2:BELIEVE_PCC_PROMOTION_TYPE:int:believe_pcc_promotion_type::::::: @@ -423,37 +485,30 @@ f:2:REGISTER_CONVERT_TO_RAW:void:register_convert_to_raw:struct type *type, int # This function is called when the value of a pseudo-register needs to # be updated. Typically it will be defined on a per-architecture # basis. -f:2:FETCH_PSEUDO_REGISTER:void:fetch_pseudo_register:int regnum:regnum:::0::0 +F:2:FETCH_PSEUDO_REGISTER:void:fetch_pseudo_register:int regnum:regnum: # This function is called when the value of a pseudo-register needs to # be set or stored. Typically it will be defined on a # per-architecture basis. -f:2:STORE_PSEUDO_REGISTER:void:store_pseudo_register:int regnum:regnum:::0::0 +F:2:STORE_PSEUDO_REGISTER:void:store_pseudo_register:int regnum:regnum: # f:2:POINTER_TO_ADDRESS:CORE_ADDR:pointer_to_address:struct type *type, void *buf:type, buf:::unsigned_pointer_to_address::0 f:2:ADDRESS_TO_POINTER:void:address_to_pointer:struct type *type, void *buf, CORE_ADDR addr:type, buf, addr:::unsigned_address_to_pointer::0 +F:2:INTEGER_TO_ADDRESS:CORE_ADDR:integer_to_address:struct type *type, void *buf:type, buf # f:2:RETURN_VALUE_ON_STACK:int:return_value_on_stack:struct type *type:type:::generic_return_value_on_stack_not::0 f:2:EXTRACT_RETURN_VALUE:void:extract_return_value:struct type *type, char *regbuf, char *valbuf:type, regbuf, valbuf::0:0 f:1:PUSH_ARGUMENTS:CORE_ADDR:push_arguments:int nargs, struct value **args, CORE_ADDR sp, int struct_return, CORE_ADDR struct_addr:nargs, args, sp, struct_return, struct_addr::0:0 f:2:PUSH_DUMMY_FRAME:void:push_dummy_frame:void:-:::0 -f:1:PUSH_RETURN_ADDRESS:CORE_ADDR:push_return_address:CORE_ADDR pc, CORE_ADDR sp:pc, sp:::0 +F:1:PUSH_RETURN_ADDRESS:CORE_ADDR:push_return_address:CORE_ADDR pc, CORE_ADDR sp:pc, sp:::0 f:2:POP_FRAME:void:pop_frame:void:-:::0 # -# I wish that these would just go away.... -f:2:D10V_MAKE_DADDR:CORE_ADDR:d10v_make_daddr:CORE_ADDR x:x:::0::0 -f:2:D10V_MAKE_IADDR:CORE_ADDR:d10v_make_iaddr:CORE_ADDR x:x:::0::0 -f:2:D10V_DADDR_P:int:d10v_daddr_p:CORE_ADDR x:x:::0::0 -f:2:D10V_IADDR_P:int:d10v_iaddr_p:CORE_ADDR x:x:::0::0 -f:2:D10V_CONVERT_DADDR_TO_RAW:CORE_ADDR:d10v_convert_daddr_to_raw:CORE_ADDR x:x:::0::0 -f:2:D10V_CONVERT_IADDR_TO_RAW:CORE_ADDR:d10v_convert_iaddr_to_raw:CORE_ADDR x:x:::0::0 -# f:2:STORE_STRUCT_RETURN:void:store_struct_return:CORE_ADDR addr, CORE_ADDR sp:addr, sp:::0 f:2:STORE_RETURN_VALUE:void:store_return_value:struct type *type, char *valbuf:type, valbuf:::0 -f:2:EXTRACT_STRUCT_VALUE_ADDRESS:CORE_ADDR:extract_struct_value_address:char *regbuf:regbuf:::0 -f:2:USE_STRUCT_CONVENTION:int:use_struct_convention:int gcc_p, struct type *value_type:gcc_p, value_type:::0 +F:2:EXTRACT_STRUCT_VALUE_ADDRESS:CORE_ADDR:extract_struct_value_address:char *regbuf:regbuf:::0 +f:2:USE_STRUCT_CONVENTION:int:use_struct_convention:int gcc_p, struct type *value_type:gcc_p, value_type:::generic_use_struct_convention::0 # f:2:FRAME_INIT_SAVED_REGS:void:frame_init_saved_regs:struct frame_info *frame:frame::0:0 -f:2:INIT_EXTRA_FRAME_INFO:void:init_extra_frame_info:int fromleaf, struct frame_info *frame:fromleaf, frame:::0 +F:2:INIT_EXTRA_FRAME_INFO:void:init_extra_frame_info:int fromleaf, struct frame_info *frame:fromleaf, frame:::0 # f:2:SKIP_PROLOGUE:CORE_ADDR:skip_prologue:CORE_ADDR ip:ip::0:0 f:2:PROLOGUE_FRAMELESS_P:int:prologue_frameless_p:CORE_ADDR ip:ip::0:generic_prologue_frameless_p::0 @@ -462,6 +517,7 @@ f:2:BREAKPOINT_FROM_PC:unsigned char *:breakpoint_from_pc:CORE_ADDR *pcptr, int f:2:MEMORY_INSERT_BREAKPOINT:int:memory_insert_breakpoint:CORE_ADDR addr, char *contents_cache:addr, contents_cache::0:default_memory_insert_breakpoint::0 f:2:MEMORY_REMOVE_BREAKPOINT:int:memory_remove_breakpoint:CORE_ADDR addr, char *contents_cache:addr, contents_cache::0:default_memory_remove_breakpoint::0 v:2:DECR_PC_AFTER_BREAK:CORE_ADDR:decr_pc_after_break::::0:-1 +f::PREPARE_TO_PROCEED:int:prepare_to_proceed:int select_it:select_it::0:default_prepare_to_proceed::0 v:2:FUNCTION_START_OFFSET:CORE_ADDR:function_start_offset::::0:-1 # f:2:REMOTE_TRANSLATE_XFER_ADDRESS:void:remote_translate_xfer_address:CORE_ADDR gdb_addr, int gdb_len, CORE_ADDR *rem_addr, int *rem_len:gdb_addr, gdb_len, rem_addr, rem_len:::generic_remote_translate_xfer_address::0 @@ -485,7 +541,52 @@ v:2:PARM_BOUNDARY:int:parm_boundary v:2:TARGET_FLOAT_FORMAT:const struct floatformat *:float_format::::::default_float_format (gdbarch) v:2:TARGET_DOUBLE_FORMAT:const struct floatformat *:double_format::::::default_double_format (gdbarch) v:2:TARGET_LONG_DOUBLE_FORMAT:const struct floatformat *:long_double_format::::::&floatformat_unknown -f:2:CONVERT_FROM_FUNC_PTR_ADDR:CORE_ADDR:convert_from_func_ptr_addr:CORE_ADDR addr:addr:::default_convert_from_func_ptr_addr::0 +f:2:CONVERT_FROM_FUNC_PTR_ADDR:CORE_ADDR:convert_from_func_ptr_addr:CORE_ADDR addr:addr:::core_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 +# we get a "real" address such as one would find in a symbol table. +# This is used only for addresses of instructions, and even then I'm +# not sure it's used in all contexts. It exists to deal with there +# 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:2:ADDR_BITS_REMOVE:CORE_ADDR:addr_bits_remove: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. +# +# FIXME/cagney/2001-01-18: This should be replaced with something that inserts breakpoints +# using the breakpoint system instead of blatting memory directly (as with rs6000). +# +# FIXME/cagney/2001-01-18: The logic is backwards. It should be asking if the target can +# single step. If not, then implement single step using breakpoints. +F:2:SOFTWARE_SINGLE_STEP:void:software_single_step:enum target_signal sig, int insert_breakpoints_p:sig, insert_breakpoints_p::0:0 +f:2:TARGET_PRINT_INSN:int:print_insn:bfd_vma vma, disassemble_info *info:vma, info:::legacy_print_insn::0 +f:2:SKIP_TRAMPOLINE_CODE:CORE_ADDR:skip_trampoline_code:CORE_ADDR pc:pc:::generic_skip_trampoline_code::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 current stopped in one of these. +f:2:IN_SOLIB_CALL_TRAMPOLINE:int:in_solib_call_trampoline:CORE_ADDR pc, char *name:pc, name:::generic_in_solib_call_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 +# as the first action in a funtion's epilogue. in_function_epilogue_p() +# is defined to return a non-zero value if either the given addr is one +# instruction after the stack destroying instruction up to the trailing +# return instruction or if we can figure out that the stack frame has +# 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 +# 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. +# This function should call error() if the argument vector is not +# representable for this target or if this target does not support +# command-line arguments. +# ARGC is the number of elements in the vector. +# ARGV is an array of strings, one per argument. +m::CONSTRUCT_INFERIOR_ARGUMENTS:char *:construct_inferior_arguments:int argc, char **argv:argc, argv:::construct_inferior_arguments::0 +F:2:DWARF2_BUILD_FRAME_INFO:void:dwarf2_build_frame_info:struct objfile *objfile:objfile:::0 EOF } @@ -512,12 +613,22 @@ EOF kill $$ exit 1 fi - if [ "${invalid_p}" = "0" -a "${postdefault}" != "" ] + if [ "x${invalid_p}" = "x0" -a -n "${postdefault}" ] then echo "Error: postdefault is useless when invalid_p=0" 1>&2 kill $$ exit 1 fi + if class_is_multiarch_p + then + if class_is_predicate_p ; then : + elif test "x${predefault}" = "x" + then + echo "Error: pure multi-arch function must have a predefault" 1>&2 + kill $$ + exit 1 + fi + fi echo "" done @@ -575,9 +686,14 @@ cat <= GDB_MULTI_ARCH_PURE) && defined (GDB_TM_FILE) +#error "GDB_TM_FILE: Pure multi-arch targets do not have a tm.h file." +#endif EOF # function typedef's @@ -609,6 +729,9 @@ do printf "\n" printf "extern ${returntype} gdbarch_${function} (struct gdbarch *gdbarch);\n" printf "/* set_gdbarch_${function}() - not applicable - pre-initialized. */\n" + printf "#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (${macro})\n" + printf "#error \"Non multi-arch definition of ${macro}\"\n" + printf "#endif\n" printf "#if GDB_MULTI_ARCH\n" printf "#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (${macro})\n" printf "#define ${macro} (gdbarch_${function} (current_gdbarch))\n" @@ -623,31 +746,45 @@ printf "\n" printf "/* The following are initialized by the target dependent code. */\n" function_list | while do_read do - if [ "${comment}" ] + if [ -n "${comment}" ] then echo "${comment}" | sed \ -e '2 s,#,/*,' \ -e '3,$ s,#, ,' \ -e '$ s,$, */,' fi - if class_is_predicate_p + if class_is_multiarch_p then - printf "\n" - printf "#if defined (${macro})\n" - printf "/* Legacy for systems yet to multi-arch ${macro} */\n" -# printf "#if (GDB_MULTI_ARCH <= GDB_MULTI_ARCH_PARTIAL) && defined (${macro})\n" - printf "#define ${macro}_P() (1)\n" - printf "#endif\n" - printf "\n" - printf "/* Default predicate for non- multi-arch targets. */\n" - printf "#if (!GDB_MULTI_ARCH) && !defined (${macro}_P)\n" - printf "#define ${macro}_P() (0)\n" - printf "#endif\n" - printf "\n" - printf "extern int gdbarch_${function}_p (struct gdbarch *gdbarch);\n" - printf "#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (${macro}_P)\n" - printf "#define ${macro}_P() (gdbarch_${function}_p (current_gdbarch))\n" - printf "#endif\n" + if class_is_predicate_p + then + printf "\n" + printf "extern int gdbarch_${function}_p (struct gdbarch *gdbarch);\n" + fi + else + if class_is_predicate_p + then + printf "\n" + printf "#if defined (${macro})\n" + printf "/* Legacy for systems yet to multi-arch ${macro} */\n" + #printf "#if (GDB_MULTI_ARCH <= GDB_MULTI_ARCH_PARTIAL) && defined (${macro})\n" + printf "#if !defined (${macro}_P)\n" + printf "#define ${macro}_P() (1)\n" + printf "#endif\n" + printf "#endif\n" + printf "\n" + printf "/* Default predicate for non- multi-arch targets. */\n" + printf "#if (!GDB_MULTI_ARCH) && !defined (${macro}_P)\n" + printf "#define ${macro}_P() (0)\n" + printf "#endif\n" + printf "\n" + printf "extern int gdbarch_${function}_p (struct gdbarch *gdbarch);\n" + printf "#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (${macro}_P)\n" + printf "#error \"Non multi-arch definition of ${macro}\"\n" + printf "#endif\n" + printf "#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (${macro}_P)\n" + printf "#define ${macro}_P() (gdbarch_${function}_p (current_gdbarch))\n" + printf "#endif\n" + fi fi if class_is_variable_p then @@ -663,6 +800,9 @@ do printf "\n" printf "extern ${returntype} gdbarch_${function} (struct gdbarch *gdbarch);\n" printf "extern void set_gdbarch_${function} (struct gdbarch *gdbarch, ${returntype} ${function});\n" + printf "#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (${macro})\n" + printf "#error \"Non multi-arch definition of ${macro}\"\n" + printf "#endif\n" printf "#if GDB_MULTI_ARCH\n" printf "#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (${macro})\n" printf "#define ${macro} (gdbarch_${function} (current_gdbarch))\n" @@ -671,14 +811,15 @@ do fi if class_is_function_p then - if fallback_default_p || class_is_predicate_p + if class_is_multiarch_p ; then : + elif fallback_default_p || class_is_predicate_p then printf "\n" printf "/* Default (function) for non- multi-arch platforms. */\n" printf "#if (!GDB_MULTI_ARCH) && !defined (${macro})\n" - if [ "${fallbackdefault}" = "0" ] + if [ "x${fallbackdefault}" = "x0" ] then - printf "#define ${macro}(${actual}) (internal_error (\"${macro}\"), 0)\n" + printf "#define ${macro}(${actual}) (internal_error (__FILE__, __LINE__, \"${macro}\"), 0)\n" else # FIXME: Should be passing current_gdbarch through! echo "#define ${macro}(${actual}) (${fallbackdefault} (${actual}))" \ @@ -687,27 +828,41 @@ do printf "#endif\n" fi printf "\n" - printf "typedef ${returntype} (gdbarch_${function}_ftype) (${formal});\n" - if [ "${formal}" = "void" ] + if [ "x${formal}" = "xvoid" ] && class_is_multiarch_p + then + printf "typedef ${returntype} (gdbarch_${function}_ftype) (struct gdbarch *gdbarch);\n" + elif class_is_multiarch_p + then + printf "typedef ${returntype} (gdbarch_${function}_ftype) (struct gdbarch *gdbarch, ${formal});\n" + else + printf "typedef ${returntype} (gdbarch_${function}_ftype) (${formal});\n" + fi + if [ "x${formal}" = "xvoid" ] then printf "extern ${returntype} gdbarch_${function} (struct gdbarch *gdbarch);\n" else printf "extern ${returntype} gdbarch_${function} (struct gdbarch *gdbarch, ${formal});\n" fi printf "extern void set_gdbarch_${function} (struct gdbarch *gdbarch, gdbarch_${function}_ftype *${function});\n" - printf "#if GDB_MULTI_ARCH\n" - printf "#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (${macro})\n" - if [ "${actual}" = "" ] - then - printf "#define ${macro}() (gdbarch_${function} (current_gdbarch))\n" - elif [ "${actual}" = "-" ] - then - printf "#define ${macro} (gdbarch_${function} (current_gdbarch))\n" + if class_is_multiarch_p ; then : else - printf "#define ${macro}(${actual}) (gdbarch_${function} (current_gdbarch, ${actual}))\n" + printf "#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (${macro})\n" + printf "#error \"Non multi-arch definition of ${macro}\"\n" + printf "#endif\n" + printf "#if GDB_MULTI_ARCH\n" + printf "#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (${macro})\n" + if [ "x${actual}" = "x" ] + then + printf "#define ${macro}() (gdbarch_${function} (current_gdbarch))\n" + elif [ "x${actual}" = "x-" ] + then + printf "#define ${macro} (gdbarch_${function} (current_gdbarch))\n" + else + printf "#define ${macro}(${actual}) (gdbarch_${function} (current_gdbarch, ${actual}))\n" + fi + printf "#endif\n" + printf "#endif\n" fi - printf "#endif\n" - printf "#endif\n" fi done @@ -756,8 +911,7 @@ extern struct gdbarch_tdep *gdbarch_tdep (struct gdbarch *gdbarch); The INIT function parameter INFO shall, as far as possible, be pre-initialized with information obtained from INFO.ABFD or - previously selected architecture (if similar). INIT shall ensure - that the INFO.BYTE_ORDER is non-zero. + previously selected architecture (if similar). The INIT function shall return any of: NULL - indicating that it doesn't recognize the selected architecture; an existing \`\`struct @@ -778,13 +932,10 @@ struct gdbarch_list struct gdbarch_info { - /* Use default: bfd_arch_unknown (ZERO). */ - enum bfd_architecture bfd_architecture; - /* Use default: NULL (ZERO). */ const struct bfd_arch_info *bfd_arch_info; - /* Use default: 0 (ZERO). */ + /* Use default: BFD_ENDIAN_UNKNOWN (NB: is not ZERO). */ int byte_order; /* Use default: NULL (ZERO). */ @@ -834,16 +985,12 @@ extern struct gdbarch *gdbarch_alloc (const struct gdbarch_info *info, struct gd extern void gdbarch_free (struct gdbarch *); -/* Helper function. Force an update of the current architecture. Used - by legacy targets that have added their own target specific - architecture manipulation commands. +/* Helper function. Force an update of the current architecture. - The INFO parameter shall be fully initialized (\`\`memset (&INFO, - sizeof (info), 0)'' set relevant fields) before gdbarch_update_p() - is called. gdbarch_update_p() shall initialize any \`\`default'' - fields using information obtained from the previous architecture or - INFO.ABFD (if specified) before calling the corresponding - architectures INIT function. + The actual architecture selected is determined by INFO, \`\`(gdb) set + architecture'' et.al., the existing architecture and BFD's default + architecture. INFO should be initialized to zero and then selected + fields should be updated. Returns non-zero if the update succeeds */ @@ -855,29 +1002,40 @@ extern int gdbarch_update_p (struct gdbarch_info info); Reserve space for a per-architecture data-pointer. An identifier for the reserved data-pointer is returned. That identifer should - be saved in a local static. + be saved in a local static variable. - When a new architecture is selected, INIT() is called. When a - previous architecture is re-selected, the per-architecture - data-pointer for that previous architecture is restored (INIT() is - not called). + The per-architecture data-pointer can be initialized in one of two + ways: The value can be set explicitly using a call to + set_gdbarch_data(); the value can be set implicitly using the value + returned by a non-NULL INIT() callback. INIT(), when non-NULL is + called after the basic architecture vector has been created. - INIT() shall return the initial value for the per-architecture - data-pointer for the current architecture. + When a previously created architecture is re-selected, the + per-architecture data-pointer for that previous architecture is + restored. INIT() is not called. + + During initialization, multiple assignments of the data-pointer are + allowed, non-NULL values are deleted by calling FREE(). If the + architecture is deleted using gdbarch_free() all non-NULL data + pointers are also deleted using FREE(). Multiple registrarants for any architecture are allowed (and strongly encouraged). */ -typedef void *(gdbarch_data_ftype) (void); -extern struct gdbarch_data *register_gdbarch_data (gdbarch_data_ftype *init); +struct gdbarch_data; -/* Return the value of the per-architecture data-pointer for the - current architecture. */ +typedef void *(gdbarch_data_init_ftype) (struct gdbarch *gdbarch); +typedef void (gdbarch_data_free_ftype) (struct gdbarch *gdbarch, + void *pointer); +extern struct gdbarch_data *register_gdbarch_data (gdbarch_data_init_ftype *init, + gdbarch_data_free_ftype *free); +extern void set_gdbarch_data (struct gdbarch *gdbarch, + struct gdbarch_data *data, + void *pointer); extern void *gdbarch_data (struct gdbarch_data*); - /* Register per-architecture memory region. Provide a memory-region swap mechanism. Per-architecture memory @@ -898,33 +1056,7 @@ extern void register_gdbarch_swap (void *data, unsigned long size, gdbarch_swap_ /* The target-system-dependent byte order is dynamic */ -/* TARGET_BYTE_ORDER_SELECTABLE_P determines if the target endianness - is selectable at runtime. The user can use the \`\`set endian'' - command to change it. TARGET_BYTE_ORDER_AUTO is nonzero when - target_byte_order should be auto-detected (from the program image - say). */ - -#if GDB_MULTI_ARCH -/* Multi-arch GDB is always bi-endian. */ -#define TARGET_BYTE_ORDER_SELECTABLE_P 1 -#endif - -#ifndef TARGET_BYTE_ORDER_SELECTABLE_P -/* compat - Catch old targets that define TARGET_BYTE_ORDER_SLECTABLE - when they should have defined TARGET_BYTE_ORDER_SELECTABLE_P 1 */ -#ifdef TARGET_BYTE_ORDER_SELECTABLE -#define TARGET_BYTE_ORDER_SELECTABLE_P 1 -#else -#define TARGET_BYTE_ORDER_SELECTABLE_P 0 -#endif -#endif - extern int target_byte_order; -#ifdef TARGET_BYTE_ORDER_SELECTABLE -/* compat - Catch old targets that define TARGET_BYTE_ORDER_SELECTABLE - and expect defs.h to re-define TARGET_BYTE_ORDER. */ -#undef TARGET_BYTE_ORDER -#endif #ifndef TARGET_BYTE_ORDER #define TARGET_BYTE_ORDER (target_byte_order + 0) #endif @@ -951,8 +1083,6 @@ extern const struct bfd_arch_info *target_architecture; /* The target-system-dependent disassembler is semi-dynamic */ -#include "dis-asm.h" /* Get defs for disassemble_info */ - extern int dis_asm_read_memory (bfd_vma memaddr, bfd_byte *myaddr, unsigned int len, disassemble_info *info); @@ -964,32 +1094,12 @@ extern void dis_asm_print_address (bfd_vma addr, extern int (*tm_print_insn) (bfd_vma, disassemble_info*); extern disassemble_info tm_print_insn_info; -#ifndef TARGET_PRINT_INSN -#define TARGET_PRINT_INSN(vma, info) (*tm_print_insn) (vma, info) -#endif #ifndef TARGET_PRINT_INSN_INFO #define TARGET_PRINT_INSN_INFO (&tm_print_insn_info) #endif -/* Explicit test for D10V architecture. - USE of these macro's is *STRONGLY* discouraged. */ - -#define GDB_TARGET_IS_D10V (TARGET_ARCHITECTURE->arch == bfd_arch_d10v) - - -/* Fallback definition for EXTRACT_STRUCT_VALUE_ADDRESS */ -#ifndef EXTRACT_STRUCT_VALUE_ADDRESS -#define EXTRACT_STRUCT_VALUE_ADDRESS_P (0) -#define EXTRACT_STRUCT_VALUE_ADDRESS(X) (internal_error ("gdbarch: EXTRACT_STRUCT_VALUE_ADDRESS"), 0) -#else -#ifndef EXTRACT_STRUCT_VALUE_ADDRESS_P -#define EXTRACT_STRUCT_VALUE_ADDRESS_P (1) -#endif -#endif - - /* Set the dynamic target-system-dependent parameters (architecture, byte-order, ...) using information found in the BFD */ @@ -1001,6 +1111,10 @@ extern void set_gdbarch_from_file (bfd *); extern void initialize_current_architecture (void); +/* For non-multiarched targets, do any initialization of the default + gdbarch object necessary after the _initialize_MODULE functions + have run. */ +extern void initialize_non_multiarch (); /* gdbarch trace variable */ extern int gdbarch_debug; @@ -1044,15 +1158,21 @@ cat <tdep = tdep; + /* NOTE: The new architecture variable is named \`\`current_gdbarch'' + so that macros such as TARGET_DOUBLE_BIT, when expanded, refer to + the current local architecture and not the previous global + architecture. This ensures that the new architectures initial + values are not influenced by the previous architecture. Once + everything is parameterised with gdbarch, this will go away. */ + struct gdbarch *current_gdbarch = XMALLOC (struct gdbarch); + memset (current_gdbarch, 0, sizeof (*current_gdbarch)); + + alloc_gdbarch_data (current_gdbarch); + + current_gdbarch->tdep = tdep; EOF printf "\n" function_list | while do_read do if class_is_info_p then - printf " gdbarch->${function} = info->${function};\n" + printf " current_gdbarch->${function} = info->${function};\n" fi done printf "\n" @@ -1212,16 +1349,16 @@ function_list | while do_read do if class_is_function_p || class_is_variable_p then - if [ "${predefault}" != "" -a "${predefault}" != "0" ] + if [ -n "${predefault}" -a "x${predefault}" != "x0" ] then - printf " gdbarch->${function} = ${predefault};\n" + printf " current_gdbarch->${function} = ${predefault};\n" fi fi done cat <byte_order == 0) - internal_error ("verify_gdbarch: byte-order unset"); + if (gdbarch->byte_order == BFD_ENDIAN_UNKNOWN) + fprintf_unfiltered (log, "\n\tbyte-order"); if (gdbarch->bfd_arch_info == NULL) - internal_error ("verify_gdbarch: bfd_arch_info unset"); + fprintf_unfiltered (log, "\n\tbfd_arch_info"); /* Check those that need to be defined for the given multi-arch level. */ EOF function_list | while do_read do if class_is_function_p || class_is_variable_p then - if [ "${invalid_p}" = "0" ] + if [ "x${invalid_p}" = "x0" ] then printf " /* Skip verify of ${function}, invalid_p == 0 */\n" elif class_is_predicate_p then printf " /* Skip verify of ${function}, has predicate */\n" # FIXME: See do_read for potential simplification - elif [ "${invalid_p}" -a "${postdefault}" ] + elif [ -n "${invalid_p}" -a -n "${postdefault}" ] then printf " if (${invalid_p})\n" printf " gdbarch->${function} = ${postdefault};\n" - elif [ "${predefault}" -a "${postdefault}" ] + elif [ -n "${predefault}" -a -n "${postdefault}" ] then printf " if (gdbarch->${function} == ${predefault})\n" printf " gdbarch->${function} = ${postdefault};\n" - elif [ "${postdefault}" ] + elif [ -n "${postdefault}" ] then printf " if (gdbarch->${function} == 0)\n" printf " gdbarch->${function} = ${postdefault};\n" - elif [ "${invalid_p}" ] + elif [ -n "${invalid_p}" ] then printf " if ((GDB_MULTI_ARCH >= ${level})\n" printf " && (${invalid_p}))\n" - printf " internal_error (\"gdbarch: verify_gdbarch: ${function} invalid\");\n" - elif [ "${predefault}" ] + printf " fprintf_unfiltered (log, \"\\\\n\\\\t${function}\");\n" + elif [ -n "${predefault}" ] then printf " if ((GDB_MULTI_ARCH >= ${level})\n" printf " && (gdbarch->${function} == ${predefault}))\n" - printf " internal_error (\"gdbarch: verify_gdbarch: ${function} invalid\");\n" + printf " fprintf_unfiltered (log, \"\\\\n\\\\t${function}\");\n" fi fi done cat < 0) + internal_error (__FILE__, __LINE__, + "verify_gdbarch: the following are invalid ...%s", + buf); + do_cleanups (cleanups); } EOF @@ -1321,14 +1472,23 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) "gdbarch_dump: GDB_MULTI_ARCH = %d\\n", GDB_MULTI_ARCH); EOF -function_list | while do_read +function_list | sort -t: +2 | while do_read do - if [ "${returntype}" = "void" ] + # multiarch functions don't have macros. + if class_is_multiarch_p + then + printf " if (GDB_MULTI_ARCH)\n" + printf " fprintf_unfiltered (file,\n" + printf " \"gdbarch_dump: ${function} = 0x%%08lx\\\\n\",\n" + printf " (long) current_gdbarch->${function});\n" + continue + fi + # Print the macro definition. + printf "#ifdef ${macro}\n" + if [ "x${returntype}" = "xvoid" ] then - printf "#if defined (${macro}) && GDB_MULTI_ARCH\n" + printf "#if GDB_MULTI_ARCH\n" printf " /* Macro might contain \`[{}]' when not multi-arch */\n" - else - printf "#ifdef ${macro}\n" fi if class_is_function_p then @@ -1341,20 +1501,20 @@ do printf " \"gdbarch_dump: ${macro} # %%s\\\\n\",\n" printf " XSTRING (${macro}));\n" fi - printf "#endif\n" -done -function_list | while do_read -do - printf "#ifdef ${macro}\n" - if [ "${print_p}" = "()" ] + # Print the architecture vector value + if [ "x${returntype}" = "xvoid" ] + then + printf "#endif\n" + fi + if [ "x${print_p}" = "x()" ] then - printf " gdbarch_dump_${function} (current_gdbarch);\n" - elif [ "${print_p}" = "0" ] + printf " gdbarch_dump_${function} (current_gdbarch);\n" + elif [ "x${print_p}" = "x0" ] then - printf " /* skip print of ${macro}, print_p == 0. */\n" - elif [ "${print_p}" ] + printf " /* skip print of ${macro}, print_p == 0. */\n" + elif [ -n "${print_p}" ] then - printf " if (${print_p})\n" + printf " if (${print_p})\n" printf " fprintf_unfiltered (file,\n" printf " \"gdbarch_dump: ${macro} = %s\\\\n\",\n" "${fmt}" printf " ${print});\n" @@ -1399,7 +1559,7 @@ do printf "int\n" printf "gdbarch_${function}_p (struct gdbarch *gdbarch)\n" printf "{\n" - if [ "${valid_p}" ] + if [ -n "${valid_p}" ] then printf " return ${valid_p};\n" else @@ -1411,7 +1571,7 @@ do then printf "\n" printf "${returntype}\n" - if [ "${formal}" = "void" ] + if [ "x${formal}" = "xvoid" ] then printf "gdbarch_${function} (struct gdbarch *gdbarch)\n" else @@ -1419,15 +1579,31 @@ do fi printf "{\n" printf " if (gdbarch->${function} == 0)\n" - printf " internal_error (\"gdbarch: gdbarch_${function} invalid\");\n" + printf " internal_error (__FILE__, __LINE__,\n" + printf " \"gdbarch: gdbarch_${function} invalid\");\n" printf " if (gdbarch_debug >= 2)\n" printf " fprintf_unfiltered (gdb_stdlog, \"gdbarch_${function} called\\\\n\");\n" - test "${actual}" = "-" && actual="" - if [ "${returntype}" = "void" ] + if [ "x${actual}" = "x-" -o "x${actual}" = "x" ] then - printf " gdbarch->${function} (${actual});\n" + if class_is_multiarch_p + then + params="gdbarch" + else + params="" + fi else - printf " return gdbarch->${function} (${actual});\n" + if class_is_multiarch_p + then + params="gdbarch, ${actual}" + else + params="${actual}" + fi + fi + if [ "x${returntype}" = "xvoid" ] + then + printf " gdbarch->${function} (${params});\n" + else + printf " return gdbarch->${function} (${params});\n" fi printf "}\n" printf "\n" @@ -1443,17 +1619,19 @@ do printf "${returntype}\n" printf "gdbarch_${function} (struct gdbarch *gdbarch)\n" printf "{\n" - if [ "${invalid_p}" = "0" ] + if [ "x${invalid_p}" = "x0" ] then printf " /* Skip verify of ${function}, invalid_p == 0 */\n" - elif [ "${invalid_p}" ] + elif [ -n "${invalid_p}" ] then printf " if (${invalid_p})\n" - printf " internal_error (\"gdbarch: gdbarch_${function} invalid\");\n" - elif [ "${predefault}" ] + printf " internal_error (__FILE__, __LINE__,\n" + printf " \"gdbarch: gdbarch_${function} invalid\");\n" + elif [ -n "${predefault}" ] then printf " if (gdbarch->${function} == ${predefault})\n" - printf " internal_error (\"gdbarch: gdbarch_${function} invalid\");\n" + printf " internal_error (__FILE__, __LINE__,\n" + printf " \"gdbarch: gdbarch_${function} invalid\");\n" fi printf " if (gdbarch_debug >= 2)\n" printf " fprintf_unfiltered (gdb_stdlog, \"gdbarch_${function} called\\\\n\");\n" @@ -1488,19 +1666,20 @@ cat <next); (*curr) = XMALLOC (struct gdbarch_data_registration); (*curr)->next = NULL; - (*curr)->init = init; (*curr)->data = XMALLOC (struct gdbarch_data); (*curr)->data->index = gdbarch_data_registry.nr++; + (*curr)->data->init = init; + (*curr)->data->free = free; return (*curr)->data; } @@ -1531,26 +1712,73 @@ static void init_gdbarch_data (struct gdbarch *gdbarch) { struct gdbarch_data_registration *rego; - gdbarch->nr_data = gdbarch_data_registry.nr + 1; - gdbarch->data = xmalloc (sizeof (void*) * gdbarch->nr_data); for (rego = gdbarch_data_registry.registrations; rego != NULL; rego = rego->next) { - if (rego->data->index < gdbarch->nr_data) - gdbarch->data[rego->data->index] = rego->init (); + struct gdbarch_data *data = rego->data; + gdb_assert (data->index < gdbarch->nr_data); + if (data->init != NULL) + { + void *pointer = data->init (gdbarch); + set_gdbarch_data (gdbarch, data, pointer); + } + } +} + +/* Create/delete the gdbarch data vector. */ + +static void +alloc_gdbarch_data (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch->data == NULL); + gdbarch->nr_data = gdbarch_data_registry.nr; + gdbarch->data = xcalloc (gdbarch->nr_data, sizeof (void*)); +} + +static void +free_gdbarch_data (struct gdbarch *gdbarch) +{ + struct gdbarch_data_registration *rego; + gdb_assert (gdbarch->data != NULL); + for (rego = gdbarch_data_registry.registrations; + rego != NULL; + rego = rego->next) + { + struct gdbarch_data *data = rego->data; + gdb_assert (data->index < gdbarch->nr_data); + if (data->free != NULL && gdbarch->data[data->index] != NULL) + { + data->free (gdbarch, gdbarch->data[data->index]); + gdbarch->data[data->index] = NULL; + } } + xfree (gdbarch->data); + gdbarch->data = NULL; } +/* Initialize the current value of thee specified per-architecture + data-pointer. */ + +void +set_gdbarch_data (struct gdbarch *gdbarch, + struct gdbarch_data *data, + void *pointer) +{ + gdb_assert (data->index < gdbarch->nr_data); + if (data->free != NULL && gdbarch->data[data->index] != NULL) + data->free (gdbarch, gdbarch->data[data->index]); + gdbarch->data[data->index] = pointer; +} + /* Return the current value of the specified per-architecture data-pointer. */ void * gdbarch_data (struct gdbarch_data *data) { - if (data->index >= current_gdbarch->nr_data) - internal_error ("gdbarch_data: request for non-existant data."); + gdb_assert (data->index < current_gdbarch->nr_data); return current_gdbarch->data[data->index]; } @@ -1684,7 +1912,8 @@ gdbarch_printable_names (void) const struct bfd_arch_info *ap; ap = bfd_lookup_arch (rego->bfd_architecture, 0); if (ap == NULL) - internal_error ("gdbarch_architecture_names: multi-arch unknown"); + internal_error (__FILE__, __LINE__, + "gdbarch_architecture_names: multi-arch unknown"); do { append_name (&arches, &nr_arches, ap->printable_name); @@ -1713,7 +1942,9 @@ gdbarch_register (enum bfd_architecture bfd_architecture, bfd_arch_info = bfd_lookup_arch (bfd_architecture, 0); if (bfd_arch_info == NULL) { - internal_error ("gdbarch: Attempt to register unknown architecture (%d)", bfd_architecture); + internal_error (__FILE__, __LINE__, + "gdbarch: Attempt to register unknown architecture (%d)", + bfd_architecture); } /* Check that we haven't seen this architecture before */ for (curr = &gdbarch_registry; @@ -1721,8 +1952,9 @@ gdbarch_register (enum bfd_architecture bfd_architecture, curr = &(*curr)->next) { if (bfd_architecture == (*curr)->bfd_architecture) - internal_error ("gdbarch: Duplicate registraration of architecture (%s)", - bfd_arch_info->printable_name); + internal_error (__FILE__, __LINE__, + "gdbarch: Duplicate registraration of architecture (%s)", + bfd_arch_info->printable_name); } /* log it */ if (gdbarch_debug) @@ -1781,75 +2013,72 @@ gdbarch_update_p (struct gdbarch_info info) struct gdbarch_list **list; struct gdbarch_registration *rego; - /* Fill in any missing bits. Most important is the bfd_architecture - which is used to select the target architecture. */ - if (info.bfd_architecture == bfd_arch_unknown) - { - if (info.bfd_arch_info != NULL) - info.bfd_architecture = info.bfd_arch_info->arch; - else if (info.abfd != NULL) - info.bfd_architecture = bfd_get_arch (info.abfd); - /* FIXME - should query BFD for its default architecture. */ - else - info.bfd_architecture = current_gdbarch->bfd_arch_info->arch; - } + /* Fill in missing parts of the INFO struct using a number of + sources: \`\`set ...''; INFOabfd supplied; existing target. */ + + /* \`\`(gdb) set architecture ...'' */ + if (info.bfd_arch_info == NULL + && !TARGET_ARCHITECTURE_AUTO) + info.bfd_arch_info = TARGET_ARCHITECTURE; + if (info.bfd_arch_info == NULL + && info.abfd != NULL + && bfd_get_arch (info.abfd) != bfd_arch_unknown + && bfd_get_arch (info.abfd) != bfd_arch_obscure) + info.bfd_arch_info = bfd_get_arch_info (info.abfd); if (info.bfd_arch_info == NULL) - { - if (target_architecture_auto && info.abfd != NULL) - info.bfd_arch_info = bfd_get_arch_info (info.abfd); - else - info.bfd_arch_info = current_gdbarch->bfd_arch_info; - } - if (info.byte_order == 0) - { - if (target_byte_order_auto && info.abfd != NULL) - info.byte_order = (bfd_big_endian (info.abfd) ? BIG_ENDIAN - : bfd_little_endian (info.abfd) ? LITTLE_ENDIAN - : 0); - else - info.byte_order = current_gdbarch->byte_order; - /* FIXME - should query BFD for its default byte-order. */ - } - /* A default for abfd? */ - - /* Find the target that knows about this architecture. */ - for (rego = gdbarch_registry; - rego != NULL; - rego = rego->next) - if (rego->bfd_architecture == info.bfd_architecture) - break; - if (rego == NULL) - { - if (gdbarch_debug) - fprintf_unfiltered (gdb_stdlog, "gdbarch_update: No matching architecture\\n"); - return 0; - } + info.bfd_arch_info = TARGET_ARCHITECTURE; + + /* \`\`(gdb) set byte-order ...'' */ + if (info.byte_order == BFD_ENDIAN_UNKNOWN + && !TARGET_BYTE_ORDER_AUTO) + info.byte_order = TARGET_BYTE_ORDER; + /* From the INFO struct. */ + if (info.byte_order == BFD_ENDIAN_UNKNOWN + && info.abfd != NULL) + info.byte_order = (bfd_big_endian (info.abfd) ? BFD_ENDIAN_BIG + : bfd_little_endian (info.abfd) ? BFD_ENDIAN_LITTLE + : BFD_ENDIAN_UNKNOWN); + /* From the current target. */ + if (info.byte_order == BFD_ENDIAN_UNKNOWN) + info.byte_order = TARGET_BYTE_ORDER; + + /* Must have found some sort of architecture. */ + gdb_assert (info.bfd_arch_info != NULL); if (gdbarch_debug) { fprintf_unfiltered (gdb_stdlog, - "gdbarch_update: info.bfd_architecture %d (%s)\\n", - info.bfd_architecture, - bfd_lookup_arch (info.bfd_architecture, 0)->printable_name); - fprintf_unfiltered (gdb_stdlog, - "gdbarch_update: info.bfd_arch_info %s\\n", + "gdbarch_update: info.bfd_arch_info %s\n", (info.bfd_arch_info != NULL ? info.bfd_arch_info->printable_name : "(null)")); fprintf_unfiltered (gdb_stdlog, - "gdbarch_update: info.byte_order %d (%s)\\n", + "gdbarch_update: info.byte_order %d (%s)\n", info.byte_order, - (info.byte_order == BIG_ENDIAN ? "big" - : info.byte_order == LITTLE_ENDIAN ? "little" + (info.byte_order == BFD_ENDIAN_BIG ? "big" + : info.byte_order == BFD_ENDIAN_LITTLE ? "little" : "default")); fprintf_unfiltered (gdb_stdlog, - "gdbarch_update: info.abfd 0x%lx\\n", + "gdbarch_update: info.abfd 0x%lx\n", (long) info.abfd); fprintf_unfiltered (gdb_stdlog, - "gdbarch_update: info.tdep_info 0x%lx\\n", + "gdbarch_update: info.tdep_info 0x%lx\n", (long) info.tdep_info); } + /* Find the target that knows about this architecture. */ + for (rego = gdbarch_registry; + rego != NULL; + rego = rego->next) + if (rego->bfd_architecture == info.bfd_arch_info->arch) + break; + if (rego == NULL) + { + if (gdbarch_debug) + fprintf_unfiltered (gdb_stdlog, "gdbarch_update: No matching architecture\\n"); + return 0; + } + /* Ask the target for a replacement architecture. */ new_gdbarch = rego->init (info, rego->arches); @@ -1888,6 +2117,7 @@ gdbarch_update_p (struct gdbarch_info info) new_gdbarch->bfd_arch_info->printable_name); current_gdbarch = new_gdbarch; swapin_gdbarch_swap (new_gdbarch); + architecture_changed_event (); return 1; } } @@ -1921,7 +2151,8 @@ gdbarch_update_p (struct gdbarch_info info) registered an interest in this architecture. CURRENT_GDBARCH must be updated before these modules are called. */ init_gdbarch_data (new_gdbarch); - + architecture_changed_event (); + if (gdbarch_debug) gdbarch_dump (current_gdbarch, gdb_stdlog);