2004-10-08 Andrew Cagney <cagney@gnu.org>

* target.h (struct target_ops): Rename to_xfer_memory to
	deprecated_xfer_memory.
	* target.c: Update.
	(deprecated_debug_xfer_memory): Rename debug_to_xfer_memory.
	* wince.c: Update.
	* win32-nat.c: Update.
	* v850ice.c: Update.
	* uw-thread.c: Update.
	* thread-db.c: Update.
	* sol-thread.c: Update.
	* remote.c: Update.
	* remote-vx.c: Update.
	* remote-st.c: Update.
	* remote-sim.c: Update.
	* remote-sds.c: Update.
	* remote-rdp.c: Update.
	* remote-rdi.c: Update.
	* remote-mips.c: Update.
	* remote-m32r-sdi.c: Update.
	* remote-e7000.c: Update.
	* procfs.c: Update.
	* ppc-bdm.c: Update.
	* nto-procfs.c: Update.
	* monitor.c: Update.
	* linux-nat.c: Update.
	* inftarg.c: Update.
	* hpux-thread.c: Update.
	* go32-nat.c: Update.
	* gnu-nat.c: Update.
	* exec.c: Update.
	* corelow.c: Update.
	* bsd-kvm.c: Update.
	* aix-thread.c: Update.
This commit is contained in:
Andrew Cagney 2004-10-08 20:30:00 +00:00
parent aa8698122b
commit c8e73a318e
33 changed files with 140 additions and 96 deletions

View file

@ -1,3 +1,39 @@
2004-10-08 Andrew Cagney <cagney@gnu.org>
* target.h (struct target_ops): Rename to_xfer_memory to
deprecated_xfer_memory.
* target.c: Update.
(deprecated_debug_xfer_memory): Rename debug_to_xfer_memory.
* wince.c: Update.
* win32-nat.c: Update.
* v850ice.c: Update.
* uw-thread.c: Update.
* thread-db.c: Update.
* sol-thread.c: Update.
* remote.c: Update.
* remote-vx.c: Update.
* remote-st.c: Update.
* remote-sim.c: Update.
* remote-sds.c: Update.
* remote-rdp.c: Update.
* remote-rdi.c: Update.
* remote-mips.c: Update.
* remote-m32r-sdi.c: Update.
* remote-e7000.c: Update.
* procfs.c: Update.
* ppc-bdm.c: Update.
* nto-procfs.c: Update.
* monitor.c: Update.
* linux-nat.c: Update.
* inftarg.c: Update.
* hpux-thread.c: Update.
* go32-nat.c: Update.
* gnu-nat.c: Update.
* exec.c: Update.
* corelow.c: Update.
* bsd-kvm.c: Update.
* aix-thread.c: Update.
2004-10-08 Andrew Cagney <cagney@gnu.org>
* target.c (debug_target): Move to near start of file.

View file

@ -1604,8 +1604,8 @@ aix_thread_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
struct cleanup *cleanup = save_inferior_ptid ();
inferior_ptid = pid_to_ptid (PIDGET (inferior_ptid));
n = base_target.to_xfer_memory (memaddr, myaddr, len,
write, attrib, &base_target);
n = base_target.deprecated_xfer_memory (memaddr, myaddr, len,
write, attrib, &base_target);
do_cleanups (cleanup);
return n;
@ -1736,7 +1736,7 @@ init_aix_thread_ops (void)
aix_thread_ops.to_wait = aix_thread_wait;
aix_thread_ops.to_fetch_registers = aix_thread_fetch_registers;
aix_thread_ops.to_store_registers = aix_thread_store_registers;
aix_thread_ops.to_xfer_memory = aix_thread_xfer_memory;
aix_thread_ops.deprecated_xfer_memory = aix_thread_xfer_memory;
/* No need for aix_thread_ops.to_create_inferior, because we activate thread
debugging when the inferior reaches pd_brk_addr. */
aix_thread_ops.to_kill = aix_thread_kill;

View file

@ -285,7 +285,7 @@ Optionally specify the filename of a core dump.";
bsd_kvm_ops.to_open = bsd_kvm_open;
bsd_kvm_ops.to_close = bsd_kvm_close;
bsd_kvm_ops.to_fetch_registers = bsd_kvm_fetch_registers;
bsd_kvm_ops.to_xfer_memory = bsd_kvm_xfer_memory;
bsd_kvm_ops.deprecated_xfer_memory = bsd_kvm_xfer_memory;
bsd_kvm_ops.to_stratum = process_stratum;
bsd_kvm_ops.to_has_memory = 1;
bsd_kvm_ops.to_has_stack = 1;

View file

