X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fns32k-tdep.c;h=27d75999bca72536aab8f91738919279ef70cb5c;hb=0ba6dca974b6df1fc1ac67608815cf5a2603856d;hp=f9fe2949b8a98223be571d73b47daef141ae360d;hpb=516034834f1bcade05e3dcd85e9c7c8b899adbd6;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/ns32k-tdep.c b/gdb/ns32k-tdep.c index f9fe2949b8..27d75999bc 100644 --- a/gdb/ns32k-tdep.c +++ b/gdb/ns32k-tdep.c @@ -190,8 +190,8 @@ umax_frame_num_args (struct frame_info *fi) if (enter_addr > 0) { pc = ((enter_addr == 1) - ? SAVED_PC_AFTER_CALL (fi) - : FRAME_SAVED_PC (fi)); + ? DEPRECATED_SAVED_PC_AFTER_CALL (fi) + : DEPRECATED_FRAME_SAVED_PC (fi)); insn = read_memory_integer (pc, 2); addr_mode = (insn >> 11) & 0x1f; insn = insn & 0x7ff; @@ -311,7 +311,7 @@ ns32k_frame_chain (struct frame_info *frame) if (inside_entry_file (get_frame_pc (frame))) return 0; - return (read_memory_integer (frame->frame, 4)); + return (read_memory_integer (get_frame_base (frame), 4)); } @@ -325,9 +325,9 @@ ns32k_sigtramp_saved_pc (struct frame_info *frame) buf = alloca (ptrbytes); /* Get sigcontext address, it is the third parameter on the stack. */ - if (frame->next) + if (get_next_frame (frame)) sigcontext_addr = read_memory_typed_address - (FRAME_ARGS_ADDRESS (frame->next) + FRAME_ARGS_SKIP + sigcontext_offs, + (FRAME_ARGS_ADDRESS (get_next_frame (frame)) + FRAME_ARGS_SKIP + sigcontext_offs, builtin_type_void_data_ptr); else sigcontext_addr = read_memory_typed_address @@ -345,14 +345,14 @@ ns32k_frame_saved_pc (struct frame_info *frame) if ((get_frame_type (frame) == SIGTRAMP_FRAME)) return (ns32k_sigtramp_saved_pc (frame)); /* XXXJRT */ - return (read_memory_integer (frame->frame + 4, 4)); + return (read_memory_integer (get_frame_base (frame) + 4, 4)); } static CORE_ADDR ns32k_frame_args_address (struct frame_info *frame) { if (ns32k_get_enter_addr (get_frame_pc (frame)) > 1) - return (frame->frame); + return (get_frame_base (frame)); return (read_register (SP_REGNUM) - 4); } @@ -360,7 +360,7 @@ ns32k_frame_args_address (struct frame_info *frame) static CORE_ADDR ns32k_frame_locals_address (struct frame_info *frame) { - return (frame->frame); + return (get_frame_base (frame)); } /* Code to initialize the addresses of the saved registers of frame described @@ -385,7 +385,7 @@ ns32k_frame_init_saved_regs (struct frame_info *frame) { regmask = read_memory_integer (enter_addr + 1, 1) & 0xff; localcount = ns32k_localcount (enter_addr); - next_addr = frame->frame + localcount; + next_addr = get_frame_base (frame) + localcount; for (regnum = 0; regnum < 8; regnum++) { @@ -393,9 +393,9 @@ ns32k_frame_init_saved_regs (struct frame_info *frame) get_frame_saved_regs (frame)[regnum] = next_addr -= 4; } - get_frame_saved_regs (frame)[SP_REGNUM] = frame->frame + 4; - get_frame_saved_regs (frame)[PC_REGNUM] = frame->frame + 4; - get_frame_saved_regs (frame)[FP_REGNUM] = read_memory_integer (frame->frame, 4); + get_frame_saved_regs (frame)[SP_REGNUM] = get_frame_base (frame) + 4; + get_frame_saved_regs (frame)[PC_REGNUM] = get_frame_base (frame) + 4; + get_frame_saved_regs (frame)[DEPRECATED_FP_REGNUM] = read_memory_integer (get_frame_base (frame), 4); } else if (enter_addr == 1) { @@ -412,8 +412,8 @@ ns32k_push_dummy_frame (void) int regnum; sp = push_word (sp, read_register (PC_REGNUM)); - sp = push_word (sp, read_register (FP_REGNUM)); - write_register (FP_REGNUM, sp); + sp = push_word (sp, read_register (DEPRECATED_FP_REGNUM)); + write_register (DEPRECATED_FP_REGNUM, sp); for (regnum = 0; regnum < 8; regnum++) sp = push_word (sp, read_register (regnum)); @@ -428,15 +428,15 @@ ns32k_pop_frame (void) CORE_ADDR fp; int regnum; - fp = frame->frame; - FRAME_INIT_SAVED_REGS (frame); + fp = get_frame_base (frame); + DEPRECATED_FRAME_INIT_SAVED_REGS (frame); for (regnum = 0; regnum < 8; regnum++) if (get_frame_saved_regs (frame)[regnum]) write_register (regnum, read_memory_integer (get_frame_saved_regs (frame)[regnum], 4)); - write_register (FP_REGNUM, read_memory_integer (fp, 4)); + write_register (DEPRECATED_FP_REGNUM, read_memory_integer (fp, 4)); write_register (PC_REGNUM, read_memory_integer (fp + 4, 4)); write_register (SP_REGNUM, fp + 8); flush_cached_frames (); @@ -558,52 +558,50 @@ ns32k_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_register_size (gdbarch, NS32K_REGISTER_SIZE); set_gdbarch_register_raw_size (gdbarch, ns32k_register_raw_size); - set_gdbarch_max_register_raw_size (gdbarch, NS32K_MAX_REGISTER_RAW_SIZE); + set_gdbarch_deprecated_max_register_raw_size (gdbarch, NS32K_MAX_REGISTER_RAW_SIZE); set_gdbarch_register_virtual_size (gdbarch, ns32k_register_virtual_size); - set_gdbarch_max_register_virtual_size (gdbarch, + set_gdbarch_deprecated_max_register_virtual_size (gdbarch, NS32K_MAX_REGISTER_VIRTUAL_SIZE); set_gdbarch_register_virtual_type (gdbarch, ns32k_register_virtual_type); /* Frame and stack info */ set_gdbarch_skip_prologue (gdbarch, umax_skip_prologue); - set_gdbarch_saved_pc_after_call (gdbarch, ns32k_saved_pc_after_call); + set_gdbarch_deprecated_saved_pc_after_call (gdbarch, ns32k_saved_pc_after_call); set_gdbarch_frame_num_args (gdbarch, umax_frame_num_args); set_gdbarch_frameless_function_invocation (gdbarch, generic_frameless_function_invocation_not); - set_gdbarch_frame_chain (gdbarch, ns32k_frame_chain); - set_gdbarch_frame_saved_pc (gdbarch, ns32k_frame_saved_pc); + set_gdbarch_deprecated_frame_chain (gdbarch, ns32k_frame_chain); + set_gdbarch_deprecated_frame_saved_pc (gdbarch, ns32k_frame_saved_pc); set_gdbarch_frame_args_address (gdbarch, ns32k_frame_args_address); set_gdbarch_frame_locals_address (gdbarch, ns32k_frame_locals_address); - set_gdbarch_frame_init_saved_regs (gdbarch, ns32k_frame_init_saved_regs); + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, ns32k_frame_init_saved_regs); set_gdbarch_frame_args_skip (gdbarch, 8); set_gdbarch_inner_than (gdbarch, core_addr_lessthan); /* Return value info */ - set_gdbarch_store_struct_return (gdbarch, ns32k_store_struct_return); + set_gdbarch_deprecated_store_struct_return (gdbarch, ns32k_store_struct_return); set_gdbarch_deprecated_extract_return_value (gdbarch, ns32k_extract_return_value); set_gdbarch_deprecated_store_return_value (gdbarch, ns32k_store_return_value); set_gdbarch_deprecated_extract_struct_value_address (gdbarch, ns32k_extract_struct_value_address); /* Call dummy info */ - set_gdbarch_push_dummy_frame (gdbarch, ns32k_push_dummy_frame); - set_gdbarch_pop_frame (gdbarch, ns32k_pop_frame); + set_gdbarch_deprecated_push_dummy_frame (gdbarch, ns32k_push_dummy_frame); + set_gdbarch_deprecated_pop_frame (gdbarch, ns32k_pop_frame); set_gdbarch_call_dummy_location (gdbarch, ON_STACK); - set_gdbarch_call_dummy_p (gdbarch, 1); set_gdbarch_call_dummy_words (gdbarch, ns32k_call_dummy_words); set_gdbarch_sizeof_call_dummy_words (gdbarch, sizeof_ns32k_call_dummy_words); set_gdbarch_fix_call_dummy (gdbarch, ns32k_fix_call_dummy); set_gdbarch_call_dummy_start_offset (gdbarch, 3); - set_gdbarch_call_dummy_breakpoint_offset_p (gdbarch, 0); + set_gdbarch_call_dummy_breakpoint_offset (gdbarch, 15); set_gdbarch_deprecated_use_generic_dummy_frames (gdbarch, 0); set_gdbarch_deprecated_pc_in_call_dummy (gdbarch, deprecated_pc_in_call_dummy_on_stack); - set_gdbarch_call_dummy_stack_adjust_p (gdbarch, 0); /* Breakpoint info */ set_gdbarch_decr_pc_after_break (gdbarch, 0); @@ -612,6 +610,9 @@ ns32k_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) /* Misc info */ set_gdbarch_function_start_offset (gdbarch, 0); + /* Should be using push_dummy_call. */ + set_gdbarch_deprecated_dummy_write_sp (gdbarch, generic_target_write_sp); + /* Hook in OS ABI-specific overrides, if they have been registered. */ gdbarch_init_osabi (info, gdbarch); @@ -623,5 +624,5 @@ _initialize_ns32k_tdep (void) { gdbarch_register (bfd_arch_ns32k, ns32k_gdbarch_init, NULL); - tm_print_insn = print_insn_ns32k; + deprecated_tm_print_insn = print_insn_ns32k; }