X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fd10v-tdep.c;h=e438b96d39d3ddd2dbe9e65914376e45e3ca4c2c;hb=e9a2674e1d04f307ae4ffb7e4571c9878f63ff66;hp=48139d17ebb04a6a41b310627911864277899ad5;hpb=1e2330ba1fbf486c2851272e2aa09dd57ad367e6;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/d10v-tdep.c b/gdb/d10v-tdep.c index 48139d17eb..e438b96d39 100644 --- a/gdb/d10v-tdep.c +++ b/gdb/d10v-tdep.c @@ -24,6 +24,7 @@ #include "defs.h" #include "frame.h" +#include "frame-unwind.h" #include "symtab.h" #include "gdbtypes.h" #include "gdbcmd.h" @@ -37,17 +38,12 @@ #include "language.h" #include "arch-utils.h" #include "regcache.h" - +#include "remote.h" #include "floatformat.h" #include "gdb/sim-d10v.h" #include "sim-regno.h" -struct frame_extra_info - { - CORE_ADDR return_pc; - int frameless; - int size; - }; +#include "gdb_assert.h" struct gdbarch_tdep { @@ -72,7 +68,7 @@ enum { R0_REGNUM = 0, R3_REGNUM = 3, - _FP_REGNUM = 11, + D10V_FP_REGNUM = 11, LR_REGNUM = 13, _SP_REGNUM = 15, PSW_REGNUM = 16, @@ -102,19 +98,6 @@ static void d10v_eva_prepare_to_trace (void); static void d10v_eva_get_trace_data (void); -static int prologue_find_regs (unsigned short op, struct frame_info *fi, - CORE_ADDR addr); - -static void d10v_frame_init_saved_regs (struct frame_info *); - -static void do_d10v_pop_frame (struct frame_info *fi); - -static int -d10v_frame_chain_valid (CORE_ADDR chain, struct frame_info *frame) -{ - return (get_frame_pc (frame) > IMEM_START); -} - static CORE_ADDR d10v_stack_align (CORE_ADDR len) { @@ -293,8 +276,8 @@ d10v_imap_register (int reg_nr) static int d10v_ts2_register_sim_regno (int nr) { - if (legacy_register_sim_regno (nr) < 0) - return legacy_register_sim_regno (nr); + /* Only makes sense to supply raw registers. */ + gdb_assert (nr >= 0 && nr < NUM_REGS); if (nr >= TS2_IMAP0_REGNUM && nr < TS2_IMAP0_REGNUM + NR_IMAP_REGS) return nr - TS2_IMAP0_REGNUM + SIM_D10V_IMAP0_REGNUM; @@ -309,8 +292,8 @@ d10v_ts2_register_sim_regno (int nr) static int d10v_ts3_register_sim_regno (int nr) { - if (legacy_register_sim_regno (nr) < 0) - return legacy_register_sim_regno (nr); + /* Only makes sense to supply raw registers. */ + gdb_assert (nr >= 0 && nr < NUM_REGS); if (nr >= TS3_IMAP0_REGNUM && nr < TS3_IMAP0_REGNUM + NR_IMAP_REGS) return nr - TS3_IMAP0_REGNUM + SIM_D10V_IMAP0_REGNUM; @@ -358,11 +341,11 @@ d10v_register_raw_size (int reg_nr) of data in register N. */ static struct type * -d10v_register_virtual_type (int reg_nr) +d10v_register_type (struct gdbarch *gdbarch, int reg_nr) { if (reg_nr == PC_REGNUM) return builtin_type_void_func_ptr; - if (reg_nr == _SP_REGNUM || reg_nr == _FP_REGNUM) + if (reg_nr == _SP_REGNUM || reg_nr == D10V_FP_REGNUM) return builtin_type_void_data_ptr; else if (reg_nr >= A0_REGNUM && reg_nr < (A0_REGNUM + NR_A_REGS)) @@ -454,40 +437,42 @@ d10v_integer_to_address (struct type *type, void *buf) return val; } -/* Store the address of the place in which to copy the structure the - subroutine will return. This is called from call_function. - - We store structs through a pointer passed in the first Argument - register. */ - -static void -d10v_store_struct_return (CORE_ADDR addr, CORE_ADDR sp) -{ - write_register (ARG1_REGNUM, (addr)); -} - /* Write into appropriate registers a function return value of type TYPE, given in virtual format. Things always get returned in RET1_REGNUM, RET2_REGNUM, ... */ static void -d10v_store_return_value (struct type *type, char *valbuf) +d10v_store_return_value (struct type *type, struct regcache *regcache, + const void *valbuf) { - char tmp = 0; - /* Only char return values need to be shifted right within R0. */ + /* Only char return values need to be shifted right within the first + regnum. */ if (TYPE_LENGTH (type) == 1 && TYPE_CODE (type) == TYPE_CODE_INT) { - /* zero the high byte */ - deprecated_write_register_bytes (REGISTER_BYTE (RET1_REGNUM), &tmp, 1); - /* copy the low byte */ - deprecated_write_register_bytes (REGISTER_BYTE (RET1_REGNUM) + 1, - valbuf, 1); + bfd_byte tmp[2]; + tmp[1] = *(bfd_byte *)valbuf; + regcache_cooked_write (regcache, RET1_REGNUM, tmp); } else - deprecated_write_register_bytes (REGISTER_BYTE (RET1_REGNUM), - valbuf, TYPE_LENGTH (type)); + { + int reg; + /* A structure is never more than 8 bytes long. See + use_struct_convention(). */ + gdb_assert (TYPE_LENGTH (type) <= 8); + /* Write out most registers, stop loop before trying to write + out any dangling byte at the end of the buffer. */ + for (reg = 0; (reg * 2) + 1 < TYPE_LENGTH (type); reg++) + { + regcache_cooked_write (regcache, RET1_REGNUM + reg, + (bfd_byte *) valbuf + reg * 2); + } + /* Write out any dangling byte at the end of the buffer. */ + if ((reg * 2) + 1 == TYPE_LENGTH (type)) + regcache_cooked_write_part (regcache, reg, 0, 1, + (bfd_byte *) valbuf + reg * 2); + } } /* Extract from an array REGBUF containing the (raw) register state @@ -495,24 +480,11 @@ d10v_store_return_value (struct type *type, char *valbuf) as a CORE_ADDR (or an expression that can be used as one). */ static CORE_ADDR -d10v_extract_struct_value_address (char *regbuf) +d10v_extract_struct_value_address (struct regcache *regcache) { - return (extract_address ((regbuf) + REGISTER_BYTE (ARG1_REGNUM), - REGISTER_RAW_SIZE (ARG1_REGNUM)) - | DMEM_START); -} - -static CORE_ADDR -d10v_frame_saved_pc (struct frame_info *frame) -{ - if (DEPRECATED_PC_IN_CALL_DUMMY (get_frame_pc (frame), - get_frame_base (frame), - get_frame_base (frame))) - return d10v_make_iaddr (deprecated_read_register_dummy (get_frame_pc (frame), - get_frame_base (frame), - PC_REGNUM)); - else - return ((frame)->extra_info->return_pc); + ULONGEST addr; + regcache_cooked_read_unsigned (regcache, ARG1_REGNUM, &addr); + return (addr | DMEM_START); } /* Immediately after a function call, return the saved pc. We can't @@ -526,55 +498,6 @@ d10v_saved_pc_after_call (struct frame_info *frame) | IMEM_START); } -/* Discard from the stack the innermost frame, restoring all saved - registers. */ - -static void -d10v_pop_frame (void) -{ - generic_pop_current_frame (do_d10v_pop_frame); -} - -static void -do_d10v_pop_frame (struct frame_info *fi) -{ - CORE_ADDR fp; - int regnum; - char raw_buffer[8]; - - fp = get_frame_base (fi); - /* fill out fsr with the address of where each */ - /* register was stored in the frame */ - d10v_frame_init_saved_regs (fi); - - /* now update the current registers with the old values */ - for (regnum = A0_REGNUM; regnum < A0_REGNUM + NR_A_REGS; regnum++) - { - if (get_frame_saved_regs (fi)[regnum]) - { - read_memory (get_frame_saved_regs (fi)[regnum], raw_buffer, REGISTER_RAW_SIZE (regnum)); - deprecated_write_register_bytes (REGISTER_BYTE (regnum), raw_buffer, - REGISTER_RAW_SIZE (regnum)); - } - } - for (regnum = 0; regnum < SP_REGNUM; regnum++) - { - if (get_frame_saved_regs (fi)[regnum]) - { - write_register (regnum, read_memory_unsigned_integer (get_frame_saved_regs (fi)[regnum], REGISTER_RAW_SIZE (regnum))); - } - } - if (get_frame_saved_regs (fi)[PSW_REGNUM]) - { - write_register (PSW_REGNUM, read_memory_unsigned_integer (get_frame_saved_regs (fi)[PSW_REGNUM], REGISTER_RAW_SIZE (PSW_REGNUM))); - } - - write_register (PC_REGNUM, read_register (LR_REGNUM)); - write_register (SP_REGNUM, fp + fi->extra_info->size); - target_store_registers (-1); - flush_cached_frames (); -} - static int check_prologue (unsigned short op) { @@ -672,54 +595,25 @@ d10v_skip_prologue (CORE_ADDR pc) return pc; } -/* Given a GDB frame, determine the address of the calling function's - frame. This will be used to create a new GDB frame struct, and - then INIT_EXTRA_FRAME_INFO and DEPRECATED_INIT_FRAME_PC will be - called for the new frame. */ - -static CORE_ADDR -d10v_frame_chain (struct frame_info *fi) +struct d10v_unwind_cache { - CORE_ADDR addr; - - /* A generic call dummy's frame is the same as caller's. */ - if (DEPRECATED_PC_IN_CALL_DUMMY (get_frame_pc (fi), get_frame_base (fi), - get_frame_base (fi))) - return get_frame_base (fi); - - d10v_frame_init_saved_regs (fi); - - - if (fi->extra_info->return_pc == IMEM_START - || inside_entry_file (fi->extra_info->return_pc)) - { - /* This is meant to halt the backtrace at "_start". - Make sure we don't halt it at a generic dummy frame. */ - if (!DEPRECATED_PC_IN_CALL_DUMMY (fi->extra_info->return_pc, 0, 0)) - return (CORE_ADDR) 0; - } - - if (!get_frame_saved_regs (fi)[FP_REGNUM]) - { - if (!get_frame_saved_regs (fi)[SP_REGNUM] - || get_frame_saved_regs (fi)[SP_REGNUM] == STACK_START) - return (CORE_ADDR) 0; - - return get_frame_saved_regs (fi)[SP_REGNUM]; - } - - addr = read_memory_unsigned_integer (get_frame_saved_regs (fi)[FP_REGNUM], - REGISTER_RAW_SIZE (FP_REGNUM)); - if (addr == 0) - return (CORE_ADDR) 0; - - return d10v_make_daddr (addr); -} - -static int next_addr, uses_frame; + CORE_ADDR return_pc; + /* The frame's base. Used when constructing a frame ID. */ + CORE_ADDR base; + int size; + CORE_ADDR *saved_regs; + /* How far the SP and r11 (FP) have been offset from the start of + the stack frame (as defined by the previous frame's stack + pointer). */ + LONGEST sp_offset; + LONGEST r11_offset; + int uses_frame; + void **regs; +}; static int -prologue_find_regs (unsigned short op, struct frame_info *fi, CORE_ADDR addr) +prologue_find_regs (struct d10v_unwind_cache *info, unsigned short op, + CORE_ADDR addr) { int n; @@ -727,8 +621,8 @@ prologue_find_regs (unsigned short op, struct frame_info *fi, CORE_ADDR addr) if ((op & 0x7E1F) == 0x6C1F) { n = (op & 0x1E0) >> 5; - next_addr -= 2; - get_frame_saved_regs (fi)[n] = next_addr; + info->sp_offset -= 2; + info->saved_regs[n] = info->sp_offset; return 1; } @@ -736,9 +630,9 @@ prologue_find_regs (unsigned short op, struct frame_info *fi, CORE_ADDR addr) else if ((op & 0x7E3F) == 0x6E1F) { n = (op & 0x1E0) >> 5; - next_addr -= 4; - get_frame_saved_regs (fi)[n] = next_addr; - get_frame_saved_regs (fi)[n + 1] = next_addr + 2; + info->sp_offset -= 4; + info->saved_regs[n] = info->sp_offset; + info->saved_regs[n + 1] = info->sp_offset + 2; return 1; } @@ -748,14 +642,23 @@ prologue_find_regs (unsigned short op, struct frame_info *fi, CORE_ADDR addr) n = (op & 0x1E) >> 1; if (n == 0) n = 16; - next_addr -= n; + info->sp_offset -= n; return 1; } /* mv r11, sp */ if (op == 0x417E) { - uses_frame = 1; + info->uses_frame = 1; + info->r11_offset = info->sp_offset; + return 1; + } + + /* st rn, @r11 */ + if ((op & 0x7E1F) == 0x6816) + { + n = (op & 0x1E0) >> 5; + info->saved_regs[n] = info->r11_offset; return 1; } @@ -767,7 +670,7 @@ prologue_find_regs (unsigned short op, struct frame_info *fi, CORE_ADDR addr) if ((op & 0x7E1F) == 0x681E) { n = (op & 0x1E0) >> 5; - get_frame_saved_regs (fi)[n] = next_addr; + info->saved_regs[n] = info->sp_offset; return 1; } @@ -775,8 +678,8 @@ prologue_find_regs (unsigned short op, struct frame_info *fi, CORE_ADDR addr) if ((op & 0x7E3F) == 0x3A1E) { n = (op & 0x1E0) >> 5; - get_frame_saved_regs (fi)[n] = next_addr; - get_frame_saved_regs (fi)[n + 1] = next_addr + 2; + info->saved_regs[n] = info->sp_offset; + info->saved_regs[n + 1] = info->sp_offset + 2; return 1; } @@ -789,21 +692,32 @@ prologue_find_regs (unsigned short op, struct frame_info *fi, CORE_ADDR addr) in the stack frame. sp is even more special: the address we return for it IS the sp for the next frame. */ -static void -d10v_frame_init_saved_regs (struct frame_info *fi) +struct d10v_unwind_cache * +d10v_frame_unwind_cache (struct frame_info *next_frame, + void **this_prologue_cache) { - CORE_ADDR fp, pc; + CORE_ADDR pc; + ULONGEST prev_sp; + ULONGEST this_base; unsigned long op; unsigned short op1, op2; int i; + struct d10v_unwind_cache *info; - fp = get_frame_base (fi); - memset (get_frame_saved_regs (fi), 0, SIZEOF_FRAME_SAVED_REGS); - next_addr = 0; + if ((*this_prologue_cache)) + return (*this_prologue_cache); - pc = get_pc_function_start (get_frame_pc (fi)); + info = FRAME_OBSTACK_ZALLOC (struct d10v_unwind_cache); + (*this_prologue_cache) = info; + info->saved_regs = frame_obstack_zalloc (SIZEOF_FRAME_SAVED_REGS); - uses_frame = 0; + info->size = 0; + info->return_pc = 0; + info->sp_offset = 0; + + pc = get_pc_function_start (frame_pc_unwind (next_frame)); + + info->uses_frame = 0; while (1) { op = (unsigned long) read_memory_integer (pc, 4); @@ -814,22 +728,22 @@ d10v_frame_init_saved_regs (struct frame_info *fi) { /* add3 sp,sp,n */ short n = op & 0xFFFF; - next_addr += n; + info->sp_offset += n; } else if ((op & 0x3F0F0000) == 0x340F0000) { /* st rn, @(offset,sp) */ short offset = op & 0xFFFF; short n = (op >> 20) & 0xF; - get_frame_saved_regs (fi)[n] = next_addr + offset; + info->saved_regs[n] = info->sp_offset + offset; } else if ((op & 0x3F1F0000) == 0x350F0000) { /* st2w rn, @(offset,sp) */ short offset = op & 0xFFFF; short n = (op >> 20) & 0xF; - get_frame_saved_regs (fi)[n] = next_addr + offset; - get_frame_saved_regs (fi)[n + 1] = next_addr + offset + 2; + info->saved_regs[n] = info->sp_offset + offset; + info->saved_regs[n + 1] = info->sp_offset + offset + 2; } else break; @@ -847,140 +761,160 @@ d10v_frame_init_saved_regs (struct frame_info *fi) op1 = (op & 0x3FFF8000) >> 15; op2 = op & 0x7FFF; } - if (!prologue_find_regs (op1, fi, pc) - || !prologue_find_regs (op2, fi, pc)) + if (!prologue_find_regs (info, op1, pc) + || !prologue_find_regs (info, op2, pc)) break; } pc += 4; } - fi->extra_info->size = -next_addr; + info->size = -info->sp_offset; - if (!(fp & 0xffff)) - fp = d10v_read_sp (); + /* Compute the frame's base, and the previous frame's SP. */ + if (info->uses_frame) + { + /* The SP was moved to the FP. This indicates that a new frame + was created. Get THIS frame's FP value by unwinding it from + the next frame. */ + frame_unwind_unsigned_register (next_frame, D10V_FP_REGNUM, &this_base); + /* The FP points at the last saved register. Adjust the FP back + to before the first saved register giving the SP. */ + prev_sp = this_base + info->size; + } + else if (info->saved_regs[SP_REGNUM]) + { + /* The SP was saved (which is very unusual), the frame base is + just the PREV's frame's TOP-OF-STACK. */ + this_base = read_memory_unsigned_integer (info->saved_regs[SP_REGNUM], + register_size (current_gdbarch, + SP_REGNUM)); + prev_sp = this_base; + } + else + { + /* Assume that the FP is this frame's SP but with that pushed + stack space added back. */ + frame_unwind_unsigned_register (next_frame, SP_REGNUM, &this_base); + prev_sp = this_base + info->size; + } + info->base = d10v_make_daddr (this_base); + prev_sp = d10v_make_daddr (prev_sp); + + /* Adjust all the saved registers so that they contain addresses and + not offsets. */ for (i = 0; i < NUM_REGS - 1; i++) - if (get_frame_saved_regs (fi)[i]) + if (info->saved_regs[i]) { - get_frame_saved_regs (fi)[i] = fp - (next_addr - get_frame_saved_regs (fi)[i]); + info->saved_regs[i] = (prev_sp + info->saved_regs[i]); } - if (get_frame_saved_regs (fi)[LR_REGNUM]) + if (info->saved_regs[LR_REGNUM]) { CORE_ADDR return_pc - = read_memory_unsigned_integer (get_frame_saved_regs (fi)[LR_REGNUM], - REGISTER_RAW_SIZE (LR_REGNUM)); - fi->extra_info->return_pc = d10v_make_iaddr (return_pc); + = read_memory_unsigned_integer (info->saved_regs[LR_REGNUM], + register_size (current_gdbarch, LR_REGNUM)); + info->return_pc = d10v_make_iaddr (return_pc); } else { - fi->extra_info->return_pc = d10v_make_iaddr (read_register (LR_REGNUM)); + ULONGEST return_pc; + frame_unwind_unsigned_register (next_frame, LR_REGNUM, &return_pc); + info->return_pc = d10v_make_iaddr (return_pc); } - /* The SP is not normally (ever?) saved, but check anyway */ - if (!get_frame_saved_regs (fi)[SP_REGNUM]) - { - /* if the FP was saved, that means the current FP is valid, */ - /* otherwise, it isn't being used, so we use the SP instead */ - if (uses_frame) - get_frame_saved_regs (fi)[SP_REGNUM] - = d10v_read_fp () + fi->extra_info->size; - else - { - get_frame_saved_regs (fi)[SP_REGNUM] = fp + fi->extra_info->size; - fi->extra_info->frameless = 1; - get_frame_saved_regs (fi)[FP_REGNUM] = 0; - } - } + /* The SP_REGNUM is special. Instead of the address of the SP, the + previous frame's SP value is saved. */ + info->saved_regs[SP_REGNUM] = prev_sp; + + return info; } static void -d10v_init_extra_frame_info (int fromleaf, struct frame_info *fi) +d10v_print_registers_info (struct gdbarch *gdbarch, struct ui_file *file, + struct frame_info *frame, int regnum, int all) { - frame_extra_info_zalloc (fi, sizeof (struct frame_extra_info)); - frame_saved_regs_zalloc (fi); - - fi->extra_info->frameless = 0; - fi->extra_info->size = 0; - fi->extra_info->return_pc = 0; - - /* If get_frame_pc (fi) is zero, but this is not the outermost frame, - then let's snatch the return_pc from the callee, so that - DEPRECATED_PC_IN_CALL_DUMMY will work. */ - if (get_frame_pc (fi) == 0 && fi->level != 0 && fi->next != NULL) - deprecated_update_frame_pc_hack (fi, d10v_frame_saved_pc (fi->next)); - - /* The call dummy doesn't save any registers on the stack, so we can - return now. */ - if (DEPRECATED_PC_IN_CALL_DUMMY (get_frame_pc (fi), get_frame_base (fi), - get_frame_base (fi))) + if (regnum >= 0) { + default_print_registers_info (gdbarch, file, frame, regnum, all); return; } - else - { - d10v_frame_init_saved_regs (fi); - } + + { + ULONGEST pc, psw, rpt_s, rpt_e, rpt_c; + frame_read_unsigned_register (frame, PC_REGNUM, &pc); + frame_read_unsigned_register (frame, PSW_REGNUM, &psw); + frame_read_unsigned_register (frame, frame_map_name_to_regnum ("rpt_s", -1), &rpt_s); + frame_read_unsigned_register (frame, frame_map_name_to_regnum ("rpt_e", -1), &rpt_e); + frame_read_unsigned_register (frame, frame_map_name_to_regnum ("rpt_c", -1), &rpt_c); + fprintf_filtered (file, "PC=%04lx (0x%lx) PSW=%04lx RPT_S=%04lx RPT_E=%04lx RPT_C=%04lx\n", + (long) pc, (long) d10v_make_iaddr (pc), (long) psw, + (long) rpt_s, (long) rpt_e, (long) rpt_c); + } + + { + int group; + for (group = 0; group < 16; group += 8) + { + int r; + fprintf_filtered (file, "R%d-R%-2d", group, group + 7); + for (r = group; r < group + 8; r++) + { + ULONGEST tmp; + frame_read_unsigned_register (frame, r, &tmp); + fprintf_filtered (file, " %04lx", (long) tmp); + } + fprintf_filtered (file, "\n"); + } + } + + /* Note: The IMAP/DMAP registers don't participate in function + calls. Don't bother trying to unwind them. */ + + { + int a; + for (a = 0; a < NR_IMAP_REGS; a++) + { + if (a > 0) + fprintf_filtered (file, " "); + fprintf_filtered (file, "IMAP%d %04lx", a, d10v_imap_register (a)); + } + if (NR_DMAP_REGS == 1) + /* Registers DMAP0 and DMAP1 are constant. Just return dmap2. */ + fprintf_filtered (file, " DMAP %04lx\n", d10v_dmap_register (2)); + else + { + for (a = 0; a < NR_DMAP_REGS; a++) + { + fprintf_filtered (file, " DMAP%d %04lx", a, d10v_dmap_register (a)); + } + fprintf_filtered (file, "\n"); + } + } + + { + char *num = alloca (max_register_size (gdbarch)); + int a; + fprintf_filtered (file, "A0-A%d", NR_A_REGS - 1); + for (a = A0_REGNUM; a < A0_REGNUM + NR_A_REGS; a++) + { + int i; + fprintf_filtered (file, " "); + frame_register_read (frame, a, num); + for (i = 0; i < max_register_size (current_gdbarch); i++) + { + fprintf_filtered (file, "%02x", (num[i] & 0xff)); + } + } + } + fprintf_filtered (file, "\n"); } static void show_regs (char *args, int from_tty) { - int a; - printf_filtered ("PC=%04lx (0x%lx) PSW=%04lx RPT_S=%04lx RPT_E=%04lx RPT_C=%04lx\n", - (long) read_register (PC_REGNUM), - (long) d10v_make_iaddr (read_register (PC_REGNUM)), - (long) read_register (PSW_REGNUM), - (long) read_register (24), - (long) read_register (25), - (long) read_register (23)); - printf_filtered ("R0-R7 %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx\n", - (long) read_register (0), - (long) read_register (1), - (long) read_register (2), - (long) read_register (3), - (long) read_register (4), - (long) read_register (5), - (long) read_register (6), - (long) read_register (7)); - printf_filtered ("R8-R15 %04lx %04lx %04lx %04lx %04lx %04lx %04lx %04lx\n", - (long) read_register (8), - (long) read_register (9), - (long) read_register (10), - (long) read_register (11), - (long) read_register (12), - (long) read_register (13), - (long) read_register (14), - (long) read_register (15)); - for (a = 0; a < NR_IMAP_REGS; a++) - { - if (a > 0) - printf_filtered (" "); - printf_filtered ("IMAP%d %04lx", a, d10v_imap_register (a)); - } - if (NR_DMAP_REGS == 1) - printf_filtered (" DMAP %04lx\n", d10v_dmap_register (2)); - else - { - for (a = 0; a < NR_DMAP_REGS; a++) - { - printf_filtered (" DMAP%d %04lx", a, d10v_dmap_register (a)); - } - printf_filtered ("\n"); - } - printf_filtered ("A0-A%d", NR_A_REGS - 1); - for (a = A0_REGNUM; a < A0_REGNUM + NR_A_REGS; a++) - { - char num[MAX_REGISTER_RAW_SIZE]; - int i; - printf_filtered (" "); - deprecated_read_register_gen (a, (char *) &num); - for (i = 0; i < MAX_REGISTER_RAW_SIZE; i++) - { - printf_filtered ("%02x", (num[i] & 0xff)); - } - } - printf_filtered ("\n"); + d10v_print_registers_info (current_gdbarch, gdb_stdout, + get_current_frame (), -1, 1); } static CORE_ADDR @@ -1015,30 +949,12 @@ d10v_read_sp (void) return (d10v_make_daddr (read_register (SP_REGNUM))); } -static void -d10v_write_sp (CORE_ADDR val) -{ - write_register (SP_REGNUM, d10v_convert_daddr_to_raw (val)); -} - static CORE_ADDR d10v_read_fp (void) { - return (d10v_make_daddr (read_register (FP_REGNUM))); + return (d10v_make_daddr (read_register (D10V_FP_REGNUM))); } -/* Function: push_return_address (pc) - Set up the return address for the inferior function call. - Needed for targets where we don't actually execute a JSR/BSR instruction */ - -static CORE_ADDR -d10v_push_return_address (CORE_ADDR pc, CORE_ADDR sp) -{ - write_register (LR_REGNUM, d10v_convert_iaddr_to_raw (CALL_DUMMY_ADDRESS ())); - return sp; -} - - /* When arguments must be pushed onto the stack, they go on in reverse order. The below implements a FILO (stack) to do this. */ @@ -1076,21 +992,28 @@ pop_stack_item (struct stack_item *si) static CORE_ADDR -d10v_push_arguments (int nargs, struct value **args, CORE_ADDR sp, - int struct_return, CORE_ADDR struct_addr) +d10v_push_dummy_call (struct gdbarch *gdbarch, struct regcache *regcache, + CORE_ADDR dummy_addr, int nargs, struct value **args, + CORE_ADDR sp, int struct_return, CORE_ADDR struct_addr) { int i; int regnum = ARG1_REGNUM; struct stack_item *si = NULL; long val; - /* If struct_return is true, then the struct return address will - consume one argument-passing register. No need to actually - write the value to the register -- that's done by - d10v_store_struct_return(). */ + /* Set the return address. For the d10v, the return breakpoint is + always at DUMMY_ADDR. */ + regcache_cooked_write_unsigned (regcache, LR_REGNUM, + d10v_convert_iaddr_to_raw (dummy_addr)); + /* If STRUCT_RETURN is true, then the struct return address (in + STRUCT_ADDR) will consume the first argument-passing register. + Both adjust the register count and store that value. */ if (struct_return) - regnum++; + { + regcache_cooked_write_unsigned (regcache, regnum, struct_addr); + regnum++; + } /* Fill in registers and arg lists */ for (i = 0; i < nargs; i++) @@ -1106,7 +1029,7 @@ d10v_push_arguments (int nargs, struct value **args, CORE_ADDR sp, /* fits in a single register, do not align */ { val = extract_unsigned_integer (contents, len); - write_register (regnum++, val); + regcache_cooked_write_unsigned (regcache, regnum++, val); } else if (len <= (ARGN_REGNUM - aligned_regnum + 1) * 2) /* value fits in remaining registers, store keeping left @@ -1117,12 +1040,12 @@ d10v_push_arguments (int nargs, struct value **args, CORE_ADDR sp, for (b = 0; b < (len & ~1); b += 2) { val = extract_unsigned_integer (&contents[b], 2); - write_register (regnum++, val); + regcache_cooked_write_unsigned (regcache, regnum++, val); } if (b < len) { val = extract_unsigned_integer (&contents[b], 1); - write_register (regnum++, (val << 8)); + regcache_cooked_write_unsigned (regcache, regnum++, (val << 8)); } } else @@ -1140,6 +1063,10 @@ d10v_push_arguments (int nargs, struct value **args, CORE_ADDR sp, si = pop_stack_item (si); } + /* Finally, update the SP register. */ + regcache_cooked_write_unsigned (regcache, SP_REGNUM, + d10v_convert_daddr_to_raw (sp)); + return sp; } @@ -1148,35 +1075,44 @@ d10v_push_arguments (int nargs, struct value **args, CORE_ADDR sp, extract and copy its value into `valbuf'. */ static void -d10v_extract_return_value (struct type *type, char regbuf[REGISTER_BYTES], - char *valbuf) +d10v_extract_return_value (struct type *type, struct regcache *regcache, + void *valbuf) { int len; #if 0 printf("RET: TYPE=%d len=%d r%d=0x%x\n", TYPE_CODE (type), TYPE_LENGTH (type), RET1_REGNUM - R0_REGNUM, (int) extract_unsigned_integer (regbuf + REGISTER_BYTE(RET1_REGNUM), - REGISTER_RAW_SIZE (RET1_REGNUM))); + register_size (current_gdbarch, RET1_REGNUM))); #endif - len = TYPE_LENGTH (type); - if (len == 1) + if (TYPE_LENGTH (type) == 1) { - unsigned short c; - - c = extract_unsigned_integer (regbuf + REGISTER_BYTE (RET1_REGNUM), - REGISTER_RAW_SIZE (RET1_REGNUM)); + ULONGEST c; + regcache_cooked_read_unsigned (regcache, RET1_REGNUM, &c); store_unsigned_integer (valbuf, 1, c); } - else if ((len & 1) == 0) - memcpy (valbuf, regbuf + REGISTER_BYTE (RET1_REGNUM), len); else { /* For return values of odd size, the first byte is in the least significant part of the first register. The - remaining bytes in remaining registers. Interestingly, - when such values are passed in, the last byte is in the - most significant byte of that same register - wierd. */ - memcpy (valbuf, regbuf + REGISTER_BYTE (RET1_REGNUM) + 1, len); + remaining bytes in remaining registers. Interestingly, when + such values are passed in, the last byte is in the most + significant byte of that same register - wierd. */ + int reg = RET1_REGNUM; + int off = 0; + if (TYPE_LENGTH (type) & 1) + { + regcache_cooked_read_part (regcache, RET1_REGNUM, 1, 1, + (bfd_byte *)valbuf + off); + off++; + reg++; + } + /* Transfer the remaining registers. */ + for (; off < TYPE_LENGTH (type); reg++, off += 2) + { + regcache_cooked_read (regcache, RET1_REGNUM + reg, + (bfd_byte *) valbuf + off); + } } } @@ -1403,26 +1339,29 @@ tdisassemble_command (char *arg, int from_tty) { int i, count; CORE_ADDR low, high; - char *space_index; if (!arg) { low = 0; high = trace_data.size; } - else if (!(space_index = (char *) strchr (arg, ' '))) - { - low = parse_and_eval_address (arg); - high = low + 5; - } else - { - /* Two arguments. */ - *space_index = '\0'; - low = parse_and_eval_address (arg); - high = parse_and_eval_address (space_index + 1); - if (high < low) - high = low; + { + char *space_index = strchr (arg, ' '); + if (space_index == NULL) + { + low = parse_and_eval_address (arg); + high = low + 5; + } + else + { + /* Two arguments. */ + *space_index = '\0'; + low = parse_and_eval_address (arg); + high = parse_and_eval_address (space_index + 1); + if (high < low) + high = low; + } } printf_filtered ("Dump of trace from %s to %s:\n", paddr_u (low), paddr_u (high)); @@ -1490,14 +1429,163 @@ display_trace (int low, int high) } } +static CORE_ADDR +d10v_unwind_pc (struct gdbarch *gdbarch, struct frame_info *next_frame) +{ + ULONGEST pc; + frame_unwind_unsigned_register (next_frame, PC_REGNUM, &pc); + return d10v_make_iaddr (pc); +} + +/* Given a GDB frame, determine the address of the calling function's + frame. This will be used to create a new GDB frame struct. */ + +static void +d10v_frame_this_id (struct frame_info *next_frame, + void **this_prologue_cache, + struct frame_id *this_id) +{ + struct d10v_unwind_cache *info + = d10v_frame_unwind_cache (next_frame, this_prologue_cache); + CORE_ADDR base; + CORE_ADDR pc; + + /* Start with a NULL frame ID. */ + (*this_id) = null_frame_id; + + /* The PC is easy. */ + pc = frame_pc_unwind (next_frame); + + /* This is meant to halt the backtrace at "_start". Make sure we + don't halt it at a generic dummy frame. */ + if (pc == IMEM_START || pc <= IMEM_START || inside_entry_file (pc)) + return; + + /* Hopefully the prologue analysis either correctly determined the + frame's base (which is the SP from the previous frame), or set + that base to "NULL". */ + base = info->base; + if (base == STACK_START || base == 0) + return; + + /* Check that we're not going round in circles with the same frame + ID (but avoid applying the test to sentinel frames which do go + round in circles). Can't use frame_id_eq() as that doesn't yet + compare the frame's PC value. */ + if (frame_relative_level (next_frame) >= 0 + && get_frame_type (next_frame) != DUMMY_FRAME + && get_frame_id (next_frame).pc == pc + && get_frame_id (next_frame).base == base) + return; + + this_id->base = base; + this_id->pc = pc; +} + +static void +saved_regs_unwinder (struct frame_info *next_frame, + CORE_ADDR *this_saved_regs, + int regnum, int *optimizedp, + enum lval_type *lvalp, CORE_ADDR *addrp, + int *realnump, void *bufferp) +{ + if (this_saved_regs[regnum] != 0) + { + if (regnum == SP_REGNUM) + { + /* SP register treated specially. */ + *optimizedp = 0; + *lvalp = not_lval; + *addrp = 0; + *realnump = -1; + if (bufferp != NULL) + store_address (bufferp, register_size (current_gdbarch, regnum), + this_saved_regs[regnum]); + } + else + { + /* Any other register is saved in memory, fetch it but cache + a local copy of its value. */ + *optimizedp = 0; + *lvalp = lval_memory; + *addrp = this_saved_regs[regnum]; + *realnump = -1; + if (bufferp != NULL) + { + /* Read the value in from memory. */ + read_memory (this_saved_regs[regnum], bufferp, + register_size (current_gdbarch, regnum)); + } + } + return; + } + + /* No luck, assume this and the next frame have the same register + value. If a value is needed, pass the request on down the chain; + otherwise just return an indication that the value is in the same + register as the next frame. */ + frame_register_unwind (next_frame, regnum, optimizedp, lvalp, addrp, + realnump, bufferp); +} + + +static void +d10v_frame_prev_register (struct frame_info *next_frame, + void **this_prologue_cache, + int regnum, int *optimizedp, + enum lval_type *lvalp, CORE_ADDR *addrp, + int *realnump, void *bufferp) +{ + struct d10v_unwind_cache *info + = d10v_frame_unwind_cache (next_frame, this_prologue_cache); + if (regnum == PC_REGNUM) + { + /* The call instruction saves the caller's PC in LR. The + function prologue of the callee may then save the LR on the + stack. Find that possibly saved LR value and return it. */ + saved_regs_unwinder (next_frame, info->saved_regs, LR_REGNUM, optimizedp, + lvalp, addrp, realnump, bufferp); + } + else + { + saved_regs_unwinder (next_frame, info->saved_regs, regnum, optimizedp, + lvalp, addrp, realnump, bufferp); + } +} + + +static struct frame_unwind d10v_frame_unwind = { + d10v_frame_this_id, + d10v_frame_prev_register +}; + +const struct frame_unwind * +d10v_frame_p (CORE_ADDR pc) +{ + return &d10v_frame_unwind; +} + +/* Assuming NEXT_FRAME->prev is a dummy, return the frame ID of that + dummy frame. The frame ID's base needs to match the TOS value + saved by save_dummy_frame_tos(), and the PC match the dummy frame's + breakpoint. */ + +static struct frame_id +d10v_unwind_dummy_id (struct gdbarch *gdbarch, struct frame_info *next_frame) +{ + ULONGEST base; + struct frame_id id; + id.pc = frame_pc_unwind (next_frame); + frame_unwind_unsigned_register (next_frame, SP_REGNUM, &base); + id.base = d10v_make_daddr (base); + return id; +} static gdbarch_init_ftype d10v_gdbarch_init; static struct gdbarch * d10v_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) { - static LONGEST d10v_call_dummy_words[] = - {0}; struct gdbarch *gdbarch; int d10v_num_regs; struct gdbarch_tdep *tdep; @@ -1514,10 +1602,6 @@ d10v_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) tdep = XMALLOC (struct gdbarch_tdep); gdbarch = gdbarch_alloc (&info, tdep); - /* NOTE: cagney/2002-12-06: This can be deleted when this arch is - ready to unwind the PC first (see frame.c:get_prev_frame()). */ - set_gdbarch_deprecated_init_frame_pc (gdbarch, init_frame_pc_default); - switch (info.bfd_arch_info->mach) { case bfd_mach_d10v_ts2: @@ -1545,21 +1629,17 @@ d10v_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_write_pc (gdbarch, d10v_write_pc); set_gdbarch_read_fp (gdbarch, d10v_read_fp); set_gdbarch_read_sp (gdbarch, d10v_read_sp); - set_gdbarch_write_sp (gdbarch, d10v_write_sp); set_gdbarch_num_regs (gdbarch, d10v_num_regs); set_gdbarch_sp_regnum (gdbarch, 15); - set_gdbarch_fp_regnum (gdbarch, 11); set_gdbarch_pc_regnum (gdbarch, 18); set_gdbarch_register_name (gdbarch, d10v_register_name); set_gdbarch_register_size (gdbarch, 2); set_gdbarch_register_bytes (gdbarch, (d10v_num_regs - 2) * 2 + 16); set_gdbarch_register_byte (gdbarch, d10v_register_byte); set_gdbarch_register_raw_size (gdbarch, d10v_register_raw_size); - set_gdbarch_max_register_raw_size (gdbarch, 8); set_gdbarch_register_virtual_size (gdbarch, generic_register_size); - set_gdbarch_max_register_virtual_size (gdbarch, 8); - set_gdbarch_register_virtual_type (gdbarch, d10v_register_virtual_type); + set_gdbarch_register_type (gdbarch, d10v_register_type); set_gdbarch_ptr_bit (gdbarch, 2 * TARGET_CHAR_BIT); set_gdbarch_addr_bit (gdbarch, 32); @@ -1593,31 +1673,17 @@ d10v_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) } set_gdbarch_call_dummy_length (gdbarch, 0); - set_gdbarch_call_dummy_address (gdbarch, entry_point_address); set_gdbarch_call_dummy_breakpoint_offset_p (gdbarch, 1); set_gdbarch_call_dummy_breakpoint_offset (gdbarch, 0); set_gdbarch_call_dummy_start_offset (gdbarch, 0); - set_gdbarch_call_dummy_words (gdbarch, d10v_call_dummy_words); - set_gdbarch_sizeof_call_dummy_words (gdbarch, sizeof (d10v_call_dummy_words)); - set_gdbarch_call_dummy_p (gdbarch, 1); - set_gdbarch_call_dummy_stack_adjust_p (gdbarch, 0); set_gdbarch_fix_call_dummy (gdbarch, generic_fix_call_dummy); - set_gdbarch_deprecated_extract_return_value (gdbarch, d10v_extract_return_value); - set_gdbarch_push_arguments (gdbarch, d10v_push_arguments); - set_gdbarch_push_dummy_frame (gdbarch, generic_push_dummy_frame); - set_gdbarch_push_return_address (gdbarch, d10v_push_return_address); - - set_gdbarch_store_struct_return (gdbarch, d10v_store_struct_return); - set_gdbarch_deprecated_store_return_value (gdbarch, d10v_store_return_value); - set_gdbarch_deprecated_extract_struct_value_address (gdbarch, d10v_extract_struct_value_address); + set_gdbarch_extract_return_value (gdbarch, d10v_extract_return_value); + set_gdbarch_push_dummy_call (gdbarch, d10v_push_dummy_call); + set_gdbarch_store_return_value (gdbarch, d10v_store_return_value); + set_gdbarch_extract_struct_value_address (gdbarch, d10v_extract_struct_value_address); set_gdbarch_use_struct_convention (gdbarch, d10v_use_struct_convention); - set_gdbarch_frame_init_saved_regs (gdbarch, d10v_frame_init_saved_regs); - set_gdbarch_init_extra_frame_info (gdbarch, d10v_init_extra_frame_info); - - set_gdbarch_pop_frame (gdbarch, d10v_pop_frame); - set_gdbarch_skip_prologue (gdbarch, d10v_skip_prologue); set_gdbarch_inner_than (gdbarch, core_addr_lessthan); set_gdbarch_decr_pc_after_break (gdbarch, 4); @@ -1628,23 +1694,26 @@ d10v_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_frame_args_skip (gdbarch, 0); set_gdbarch_frameless_function_invocation (gdbarch, frameless_look_for_prologue); - set_gdbarch_frame_chain (gdbarch, d10v_frame_chain); - set_gdbarch_frame_chain_valid (gdbarch, d10v_frame_chain_valid); - set_gdbarch_frame_saved_pc (gdbarch, d10v_frame_saved_pc); set_gdbarch_saved_pc_after_call (gdbarch, d10v_saved_pc_after_call); set_gdbarch_frame_num_args (gdbarch, frame_num_args_unknown); set_gdbarch_stack_align (gdbarch, d10v_stack_align); set_gdbarch_register_sim_regno (gdbarch, d10v_register_sim_regno); - set_gdbarch_extra_stack_alignment_needed (gdbarch, 0); - return gdbarch; -} + set_gdbarch_print_registers_info (gdbarch, d10v_print_registers_info); + + frame_unwind_append_predicate (gdbarch, d10v_frame_p); + /* Methods for saving / extracting a dummy frame's ID. */ + set_gdbarch_unwind_dummy_id (gdbarch, d10v_unwind_dummy_id); + set_gdbarch_save_dummy_frame_tos (gdbarch, generic_save_dummy_frame_tos); -extern void (*target_resume_hook) (void); -extern void (*target_wait_loop_hook) (void); + /* Return the unwound PC value. */ + set_gdbarch_unwind_pc (gdbarch, d10v_unwind_pc); + + return gdbarch; +} void _initialize_d10v_tdep (void) @@ -1656,7 +1725,8 @@ _initialize_d10v_tdep (void) target_resume_hook = d10v_eva_prepare_to_trace; target_wait_loop_hook = d10v_eva_get_trace_data; - add_com ("regs", class_vars, show_regs, "Print all registers"); + deprecate_cmd (add_com ("regs", class_vars, show_regs, "Print all registers"), + "info registers"); add_com ("itrace", class_support, trace_command, "Enable tracing of instruction execution.");