X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fmn10300-tdep.c;h=e9b720055576eaa8befd1c310391ec7ddeb66285;hb=c5fa424560dd1098617ee6df456a7d4b4fb5f9f1;hp=f185fdffb4774aa9d5d49cf8482747903564d888;hpb=483d36b217bc77e99344ece84a7e70c1b3950f0e;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c index f185fdffb4..e9b7200555 100644 --- a/gdb/mn10300-tdep.c +++ b/gdb/mn10300-tdep.c @@ -1,7 +1,7 @@ /* Target-dependent code for the Matsushita MN10300 for GDB, the GNU debugger. - Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software - Foundation, Inc. + Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free + Software Foundation, Inc. This file is part of GDB. @@ -28,9 +28,11 @@ #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 @@ -120,53 +122,79 @@ mn10300_saved_pc_after_call (struct frame_info *fi) } static void -mn10300_extract_return_value (struct type *type, char *regbuf, char *valbuf) +mn10300_extract_return_value (struct gdbarch *gdbarch, struct type *type, + struct regcache *regcache, void *valbuf) { + char buf[MAX_REGISTER_SIZE]; + int len = TYPE_LENGTH (type); + int reg, regsz; + if (TYPE_CODE (type) == TYPE_CODE_PTR) - memcpy (valbuf, regbuf + REGISTER_BYTE (4), TYPE_LENGTH (type)); + reg = 4; else - memcpy (valbuf, regbuf + REGISTER_BYTE (0), TYPE_LENGTH (type)); -} + reg = 0; -static CORE_ADDR -mn10300_extract_struct_value_address (char *regbuf) -{ - return extract_address (regbuf + REGISTER_BYTE (4), - REGISTER_RAW_SIZE (4)); + regsz = register_size (gdbarch, reg); + if (len <= regsz) + { + regcache_raw_read (regcache, reg, buf); + memcpy (valbuf, buf, len); + } + else if (len <= 2 * regsz) + { + regcache_raw_read (regcache, reg, buf); + memcpy (valbuf, buf, regsz); + gdb_assert (regsz == register_size (gdbarch, reg + 1)); + regcache_raw_read (regcache, reg + 1, buf); + memcpy ((char *) valbuf + regsz, buf, len - regsz); + } + else + internal_error (__FILE__, __LINE__, + "Cannot extract return value %d bytes long.", len); } static void -mn10300_store_return_value (struct type *type, char *valbuf) +mn10300_store_return_value (struct gdbarch *gdbarch, struct type *type, + struct regcache *regcache, const void *valbuf) { + int len = TYPE_LENGTH (type); + int reg, regsz; + if (TYPE_CODE (type) == TYPE_CODE_PTR) - deprecated_write_register_bytes (REGISTER_BYTE (4), valbuf, - TYPE_LENGTH (type)); + reg = 4; + else + reg = 0; + + regsz = register_size (gdbarch, reg); + + if (len <= regsz) + regcache_raw_write_part (regcache, reg, 0, len, valbuf); + else if (len <= 2 * regsz) + { + regcache_raw_write (regcache, reg, valbuf); + gdb_assert (regsz == register_size (gdbarch, reg + 1)); + regcache_raw_write_part (regcache, reg+1, 0, + len - regsz, (char *) valbuf + regsz); + } else - deprecated_write_register_bytes (REGISTER_BYTE (0), valbuf, - TYPE_LENGTH (type)); + internal_error (__FILE__, __LINE__, + "Cannot store return value %d bytes long.", len); } 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) - { - struct frame_extra_info *extra_info; - dummy = deprecated_frame_xmalloc (); - dummy->saved_regs = xmalloc (SIZEOF_FRAME_SAVED_REGS); - extra_info = XMALLOC (struct frame_extra_info); - deprecated_set_frame_extra_info_hack (dummy, extra_info); - } - deprecated_set_frame_next_hack (dummy, NULL); - deprecated_set_frame_prev_hack (dummy, NULL); + 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); - dummy->extra_info->status = 0; - dummy->extra_info->stack_size = 0; - memset (get_frame_saved_regs (dummy), '\000', SIZEOF_FRAME_SAVED_REGS); - mn10300_analyze_prologue (dummy, 0); + 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; } @@ -176,12 +204,111 @@ analyze_dummy_frame (CORE_ADDR pc, CORE_ADDR frame) #define MY_FRAME_IN_FP 0x2 #define NO_MORE_FRAMES 0x4 +/* Compute the alignment required by a type. */ + +static int +mn10300_type_align (struct type *type) +{ + int i, align = 1; + + switch (TYPE_CODE (type)) + { + case TYPE_CODE_INT: + case TYPE_CODE_ENUM: + case TYPE_CODE_SET: + case TYPE_CODE_RANGE: + case TYPE_CODE_CHAR: + case TYPE_CODE_BOOL: + case TYPE_CODE_FLT: + case TYPE_CODE_PTR: + case TYPE_CODE_REF: + return TYPE_LENGTH (type); + + case TYPE_CODE_COMPLEX: + return TYPE_LENGTH (type) / 2; + + case TYPE_CODE_STRUCT: + case TYPE_CODE_UNION: + for (i = 0; i < TYPE_NFIELDS (type); i++) + { + int falign = mn10300_type_align (TYPE_FIELD_TYPE (type, i)); + while (align < falign) + align <<= 1; + } + return align; + + case TYPE_CODE_ARRAY: + /* HACK! Structures containing arrays, even small ones, are not + elligible for returning in registers. */ + return 256; + + case TYPE_CODE_TYPEDEF: + return mn10300_type_align (check_typedef (type)); + + default: + internal_error (__FILE__, __LINE__, "bad switch"); + } +} /* Should call_function allocate stack space for a struct return? */ static int -mn10300_use_struct_convention (int gcc_p, struct type *type) +mn10300_use_struct_convention (struct type *type) { - return (TYPE_NFIELDS (type) > 1 || TYPE_LENGTH (type) > 8); + /* Structures bigger than a pair of words can't be returned in + registers. */ + if (TYPE_LENGTH (type) > 8) + return 1; + + switch (TYPE_CODE (type)) + { + case TYPE_CODE_STRUCT: + case TYPE_CODE_UNION: + /* Structures with a single field are handled as the field + itself. */ + if (TYPE_NFIELDS (type) == 1) + return mn10300_use_struct_convention (TYPE_FIELD_TYPE (type, 0)); + + /* Structures with word or double-word size are passed in memory, as + long as they require at least word alignment. */ + if (mn10300_type_align (type) >= 4) + return 0; + + return 1; + + /* Arrays are addressable, so they're never returned in + registers. This condition can only hold when the array is + the only field of a struct or union. */ + case TYPE_CODE_ARRAY: + return 1; + + case TYPE_CODE_TYPEDEF: + return mn10300_use_struct_convention (check_typedef (type)); + + default: + return 0; + } +} + +/* Determine, for architecture GDBARCH, how a return value of TYPE + should be returned. If it is supposed to be returned in registers, + and READBUF is non-zero, read the appropriate value from REGCACHE, + and copy it into READBUF. If WRITEBUF is non-zero, write the value + from WRITEBUF into REGCACHE. */ + +static enum return_value_convention +mn10300_return_value (struct gdbarch *gdbarch, struct type *type, + struct regcache *regcache, void *readbuf, + const void *writebuf) +{ + if (mn10300_use_struct_convention (type)) + return RETURN_VALUE_STRUCT_CONVENTION; + + if (readbuf) + mn10300_extract_return_value (gdbarch, type, regcache, readbuf); + if (writebuf) + mn10300_store_return_value (gdbarch, type, regcache, writebuf); + + return RETURN_VALUE_REGISTER_CONVENTION; } /* The breakpoint instruction must be the same size as the smallest @@ -207,11 +334,11 @@ 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) + if (get_frame_extra_info (fi)->status & MY_FRAME_IN_SP) deprecated_update_frame_base_hack (fi, read_sp () - stack_size); - else if (fi->extra_info->status & MY_FRAME_IN_FP) + else if (get_frame_extra_info (fi)->status & MY_FRAME_IN_FP) deprecated_update_frame_base_hack (fi, read_register (A3_REGNUM)); } } @@ -233,59 +360,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; + 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) { - get_frame_saved_regs (fi)[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) { - get_frame_saved_regs (fi)[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) { - get_frame_saved_regs (fi)[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) { - get_frame_saved_regs (fi)[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) { - 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; + 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) { - 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; + 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) { - get_frame_saved_regs (fi)[E0_REGNUM + 3] = fi->frame + offset; - get_frame_saved_regs (fi)[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; } } @@ -398,8 +525,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 ? get_frame_pc (fi) : 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); @@ -415,20 +547,23 @@ 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. */ - status = read_memory_nobpt (pc, buf, 2); + status = deprecated_read_memory_nobpt (pc, buf, 2); 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. @@ -436,7 +571,7 @@ 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) + if (get_next_frame (fi) == NULL) deprecated_update_frame_base_hack (fi, read_sp ()); return get_frame_pc (fi); } @@ -445,13 +580,14 @@ mn10300_analyze_prologue (struct frame_info *fi, CORE_ADDR pc) frame hasn't been allocated yet. */ if (fi && get_frame_pc (fi) == func_addr) { - if (fi->next == NULL) + 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 ? get_frame_pc (fi) : func_end; + stop = fi ? pc : func_end; /* Don't walk off the end of the function. */ stop = stop > func_end ? func_end : stop; @@ -460,8 +596,8 @@ mn10300_analyze_prologue (struct frame_info *fi, CORE_ADDR pc) addr = func_addr; /* Suck in two bytes. */ - status = read_memory_nobpt (addr, buf, 2); - if (status != 0) + if (addr + 2 >= stop + || (status = deprecated_read_memory_nobpt (addr, buf, 2)) != 0) { fix_frame_pointer (fi, 0); return addr; @@ -473,7 +609,7 @@ mn10300_analyze_prologue (struct frame_info *fi, CORE_ADDR pc) 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; } @@ -485,7 +621,7 @@ mn10300_analyze_prologue (struct frame_info *fi, CORE_ADDR pc) if (buf[0] == 0xcf) { /* Extract the register list for the movm instruction. */ - status = read_memory_nobpt (addr + 1, buf, 1); + status = deprecated_read_memory_nobpt (addr + 1, buf, 1); movm_args = *buf; addr += 2; @@ -494,7 +630,7 @@ 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) + if (fi && get_next_frame (fi) == NULL) deprecated_update_frame_base_hack (fi, read_sp ()); /* Note if/where callee saved registers were saved. */ @@ -503,11 +639,11 @@ mn10300_analyze_prologue (struct frame_info *fi, CORE_ADDR pc) } /* Get the next two bytes so the prologue scan can continue. */ - status = read_memory_nobpt (addr, buf, 2); + status = deprecated_read_memory_nobpt (addr, buf, 2); if (status != 0) { /* Fix fi->frame since it's bogus at this point. */ - if (fi && fi->next == NULL) + if (fi && get_next_frame (fi) == NULL) deprecated_update_frame_base_hack (fi, read_sp ()); /* Note if/where callee saved registers were saved. */ @@ -524,8 +660,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. */ @@ -540,7 +676,7 @@ mn10300_analyze_prologue (struct frame_info *fi, CORE_ADDR pc) } /* Get two more bytes so scanning can continue. */ - status = read_memory_nobpt (addr, buf, 2); + status = deprecated_read_memory_nobpt (addr, buf, 2); if (status != 0) { /* Fix fi->frame if it's bogus at this point. */ @@ -562,7 +698,7 @@ mn10300_analyze_prologue (struct frame_info *fi, CORE_ADDR pc) If none of the above was found, then this prologue has no additional stack. */ - status = read_memory_nobpt (addr, buf, 2); + status = deprecated_read_memory_nobpt (addr, buf, 2); if (status != 0) { /* Fix fi->frame if it's bogus at this point. */ @@ -585,7 +721,7 @@ mn10300_analyze_prologue (struct frame_info *fi, CORE_ADDR pc) { /* Suck in imm_size more bytes, they'll hold the size of the current frame. */ - status = read_memory_nobpt (addr + 2, buf, imm_size); + status = deprecated_read_memory_nobpt (addr + 2, buf, imm_size); if (status != 0) { /* Fix fi->frame if it's bogus at this point. */ @@ -599,7 +735,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; @@ -635,14 +771,14 @@ saved_regs_size (struct frame_info *fi) /* Reserve four bytes for every register saved. */ for (i = 0; i < NUM_REGS; i++) - if (get_frame_saved_regs (fi)[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 (get_frame_saved_regs (fi)[LIR_REGNUM]) + if (deprecated_get_frame_saved_regs (fi)[LIR_REGNUM]) adjust += 4; return adjust; @@ -662,11 +798,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 @@ -686,14 +822,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 (get_frame_saved_regs (fi)[A3_REGNUM]) - return (read_memory_integer (get_frame_saved_regs (fi)[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); } @@ -704,7 +841,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; } } @@ -726,23 +863,22 @@ 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 (get_frame_saved_regs (frame)[regnum] != 0) + if (deprecated_get_frame_saved_regs (frame)[regnum] != 0) { ULONGEST value; - value = read_memory_unsigned_integer (get_frame_saved_regs (frame)[regnum], - REGISTER_RAW_SIZE (regnum)); + value = read_memory_unsigned_integer (deprecated_get_frame_saved_regs (frame)[regnum], + register_size (current_gdbarch, regnum)); write_register (regnum, value); } - /* Actually cut back the stack. */ - write_register (SP_REGNUM, get_frame_base (frame)); - - /* Don't we need to set the PC?!? XXX FIXME. */ + /* Actually cut back the stack, adjusted by the saved registers like + ret would. */ + write_register (SP_REGNUM, get_frame_base (frame) + saved_regs_size (frame)); } /* Function: pop_frame @@ -751,10 +887,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 (); } @@ -849,7 +988,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; } @@ -877,7 +1016,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 @@ -890,21 +1030,22 @@ mn10300_frame_saved_pc (struct frame_info *fi) 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) - deprecated_update_frame_pc_hack (fi, 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); 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); } @@ -931,10 +1072,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 { @@ -1005,7 +1146,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); @@ -1023,14 +1164,14 @@ mn10300_print_register (const char *name, int regnum, int reg_width) int byte; if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) { - for (byte = REGISTER_RAW_SIZE (regnum) - REGISTER_VIRTUAL_SIZE (regnum); - byte < REGISTER_RAW_SIZE (regnum); + for (byte = register_size (current_gdbarch, regnum) - DEPRECATED_REGISTER_VIRTUAL_SIZE (regnum); + byte < register_size (current_gdbarch, 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]); @@ -1086,6 +1227,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 @@ -1100,7 +1249,6 @@ static struct gdbarch * mn10300_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) { - static LONGEST mn10300_call_dummy_words[] = { 0 }; struct gdbarch *gdbarch; struct gdbarch_tdep *tdep = NULL; int am33_mode; @@ -1141,69 +1289,48 @@ 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_raw_size (gdbarch, mn10300_register_raw_size); + set_gdbarch_deprecated_register_byte (gdbarch, mn10300_register_byte); + 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_deprecated_do_registers_info (gdbarch, mn10300_do_registers_info); set_gdbarch_sp_regnum (gdbarch, 8); set_gdbarch_pc_regnum (gdbarch, 9); - set_gdbarch_fp_regnum (gdbarch, 31); + 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_inner_than (gdbarch, core_addr_lessthan); - 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_deprecated_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_deprecated_extract_return_value (gdbarch, mn10300_extract_return_value); - set_gdbarch_deprecated_extract_struct_value_address - (gdbarch, mn10300_extract_struct_value_address); - set_gdbarch_deprecated_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_return_value (gdbarch, mn10300_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_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_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_deprecated_pc_in_call_dummy (gdbarch, deprecated_pc_in_call_dummy_at_entry_point); - 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_use_struct_convention (gdbarch, mn10300_use_struct_convention); + 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); 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; } @@ -1211,8 +1338,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); }