@ -538,11 +538,11 @@ core_xfer_partial (struct target_ops *ops, enum target_object object,
{
case TARGET_OBJECT_MEMORY:
if (readbuf)
return (*ops->to_xfer_memory) (offset, readbuf, len, 0/*write*/,
NULL, ops);
return (*ops->deprecated_xfer_memory) (offset, readbuf, len,
0/*write*/, NULL, ops);
if (writebuf)
return (*ops->to_xfer_memory) (offset, readbuf, len, 1/*write*/,
NULL, ops);
return (*ops->deprecated_xfer_memory) (offset, readbuf, len,
1/*write*/, NULL, ops);
return -1;
case TARGET_OBJECT_AUXV:
@ -655,7 +655,7 @@ init_core_ops (void)
core_ops.to_detach = core_detach;
core_ops.to_fetch_registers = get_core_registers;
core_ops.to_xfer_partial = core_xfer_partial;
core_ops.to_xfer_memory = xfer_memory;
core_ops.deprecated_xfer_memory = xfer_memory;
core_ops.to_files_info = core_files_info;
core_ops.to_insert_breakpoint = ignore;
core_ops.to_remove_breakpoint = ignore;

View file

@ -699,7 +699,7 @@ Specify the filename of the executable file.";
exec_ops.to_open = exec_open;
exec_ops.to_close = exec_close;
exec_ops.to_attach = find_default_attach;
exec_ops.to_xfer_memory = xfer_memory;
exec_ops.deprecated_xfer_memory = xfer_memory;
exec_ops.to_files_info = exec_files_info;
exec_ops.to_insert_breakpoint = ignore;
exec_ops.to_remove_breakpoint = ignore;

View file

@ -2597,7 +2597,7 @@ init_gnu_ops (void)
gnu_ops.to_fetch_registers = gnu_fetch_registers; /* to_fetch_registers */
gnu_ops.to_store_registers = gnu_store_registers; /* to_store_registers */
gnu_ops.to_prepare_to_store = gnu_prepare_to_store; /* to_prepare_to_store */
gnu_ops.to_xfer_memory = gnu_xfer_memory; /* to_xfer_memory */
gnu_ops.deprecated_xfer_memory = gnu_xfer_memory;
gnu_ops.to_find_memory_regions = gnu_find_memory_regions;
gnu_ops.to_insert_breakpoint = memory_insert_breakpoint;
gnu_ops.to_remove_breakpoint = memory_remove_breakpoint;

View file

@ -861,7 +861,7 @@ init_go32_ops (void)
go32_ops.to_fetch_registers = go32_fetch_registers;
go32_ops.to_store_registers = go32_store_registers;
go32_ops.to_prepare_to_store = go32_prepare_to_store;
go32_ops.to_xfer_memory = go32_xfer_memory;
go32_ops.deprecated_xfer_memory = go32_xfer_memory;
go32_ops.to_files_info = go32_files_info;
go32_ops.to_insert_breakpoint = memory_insert_breakpoint;
go32_ops.to_remove_breakpoint = memory_remove_breakpoint;

View file

@ -403,7 +403,7 @@ hpux_thread_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len,
inferior_ptid = main_ptid;
retval =
deprecated_child_ops.to_xfer_memory (memaddr, myaddr, len, dowrite, attribs, target);
deprecated_child_ops.deprecated_xfer_memory (memaddr, myaddr, len, dowrite, attribs, target);
do_cleanups (old_chain);
@ -550,7 +550,7 @@ init_hpux_thread_ops (void)
hpux_thread_ops.to_fetch_registers = hpux_thread_fetch_registers;
hpux_thread_ops.to_store_registers = hpux_thread_store_registers;
hpux_thread_ops.to_prepare_to_store = hpux_thread_prepare_to_store;
hpux_thread_ops.to_xfer_memory = hpux_thread_xfer_memory;
hpux_thread_ops.deprecated_xfer_memory = hpux_thread_xfer_memory;
hpux_thread_ops.to_files_info = hpux_thread_files_info;
hpux_thread_ops.to_insert_breakpoint = memory_insert_breakpoint;
hpux_thread_ops.to_remove_breakpoint = memory_remove_breakpoint;

View file

@ -593,7 +593,7 @@ init_child_ops (void)
deprecated_child_ops.to_fetch_registers = fetch_inferior_registers;
deprecated_child_ops.to_store_registers = store_inferior_registers;
deprecated_child_ops.to_prepare_to_store = child_prepare_to_store;
deprecated_child_ops.to_xfer_memory = child_xfer_memory;
deprecated_child_ops.deprecated_xfer_memory = child_xfer_memory;
deprecated_child_ops.to_xfer_partial = child_xfer_partial;
deprecated_child_ops.to_files_info = child_files_info;
deprecated_child_ops.to_insert_breakpoint = memory_insert_breakpoint;

View file

@ -2332,7 +2332,7 @@ init_linux_nat_ops (void)
honor the LWP id, so we can use them directly. */
linux_nat_ops.to_fetch_registers = fetch_inferior_registers;
linux_nat_ops.to_store_registers = store_inferior_registers;
linux_nat_ops.to_xfer_memory = linux_nat_xfer_memory;
linux_nat_ops.deprecated_xfer_memory = linux_nat_xfer_memory;
linux_nat_ops.to_kill = linux_nat_kill;
linux_nat_ops.to_create_inferior = linux_nat_create_inferior;
linux_nat_ops.to_mourn_inferior = linux_nat_mourn_inferior;

View file

@ -2256,7 +2256,7 @@ init_base_monitor_ops (void)
monitor_ops.to_fetch_registers = monitor_fetch_registers;
monitor_ops.to_store_registers = monitor_store_registers;
monitor_ops.to_prepare_to_store = monitor_prepare_to_store;
monitor_ops.to_xfer_memory = monitor_xfer_memory;
monitor_ops.deprecated_xfer_memory = monitor_xfer_memory;
monitor_ops.to_files_info = monitor_files_info;
monitor_ops.to_insert_breakpoint = monitor_insert_breakpoint;
monitor_ops.to_remove_breakpoint = monitor_remove_breakpoint;

View file

@ -1272,7 +1272,7 @@ init_procfs_ops (void)
procfs_ops.to_fetch_registers = procfs_fetch_registers;
procfs_ops.to_store_registers = procfs_store_registers;
procfs_ops.to_prepare_to_store = procfs_prepare_to_store;
procfs_ops.to_xfer_memory = procfs_xfer_memory;
procfs_ops.deprecated_xfer_memory = procfs_xfer_memory;
procfs_ops.to_files_info = procfs_files_info;
procfs_ops.to_insert_breakpoint = procfs_insert_breakpoint;
procfs_ops.to_remove_breakpoint = procfs_remove_breakpoint;

View file

@ -325,7 +325,7 @@ a wiggler, specify wiggler and then the port it is connected to\n\
bdm_ppc_ops.to_fetch_registers = bdm_ppc_fetch_registers;
bdm_ppc_ops.to_store_registers = bdm_ppc_store_registers;
bdm_ppc_ops.to_prepare_to_store = ocd_prepare_to_store;
bdm_ppc_ops.to_xfer_memory = ocd_xfer_memory;
bdm_ppc_ops.deprecated_xfer_memory = ocd_xfer_memory;
bdm_ppc_ops.to_files_info = ocd_files_info;
bdm_ppc_ops.to_insert_breakpoint = ocd_insert_breakpoint;
bdm_ppc_ops.to_remove_breakpoint = ocd_remove_breakpoint;

View file

@ -172,7 +172,7 @@ init_procfs_ops (void)
procfs_ops.to_fetch_registers = procfs_fetch_registers;
procfs_ops.to_store_registers = procfs_store_registers;
procfs_ops.to_xfer_partial = procfs_xfer_partial;
procfs_ops.to_xfer_memory = procfs_xfer_memory;
procfs_ops.deprecated_xfer_memory = procfs_xfer_memory;
procfs_ops.to_insert_breakpoint = memory_insert_breakpoint;
procfs_ops.to_remove_breakpoint = memory_remove_breakpoint;
procfs_ops.to_notice_signals = procfs_notice_signals;
@ -4326,11 +4326,11 @@ procfs_xfer_partial (struct target_ops *ops, enum target_object object,
{
case TARGET_OBJECT_MEMORY:
if (readbuf)
return (*ops->to_xfer_memory) (offset, readbuf, len, 0/*write*/,
NULL, ops);
return (*ops->deprecated_xfer_memory) (offset, readbuf, len,
0/*write*/, NULL, ops);
if (writebuf)
return (*ops->to_xfer_memory) (offset, writebuf, len, 1/*write*/,
NULL, ops);
return (*ops->deprecated_xfer_memory) (offset, writebuf, len,
1/*write*/, NULL, ops);
return -1;
#ifdef NEW_PROC_API

View file

@ -2150,7 +2150,7 @@ target e7000 foobar";
e7000_ops.to_fetch_registers = e7000_fetch_register;
e7000_ops.to_store_registers = e7000_store_register;
e7000_ops.to_prepare_to_store = e7000_prepare_to_store;
e7000_ops.to_xfer_memory = e7000_xfer_inferior_memory;
e7000_ops.deprecated_xfer_memory = e7000_xfer_inferior_memory;
e7000_ops.to_files_info = e7000_files_info;
e7000_ops.to_insert_breakpoint = e7000_insert_breakpoint;
e7000_ops.to_remove_breakpoint = e7000_remove_breakpoint;

View file

@ -1575,7 +1575,7 @@ init_m32r_ops (void)
m32r_ops.to_fetch_registers = m32r_fetch_register;
m32r_ops.to_store_registers = m32r_store_register;
m32r_ops.to_prepare_to_store = m32r_prepare_to_store;
m32r_ops.to_xfer_memory = m32r_xfer_memory;
m32r_ops.deprecated_xfer_memory = m32r_xfer_memory;
m32r_ops.to_files_info = m32r_files_info;
m32r_ops.to_insert_breakpoint = m32r_insert_breakpoint;
m32r_ops.to_remove_breakpoint = m32r_remove_breakpoint;

View file

@ -3306,7 +3306,7 @@ _initialize_remote_mips (void)
mips_ops.to_fetch_registers = mips_fetch_registers;
mips_ops.to_store_registers = mips_store_registers;
mips_ops.to_prepare_to_store = mips_prepare_to_store;
mips_ops.to_xfer_memory = mips_xfer_memory;
mips_ops.deprecated_xfer_memory = mips_xfer_memory;
mips_ops.to_files_info = mips_files_info;
mips_ops.to_insert_breakpoint = mips_insert_breakpoint;
mips_ops.to_remove_breakpoint = mips_remove_breakpoint;

View file

@ -895,7 +895,7 @@ Specify the serial device it is connected to (e.g. /dev/ttya).";
arm_rdi_ops.to_fetch_registers = arm_rdi_fetch_registers;
arm_rdi_ops.to_store_registers = arm_rdi_store_registers;
arm_rdi_ops.to_prepare_to_store = arm_rdi_prepare_to_store;
arm_rdi_ops.to_xfer_memory = arm_rdi_xfer_memory;
arm_rdi_ops.deprecated_xfer_memory = arm_rdi_xfer_memory;
arm_rdi_ops.to_files_info = arm_rdi_files_info;
arm_rdi_ops.to_insert_breakpoint = arm_rdi_insert_breakpoint;
arm_rdi_ops.to_remove_breakpoint = arm_rdi_remove_breakpoint;

View file

@ -1405,7 +1405,7 @@ init_remote_rdp_ops (void)
remote_rdp_ops.to_fetch_registers = remote_rdp_fetch_register;
remote_rdp_ops.to_store_registers = remote_rdp_store_register;
remote_rdp_ops.to_prepare_to_store = remote_rdp_prepare_to_store;
remote_rdp_ops.to_xfer_memory = remote_rdp_xfer_inferior_memory;
remote_rdp_ops.deprecated_xfer_memory = remote_rdp_xfer_inferior_memory;
remote_rdp_ops.to_files_info = remote_rdp_files_info;
remote_rdp_ops.to_insert_breakpoint = remote_rdp_insert_breakpoint;
remote_rdp_ops.to_remove_breakpoint = remote_rdp_remove_breakpoint;

View file

@ -1061,7 +1061,7 @@ Specify the serial device it is connected to (e.g. /dev/ttya).";
sds_ops.to_fetch_registers = sds_fetch_registers;
sds_ops.to_store_registers = sds_store_registers;
sds_ops.to_prepare_to_store = sds_prepare_to_store;
sds_ops.to_xfer_memory = sds_xfer_memory;
sds_ops.deprecated_xfer_memory = sds_xfer_memory;
sds_ops.to_files_info = sds_files_info;
sds_ops.to_insert_breakpoint = sds_insert_breakpoint;
sds_ops.to_remove_breakpoint = sds_remove_breakpoint;

View file

@ -863,7 +863,7 @@ init_gdbsim_ops (void)
gdbsim_ops.to_fetch_registers = gdbsim_fetch_register;
gdbsim_ops.to_store_registers = gdbsim_store_register;
gdbsim_ops.to_prepare_to_store = gdbsim_prepare_to_store;
gdbsim_ops.to_xfer_memory = gdbsim_xfer_inferior_memory;
gdbsim_ops.deprecated_xfer_memory = gdbsim_xfer_inferior_memory;
gdbsim_ops.to_files_info = gdbsim_files_info;
gdbsim_ops.to_insert_breakpoint = gdbsim_insert_breakpoint;
gdbsim_ops.to_remove_breakpoint = gdbsim_remove_breakpoint;

View file

@ -775,7 +775,7 @@ the speed to connect at in bits per second.";
st2000_ops.to_fetch_registers = st2000_fetch_register;
st2000_ops.to_store_registers = st2000_store_register;
st2000_ops.to_prepare_to_store = st2000_prepare_to_store;
st2000_ops.to_xfer_memory = st2000_xfer_inferior_memory;
st2000_ops.deprecated_xfer_memory = st2000_xfer_inferior_memory;
st2000_ops.to_files_info = st2000_files_info;
st2000_ops.to_insert_breakpoint = st2000_insert_breakpoint;
st2000_ops.to_remove_breakpoint = st2000_remove_breakpoint; /* Breakpoints */

View file

@ -1343,7 +1343,7 @@ Specify the name of the machine to connect to.";
vx_ops.to_open = vx_open;
vx_ops.to_close = vx_close;
vx_ops.to_attach = vx_attach;
vx_ops.to_xfer_memory = vx_xfer_memory;
vx_ops.deprecated_xfer_memory = vx_xfer_memory;
vx_ops.to_files_info = vx_files_info;
vx_ops.to_load = vx_load_command;
vx_ops.to_lookup_symbol = vx_lookup_symbol;
@ -1368,7 +1368,7 @@ init_vx_run_ops (void)
vx_run_ops.to_fetch_registers = vx_read_register;
vx_run_ops.to_store_registers = vx_write_register;
vx_run_ops.to_prepare_to_store = vx_prepare_to_store;
vx_run_ops.to_xfer_memory = vx_xfer_memory;
vx_run_ops.deprecated_xfer_memory = vx_xfer_memory;
vx_run_ops.to_files_info = vx_run_files_info;
vx_run_ops.to_insert_breakpoint = vx_insert_breakpoint;
vx_run_ops.to_remove_breakpoint = vx_remove_breakpoint;

View file

@ -5247,7 +5247,7 @@ Specify the serial device it is connected to\n\
remote_ops.to_fetch_registers = remote_fetch_registers;
remote_ops.to_store_registers = remote_store_registers;
remote_ops.to_prepare_to_store = remote_prepare_to_store;
remote_ops.to_xfer_memory = remote_xfer_memory;
remote_ops.deprecated_xfer_memory = remote_xfer_memory;
remote_ops.to_files_info = remote_files_info;
remote_ops.to_insert_breakpoint = remote_insert_breakpoint;
remote_ops.to_remove_breakpoint = remote_remove_breakpoint;
@ -5367,7 +5367,7 @@ Specify the serial device it is connected to (e.g. /dev/ttya).";
remote_async_ops.to_fetch_registers = remote_fetch_registers;
remote_async_ops.to_store_registers = remote_store_registers;
remote_async_ops.to_prepare_to_store = remote_prepare_to_store;
remote_async_ops.to_xfer_memory = remote_xfer_memory;
remote_async_ops.deprecated_xfer_memory = remote_xfer_memory;
remote_async_ops.to_files_info = remote_files_info;
remote_async_ops.to_insert_breakpoint = remote_insert_breakpoint;
remote_async_ops.to_remove_breakpoint = remote_remove_breakpoint;

View file

@ -680,11 +680,11 @@ sol_thread_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int dowrite,
}
if (target_has_execution)
retval = procfs_ops.to_xfer_memory (memaddr, myaddr, len,
dowrite, attrib, target);
retval = procfs_ops.deprecated_xfer_memory (memaddr, myaddr, len,
dowrite, attrib, target);
else
retval = orig_core_ops.to_xfer_memory (memaddr, myaddr, len,
dowrite, attrib, target);
retval = orig_core_ops.deprecated_xfer_memory (memaddr, myaddr, len,
dowrite, attrib, target);
do_cleanups (old_chain);
@ -1014,11 +1014,11 @@ rw_common (int dowrite, const struct ps_prochandle *ph, gdb_ps_addr_t addr,
/* FIXME: passing 0 as attrib argument. */
if (target_has_execution)
cc = procfs_ops.to_xfer_memory (addr, buf, size,
dowrite, 0, &procfs_ops);
cc = procfs_ops.deprecated_xfer_memory (addr, buf, size,
dowrite, 0, &procfs_ops);
else
cc = orig_core_ops.to_xfer_memory (addr, buf, size,
dowrite, 0, &core_ops);
cc = orig_core_ops.deprecated_xfer_memory (addr, buf, size,
dowrite, 0, &core_ops);
if (cc < 0)
{
@ -1541,7 +1541,7 @@ init_sol_thread_ops (void)
sol_thread_ops.to_fetch_registers = sol_thread_fetch_registers;
sol_thread_ops.to_store_registers = sol_thread_store_registers;
sol_thread_ops.to_prepare_to_store = sol_thread_prepare_to_store;
sol_thread_ops.to_xfer_memory = sol_thread_xfer_memory;
sol_thread_ops.deprecated_xfer_memory = sol_thread_xfer_memory;
sol_thread_ops.to_xfer_partial = sol_thread_xfer_partial;
sol_thread_ops.to_files_info = sol_thread_files_info;
sol_thread_ops.to_insert_breakpoint = memory_insert_breakpoint;
@ -1584,7 +1584,7 @@ init_sol_core_ops (void)
sol_core_ops.to_attach = sol_thread_attach;
sol_core_ops.to_detach = sol_core_detach;
sol_core_ops.to_fetch_registers = sol_thread_fetch_registers;
sol_core_ops.to_xfer_memory = sol_thread_xfer_memory;
sol_core_ops.deprecated_xfer_memory = sol_thread_xfer_memory;
sol_core_ops.to_xfer_partial = sol_thread_xfer_partial;
sol_core_ops.to_files_info = sol_core_files_info;
sol_core_ops.to_insert_breakpoint = ignore;

View file

@ -108,8 +108,9 @@ static void debug_to_store_registers (int);
static void debug_to_prepare_to_store (void);
static int debug_to_xfer_memory (CORE_ADDR, char *, int, int,
struct mem_attrib *, struct target_ops *);
static int deprecated_debug_xfer_memory (CORE_ADDR, char *, int, int,
struct mem_attrib *,
struct target_ops *);
static void debug_to_files_info (struct target_ops *);
@ -390,7 +391,7 @@ update_current_target (void)
INHERIT (to_fetch_registers, t);
INHERIT (to_store_registers, t);
INHERIT (to_prepare_to_store, t);
INHERIT (to_xfer_memory, t);
INHERIT (deprecated_xfer_memory, t);
INHERIT (to_files_info, t);
INHERIT (to_insert_breakpoint, t);
INHERIT (to_remove_breakpoint, t);
@ -497,7 +498,7 @@ update_current_target (void)
de_fault (to_prepare_to_store,
(void (*) (void))
noprocess);
de_fault (to_xfer_memory,
de_fault (deprecated_xfer_memory,
(int (*) (CORE_ADDR, char *, int, int, struct mem_attrib *, struct target_ops *))
nomemory);
de_fault (to_files_info,
@ -1047,8 +1048,8 @@ do_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
if (len == 0)
return 0;
/* to_xfer_memory is not guaranteed to set errno, even when it returns
0. */
/* deprecated_xfer_memory is not guaranteed to set errno, even when
it returns 0. */
errno = 0;
if (!write && trust_readonly)
@ -1065,7 +1066,7 @@ do_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
}
/* The quick case is that the top target can handle the transfer. */
res = current_target.to_xfer_memory
res = current_target.deprecated_xfer_memory
(memaddr, myaddr, len, write, attrib, &current_target);
/* If res <= 0 then we call it again in the loop. Ah well. */
@ -1076,7 +1077,7 @@ do_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
if (!t->to_has_memory)
continue;
res = t->to_xfer_memory (memaddr, myaddr, len, write, attrib, t);
res = t->deprecated_xfer_memory (memaddr, myaddr, len, write, attrib, t);
if (res > 0)
break; /* Handled all or part of xfer */
if (t->to_has_all_memory)
@ -1256,9 +1257,9 @@ default_xfer_partial (struct target_ops *ops, enum target_object object,
const void *writebuf, ULONGEST offset, LONGEST len)
{
if (object == TARGET_OBJECT_MEMORY
&& ops->to_xfer_memory != NULL)
/* If available, fall back to the target's "to_xfer_memory"
method. */
&& ops->deprecated_xfer_memory != NULL)
/* If available, fall back to the target's
"deprecated_xfer_memory" method. */
{
int xfered = -1;
errno = 0;
@ -1267,18 +1268,18 @@ default_xfer_partial (struct target_ops *ops, enum target_object object,
void *buffer = xmalloc (len);
struct cleanup *cleanup = make_cleanup (xfree, buffer);
memcpy (buffer, writebuf, len);
xfered = ops->to_xfer_memory (offset, buffer, len, 1/*write*/, NULL,
ops);
xfered = ops->deprecated_xfer_memory (offset, buffer, len,
1/*write*/, NULL, ops);
do_cleanups (cleanup);
}
if (readbuf != NULL)
xfered = ops->to_xfer_memory (offset, readbuf, len, 0/*read*/, NULL,
ops);
xfered = ops->deprecated_xfer_memory (offset, readbuf, len, 0/*read*/,
NULL, ops);
if (xfered > 0)
return xfered;
else if (xfered == 0 && errno == 0)
/* "to_xfer_memory" uses 0, cross checked against ERRNO as one
indication of an error. */
/* "deprecated_xfer_memory" uses 0, cross checked against
ERRNO as one indication of an error. */
return 0;
else
return -1;
@ -1964,14 +1965,14 @@ debug_to_prepare_to_store (void)
}
static int
debug_to_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
struct mem_attrib *attrib,
struct target_ops *target)
deprecated_debug_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len,
int write, struct mem_attrib *attrib,
struct target_ops *target)
{
int retval;
retval = debug_target.to_xfer_memory (memaddr, myaddr, len, write,
attrib, target);
retval = debug_target.deprecated_xfer_memory (memaddr, myaddr, len, write,
attrib, target);
fprintf_unfiltered (gdb_stdlog,
"target_xfer_memory (0x%x, xxx, %d, %s, xxx) = %d",
@ -2487,7 +2488,7 @@ setup_target_debug (void)
current_target.to_fetch_registers = debug_to_fetch_registers;
current_target.to_store_registers = debug_to_store_registers;
current_target.to_prepare_to_store = debug_to_prepare_to_store;
current_target.to_xfer_memory = debug_to_xfer_memory;
current_target.deprecated_xfer_memory = deprecated_debug_xfer_memory;
current_target.to_files_info = debug_to_files_info;
current_target.to_insert_breakpoint = debug_to_insert_breakpoint;
current_target.to_remove_breakpoint = debug_to_remove_breakpoint;

View file

@ -324,12 +324,15 @@ struct target_ops
negative (call its absolute value N) means that we cannot
transfer right at MEMADDR, but we could transfer at least
something at MEMADDR + N. */
something at MEMADDR + N.
int (*to_xfer_memory) (CORE_ADDR memaddr, char *myaddr,
int len, int write,
struct mem_attrib *attrib,
struct target_ops *target);
NOTE: cagney/2004-10-01: This has been entirely superseeded by
to_xfer_partial and inferior inheritance. */
int (*deprecated_xfer_memory) (CORE_ADDR memaddr, char *myaddr,
int len, int write,
struct mem_attrib *attrib,
struct target_ops *target);
void (*to_files_info) (struct target_ops *);
int (*to_insert_breakpoint) (CORE_ADDR, char *);

View file

@ -987,8 +987,8 @@ thread_db_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
}
xfer =
target_beneath->to_xfer_memory (memaddr, myaddr, len, write, attrib,
target);
target_beneath->deprecated_xfer_memory (memaddr, myaddr, len, write,
attrib, target);
do_cleanups (old_chain);
return xfer;
@ -1339,7 +1339,7 @@ init_thread_db_ops (void)
thread_db_ops.to_wait = thread_db_wait;
thread_db_ops.to_fetch_registers = thread_db_fetch_registers;
thread_db_ops.to_store_registers = thread_db_store_registers;
thread_db_ops.to_xfer_memory = thread_db_xfer_memory;
thread_db_ops.deprecated_xfer_memory = thread_db_xfer_memory;
thread_db_ops.to_kill = thread_db_kill;
thread_db_ops.to_create_inferior = thread_db_create_inferior;
thread_db_ops.to_post_startup_inferior = thread_db_post_startup_inferior;

View file

@ -332,8 +332,9 @@ dbgstate (int state)
static int
read_thr_debug (struct thread_debug *debugp)
{
return base_ops.to_xfer_memory (thr_debug_addr, (char *)debugp,
sizeof (*debugp), 0, NULL, &base_ops);
return base_ops.deprecated_xfer_memory (thr_debug_addr, (char *)debugp,
sizeof (*debugp), 0, NULL,
&base_ops);
}
/* Read into MAP the contents of the thread map at inferior process address
@ -342,8 +343,9 @@ read_thr_debug (struct thread_debug *debugp)
static int
read_map (CORE_ADDR mapp, struct thread_map *map)
{
return base_ops.to_xfer_memory ((CORE_ADDR)THR_MAP (mapp), (char *)map,
sizeof (*map), 0, NULL, &base_ops);
return base_ops.deprecated_xfer_memory ((CORE_ADDR)THR_MAP (mapp),
(char *)map, sizeof (*map),
0, NULL, &base_ops);
}
/* Read into LWP the contents of the lwp decriptor at inferior process address
@ -352,8 +354,8 @@ read_map (CORE_ADDR mapp, struct thread_map *map)
static int
read_lwp (CORE_ADDR lwpp, __lwp_desc_t *lwp)
{
return base_ops.to_xfer_memory (lwpp, (char *)lwp,
sizeof (*lwp), 0, NULL, &base_ops);
return base_ops.deprecated_xfer_memory (lwpp, (char *)lwp,
sizeof (*lwp), 0, NULL, &base_ops);
}
/* Iterate through all user threads, applying FUNC(<map>, <lwp>, DATA) until
@ -375,8 +377,9 @@ thread_iter (int (*func)(iter_t *, void *), void *data)
if (!read_thr_debug (&debug))
return 0;
if (!base_ops.to_xfer_memory ((CORE_ADDR)debug.thr_map, (char *)&mapp,
sizeof (mapp), 0, NULL, &base_ops))
if (!base_ops.deprecated_xfer_memory ((CORE_ADDR)debug.thr_map,
(char *)&mapp, sizeof (mapp), 0, NULL,
&base_ops))
return 0;
if (!mapp)
return 0;
@ -633,11 +636,12 @@ libthread_stub (ptid_t ptid)
/* Retrieve stub args. */
sp = read_register_pid (SP_REGNUM, ptid);
if (!base_ops.to_xfer_memory (sp + SP_ARG0, (char *)&mapp,
sizeof (mapp), 0, NULL, &base_ops))
if (!base_ops.deprecated_xfer_memory (sp + SP_ARG0, (char *)&mapp,
sizeof (mapp), 0, NULL, &base_ops))
goto err;
if (!base_ops.to_xfer_memory (sp + SP_ARG0 + sizeof (mapp), (char *)&change,
sizeof (change), 0, NULL, &base_ops))
if (!base_ops.deprecated_xfer_memory (sp + SP_ARG0 + sizeof (mapp),
(char *)&change, sizeof (change), 0,
NULL, &base_ops))
goto err;
/* create_inferior() may not have finished yet, so notice the main
@ -953,7 +957,7 @@ libthread_init (void)
if (!(thr_debug_addr = SYMBOL_VALUE_ADDRESS (ms)))
return;
/* Initialize base_ops.to_xfer_memory(). */
/* Initialize base_ops.deprecated_xfer_memory(). */
base_ops = current_target;
/* Load _thr_debug's current contents. */
@ -984,8 +988,8 @@ libthread_init (void)
/* Activate the stub function. */
onp = (CORE_ADDR)&((struct thread_debug *)thr_debug_addr)->thr_debug_on;
if (!base_ops.to_xfer_memory ((CORE_ADDR)onp, (char *)&one,
sizeof (one), 1, NULL, &base_ops))
if (!base_ops.deprecated_xfer_memory ((CORE_ADDR)onp, (char *)&one,
sizeof (one), 1, NULL, &base_ops))
{
delete_breakpoint (b);
goto err;

View file

@ -899,7 +899,7 @@ init_850ice_ops (void)
v850ice_ops.to_fetch_registers = v850ice_fetch_registers;
v850ice_ops.to_store_registers = v850ice_store_registers;
v850ice_ops.to_prepare_to_store = v850ice_prepare_to_store;
v850ice_ops.to_xfer_memory = v850ice_xfer_memory;
v850ice_ops.deprecated_xfer_memory = v850ice_xfer_memory;
v850ice_ops.to_files_info = v850ice_files_info;
v850ice_ops.to_insert_breakpoint = v850ice_insert_breakpoint;
v850ice_ops.to_remove_breakpoint = v850ice_remove_breakpoint;

View file

@ -2080,7 +2080,7 @@ init_child_ops (void)
deprecated_child_ops.to_fetch_registers = child_fetch_inferior_registers;
deprecated_child_ops.to_store_registers = child_store_inferior_registers;
deprecated_child_ops.to_prepare_to_store = child_prepare_to_store;
deprecated_child_ops.to_xfer_memory = child_xfer_memory;
deprecated_child_ops.deprecated_xfer_memory = child_xfer_memory;
deprecated_child_ops.to_files_info = child_files_info;
deprecated_child_ops.to_insert_breakpoint = memory_insert_breakpoint;
deprecated_child_ops.to_remove_breakpoint = memory_remove_breakpoint;

View file

@ -1900,7 +1900,7 @@ init_child_ops (void)
deprecated_child_ops.to_fetch_registers = child_fetch_inferior_registers;
deprecated_child_ops.to_store_registers = child_store_inferior_registers;
deprecated_child_ops.to_prepare_to_store = child_prepare_to_store;
deprecated_child_ops.to_xfer_memory = child_xfer_memory;
deprecated_child_ops.deprecated_xfer_memory = child_xfer_memory;
deprecated_child_ops.to_files_info = child_files_info;
deprecated_child_ops.to_insert_breakpoint = memory_insert_breakpoint;
deprecated_child_ops.to_remove_breakpoint = memory_remove_breakpoint;

View file

@ -2080,7 +2080,7 @@ init_child_ops (void)
deprecated_child_ops.to_fetch_registers = child_fetch_inferior_registers;
deprecated_child_ops.to_store_registers = child_store_inferior_registers;
deprecated_child_ops.to_prepare_to_store = child_prepare_to_store;
deprecated_child_ops.to_xfer_memory = child_xfer_memory;
deprecated_child_ops.deprecated_xfer_memory = child_xfer_memory;
deprecated_child_ops.to_files_info = child_files_info;
deprecated_child_ops.to_insert_breakpoint = memory_insert_breakpoint;
deprecated_child_ops.to_remove_breakpoint = memory_remove_breakpoint;