diff options
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/gdbarch.c | 16 | ||||
| -rw-r--r-- | gdb/gdbarch.h | 8 | ||||
| -rwxr-xr-x | gdb/gdbarch.sh | 8 |
4 files changed, 14 insertions, 24 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a603fdf..bec72c3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2000-04-27 Michael Snyder <msnyder@seadog.cygnus.com> + + * gdbarch.sh (d10v_daddr_p, d10v_iaddr_p, d10v_convert_daddr_to_raw, + d10v_convert_iaddr_to_raw): make these multi-arch functions optional. + * gdbarch.c, gdbarch.h: regenerate + Fri Apr 28 12:21:28 2000 Andrew Cagney <cagney@b1.cygnus.com> From Tim Mooney <mooney@dogbert.cc.ndsu.nodak.edu>: diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index b14cee8..a1c14d6 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -553,18 +553,10 @@ verify_gdbarch (struct gdbarch *gdbarch) internal_error ("gdbarch: verify_gdbarch: pop_frame invalid"); /* Skip verify of d10v_make_daddr, invalid_p == 0 */ /* Skip verify of d10v_make_iaddr, invalid_p == 0 */ - if ((GDB_MULTI_ARCH >= 2) - && (gdbarch->d10v_daddr_p == 0)) - internal_error ("gdbarch: verify_gdbarch: d10v_daddr_p invalid"); - if ((GDB_MULTI_ARCH >= 2) - && (gdbarch->d10v_iaddr_p == 0)) - internal_error ("gdbarch: verify_gdbarch: d10v_iaddr_p invalid"); - if ((GDB_MULTI_ARCH >= 2) - && (gdbarch->d10v_convert_daddr_to_raw == 0)) - internal_error ("gdbarch: verify_gdbarch: d10v_convert_daddr_to_raw invalid"); - if ((GDB_MULTI_ARCH >= 2) - && (gdbarch->d10v_convert_iaddr_to_raw == 0)) - internal_error ("gdbarch: verify_gdbarch: d10v_convert_iaddr_to_raw invalid"); + /* Skip verify of d10v_daddr_p, invalid_p == 0 */ + /* Skip verify of d10v_iaddr_p, invalid_p == 0 */ + /* Skip verify of d10v_convert_daddr_to_raw, invalid_p == 0 */ + /* Skip verify of d10v_convert_iaddr_to_raw, invalid_p == 0 */ if ((GDB_MULTI_ARCH >= 2) && (gdbarch->store_struct_return == 0)) internal_error ("gdbarch: verify_gdbarch: store_struct_return invalid"); diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index 6ed0856..f7f88d2 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -571,38 +571,30 @@ extern void set_gdbarch_d10v_make_iaddr (struct gdbarch *gdbarch, gdbarch_d10v_m typedef int (gdbarch_d10v_daddr_p_ftype) (CORE_ADDR x); extern int gdbarch_d10v_daddr_p (struct gdbarch *gdbarch, CORE_ADDR x); extern void set_gdbarch_d10v_daddr_p (struct gdbarch *gdbarch, gdbarch_d10v_daddr_p_ftype *d10v_daddr_p); -#if GDB_MULTI_ARCH #if (GDB_MULTI_ARCH > 1) || !defined (D10V_DADDR_P) #define D10V_DADDR_P(x) (gdbarch_d10v_daddr_p (current_gdbarch, x)) #endif -#endif typedef int (gdbarch_d10v_iaddr_p_ftype) (CORE_ADDR x); extern int gdbarch_d10v_iaddr_p (struct gdbarch *gdbarch, CORE_ADDR x); extern void set_gdbarch_d10v_iaddr_p (struct gdbarch *gdbarch, gdbarch_d10v_iaddr_p_ftype *d10v_iaddr_p); -#if GDB_MULTI_ARCH #if (GDB_MULTI_ARCH > 1) || !defined (D10V_IADDR_P) #define D10V_IADDR_P(x) (gdbarch_d10v_iaddr_p (current_gdbarch, x)) #endif -#endif typedef CORE_ADDR (gdbarch_d10v_convert_daddr_to_raw_ftype) (CORE_ADDR x); extern CORE_ADDR gdbarch_d10v_convert_daddr_to_raw (struct gdbarch *gdbarch, CORE_ADDR x); extern void set_gdbarch_d10v_convert_daddr_to_raw (struct gdbarch *gdbarch, gdbarch_d10v_convert_daddr_to_raw_ftype *d10v_convert_daddr_to_raw); -#if GDB_MULTI_ARCH #if (GDB_MULTI_ARCH > 1) || !defined (D10V_CONVERT_DADDR_TO_RAW) #define D10V_CONVERT_DADDR_TO_RAW(x) (gdbarch_d10v_convert_daddr_to_raw (current_gdbarch, x)) #endif -#endif typedef CORE_ADDR (gdbarch_d10v_convert_iaddr_to_raw_ftype) (CORE_ADDR x); extern CORE_ADDR gdbarch_d10v_convert_iaddr_to_raw (struct gdbarch *gdbarch, CORE_ADDR x); extern void set_gdbarch_d10v_convert_iaddr_to_raw (struct gdbarch *gdbarch, gdbarch_d10v_convert_iaddr_to_raw_ftype *d10v_convert_iaddr_to_raw); -#if GDB_MULTI_ARCH #if (GDB_MULTI_ARCH > 1) || !defined (D10V_CONVERT_IADDR_TO_RAW) #define D10V_CONVERT_IADDR_TO_RAW(x) (gdbarch_d10v_convert_iaddr_to_raw (current_gdbarch, x)) #endif -#endif typedef void (gdbarch_store_struct_return_ftype) (CORE_ADDR addr, CORE_ADDR sp); extern void gdbarch_store_struct_return (struct gdbarch *gdbarch, CORE_ADDR addr, CORE_ADDR sp); diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index c743e15..9e97f17 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -288,10 +288,10 @@ 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 -f:2:D10V_IADDR_P:int:d10v_iaddr_p:CORE_ADDR x:x:::0 -f:2:D10V_CONVERT_DADDR_TO_RAW:CORE_ADDR:d10v_convert_daddr_to_raw:CORE_ADDR x:x:::0 -f:2:D10V_CONVERT_IADDR_TO_RAW:CORE_ADDR:d10v_convert_iaddr_to_raw:CORE_ADDR x:x:::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 |