From a79378d4510226bd2df9e6eb776c125bdb875755 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Wed, 23 May 2012 11:34:56 +0000 Subject: [PATCH] 2012-05-23 Pedro Alves * arch-utils.h (default_target_signal_to_host): Delete. * arch-utils.c (default_target_signal_to_host): Delete. * gdbarch.sh (target_signal_to_host): Remove. * gdbarch.h, gdbarch.c: Regenerate. --- gdb/ChangeLog | 7 +++++++ gdb/arch-utils.c | 6 ------ gdb/arch-utils.h | 2 -- gdb/gdbarch.c | 24 ------------------------ gdb/gdbarch.h | 7 ------- gdb/gdbarch.sh | 3 --- 6 files changed, 7 insertions(+), 42 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 98ffd2f5fe..ac52d5d254 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2012-05-23 Pedro Alves + + * arch-utils.h (default_target_signal_to_host): Delete. + * arch-utils.c (default_target_signal_to_host): Delete. + * gdbarch.sh (target_signal_to_host): Remove. + * gdbarch.h, gdbarch.c: Regenerate. + 2012-05-22 Doug Evans * dwarf2-frame.c (struct dwarf2_cie): Make initial_instructions, end diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c index fabb515a64..c6866a9afd 100644 --- a/gdb/arch-utils.c +++ b/gdb/arch-utils.c @@ -793,12 +793,6 @@ default_gen_return_address (struct gdbarch *gdbarch, error (_("This architecture has no method to collect a return address.")); } -int -default_target_signal_to_host (struct gdbarch *gdbarch, enum target_signal ts) -{ - return target_signal_to_host (ts); -} - enum target_signal default_target_signal_from_host (struct gdbarch *gdbarch, int signo) { diff --git a/gdb/arch-utils.h b/gdb/arch-utils.h index c2c339860a..8f4763559d 100644 --- a/gdb/arch-utils.h +++ b/gdb/arch-utils.h @@ -174,7 +174,5 @@ extern const char *default_auto_wide_charset (void); extern enum target_signal default_target_signal_from_host (struct gdbarch *, int); -extern int default_target_signal_to_host (struct gdbarch *, - enum target_signal); #endif diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index af2033b7e5..8d009f344d 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -261,7 +261,6 @@ struct gdbarch gdbarch_process_record_ftype *process_record; gdbarch_process_record_signal_ftype *process_record_signal; gdbarch_target_signal_from_host_ftype *target_signal_from_host; - gdbarch_target_signal_to_host_ftype *target_signal_to_host; gdbarch_get_siginfo_type_ftype *get_siginfo_type; gdbarch_record_special_symbol_ftype *record_special_symbol; gdbarch_get_syscall_number_ftype *get_syscall_number; @@ -429,7 +428,6 @@ struct gdbarch startup_gdbarch = 0, /* process_record */ 0, /* process_record_signal */ default_target_signal_from_host, /* target_signal_from_host */ - default_target_signal_to_host, /* target_signal_to_host */ 0, /* get_siginfo_type */ 0, /* record_special_symbol */ 0, /* get_syscall_number */ @@ -539,7 +537,6 @@ gdbarch_alloc (const struct gdbarch_info *info, gdbarch->displaced_step_location = NULL; gdbarch->relocate_instruction = NULL; gdbarch->target_signal_from_host = default_target_signal_from_host; - gdbarch->target_signal_to_host = default_target_signal_to_host; gdbarch->has_shared_address_space = default_has_shared_address_space; gdbarch->fast_tracepoint_valid_at = default_fast_tracepoint_valid_at; gdbarch->auto_charset = default_auto_charset; @@ -731,7 +728,6 @@ verify_gdbarch (struct gdbarch *gdbarch) /* Skip verify of process_record, has predicate. */ /* Skip verify of process_record_signal, has predicate. */ /* Skip verify of target_signal_from_host, invalid_p == 0 */ - /* Skip verify of target_signal_to_host, invalid_p == 0 */ /* Skip verify of get_siginfo_type, has predicate. */ /* Skip verify of record_special_symbol, has predicate. */ /* Skip verify of get_syscall_number, has predicate. */ @@ -1344,9 +1340,6 @@ gdbarch_dump (struct gdbarch *gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: target_signal_from_host = <%s>\n", host_address_to_string (gdbarch->target_signal_from_host)); - fprintf_unfiltered (file, - "gdbarch_dump: target_signal_to_host = <%s>\n", - host_address_to_string (gdbarch->target_signal_to_host)); fprintf_unfiltered (file, "gdbarch_dump: gdbarch_unwind_pc_p() = %d\n", gdbarch_unwind_pc_p (gdbarch)); @@ -3811,23 +3804,6 @@ set_gdbarch_target_signal_from_host (struct gdbarch *gdbarch, gdbarch->target_signal_from_host = target_signal_from_host; } -int -gdbarch_target_signal_to_host (struct gdbarch *gdbarch, enum target_signal ts) -{ - gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->target_signal_to_host != NULL); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_target_signal_to_host called\n"); - return gdbarch->target_signal_to_host (gdbarch, ts); -} - -void -set_gdbarch_target_signal_to_host (struct gdbarch *gdbarch, - gdbarch_target_signal_to_host_ftype target_signal_to_host) -{ - gdbarch->target_signal_to_host = target_signal_to_host; -} - int gdbarch_get_siginfo_type_p (struct gdbarch *gdbarch) { diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index 5bc4f4d8c1..4388a7d572 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -946,13 +946,6 @@ typedef enum target_signal (gdbarch_target_signal_from_host_ftype) (struct gdbar extern enum target_signal gdbarch_target_signal_from_host (struct gdbarch *gdbarch, int signo); extern void set_gdbarch_target_signal_from_host (struct gdbarch *gdbarch, gdbarch_target_signal_from_host_ftype *target_signal_from_host); -/* Signal translation: translate GDB's signal number into inferior's host - signal number. */ - -typedef int (gdbarch_target_signal_to_host_ftype) (struct gdbarch *gdbarch, enum target_signal ts); -extern int gdbarch_target_signal_to_host (struct gdbarch *gdbarch, enum target_signal ts); -extern void set_gdbarch_target_signal_to_host (struct gdbarch *gdbarch, gdbarch_target_signal_to_host_ftype *target_signal_to_host); - /* Extra signal info inspection. Return a type suitable to inspect extra signal information. */ diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index 3e3b126c21..9394677afd 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -775,9 +775,6 @@ M:int:process_record_signal:struct regcache *regcache, enum target_signal signal # Signal translation: translate inferior's signal (host's) number into # GDB's representation. m:enum target_signal:target_signal_from_host:int signo:signo::default_target_signal_from_host::0 -# Signal translation: translate GDB's signal number into inferior's host -# signal number. -m:int:target_signal_to_host:enum target_signal ts:ts::default_target_signal_to_host::0 # Extra signal info inspection. #