diff options
| -rw-r--r-- | gdb/ChangeLog | 23 | ||||
| -rw-r--r-- | gdb/findvar.c | 8 | ||||
| -rw-r--r-- | gdb/gdbarch.c | 26 | ||||
| -rw-r--r-- | gdb/gdbarch.h | 73 | ||||
| -rwxr-xr-x | gdb/gdbarch.sh | 47 | ||||
| -rw-r--r-- | gdb/mem-break.c | 8 | ||||
| -rw-r--r-- | gdb/remote.c | 5 | ||||
| -rw-r--r-- | gdb/target.h | 4 | ||||
| -rw-r--r-- | gdb/valops.c | 12 |
9 files changed, 49 insertions, 157 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 2f64be3..afa5592 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,26 @@ +Mon Apr 17 11:26:01 2000 Andrew Cagney <cagney@b1.cygnus.com> + + * remote.c (REMOTE_TRANSLATE_XFER_ADDRESS), mem-break.c + (MEMORY_INSERT_BREAKPOINT, MEMORY_REMOVE_BREAKPOINT), target.h + (BREAKPOINT_FROM_PC), valops.c (COERCE_FLOAT_TO_DOUBLE), + gdbarch.sh (D10V_MAKE_DADDR, D10V_MAKE_IADDR, + FRAMELESS_FUNCTION_INVOCATION, REGISTER_CONVERTIBLE, + REGISTER_CONVERT_TO_VIRTUAL, REGISTER_CONVERT_TO_RAW, + REGISTER_NAME), findvar.c (POINTER_TO_ADDRESS, + ADDRESS_TO_POINTER): Delete default definition. Handled by + gdbarch. + + * gdbarch.sh: Make multi-arch defaults, defaults for non- + multi-arch targets. + (REGISTER_NAME, COERCE_FLOAT_TO_DOUBLE, REGISTER_CONVERTIBLE, + REGISTER_CONVERT_TO_VIRTUAL, REGISTER_CONVERT_TO_RAW, + D10V_MAKE_DADDR, D10V_MAKE_IADDR, BREAKPOINT_FROM_PC, + MEMORY_INSERT_BREAKPOINT, MEMORY_REMOVE_BREAKPOINT, + REMOTE_TRANSLATE_XFER_ADDRESS, FRAMELESS_FUNCTION_INVOCATION): + Provide default/legacy implementation. + (REGISTER_NAMES, CALL_DUMMY): Allow legacy definition. + * gdbarch.h, gdbarch.c: Re-generate. + 2000-04-16 Jim Blandy <jimb@redhat.com> * findvar.c (store_typed_address, extract_typed_address): Fix diff --git a/gdb/findvar.c b/gdb/findvar.c index dd86904..3f3721f 100644 --- a/gdb/findvar.c +++ b/gdb/findvar.c @@ -192,10 +192,6 @@ extract_address (void *addr, int len) } -#ifndef POINTER_TO_ADDRESS -#define POINTER_TO_ADDRESS generic_pointer_to_address -#endif - /* Treat the bytes at BUF as a pointer of type TYPE, and return the address it represents. */ CORE_ADDR @@ -282,10 +278,6 @@ store_address (void *addr, int len, LONGEST val) } -#ifndef ADDRESS_TO_POINTER -#define ADDRESS_TO_POINTER generic_address_to_pointer -#endif - /* Store the address ADDR as a pointer of type TYPE at BUF, in target form. */ void diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 6b58760..ed05584 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -1316,6 +1316,8 @@ set_gdbarch_pc_regnum (struct gdbarch *gdbarch, char * gdbarch_register_name (struct gdbarch *gdbarch, int regnr) { + if (GDB_MULTI_ARCH == 0) + return legacy_register_name (regnr); if (gdbarch->register_name == 0) internal_error ("gdbarch: gdbarch_register_name invalid"); if (gdbarch_debug >= 2) @@ -1735,6 +1737,8 @@ set_gdbarch_believe_pcc_promotion_type (struct gdbarch *gdbarch, int gdbarch_coerce_float_to_double (struct gdbarch *gdbarch, struct type *formal, struct type *actual) { + if (GDB_MULTI_ARCH == 0) + return default_coerce_float_to_double (formal, actual); if (gdbarch->coerce_float_to_double == 0) internal_error ("gdbarch: gdbarch_coerce_float_to_double invalid"); if (gdbarch_debug >= 2) @@ -1769,6 +1773,8 @@ set_gdbarch_get_saved_register (struct gdbarch *gdbarch, int gdbarch_register_convertible (struct gdbarch *gdbarch, int nr) { + if (GDB_MULTI_ARCH == 0) + return generic_register_convertible_not (nr); if (gdbarch->register_convertible == 0) internal_error ("gdbarch: gdbarch_register_convertible invalid"); if (gdbarch_debug >= 2) @@ -1820,6 +1826,8 @@ set_gdbarch_register_convert_to_raw (struct gdbarch *gdbarch, CORE_ADDR gdbarch_pointer_to_address (struct gdbarch *gdbarch, struct type *type, char *buf) { + if (GDB_MULTI_ARCH == 0) + return generic_pointer_to_address (type, buf); if (gdbarch->pointer_to_address == 0) internal_error ("gdbarch: gdbarch_pointer_to_address invalid"); if (gdbarch_debug >= 2) @@ -1837,6 +1845,11 @@ set_gdbarch_pointer_to_address (struct gdbarch *gdbarch, void gdbarch_address_to_pointer (struct gdbarch *gdbarch, struct type *type, char *buf, CORE_ADDR addr) { + if (GDB_MULTI_ARCH == 0) + { + generic_address_to_pointer (type, buf, addr); + return; + } if (gdbarch->address_to_pointer == 0) internal_error ("gdbarch: gdbarch_address_to_pointer invalid"); if (gdbarch_debug >= 2) @@ -2177,6 +2190,8 @@ set_gdbarch_inner_than (struct gdbarch *gdbarch, unsigned char * gdbarch_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr, int *lenptr) { + if (GDB_MULTI_ARCH == 0) + return legacy_breakpoint_from_pc (pcptr, lenptr); if (gdbarch->breakpoint_from_pc == 0) internal_error ("gdbarch: gdbarch_breakpoint_from_pc invalid"); if (gdbarch_debug >= 2) @@ -2194,6 +2209,8 @@ set_gdbarch_breakpoint_from_pc (struct gdbarch *gdbarch, int gdbarch_memory_insert_breakpoint (struct gdbarch *gdbarch, CORE_ADDR addr, char *contents_cache) { + if (GDB_MULTI_ARCH == 0) + return default_memory_insert_breakpoint (addr, contents_cache); if (gdbarch->memory_insert_breakpoint == 0) internal_error ("gdbarch: gdbarch_memory_insert_breakpoint invalid"); if (gdbarch_debug >= 2) @@ -2211,6 +2228,8 @@ set_gdbarch_memory_insert_breakpoint (struct gdbarch *gdbarch, int gdbarch_memory_remove_breakpoint (struct gdbarch *gdbarch, CORE_ADDR addr, char *contents_cache) { + if (GDB_MULTI_ARCH == 0) + return default_memory_remove_breakpoint (addr, contents_cache); if (gdbarch->memory_remove_breakpoint == 0) internal_error ("gdbarch: gdbarch_memory_remove_breakpoint invalid"); if (gdbarch_debug >= 2) @@ -2262,6 +2281,11 @@ set_gdbarch_function_start_offset (struct gdbarch *gdbarch, void gdbarch_remote_translate_xfer_address (struct gdbarch *gdbarch, CORE_ADDR gdb_addr, int gdb_len, CORE_ADDR *rem_addr, int *rem_len) { + if (GDB_MULTI_ARCH == 0) + { + generic_remote_translate_xfer_address (gdb_addr, gdb_len, rem_addr, rem_len); + return; + } if (gdbarch->remote_translate_xfer_address == 0) internal_error ("gdbarch: gdbarch_remote_translate_xfer_address invalid"); if (gdbarch_debug >= 2) @@ -2296,6 +2320,8 @@ set_gdbarch_frame_args_skip (struct gdbarch *gdbarch, int gdbarch_frameless_function_invocation (struct gdbarch *gdbarch, struct frame_info *fi) { + if (GDB_MULTI_ARCH == 0) + return generic_frameless_function_invocation_not (fi); if (gdbarch->frameless_function_invocation == 0) internal_error ("gdbarch: gdbarch_frameless_function_invocation invalid"); if (gdbarch_debug >= 2) diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index 4f837c1..cc01e75 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -54,18 +54,6 @@ extern struct gdbarch *current_gdbarch; 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" #endif @@ -268,11 +256,9 @@ extern void set_gdbarch_pc_regnum (struct gdbarch *gdbarch, int pc_regnum); typedef char * (gdbarch_register_name_ftype) (int regnr); extern char * gdbarch_register_name (struct gdbarch *gdbarch, int regnr); extern void set_gdbarch_register_name (struct gdbarch *gdbarch, gdbarch_register_name_ftype *register_name); -#if GDB_MULTI_ARCH #if (GDB_MULTI_ARCH > 1) || !defined (REGISTER_NAME) #define REGISTER_NAME(regnr) (gdbarch_register_name (current_gdbarch, regnr)) #endif -#endif extern int gdbarch_register_size (struct gdbarch *gdbarch); extern void set_gdbarch_register_size (struct gdbarch *gdbarch, int register_size); @@ -476,11 +462,9 @@ extern void set_gdbarch_believe_pcc_promotion_type (struct gdbarch *gdbarch, int typedef int (gdbarch_coerce_float_to_double_ftype) (struct type *formal, struct type *actual); extern int gdbarch_coerce_float_to_double (struct gdbarch *gdbarch, struct type *formal, struct type *actual); extern void set_gdbarch_coerce_float_to_double (struct gdbarch *gdbarch, gdbarch_coerce_float_to_double_ftype *coerce_float_to_double); -#if GDB_MULTI_ARCH #if (GDB_MULTI_ARCH > 1) || !defined (COERCE_FLOAT_TO_DOUBLE) #define COERCE_FLOAT_TO_DOUBLE(formal, actual) (gdbarch_coerce_float_to_double (current_gdbarch, formal, actual)) #endif -#endif typedef void (gdbarch_get_saved_register_ftype) (char *raw_buffer, int *optimized, CORE_ADDR *addrp, struct frame_info *frame, int regnum, enum lval_type *lval); extern void gdbarch_get_saved_register (struct gdbarch *gdbarch, char *raw_buffer, int *optimized, CORE_ADDR *addrp, struct frame_info *frame, int regnum, enum lval_type *lval); @@ -494,47 +478,37 @@ extern void set_gdbarch_get_saved_register (struct gdbarch *gdbarch, gdbarch_get typedef int (gdbarch_register_convertible_ftype) (int nr); extern int gdbarch_register_convertible (struct gdbarch *gdbarch, int nr); extern void set_gdbarch_register_convertible (struct gdbarch *gdbarch, gdbarch_register_convertible_ftype *register_convertible); -#if GDB_MULTI_ARCH #if (GDB_MULTI_ARCH > 1) || !defined (REGISTER_CONVERTIBLE) #define REGISTER_CONVERTIBLE(nr) (gdbarch_register_convertible (current_gdbarch, nr)) #endif -#endif typedef void (gdbarch_register_convert_to_virtual_ftype) (int regnum, struct type *type, char *from, char *to); extern void gdbarch_register_convert_to_virtual (struct gdbarch *gdbarch, int regnum, struct type *type, char *from, char *to); extern void set_gdbarch_register_convert_to_virtual (struct gdbarch *gdbarch, gdbarch_register_convert_to_virtual_ftype *register_convert_to_virtual); -#if GDB_MULTI_ARCH #if (GDB_MULTI_ARCH > 1) || !defined (REGISTER_CONVERT_TO_VIRTUAL) #define REGISTER_CONVERT_TO_VIRTUAL(regnum, type, from, to) (gdbarch_register_convert_to_virtual (current_gdbarch, regnum, type, from, to)) #endif -#endif typedef void (gdbarch_register_convert_to_raw_ftype) (struct type *type, int regnum, char *from, char *to); extern void gdbarch_register_convert_to_raw (struct gdbarch *gdbarch, struct type *type, int regnum, char *from, char *to); extern void set_gdbarch_register_convert_to_raw (struct gdbarch *gdbarch, gdbarch_register_convert_to_raw_ftype *register_convert_to_raw); -#if GDB_MULTI_ARCH #if (GDB_MULTI_ARCH > 1) || !defined (REGISTER_CONVERT_TO_RAW) #define REGISTER_CONVERT_TO_RAW(type, regnum, from, to) (gdbarch_register_convert_to_raw (current_gdbarch, type, regnum, from, to)) #endif -#endif typedef CORE_ADDR (gdbarch_pointer_to_address_ftype) (struct type *type, char *buf); extern CORE_ADDR gdbarch_pointer_to_address (struct gdbarch *gdbarch, struct type *type, char *buf); extern void set_gdbarch_pointer_to_address (struct gdbarch *gdbarch, gdbarch_pointer_to_address_ftype *pointer_to_address); -#if GDB_MULTI_ARCH #if (GDB_MULTI_ARCH > 1) || !defined (POINTER_TO_ADDRESS) #define POINTER_TO_ADDRESS(type, buf) (gdbarch_pointer_to_address (current_gdbarch, type, buf)) #endif -#endif typedef void (gdbarch_address_to_pointer_ftype) (struct type *type, char *buf, CORE_ADDR addr); extern void gdbarch_address_to_pointer (struct gdbarch *gdbarch, struct type *type, char *buf, CORE_ADDR addr); extern void set_gdbarch_address_to_pointer (struct gdbarch *gdbarch, gdbarch_address_to_pointer_ftype *address_to_pointer); -#if GDB_MULTI_ARCH #if (GDB_MULTI_ARCH > 1) || !defined (ADDRESS_TO_POINTER) #define ADDRESS_TO_POINTER(type, buf, addr) (gdbarch_address_to_pointer (current_gdbarch, type, buf, addr)) #endif -#endif typedef void (gdbarch_extract_return_value_ftype) (struct type *type, char *regbuf, char *valbuf); extern void gdbarch_extract_return_value (struct gdbarch *gdbarch, struct type *type, char *regbuf, char *valbuf); @@ -584,20 +558,16 @@ extern void set_gdbarch_pop_frame (struct gdbarch *gdbarch, gdbarch_pop_frame_ft typedef CORE_ADDR (gdbarch_d10v_make_daddr_ftype) (CORE_ADDR x); extern CORE_ADDR gdbarch_d10v_make_daddr (struct gdbarch *gdbarch, CORE_ADDR x); extern void set_gdbarch_d10v_make_daddr (struct gdbarch *gdbarch, gdbarch_d10v_make_daddr_ftype *d10v_make_daddr); -#if GDB_MULTI_ARCH #if (GDB_MULTI_ARCH > 1) || !defined (D10V_MAKE_DADDR) #define D10V_MAKE_DADDR(x) (gdbarch_d10v_make_daddr (current_gdbarch, x)) #endif -#endif typedef CORE_ADDR (gdbarch_d10v_make_iaddr_ftype) (CORE_ADDR x); extern CORE_ADDR gdbarch_d10v_make_iaddr (struct gdbarch *gdbarch, CORE_ADDR x); extern void set_gdbarch_d10v_make_iaddr (struct gdbarch *gdbarch, gdbarch_d10v_make_iaddr_ftype *d10v_make_iaddr); -#if GDB_MULTI_ARCH #if (GDB_MULTI_ARCH > 1) || !defined (D10V_MAKE_IADDR) #define D10V_MAKE_IADDR(x) (gdbarch_d10v_make_iaddr (current_gdbarch, x)) #endif -#endif typedef int (gdbarch_d10v_daddr_p_ftype) (CORE_ADDR x); extern int gdbarch_d10v_daddr_p (struct gdbarch *gdbarch, CORE_ADDR x); @@ -710,29 +680,23 @@ extern void set_gdbarch_inner_than (struct gdbarch *gdbarch, gdbarch_inner_than_ typedef unsigned char * (gdbarch_breakpoint_from_pc_ftype) (CORE_ADDR *pcptr, int *lenptr); extern unsigned char * gdbarch_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr, int *lenptr); extern void set_gdbarch_breakpoint_from_pc (struct gdbarch *gdbarch, gdbarch_breakpoint_from_pc_ftype *breakpoint_from_pc); -#if GDB_MULTI_ARCH #if (GDB_MULTI_ARCH > 1) || !defined (BREAKPOINT_FROM_PC) #define BREAKPOINT_FROM_PC(pcptr, lenptr) (gdbarch_breakpoint_from_pc (current_gdbarch, pcptr, lenptr)) #endif -#endif typedef int (gdbarch_memory_insert_breakpoint_ftype) (CORE_ADDR addr, char *contents_cache); extern int gdbarch_memory_insert_breakpoint (struct gdbarch *gdbarch, CORE_ADDR addr, char *contents_cache); extern void set_gdbarch_memory_insert_breakpoint (struct gdbarch *gdbarch, gdbarch_memory_insert_breakpoint_ftype *memory_insert_breakpoint); -#if GDB_MULTI_ARCH #if (GDB_MULTI_ARCH > 1) || !defined (MEMORY_INSERT_BREAKPOINT) #define MEMORY_INSERT_BREAKPOINT(addr, contents_cache) (gdbarch_memory_insert_breakpoint (current_gdbarch, addr, contents_cache)) #endif -#endif typedef int (gdbarch_memory_remove_breakpoint_ftype) (CORE_ADDR addr, char *contents_cache); extern int gdbarch_memory_remove_breakpoint (struct gdbarch *gdbarch, CORE_ADDR addr, char *contents_cache); extern void set_gdbarch_memory_remove_breakpoint (struct gdbarch *gdbarch, gdbarch_memory_remove_breakpoint_ftype *memory_remove_breakpoint); -#if GDB_MULTI_ARCH #if (GDB_MULTI_ARCH > 1) || !defined (MEMORY_REMOVE_BREAKPOINT) #define MEMORY_REMOVE_BREAKPOINT(addr, contents_cache) (gdbarch_memory_remove_breakpoint (current_gdbarch, addr, contents_cache)) #endif -#endif extern CORE_ADDR gdbarch_decr_pc_after_break (struct gdbarch *gdbarch); extern void set_gdbarch_decr_pc_after_break (struct gdbarch *gdbarch, CORE_ADDR decr_pc_after_break); @@ -753,11 +717,9 @@ extern void set_gdbarch_function_start_offset (struct gdbarch *gdbarch, CORE_ADD typedef void (gdbarch_remote_translate_xfer_address_ftype) (CORE_ADDR gdb_addr, int gdb_len, CORE_ADDR *rem_addr, int *rem_len); extern void gdbarch_remote_translate_xfer_address (struct gdbarch *gdbarch, CORE_ADDR gdb_addr, int gdb_len, CORE_ADDR *rem_addr, int *rem_len); extern void set_gdbarch_remote_translate_xfer_address (struct gdbarch *gdbarch, gdbarch_remote_translate_xfer_address_ftype *remote_translate_xfer_address); -#if GDB_MULTI_ARCH #if (GDB_MULTI_ARCH > 1) || !defined (REMOTE_TRANSLATE_XFER_ADDRESS) #define REMOTE_TRANSLATE_XFER_ADDRESS(gdb_addr, gdb_len, rem_addr, rem_len) (gdbarch_remote_translate_xfer_address (current_gdbarch, gdb_addr, gdb_len, rem_addr, rem_len)) #endif -#endif extern CORE_ADDR gdbarch_frame_args_skip (struct gdbarch *gdbarch); extern void set_gdbarch_frame_args_skip (struct gdbarch *gdbarch, CORE_ADDR frame_args_skip); @@ -770,11 +732,9 @@ extern void set_gdbarch_frame_args_skip (struct gdbarch *gdbarch, CORE_ADDR fram typedef int (gdbarch_frameless_function_invocation_ftype) (struct frame_info *fi); extern int gdbarch_frameless_function_invocation (struct gdbarch *gdbarch, struct frame_info *fi); extern void set_gdbarch_frameless_function_invocation (struct gdbarch *gdbarch, gdbarch_frameless_function_invocation_ftype *frameless_function_invocation); -#if GDB_MULTI_ARCH #if (GDB_MULTI_ARCH > 1) || !defined (FRAMELESS_FUNCTION_INVOCATION) #define FRAMELESS_FUNCTION_INVOCATION(fi) (gdbarch_frameless_function_invocation (current_gdbarch, fi)) #endif -#endif typedef CORE_ADDR (gdbarch_frame_chain_ftype) (struct frame_info *frame); extern CORE_ADDR gdbarch_frame_chain (struct gdbarch *gdbarch, struct frame_info *frame); @@ -1087,31 +1047,6 @@ extern disassemble_info tm_print_insn_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 */ @@ -1125,14 +1060,6 @@ extern int generic_register_convertible_not (int reg_nr); #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 */ diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index 93d9871..d8ee81c 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -39,8 +39,6 @@ compare_new () default_is_fallback_p () { [ "${default}" != "" -a "${invalid_p}" = "0" ] - # FIXME: cagney - not until after 5.0 - false } # Format of the input table @@ -381,18 +379,6 @@ extern struct gdbarch *current_gdbarch; 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" #endif @@ -726,31 +712,6 @@ extern disassemble_info tm_print_insn_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 */ @@ -764,14 +725,6 @@ extern int generic_register_convertible_not (int reg_nr); #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 */ diff --git a/gdb/mem-break.c b/gdb/mem-break.c index 99db9d2..3f013c2 100644 --- a/gdb/mem-break.c +++ b/gdb/mem-break.c @@ -125,10 +125,6 @@ default_memory_remove_breakpoint (addr, contents_cache) } -#if !defined(MEMORY_INSERT_BREAKPOINT) -#define MEMORY_INSERT_BREAKPOINT(addr, contents_cache) \ - default_memory_insert_breakpoint(addr, contents_cache) -#endif int memory_insert_breakpoint (addr, contents_cache) CORE_ADDR addr; @@ -137,10 +133,6 @@ memory_insert_breakpoint (addr, contents_cache) return MEMORY_INSERT_BREAKPOINT(addr, contents_cache); } -#if !defined(MEMORY_REMOVE_BREAKPOINT) -#define MEMORY_REMOVE_BREAKPOINT(addr, contents_cache) \ - default_memory_remove_breakpoint(addr, contents_cache) -#endif int memory_remove_breakpoint (addr, contents_cache) CORE_ADDR addr; diff --git a/gdb/remote.c b/gdb/remote.c index 54d3b2c..00172b3 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -3596,11 +3596,6 @@ remote_read_bytes (memaddr, myaddr, len) SHOULD_WRITE is nonzero. Returns length of data written or read; 0 for error. */ -#ifndef REMOTE_TRANSLATE_XFER_ADDRESS -#define REMOTE_TRANSLATE_XFER_ADDRESS(MEM_ADDR, MEM_LEN, TARG_ADDR, TARG_LEN) \ - (*(TARG_ADDR) = (MEM_ADDR), *(TARG_LEN) = (MEM_LEN)) -#endif - /* ARGSUSED */ static int remote_xfer_memory (mem_addr, buffer, mem_len, should_write, target) diff --git a/gdb/target.h b/gdb/target.h index 07a94c0..ea819c0 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -1337,10 +1337,6 @@ extern int default_memory_remove_breakpoint PARAMS ((CORE_ADDR, char *)); extern int default_memory_insert_breakpoint PARAMS ((CORE_ADDR, char *)); extern breakpoint_from_pc_fn memory_breakpoint_from_pc; -#ifndef BREAKPOINT_FROM_PC -#define BREAKPOINT_FROM_PC(pcptr, lenptr) \ - memory_breakpoint_from_pc (pcptr, lenptr) -#endif /* From target.c */ diff --git a/gdb/valops.c b/gdb/valops.c index e734877..3198741 100644 --- a/gdb/valops.c +++ b/gdb/valops.c @@ -1128,18 +1128,6 @@ default_push_arguments (nargs, args, sp, struct_return, struct_addr) } -/* If we're calling a function declared without a prototype, should we - promote floats to doubles? FORMAL and ACTUAL are the types of the - arguments; FORMAL may be NULL. - - If we have no definition for this macro, either from the target or - from gdbarch, provide a default. */ -#ifndef COERCE_FLOAT_TO_DOUBLE -#define COERCE_FLOAT_TO_DOUBLE(formal, actual) \ - (default_coerce_float_to_double ((formal), (actual))) -#endif - - /* A default function for COERCE_FLOAT_TO_DOUBLE: do the coercion only when we don't have any type for the argument at hand. This occurs when we have no debug info, or when passing varargs. |