2003-07-21 20:56:05 +02:00
|
|
|
/* Target-dependent code for Renesas M32R, for GDB.
|
|
|
|
|
2007-01-09 18:59:20 +01:00
|
|
|
Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2007
|
|
|
|
Free Software Foundation, Inc.
|
2003-07-21 20:56:05 +02:00
|
|
|
|
|
|
|
This file is part of GDB.
|
|
|
|
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
2007-08-23 20:08:50 +02:00
|
|
|
the Free Software Foundation; either version 3 of the License, or
|
2003-07-21 20:56:05 +02:00
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
2007-08-23 20:08:50 +02:00
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
2003-07-21 20:56:05 +02:00
|
|
|
|
|
|
|
#include "defs.h"
|
|
|
|
#include "frame.h"
|
|
|
|
#include "frame-unwind.h"
|
|
|
|
#include "frame-base.h"
|
|
|
|
#include "symtab.h"
|
|
|
|
#include "gdbtypes.h"
|
|
|
|
#include "gdbcmd.h"
|
|
|
|
#include "gdbcore.h"
|
|
|
|
#include "gdb_string.h"
|
|
|
|
#include "value.h"
|
|
|
|
#include "inferior.h"
|
|
|
|
#include "symfile.h"
|
|
|
|
#include "objfiles.h"
|
2004-11-04 03:15:20 +01:00
|
|
|
#include "osabi.h"
|
2003-07-21 20:56:05 +02:00
|
|
|
#include "language.h"
|
|
|
|
#include "arch-utils.h"
|
|
|
|
#include "regcache.h"
|
|
|
|
#include "trad-frame.h"
|
2003-10-08 04:41:49 +02:00
|
|
|
#include "dis-asm.h"
|
2003-07-21 20:56:05 +02:00
|
|
|
|
|
|
|
#include "gdb_assert.h"
|
|
|
|
|
2004-10-01 09:29:34 +02:00
|
|
|
#include "m32r-tdep.h"
|
2003-07-21 20:56:05 +02:00
|
|
|
|
|
|
|
/* Local functions */
|
|
|
|
|
|
|
|
extern void _initialize_m32r_tdep (void);
|
|
|
|
|
|
|
|
static CORE_ADDR
|
|
|
|
m32r_frame_align (struct gdbarch *gdbarch, CORE_ADDR sp)
|
|
|
|
{
|
|
|
|
/* Align to the size of an instruction (so that they can safely be
|
|
|
|
pushed onto the stack. */
|
|
|
|
return sp & ~3;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2004-11-04 01:40:39 +01:00
|
|
|
/* Breakpoints
|
|
|
|
|
|
|
|
The little endian mode of M32R is unique. In most of architectures,
|
|
|
|
two 16-bit instructions, A and B, are placed as the following:
|
|
|
|
|
|
|
|
Big endian:
|
|
|
|
A0 A1 B0 B1
|
|
|
|
|
|
|
|
Little endian:
|
|
|
|
A1 A0 B1 B0
|
|
|
|
|
|
|
|
In M32R, they are placed like this:
|
|
|
|
|
|
|
|
Big endian:
|
|
|
|
A0 A1 B0 B1
|
|
|
|
|
|
|
|
Little endian:
|
|
|
|
B1 B0 A1 A0
|
|
|
|
|
|
|
|
This is because M32R always fetches instructions in 32-bit.
|
|
|
|
|
|
|
|
The following functions take care of this behavior. */
|
2003-07-21 20:56:05 +02:00
|
|
|
|
|
|
|
static int
|
gdb/
* breakpoint.c (deprecated_read_memory_nobpt): Update to use
shadow_len.
(insert_bp_location, reattach_breakpoints, remove_breakpoint)
(delete_breakpoint): Update calls to changed methods.
(deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint)
(single_step_breakpoints, insert_single_step_breakpoint)
(remove_single_step_breakpoints): New.
* breakpoint.h (struct bp_target_info): New.
(struct bp_location): Replace shadow_contents with
target_info and overlay_target_info.
(deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint)
(insert_single_step_breakpoint, remove_single_step_breakpoints): New
prototypes.
* gdbarch.sh: Forward declare struct bp_target_info in gdbarch.h.
(memory_insert_breakpoint, memory_remove_breakpoint): Update second
argument.
* mem-break.c (default_memory_insert_breakpoint): Update. Set
placed_address, placed_size, and shadow_len.
(default_memory_remove_breakpoint): Update. Don't use
BREAKPOINT_FROM_PC.
(memory_insert_breakpoint, memory_remove_breakpoint): Update.
* target.c (update_current_target): Update prototypes for changed
functions.
(debug_to_insert_breakpoint, debug_to_remove_breakpoint)
(debug_to_insert_hw_breakpoint, debug_to_remove_hw_breakpoint):
Update.
* target.h: Forward declare struct bp_target_info.
(struct target_ops): Use a bp_target_info argument for
to_insert_breakpoint, to_remove_breakpoint,
to_insert_hw_breakpoint, and to_remove_hw_breakpoint.
(target_insert_breakpoint, target_remove_breakpoint)
(target_insert_hw_breakpoint, target_remove_hw_breakpoint)
(memory_insert_breakpoint, memory_remove_breakpoint)
(default_memory_insert_breakpoint, default_memory_remove_breakpoint):
Update.
* config/i386/nm-i386.h: Forward declare struct bp_target_info.
(i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): Update.
(target_insert_hw_breakpoint, target_remove_hw_breakpoint): Likewise.
* gdbarch.c, gdbarch.h: Regenerated.
* alpha-tdep.c (alpha_software_single_step): Use
insert_single_step_breakpoint and remove_single_step_breakpoints.
Remove unused statics.
* arm-tdep.c (arm_software_single_step): Likewise. Add a note.
* cris-tdep.c (cris_software_single_step): Likewise.
* mips-tdep.c (mips_software_single_step): Likewise.
* rs6000-tdep.c (rs6000_software_single_step): Likewise.
* sparc-tdep.c (sparc_software_single_step): Likewise.
* wince.c (struct thread_info_struct): Remove step_prev.
(undoSStep): Use remove_single_step_breakpoints.
(wince_software_single_step): Use insert_single_step_breakpoint.
* corelow.c (ignore): Remove unneeded prototype. Update arguments.
* exec.c (ignore): Likewise.
* sol-thread.c (ignore): Likewise.
* procfs.c (dbx_link_shadow_contents): Delete.
(dbx_link_bpt): New.
(procfs_mourn_inferior): Remove it if necessary.
(remove_dbx_link_breakpoint): Use it.
(insert_dbx_link_bpt_in_file): Set it.
(procfs_init_inferior): Don't update dbx_link_bpt_addr.
* rs6000-nat.c (exec_one_dummy_insn): Use
deprecated_insert_raw_breakpoint and
deprecated_remove_raw_breakpoint.
* solib-irix.c (shadow_contents, breakpoint_addr): Delete.
(base_breakpoint): New.
(disable_break): Use it.
(enable_break): Set it.
* i386-nat.c (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint):
Update.
* ia64-tdep.c (ia64_memory_insert_breakpoint)
(ia64_memory_remove_breakpoint): Likewise.
* m32r-tdep.c (m32r_memory_insert_breakpoint)
(m32r_memory_remove_breakpoint): Likewise.
* monitor.c (monitor_insert_breakpoint, monitor_remove_breakpoint):
Likewise. Remove unnecessary prototypes. Use placed_address
and placed_size. Removed useless read from memory.
* nto-procfs.c (procfs_insert_breakpoint)
(procfs_remove_breakpoint, procfs_insert_hw_breakpoint)
(procfs_remove_hw_breakpoint): Update.
* ocd.c (ocd_insert_breakpoint, ocd_remove_breakpoint): Likewise.
* ocd.h (ocd_insert_breakpoint, ocd_remove_breakpoint): Likewise.
* ppc-linux-tdep.c (ppc_linux_memory_remove_breakpoint): Likewise.
* ppc-tdep.h (ppc_linux_memory_remove_breakpoint): Likewise.
* remote-e7000.c (e7000_insert_breakpoint)
(e7000_remove_breakpoint): Likewise.
* remote-m32r-sdi.c (m32r_insert_breakpoint)
(m32r_remove_breakpoint): Likewise.
* remote-mips.c (mips_insert_breakpoint)
(mips_remove_breakpoint): Likewise.
* remote-rdp.c (remote_rdp_insert_breakpoint)
(remote_rdp_remove_breakpoint): Likewise.
(rdp_step): Use deprecated_insert_raw_breakpoint and
deprecated_remove_raw_breakpoint.
* remote-sds.c (sds_insert_breakpoint, sds_remove_breakpoint):
Update.
* remote-sim.c (gdbsim_insert_breakpoint, gdbsim_remove_breakpoint):
Delete.
(init_gdbsim_ops): Use memory_insert_breakpoint and
memory_remove_breakpoint.
* remote-st.c (st2000_insert_breakpoint)
(st2000_remove_breakpoint): Update. Remove unused
BREAKPOINT_FROM_PC.
* remote.c (remote_insert_breakpoint, remote_remove_breakpoint):
Update. Use placed_address and placed_size.
(remote_insert_hw_breakpoint, remote_remove_hw_breakpoint): Likewise.
gdb/doc/
* gdbint.texinfo (x86 Watchpoints, Target Conditionals): Update insert
and remove breakpoint prototypes.
(Watchpoints): Move description of target_insert_hw_breakpoint and
target_remove_hw_breakpoint ...
(Breakpoints): ... to here. Document target_insert_breakpoint and
target_remove_breakpoint.
2006-04-18 21:20:08 +02:00
|
|
|
m32r_memory_insert_breakpoint (struct bp_target_info *bp_tgt)
|
2003-07-21 20:56:05 +02:00
|
|
|
{
|
gdb/
* breakpoint.c (deprecated_read_memory_nobpt): Update to use
shadow_len.
(insert_bp_location, reattach_breakpoints, remove_breakpoint)
(delete_breakpoint): Update calls to changed methods.
(deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint)
(single_step_breakpoints, insert_single_step_breakpoint)
(remove_single_step_breakpoints): New.
* breakpoint.h (struct bp_target_info): New.
(struct bp_location): Replace shadow_contents with
target_info and overlay_target_info.
(deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint)
(insert_single_step_breakpoint, remove_single_step_breakpoints): New
prototypes.
* gdbarch.sh: Forward declare struct bp_target_info in gdbarch.h.
(memory_insert_breakpoint, memory_remove_breakpoint): Update second
argument.
* mem-break.c (default_memory_insert_breakpoint): Update. Set
placed_address, placed_size, and shadow_len.
(default_memory_remove_breakpoint): Update. Don't use
BREAKPOINT_FROM_PC.
(memory_insert_breakpoint, memory_remove_breakpoint): Update.
* target.c (update_current_target): Update prototypes for changed
functions.
(debug_to_insert_breakpoint, debug_to_remove_breakpoint)
(debug_to_insert_hw_breakpoint, debug_to_remove_hw_breakpoint):
Update.
* target.h: Forward declare struct bp_target_info.
(struct target_ops): Use a bp_target_info argument for
to_insert_breakpoint, to_remove_breakpoint,
to_insert_hw_breakpoint, and to_remove_hw_breakpoint.
(target_insert_breakpoint, target_remove_breakpoint)
(target_insert_hw_breakpoint, target_remove_hw_breakpoint)
(memory_insert_breakpoint, memory_remove_breakpoint)
(default_memory_insert_breakpoint, default_memory_remove_breakpoint):
Update.
* config/i386/nm-i386.h: Forward declare struct bp_target_info.
(i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): Update.
(target_insert_hw_breakpoint, target_remove_hw_breakpoint): Likewise.
* gdbarch.c, gdbarch.h: Regenerated.
* alpha-tdep.c (alpha_software_single_step): Use
insert_single_step_breakpoint and remove_single_step_breakpoints.
Remove unused statics.
* arm-tdep.c (arm_software_single_step): Likewise. Add a note.
* cris-tdep.c (cris_software_single_step): Likewise.
* mips-tdep.c (mips_software_single_step): Likewise.
* rs6000-tdep.c (rs6000_software_single_step): Likewise.
* sparc-tdep.c (sparc_software_single_step): Likewise.
* wince.c (struct thread_info_struct): Remove step_prev.
(undoSStep): Use remove_single_step_breakpoints.
(wince_software_single_step): Use insert_single_step_breakpoint.
* corelow.c (ignore): Remove unneeded prototype. Update arguments.
* exec.c (ignore): Likewise.
* sol-thread.c (ignore): Likewise.
* procfs.c (dbx_link_shadow_contents): Delete.
(dbx_link_bpt): New.
(procfs_mourn_inferior): Remove it if necessary.
(remove_dbx_link_breakpoint): Use it.
(insert_dbx_link_bpt_in_file): Set it.
(procfs_init_inferior): Don't update dbx_link_bpt_addr.
* rs6000-nat.c (exec_one_dummy_insn): Use
deprecated_insert_raw_breakpoint and
deprecated_remove_raw_breakpoint.
* solib-irix.c (shadow_contents, breakpoint_addr): Delete.
(base_breakpoint): New.
(disable_break): Use it.
(enable_break): Set it.
* i386-nat.c (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint):
Update.
* ia64-tdep.c (ia64_memory_insert_breakpoint)
(ia64_memory_remove_breakpoint): Likewise.
* m32r-tdep.c (m32r_memory_insert_breakpoint)
(m32r_memory_remove_breakpoint): Likewise.
* monitor.c (monitor_insert_breakpoint, monitor_remove_breakpoint):
Likewise. Remove unnecessary prototypes. Use placed_address
and placed_size. Removed useless read from memory.
* nto-procfs.c (procfs_insert_breakpoint)
(procfs_remove_breakpoint, procfs_insert_hw_breakpoint)
(procfs_remove_hw_breakpoint): Update.
* ocd.c (ocd_insert_breakpoint, ocd_remove_breakpoint): Likewise.
* ocd.h (ocd_insert_breakpoint, ocd_remove_breakpoint): Likewise.
* ppc-linux-tdep.c (ppc_linux_memory_remove_breakpoint): Likewise.
* ppc-tdep.h (ppc_linux_memory_remove_breakpoint): Likewise.
* remote-e7000.c (e7000_insert_breakpoint)
(e7000_remove_breakpoint): Likewise.
* remote-m32r-sdi.c (m32r_insert_breakpoint)
(m32r_remove_breakpoint): Likewise.
* remote-mips.c (mips_insert_breakpoint)
(mips_remove_breakpoint): Likewise.
* remote-rdp.c (remote_rdp_insert_breakpoint)
(remote_rdp_remove_breakpoint): Likewise.
(rdp_step): Use deprecated_insert_raw_breakpoint and
deprecated_remove_raw_breakpoint.
* remote-sds.c (sds_insert_breakpoint, sds_remove_breakpoint):
Update.
* remote-sim.c (gdbsim_insert_breakpoint, gdbsim_remove_breakpoint):
Delete.
(init_gdbsim_ops): Use memory_insert_breakpoint and
memory_remove_breakpoint.
* remote-st.c (st2000_insert_breakpoint)
(st2000_remove_breakpoint): Update. Remove unused
BREAKPOINT_FROM_PC.
* remote.c (remote_insert_breakpoint, remote_remove_breakpoint):
Update. Use placed_address and placed_size.
(remote_insert_hw_breakpoint, remote_remove_hw_breakpoint): Likewise.
gdb/doc/
* gdbint.texinfo (x86 Watchpoints, Target Conditionals): Update insert
and remove breakpoint prototypes.
(Watchpoints): Move description of target_insert_hw_breakpoint and
target_remove_hw_breakpoint ...
(Breakpoints): ... to here. Document target_insert_breakpoint and
target_remove_breakpoint.
2006-04-18 21:20:08 +02:00
|
|
|
CORE_ADDR addr = bp_tgt->placed_address;
|
2003-07-21 20:56:05 +02:00
|
|
|
int val;
|
2005-11-08 06:54:22 +01:00
|
|
|
gdb_byte buf[4];
|
gdb/
* breakpoint.c (deprecated_read_memory_nobpt): Update to use
shadow_len.
(insert_bp_location, reattach_breakpoints, remove_breakpoint)
(delete_breakpoint): Update calls to changed methods.
(deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint)
(single_step_breakpoints, insert_single_step_breakpoint)
(remove_single_step_breakpoints): New.
* breakpoint.h (struct bp_target_info): New.
(struct bp_location): Replace shadow_contents with
target_info and overlay_target_info.
(deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint)
(insert_single_step_breakpoint, remove_single_step_breakpoints): New
prototypes.
* gdbarch.sh: Forward declare struct bp_target_info in gdbarch.h.
(memory_insert_breakpoint, memory_remove_breakpoint): Update second
argument.
* mem-break.c (default_memory_insert_breakpoint): Update. Set
placed_address, placed_size, and shadow_len.
(default_memory_remove_breakpoint): Update. Don't use
BREAKPOINT_FROM_PC.
(memory_insert_breakpoint, memory_remove_breakpoint): Update.
* target.c (update_current_target): Update prototypes for changed
functions.
(debug_to_insert_breakpoint, debug_to_remove_breakpoint)
(debug_to_insert_hw_breakpoint, debug_to_remove_hw_breakpoint):
Update.
* target.h: Forward declare struct bp_target_info.
(struct target_ops): Use a bp_target_info argument for
to_insert_breakpoint, to_remove_breakpoint,
to_insert_hw_breakpoint, and to_remove_hw_breakpoint.
(target_insert_breakpoint, target_remove_breakpoint)
(target_insert_hw_breakpoint, target_remove_hw_breakpoint)
(memory_insert_breakpoint, memory_remove_breakpoint)
(default_memory_insert_breakpoint, default_memory_remove_breakpoint):
Update.
* config/i386/nm-i386.h: Forward declare struct bp_target_info.
(i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): Update.
(target_insert_hw_breakpoint, target_remove_hw_breakpoint): Likewise.
* gdbarch.c, gdbarch.h: Regenerated.
* alpha-tdep.c (alpha_software_single_step): Use
insert_single_step_breakpoint and remove_single_step_breakpoints.
Remove unused statics.
* arm-tdep.c (arm_software_single_step): Likewise. Add a note.
* cris-tdep.c (cris_software_single_step): Likewise.
* mips-tdep.c (mips_software_single_step): Likewise.
* rs6000-tdep.c (rs6000_software_single_step): Likewise.
* sparc-tdep.c (sparc_software_single_step): Likewise.
* wince.c (struct thread_info_struct): Remove step_prev.
(undoSStep): Use remove_single_step_breakpoints.
(wince_software_single_step): Use insert_single_step_breakpoint.
* corelow.c (ignore): Remove unneeded prototype. Update arguments.
* exec.c (ignore): Likewise.
* sol-thread.c (ignore): Likewise.
* procfs.c (dbx_link_shadow_contents): Delete.
(dbx_link_bpt): New.
(procfs_mourn_inferior): Remove it if necessary.
(remove_dbx_link_breakpoint): Use it.
(insert_dbx_link_bpt_in_file): Set it.
(procfs_init_inferior): Don't update dbx_link_bpt_addr.
* rs6000-nat.c (exec_one_dummy_insn): Use
deprecated_insert_raw_breakpoint and
deprecated_remove_raw_breakpoint.
* solib-irix.c (shadow_contents, breakpoint_addr): Delete.
(base_breakpoint): New.
(disable_break): Use it.
(enable_break): Set it.
* i386-nat.c (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint):
Update.
* ia64-tdep.c (ia64_memory_insert_breakpoint)
(ia64_memory_remove_breakpoint): Likewise.
* m32r-tdep.c (m32r_memory_insert_breakpoint)
(m32r_memory_remove_breakpoint): Likewise.
* monitor.c (monitor_insert_breakpoint, monitor_remove_breakpoint):
Likewise. Remove unnecessary prototypes. Use placed_address
and placed_size. Removed useless read from memory.
* nto-procfs.c (procfs_insert_breakpoint)
(procfs_remove_breakpoint, procfs_insert_hw_breakpoint)
(procfs_remove_hw_breakpoint): Update.
* ocd.c (ocd_insert_breakpoint, ocd_remove_breakpoint): Likewise.
* ocd.h (ocd_insert_breakpoint, ocd_remove_breakpoint): Likewise.
* ppc-linux-tdep.c (ppc_linux_memory_remove_breakpoint): Likewise.
* ppc-tdep.h (ppc_linux_memory_remove_breakpoint): Likewise.
* remote-e7000.c (e7000_insert_breakpoint)
(e7000_remove_breakpoint): Likewise.
* remote-m32r-sdi.c (m32r_insert_breakpoint)
(m32r_remove_breakpoint): Likewise.
* remote-mips.c (mips_insert_breakpoint)
(mips_remove_breakpoint): Likewise.
* remote-rdp.c (remote_rdp_insert_breakpoint)
(remote_rdp_remove_breakpoint): Likewise.
(rdp_step): Use deprecated_insert_raw_breakpoint and
deprecated_remove_raw_breakpoint.
* remote-sds.c (sds_insert_breakpoint, sds_remove_breakpoint):
Update.
* remote-sim.c (gdbsim_insert_breakpoint, gdbsim_remove_breakpoint):
Delete.
(init_gdbsim_ops): Use memory_insert_breakpoint and
memory_remove_breakpoint.
* remote-st.c (st2000_insert_breakpoint)
(st2000_remove_breakpoint): Update. Remove unused
BREAKPOINT_FROM_PC.
* remote.c (remote_insert_breakpoint, remote_remove_breakpoint):
Update. Use placed_address and placed_size.
(remote_insert_hw_breakpoint, remote_remove_hw_breakpoint): Likewise.
gdb/doc/
* gdbint.texinfo (x86 Watchpoints, Target Conditionals): Update insert
and remove breakpoint prototypes.
(Watchpoints): Move description of target_insert_hw_breakpoint and
target_remove_hw_breakpoint ...
(Breakpoints): ... to here. Document target_insert_breakpoint and
target_remove_breakpoint.
2006-04-18 21:20:08 +02:00
|
|
|
gdb_byte *contents_cache = bp_tgt->shadow_contents;
|
2005-11-08 06:54:22 +01:00
|
|
|
gdb_byte bp_entry[] = { 0x10, 0xf1 }; /* dpt */
|
2003-07-21 20:56:05 +02:00
|
|
|
|
|
|
|
/* Save the memory contents. */
|
2004-11-04 01:40:39 +01:00
|
|
|
val = target_read_memory (addr & 0xfffffffc, contents_cache, 4);
|
2003-07-21 20:56:05 +02:00
|
|
|
if (val != 0)
|
|
|
|
return val; /* return error */
|
|
|
|
|
gdb/
* breakpoint.c (deprecated_read_memory_nobpt): Update to use
shadow_len.
(insert_bp_location, reattach_breakpoints, remove_breakpoint)
(delete_breakpoint): Update calls to changed methods.
(deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint)
(single_step_breakpoints, insert_single_step_breakpoint)
(remove_single_step_breakpoints): New.
* breakpoint.h (struct bp_target_info): New.
(struct bp_location): Replace shadow_contents with
target_info and overlay_target_info.
(deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint)
(insert_single_step_breakpoint, remove_single_step_breakpoints): New
prototypes.
* gdbarch.sh: Forward declare struct bp_target_info in gdbarch.h.
(memory_insert_breakpoint, memory_remove_breakpoint): Update second
argument.
* mem-break.c (default_memory_insert_breakpoint): Update. Set
placed_address, placed_size, and shadow_len.
(default_memory_remove_breakpoint): Update. Don't use
BREAKPOINT_FROM_PC.
(memory_insert_breakpoint, memory_remove_breakpoint): Update.
* target.c (update_current_target): Update prototypes for changed
functions.
(debug_to_insert_breakpoint, debug_to_remove_breakpoint)
(debug_to_insert_hw_breakpoint, debug_to_remove_hw_breakpoint):
Update.
* target.h: Forward declare struct bp_target_info.
(struct target_ops): Use a bp_target_info argument for
to_insert_breakpoint, to_remove_breakpoint,
to_insert_hw_breakpoint, and to_remove_hw_breakpoint.
(target_insert_breakpoint, target_remove_breakpoint)
(target_insert_hw_breakpoint, target_remove_hw_breakpoint)
(memory_insert_breakpoint, memory_remove_breakpoint)
(default_memory_insert_breakpoint, default_memory_remove_breakpoint):
Update.
* config/i386/nm-i386.h: Forward declare struct bp_target_info.
(i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): Update.
(target_insert_hw_breakpoint, target_remove_hw_breakpoint): Likewise.
* gdbarch.c, gdbarch.h: Regenerated.
* alpha-tdep.c (alpha_software_single_step): Use
insert_single_step_breakpoint and remove_single_step_breakpoints.
Remove unused statics.
* arm-tdep.c (arm_software_single_step): Likewise. Add a note.
* cris-tdep.c (cris_software_single_step): Likewise.
* mips-tdep.c (mips_software_single_step): Likewise.
* rs6000-tdep.c (rs6000_software_single_step): Likewise.
* sparc-tdep.c (sparc_software_single_step): Likewise.
* wince.c (struct thread_info_struct): Remove step_prev.
(undoSStep): Use remove_single_step_breakpoints.
(wince_software_single_step): Use insert_single_step_breakpoint.
* corelow.c (ignore): Remove unneeded prototype. Update arguments.
* exec.c (ignore): Likewise.
* sol-thread.c (ignore): Likewise.
* procfs.c (dbx_link_shadow_contents): Delete.
(dbx_link_bpt): New.
(procfs_mourn_inferior): Remove it if necessary.
(remove_dbx_link_breakpoint): Use it.
(insert_dbx_link_bpt_in_file): Set it.
(procfs_init_inferior): Don't update dbx_link_bpt_addr.
* rs6000-nat.c (exec_one_dummy_insn): Use
deprecated_insert_raw_breakpoint and
deprecated_remove_raw_breakpoint.
* solib-irix.c (shadow_contents, breakpoint_addr): Delete.
(base_breakpoint): New.
(disable_break): Use it.
(enable_break): Set it.
* i386-nat.c (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint):
Update.
* ia64-tdep.c (ia64_memory_insert_breakpoint)
(ia64_memory_remove_breakpoint): Likewise.
* m32r-tdep.c (m32r_memory_insert_breakpoint)
(m32r_memory_remove_breakpoint): Likewise.
* monitor.c (monitor_insert_breakpoint, monitor_remove_breakpoint):
Likewise. Remove unnecessary prototypes. Use placed_address
and placed_size. Removed useless read from memory.
* nto-procfs.c (procfs_insert_breakpoint)
(procfs_remove_breakpoint, procfs_insert_hw_breakpoint)
(procfs_remove_hw_breakpoint): Update.
* ocd.c (ocd_insert_breakpoint, ocd_remove_breakpoint): Likewise.
* ocd.h (ocd_insert_breakpoint, ocd_remove_breakpoint): Likewise.
* ppc-linux-tdep.c (ppc_linux_memory_remove_breakpoint): Likewise.
* ppc-tdep.h (ppc_linux_memory_remove_breakpoint): Likewise.
* remote-e7000.c (e7000_insert_breakpoint)
(e7000_remove_breakpoint): Likewise.
* remote-m32r-sdi.c (m32r_insert_breakpoint)
(m32r_remove_breakpoint): Likewise.
* remote-mips.c (mips_insert_breakpoint)
(mips_remove_breakpoint): Likewise.
* remote-rdp.c (remote_rdp_insert_breakpoint)
(remote_rdp_remove_breakpoint): Likewise.
(rdp_step): Use deprecated_insert_raw_breakpoint and
deprecated_remove_raw_breakpoint.
* remote-sds.c (sds_insert_breakpoint, sds_remove_breakpoint):
Update.
* remote-sim.c (gdbsim_insert_breakpoint, gdbsim_remove_breakpoint):
Delete.
(init_gdbsim_ops): Use memory_insert_breakpoint and
memory_remove_breakpoint.
* remote-st.c (st2000_insert_breakpoint)
(st2000_remove_breakpoint): Update. Remove unused
BREAKPOINT_FROM_PC.
* remote.c (remote_insert_breakpoint, remote_remove_breakpoint):
Update. Use placed_address and placed_size.
(remote_insert_hw_breakpoint, remote_remove_hw_breakpoint): Likewise.
gdb/doc/
* gdbint.texinfo (x86 Watchpoints, Target Conditionals): Update insert
and remove breakpoint prototypes.
(Watchpoints): Move description of target_insert_hw_breakpoint and
target_remove_hw_breakpoint ...
(Breakpoints): ... to here. Document target_insert_breakpoint and
target_remove_breakpoint.
2006-04-18 21:20:08 +02:00
|
|
|
bp_tgt->placed_size = bp_tgt->shadow_len = 4;
|
|
|
|
|
2003-07-21 20:56:05 +02:00
|
|
|
/* Determine appropriate breakpoint contents and size for this address. */
|
2007-05-31 Markus Deuling <deuling@de.ibm.com>
* xtensa-tdep.c (XTENSA_IS_ENTRY, extract_call_winsize)
(xtensa_register_write_masked, xtensa_register_read_masked)
(xtensa_extract_return_value, xtensa_store_return_value
(xtensa_push_dummy_call, xtensa_breakpoint_from_pc): Replace
TARGET_BYTE_ORDER by gdbarch_byte_order.
* sh-tdep.c (sh_breakpoint_from_pc, gdb_print_insn_sh)
(sh_justify_value_in_reg, sh_next_flt_argreg, sh_push_dummy_call_fpu)
(sh_extract_return_value_fpu, sh_store_return_value_fpu): Likewise.
* sh64-tdep.c (sh64_breakpoint_from_pc, gdb_print_insn_sh64)
(sh64_push_dummy_call, sh64_extract_return_value)
(sh64_store_return_value, sh64_register_convert_to_virtual)
(sh64_register_convert_to_raw, sh64_pseudo_register_read)
(sh64_pseudo_register_write, sh64_do_fp_register)
(sh64_frame_prev_register): Likewise.
* score-tdep.c (score_print_insn, score_breakpoint_from_pc)
(score_return_value, score_push_dummy_call, score_fetch_inst): Likewise.
* rs6000-tdep.c (rs6000_breakpoint_from_pc, rs6000_push_dummy_call)
(e500_move_ev_register,gdb_print_insn_powerpc): Likewise.
* remote-m32r-sdi.c (m32r_resume, m32r_wait): Likewise.
* ppc-linux-nat.c (store_register): Likewise.
* nto-tdep.c (nto_find_and_open_solib)
(nto_init_solib_absolute_prefix): Likewise.
* mips-tdep.c (mips_pseudo_register_read, mips_pseudo_register_write)
(mips_convert_register_p, mips_eabi_push_dummy_call)
(mips_n32n64_push_dummy_call, mips_n32n64_return_value)
(mips_o32_push_dummy_call, mips_o32_return_value)
(mips_o64_push_dummy_call, mips_o64_return_value, mips_o64_return_value)
(mips_read_fp_register_single, mips_read_fp_register_double)
(mips_print_register, print_gp_register_row, gdb_print_insn_mips)
(mips_breakpoint_from_pc): Likewise.
* mipsnbsd-tdep.c (mipsnbsd_sigtramp_offset): Likewise.
* mips-linux-tdep.c (mips64_supply_fpregset, mips64_fill_fpregset)
(mips_linux_o32_sigframe_init): Likewise.
* m32r-tdep.c (m32r_memory_insert_breakpoint)
(m32r_memory_remove_breakpoint, m32r_breakpoint_from_pc): Likewise.
* libunwind-frame.c (libunwind_frame_cache, libunwind_frame_sniffer)
(libunwind_sigtramp_frame_sniffer, libunwind_get_reg_special): Likewise.
* iq2000-tdep.c (iq2000_breakpoint_from_pc): Likewise.
* coffread.c (process_coff_symbol): Likewise.
* arm-tdep.c (convert_from_extended, convert_to_extended)
(gdb_print_insn_arm): Likewise.
2007-05-31 22:57:41 +02:00
|
|
|
if (gdbarch_byte_order (current_gdbarch) == BFD_ENDIAN_BIG)
|
2003-07-21 20:56:05 +02:00
|
|
|
{
|
2004-11-04 01:40:39 +01:00
|
|
|
if ((addr & 3) == 0)
|
2003-07-21 20:56:05 +02:00
|
|
|
{
|
2004-11-04 01:40:39 +01:00
|
|
|
buf[0] = bp_entry[0];
|
|
|
|
buf[1] = bp_entry[1];
|
|
|
|
buf[2] = contents_cache[2] & 0x7f;
|
|
|
|
buf[3] = contents_cache[3];
|
2003-07-21 20:56:05 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2004-11-04 01:40:39 +01:00
|
|
|
buf[0] = contents_cache[0];
|
|
|
|
buf[1] = contents_cache[1];
|
|
|
|
buf[2] = bp_entry[0];
|
|
|
|
buf[3] = bp_entry[1];
|
2003-07-21 20:56:05 +02:00
|
|
|
}
|
|
|
|
}
|
2004-11-04 01:40:39 +01:00
|
|
|
else /* little-endian */
|
|
|
|
{
|
|
|
|
if ((addr & 3) == 0)
|
2003-07-21 20:56:05 +02:00
|
|
|
{
|
2004-11-04 01:40:39 +01:00
|
|
|
buf[0] = contents_cache[0];
|
|
|
|
buf[1] = contents_cache[1] & 0x7f;
|
|
|
|
buf[2] = bp_entry[1];
|
|
|
|
buf[3] = bp_entry[0];
|
2003-07-21 20:56:05 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2004-11-04 01:40:39 +01:00
|
|
|
buf[0] = bp_entry[1];
|
|
|
|
buf[1] = bp_entry[0];
|
|
|
|
buf[2] = contents_cache[2];
|
|
|
|
buf[3] = contents_cache[3];
|
2003-07-21 20:56:05 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Write the breakpoint. */
|
2004-11-04 01:40:39 +01:00
|
|
|
val = target_write_memory (addr & 0xfffffffc, buf, 4);
|
2003-07-21 20:56:05 +02:00
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
gdb/
* breakpoint.c (deprecated_read_memory_nobpt): Update to use
shadow_len.
(insert_bp_location, reattach_breakpoints, remove_breakpoint)
(delete_breakpoint): Update calls to changed methods.
(deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint)
(single_step_breakpoints, insert_single_step_breakpoint)
(remove_single_step_breakpoints): New.
* breakpoint.h (struct bp_target_info): New.
(struct bp_location): Replace shadow_contents with
target_info and overlay_target_info.
(deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint)
(insert_single_step_breakpoint, remove_single_step_breakpoints): New
prototypes.
* gdbarch.sh: Forward declare struct bp_target_info in gdbarch.h.
(memory_insert_breakpoint, memory_remove_breakpoint): Update second
argument.
* mem-break.c (default_memory_insert_breakpoint): Update. Set
placed_address, placed_size, and shadow_len.
(default_memory_remove_breakpoint): Update. Don't use
BREAKPOINT_FROM_PC.
(memory_insert_breakpoint, memory_remove_breakpoint): Update.
* target.c (update_current_target): Update prototypes for changed
functions.
(debug_to_insert_breakpoint, debug_to_remove_breakpoint)
(debug_to_insert_hw_breakpoint, debug_to_remove_hw_breakpoint):
Update.
* target.h: Forward declare struct bp_target_info.
(struct target_ops): Use a bp_target_info argument for
to_insert_breakpoint, to_remove_breakpoint,
to_insert_hw_breakpoint, and to_remove_hw_breakpoint.
(target_insert_breakpoint, target_remove_breakpoint)
(target_insert_hw_breakpoint, target_remove_hw_breakpoint)
(memory_insert_breakpoint, memory_remove_breakpoint)
(default_memory_insert_breakpoint, default_memory_remove_breakpoint):
Update.
* config/i386/nm-i386.h: Forward declare struct bp_target_info.
(i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): Update.
(target_insert_hw_breakpoint, target_remove_hw_breakpoint): Likewise.
* gdbarch.c, gdbarch.h: Regenerated.
* alpha-tdep.c (alpha_software_single_step): Use
insert_single_step_breakpoint and remove_single_step_breakpoints.
Remove unused statics.
* arm-tdep.c (arm_software_single_step): Likewise. Add a note.
* cris-tdep.c (cris_software_single_step): Likewise.
* mips-tdep.c (mips_software_single_step): Likewise.
* rs6000-tdep.c (rs6000_software_single_step): Likewise.
* sparc-tdep.c (sparc_software_single_step): Likewise.
* wince.c (struct thread_info_struct): Remove step_prev.
(undoSStep): Use remove_single_step_breakpoints.
(wince_software_single_step): Use insert_single_step_breakpoint.
* corelow.c (ignore): Remove unneeded prototype. Update arguments.
* exec.c (ignore): Likewise.
* sol-thread.c (ignore): Likewise.
* procfs.c (dbx_link_shadow_contents): Delete.
(dbx_link_bpt): New.
(procfs_mourn_inferior): Remove it if necessary.
(remove_dbx_link_breakpoint): Use it.
(insert_dbx_link_bpt_in_file): Set it.
(procfs_init_inferior): Don't update dbx_link_bpt_addr.
* rs6000-nat.c (exec_one_dummy_insn): Use
deprecated_insert_raw_breakpoint and
deprecated_remove_raw_breakpoint.
* solib-irix.c (shadow_contents, breakpoint_addr): Delete.
(base_breakpoint): New.
(disable_break): Use it.
(enable_break): Set it.
* i386-nat.c (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint):
Update.
* ia64-tdep.c (ia64_memory_insert_breakpoint)
(ia64_memory_remove_breakpoint): Likewise.
* m32r-tdep.c (m32r_memory_insert_breakpoint)
(m32r_memory_remove_breakpoint): Likewise.
* monitor.c (monitor_insert_breakpoint, monitor_remove_breakpoint):
Likewise. Remove unnecessary prototypes. Use placed_address
and placed_size. Removed useless read from memory.
* nto-procfs.c (procfs_insert_breakpoint)
(procfs_remove_breakpoint, procfs_insert_hw_breakpoint)
(procfs_remove_hw_breakpoint): Update.
* ocd.c (ocd_insert_breakpoint, ocd_remove_breakpoint): Likewise.
* ocd.h (ocd_insert_breakpoint, ocd_remove_breakpoint): Likewise.
* ppc-linux-tdep.c (ppc_linux_memory_remove_breakpoint): Likewise.
* ppc-tdep.h (ppc_linux_memory_remove_breakpoint): Likewise.
* remote-e7000.c (e7000_insert_breakpoint)
(e7000_remove_breakpoint): Likewise.
* remote-m32r-sdi.c (m32r_insert_breakpoint)
(m32r_remove_breakpoint): Likewise.
* remote-mips.c (mips_insert_breakpoint)
(mips_remove_breakpoint): Likewise.
* remote-rdp.c (remote_rdp_insert_breakpoint)
(remote_rdp_remove_breakpoint): Likewise.
(rdp_step): Use deprecated_insert_raw_breakpoint and
deprecated_remove_raw_breakpoint.
* remote-sds.c (sds_insert_breakpoint, sds_remove_breakpoint):
Update.
* remote-sim.c (gdbsim_insert_breakpoint, gdbsim_remove_breakpoint):
Delete.
(init_gdbsim_ops): Use memory_insert_breakpoint and
memory_remove_breakpoint.
* remote-st.c (st2000_insert_breakpoint)
(st2000_remove_breakpoint): Update. Remove unused
BREAKPOINT_FROM_PC.
* remote.c (remote_insert_breakpoint, remote_remove_breakpoint):
Update. Use placed_address and placed_size.
(remote_insert_hw_breakpoint, remote_remove_hw_breakpoint): Likewise.
gdb/doc/
* gdbint.texinfo (x86 Watchpoints, Target Conditionals): Update insert
and remove breakpoint prototypes.
(Watchpoints): Move description of target_insert_hw_breakpoint and
target_remove_hw_breakpoint ...
(Breakpoints): ... to here. Document target_insert_breakpoint and
target_remove_breakpoint.
2006-04-18 21:20:08 +02:00
|
|
|
m32r_memory_remove_breakpoint (struct bp_target_info *bp_tgt)
|
2003-07-21 20:56:05 +02:00
|
|
|
{
|
gdb/
* breakpoint.c (deprecated_read_memory_nobpt): Update to use
shadow_len.
(insert_bp_location, reattach_breakpoints, remove_breakpoint)
(delete_breakpoint): Update calls to changed methods.
(deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint)
(single_step_breakpoints, insert_single_step_breakpoint)
(remove_single_step_breakpoints): New.
* breakpoint.h (struct bp_target_info): New.
(struct bp_location): Replace shadow_contents with
target_info and overlay_target_info.
(deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint)
(insert_single_step_breakpoint, remove_single_step_breakpoints): New
prototypes.
* gdbarch.sh: Forward declare struct bp_target_info in gdbarch.h.
(memory_insert_breakpoint, memory_remove_breakpoint): Update second
argument.
* mem-break.c (default_memory_insert_breakpoint): Update. Set
placed_address, placed_size, and shadow_len.
(default_memory_remove_breakpoint): Update. Don't use
BREAKPOINT_FROM_PC.
(memory_insert_breakpoint, memory_remove_breakpoint): Update.
* target.c (update_current_target): Update prototypes for changed
functions.
(debug_to_insert_breakpoint, debug_to_remove_breakpoint)
(debug_to_insert_hw_breakpoint, debug_to_remove_hw_breakpoint):
Update.
* target.h: Forward declare struct bp_target_info.
(struct target_ops): Use a bp_target_info argument for
to_insert_breakpoint, to_remove_breakpoint,
to_insert_hw_breakpoint, and to_remove_hw_breakpoint.
(target_insert_breakpoint, target_remove_breakpoint)
(target_insert_hw_breakpoint, target_remove_hw_breakpoint)
(memory_insert_breakpoint, memory_remove_breakpoint)
(default_memory_insert_breakpoint, default_memory_remove_breakpoint):
Update.
* config/i386/nm-i386.h: Forward declare struct bp_target_info.
(i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): Update.
(target_insert_hw_breakpoint, target_remove_hw_breakpoint): Likewise.
* gdbarch.c, gdbarch.h: Regenerated.
* alpha-tdep.c (alpha_software_single_step): Use
insert_single_step_breakpoint and remove_single_step_breakpoints.
Remove unused statics.
* arm-tdep.c (arm_software_single_step): Likewise. Add a note.
* cris-tdep.c (cris_software_single_step): Likewise.
* mips-tdep.c (mips_software_single_step): Likewise.
* rs6000-tdep.c (rs6000_software_single_step): Likewise.
* sparc-tdep.c (sparc_software_single_step): Likewise.
* wince.c (struct thread_info_struct): Remove step_prev.
(undoSStep): Use remove_single_step_breakpoints.
(wince_software_single_step): Use insert_single_step_breakpoint.
* corelow.c (ignore): Remove unneeded prototype. Update arguments.
* exec.c (ignore): Likewise.
* sol-thread.c (ignore): Likewise.
* procfs.c (dbx_link_shadow_contents): Delete.
(dbx_link_bpt): New.
(procfs_mourn_inferior): Remove it if necessary.
(remove_dbx_link_breakpoint): Use it.
(insert_dbx_link_bpt_in_file): Set it.
(procfs_init_inferior): Don't update dbx_link_bpt_addr.
* rs6000-nat.c (exec_one_dummy_insn): Use
deprecated_insert_raw_breakpoint and
deprecated_remove_raw_breakpoint.
* solib-irix.c (shadow_contents, breakpoint_addr): Delete.
(base_breakpoint): New.
(disable_break): Use it.
(enable_break): Set it.
* i386-nat.c (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint):
Update.
* ia64-tdep.c (ia64_memory_insert_breakpoint)
(ia64_memory_remove_breakpoint): Likewise.
* m32r-tdep.c (m32r_memory_insert_breakpoint)
(m32r_memory_remove_breakpoint): Likewise.
* monitor.c (monitor_insert_breakpoint, monitor_remove_breakpoint):
Likewise. Remove unnecessary prototypes. Use placed_address
and placed_size. Removed useless read from memory.
* nto-procfs.c (procfs_insert_breakpoint)
(procfs_remove_breakpoint, procfs_insert_hw_breakpoint)
(procfs_remove_hw_breakpoint): Update.
* ocd.c (ocd_insert_breakpoint, ocd_remove_breakpoint): Likewise.
* ocd.h (ocd_insert_breakpoint, ocd_remove_breakpoint): Likewise.
* ppc-linux-tdep.c (ppc_linux_memory_remove_breakpoint): Likewise.
* ppc-tdep.h (ppc_linux_memory_remove_breakpoint): Likewise.
* remote-e7000.c (e7000_insert_breakpoint)
(e7000_remove_breakpoint): Likewise.
* remote-m32r-sdi.c (m32r_insert_breakpoint)
(m32r_remove_breakpoint): Likewise.
* remote-mips.c (mips_insert_breakpoint)
(mips_remove_breakpoint): Likewise.
* remote-rdp.c (remote_rdp_insert_breakpoint)
(remote_rdp_remove_breakpoint): Likewise.
(rdp_step): Use deprecated_insert_raw_breakpoint and
deprecated_remove_raw_breakpoint.
* remote-sds.c (sds_insert_breakpoint, sds_remove_breakpoint):
Update.
* remote-sim.c (gdbsim_insert_breakpoint, gdbsim_remove_breakpoint):
Delete.
(init_gdbsim_ops): Use memory_insert_breakpoint and
memory_remove_breakpoint.
* remote-st.c (st2000_insert_breakpoint)
(st2000_remove_breakpoint): Update. Remove unused
BREAKPOINT_FROM_PC.
* remote.c (remote_insert_breakpoint, remote_remove_breakpoint):
Update. Use placed_address and placed_size.
(remote_insert_hw_breakpoint, remote_remove_hw_breakpoint): Likewise.
gdb/doc/
* gdbint.texinfo (x86 Watchpoints, Target Conditionals): Update insert
and remove breakpoint prototypes.
(Watchpoints): Move description of target_insert_hw_breakpoint and
target_remove_hw_breakpoint ...
(Breakpoints): ... to here. Document target_insert_breakpoint and
target_remove_breakpoint.
2006-04-18 21:20:08 +02:00
|
|
|
CORE_ADDR addr = bp_tgt->placed_address;
|
2003-07-21 20:56:05 +02:00
|
|
|
int val;
|
2005-11-08 06:54:22 +01:00
|
|
|
gdb_byte buf[4];
|
gdb/
* breakpoint.c (deprecated_read_memory_nobpt): Update to use
shadow_len.
(insert_bp_location, reattach_breakpoints, remove_breakpoint)
(delete_breakpoint): Update calls to changed methods.
(deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint)
(single_step_breakpoints, insert_single_step_breakpoint)
(remove_single_step_breakpoints): New.
* breakpoint.h (struct bp_target_info): New.
(struct bp_location): Replace shadow_contents with
target_info and overlay_target_info.
(deprecated_insert_raw_breakpoint, deprecated_remove_raw_breakpoint)
(insert_single_step_breakpoint, remove_single_step_breakpoints): New
prototypes.
* gdbarch.sh: Forward declare struct bp_target_info in gdbarch.h.
(memory_insert_breakpoint, memory_remove_breakpoint): Update second
argument.
* mem-break.c (default_memory_insert_breakpoint): Update. Set
placed_address, placed_size, and shadow_len.
(default_memory_remove_breakpoint): Update. Don't use
BREAKPOINT_FROM_PC.
(memory_insert_breakpoint, memory_remove_breakpoint): Update.
* target.c (update_current_target): Update prototypes for changed
functions.
(debug_to_insert_breakpoint, debug_to_remove_breakpoint)
(debug_to_insert_hw_breakpoint, debug_to_remove_hw_breakpoint):
Update.
* target.h: Forward declare struct bp_target_info.
(struct target_ops): Use a bp_target_info argument for
to_insert_breakpoint, to_remove_breakpoint,
to_insert_hw_breakpoint, and to_remove_hw_breakpoint.
(target_insert_breakpoint, target_remove_breakpoint)
(target_insert_hw_breakpoint, target_remove_hw_breakpoint)
(memory_insert_breakpoint, memory_remove_breakpoint)
(default_memory_insert_breakpoint, default_memory_remove_breakpoint):
Update.
* config/i386/nm-i386.h: Forward declare struct bp_target_info.
(i386_insert_hw_breakpoint, i386_remove_hw_breakpoint): Update.
(target_insert_hw_breakpoint, target_remove_hw_breakpoint): Likewise.
* gdbarch.c, gdbarch.h: Regenerated.
* alpha-tdep.c (alpha_software_single_step): Use
insert_single_step_breakpoint and remove_single_step_breakpoints.
Remove unused statics.
* arm-tdep.c (arm_software_single_step): Likewise. Add a note.
* cris-tdep.c (cris_software_single_step): Likewise.
* mips-tdep.c (mips_software_single_step): Likewise.
* rs6000-tdep.c (rs6000_software_single_step): Likewise.
* sparc-tdep.c (sparc_software_single_step): Likewise.
* wince.c (struct thread_info_struct): Remove step_prev.
(undoSStep): Use remove_single_step_breakpoints.
(wince_software_single_step): Use insert_single_step_breakpoint.
* corelow.c (ignore): Remove unneeded prototype. Update arguments.
* exec.c (ignore): Likewise.
* sol-thread.c (ignore): Likewise.
* procfs.c (dbx_link_shadow_contents): Delete.
(dbx_link_bpt): New.
(procfs_mourn_inferior): Remove it if necessary.
(remove_dbx_link_breakpoint): Use it.
(insert_dbx_link_bpt_in_file): Set it.
(procfs_init_inferior): Don't update dbx_link_bpt_addr.
* rs6000-nat.c (exec_one_dummy_insn): Use
deprecated_insert_raw_breakpoint and
deprecated_remove_raw_breakpoint.
* solib-irix.c (shadow_contents, breakpoint_addr): Delete.
(base_breakpoint): New.
(disable_break): Use it.
(enable_break): Set it.
* i386-nat.c (i386_insert_hw_breakpoint, i386_remove_hw_breakpoint):
Update.
* ia64-tdep.c (ia64_memory_insert_breakpoint)
(ia64_memory_remove_breakpoint): Likewise.
* m32r-tdep.c (m32r_memory_insert_breakpoint)
(m32r_memory_remove_breakpoint): Likewise.
* monitor.c (monitor_insert_breakpoint, monitor_remove_breakpoint):
Likewise. Remove unnecessary prototypes. Use placed_address
and placed_size. Removed useless read from memory.
* nto-procfs.c (procfs_insert_breakpoint)
(procfs_remove_breakpoint, procfs_insert_hw_breakpoint)
(procfs_remove_hw_breakpoint): Update.
* ocd.c (ocd_insert_breakpoint, ocd_remove_breakpoint): Likewise.
* ocd.h (ocd_insert_breakpoint, ocd_remove_breakpoint): Likewise.
* ppc-linux-tdep.c (ppc_linux_memory_remove_breakpoint): Likewise.
* ppc-tdep.h (ppc_linux_memory_remove_breakpoint): Likewise.
* remote-e7000.c (e7000_insert_breakpoint)
(e7000_remove_breakpoint): Likewise.
* remote-m32r-sdi.c (m32r_insert_breakpoint)
(m32r_remove_breakpoint): Likewise.
* remote-mips.c (mips_insert_breakpoint)
(mips_remove_breakpoint): Likewise.
* remote-rdp.c (remote_rdp_insert_breakpoint)
(remote_rdp_remove_breakpoint): Likewise.
(rdp_step): Use deprecated_insert_raw_breakpoint and
deprecated_remove_raw_breakpoint.
* remote-sds.c (sds_insert_breakpoint, sds_remove_breakpoint):
Update.
* remote-sim.c (gdbsim_insert_breakpoint, gdbsim_remove_breakpoint):
Delete.
(init_gdbsim_ops): Use memory_insert_breakpoint and
memory_remove_breakpoint.
* remote-st.c (st2000_insert_breakpoint)
(st2000_remove_breakpoint): Update. Remove unused
BREAKPOINT_FROM_PC.
* remote.c (remote_insert_breakpoint, remote_remove_breakpoint):
Update. Use placed_address and placed_size.
(remote_insert_hw_breakpoint, remote_remove_hw_breakpoint): Likewise.
gdb/doc/
* gdbint.texinfo (x86 Watchpoints, Target Conditionals): Update insert
and remove breakpoint prototypes.
(Watchpoints): Move description of target_insert_hw_breakpoint and
target_remove_hw_breakpoint ...
(Breakpoints): ... to here. Document target_insert_breakpoint and
target_remove_breakpoint.
2006-04-18 21:20:08 +02:00
|
|
|
gdb_byte *contents_cache = bp_tgt->shadow_contents;
|
2003-07-21 20:56:05 +02:00
|
|
|
|
2004-11-04 01:40:39 +01:00
|
|
|
buf[0] = contents_cache[0];
|
|
|
|
buf[1] = contents_cache[1];
|
|
|
|
buf[2] = contents_cache[2];
|
|
|
|
buf[3] = contents_cache[3];
|
|
|
|
|
|
|
|
/* Remove parallel bit. */
|
2007-05-31 Markus Deuling <deuling@de.ibm.com>
* xtensa-tdep.c (XTENSA_IS_ENTRY, extract_call_winsize)
(xtensa_register_write_masked, xtensa_register_read_masked)
(xtensa_extract_return_value, xtensa_store_return_value
(xtensa_push_dummy_call, xtensa_breakpoint_from_pc): Replace
TARGET_BYTE_ORDER by gdbarch_byte_order.
* sh-tdep.c (sh_breakpoint_from_pc, gdb_print_insn_sh)
(sh_justify_value_in_reg, sh_next_flt_argreg, sh_push_dummy_call_fpu)
(sh_extract_return_value_fpu, sh_store_return_value_fpu): Likewise.
* sh64-tdep.c (sh64_breakpoint_from_pc, gdb_print_insn_sh64)
(sh64_push_dummy_call, sh64_extract_return_value)
(sh64_store_return_value, sh64_register_convert_to_virtual)
(sh64_register_convert_to_raw, sh64_pseudo_register_read)
(sh64_pseudo_register_write, sh64_do_fp_register)
(sh64_frame_prev_register): Likewise.
* score-tdep.c (score_print_insn, score_breakpoint_from_pc)
(score_return_value, score_push_dummy_call, score_fetch_inst): Likewise.
* rs6000-tdep.c (rs6000_breakpoint_from_pc, rs6000_push_dummy_call)
(e500_move_ev_register,gdb_print_insn_powerpc): Likewise.
* remote-m32r-sdi.c (m32r_resume, m32r_wait): Likewise.
* ppc-linux-nat.c (store_register): Likewise.
* nto-tdep.c (nto_find_and_open_solib)
(nto_init_solib_absolute_prefix): Likewise.
* mips-tdep.c (mips_pseudo_register_read, mips_pseudo_register_write)
(mips_convert_register_p, mips_eabi_push_dummy_call)
(mips_n32n64_push_dummy_call, mips_n32n64_return_value)
(mips_o32_push_dummy_call, mips_o32_return_value)
(mips_o64_push_dummy_call, mips_o64_return_value, mips_o64_return_value)
(mips_read_fp_register_single, mips_read_fp_register_double)
(mips_print_register, print_gp_register_row, gdb_print_insn_mips)
(mips_breakpoint_from_pc): Likewise.
* mipsnbsd-tdep.c (mipsnbsd_sigtramp_offset): Likewise.
* mips-linux-tdep.c (mips64_supply_fpregset, mips64_fill_fpregset)
(mips_linux_o32_sigframe_init): Likewise.
* m32r-tdep.c (m32r_memory_insert_breakpoint)
(m32r_memory_remove_breakpoint, m32r_breakpoint_from_pc): Likewise.
* libunwind-frame.c (libunwind_frame_cache, libunwind_frame_sniffer)
(libunwind_sigtramp_frame_sniffer, libunwind_get_reg_special): Likewise.
* iq2000-tdep.c (iq2000_breakpoint_from_pc): Likewise.
* coffread.c (process_coff_symbol): Likewise.
* arm-tdep.c (convert_from_extended, convert_to_extended)
(gdb_print_insn_arm): Likewise.
2007-05-31 22:57:41 +02:00
|
|
|
if (gdbarch_byte_order (current_gdbarch) == BFD_ENDIAN_BIG)
|
2003-07-21 20:56:05 +02:00
|
|
|
{
|
2004-11-04 01:40:39 +01:00
|
|
|
if ((buf[0] & 0x80) == 0 && (buf[2] & 0x80) != 0)
|
|
|
|
buf[2] &= 0x7f;
|
2003-07-21 20:56:05 +02:00
|
|
|
}
|
2004-11-04 01:40:39 +01:00
|
|
|
else /* little-endian */
|
2003-07-21 20:56:05 +02:00
|
|
|
{
|
2004-11-04 01:40:39 +01:00
|
|
|
if ((buf[3] & 0x80) == 0 && (buf[1] & 0x80) != 0)
|
|
|
|
buf[1] &= 0x7f;
|
2003-07-21 20:56:05 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Write contents. */
|
2004-11-04 01:40:39 +01:00
|
|
|
val = target_write_memory (addr & 0xfffffffc, buf, 4);
|
2003-07-21 20:56:05 +02:00
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2005-11-08 06:54:22 +01:00
|
|
|
static const gdb_byte *
|
2003-07-21 20:56:05 +02:00
|
|
|
m32r_breakpoint_from_pc (CORE_ADDR *pcptr, int *lenptr)
|
|
|
|
{
|
2005-11-08 06:54:22 +01:00
|
|
|
static gdb_byte be_bp_entry[] = { 0x10, 0xf1, 0x70, 0x00 }; /* dpt -> nop */
|
|
|
|
static gdb_byte le_bp_entry[] = { 0x00, 0x70, 0xf1, 0x10 }; /* dpt -> nop */
|
|
|
|
gdb_byte *bp;
|
2003-07-21 20:56:05 +02:00
|
|
|
|
|
|
|
/* Determine appropriate breakpoint. */
|
2007-05-31 Markus Deuling <deuling@de.ibm.com>
* xtensa-tdep.c (XTENSA_IS_ENTRY, extract_call_winsize)
(xtensa_register_write_masked, xtensa_register_read_masked)
(xtensa_extract_return_value, xtensa_store_return_value
(xtensa_push_dummy_call, xtensa_breakpoint_from_pc): Replace
TARGET_BYTE_ORDER by gdbarch_byte_order.
* sh-tdep.c (sh_breakpoint_from_pc, gdb_print_insn_sh)
(sh_justify_value_in_reg, sh_next_flt_argreg, sh_push_dummy_call_fpu)
(sh_extract_return_value_fpu, sh_store_return_value_fpu): Likewise.
* sh64-tdep.c (sh64_breakpoint_from_pc, gdb_print_insn_sh64)
(sh64_push_dummy_call, sh64_extract_return_value)
(sh64_store_return_value, sh64_register_convert_to_virtual)
(sh64_register_convert_to_raw, sh64_pseudo_register_read)
(sh64_pseudo_register_write, sh64_do_fp_register)
(sh64_frame_prev_register): Likewise.
* score-tdep.c (score_print_insn, score_breakpoint_from_pc)
(score_return_value, score_push_dummy_call, score_fetch_inst): Likewise.
* rs6000-tdep.c (rs6000_breakpoint_from_pc, rs6000_push_dummy_call)
(e500_move_ev_register,gdb_print_insn_powerpc): Likewise.
* remote-m32r-sdi.c (m32r_resume, m32r_wait): Likewise.
* ppc-linux-nat.c (store_register): Likewise.
* nto-tdep.c (nto_find_and_open_solib)
(nto_init_solib_absolute_prefix): Likewise.
* mips-tdep.c (mips_pseudo_register_read, mips_pseudo_register_write)
(mips_convert_register_p, mips_eabi_push_dummy_call)
(mips_n32n64_push_dummy_call, mips_n32n64_return_value)
(mips_o32_push_dummy_call, mips_o32_return_value)
(mips_o64_push_dummy_call, mips_o64_return_value, mips_o64_return_value)
(mips_read_fp_register_single, mips_read_fp_register_double)
(mips_print_register, print_gp_register_row, gdb_print_insn_mips)
(mips_breakpoint_from_pc): Likewise.
* mipsnbsd-tdep.c (mipsnbsd_sigtramp_offset): Likewise.
* mips-linux-tdep.c (mips64_supply_fpregset, mips64_fill_fpregset)
(mips_linux_o32_sigframe_init): Likewise.
* m32r-tdep.c (m32r_memory_insert_breakpoint)
(m32r_memory_remove_breakpoint, m32r_breakpoint_from_pc): Likewise.
* libunwind-frame.c (libunwind_frame_cache, libunwind_frame_sniffer)
(libunwind_sigtramp_frame_sniffer, libunwind_get_reg_special): Likewise.
* iq2000-tdep.c (iq2000_breakpoint_from_pc): Likewise.
* coffread.c (process_coff_symbol): Likewise.
* arm-tdep.c (convert_from_extended, convert_to_extended)
(gdb_print_insn_arm): Likewise.
2007-05-31 22:57:41 +02:00
|
|
|
if (gdbarch_byte_order (current_gdbarch) == BFD_ENDIAN_BIG)
|
2003-07-21 20:56:05 +02:00
|
|
|
{
|
|
|
|
if ((*pcptr & 3) == 0)
|
|
|
|
{
|
2004-11-04 01:40:39 +01:00
|
|
|
bp = be_bp_entry;
|
|
|
|
*lenptr = 4;
|
2003-07-21 20:56:05 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2004-11-04 01:40:39 +01:00
|
|
|
bp = be_bp_entry;
|
|
|
|
*lenptr = 2;
|
2003-07-21 20:56:05 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if ((*pcptr & 3) == 0)
|
|
|
|
{
|
2004-11-04 01:40:39 +01:00
|
|
|
bp = le_bp_entry;
|
|
|
|
*lenptr = 4;
|
2003-07-21 20:56:05 +02:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2004-11-04 01:40:39 +01:00
|
|
|
bp = le_bp_entry + 2;
|
|
|
|
*lenptr = 2;
|
2003-07-21 20:56:05 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return bp;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
char *m32r_register_names[] = {
|
|
|
|
"r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",
|
|
|
|
"r8", "r9", "r10", "r11", "r12", "fp", "lr", "sp",
|
|
|
|
"psw", "cbr", "spi", "spu", "bpc", "pc", "accl", "acch",
|
|
|
|
"evb"
|
|
|
|
};
|
|
|
|
|
|
|
|
static const char *
|
|
|
|
m32r_register_name (int reg_nr)
|
|
|
|
{
|
|
|
|
if (reg_nr < 0)
|
|
|
|
return NULL;
|
2004-10-01 09:29:34 +02:00
|
|
|
if (reg_nr >= M32R_NUM_REGS)
|
2003-07-21 20:56:05 +02:00
|
|
|
return NULL;
|
|
|
|
return m32r_register_names[reg_nr];
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Return the GDB type object for the "standard" data type
|
|
|
|
of data in register N. */
|
|
|
|
|
|
|
|
static struct type *
|
|
|
|
m32r_register_type (struct gdbarch *gdbarch, int reg_nr)
|
|
|
|
{
|
|
|
|
if (reg_nr == M32R_PC_REGNUM)
|
|
|
|
return builtin_type_void_func_ptr;
|
|
|
|
else if (reg_nr == M32R_SP_REGNUM || reg_nr == M32R_FP_REGNUM)
|
|
|
|
return builtin_type_void_data_ptr;
|
|
|
|
else
|
|
|
|
return builtin_type_int32;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* 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
|
|
|
|
m32r_store_return_value (struct type *type, struct regcache *regcache,
|
|
|
|
const void *valbuf)
|
|
|
|
{
|
|
|
|
CORE_ADDR regval;
|
|
|
|
int len = TYPE_LENGTH (type);
|
|
|
|
|
|
|
|
regval = extract_unsigned_integer (valbuf, len > 4 ? 4 : len);
|
|
|
|
regcache_cooked_write_unsigned (regcache, RET1_REGNUM, regval);
|
|
|
|
|
|
|
|
if (len > 4)
|
|
|
|
{
|
2005-11-08 06:54:22 +01:00
|
|
|
regval = extract_unsigned_integer ((gdb_byte *) valbuf + 4, len - 4);
|
2003-07-21 20:56:05 +02:00
|
|
|
regcache_cooked_write_unsigned (regcache, RET1_REGNUM + 1, regval);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This is required by skip_prologue. The results of decoding a prologue
|
|
|
|
should be cached because this thrashing is getting nuts. */
|
|
|
|
|
2004-10-07 03:21:53 +02:00
|
|
|
static int
|
2003-07-21 20:56:05 +02:00
|
|
|
decode_prologue (CORE_ADDR start_pc, CORE_ADDR scan_limit,
|
2004-10-07 03:21:53 +02:00
|
|
|
CORE_ADDR *pl_endptr, unsigned long *framelength)
|
2003-07-21 20:56:05 +02:00
|
|
|
{
|
|
|
|
unsigned long framesize;
|
|
|
|
int insn;
|
|
|
|
int op1;
|
|
|
|
CORE_ADDR after_prologue = 0;
|
2004-10-07 03:21:53 +02:00
|
|
|
CORE_ADDR after_push = 0;
|
2003-07-21 20:56:05 +02:00
|
|
|
CORE_ADDR after_stack_adjust = 0;
|
|
|
|
CORE_ADDR current_pc;
|
2004-10-07 03:21:53 +02:00
|
|
|
LONGEST return_value;
|
2003-07-21 20:56:05 +02:00
|
|
|
|
|
|
|
framesize = 0;
|
|
|
|
after_prologue = 0;
|
|
|
|
|
|
|
|
for (current_pc = start_pc; current_pc < scan_limit; current_pc += 2)
|
|
|
|
{
|
2004-10-07 03:21:53 +02:00
|
|
|
/* Check if current pc's location is readable. */
|
|
|
|
if (!safe_read_memory_integer (current_pc, 2, &return_value))
|
|
|
|
return -1;
|
|
|
|
|
2003-07-21 20:56:05 +02:00
|
|
|
insn = read_memory_unsigned_integer (current_pc, 2);
|
|
|
|
|
2004-10-07 03:21:53 +02:00
|
|
|
if (insn == 0x0000)
|
|
|
|
break;
|
|
|
|
|
2003-07-21 20:56:05 +02:00
|
|
|
/* If this is a 32 bit instruction, we dont want to examine its
|
|
|
|
immediate data as though it were an instruction */
|
|
|
|
if (current_pc & 0x02)
|
|
|
|
{
|
|
|
|
/* decode this instruction further */
|
|
|
|
insn &= 0x7fff;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (insn & 0x8000)
|
|
|
|
{
|
|
|
|
if (current_pc == scan_limit)
|
|
|
|
scan_limit += 2; /* extend the search */
|
2004-10-07 03:21:53 +02:00
|
|
|
|
2003-07-21 20:56:05 +02:00
|
|
|
current_pc += 2; /* skip the immediate data */
|
2004-10-07 03:21:53 +02:00
|
|
|
|
|
|
|
/* Check if current pc's location is readable. */
|
|
|
|
if (!safe_read_memory_integer (current_pc, 2, &return_value))
|
|
|
|
return -1;
|
|
|
|
|
2003-07-21 20:56:05 +02:00
|
|
|
if (insn == 0x8faf) /* add3 sp, sp, xxxx */
|
|
|
|
/* add 16 bit sign-extended offset */
|
|
|
|
{
|
|
|
|
framesize +=
|
|
|
|
-((short) read_memory_unsigned_integer (current_pc, 2));
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2003-07-27 17:38:16 +02:00
|
|
|
if (((insn >> 8) == 0xe4) /* ld24 r4, xxxxxx; sub sp, r4 */
|
2004-10-07 03:21:53 +02:00
|
|
|
&& safe_read_memory_integer (current_pc + 2, 2,
|
|
|
|
&return_value)
|
2003-07-27 17:38:16 +02:00
|
|
|
&& read_memory_unsigned_integer (current_pc + 2,
|
|
|
|
2) == 0x0f24)
|
2003-07-21 20:56:05 +02:00
|
|
|
/* subtract 24 bit sign-extended negative-offset */
|
|
|
|
{
|
|
|
|
insn = read_memory_unsigned_integer (current_pc - 2, 4);
|
|
|
|
if (insn & 0x00800000) /* sign extend */
|
|
|
|
insn |= 0xff000000; /* negative */
|
|
|
|
else
|
|
|
|
insn &= 0x00ffffff; /* positive */
|
|
|
|
framesize += insn;
|
|
|
|
}
|
|
|
|
}
|
2004-10-07 03:21:53 +02:00
|
|
|
after_push = current_pc + 2;
|
2003-07-21 20:56:05 +02:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
op1 = insn & 0xf000; /* isolate just the first nibble */
|
|
|
|
|
|
|
|
if ((insn & 0xf0ff) == 0x207f)
|
|
|
|
{ /* st reg, @-sp */
|
|
|
|
int regno;
|
|
|
|
framesize += 4;
|
|
|
|
regno = ((insn >> 8) & 0xf);
|
|
|
|
after_prologue = 0;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if ((insn >> 8) == 0x4f) /* addi sp, xx */
|
|
|
|
/* add 8 bit sign-extended offset */
|
|
|
|
{
|
2005-11-08 06:54:22 +01:00
|
|
|
int stack_adjust = (gdb_byte) (insn & 0xff);
|
2003-07-21 20:56:05 +02:00
|
|
|
|
|
|
|
/* there are probably two of these stack adjustments:
|
|
|
|
1) A negative one in the prologue, and
|
|
|
|
2) A positive one in the epilogue.
|
|
|
|
We are only interested in the first one. */
|
|
|
|
|
|
|
|
if (stack_adjust < 0)
|
|
|
|
{
|
|
|
|
framesize -= stack_adjust;
|
|
|
|
after_prologue = 0;
|
|
|
|
/* A frameless function may have no "mv fp, sp".
|
|
|
|
In that case, this is the end of the prologue. */
|
|
|
|
after_stack_adjust = current_pc + 2;
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (insn == 0x1d8f)
|
|
|
|
{ /* mv fp, sp */
|
|
|
|
after_prologue = current_pc + 2;
|
|
|
|
break; /* end of stack adjustments */
|
|
|
|
}
|
2004-10-07 03:21:53 +02:00
|
|
|
|
2003-07-21 20:56:05 +02:00
|
|
|
/* Nop looks like a branch, continue explicitly */
|
|
|
|
if (insn == 0x7000)
|
|
|
|
{
|
|
|
|
after_prologue = current_pc + 2;
|
|
|
|
continue; /* nop occurs between pushes */
|
|
|
|
}
|
2004-10-07 03:21:53 +02:00
|
|
|
/* End of prolog if any of these are trap instructions */
|
|
|
|
if ((insn & 0xfff0) == 0x10f0)
|
|
|
|
{
|
|
|
|
after_prologue = current_pc;
|
|
|
|
break;
|
|
|
|
}
|
2003-07-21 20:56:05 +02:00
|
|
|
/* End of prolog if any of these are branch instructions */
|
|
|
|
if ((op1 == 0x7000) || (op1 == 0xb000) || (op1 == 0xf000))
|
|
|
|
{
|
|
|
|
after_prologue = current_pc;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
/* Some of the branch instructions are mixed with other types */
|
|
|
|
if (op1 == 0x1000)
|
|
|
|
{
|
|
|
|
int subop = insn & 0x0ff0;
|
|
|
|
if ((subop == 0x0ec0) || (subop == 0x0fc0))
|
|
|
|
{
|
|
|
|
after_prologue = current_pc;
|
|
|
|
continue; /* jmp , jl */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-10-07 03:21:53 +02:00
|
|
|
if (framelength)
|
|
|
|
*framelength = framesize;
|
|
|
|
|
2003-07-21 20:56:05 +02:00
|
|
|
if (current_pc >= scan_limit)
|
|
|
|
{
|
|
|
|
if (pl_endptr)
|
|
|
|
{
|
|
|
|
if (after_stack_adjust != 0)
|
|
|
|
/* We did not find a "mv fp,sp", but we DID find
|
|
|
|
a stack_adjust. Is it safe to use that as the
|
|
|
|
end of the prologue? I just don't know. */
|
|
|
|
{
|
|
|
|
*pl_endptr = after_stack_adjust;
|
|
|
|
}
|
2004-10-07 03:21:53 +02:00
|
|
|
else if (after_push != 0)
|
|
|
|
/* We did not find a "mv fp,sp", but we DID find
|
|
|
|
a push. Is it safe to use that as the
|
|
|
|
end of the prologue? I just don't know. */
|
|
|
|
{
|
|
|
|
*pl_endptr = after_push;
|
|
|
|
}
|
2003-07-21 20:56:05 +02:00
|
|
|
else
|
|
|
|
/* We reached the end of the loop without finding the end
|
|
|
|
of the prologue. No way to win -- we should report failure.
|
|
|
|
The way we do that is to return the original start_pc.
|
|
|
|
GDB will set a breakpoint at the start of the function (etc.) */
|
|
|
|
*pl_endptr = start_pc;
|
|
|
|
}
|
2004-10-07 03:21:53 +02:00
|
|
|
return 0;
|
2003-07-21 20:56:05 +02:00
|
|
|
}
|
2004-10-07 03:21:53 +02:00
|
|
|
|
2003-07-21 20:56:05 +02:00
|
|
|
if (after_prologue == 0)
|
|
|
|
after_prologue = current_pc;
|
|
|
|
|
|
|
|
if (pl_endptr)
|
|
|
|
*pl_endptr = after_prologue;
|
2004-10-07 03:21:53 +02:00
|
|
|
|
|
|
|
return 0;
|
2003-07-21 20:56:05 +02:00
|
|
|
} /* decode_prologue */
|
|
|
|
|
|
|
|
/* Function: skip_prologue
|
|
|
|
Find end of function prologue */
|
|
|
|
|
2004-10-07 03:21:53 +02:00
|
|
|
#define DEFAULT_SEARCH_LIMIT 128
|
2003-07-21 20:56:05 +02:00
|
|
|
|
|
|
|
CORE_ADDR
|
|
|
|
m32r_skip_prologue (CORE_ADDR pc)
|
|
|
|
{
|
|
|
|
CORE_ADDR func_addr, func_end;
|
|
|
|
struct symtab_and_line sal;
|
2004-10-07 03:21:53 +02:00
|
|
|
LONGEST return_value;
|
2003-07-21 20:56:05 +02:00
|
|
|
|
|
|
|
/* See what the symbol table says */
|
|
|
|
|
|
|
|
if (find_pc_partial_function (pc, NULL, &func_addr, &func_end))
|
|
|
|
{
|
|
|
|
sal = find_pc_line (func_addr, 0);
|
|
|
|
|
|
|
|
if (sal.line != 0 && sal.end <= func_end)
|
|
|
|
{
|
|
|
|
func_end = sal.end;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
/* Either there's no line info, or the line after the prologue is after
|
|
|
|
the end of the function. In this case, there probably isn't a
|
|
|
|
prologue. */
|
|
|
|
{
|
|
|
|
func_end = min (func_end, func_addr + DEFAULT_SEARCH_LIMIT);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
func_end = pc + DEFAULT_SEARCH_LIMIT;
|
2004-10-07 03:21:53 +02:00
|
|
|
|
|
|
|
/* If pc's location is not readable, just quit. */
|
|
|
|
if (!safe_read_memory_integer (pc, 4, &return_value))
|
|
|
|
return pc;
|
|
|
|
|
|
|
|
/* Find the end of prologue. */
|
|
|
|
if (decode_prologue (pc, func_end, &sal.end, NULL) < 0)
|
|
|
|
return pc;
|
|
|
|
|
2003-07-21 20:56:05 +02:00
|
|
|
return sal.end;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct m32r_unwind_cache
|
|
|
|
{
|
|
|
|
/* The previous frame's inner most stack address. Used as this
|
|
|
|
frame ID's stack_addr. */
|
|
|
|
CORE_ADDR prev_sp;
|
|
|
|
/* The frame's base, optionally used by the high-level debug info. */
|
|
|
|
CORE_ADDR base;
|
|
|
|
int size;
|
|
|
|
/* How far the SP and r13 (FP) have been offset from the start of
|
|
|
|
the stack frame (as defined by the previous frame's stack
|
|
|
|
pointer). */
|
|
|
|
LONGEST sp_offset;
|
|
|
|
LONGEST r13_offset;
|
|
|
|
int uses_frame;
|
|
|
|
/* Table indicating the location of each and every register. */
|
|
|
|
struct trad_frame_saved_reg *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
|
|
|
|
includes special registers such as pc and fp saved in special ways
|
|
|
|
in the stack frame. sp is even more special: the address we return
|
|
|
|
for it IS the sp for the next frame. */
|
|
|
|
|
|
|
|
static struct m32r_unwind_cache *
|
|
|
|
m32r_frame_unwind_cache (struct frame_info *next_frame,
|
|
|
|
void **this_prologue_cache)
|
|
|
|
{
|
2004-10-07 03:21:53 +02:00
|
|
|
CORE_ADDR pc, scan_limit;
|
2003-07-21 20:56:05 +02:00
|
|
|
ULONGEST prev_sp;
|
|
|
|
ULONGEST this_base;
|
2004-10-07 03:21:53 +02:00
|
|
|
unsigned long op, op2;
|
2003-07-21 20:56:05 +02:00
|
|
|
int i;
|
|
|
|
struct m32r_unwind_cache *info;
|
|
|
|
|
2004-10-07 03:21:53 +02:00
|
|
|
|
2003-07-21 20:56:05 +02:00
|
|
|
if ((*this_prologue_cache))
|
|
|
|
return (*this_prologue_cache);
|
|
|
|
|
|
|
|
info = FRAME_OBSTACK_ZALLOC (struct m32r_unwind_cache);
|
|
|
|
(*this_prologue_cache) = info;
|
|
|
|
info->saved_regs = trad_frame_alloc_saved_regs (next_frame);
|
|
|
|
|
|
|
|
info->size = 0;
|
|
|
|
info->sp_offset = 0;
|
|
|
|
info->uses_frame = 0;
|
2004-10-07 03:21:53 +02:00
|
|
|
|
|
|
|
scan_limit = frame_pc_unwind (next_frame);
|
* dwarf2-frame.c (dwarf2_frame_cache, dwarf2_frame_this_id)
(dwarf2_frame_sniffer): Update.
(dwarf2_signal_frame_this_id): New function.
(dwarf2_signal_frame_unwind): Use it.
(dwarf2_frame_base_sniffer): Use frame_unwind_address_in_block.
* frame.c (frame_func_unwind): Add this_type argument.
(get_frame_func): Update.
(frame_unwind_address_in_block): Add this_type argument and check it.
Fix a typo.
(get_frame_address_in_block): Update.
* frame.h (enum frame_type): Move higher in the file.
(frame_unwind_address_in_block, frame_func_unwind): Add enum frame_type
argument.
* alpha-mdebug-tdep.c, alpha-tdep.c, amd64-tdep.c, amd64obsd-tdep.c,
arm-tdep.c, avr-tdep.c, cris-tdep.c, frv-tdep.c, h8300-tdep.c,
hppa-tdep.c, i386-tdep.c, i386obsd-tdep.c, ia64-tdep.c,
libunwind-frame.c, m32c-tdep.c, m32r-linux-tdep.c, m32r-tdep.c,
m68hc11-tdep.c, m68k-tdep.c, m88k-tdep.c, mips-mdebug-tdep.c,
mips-tdep.c, mn10300-tdep.c, mt-tdep.c, rs6000-tdep.c, s390-tdep.c,
score-tdep.c, sh-tdep.c, sh64-tdep.c, sparc-tdep.c,
sparc64obsd-tdep.c, spu-tdep.c, v850-tdep.c, vax-tdep.c,
xstormy16-tdep.c, xtensa-tdep.c: Update calls to
frame_func_unwind and frame_unwind_address_in_block to specify
the frame type. Use frame_unwind_address_in_block instead of
frame_pc_unwind in sniffers.
* gdb.arch/i386-signal.c, gdb.arch/i386-signal.exp: New files.
2007-02-27 21:17:19 +01:00
|
|
|
for (pc = frame_func_unwind (next_frame, NORMAL_FRAME);
|
2004-10-07 03:21:53 +02:00
|
|
|
pc > 0 && pc < scan_limit; pc += 2)
|
2003-07-21 20:56:05 +02:00
|
|
|
{
|
|
|
|
if ((pc & 2) == 0)
|
|
|
|
{
|
|
|
|
op = get_frame_memory_unsigned (next_frame, pc, 4);
|
|
|
|
if ((op & 0x80000000) == 0x80000000)
|
|
|
|
{
|
|
|
|
/* 32-bit instruction */
|
|
|
|
if ((op & 0xffff0000) == 0x8faf0000)
|
|
|
|
{
|
|
|
|
/* add3 sp,sp,xxxx */
|
|
|
|
short n = op & 0xffff;
|
|
|
|
info->sp_offset += n;
|
|
|
|
}
|
2004-10-07 03:21:53 +02:00
|
|
|
else if (((op >> 8) == 0xe4)
|
|
|
|
&& get_frame_memory_unsigned (next_frame, pc + 2,
|
2003-07-27 17:38:16 +02:00
|
|
|
2) == 0x0f24)
|
2003-07-21 20:56:05 +02:00
|
|
|
{
|
2004-10-07 03:21:53 +02:00
|
|
|
/* ld24 r4, xxxxxx; sub sp, r4 */
|
2003-07-21 20:56:05 +02:00
|
|
|
unsigned long n = op & 0xffffff;
|
|
|
|
info->sp_offset += n;
|
2004-10-07 03:21:53 +02:00
|
|
|
pc += 2; /* skip sub instruction */
|
2003-07-21 20:56:05 +02:00
|
|
|
}
|
|
|
|
|
2004-10-07 03:21:53 +02:00
|
|
|
if (pc == scan_limit)
|
|
|
|
scan_limit += 2; /* extend the search */
|
|
|
|
pc += 2; /* skip the immediate data */
|
2003-07-21 20:56:05 +02:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 16-bit instructions */
|
|
|
|
op = get_frame_memory_unsigned (next_frame, pc, 2) & 0x7fff;
|
|
|
|
if ((op & 0xf0ff) == 0x207f)
|
|
|
|
{
|
|
|
|
/* st rn, @-sp */
|
|
|
|
int regno = ((op >> 8) & 0xf);
|
|
|
|
info->sp_offset -= 4;
|
|
|
|
info->saved_regs[regno].addr = info->sp_offset;
|
|
|
|
}
|
|
|
|
else if ((op & 0xff00) == 0x4f00)
|
|
|
|
{
|
|
|
|
/* addi sp, xx */
|
2005-11-08 06:54:22 +01:00
|
|
|
int n = (gdb_byte) (op & 0xff);
|
2003-07-21 20:56:05 +02:00
|
|
|
info->sp_offset += n;
|
|
|
|
}
|
|
|
|
else if (op == 0x1d8f)
|
|
|
|
{
|
|
|
|
/* mv fp, sp */
|
|
|
|
info->uses_frame = 1;
|
|
|
|
info->r13_offset = info->sp_offset;
|
2004-10-07 03:21:53 +02:00
|
|
|
break; /* end of stack adjustments */
|
|
|
|
}
|
|
|
|
else if ((op & 0xfff0) == 0x10f0)
|
|
|
|
{
|
|
|
|
/* end of prologue if this is a trap instruction */
|
|
|
|
break; /* end of stack adjustments */
|
2003-07-21 20:56:05 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
info->size = -info->sp_offset;
|
|
|
|
|
|
|
|
/* Compute the previous frame's stack pointer (which is also the
|
|
|
|
frame's ID's stack address), and this frame's base pointer. */
|
|
|
|
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. */
|
2003-07-27 17:38:16 +02:00
|
|
|
this_base = frame_unwind_register_unsigned (next_frame, M32R_FP_REGNUM);
|
2003-07-21 20:56:05 +02:00
|
|
|
/* 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
|
|
|
|
{
|
|
|
|
/* Assume that the FP is this frame's SP but with that pushed
|
|
|
|
stack space added back. */
|
2003-07-27 17:38:16 +02:00
|
|
|
this_base = frame_unwind_register_unsigned (next_frame, M32R_SP_REGNUM);
|
2003-07-21 20:56:05 +02:00
|
|
|
prev_sp = this_base + info->size;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Convert that SP/BASE into real addresses. */
|
|
|
|
info->prev_sp = prev_sp;
|
|
|
|
info->base = this_base;
|
|
|
|
|
|
|
|
/* Adjust all the saved registers so that they contain addresses and
|
|
|
|
not offsets. */
|
2007-05-31 Markus Deuling <deuling@de.ibm.com>
* gdbarch.sh (NUM_REGS): Replace by gdbarch_num_regs.
* i386-tdep.c (i386_dbx_reg_to_regnum)
(i386_svr4_reg_to_regnum): Likewise.
* inf-ptrace.c (inf_ptrace_fetch_registers)
(inf_ptrace_store_registers): Likewise.
* corelow.c (get_core_registers): Likewise.
* i386-linux-nat.c (supply_gregset, fill_gregset)
(i386_linux_fetch_inferior_registers)
(i386_linux_store_inferior_registers): Likewise.
* remote.c (init_remote_state,packet_reg_from_regnum)
(packet_reg_from_pnum,process_g_packet,remote_fetch_registers)
(remote_prepare_to_store,store_registers_using_G)
(remote_store_registers,remote_arch_state): Likewise.
* tracepoint.c (encode_actions): Likewise.
* mi/mi-main.c (mi_cmd_data_list_register_names)
(mi_cmd_data_list_changed_registers,mi_cmd_data_list_register_values)
(mi_cmd_data_write_register_values): Likewise.
* tui/tui-regs.c (tui_show_register_group)
(tui_show_register_group): Likewise.
* xtensa-tdep.h (FP_ALIAS): Likewise.
* xtensa-tdep.c (xtensa_register_name,xtensa_register_type)
(xtensa_reg_to_regnum,xtensa_pseudo_register_read)
(xtensa_pseudo_register_write,xtensa_register_reggroup_p): Likewise.
* win32-nat.c (do_win32_fetch_inferior_registers)
(do_win32_store_inferior_registers,fetch_elf_core_registers
* user-regs.h: Likewise (comment).
* user-regs.c (user_reg, user_reg_map_name_to_regnum): Likewise.
* trad-frame.c (trad_frame_alloc_saved_regs): Likewise.
* target-descriptions.h: Likewise (comment).
* target-descriptions.c (tdesc_use_registers): Likewise (comment).
* target.c (debug_print_register): Likewise.
* stack.c (frame_info): Likewise.
* stabsread.c (define_symbol): Likewise.
* sh64-tdep.c (sh64_do_pseudo_register,sh64_print_register)
(sh64_media_print_registers_info)
(sh64_compact_print_registers_info): Likewise.
* rs6000-tdep.c (rs6000_register_sim_regno): Likewise.
* rs6000-nat.c (fetch_register,store_register): Likewise.
* remote-sim.c (one2one_register_sim_regno,gdbsim_fetch_register)
(gdbsim_fetch_register,gdbsim_store_register): Likewise.
* remote-mips.c (mips_fetch_registers,mips_store_registers): Likewise.
* remote-m32r-sdi.c (m32r_fetch_registers)
(m32r_store_registers): Likewise.
* reggroups.c (default_register_reggroup_p): Likewise.
* regcache.c (init_regcache_descr,register_size,regcache,regcache_save)
(regcache_restore,regcache_dump): Likewise.
* monitor.c (monitor_fetch_registers,monitor_store_registers): Likewise.
* mips-tdep.c (mips_xfer_register,mips_register_name)
(mips_register_reggroup_p,mips_pseudo_register_read)
(mips_pseudo_register_write,mips_convert_register_p,mips_register_type)
(mips_unwind_pc,mips_unwind_sp,mips_unwind_dummy_id,set_reg_offset)
(mips16_scan_prologue,mips_insn16_frame_cache,reset_saved_regs)
(mips32_scan_prologue,mips_insn32_frame_cache,read_next_frame_reg)
(mips_n32n64_return_value,mips_o32_return_value,mips_o64_return_value)
(print_gp_register_row,mips_print_registers_info)
(mips_stab_reg_to_regnum,mips_dwarf_dwarf2_ecoff_reg_to_regnum)
(mips_register_sim_regno): Likewise.
* mips-linux-tdep.c (mips_linux_o32_sigframe_init)
(mips_linux_n32n64_sigframe_init): Likewise.
* mips-linux-nat.c (mips_linux_register_addr)
(mips64_linux_register_addr): Likewise.
* findvar.c (value_of_register): Likewise.
* infcmd.c (default_print_registers_info,registers_info)
(print_vector_info,print_float_info): Likewise.
* mips64obsd-tdep.c (mips64obsd_sigframe_init): Likewise.
* inf-child.c (inf_child_fetch_inferior_registers): Likewise.
* m68k-tdep.c (m68k_dwarf_reg_to_regnum): Likewise.
* m68hc11-tdep.c (m68hc11_frame_unwind_cache(: Likewise.
* m32r-tdep.c (m32r_frame_unwind_cache): Likewise.
* ia64-linux-nat.c (ia64_register_addr,ia64_cannot_fetch_register)
(ia64_cannot_store_register,ia64_linux_fetch_registers)
(ia64_linux_store_registers): Likewise.
* hpux-thread.c (hpux_thread_fetch_registers)
(hpux_thread_store_registers): Likewise.
* h8300-tdep.c (E_PSEUDO_CCR_REGNUM,E_PSEUDO_EXR_REGNUM)
(h8300_init_frame_cache,h8300_frame_cache,h8300_frame_prev_register)
(h8300_register_type): Likewise.
* dwarf2-frame.c (dwarf2_frame_cache)
(dwarf2_frame_state_alloc_regs): Likewise.
* cris-tdep.c (cris_register_size,cris_cannot_fetch_register)
(cris_cannot_store_register,crisv32_cannot_fetch_register)
(crisv32_cannot_store_register,cris_register_name): Likewise.
* avr-tdep.c (avr_frame_unwind_cache): Likewise.
* arch-utils.c (legacy_register_sim_regno)
(legacy_virtual_frame_pointer): Likewise.
* arm-tdep.c (arm_make_prologue_cache,arm_register_sim_regno):Likewise.
* arm-tdep.h: Likewise (comment).
* frv-tdep.c (frv_register_sim_regno): Likewise.
* m68klinux-nat.c (old_fetch_inferior_registers)
(old_store_inferior_registers): Likewise.
* m32c-tdep.c (m32c_virtual_frame_pointer): Likewise.
* irix5-nat.c (fetch_core_registers): Likewise.
* hppa-tdep.c (hppa_frame_cache): Likewise.
* hppa-linux-nat.c (hppa_linux_register_addr)
(hppa_linux_fetch_inferior_registers)
(hppa_linux_store_inferior_registers): Likewise.
* hppa-hpux-nat.c (hppa_hpux_fetch_inferior_registers)
(hppa_hpux_store_inferior_registers): Likewise.
* amd64-nat.c (amd64_native_gregset_reg_offset)
(amd64_supply_native_gregset,amd64_collect_native_gregset): Likewise.
* dbug-rom.c (dbug_regname): Likewise.
* m68hc11-tdep.c (m68hc11_frame_unwind_cache)
(HARD_PAGE_REGNUM (comment)): Likewise.
* gdbarch.sh (NUM_PSEUDO_REGS): Replace by gdbarch_num_pseudo_regs.
* i386-tdep.c (i386_dbx_reg_to_regnum)
(i386_svr4_reg_to_regnum): Likewise.
* mi/mi-main.c (mi_cmd_data_list_register_names)
(mi_cmd_data_list_changed_registers,mi_cmd_data_list_register_values)
(mi_cmd_data_write_register_values): Likewise.
* gdbarch.c, gdbarch.h: Regenerate.
* tui/tui-regs.c (tui_show_register_group): Likewise.
* xtensa-tdep.h (FP_ALIAS): Likewise.
* user-regs.h: Likewise (comment).
* user-regs.c (user_reg, user_reg_map_name_to_regnum): Likewise.
* trad-frame.c (trad_frame_alloc_saved_regs): Likewise.
* target-descriptions.h: Likewise (comment).
* target.c (debug_print_register): Likewise.
* stack.c (frame_info): Likewise.
* stabsread.c (define_symbol): Likewise.
* sh64-tdep.c (sh64_print_register,sh64_media_print_registers_info)
(sh64_compact_print_registers_info): Likewise.
* rs6000-tdep.c (rs6000_register_sim_regno): Likewise.
* regcache.c (init_regcache_descr,register_size,regcache,regcache_save
(regcache_restore,regcache_dump): Likewise.
* mips-tdep.c (print_gp_register_row,mips_print_registers_info)
(mips_dwarf_dwarf2_ecoff_reg_to_regnum)
(mips_stab_reg_to_regnum): Likewise.
* findvar.c (value_of_register): Likewise.
* infcmd.c (default_print_registers_info,registers_info)
(print_vector_info,print_float_info): Likewise.
* m68k-tdep.c (m68k_dwarf_reg_to_regnum): Likewise.
* h8300-tdep.c (h8300_register_type): Likewise.
* dwarf2-frame.c (dwarf2_frame_cache): Likewise.
* frame.h (SIZEOF_FRAME_SAVED_REGS): Likewise.
* xtensa-tdep.c (xtensa_register_type,xtensa_reg_to_regnum)
(xtensa_pseudo_register_read,xtensa_pseudo_register_write): Likewise.
* parse.c: Remove comment.
* gdbarch.c, gdbarch.h: Regenerate
2007-05-31 19:32:22 +02:00
|
|
|
for (i = 0; i < gdbarch_num_regs (current_gdbarch) - 1; i++)
|
2003-07-21 20:56:05 +02:00
|
|
|
if (trad_frame_addr_p (info->saved_regs, i))
|
|
|
|
info->saved_regs[i].addr = (info->prev_sp + info->saved_regs[i].addr);
|
|
|
|
|
|
|
|
/* The call instruction moves the caller's PC in the callee's LR.
|
|
|
|
Since this is an unwind, do the reverse. Copy the location of LR
|
|
|
|
into PC (the address / regnum) so that a request for PC will be
|
|
|
|
converted into a request for the LR. */
|
|
|
|
info->saved_regs[M32R_PC_REGNUM] = info->saved_regs[LR_REGNUM];
|
|
|
|
|
|
|
|
/* The previous frame's SP needed to be computed. Save the computed
|
|
|
|
value. */
|
|
|
|
trad_frame_set_value (info->saved_regs, M32R_SP_REGNUM, prev_sp);
|
|
|
|
|
|
|
|
return info;
|
|
|
|
}
|
|
|
|
|
|
|
|
static CORE_ADDR
|
2007-06-16 00:44:56 +02:00
|
|
|
m32r_read_pc (struct regcache *regcache)
|
2003-07-21 20:56:05 +02:00
|
|
|
{
|
2003-07-27 17:38:16 +02:00
|
|
|
ULONGEST pc;
|
2007-06-16 00:44:56 +02:00
|
|
|
regcache_cooked_read_unsigned (regcache, M32R_PC_REGNUM, &pc);
|
2003-07-21 20:56:05 +02:00
|
|
|
return pc;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2007-06-16 00:44:56 +02:00
|
|
|
m32r_write_pc (struct regcache *regcache, CORE_ADDR val)
|
2003-07-21 20:56:05 +02:00
|
|
|
{
|
2007-06-16 00:44:56 +02:00
|
|
|
regcache_cooked_write_unsigned (regcache, M32R_PC_REGNUM, val);
|
2003-07-21 20:56:05 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static CORE_ADDR
|
|
|
|
m32r_unwind_sp (struct gdbarch *gdbarch, struct frame_info *next_frame)
|
|
|
|
{
|
2003-07-27 17:38:16 +02:00
|
|
|
return frame_unwind_register_unsigned (next_frame, M32R_SP_REGNUM);
|
2003-07-21 20:56:05 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static CORE_ADDR
|
2004-06-07 04:02:55 +02:00
|
|
|
m32r_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
|
2003-07-21 20:56:05 +02:00
|
|
|
struct regcache *regcache, CORE_ADDR bp_addr, int nargs,
|
|
|
|
struct value **args, CORE_ADDR sp, int struct_return,
|
|
|
|
CORE_ADDR struct_addr)
|
|
|
|
{
|
|
|
|
int stack_offset, stack_alloc;
|
|
|
|
int argreg = ARG1_REGNUM;
|
|
|
|
int argnum;
|
|
|
|
struct type *type;
|
|
|
|
enum type_code typecode;
|
|
|
|
CORE_ADDR regval;
|
2005-11-08 06:54:22 +01:00
|
|
|
gdb_byte *val;
|
|
|
|
gdb_byte valbuf[MAX_REGISTER_SIZE];
|
2003-07-21 20:56:05 +02:00
|
|
|
int len;
|
|
|
|
int odd_sized_struct;
|
|
|
|
|
|
|
|
/* first force sp to a 4-byte alignment */
|
|
|
|
sp = sp & ~3;
|
|
|
|
|
|
|
|
/* Set the return address. For the m32r, the return breakpoint is
|
|
|
|
always at BP_ADDR. */
|
|
|
|
regcache_cooked_write_unsigned (regcache, LR_REGNUM, bp_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)
|
|
|
|
{
|
|
|
|
regcache_cooked_write_unsigned (regcache, argreg, struct_addr);
|
|
|
|
argreg++;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Now make sure there's space on the stack */
|
|
|
|
for (argnum = 0, stack_alloc = 0; argnum < nargs; argnum++)
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* sparc-tdep.c: Replace VALUE_TYPE with value_type.
* v850-tdep.c, sparc64-tdep.c, sh-tdep.c: Ditto.
* sh64-tdep.c, s390-tdep.c, mcore-tdep.c: Ditto.
* h8300-tdep.c, arm-linux-tdep.c, amd64-tdep.c: Ditto.
* hppa-tdep.c, mips-tdep.c, m88k-tdep.c: Ditto.
* m68hc11-tdep.c, m32r-tdep.c, ia64-tdep.c: Ditto.
* frv-tdep.c, cris-tdep.c, avr-tdep.c, alpha-tdep.c: Ditto.
2004-11-13 03:15:33 +01:00
|
|
|
stack_alloc += ((TYPE_LENGTH (value_type (args[argnum])) + 3) & ~3);
|
2003-07-21 20:56:05 +02:00
|
|
|
sp -= stack_alloc; /* make room on stack for args */
|
|
|
|
|
|
|
|
for (argnum = 0, stack_offset = 0; argnum < nargs; argnum++)
|
|
|
|
{
|
2004-11-12 Andrew Cagney <cagney@gnu.org>
* sparc-tdep.c: Replace VALUE_TYPE with value_type.
* v850-tdep.c, sparc64-tdep.c, sh-tdep.c: Ditto.
* sh64-tdep.c, s390-tdep.c, mcore-tdep.c: Ditto.
* h8300-tdep.c, arm-linux-tdep.c, amd64-tdep.c: Ditto.
* hppa-tdep.c, mips-tdep.c, m88k-tdep.c: Ditto.
* m68hc11-tdep.c, m32r-tdep.c, ia64-tdep.c: Ditto.
* frv-tdep.c, cris-tdep.c, avr-tdep.c, alpha-tdep.c: Ditto.
2004-11-13 03:15:33 +01:00
|
|
|
type = value_type (args[argnum]);
|
2003-07-21 20:56:05 +02:00
|
|
|
typecode = TYPE_CODE (type);
|
|
|
|
len = TYPE_LENGTH (type);
|
|
|
|
|
|
|
|
memset (valbuf, 0, sizeof (valbuf));
|
|
|
|
|
|
|
|
/* Passes structures that do not fit in 2 registers by reference. */
|
|
|
|
if (len > 8
|
|
|
|
&& (typecode == TYPE_CODE_STRUCT || typecode == TYPE_CODE_UNION))
|
|
|
|
{
|
|
|
|
store_unsigned_integer (valbuf, 4, VALUE_ADDRESS (args[argnum]));
|
|
|
|
typecode = TYPE_CODE_PTR;
|
|
|
|
len = 4;
|
|
|
|
val = valbuf;
|
|
|
|
}
|
|
|
|
else if (len < 4)
|
|
|
|
{
|
|
|
|
/* value gets right-justified in the register or stack word */
|
2003-07-27 17:38:16 +02:00
|
|
|
memcpy (valbuf + (register_size (gdbarch, argreg) - len),
|
2005-11-08 06:54:22 +01:00
|
|
|
(gdb_byte *) value_contents (args[argnum]), len);
|
2003-07-21 20:56:05 +02:00
|
|
|
val = valbuf;
|
|
|
|
}
|
|
|
|
else
|
2005-11-08 06:54:22 +01:00
|
|
|
val = (gdb_byte *) value_contents (args[argnum]);
|
2003-07-21 20:56:05 +02:00
|
|
|
|
|
|
|
while (len > 0)
|
|
|
|
{
|
|
|
|
if (argreg > ARGN_REGNUM)
|
|
|
|
{
|
|
|
|
/* must go on the stack */
|
|
|
|
write_memory (sp + stack_offset, val, 4);
|
|
|
|
stack_offset += 4;
|
|
|
|
}
|
|
|
|
else if (argreg <= ARGN_REGNUM)
|
|
|
|
{
|
|
|
|
/* there's room in a register */
|
|
|
|
regval =
|
2003-07-27 17:38:16 +02:00
|
|
|
extract_unsigned_integer (val,
|
|
|
|
register_size (gdbarch, argreg));
|
2003-07-21 20:56:05 +02:00
|
|
|
regcache_cooked_write_unsigned (regcache, argreg++, regval);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Store the value 4 bytes at a time. This means that things
|
|
|
|
larger than 4 bytes may go partly in registers and partly
|
|
|
|
on the stack. */
|
2003-07-27 17:38:16 +02:00
|
|
|
len -= register_size (gdbarch, argreg);
|
|
|
|
val += register_size (gdbarch, argreg);
|
2003-07-21 20:56:05 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Finally, update the SP register. */
|
|
|
|
regcache_cooked_write_unsigned (regcache, M32R_SP_REGNUM, sp);
|
|
|
|
|
|
|
|
return sp;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Given a return value in `regbuf' with a type `valtype',
|
|
|
|
extract and copy its value into `valbuf'. */
|
|
|
|
|
|
|
|
static void
|
|
|
|
m32r_extract_return_value (struct type *type, struct regcache *regcache,
|
|
|
|
void *dst)
|
|
|
|
{
|
|
|
|
bfd_byte *valbuf = dst;
|
|
|
|
int len = TYPE_LENGTH (type);
|
|
|
|
ULONGEST tmp;
|
|
|
|
|
|
|
|
/* By using store_unsigned_integer we avoid having to do
|
|
|
|
anything special for small big-endian values. */
|
|
|
|
regcache_cooked_read_unsigned (regcache, RET1_REGNUM, &tmp);
|
|
|
|
store_unsigned_integer (valbuf, (len > 4 ? len - 4 : len), tmp);
|
|
|
|
|
|
|
|
/* Ignore return values more than 8 bytes in size because the m32r
|
|
|
|
returns anything more than 8 bytes in the stack. */
|
|
|
|
if (len > 4)
|
|
|
|
{
|
|
|
|
regcache_cooked_read_unsigned (regcache, RET1_REGNUM + 1, &tmp);
|
|
|
|
store_unsigned_integer (valbuf + len - 4, 4, tmp);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-10-05 06:07:10 +02:00
|
|
|
enum return_value_convention
|
|
|
|
m32r_return_value (struct gdbarch *gdbarch, struct type *valtype,
|
2005-11-08 06:54:22 +01:00
|
|
|
struct regcache *regcache, gdb_byte *readbuf,
|
|
|
|
const gdb_byte *writebuf)
|
2004-10-05 06:07:10 +02:00
|
|
|
{
|
|
|
|
if (TYPE_LENGTH (valtype) > 8)
|
|
|
|
return RETURN_VALUE_STRUCT_CONVENTION;
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (readbuf != NULL)
|
|
|
|
m32r_extract_return_value (valtype, regcache, readbuf);
|
|
|
|
if (writebuf != NULL)
|
|
|
|
m32r_store_return_value (valtype, regcache, writebuf);
|
|
|
|
return RETURN_VALUE_REGISTER_CONVENTION;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-07-21 20:56:05 +02:00
|
|
|
|
|
|
|
static CORE_ADDR
|
|
|
|
m32r_unwind_pc (struct gdbarch *gdbarch, struct frame_info *next_frame)
|
|
|
|
{
|
2003-07-27 17:38:16 +02:00
|
|
|
return frame_unwind_register_unsigned (next_frame, M32R_PC_REGNUM);
|
2003-07-21 20:56:05 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* 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
|
|
|
|
m32r_frame_this_id (struct frame_info *next_frame,
|
|
|
|
void **this_prologue_cache, struct frame_id *this_id)
|
|
|
|
{
|
|
|
|
struct m32r_unwind_cache *info
|
|
|
|
= m32r_frame_unwind_cache (next_frame, this_prologue_cache);
|
|
|
|
CORE_ADDR base;
|
|
|
|
CORE_ADDR func;
|
|
|
|
struct minimal_symbol *msym_stack;
|
|
|
|
struct frame_id id;
|
|
|
|
|
|
|
|
/* The FUNC is easy. */
|
* dwarf2-frame.c (dwarf2_frame_cache, dwarf2_frame_this_id)
(dwarf2_frame_sniffer): Update.
(dwarf2_signal_frame_this_id): New function.
(dwarf2_signal_frame_unwind): Use it.
(dwarf2_frame_base_sniffer): Use frame_unwind_address_in_block.
* frame.c (frame_func_unwind): Add this_type argument.
(get_frame_func): Update.
(frame_unwind_address_in_block): Add this_type argument and check it.
Fix a typo.
(get_frame_address_in_block): Update.
* frame.h (enum frame_type): Move higher in the file.
(frame_unwind_address_in_block, frame_func_unwind): Add enum frame_type
argument.
* alpha-mdebug-tdep.c, alpha-tdep.c, amd64-tdep.c, amd64obsd-tdep.c,
arm-tdep.c, avr-tdep.c, cris-tdep.c, frv-tdep.c, h8300-tdep.c,
hppa-tdep.c, i386-tdep.c, i386obsd-tdep.c, ia64-tdep.c,
libunwind-frame.c, m32c-tdep.c, m32r-linux-tdep.c, m32r-tdep.c,
m68hc11-tdep.c, m68k-tdep.c, m88k-tdep.c, mips-mdebug-tdep.c,
mips-tdep.c, mn10300-tdep.c, mt-tdep.c, rs6000-tdep.c, s390-tdep.c,
score-tdep.c, sh-tdep.c, sh64-tdep.c, sparc-tdep.c,
sparc64obsd-tdep.c, spu-tdep.c, v850-tdep.c, vax-tdep.c,
xstormy16-tdep.c, xtensa-tdep.c: Update calls to
frame_func_unwind and frame_unwind_address_in_block to specify
the frame type. Use frame_unwind_address_in_block instead of
frame_pc_unwind in sniffers.
* gdb.arch/i386-signal.c, gdb.arch/i386-signal.exp: New files.
2007-02-27 21:17:19 +01:00
|
|
|
func = frame_func_unwind (next_frame, NORMAL_FRAME);
|
2003-07-21 20:56:05 +02:00
|
|
|
|
|
|
|
/* Check if the stack is empty. */
|
|
|
|
msym_stack = lookup_minimal_symbol ("_stack", NULL, NULL);
|
|
|
|
if (msym_stack && info->base == SYMBOL_VALUE_ADDRESS (msym_stack))
|
|
|
|
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->prev_sp;
|
|
|
|
if (base == 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
id = frame_id_build (base, func);
|
|
|
|
(*this_id) = id;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
m32r_frame_prev_register (struct frame_info *next_frame,
|
|
|
|
void **this_prologue_cache,
|
|
|
|
int regnum, int *optimizedp,
|
|
|
|
enum lval_type *lvalp, CORE_ADDR *addrp,
|
2005-11-08 06:54:22 +01:00
|
|
|
int *realnump, gdb_byte *bufferp)
|
2003-07-21 20:56:05 +02:00
|
|
|
{
|
|
|
|
struct m32r_unwind_cache *info
|
|
|
|
= m32r_frame_unwind_cache (next_frame, this_prologue_cache);
|
2004-07-31 23:53:17 +02:00
|
|
|
trad_frame_get_prev_register (next_frame, info->saved_regs, regnum,
|
|
|
|
optimizedp, lvalp, addrp, realnump, bufferp);
|
2003-07-21 20:56:05 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static const struct frame_unwind m32r_frame_unwind = {
|
|
|
|
NORMAL_FRAME,
|
|
|
|
m32r_frame_this_id,
|
|
|
|
m32r_frame_prev_register
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct frame_unwind *
|
2003-07-27 17:38:16 +02:00
|
|
|
m32r_frame_sniffer (struct frame_info *next_frame)
|
2003-07-21 20:56:05 +02:00
|
|
|
{
|
|
|
|
return &m32r_frame_unwind;
|
|
|
|
}
|
|
|
|
|
|
|
|
static CORE_ADDR
|
|
|
|
m32r_frame_base_address (struct frame_info *next_frame, void **this_cache)
|
|
|
|
{
|
|
|
|
struct m32r_unwind_cache *info
|
|
|
|
= m32r_frame_unwind_cache (next_frame, this_cache);
|
|
|
|
return info->base;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct frame_base m32r_frame_base = {
|
|
|
|
&m32r_frame_unwind,
|
|
|
|
m32r_frame_base_address,
|
|
|
|
m32r_frame_base_address,
|
|
|
|
m32r_frame_base_address
|
|
|
|
};
|
|
|
|
|
|
|
|
/* 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
|
|
|
|
m32r_unwind_dummy_id (struct gdbarch *gdbarch, struct frame_info *next_frame)
|
|
|
|
{
|
|
|
|
return frame_id_build (m32r_unwind_sp (gdbarch, next_frame),
|
|
|
|
frame_pc_unwind (next_frame));
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static gdbarch_init_ftype m32r_gdbarch_init;
|
|
|
|
|
|
|
|
static struct gdbarch *
|
|
|
|
m32r_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
|
|
|
|
{
|
|
|
|
struct gdbarch *gdbarch;
|
|
|
|
struct gdbarch_tdep *tdep;
|
|
|
|
|
|
|
|
/* If there is already a candidate, use it. */
|
|
|
|
arches = gdbarch_list_lookup_by_info (arches, &info);
|
|
|
|
if (arches != NULL)
|
|
|
|
return arches->gdbarch;
|
|
|
|
|
|
|
|
/* Allocate space for the new architecture. */
|
|
|
|
tdep = XMALLOC (struct gdbarch_tdep);
|
|
|
|
gdbarch = gdbarch_alloc (&info, tdep);
|
|
|
|
|
|
|
|
set_gdbarch_read_pc (gdbarch, m32r_read_pc);
|
|
|
|
set_gdbarch_write_pc (gdbarch, m32r_write_pc);
|
|
|
|
set_gdbarch_unwind_sp (gdbarch, m32r_unwind_sp);
|
|
|
|
|
2004-10-01 09:29:34 +02:00
|
|
|
set_gdbarch_num_regs (gdbarch, M32R_NUM_REGS);
|
2003-07-21 20:56:05 +02:00
|
|
|
set_gdbarch_sp_regnum (gdbarch, M32R_SP_REGNUM);
|
|
|
|
set_gdbarch_register_name (gdbarch, m32r_register_name);
|
|
|
|
set_gdbarch_register_type (gdbarch, m32r_register_type);
|
|
|
|
|
|
|
|
set_gdbarch_push_dummy_call (gdbarch, m32r_push_dummy_call);
|
2004-10-05 06:07:10 +02:00
|
|
|
set_gdbarch_return_value (gdbarch, m32r_return_value);
|
2003-07-21 20:56:05 +02:00
|
|
|
|
|
|
|
set_gdbarch_skip_prologue (gdbarch, m32r_skip_prologue);
|
|
|
|
set_gdbarch_inner_than (gdbarch, core_addr_lessthan);
|
|
|
|
set_gdbarch_breakpoint_from_pc (gdbarch, m32r_breakpoint_from_pc);
|
|
|
|
set_gdbarch_memory_insert_breakpoint (gdbarch,
|
|
|
|
m32r_memory_insert_breakpoint);
|
|
|
|
set_gdbarch_memory_remove_breakpoint (gdbarch,
|
|
|
|
m32r_memory_remove_breakpoint);
|
|
|
|
|
|
|
|
set_gdbarch_frame_align (gdbarch, m32r_frame_align);
|
|
|
|
|
|
|
|
frame_base_set_default (gdbarch, &m32r_frame_base);
|
|
|
|
|
|
|
|
/* Methods for saving / extracting a dummy frame's ID. The ID's
|
|
|
|
stack address must match the SP value returned by
|
|
|
|
PUSH_DUMMY_CALL, and saved by generic_save_dummy_frame_tos. */
|
|
|
|
set_gdbarch_unwind_dummy_id (gdbarch, m32r_unwind_dummy_id);
|
|
|
|
|
|
|
|
/* Return the unwound PC value. */
|
|
|
|
set_gdbarch_unwind_pc (gdbarch, m32r_unwind_pc);
|
|
|
|
|
|
|
|
set_gdbarch_print_insn (gdbarch, print_insn_m32r);
|
|
|
|
|
2004-11-04 03:15:20 +01:00
|
|
|
/* Hook in ABI-specific overrides, if they have been registered. */
|
|
|
|
gdbarch_init_osabi (info, gdbarch);
|
|
|
|
|
|
|
|
/* Hook in the default unwinders. */
|
|
|
|
frame_unwind_append_sniffer (gdbarch, m32r_frame_sniffer);
|
|
|
|
|
2007-05-11 21:57:17 +02:00
|
|
|
/* Support simple overlay manager. */
|
|
|
|
set_gdbarch_overlay_update (gdbarch, simple_overlay_update);
|
|
|
|
|
2003-07-21 20:56:05 +02:00
|
|
|
return gdbarch;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
_initialize_m32r_tdep (void)
|
|
|
|
{
|
|
|
|
register_gdbarch_init (bfd_arch_m32r, m32r_gdbarch_init);
|
|
|
|
}
|