From f0a3766fdd080b4165be169f8ea8b003ca828742 Mon Sep 17 00:00:00 2001 From: kettenis Date: Sun, 14 Jan 2007 14:35:51 +0000 Subject: [PATCH] * frv-tdep.c (frv_gdbarch_init, frv_register_name) (frv_breakpoint_from_pc, frv_gdbarch_adjust_breakpoint_address) (frv_skip_prologue): Remove prototypes. (frv_adjust_breakpoint_address): Renamed from frv_gdbarch_adjust_breakpoint_address. (frv_gdbarch_init): Adjust. --- gdb/ChangeLog | 9 +++++++++ gdb/frv-tdep.c | 13 +++---------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0eacbc348d..86f330c733 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2007-01-14 Mark Kettenis + + * frv-tdep.c (frv_gdbarch_init, frv_register_name) + (frv_breakpoint_from_pc, frv_gdbarch_adjust_breakpoint_address) + (frv_skip_prologue): Remove prototypes. + (frv_adjust_breakpoint_address): Renamed from + frv_gdbarch_adjust_breakpoint_address. + (frv_gdbarch_init): Adjust. + 2007-01-13 Mark Kettenis * gdbarch.sh (deprecated_extract_return_value) diff --git a/gdb/frv-tdep.c b/gdb/frv-tdep.c index 9e974d4ac2..4945712c4a 100644 --- a/gdb/frv-tdep.c +++ b/gdb/frv-tdep.c @@ -43,14 +43,6 @@ extern void _initialize_frv_tdep (void); -static gdbarch_init_ftype frv_gdbarch_init; - -static gdbarch_register_name_ftype frv_register_name; -static gdbarch_breakpoint_from_pc_ftype frv_breakpoint_from_pc; -static gdbarch_adjust_breakpoint_address_ftype frv_gdbarch_adjust_breakpoint_address; -static gdbarch_skip_prologue_ftype frv_skip_prologue; - - struct frv_unwind_cache /* was struct frame_extra_info */ { /* The previous frame's inner-most stack address. Used as this @@ -443,7 +435,7 @@ static const int frv_instr_size = 4; constraint that a break instruction must not appear as any but the first instruction in the bundle. */ static CORE_ADDR -frv_gdbarch_adjust_breakpoint_address (struct gdbarch *gdbarch, CORE_ADDR bpaddr) +frv_adjust_breakpoint_address (struct gdbarch *gdbarch, CORE_ADDR bpaddr) { int count = max_instrs_per_bundle; CORE_ADDR addr = bpaddr - frv_instr_size; @@ -1505,7 +1497,8 @@ frv_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_skip_prologue (gdbarch, frv_skip_prologue); set_gdbarch_breakpoint_from_pc (gdbarch, frv_breakpoint_from_pc); - set_gdbarch_adjust_breakpoint_address (gdbarch, frv_gdbarch_adjust_breakpoint_address); + set_gdbarch_adjust_breakpoint_address + (gdbarch, frv_adjust_breakpoint_address); set_gdbarch_deprecated_use_struct_convention (gdbarch, always_use_struct_convention); set_gdbarch_extract_return_value (gdbarch, frv_extract_return_value); -- 2.11.0