diff options
Diffstat (limited to 'gdb/avr-tdep.c')
| -rw-r--r-- | gdb/avr-tdep.c | 95 |
1 files changed, 12 insertions, 83 deletions
diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c index a4893ba..975132a 100644 --- a/gdb/avr-tdep.c +++ b/gdb/avr-tdep.c @@ -418,7 +418,8 @@ avr_convert_from_func_ptr_addr (CORE_ADDR addr) return addr * 2; } -/* avr_scan_prologue is also used as the frame_init_saved_regs(). +/* avr_scan_prologue is also used as the + deprecated_frame_init_saved_regs(). Put here the code to store, into fi->saved_regs, the addresses of the saved registers of frame described by FRAME_INFO. This @@ -892,34 +893,6 @@ avr_saved_pc_after_call (struct frame_info *frame) return (m2 | (m1 << 8)) * 2; } -/* Figure out where in REGBUF the called function has left its return value. - Copy that into VALBUF. */ - -static void -avr_extract_return_value (struct type *type, char *regbuf, char *valbuf) -{ - int wordsize, len; - - wordsize = 2; - - len = TYPE_LENGTH (type); - - switch (len) - { - case 1: /* (char) */ - case 2: /* (short), (int) */ - memcpy (valbuf, regbuf + REGISTER_BYTE (24), 2); - break; - case 4: /* (long), (float) */ - memcpy (valbuf, regbuf + REGISTER_BYTE (22), 4); - break; - case 8: /* (double) (doesn't seem to happen, which is good, - because this almost certainly isn't right. */ - error ("I don't know how a double is returned."); - break; - } -} - /* Returns the return address for a dummy. */ static CORE_ADDR @@ -928,35 +901,6 @@ avr_call_dummy_address (void) return entry_point_address (); } -/* Place the appropriate value in the appropriate registers. - Primarily used by the RETURN command. */ - -static void -avr_store_return_value (struct type *type, char *valbuf) -{ - int wordsize, len, regval; - - wordsize = 2; - - len = TYPE_LENGTH (type); - switch (len) - { - case 1: /* char */ - case 2: /* short, int */ - regval = extract_address (valbuf, len); - write_register (0, regval); - break; - case 4: /* long, float */ - regval = extract_address (valbuf, len); - write_register (0, regval >> 16); - write_register (1, regval & 0xffff); - break; - case 8: /* presumeably double, but doesn't seem to happen */ - error ("I don't know how to return a double."); - break; - } -} - /* Setup the return address for a dummy frame, as called by call_function_by_hand. Only necessary when you are using an empty CALL_DUMMY. */ @@ -1031,8 +975,8 @@ avr_frame_address (struct frame_info *fi) /* 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. + then DEPRECATED_INIT_EXTRA_FRAME_INFO and DEPRECATED_INIT_FRAME_PC + will be called for the new frame. For us, the frame address is its stack pointer value, so we look up the function prologue to determine the caller's sp value, and return it. */ @@ -1067,17 +1011,6 @@ avr_store_struct_return (CORE_ADDR addr, CORE_ADDR sp) write_register (0, addr); } -/* Extract from an array REGBUF containing the (raw) register state - the address in which a function should return its structure value, - as a CORE_ADDR (or an expression that can be used as one). */ - -static CORE_ADDR -avr_extract_struct_value_address (char *regbuf) -{ - return (extract_address ((regbuf) + REGISTER_BYTE (0), - REGISTER_RAW_SIZE (0)) | AVR_SMEM_START); -} - /* Setup the function arguments for calling a function in the inferior. On the AVR architecture, there are 18 registers (R25 to R8) which are @@ -1227,9 +1160,9 @@ avr_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_register_bytes (gdbarch, AVR_NUM_REG_BYTES); set_gdbarch_register_byte (gdbarch, avr_register_byte); set_gdbarch_register_raw_size (gdbarch, avr_register_raw_size); - set_gdbarch_max_register_raw_size (gdbarch, 4); + set_gdbarch_deprecated_max_register_raw_size (gdbarch, 4); set_gdbarch_register_virtual_size (gdbarch, avr_register_virtual_size); - set_gdbarch_max_register_virtual_size (gdbarch, 4); + set_gdbarch_deprecated_max_register_virtual_size (gdbarch, 4); set_gdbarch_register_virtual_type (gdbarch, avr_register_virtual_type); set_gdbarch_print_insn (gdbarch, print_insn_avr); @@ -1248,23 +1181,16 @@ avr_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_address_to_pointer (gdbarch, avr_address_to_pointer); set_gdbarch_pointer_to_address (gdbarch, avr_pointer_to_address); - set_gdbarch_deprecated_extract_return_value (gdbarch, avr_extract_return_value); set_gdbarch_push_arguments (gdbarch, avr_push_arguments); - set_gdbarch_push_dummy_frame (gdbarch, generic_push_dummy_frame); set_gdbarch_push_return_address (gdbarch, avr_push_return_address); set_gdbarch_pop_frame (gdbarch, avr_pop_frame); - set_gdbarch_deprecated_store_return_value (gdbarch, avr_store_return_value); - set_gdbarch_use_struct_convention (gdbarch, generic_use_struct_convention); set_gdbarch_store_struct_return (gdbarch, avr_store_struct_return); - set_gdbarch_deprecated_extract_struct_value_address - (gdbarch, avr_extract_struct_value_address); - set_gdbarch_frame_init_saved_regs (gdbarch, avr_scan_prologue); - set_gdbarch_init_extra_frame_info (gdbarch, avr_init_extra_frame_info); + set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, avr_scan_prologue); + set_gdbarch_deprecated_init_extra_frame_info (gdbarch, avr_init_extra_frame_info); set_gdbarch_skip_prologue (gdbarch, avr_skip_prologue); -/* set_gdbarch_prologue_frameless_p (gdbarch, avr_prologue_frameless_p); */ set_gdbarch_inner_than (gdbarch, core_addr_lessthan); set_gdbarch_decr_pc_after_break (gdbarch, 0); @@ -1353,7 +1279,10 @@ avr_io_reg_read_command (char *args, int from_tty) for (i = 0; i < nreg; i += step) { - j = step - (nreg % step); /* how many registers this round? */ + /* how many registers this round? */ + j = step; + if ((i+j) >= nreg) + j = nreg - i; /* last block is less than 8 registers */ snprintf (query, sizeof (query) - 1, "avr.io_reg:%x,%x", i, j); target_query ((int) 'R', query, buf, &bufsiz); |