diff options
Diffstat (limited to 'gdb/gdbarch.c')
| -rw-r--r-- | gdb/gdbarch.c | 57 |
1 files changed, 36 insertions, 21 deletions
diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 0f6e415..1ee401f 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -217,7 +217,7 @@ struct gdbarch CORE_ADDR function_start_offset; gdbarch_remote_translate_xfer_address_ftype *remote_translate_xfer_address; CORE_ADDR frame_args_skip; - gdbarch_frameless_function_invocation_ftype *frameless_function_invocation; + gdbarch_deprecated_frameless_function_invocation_ftype *deprecated_frameless_function_invocation; gdbarch_deprecated_frame_chain_ftype *deprecated_frame_chain; gdbarch_deprecated_frame_chain_valid_ftype *deprecated_frame_chain_valid; gdbarch_deprecated_frame_saved_pc_ftype *deprecated_frame_saved_pc; @@ -384,7 +384,7 @@ struct gdbarch startup_gdbarch = 0, /* function_start_offset */ generic_remote_translate_xfer_address, /* remote_translate_xfer_address */ 0, /* frame_args_skip */ - 0, /* frameless_function_invocation */ + 0, /* deprecated_frameless_function_invocation */ 0, /* deprecated_frame_chain */ 0, /* deprecated_frame_chain_valid */ 0, /* deprecated_frame_saved_pc */ @@ -512,7 +512,6 @@ gdbarch_alloc (const struct gdbarch_info *info, current_gdbarch->memory_insert_breakpoint = default_memory_insert_breakpoint; current_gdbarch->memory_remove_breakpoint = default_memory_remove_breakpoint; current_gdbarch->remote_translate_xfer_address = generic_remote_translate_xfer_address; - current_gdbarch->frameless_function_invocation = generic_frameless_function_invocation_not; current_gdbarch->deprecated_frame_args_address = get_frame_base; current_gdbarch->deprecated_frame_locals_address = get_frame_base; current_gdbarch->stabs_argument_has_addr = default_stabs_argument_has_addr; @@ -690,7 +689,7 @@ verify_gdbarch (struct gdbarch *current_gdbarch) /* Skip verify of function_start_offset, invalid_p == 0 */ /* Skip verify of remote_translate_xfer_address, invalid_p == 0 */ /* Skip verify of frame_args_skip, invalid_p == 0 */ - /* Skip verify of frameless_function_invocation, invalid_p == 0 */ + /* Skip verify of deprecated_frameless_function_invocation, has predicate */ /* Skip verify of deprecated_frame_chain, has predicate */ /* Skip verify of deprecated_frame_chain_valid, has predicate */ /* Skip verify of deprecated_frame_saved_pc, has predicate */ @@ -1079,6 +1078,25 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file) "gdbarch_dump: DEPRECATED_FP_REGNUM = %d\n", DEPRECATED_FP_REGNUM); #endif +#ifdef DEPRECATED_FRAMELESS_FUNCTION_INVOCATION_P + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "DEPRECATED_FRAMELESS_FUNCTION_INVOCATION_P()", + XSTRING (DEPRECATED_FRAMELESS_FUNCTION_INVOCATION_P ())); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_FRAMELESS_FUNCTION_INVOCATION_P() = %d\n", + DEPRECATED_FRAMELESS_FUNCTION_INVOCATION_P ()); +#endif +#ifdef DEPRECATED_FRAMELESS_FUNCTION_INVOCATION + fprintf_unfiltered (file, + "gdbarch_dump: %s # %s\n", + "DEPRECATED_FRAMELESS_FUNCTION_INVOCATION(fi)", + XSTRING (DEPRECATED_FRAMELESS_FUNCTION_INVOCATION (fi))); + fprintf_unfiltered (file, + "gdbarch_dump: DEPRECATED_FRAMELESS_FUNCTION_INVOCATION = <0x%08lx>\n", + (long) current_gdbarch->deprecated_frameless_function_invocation + /*DEPRECATED_FRAMELESS_FUNCTION_INVOCATION ()*/); +#endif #ifdef DEPRECATED_FRAME_ARGS_ADDRESS_P fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", @@ -1746,16 +1764,6 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file) "gdbarch_dump: FP0_REGNUM = %d\n", FP0_REGNUM); #endif -#ifdef FRAMELESS_FUNCTION_INVOCATION - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "FRAMELESS_FUNCTION_INVOCATION(fi)", - XSTRING (FRAMELESS_FUNCTION_INVOCATION (fi))); - fprintf_unfiltered (file, - "gdbarch_dump: FRAMELESS_FUNCTION_INVOCATION = <0x%08lx>\n", - (long) current_gdbarch->frameless_function_invocation - /*FRAMELESS_FUNCTION_INVOCATION ()*/); -#endif #ifdef FRAME_ARGS_SKIP fprintf_unfiltered (file, "gdbarch_dump: FRAME_ARGS_SKIP # %s\n", @@ -4475,20 +4483,27 @@ set_gdbarch_frame_args_skip (struct gdbarch *gdbarch, } int -gdbarch_frameless_function_invocation (struct gdbarch *gdbarch, struct frame_info *fi) +gdbarch_deprecated_frameless_function_invocation_p (struct gdbarch *gdbarch) +{ + gdb_assert (gdbarch != NULL); + return gdbarch->deprecated_frameless_function_invocation != NULL; +} + +int +gdbarch_deprecated_frameless_function_invocation (struct gdbarch *gdbarch, struct frame_info *fi) { gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->frameless_function_invocation != NULL); + gdb_assert (gdbarch->deprecated_frameless_function_invocation != NULL); if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_frameless_function_invocation called\n"); - return gdbarch->frameless_function_invocation (fi); + fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_frameless_function_invocation called\n"); + return gdbarch->deprecated_frameless_function_invocation (fi); } void -set_gdbarch_frameless_function_invocation (struct gdbarch *gdbarch, - gdbarch_frameless_function_invocation_ftype frameless_function_invocation) +set_gdbarch_deprecated_frameless_function_invocation (struct gdbarch *gdbarch, + gdbarch_deprecated_frameless_function_invocation_ftype deprecated_frameless_function_invocation) { - gdbarch->frameless_function_invocation = frameless_function_invocation; + gdbarch->deprecated_frameless_function_invocation = deprecated_frameless_function_invocation; } int |