diff options
Diffstat (limited to 'gdb/mn10300-tdep.c')
-rw-r--r-- | gdb/mn10300-tdep.c | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c index f185fdffb47..0753492d0fd 100644 --- a/gdb/mn10300-tdep.c +++ b/gdb/mn10300-tdep.c @@ -233,59 +233,59 @@ set_movm_offsets (struct frame_info *fi, int movm_args) /* The `other' bit leaves a blank area of four bytes at the beginning of its block of saved registers, making it 32 bytes long in total. */ - get_frame_saved_regs (fi)[LAR_REGNUM] = fi->frame + offset + 4; - get_frame_saved_regs (fi)[LIR_REGNUM] = fi->frame + offset + 8; - get_frame_saved_regs (fi)[MDR_REGNUM] = fi->frame + offset + 12; - get_frame_saved_regs (fi)[A0_REGNUM + 1] = fi->frame + offset + 16; - get_frame_saved_regs (fi)[A0_REGNUM] = fi->frame + offset + 20; - get_frame_saved_regs (fi)[D0_REGNUM + 1] = fi->frame + offset + 24; - get_frame_saved_regs (fi)[D0_REGNUM] = fi->frame + offset + 28; + get_frame_saved_regs (fi)[LAR_REGNUM] = get_frame_base (fi) + offset + 4; + get_frame_saved_regs (fi)[LIR_REGNUM] = get_frame_base (fi) + offset + 8; + get_frame_saved_regs (fi)[MDR_REGNUM] = get_frame_base (fi) + offset + 12; + get_frame_saved_regs (fi)[A0_REGNUM + 1] = get_frame_base (fi) + offset + 16; + get_frame_saved_regs (fi)[A0_REGNUM] = get_frame_base (fi) + offset + 20; + get_frame_saved_regs (fi)[D0_REGNUM + 1] = get_frame_base (fi) + offset + 24; + get_frame_saved_regs (fi)[D0_REGNUM] = get_frame_base (fi) + offset + 28; offset += 32; } if (movm_args & movm_a3_bit) { - get_frame_saved_regs (fi)[A3_REGNUM] = fi->frame + offset; + get_frame_saved_regs (fi)[A3_REGNUM] = get_frame_base (fi) + offset; offset += 4; } if (movm_args & movm_a2_bit) { - get_frame_saved_regs (fi)[A2_REGNUM] = fi->frame + offset; + get_frame_saved_regs (fi)[A2_REGNUM] = get_frame_base (fi) + offset; offset += 4; } if (movm_args & movm_d3_bit) { - get_frame_saved_regs (fi)[D3_REGNUM] = fi->frame + offset; + get_frame_saved_regs (fi)[D3_REGNUM] = get_frame_base (fi) + offset; offset += 4; } if (movm_args & movm_d2_bit) { - get_frame_saved_regs (fi)[D2_REGNUM] = fi->frame + offset; + get_frame_saved_regs (fi)[D2_REGNUM] = get_frame_base (fi) + offset; offset += 4; } if (AM33_MODE) { if (movm_args & movm_exother_bit) { - get_frame_saved_regs (fi)[MCVF_REGNUM] = fi->frame + offset; - get_frame_saved_regs (fi)[MCRL_REGNUM] = fi->frame + offset + 4; - get_frame_saved_regs (fi)[MCRH_REGNUM] = fi->frame + offset + 8; - get_frame_saved_regs (fi)[MDRQ_REGNUM] = fi->frame + offset + 12; - get_frame_saved_regs (fi)[E0_REGNUM + 1] = fi->frame + offset + 16; - get_frame_saved_regs (fi)[E0_REGNUM + 0] = fi->frame + offset + 20; + get_frame_saved_regs (fi)[MCVF_REGNUM] = get_frame_base (fi) + offset; + get_frame_saved_regs (fi)[MCRL_REGNUM] = get_frame_base (fi) + offset + 4; + get_frame_saved_regs (fi)[MCRH_REGNUM] = get_frame_base (fi) + offset + 8; + get_frame_saved_regs (fi)[MDRQ_REGNUM] = get_frame_base (fi) + offset + 12; + get_frame_saved_regs (fi)[E0_REGNUM + 1] = get_frame_base (fi) + offset + 16; + get_frame_saved_regs (fi)[E0_REGNUM + 0] = get_frame_base (fi) + offset + 20; offset += 24; } if (movm_args & movm_exreg1_bit) { - get_frame_saved_regs (fi)[E0_REGNUM + 7] = fi->frame + offset; - get_frame_saved_regs (fi)[E0_REGNUM + 6] = fi->frame + offset + 4; - get_frame_saved_regs (fi)[E0_REGNUM + 5] = fi->frame + offset + 8; - get_frame_saved_regs (fi)[E0_REGNUM + 4] = fi->frame + offset + 12; + get_frame_saved_regs (fi)[E0_REGNUM + 7] = get_frame_base (fi) + offset; + get_frame_saved_regs (fi)[E0_REGNUM + 6] = get_frame_base (fi) + offset + 4; + get_frame_saved_regs (fi)[E0_REGNUM + 5] = get_frame_base (fi) + offset + 8; + get_frame_saved_regs (fi)[E0_REGNUM + 4] = get_frame_base (fi) + offset + 12; offset += 16; } if (movm_args & movm_exreg0_bit) { - get_frame_saved_regs (fi)[E0_REGNUM + 3] = fi->frame + offset; - get_frame_saved_regs (fi)[E0_REGNUM + 2] = fi->frame + offset + 4; + get_frame_saved_regs (fi)[E0_REGNUM + 3] = get_frame_base (fi) + offset; + get_frame_saved_regs (fi)[E0_REGNUM + 2] = get_frame_base (fi) + offset + 4; offset += 8; } } @@ -686,7 +686,7 @@ mn10300_frame_chain (struct frame_info *fi) /* The easiest way to get that info is to analyze our caller's frame. So we set up a dummy frame and call mn10300_analyze_prologue to find stuff for us. */ - dummy = analyze_dummy_frame (FRAME_SAVED_PC (fi), fi->frame); + dummy = analyze_dummy_frame (FRAME_SAVED_PC (fi), get_frame_base (fi)); if (dummy->extra_info->status & MY_FRAME_IN_FP) { @@ -704,7 +704,7 @@ mn10300_frame_chain (struct frame_info *fi) /* Our caller does not have a frame pointer. So his frame starts at the base of our frame (fi->frame) + register save space + <his size>. */ - return fi->frame + adjust + -dummy->extra_info->stack_size; + return get_frame_base (fi) + adjust + -dummy->extra_info->stack_size; } } @@ -877,7 +877,7 @@ mn10300_frame_saved_pc (struct frame_info *fi) { int adjust = saved_regs_size (fi); - return (read_memory_integer (fi->frame + adjust, REGISTER_SIZE)); + return (read_memory_integer (get_frame_base (fi) + adjust, REGISTER_SIZE)); } /* Function: mn10300_init_extra_frame_info |