From e963316fd5e5fc422afda43ff8f3409ea7144284 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Sun, 22 Feb 2004 17:01:04 +0000 Subject: [PATCH] 2004-02-22 Andrew Cagney * hppa-tdep.c (hppa_gdbarch_init): Convert compile time #if0s into runtime if(0). --- gdb/ChangeLog | 5 +++- gdb/hppa-tdep.c | 80 ++++++++++++++++++++++++++----------------------- 2 files changed, 47 insertions(+), 38 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 770aba1361b..f9eb986d04b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,9 +1,12 @@ 2004-02-22 Andrew Cagney + * hppa-tdep.c (hppa_gdbarch_init): Convert compile time #if0s into + runtime if(0). + * hppa-tdep.c (hppa_breakpoint_from_pc): Make "breakpoint" unsigned. (hppa_frame_find_saved_regs): Fix "std" instruction pattern - + * config/pa/tm-hppa.h: Update copyright. (DEPRECATED_INIT_FRAME_PC): Delete macro. (deprecated_init_frame_pc_default): Delete declaration. diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c index 94124798e10..61cfd57f72c 100644 --- a/gdb/hppa-tdep.c +++ b/gdb/hppa-tdep.c @@ -5186,46 +5186,52 @@ hppa_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_have_nonsteppable_watchpoint (gdbarch, 1); /* Inferior function call methods. */ -#if 0 -#else - switch (tdep->bytes_per_address) + if (0) { - case 4: - set_gdbarch_deprecated_call_dummy_length (gdbarch, hppa32_call_dummy_length); - set_gdbarch_deprecated_stack_align (gdbarch, hppa32_stack_align); - set_gdbarch_deprecated_reg_struct_has_addr (gdbarch, hppa_reg_struct_has_addr); - set_gdbarch_deprecated_extract_return_value (gdbarch, hppa32_extract_return_value); - set_gdbarch_use_struct_convention (gdbarch, hppa32_use_struct_convention); - set_gdbarch_deprecated_store_return_value (gdbarch, hppa32_store_return_value); - break; - case 8: - set_gdbarch_deprecated_call_dummy_breakpoint_offset (gdbarch, hppa64_call_dummy_breakpoint_offset); - set_gdbarch_deprecated_call_dummy_length (gdbarch, hppa64_call_dummy_length); - set_gdbarch_deprecated_stack_align (gdbarch, hppa64_stack_align); - set_gdbarch_deprecated_extract_return_value (gdbarch, hppa64_extract_return_value); - set_gdbarch_use_struct_convention (gdbarch, hppa64_use_struct_convention); - set_gdbarch_deprecated_store_return_value (gdbarch, hppa64_store_return_value); - break; } - set_gdbarch_deprecated_store_struct_return (gdbarch, hppa_store_struct_return); - set_gdbarch_deprecated_push_dummy_frame (gdbarch, hppa_push_dummy_frame); - /* set_gdbarch_deprecated_fix_call_dummy (gdbarch, hppa_fix_call_dummy); */ - set_gdbarch_deprecated_push_arguments (gdbarch, hppa_push_arguments); -#endif - + else + { + switch (tdep->bytes_per_address) + { + case 4: + set_gdbarch_deprecated_call_dummy_length (gdbarch, hppa32_call_dummy_length); + set_gdbarch_deprecated_stack_align (gdbarch, hppa32_stack_align); + set_gdbarch_deprecated_reg_struct_has_addr (gdbarch, hppa_reg_struct_has_addr); + set_gdbarch_deprecated_extract_return_value (gdbarch, hppa32_extract_return_value); + set_gdbarch_use_struct_convention (gdbarch, hppa32_use_struct_convention); + set_gdbarch_deprecated_store_return_value (gdbarch, hppa32_store_return_value); + break; + case 8: + set_gdbarch_deprecated_call_dummy_breakpoint_offset (gdbarch, hppa64_call_dummy_breakpoint_offset); + set_gdbarch_deprecated_call_dummy_length (gdbarch, hppa64_call_dummy_length); + set_gdbarch_deprecated_stack_align (gdbarch, hppa64_stack_align); + set_gdbarch_deprecated_extract_return_value (gdbarch, hppa64_extract_return_value); + set_gdbarch_use_struct_convention (gdbarch, hppa64_use_struct_convention); + set_gdbarch_deprecated_store_return_value (gdbarch, hppa64_store_return_value); + break; + } + set_gdbarch_deprecated_store_struct_return (gdbarch, hppa_store_struct_return); + set_gdbarch_deprecated_push_dummy_frame (gdbarch, hppa_push_dummy_frame); + /* set_gdbarch_deprecated_fix_call_dummy (gdbarch, hppa_fix_call_dummy); */ + set_gdbarch_deprecated_push_arguments (gdbarch, hppa_push_arguments); + } + /* Frame unwind methods. */ -#if 0 -#else - set_gdbarch_deprecated_saved_pc_after_call (gdbarch, hppa_saved_pc_after_call); - set_gdbarch_deprecated_init_frame_pc (gdbarch, deprecated_init_frame_pc_default); - set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, hppa_frame_init_saved_regs); - set_gdbarch_deprecated_init_extra_frame_info (gdbarch, hppa_init_extra_frame_info); - set_gdbarch_deprecated_frame_chain (gdbarch, hppa_frame_chain); - set_gdbarch_deprecated_frame_chain_valid (gdbarch, hppa_frame_chain_valid); - set_gdbarch_deprecated_frameless_function_invocation (gdbarch, hppa_frameless_function_invocation); - set_gdbarch_deprecated_frame_saved_pc (gdbarch, hppa_frame_saved_pc); - set_gdbarch_deprecated_pop_frame (gdbarch, hppa_pop_frame); -#endif + if (0) + { + } + else + { + set_gdbarch_deprecated_saved_pc_after_call (gdbarch, hppa_saved_pc_after_call); + set_gdbarch_deprecated_init_frame_pc (gdbarch, deprecated_init_frame_pc_default); + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, hppa_frame_init_saved_regs); + set_gdbarch_deprecated_init_extra_frame_info (gdbarch, hppa_init_extra_frame_info); + set_gdbarch_deprecated_frame_chain (gdbarch, hppa_frame_chain); + set_gdbarch_deprecated_frame_chain_valid (gdbarch, hppa_frame_chain_valid); + set_gdbarch_deprecated_frameless_function_invocation (gdbarch, hppa_frameless_function_invocation); + set_gdbarch_deprecated_frame_saved_pc (gdbarch, hppa_frame_saved_pc); + set_gdbarch_deprecated_pop_frame (gdbarch, hppa_pop_frame); + } /* Hook in ABI-specific overrides, if they have been registered. */ gdbarch_init_osabi (info, gdbarch); -- 2.30.2