#!/usr/local/bin/bash
# Architecture commands for GDB, the GNU debugger.
-# Copyright 1998-1999 Free Software Foundation, Inc.
+# Copyright 1998-2000 Free Software Foundation, Inc.
#
# This file is part of GDB.
#
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-read="class level macro returntype function formal actual attrib default init invalid_p fmt print print_p description"
+compare_new ()
+{
+ file=$1
+ if ! test -r ${file}
+ then
+ echo "${file} missing? cp new-${file} ${file}" 1>&2
+ elif diff -c ${file} new-${file}
+ then
+ echo "${file} unchanged" 1>&2
+ else
+ echo "${file} has changed? cp new-${file} ${file}" 1>&2
+ fi
+}
+
+
+# DEFAULT is a valid fallback definition of a MACRO when
+# multi-arch is not enabled.
+default_is_fallback_p ()
+{
+ [ "${default}" != "" -a "${invalid_p}" = "0" ]
+}
+
+# Format of the input table
+read="class level macro returntype function formal actual attrib startup default invalid_p fmt print print_p description"
+
+class_is_variable_p ()
+{
+ [ "${class}" = "v" -o "${class}" = "V" ]
+}
+
+class_is_function_p ()
+{
+ [ "${class}" = "f" -o "${class}" = "F" ]
+}
+
+class_is_predicate_p ()
+{
+ [ "${class}" = "F" -o "${class}" = "V" ]
+}
+
+class_is_info_p ()
+{
+ [ "${class}" = "i" ]
+}
+
+
+do_read ()
+{
+ if eval read $read
+ then
+ test "${startup}" || startup=0
+ test "${fmt}" || fmt="%ld"
+ test "${print}" || print="(long) ${macro}"
+ #FIXME:
+ #Should set DEFAULT to zero and force the user to provide
+ #an invalid_p=0
+ #test "${default}" || default=0 - NO
+ case "${invalid_p}" in
+ 0 ) valid_p=1 ;;
+ "" ) test "${default}" && valid_p="gdbarch->${function} != ${default}"
+ #NOT_YET
+ #test "${default}" && invalid_p="gdbarch->${function} == ${default}"
+ ;;
+ * ) valid_p="!(${invalid_p})"
+ esac
+ #NOT YET:
+ :
+ else
+ false
+ fi
+}
+
# dump out/verify the doco
for field in ${read}
class ) : ;;
- # # -> line disable
- # f -> function
- # hiding a function
- # v -> variable
- # hiding a variable
- # i -> set from info
- # hiding something from the ``struct info'' object
+ # # -> line disable
+ # f -> function
+ # hiding a function
+ # F -> function + predicate
+ # hiding a function + predicate to test function validity
+ # v -> variable
+ # hiding a variable
+ # V -> variable + predicate
+ # hiding a variable + predicate to test variables validity
+ # i -> set from info
+ # hiding something from the ``struct info'' object
level ) : ;;
- # See GDB_MULTI_ARCH description. Having GDB_MULTI_ARCH >=
- # LEVEL is a predicate on checking that a given method is
- # initialized (using INVALID_P).
+ # See GDB_MULTI_ARCH description. Having GDB_MULTI_ARCH >=
+ # LEVEL is a predicate on checking that a given method is
+ # initialized (using INVALID_P).
macro ) : ;;
- # The name of the MACRO that this method is to be accessed by.
+ # The name of the MACRO that this method is to be accessed by.
returntype ) : ;;
- # For functions, the return type; for variables, the data type
+ # For functions, the return type; for variables, the data type
function ) : ;;
- # For functions, the member function name; for variables, the
- # variable name. Member function names are always prefixed with
- # ``gdbarch_'' for name-space purity.
+ # For functions, the member function name; for variables, the
+ # variable name. Member function names are always prefixed with
+ # ``gdbarch_'' for name-space purity.
formal ) : ;;
- # The formal argument list. It is assumed that the formal
- # argument list includes the actual name of each list element.
- # A function with no arguments shall have ``void'' as the formal
- # argument list.
+ # The formal argument list. It is assumed that the formal
+ # argument list includes the actual name of each list element.
+ # A function with no arguments shall have ``void'' as the
+ # formal argument list.
actual ) : ;;
- # The list of actual arguments. The arguments specified shall
- # match the FORMAL list given above. Functions with out
- # arguments leave this blank.
+ # The list of actual arguments. The arguments specified shall
+ # 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.
+ # Any GCC attributes that should be attached to the function
+ # declaration. At present this field is unused.
- default ) : ;;
+ startup ) : ;;
- # To help with the GDB startup a default static gdbarch object
- # is created. DEFAULT is the value to insert into the static
- # gdbarch object. If empty ZERO is used.
+ # To help with the GDB startup a static gdbarch object is
+ # created. STARTUP is the value to insert into that static
+ # gdbarch object.
+
+ # By default ``0'' is used.
+
+ default ) : ;;
- init ) : ;;
+ # Any initial value to assign to a new gdbarch object after it
+ # as been malloc()ed. Zero is used by default.
- # Any initial value to assign to a new gdbarch object after it
- # as been malloc()ed. Zero is used by default.
+ # Specify a non-empty DEFAULT and a zero INVALID_P to create a
+ # fallback value or function for when multi-arch is disabled.
+ # Specify a zero DEFAULT function to make that fallback
+ # illegal to call.
invalid_p ) : ;;
- # A predicate equation that validates MEMBER. Non-zero is returned
- # if the code creating the new architecture failed to initialize
- # the MEMBER or initialized the member to something invalid.
- # By default, a check that the value is no longer equal to INIT
- # is performed. The equation ``0'' disables the invalid_p check.
+ # A predicate equation that validates MEMBER. Non-zero is
+ # returned if the code creating the new architecture failed to
+ # initialize the MEMBER or initialized the member to something
+ # invalid. By default, a check that the value is no longer
+ # equal to DEFAULT is performed. The equation ``0'' disables
+ # the invalid_p check.
fmt ) : ;;
- # printf style format string that can be used to print out the
- # MEMBER. The default is to assume "%ld" is safe. Sometimes
- # "%s" is useful. For functions, this is ignored and the
- # function address is printed.
+ # 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.
+
+ # By default ```%ld'' is used.
print ) : ;;
- # An optional equation that converts the MEMBER into a value
- # suitable for that FMT. By default it is assumed that the
- # member's MACRO cast to long is safe.
+ # An optional equation that casts MEMBER to a value suitable
+ # for formatting by FMT.
+
+ # By default ``(long)'' is used.
print_p ) : ;;
- # An optional indicator for any predicte to wrap around the
- # print member code.
- # # -> Wrap print up in ``#ifdef MACRO''
- # exp -> Wrap print up in ``if (${print_p}) ...
+ # An optional indicator for any predicte to wrap around the
+ # print member code.
+
+ # exp -> Wrap print up in ``if (${print_p}) ...
+ # ``'' -> No predicate
description ) : ;;
v:1:TARGET_FLOAT_BIT:int:float_bit::::8 * sizeof (float):0
v:1:TARGET_DOUBLE_BIT:int:double_bit::::8 * sizeof (double):0
v:1:TARGET_LONG_DOUBLE_BIT:int:long_double_bit::::8 * sizeof (long double):0
+v:1:IEEE_FLOAT:int:ieee_float::::0:0:0:::
#
f:1:TARGET_READ_PC:CORE_ADDR:read_pc:int pid:pid::0:0
f:1:TARGET_WRITE_PC:void:write_pc:CORE_ADDR val, int pid:val, pid::0:0
v:2:SP_REGNUM:int:sp_regnum::::0:-1
v:2:FP_REGNUM:int:fp_regnum::::0:-1
v:2:PC_REGNUM:int:pc_regnum::::0:-1
-f:2:REGISTER_NAME:char *:register_name:int regnr:regnr::0:0
+v:2:FP0_REGNUM:int:fp0_regnum::::0:-1:0
+v:2:NPC_REGNUM:int:npc_regnum::::0:-1:0
+v:2:NNPC_REGNUM:int:nnpc_regnum::::0:-1:0
+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
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
v:1:CALL_DUMMY_P:int:call_dummy_p::::0:-1
-v:2:CALL_DUMMY_WORDS:LONGEST *:call_dummy_words::::0:::0x%08lx
-v:2:SIZEOF_CALL_DUMMY_WORDS:int:sizeof_call_dummy_words::::0:::0x%08lx
+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:0
#
-v:2:BELIEVE_PCC_PROMOTION:int:believe_pcc_promotion::::0:::::#
-v:2:BELIEVE_PCC_PROMOTION_TYPE:int:believe_pcc_promotion_type::::0:::::#
+v:2:BELIEVE_PCC_PROMOTION:int:believe_pcc_promotion::::0:::::
+v:2:BELIEVE_PCC_PROMOTION_TYPE:int:believe_pcc_promotion_type::::0:::::
+f:2:COERCE_FLOAT_TO_DOUBLE:int:coerce_float_to_double:struct type *formal, struct type *actual:formal, actual:::default_coerce_float_to_double:0
f:1:GET_SAVED_REGISTER:void:get_saved_register:char *raw_buffer, int *optimized, CORE_ADDR *addrp, struct frame_info *frame, int regnum, enum lval_type *lval:raw_buffer, optimized, addrp, frame, regnum, lval::generic_get_saved_register:0
#
-f:1:REGISTER_CONVERTIBLE:int:register_convertible:int nr:nr::0:0
-f:2:REGISTER_CONVERT_TO_VIRTUAL:void:register_convert_to_virtual:int regnum, struct type *type, char *from, char *to:regnum, type, from, to::0:0
-f:2:REGISTER_CONVERT_TO_RAW:void:register_convert_to_raw:struct type *type, int regnum, char *from, char *to:type, regnum, from, to::0:0
+f:1:REGISTER_CONVERTIBLE:int:register_convertible:int nr:nr:::generic_register_convertible_not:0
+f:2:REGISTER_CONVERT_TO_VIRTUAL:void:register_convert_to_virtual:int regnum, struct type *type, char *from, char *to:regnum, type, from, to:::0:0
+f:2:REGISTER_CONVERT_TO_RAW:void:register_convert_to_raw:struct type *type, int regnum, char *from, char *to:type, regnum, from, to:::0:0
+#
+f:2:POINTER_TO_ADDRESS:CORE_ADDR:pointer_to_address:struct type *type, char *buf:type, buf:::generic_pointer_to_address:0
+f:2:ADDRESS_TO_POINTER:void:address_to_pointer:struct type *type, char *buf, CORE_ADDR addr:type, buf, addr:::generic_address_to_pointer:0
#
+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:0
-f:1:PUSH_RETURN_ADDRESS:CORE_ADDR:push_return_address:CORE_ADDR pc, CORE_ADDR sp:pc, sp::0:0
-f:2:POP_FRAME:void:pop_frame:void:-::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: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: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:0
-f:2:STORE_RETURN_VALUE:void:store_return_value:struct type *type, char *valbuf:type, valbuf::0:0
-f:2:EXTRACT_STRUCT_VALUE_ADDRESS:CORE_ADDR:extract_struct_value_address:char *regbuf:regbuf::0:0
-f:2:USE_STRUCT_CONVENTION:int:use_struct_convention:int gcc_p, struct type *value_type:gcc_p, value_type::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: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: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
f:2:INNER_THAN:int:inner_than:CORE_ADDR lhs, CORE_ADDR rhs:lhs, rhs::0:0
-f:2:BREAKPOINT_FROM_PC:unsigned char *:breakpoint_from_pc:CORE_ADDR *pcptr, int *lenptr:pcptr, lenptr::0:0
+f:2:BREAKPOINT_FROM_PC:unsigned char *:breakpoint_from_pc:CORE_ADDR *pcptr, int *lenptr:pcptr, lenptr:::legacy_breakpoint_from_pc:0
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
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::0:0
+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
#
v:2:FRAME_ARGS_SKIP:CORE_ADDR:frame_args_skip::::0:-1
-f:2:FRAMELESS_FUNCTION_INVOCATION:int:frameless_function_invocation:struct frame_info *fi:fi::0:0
+f:2:FRAMELESS_FUNCTION_INVOCATION:int:frameless_function_invocation:struct frame_info *fi:fi:::generic_frameless_function_invocation_not:0
f:2:FRAME_CHAIN:CORE_ADDR:frame_chain:struct frame_info *frame:frame::0:0
f:1:FRAME_CHAIN_VALID:int:frame_chain_valid:CORE_ADDR chain, struct frame_info *thisframe:chain, thisframe::0:0
f:2:FRAME_SAVED_PC:CORE_ADDR:frame_saved_pc:struct frame_info *fi:fi::0:0
f:2:SAVED_PC_AFTER_CALL:CORE_ADDR:saved_pc_after_call:struct frame_info *frame:frame::0:0
f:2:FRAME_NUM_ARGS:int:frame_num_args:struct frame_info *frame:frame::0:0
#
+F:2:STACK_ALIGN:CORE_ADDR:stack_align:CORE_ADDR sp:sp::0:0
+F:2:REG_STRUCT_HAS_ADDR:int:reg_struct_has_addr:int gcc_p, struct type *type:gcc_p, type::0:0
+F:2:SAVE_DUMMY_FRAME_TOS:void:save_dummy_frame_tos:CORE_ADDR sp:sp::0:0
EOF
grep -v '^#'
}
# dump it out
if true
then
- exec > new-gdbarch
- function_list | while eval read $read
- do
- cat <<EOF
+ exec > new-gdbarch
+ function_list | while do_read # eval read $read
+ do
+ cat <<EOF
${class} ${macro}(${actual})
${returntype} ${function} ($formal)${attrib}
level=${level}
+ startup=${startup}
default=${default}
- init=${init}
invalid_p=${invalid_p}
+ valid_p=${valid_p}
fmt=${fmt}
print=${print}
print_p=${print_p}
description=${description}
EOF
- done
- exec 1>&2
+ if class_is_predicate_p && default_is_fallback_p
+ then
+ echo "Error: predicate function can not have a non- multi-arch default" 1>&2
+ kill $$
+ exit 1
+ fi
+ done
+ exec 1>&2
fi
copyright ()
{
cat <<EOF
+/* *INDENT-OFF* */ /* THIS FILE IS GENERATED */
+
/* Dynamic architecture support for GDB, the GNU debugger.
Copyright 1998-1999, Free Software Foundation, Inc.
Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-/* *INDENT-OFF* */ /* \`\`typedef (f)();'' confuses indent */
-
/* This file was created with the aid of \`\`gdbarch.sh''.
The bourn shell script \`\`gdbarch.sh'' creates the files
/* If any of the following are defined, the target wasn't correctly
converted. */
-#if GDB_MULTI_ARCH
-#if defined (CALL_DUMMY)
-#error "CALL_DUMMY: replaced by CALL_DUMMY_WORDS/SIZEOF_CALL_DUMMY_WORDS"
-#endif
-#endif
-
-#if GDB_MULTI_ARCH
-#if defined (REGISTER_NAMES)
-#error "REGISTER_NAMES: replaced by REGISTER_NAME"
-#endif
-#endif
-
#if GDB_MULTI_ARCH
#if defined (EXTRA_FRAME_INFO)
#error "EXTRA_FRAME_INFO: replaced by struct frame_extra_info"
echo ""
echo ""
echo "/* The following are pre-initialized by GDBARCH. */"
-function_list | while eval read $read
+function_list | while do_read # eval read $read
do
- case "${class}" in
- "i" )
+ if class_is_info_p
+ then
echo ""
echo "extern ${returntype} gdbarch_${function} (struct gdbarch *gdbarch);"
echo "/* set_gdbarch_${function}() - not applicable - pre-initialized. */"
echo "#define ${macro} (gdbarch_${function} (current_gdbarch))"
echo "#endif"
echo "#endif"
- ;;
- esac
+ fi
done
# function typedef's
echo ""
echo ""
echo "/* The following are initialized by the target dependant code. */"
-function_list | while eval read $read
+function_list | while do_read # eval read $read
do
- case "${class}" in
- "v" )
+ if class_is_predicate_p
+ then
+ echo ""
+ echo "#if defined (${macro})"
+ echo "/* Legacy for systems yet to multi-arch ${macro} */"
+# echo "#if (GDB_MULTI_ARCH <= 2) && defined (${macro})"
+ echo "#define ${macro}_P() (1)"
+ echo "#endif"
+ echo ""
+ echo "/* Default predicate for non- multi-arch targets. */"
+ echo "#if (GDB_MULTI_ARCH == 0) && !defined (${macro}_P)"
+ echo "#define ${macro}_P() (0)"
+ echo "#endif"
+ echo ""
+ echo "extern int gdbarch_${function}_p (struct gdbarch *gdbarch);"
+ echo "#if (GDB_MULTI_ARCH > 1) || !defined (${macro}_P)"
+ echo "#define ${macro}_P() (gdbarch_${function}_p (current_gdbarch))"
+ echo "#endif"
+ fi
+ if class_is_variable_p
+ then
+ if default_is_fallback_p || class_is_predicate_p
+ then
+ echo ""
+ echo "/* Default (value) for non- multi-arch platforms. */"
+ echo "#if (GDB_MULTI_ARCH == 0) && !defined (${macro})"
+ echo "#define ${macro} (${default})"
+ echo "#endif"
+ fi
echo ""
echo "extern ${returntype} gdbarch_${function} (struct gdbarch *gdbarch);"
echo "extern void set_gdbarch_${function} (struct gdbarch *gdbarch, ${returntype} ${function});"
echo "#define ${macro} (gdbarch_${function} (current_gdbarch))"
echo "#endif"
echo "#endif"
- ;;
- "f" )
+ fi
+ if class_is_function_p
+ then
+ if default_is_fallback_p || class_is_predicate_p
+ then
+ echo ""
+ echo "/* Default (function) for non- multi-arch platforms. */"
+ echo "#if (GDB_MULTI_ARCH == 0) && !defined (${macro})"
+ if [ "${default}" = "0" ]
+ then
+ echo "#define ${macro}(${actual}) (internal_error (\"${macro}\"), 0)"
+ else
+ echo "#define ${macro}(${actual}) (${default} (${actual}))"
+ fi
+ echo "#endif"
+ fi
echo ""
echo "typedef ${returntype} (gdbarch_${function}_ftype) (${formal});"
if [ "${formal}" = "void" ]
fi
echo "#endif"
echo "#endif"
- ;;
- esac
+ fi
done
# close it off
extern struct gdbarch *gdbarch_alloc (const struct gdbarch_info *info, struct gdbarch_tdep *tdep);
+/* Helper function. Free a partially-constructed \`\`struct gdbarch''. */
+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.
#include "dis-asm.h" /* Get defs for disassemble_info */
extern int dis_asm_read_memory (bfd_vma memaddr, bfd_byte *myaddr,
- int len, disassemble_info *info);
+ unsigned int len, disassemble_info *info);
extern void dis_asm_memory_error (int status, bfd_vma memaddr,
disassemble_info *info);
USE of these macro's is *STRONGLY* discouraged. */
#define GDB_TARGET_IS_D10V (TARGET_ARCHITECTURE->arch == bfd_arch_d10v)
-#ifndef D10V_MAKE_DADDR
-#define D10V_MAKE_DADDR(X) (internal_error ("gdbarch: D10V_MAKE_DADDR"), 0)
-#endif
-#ifndef D10V_MAKE_IADDR
-#define D10V_MAKE_IADDR(X) (internal_error ("gdbarch: D10V_MAKE_IADDR"), 0)
-#endif
-
-
-/* Fallback definition of FRAMELESS_FUNCTION_INVOCATION */
-#ifndef FRAMELESS_FUNCTION_INVOCATION
-#define FRAMELESS_FUNCTION_INVOCATION(FI) (0)
-#endif
-
-
-/* Fallback definition of REGISTER_CONVERTIBLE etc */
-extern int generic_register_convertible_not (int reg_nr);
-#ifndef REGISTER_CONVERTIBLE
-#define REGISTER_CONVERTIBLE(x) (0)
-#endif
-#ifndef REGISTER_CONVERT_TO_VIRTUAL
-#define REGISTER_CONVERT_TO_VIRTUAL(x, y, z, a)
-#endif
-#ifndef REGISTER_CONVERT_TO_RAW
-#define REGISTER_CONVERT_TO_RAW(x, y, z, a)
-#endif
/* Fallback definition for EXTRACT_STRUCT_VALUE_ADDRESS */
#endif
-/* Fallback definition for REGISTER_NAME for systems still defining
- REGISTER_NAMES. */
-#ifndef REGISTER_NAME
-extern char *gdb_register_names[];
-#define REGISTER_NAME(i) gdb_register_names[i]
-#endif
-
-
/* Set the dynamic target-system-dependant parameters (architecture,
byte-order, ...) using information found in the BFD */
EOF
exec 1>&2
#../move-if-change new-gdbarch.h gdbarch.h
-if ! test -r gdbarch.h
-then
- echo "gdbarch.h missing? cp new-gdbarch.h gdbarch.h" 1>&2
-elif diff -c gdbarch.h new-gdbarch.h
-then
- echo "gdbarch.h unchanged" 1>&2
-else
- echo "gdbarch.h has changed? cp new-gdbarch.h gdbarch.h" 1>&2
-fi
+compare_new gdbarch.h
#
cat <<EOF
#include "defs.h"
+#include "arch-utils.h"
#if GDB_MULTI_ARCH
#include "gdbcmd.h"
echo "struct gdbarch"
echo "{"
echo " /* basic architectural information */"
-function_list | while eval read $read
+function_list | while do_read # eval read $read
do
- case "${class}" in
- "i" ) echo " ${returntype} ${function};" ;;
- esac
+ if class_is_info_p
+ then
+ echo " ${returntype} ${function};"
+ fi
done
echo ""
echo " /* target specific vector. */"
gdbarch_dump(): Add a fprintf_unfiltered call to so that the new
field is dumped out
- \`\`default_gdbarch()'': Append an initial value to the static
+ \`\`startup_gdbarch()'': Append an initial value to the static
variable (base values on the host's c-type system).
get_gdbarch(): Implement the set/get functions (probably using
*/
EOF
-function_list | while eval read $read
+function_list | while do_read # eval read $read
do
- case "${class}" in
- "v" ) echo " ${returntype} ${function};" ;;
- "f" ) echo " gdbarch_${function}_ftype *${function}${attrib};" ;;
- esac
+ if class_is_variable_p
+ then
+ echo " ${returntype} ${function};"
+ elif class_is_function_p
+ then
+ echo " gdbarch_${function}_ftype *${function}${attrib};"
+ fi
done
echo "};"
echo ""
echo "extern const struct bfd_arch_info bfd_default_arch_struct;"
echo ""
-echo "struct gdbarch default_gdbarch = {"
+echo "struct gdbarch startup_gdbarch = {"
echo " /* basic architecture information */"
-function_list | while eval read $read
+function_list | while do_read # eval read $read
do
- case "${class}" in
- "i" ) echo " ${default}," ;;
- esac
+ if class_is_info_p
+ then
+ echo " ${startup},"
+ fi
done
cat <<EOF
/* target specific vector */
0, NULL, NULL,
/* Multi-arch values */
EOF
-function_list | while eval read $read
+function_list | while do_read # eval read $read
do
- case "${class}" in
- "f" | "v" ) echo " ${default}," ;;
- esac
+ if class_is_function_p || class_is_variable_p
+ then
+ echo " ${startup},"
+ fi
done
cat <<EOF
- /* default_gdbarch() */
+ /* startup_gdbarch() */
};
-struct gdbarch *current_gdbarch = &default_gdbarch;
+struct gdbarch *current_gdbarch = &startup_gdbarch;
EOF
# Create a new gdbarch struct
gdbarch->tdep = tdep;
EOF
echo ""
-function_list | while eval read $read
+function_list | while do_read # eval read $read
do
- case "${class}" in
- "i" ) echo " gdbarch->${function} = info->${function};"
- esac
+ if class_is_info_p
+ then
+ echo " gdbarch->${function} = info->${function};"
+ fi
done
echo ""
echo " /* Force the explicit initialization of these. */"
-function_list | while eval read $read
+function_list | while do_read # eval read $read
do
- case "${class}" in
- "f" | "v" )
- if [ "${init}" != "" -a "${init}" != "0" ]
+ if class_is_function_p || class_is_variable_p
+ then
+ if [ "${default}" != "" -a "${default}" != "0" ]
then
- echo " gdbarch->${function} = ${init};"
+ echo " gdbarch->${function} = ${default};"
fi
- ;;
- esac
+ fi
done
cat <<EOF
/* gdbarch_alloc() */
}
EOF
+# Free a gdbarch struct.
+echo ""
+echo ""
+cat <<EOF
+/* Free a gdbarch struct. This should never happen in normal
+ operation --- once you've created a gdbarch, you keep it around.
+ However, if an architecture's init function encounters an error
+ building the structure, it may need to clean up a partially
+ constructed gdbarch. */
+void
+gdbarch_free (struct gdbarch *arch)
+{
+ /* At the moment, this is trivial. */
+ free (arch);
+}
+EOF
+
# verify a new architecture
echo ""
echo ""
internal_error ("verify_gdbarch: bfd_arch_info unset");
/* Check those that need to be defined for the given multi-arch level. */
EOF
-function_list | while eval read $read
+function_list | while do_read # eval read $read
do
- case "${class}" in
- "f" | "v" )
- if [ "${invalid_p}" ]
+ if class_is_function_p || class_is_variable_p
+ then
+ if [ "${invalid_p}" = "0" ]
then
- echo " if ((GDB_MULTI_ARCH >= ${level})"
- echo " && (${invalid_p}))"
- echo " internal_error (\"gdbarch: verify_gdbarch: ${function} invalid\");"
- elif [ "${init}" ]
+ echo " /* Skip verify of ${function}, invalid_p == 0 */"
+ elif class_is_predicate_p
then
- echo " if ((GDB_MULTI_ARCH >= ${level})"
- echo " && (gdbarch->${function} == ${init}))"
- echo " internal_error (\"gdbarch: verify_gdbarch: ${function} invalid\");"
+ echo " /* Skip verify of ${function}, has predicate */"
+ elif [ "${invalid_p}" ]
+ then
+ echo " if ((GDB_MULTI_ARCH >= ${level})"
+ echo " && (${invalid_p}))"
+ echo " internal_error (\"gdbarch: verify_gdbarch: ${function} invalid\");"
+ elif [ "${default}" ]
+ then
+ echo " if ((GDB_MULTI_ARCH >= ${level})"
+ echo " && (gdbarch->${function} == ${default}))"
+ echo " internal_error (\"gdbarch: verify_gdbarch: ${function} invalid\");"
fi
- ;;
- esac
+ fi
done
cat <<EOF
}
gdbarch_dump (void)
{
EOF
-function_list | while eval read $read
+function_list | while do_read # eval read $read
do
- case "${class}" in
- "f" )
+ echo "#ifdef ${macro}"
+ if class_is_function_p
+ then
echo " fprintf_unfiltered (gdb_stdlog,"
echo " \"gdbarch_update: ${macro} = 0x%08lx\\n\","
echo " (long) current_gdbarch->${function}"
echo " /*${macro} ()*/);"
- ;;
- * )
- test "${fmt}" || fmt="%ld"
- test "${print}" || print="(long) ${macro}"
- if [ "${print_p}" = "#" ]
- then
- echo "#ifdef ${macro}"
- echo " fprintf_unfiltered (gdb_stdlog,"
- echo " \"gdbarch_update: ${macro} = ${fmt}\\n\","
- echo " ${print});"
- echo "#endif"
- elif [ "${print_p}" ]
+ else
+ if [ "${print_p}" ]
then
echo " if (${print_p})"
echo " fprintf_unfiltered (gdb_stdlog,"
echo " \"gdbarch_update: ${macro} = ${fmt}\\n\","
echo " ${print});"
fi
- ;;
- esac
+ fi
+ echo "#endif"
done
-echo "}"
+cat <<EOF
+ fprintf_unfiltered (gdb_stdlog,
+ "gdbarch_update: GDB_MULTI_ARCH = %d\\n",
+ GDB_MULTI_ARCH);
+}
+EOF
# GET/SET
gdbarch_tdep (struct gdbarch *gdbarch)
{
if (gdbarch_debug >= 2)
- /* FIXME: gdb_std??? */
fprintf_unfiltered (gdb_stdlog, "gdbarch_tdep called\n");
return gdbarch->tdep;
}
EOF
echo ""
-function_list | while eval read $read
+function_list | while do_read # eval read $read
do
- case "${class}" in
- "f" )
+ if class_is_predicate_p
+ then
+ echo ""
+ echo "int"
+ echo "gdbarch_${function}_p (struct gdbarch *gdbarch)"
+ echo "{"
+ if [ "${valid_p}" ]
+ then
+ echo " return ${valid_p};"
+ else
+ echo "#error \"gdbarch_${function}_p: not defined\""
+ fi
+ echo "}"
+ fi
+ if class_is_function_p
+ then
echo ""
echo "${returntype}"
if [ "${formal}" = "void" ]
echo " if (gdbarch->${function} == 0)"
echo " internal_error (\"gdbarch: gdbarch_${function} invalid\");"
echo " if (gdbarch_debug >= 2)"
- echo " /* FIXME: gdb_std??? */"
echo " fprintf_unfiltered (gdb_stdlog, \"gdbarch_${function} called\n\");"
test "${actual}" = "-" && actual=""
if [ "${returntype}" = "void" ]
echo "{"
echo " gdbarch->${function} = ${function};"
echo "}"
- ;;
- "v" )
+ elif class_is_variable_p
+ then
echo ""
echo "${returntype}"
echo "gdbarch_${function} (struct gdbarch *gdbarch)"
echo "{"
- if [ "${invalid_p}" ]
+ if [ "${invalid_p}" = "0" ]
+ then
+ echo " /* Skip verify of ${function}, invalid_p == 0 */"
+ elif [ "${invalid_p}" ]
then
echo " if (${invalid_p})"
echo " internal_error (\"gdbarch: gdbarch_${function} invalid\");"
- elif [ "${init}" ]
+ elif [ "${default}" ]
then
- echo " if (gdbarch->${function} == ${init})"
+ echo " if (gdbarch->${function} == ${default})"
echo " internal_error (\"gdbarch: gdbarch_${function} invalid\");"
fi
echo " if (gdbarch_debug >= 2)"
- echo " /* FIXME: gdb_std??? */"
echo " fprintf_unfiltered (gdb_stdlog, \"gdbarch_${function} called\n\");"
echo " return gdbarch->${function};"
echo "}"
echo "{"
echo " gdbarch->${function} = ${function};"
echo "}"
- ;;
- "i" )
+ elif class_is_info_p
+ then
echo ""
echo "${returntype}"
echo "gdbarch_${function} (struct gdbarch *gdbarch)"
echo "{"
echo " if (gdbarch_debug >= 2)"
- echo " /* FIXME: gdb_std??? */"
echo " fprintf_unfiltered (gdb_stdlog, \"gdbarch_${function} called\n\");"
echo " return gdbarch->${function};"
echo "}"
- ;;
- esac
+ fi
done
# All the trailing guff
return 0;
}
+
/* Disassembler */
/* Pointer to the target-dependent disassembly function. */
}
-#if defined (CALL_DUMMY)
-/* FIXME - this should go away */
-LONGEST call_dummy_words[] = CALL_DUMMY;
-int sizeof_call_dummy_words = sizeof (call_dummy_words);
-#endif
-
-
/* Initialize the current architecture. */
void
initialize_current_architecture ()
void
_initialize_gdbarch ()
{
+ struct cmd_list_element *c;
+
add_prefix_cmd ("endian", class_support, set_endian,
"Set endianness of target.",
&endianlist, "set endian ", 0, &setlist);
tm_print_insn_info.memory_error_func = dis_asm_memory_error;
tm_print_insn_info.print_address_func = dis_asm_print_address;
- add_show_from_set (add_set_cmd ("archdebug",
+ add_show_from_set (add_set_cmd ("arch",
class_maintenance,
var_zinteger,
(char *)&gdbarch_debug,
"Set architecture debugging.\n\\
-When non-zero, architecture debugging is enabled.", &setlist),
- &showlist);
+When non-zero, architecture debugging is enabled.", &setdebuglist),
+ &showdebuglist);
+ c = add_set_cmd ("archdebug",
+ class_maintenance,
+ var_zinteger,
+ (char *)&gdbarch_debug,
+ "Set architecture debugging.\n\\
+When non-zero, architecture debugging is enabled.", &setlist);
+
+ deprecate_cmd (c, "set debug arch");
+ deprecate_cmd (add_show_from_set (c, &showlist), "show debug arch");
}
EOF
# close things off
exec 1>&2
#../move-if-change new-gdbarch.c gdbarch.c
-if ! test -r gdbarch.c
-then
- echo "gdbarch.c missing? cp new-gdbarch.c gdbarch.c" 1>&2
-elif diff -c gdbarch.c new-gdbarch.c
-then
- echo "gdbarch.c unchanged" 1>&2
-else
- echo "gdbarch.c has changed? cp new-gdbarch.c gdbarch.c" 1>&2
-fi
+compare_new gdbarch.c