X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fmn10300-tdep.c;h=5e3a5f82bd3dc3a8016464540e014e0de21d5c6e;hb=36710c632ceea0a828b1084bb5faaa224910f22f;hp=d62a093aaf72e23322a49564a104331768d2276b;hpb=f096a152b39f7a6c65f2f344a0e2593fd85abdcc;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c index d62a093aaf..5e3a5f82bd 100644 --- a/gdb/mn10300-tdep.c +++ b/gdb/mn10300-tdep.c @@ -1,6 +1,7 @@ /* Target-dependent code for the Matsushita MN10300 for GDB, the GNU debugger. - Copyright 1996, 1997, 1998, 1999, 2000, 2001 - Free Software Foundation, Inc. + + Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free + Software Foundation, Inc. This file is part of GDB. @@ -22,15 +23,43 @@ #include "defs.h" #include "frame.h" #include "inferior.h" -#include "obstack.h" #include "target.h" #include "value.h" #include "bfd.h" #include "gdb_string.h" #include "gdbcore.h" -#include "symfile.h" +#include "objfiles.h" #include "regcache.h" #include "arch-utils.h" +#include "gdb_assert.h" +#include "dis-asm.h" + +#define D0_REGNUM 0 +#define D2_REGNUM 2 +#define D3_REGNUM 3 +#define A0_REGNUM 4 +#define A2_REGNUM 6 +#define A3_REGNUM 7 +#define MDR_REGNUM 10 +#define PSW_REGNUM 11 +#define LIR_REGNUM 12 +#define LAR_REGNUM 13 +#define MDRQ_REGNUM 14 +#define E0_REGNUM 15 +#define MCRH_REGNUM 26 +#define MCRL_REGNUM 27 +#define MCVF_REGNUM 28 + +enum movm_register_bits { + movm_exother_bit = 0x01, + movm_exreg1_bit = 0x02, + movm_exreg0_bit = 0x04, + movm_other_bit = 0x08, + movm_a3_bit = 0x10, + movm_a2_bit = 0x20, + movm_d3_bit = 0x40, + movm_d2_bit = 0x80 +}; extern void _initialize_mn10300_tdep (void); static CORE_ADDR mn10300_analyze_prologue (struct frame_info *fi, @@ -61,7 +90,7 @@ register_name (int reg, char **regs, long sizeof_regs) return regs[reg]; } -static char * +static const char * mn10300_generic_register_name (int reg) { static char *regs[] = @@ -74,7 +103,7 @@ mn10300_generic_register_name (int reg) } -static char * +static const char * am33_register_name (int reg) { static char *regs[] = @@ -96,46 +125,36 @@ static void mn10300_extract_return_value (struct type *type, char *regbuf, char *valbuf) { if (TYPE_CODE (type) == TYPE_CODE_PTR) - memcpy (valbuf, regbuf + REGISTER_BYTE (4), TYPE_LENGTH (type)); + memcpy (valbuf, regbuf + DEPRECATED_REGISTER_BYTE (4), TYPE_LENGTH (type)); else - memcpy (valbuf, regbuf + REGISTER_BYTE (0), TYPE_LENGTH (type)); -} - -static CORE_ADDR -mn10300_extract_struct_value_address (char *regbuf) -{ - return extract_address (regbuf + REGISTER_BYTE (4), - REGISTER_RAW_SIZE (4)); + memcpy (valbuf, regbuf + DEPRECATED_REGISTER_BYTE (0), TYPE_LENGTH (type)); } static void mn10300_store_return_value (struct type *type, char *valbuf) { if (TYPE_CODE (type) == TYPE_CODE_PTR) - write_register_bytes (REGISTER_BYTE (4), valbuf, TYPE_LENGTH (type)); + deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (4), valbuf, + TYPE_LENGTH (type)); else - write_register_bytes (REGISTER_BYTE (0), valbuf, TYPE_LENGTH (type)); + deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (0), valbuf, + TYPE_LENGTH (type)); } static struct frame_info *analyze_dummy_frame (CORE_ADDR, CORE_ADDR); static struct frame_info * analyze_dummy_frame (CORE_ADDR pc, CORE_ADDR frame) { - static struct frame_info *dummy = NULL; - if (dummy == NULL) - { - dummy = xmalloc (sizeof (struct frame_info)); - dummy->saved_regs = xmalloc (SIZEOF_FRAME_SAVED_REGS); - dummy->extra_info = xmalloc (sizeof (struct frame_extra_info)); - } - dummy->next = NULL; - dummy->prev = NULL; - dummy->pc = pc; - dummy->frame = frame; - dummy->extra_info->status = 0; - dummy->extra_info->stack_size = 0; - memset (dummy->saved_regs, '\000', SIZEOF_FRAME_SAVED_REGS); - mn10300_analyze_prologue (dummy, 0); + struct cleanup *old_chain = make_cleanup (null_cleanup, NULL); + struct frame_info *dummy + = deprecated_frame_xmalloc_with_cleanup (SIZEOF_FRAME_SAVED_REGS, + sizeof (struct frame_extra_info)); + deprecated_update_frame_pc_hack (dummy, pc); + deprecated_update_frame_base_hack (dummy, frame); + get_frame_extra_info (dummy)->status = 0; + get_frame_extra_info (dummy)->stack_size = 0; + mn10300_analyze_prologue (dummy, pc); + do_cleanups (old_chain); return dummy; } @@ -160,7 +179,7 @@ mn10300_use_struct_convention (int gcc_p, struct type *type) so we need a single byte breakpoint. Matsushita hasn't defined one, so we defined it ourselves. */ -static unsigned char * +const static unsigned char * mn10300_breakpoint_from_pc (CORE_ADDR *bp_addr, int *bp_size) { static char breakpoint[] = @@ -176,12 +195,12 @@ mn10300_breakpoint_from_pc (CORE_ADDR *bp_addr, int *bp_size) static void fix_frame_pointer (struct frame_info *fi, int stack_size) { - if (fi && fi->next == NULL) + if (fi && get_next_frame (fi) == NULL) { - if (fi->extra_info->status & MY_FRAME_IN_SP) - fi->frame = read_sp () - stack_size; - else if (fi->extra_info->status & MY_FRAME_IN_FP) - fi->frame = read_register (A3_REGNUM); + if (get_frame_extra_info (fi)->status & MY_FRAME_IN_SP) + deprecated_update_frame_base_hack (fi, read_sp () - stack_size); + else if (get_frame_extra_info (fi)->status & MY_FRAME_IN_FP) + deprecated_update_frame_base_hack (fi, read_register (A3_REGNUM)); } } @@ -202,59 +221,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. */ - fi->saved_regs[LAR_REGNUM] = fi->frame + offset + 4; - fi->saved_regs[LIR_REGNUM] = fi->frame + offset + 8; - fi->saved_regs[MDR_REGNUM] = fi->frame + offset + 12; - fi->saved_regs[A0_REGNUM + 1] = fi->frame + offset + 16; - fi->saved_regs[A0_REGNUM] = fi->frame + offset + 20; - fi->saved_regs[D0_REGNUM + 1] = fi->frame + offset + 24; - fi->saved_regs[D0_REGNUM] = fi->frame + offset + 28; + deprecated_get_frame_saved_regs (fi)[LAR_REGNUM] = get_frame_base (fi) + offset + 4; + deprecated_get_frame_saved_regs (fi)[LIR_REGNUM] = get_frame_base (fi) + offset + 8; + deprecated_get_frame_saved_regs (fi)[MDR_REGNUM] = get_frame_base (fi) + offset + 12; + deprecated_get_frame_saved_regs (fi)[A0_REGNUM + 1] = get_frame_base (fi) + offset + 16; + deprecated_get_frame_saved_regs (fi)[A0_REGNUM] = get_frame_base (fi) + offset + 20; + deprecated_get_frame_saved_regs (fi)[D0_REGNUM + 1] = get_frame_base (fi) + offset + 24; + deprecated_get_frame_saved_regs (fi)[D0_REGNUM] = get_frame_base (fi) + offset + 28; offset += 32; } if (movm_args & movm_a3_bit) { - fi->saved_regs[A3_REGNUM] = fi->frame + offset; + deprecated_get_frame_saved_regs (fi)[A3_REGNUM] = get_frame_base (fi) + offset; offset += 4; } if (movm_args & movm_a2_bit) { - fi->saved_regs[A2_REGNUM] = fi->frame + offset; + deprecated_get_frame_saved_regs (fi)[A2_REGNUM] = get_frame_base (fi) + offset; offset += 4; } if (movm_args & movm_d3_bit) { - fi->saved_regs[D3_REGNUM] = fi->frame + offset; + deprecated_get_frame_saved_regs (fi)[D3_REGNUM] = get_frame_base (fi) + offset; offset += 4; } if (movm_args & movm_d2_bit) { - fi->saved_regs[D2_REGNUM] = fi->frame + offset; + deprecated_get_frame_saved_regs (fi)[D2_REGNUM] = get_frame_base (fi) + offset; offset += 4; } if (AM33_MODE) { if (movm_args & movm_exother_bit) { - fi->saved_regs[MCVF_REGNUM] = fi->frame + offset; - fi->saved_regs[MCRL_REGNUM] = fi->frame + offset + 4; - fi->saved_regs[MCRH_REGNUM] = fi->frame + offset + 8; - fi->saved_regs[MDRQ_REGNUM] = fi->frame + offset + 12; - fi->saved_regs[E0_REGNUM + 1] = fi->frame + offset + 16; - fi->saved_regs[E0_REGNUM + 0] = fi->frame + offset + 20; + deprecated_get_frame_saved_regs (fi)[MCVF_REGNUM] = get_frame_base (fi) + offset; + deprecated_get_frame_saved_regs (fi)[MCRL_REGNUM] = get_frame_base (fi) + offset + 4; + deprecated_get_frame_saved_regs (fi)[MCRH_REGNUM] = get_frame_base (fi) + offset + 8; + deprecated_get_frame_saved_regs (fi)[MDRQ_REGNUM] = get_frame_base (fi) + offset + 12; + deprecated_get_frame_saved_regs (fi)[E0_REGNUM + 1] = get_frame_base (fi) + offset + 16; + deprecated_get_frame_saved_regs (fi)[E0_REGNUM + 0] = get_frame_base (fi) + offset + 20; offset += 24; } if (movm_args & movm_exreg1_bit) { - fi->saved_regs[E0_REGNUM + 7] = fi->frame + offset; - fi->saved_regs[E0_REGNUM + 6] = fi->frame + offset + 4; - fi->saved_regs[E0_REGNUM + 5] = fi->frame + offset + 8; - fi->saved_regs[E0_REGNUM + 4] = fi->frame + offset + 12; + deprecated_get_frame_saved_regs (fi)[E0_REGNUM + 7] = get_frame_base (fi) + offset; + deprecated_get_frame_saved_regs (fi)[E0_REGNUM + 6] = get_frame_base (fi) + offset + 4; + deprecated_get_frame_saved_regs (fi)[E0_REGNUM + 5] = get_frame_base (fi) + offset + 8; + deprecated_get_frame_saved_regs (fi)[E0_REGNUM + 4] = get_frame_base (fi) + offset + 12; offset += 16; } if (movm_args & movm_exreg0_bit) { - fi->saved_regs[E0_REGNUM + 3] = fi->frame + offset; - fi->saved_regs[E0_REGNUM + 2] = fi->frame + offset + 4; + deprecated_get_frame_saved_regs (fi)[E0_REGNUM + 3] = get_frame_base (fi) + offset; + deprecated_get_frame_saved_regs (fi)[E0_REGNUM + 2] = get_frame_base (fi) + offset + 4; offset += 8; } } @@ -264,16 +283,63 @@ set_movm_offsets (struct frame_info *fi, int movm_args) /* The main purpose of this file is dealing with prologues to extract information about stack frames and saved registers. - For reference here's how prologues look on the mn10300: + In gcc/config/mn13000/mn10300.c, the expand_prologue prologue + function is pretty readable, and has a nice explanation of how the + prologue is generated. The prologues generated by that code will + have the following form (NOTE: the current code doesn't handle all + this!): + + + If this is an old-style varargs function, then its arguments + need to be flushed back to the stack: + + mov d0,(4,sp) + mov d1,(4,sp) + + + If we use any of the callee-saved registers, save them now. + + movm [some callee-saved registers],(sp) + + + If we have any floating-point registers to save: + + - Decrement the stack pointer to reserve space for the registers. + If the function doesn't need a frame pointer, we may combine + this with the adjustment that reserves space for the frame. + + add -SIZE, sp + + - Save the floating-point registers. We have two possible + strategies: + + . Save them at fixed offset from the SP: - With frame pointer: - movm [d2,d3,a2,a3],sp - mov sp,a3 - add ,sp + fmov fsN,(OFFSETN,sp) + fmov fsM,(OFFSETM,sp) + ... - Without frame pointer: - movm [d2,d3,a2,a3],sp (if needed) - add ,sp + Note that, if OFFSETN happens to be zero, you'll get the + different opcode: fmov fsN,(sp) + + . Or, set a0 to the start of the save area, and then use + post-increment addressing to save the FP registers. + + mov sp, a0 + add SIZE, a0 + fmov fsN,(a0+) + fmov fsM,(a0+) + ... + + + If the function needs a frame pointer, we set it here. + + mov sp, a3 + + + Now we reserve space for the stack frame proper. This could be + merged into the `add -SIZE, sp' instruction for FP saves up + above, unless we needed to set the frame pointer in the previous + step, or the frame is so large that allocating the whole thing at + once would put the FP register save slots out of reach of the + addressing mode (128 bytes). + + add -SIZE, sp One day we might keep the stack pointer constant, that won't change the code for prologues, but it will make the frame @@ -303,7 +369,7 @@ set_movm_offsets (struct frame_info *fi, int movm_args) save instructions. MY_FRAME_IN_FP: The base of the current frame is in the - frame pointer register ($a2). + frame pointer register ($a3). NO_MORE_FRAMES: Set this if the current frame is "start" or if the first instruction looks like mov ,sp. This tells @@ -320,8 +386,13 @@ mn10300_analyze_prologue (struct frame_info *fi, CORE_ADDR pc) char *name; /* Use the PC in the frame if it's provided to look up the - start of this function. */ - pc = (fi ? fi->pc : pc); + start of this function. + + Note: kevinb/2003-07-16: We used to do the following here: + pc = (fi ? get_frame_pc (fi) : pc); + But this is (now) badly broken when called from analyze_dummy_frame(). + */ + pc = (pc ? pc : get_frame_pc (fi)); /* Find the start of this function. */ status = find_pc_partial_function (pc, &name, &func_addr, &func_end); @@ -337,13 +408,13 @@ mn10300_analyze_prologue (struct frame_info *fi, CORE_ADDR pc) if (strcmp (name, "start") == 0) { if (fi != NULL) - fi->extra_info->status = NO_MORE_FRAMES; + get_frame_extra_info (fi)->status = NO_MORE_FRAMES; return pc; } /* At the start of a function our frame is in the stack pointer. */ if (fi) - fi->extra_info->status = MY_FRAME_IN_SP; + get_frame_extra_info (fi)->status = MY_FRAME_IN_SP; /* Get the next two bytes into buf, we need two because rets is a two byte insn and the first isn't enough to uniquely identify it. */ @@ -351,6 +422,9 @@ mn10300_analyze_prologue (struct frame_info *fi, CORE_ADDR pc) if (status != 0) return pc; +#if 0 + /* Note: kevinb/2003-07-16: We shouldn't be making these sorts of + changes to the frame in prologue examination code. */ /* If we're physically on an "rets" instruction, then our frame has already been deallocated. Note this can also be true for retf and ret if they specify a size of zero. @@ -358,22 +432,23 @@ mn10300_analyze_prologue (struct frame_info *fi, CORE_ADDR pc) In this case fi->frame is bogus, we need to fix it. */ if (fi && buf[0] == 0xf0 && buf[1] == 0xfc) { - if (fi->next == NULL) - fi->frame = read_sp (); - return fi->pc; + if (get_next_frame (fi) == NULL) + deprecated_update_frame_base_hack (fi, read_sp ()); + return get_frame_pc (fi); } /* Similarly if we're stopped on the first insn of a prologue as our frame hasn't been allocated yet. */ - if (fi && fi->pc == func_addr) + if (fi && get_frame_pc (fi) == func_addr) { - if (fi->next == NULL) - fi->frame = read_sp (); - return fi->pc; + if (get_next_frame (fi) == NULL) + deprecated_update_frame_base_hack (fi, read_sp ()); + return get_frame_pc (fi); } +#endif /* Figure out where to stop scanning. */ - stop = fi ? fi->pc : func_end; + stop = fi ? pc : func_end; /* Don't walk off the end of the function. */ stop = stop > func_end ? func_end : stop; @@ -389,12 +464,13 @@ mn10300_analyze_prologue (struct frame_info *fi, CORE_ADDR pc) return addr; } - /* First see if this insn sets the stack pointer; if so, it's something - we won't understand, so quit now. */ + /* First see if this insn sets the stack pointer from a register; if + so, it's probably the initialization of the stack pointer in _start, + so mark this as the bottom-most frame. */ if (buf[0] == 0xf2 && (buf[1] & 0xf3) == 0xf0) { if (fi) - fi->extra_info->status = NO_MORE_FRAMES; + get_frame_extra_info (fi)->status = NO_MORE_FRAMES; return addr; } @@ -415,8 +491,8 @@ mn10300_analyze_prologue (struct frame_info *fi, CORE_ADDR pc) if (addr >= stop) { /* Fix fi->frame since it's bogus at this point. */ - if (fi && fi->next == NULL) - fi->frame = read_sp (); + if (fi && get_next_frame (fi) == NULL) + deprecated_update_frame_base_hack (fi, read_sp ()); /* Note if/where callee saved registers were saved. */ set_movm_offsets (fi, movm_args); @@ -428,8 +504,8 @@ mn10300_analyze_prologue (struct frame_info *fi, CORE_ADDR pc) if (status != 0) { /* Fix fi->frame since it's bogus at this point. */ - if (fi && fi->next == NULL) - fi->frame = read_sp (); + if (fi && get_next_frame (fi) == NULL) + deprecated_update_frame_base_hack (fi, read_sp ()); /* Note if/where callee saved registers were saved. */ set_movm_offsets (fi, movm_args); @@ -445,8 +521,8 @@ mn10300_analyze_prologue (struct frame_info *fi, CORE_ADDR pc) /* The frame pointer is now valid. */ if (fi) { - fi->extra_info->status |= MY_FRAME_IN_FP; - fi->extra_info->status &= ~MY_FRAME_IN_SP; + get_frame_extra_info (fi)->status |= MY_FRAME_IN_FP; + get_frame_extra_info (fi)->status &= ~MY_FRAME_IN_SP; } /* Quit now if we're beyond the stop point. */ @@ -520,7 +596,7 @@ mn10300_analyze_prologue (struct frame_info *fi, CORE_ADDR pc) /* Note the size of the stack in the frame info structure. */ stack_size = extract_signed_integer (buf, imm_size); if (fi) - fi->extra_info->stack_size = stack_size; + get_frame_extra_info (fi)->stack_size = stack_size; /* We just consumed 2 + imm_size bytes. */ addr += 2 + imm_size; @@ -556,14 +632,14 @@ saved_regs_size (struct frame_info *fi) /* Reserve four bytes for every register saved. */ for (i = 0; i < NUM_REGS; i++) - if (fi->saved_regs[i]) + if (deprecated_get_frame_saved_regs (fi)[i]) adjust += 4; /* If we saved LIR, then it's most likely we used a `movm' instruction with the `other' bit set, in which case the SP is decremented by an extra four bytes, "to simplify calculation of the transfer area", according to the processor manual. */ - if (fi->saved_regs[LIR_REGNUM]) + if (deprecated_get_frame_saved_regs (fi)[LIR_REGNUM]) adjust += 4; return adjust; @@ -583,11 +659,11 @@ mn10300_frame_chain (struct frame_info *fi) struct frame_info *dummy; /* Walk through the prologue to determine the stack size, location of saved registers, end of the prologue, etc. */ - if (fi->extra_info->status == 0) + if (get_frame_extra_info (fi)->status == 0) mn10300_analyze_prologue (fi, (CORE_ADDR) 0); /* Quit now if mn10300_analyze_prologue set NO_MORE_FRAMES. */ - if (fi->extra_info->status & NO_MORE_FRAMES) + if (get_frame_extra_info (fi)->status & NO_MORE_FRAMES) return 0; /* Now that we've analyzed our prologue, determine the frame @@ -607,14 +683,15 @@ 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 (DEPRECATED_FRAME_SAVED_PC (fi), get_frame_base (fi)); - if (dummy->extra_info->status & MY_FRAME_IN_FP) + if (get_frame_extra_info (dummy)->status & MY_FRAME_IN_FP) { /* Our caller has a frame pointer. So find the frame in $a3 or in the stack. */ - if (fi->saved_regs[A3_REGNUM]) - return (read_memory_integer (fi->saved_regs[A3_REGNUM], REGISTER_SIZE)); + if (deprecated_get_frame_saved_regs (fi)[A3_REGNUM]) + return (read_memory_integer (deprecated_get_frame_saved_regs (fi)[A3_REGNUM], + DEPRECATED_REGISTER_SIZE)); else return read_register (A3_REGNUM); } @@ -625,7 +702,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 + . */ - return fi->frame + adjust + -dummy->extra_info->stack_size; + return get_frame_base (fi) + adjust + -get_frame_extra_info (dummy)->stack_size; } } @@ -647,21 +724,21 @@ mn10300_pop_frame_regular (struct frame_info *frame) { int regnum; - write_register (PC_REGNUM, FRAME_SAVED_PC (frame)); + write_register (PC_REGNUM, DEPRECATED_FRAME_SAVED_PC (frame)); /* Restore any saved registers. */ for (regnum = 0; regnum < NUM_REGS; regnum++) - if (frame->saved_regs[regnum] != 0) + if (deprecated_get_frame_saved_regs (frame)[regnum] != 0) { ULONGEST value; - value = read_memory_unsigned_integer (frame->saved_regs[regnum], - REGISTER_RAW_SIZE (regnum)); + value = read_memory_unsigned_integer (deprecated_get_frame_saved_regs (frame)[regnum], + DEPRECATED_REGISTER_RAW_SIZE (regnum)); write_register (regnum, value); } /* Actually cut back the stack. */ - write_register (SP_REGNUM, FRAME_FP (frame)); + write_register (SP_REGNUM, get_frame_base (frame)); /* Don't we need to set the PC?!? XXX FIXME. */ } @@ -672,10 +749,13 @@ mn10300_pop_frame_regular (struct frame_info *frame) static void mn10300_pop_frame (void) { - /* This function checks for and handles generic dummy frames, and - calls back to our function for ordinary frames. */ - generic_pop_current_frame (mn10300_pop_frame_regular); - + struct frame_info *frame = get_current_frame (); + if (get_frame_type (frame) == DUMMY_FRAME) + /* NOTE: cagney/2002-22-23: Does this ever occure? Surely a dummy + frame will have already been poped by the "infrun.c" code. */ + deprecated_pop_dummy_frame (); + else + mn10300_pop_frame_regular (frame); /* Throw away any cached frame information. */ flush_cached_frames (); } @@ -770,7 +850,7 @@ mn10300_push_return_address (CORE_ADDR pc, CORE_ADDR sp) { unsigned char buf[4]; - store_unsigned_integer (buf, 4, CALL_DUMMY_ADDRESS ()); + store_unsigned_integer (buf, 4, entry_point_address ()); write_memory (sp - 4, buf, 4); return sp - 4; } @@ -798,7 +878,8 @@ 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, + DEPRECATED_REGISTER_SIZE)); } /* Function: mn10300_init_extra_frame_info @@ -806,27 +887,27 @@ mn10300_frame_saved_pc (struct frame_info *fi) registers. Most of the work is done in mn10300_analyze_prologue(). Note that when we are called for the last frame (currently active frame), - that fi->pc and fi->frame will already be setup. However, fi->frame will + that get_frame_pc (fi) and fi->frame will already be setup. However, fi->frame will be valid only if this routine uses FP. For previous frames, fi-frame will always be correct. mn10300_analyze_prologue will fix fi->frame if it's not valid. - We can be called with the PC in the call dummy under two circumstances. - First, during normal backtracing, second, while figuring out the frame - pointer just prior to calling the target function (see run_stack_dummy). */ + We can be called with the PC in the call dummy under two + circumstances. First, during normal backtracing, second, while + figuring out the frame pointer just prior to calling the target + function (see call_function_by_hand). */ static void mn10300_init_extra_frame_info (int fromleaf, struct frame_info *fi) { - if (fi->next) - fi->pc = FRAME_SAVED_PC (fi->next); + if (get_next_frame (fi)) + deprecated_update_frame_pc_hack (fi, DEPRECATED_FRAME_SAVED_PC (get_next_frame (fi))); frame_saved_regs_zalloc (fi); - fi->extra_info = (struct frame_extra_info *) - frame_obstack_alloc (sizeof (struct frame_extra_info)); + frame_extra_info_zalloc (fi, sizeof (struct frame_extra_info)); - fi->extra_info->status = 0; - fi->extra_info->stack_size = 0; + get_frame_extra_info (fi)->status = 0; + get_frame_extra_info (fi)->stack_size = 0; mn10300_analyze_prologue (fi, 0); } @@ -853,10 +934,10 @@ mn10300_virtual_frame_pointer (CORE_ADDR pc, /* Set up a dummy frame_info, Analyze the prolog and fill in the extra info. */ /* Results will tell us which type of frame it uses. */ - if (dummy->extra_info->status & MY_FRAME_IN_SP) + if (get_frame_extra_info (dummy)->status & MY_FRAME_IN_SP) { *reg = SP_REGNUM; - *offset = -(dummy->extra_info->stack_size); + *offset = -(get_frame_extra_info (dummy)->stack_size); } else { @@ -927,7 +1008,7 @@ mn10300_dwarf2_reg_to_regnum (int dwarf2) static void mn10300_print_register (const char *name, int regnum, int reg_width) { - char *raw_buffer = alloca (MAX_REGISTER_RAW_SIZE); + char raw_buffer[MAX_REGISTER_SIZE]; if (reg_width) printf_filtered ("%*s: ", reg_width, name); @@ -935,7 +1016,7 @@ mn10300_print_register (const char *name, int regnum, int reg_width) printf_filtered ("%s: ", name); /* Get the data */ - if (read_relative_register_raw_bytes (regnum, raw_buffer)) + if (!frame_register_read (deprecated_selected_frame, regnum, raw_buffer)) { printf_filtered ("[invalid]"); return; @@ -943,16 +1024,16 @@ mn10300_print_register (const char *name, int regnum, int reg_width) else { int byte; - if (TARGET_BYTE_ORDER == BIG_ENDIAN) + if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) { - for (byte = REGISTER_RAW_SIZE (regnum) - REGISTER_VIRTUAL_SIZE (regnum); - byte < REGISTER_RAW_SIZE (regnum); + for (byte = DEPRECATED_REGISTER_RAW_SIZE (regnum) - DEPRECATED_REGISTER_VIRTUAL_SIZE (regnum); + byte < DEPRECATED_REGISTER_RAW_SIZE (regnum); byte++) printf_filtered ("%02x", (unsigned char) raw_buffer[byte]); } else { - for (byte = REGISTER_VIRTUAL_SIZE (regnum) - 1; + for (byte = DEPRECATED_REGISTER_VIRTUAL_SIZE (regnum) - 1; byte >= 0; byte--) printf_filtered ("%02x", (unsigned char) raw_buffer[byte]); @@ -1008,6 +1089,14 @@ mn10300_do_registers_info (int regnum, int fpregs) } } +static CORE_ADDR +mn10300_read_fp (void) +{ + /* That's right, we're using the stack pointer as our frame pointer. */ + gdb_assert (SP_REGNUM >= 0); + return read_register (SP_REGNUM); +} + /* Dump out the mn10300 speciic architecture information. */ static void @@ -1063,74 +1152,56 @@ mn10300_gdbarch_init (struct gdbarch_info info, /* Registers. */ set_gdbarch_num_regs (gdbarch, num_regs); set_gdbarch_register_name (gdbarch, register_name); - set_gdbarch_register_size (gdbarch, 4); - set_gdbarch_register_bytes (gdbarch, - num_regs * gdbarch_register_size (gdbarch)); - set_gdbarch_max_register_raw_size (gdbarch, 4); - set_gdbarch_register_raw_size (gdbarch, mn10300_register_raw_size); - set_gdbarch_register_byte (gdbarch, mn10300_register_byte); - set_gdbarch_max_register_virtual_size (gdbarch, 4); - set_gdbarch_register_virtual_size (gdbarch, mn10300_register_virtual_size); - set_gdbarch_register_virtual_type (gdbarch, mn10300_register_virtual_type); + set_gdbarch_deprecated_register_size (gdbarch, 4); + set_gdbarch_deprecated_register_bytes (gdbarch, num_regs * gdbarch_deprecated_register_size (gdbarch)); + set_gdbarch_deprecated_max_register_raw_size (gdbarch, 4); + set_gdbarch_deprecated_register_raw_size (gdbarch, mn10300_register_raw_size); + set_gdbarch_deprecated_register_byte (gdbarch, mn10300_register_byte); + set_gdbarch_deprecated_max_register_virtual_size (gdbarch, 4); + set_gdbarch_deprecated_register_virtual_size (gdbarch, mn10300_register_virtual_size); + set_gdbarch_deprecated_register_virtual_type (gdbarch, mn10300_register_virtual_type); set_gdbarch_dwarf2_reg_to_regnum (gdbarch, mn10300_dwarf2_reg_to_regnum); - set_gdbarch_do_registers_info (gdbarch, mn10300_do_registers_info); - set_gdbarch_fp_regnum (gdbarch, 31); + set_gdbarch_deprecated_do_registers_info (gdbarch, mn10300_do_registers_info); + set_gdbarch_sp_regnum (gdbarch, 8); + set_gdbarch_pc_regnum (gdbarch, 9); + set_gdbarch_deprecated_fp_regnum (gdbarch, 31); set_gdbarch_virtual_frame_pointer (gdbarch, mn10300_virtual_frame_pointer); /* Breakpoints. */ set_gdbarch_breakpoint_from_pc (gdbarch, mn10300_breakpoint_from_pc); - set_gdbarch_function_start_offset (gdbarch, 0); - set_gdbarch_decr_pc_after_break (gdbarch, 0); /* Stack unwinding. */ - set_gdbarch_get_saved_register (gdbarch, generic_get_saved_register); - set_gdbarch_frame_chain_valid (gdbarch, generic_file_frame_chain_valid); set_gdbarch_inner_than (gdbarch, core_addr_lessthan); - set_gdbarch_frame_chain_valid (gdbarch, generic_file_frame_chain_valid); - set_gdbarch_saved_pc_after_call (gdbarch, mn10300_saved_pc_after_call); - set_gdbarch_init_extra_frame_info (gdbarch, mn10300_init_extra_frame_info); - set_gdbarch_init_frame_pc (gdbarch, init_frame_pc_noop); - set_gdbarch_frame_init_saved_regs (gdbarch, mn10300_frame_init_saved_regs); - set_gdbarch_frame_chain (gdbarch, mn10300_frame_chain); - set_gdbarch_frame_saved_pc (gdbarch, mn10300_frame_saved_pc); - set_gdbarch_extract_return_value (gdbarch, mn10300_extract_return_value); - set_gdbarch_extract_struct_value_address - (gdbarch, mn10300_extract_struct_value_address); - set_gdbarch_store_return_value (gdbarch, mn10300_store_return_value); - set_gdbarch_store_struct_return (gdbarch, mn10300_store_struct_return); - set_gdbarch_pop_frame (gdbarch, mn10300_pop_frame); + set_gdbarch_deprecated_saved_pc_after_call (gdbarch, mn10300_saved_pc_after_call); + set_gdbarch_deprecated_init_extra_frame_info (gdbarch, mn10300_init_extra_frame_info); + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, mn10300_frame_init_saved_regs); + set_gdbarch_deprecated_frame_chain (gdbarch, mn10300_frame_chain); + set_gdbarch_deprecated_frame_saved_pc (gdbarch, mn10300_frame_saved_pc); + set_gdbarch_deprecated_extract_return_value (gdbarch, mn10300_extract_return_value); + set_gdbarch_deprecated_store_return_value (gdbarch, mn10300_store_return_value); + set_gdbarch_deprecated_store_struct_return (gdbarch, mn10300_store_struct_return); + set_gdbarch_deprecated_pop_frame (gdbarch, mn10300_pop_frame); set_gdbarch_skip_prologue (gdbarch, mn10300_skip_prologue); - set_gdbarch_frame_args_skip (gdbarch, 0); - set_gdbarch_frame_args_address (gdbarch, default_frame_address); - set_gdbarch_frame_locals_address (gdbarch, default_frame_address); - set_gdbarch_frame_num_args (gdbarch, frame_num_args_unknown); /* That's right, we're using the stack pointer as our frame pointer. */ - set_gdbarch_read_fp (gdbarch, generic_target_read_sp); + set_gdbarch_deprecated_target_read_fp (gdbarch, mn10300_read_fp); /* Calling functions in the inferior from GDB. */ - set_gdbarch_call_dummy_p (gdbarch, 1); - set_gdbarch_call_dummy_breakpoint_offset_p (gdbarch, 1); - set_gdbarch_call_dummy_breakpoint_offset (gdbarch, 0); - set_gdbarch_call_dummy_stack_adjust_p (gdbarch, 0); - set_gdbarch_call_dummy_location (gdbarch, AT_ENTRY_POINT); - set_gdbarch_call_dummy_address (gdbarch, entry_point_address); - set_gdbarch_call_dummy_words (gdbarch, mn10300_call_dummy_words); - set_gdbarch_sizeof_call_dummy_words (gdbarch, - sizeof (mn10300_call_dummy_words)); - set_gdbarch_call_dummy_length (gdbarch, 0); - set_gdbarch_fix_call_dummy (gdbarch, generic_fix_call_dummy); - set_gdbarch_call_dummy_start_offset (gdbarch, 0); - set_gdbarch_pc_in_call_dummy (gdbarch, pc_in_call_dummy_at_entry_point); - set_gdbarch_use_generic_dummy_frames (gdbarch, 1); - set_gdbarch_push_dummy_frame (gdbarch, generic_push_dummy_frame); - set_gdbarch_push_arguments (gdbarch, mn10300_push_arguments); - set_gdbarch_reg_struct_has_addr (gdbarch, mn10300_reg_struct_has_addr); - set_gdbarch_push_return_address (gdbarch, mn10300_push_return_address); - set_gdbarch_save_dummy_frame_tos (gdbarch, generic_save_dummy_frame_tos); + set_gdbarch_deprecated_call_dummy_words (gdbarch, mn10300_call_dummy_words); + set_gdbarch_deprecated_sizeof_call_dummy_words (gdbarch, sizeof (mn10300_call_dummy_words)); + set_gdbarch_deprecated_push_arguments (gdbarch, mn10300_push_arguments); + set_gdbarch_deprecated_reg_struct_has_addr + (gdbarch, mn10300_reg_struct_has_addr); + set_gdbarch_deprecated_push_return_address (gdbarch, mn10300_push_return_address); + set_gdbarch_deprecated_save_dummy_frame_tos (gdbarch, generic_save_dummy_frame_tos); set_gdbarch_use_struct_convention (gdbarch, mn10300_use_struct_convention); tdep->am33_mode = am33_mode; + /* Should be using push_dummy_call. */ + set_gdbarch_deprecated_dummy_write_sp (gdbarch, deprecated_write_sp); + + set_gdbarch_print_insn (gdbarch, print_insn_mn10300); + return gdbarch; } @@ -1138,8 +1209,5 @@ void _initialize_mn10300_tdep (void) { /* printf("_initialize_mn10300_tdep\n"); */ - - tm_print_insn = print_insn_mn10300; - - register_gdbarch_init (bfd_arch_mn10300, mn10300_gdbarch_init); + gdbarch_register (bfd_arch_mn10300, mn10300_gdbarch_init, mn10300_dump_tdep); }