From 98d346c38e53e4d3259184f5405f6ae0d12627ba Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Sun, 4 Apr 2004 14:23:51 +0000 Subject: [PATCH] 2004-04-04 Andrew Cagney * gnu-nat.c (gnu_wait): Use memcpy instead of bcopy. * remote-vxmips.c (vx_read_register, vx_write_register): Ditto. * remote-vx68.c (vx_read_register, vx_write_register): Ditto. --- gdb/ChangeLog | 4 +++ gdb/gnu-nat.c | 2 +- gdb/remote-vx68.c | 55 ++++++++++++++++++---------------- gdb/remote-vxmips.c | 72 +++++++++++++++++++++++++-------------------- 4 files changed, 74 insertions(+), 59 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5bba7e6d609..28794941af3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,9 @@ 2004-04-04 Andrew Cagney + * gnu-nat.c (gnu_wait): Use memcpy instead of bcopy. + * remote-vxmips.c (vx_read_register, vx_write_register): Ditto. + * remote-vx68.c (vx_read_register, vx_write_register): Ditto. + * config/vax/xm-vax.h (FAULT_CODE_ORIGIN, INIT_STACK): Delete. * config/alpha/xm-alphaosf.h (NO_SIGINTERRUPT): Delete. * config/alpha/xm-alphalinux.h (NO_SIGINTERRUPT): Delete. diff --git a/gdb/gnu-nat.c b/gdb/gnu-nat.c index a61d577f839..dee0e2c7d23 100644 --- a/gdb/gnu-nat.c +++ b/gdb/gnu-nat.c @@ -1574,7 +1574,7 @@ rewait: } /* Pass back out our results. */ - bcopy (&inf->wait.status, status, sizeof (*status)); + memcpy (status, &inf->wait.status, sizeof (*status)); thread = inf->wait.thread; if (thread) diff --git a/gdb/remote-vx68.c b/gdb/remote-vx68.c index 8cdac6f0278..8b008247e72 100644 --- a/gdb/remote-vx68.c +++ b/gdb/remote-vx68.c @@ -85,14 +85,15 @@ vx_read_register (int regno) net_read_registers (mc68k_greg_packet, MC68K_GREG_PLEN, PTRACE_GETREGS); - bcopy (&mc68k_greg_packet[MC68K_R_D0], deprecated_registers, - 16 * MC68K_GREG_SIZE); - bcopy (&mc68k_greg_packet[MC68K_R_SR], - &deprecated_registers[DEPRECATED_REGISTER_BYTE (PS_REGNUM)], - MC68K_GREG_SIZE); - bcopy (&mc68k_greg_packet[MC68K_R_PC], - &deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)], - MC68K_GREG_SIZE); + memcpy (deprecated_registers, + &mc68k_greg_packet[MC68K_R_D0] + 16 * MC68K_GREG_SIZE); + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (PS_REGNUM)], + &mc68k_greg_packet[MC68K_R_SR], + MC68K_GREG_SIZE); + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)], + &mc68k_greg_packet[MC68K_R_PC], + MC68K_GREG_SIZE); /* Get floating-point registers, if the target system has them. Otherwise, zero them. */ @@ -102,12 +103,12 @@ vx_read_register (int regno) net_read_registers (mc68k_fpreg_packet, MC68K_FPREG_PLEN, PTRACE_GETFPREGS); - bcopy (&mc68k_fpreg_packet[MC68K_R_FP0], - &deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], - MC68K_FPREG_SIZE * 8); - bcopy (&mc68k_fpreg_packet[MC68K_R_FPCR], - &deprecated_registers[DEPRECATED_REGISTER_BYTE (FPC_REGNUM)], - MC68K_FPREG_PLEN - (MC68K_FPREG_SIZE * 8)); + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], + &mc68k_fpreg_packet[MC68K_R_FP0], + MC68K_FPREG_SIZE * 8); + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FPC_REGNUM)], + &mc68k_fpreg_packet[MC68K_R_FPCR], + MC68K_FPREG_PLEN - (MC68K_FPREG_SIZE * 8)); } else { @@ -134,12 +135,14 @@ vx_write_register (int regno) /* Store general-purpose registers. */ - bcopy (deprecated_registers, &mc68k_greg_packet[MC68K_R_D0], - 16 * MC68K_GREG_SIZE); - bcopy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (PS_REGNUM)], - &mc68k_greg_packet[MC68K_R_SR], MC68K_GREG_SIZE); - bcopy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)], - &mc68k_greg_packet[MC68K_R_PC], MC68K_GREG_SIZE); + memcpy (&mc68k_greg_packet[MC68K_R_D0], deprecated_registers, + 16 * MC68K_GREG_SIZE); + memcpy (&mc68k_greg_packet[MC68K_R_SR], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (PS_REGNUM)], + MC68K_GREG_SIZE); + memcpy (&mc68k_greg_packet[MC68K_R_PC], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (PC_REGNUM)], + MC68K_GREG_SIZE); net_write_registers (mc68k_greg_packet, MC68K_GREG_PLEN, PTRACE_SETREGS); @@ -147,12 +150,12 @@ vx_write_register (int regno) if (target_has_fp) { - bcopy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], - &mc68k_fpreg_packet[MC68K_R_FP0], - MC68K_FPREG_SIZE * 8); - bcopy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FPC_REGNUM)], - &mc68k_fpreg_packet[MC68K_R_FPCR], - MC68K_FPREG_PLEN - (MC68K_FPREG_SIZE * 8)); + memcpy (&mc68k_fpreg_packet[MC68K_R_FP0], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], + MC68K_FPREG_SIZE * 8); + memcpy (&mc68k_fpreg_packet[MC68K_R_FPCR], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (FPC_REGNUM)], + MC68K_FPREG_PLEN - (MC68K_FPREG_SIZE * 8)); net_write_registers (mc68k_fpreg_packet, MC68K_FPREG_PLEN, PTRACE_SETFPREGS); diff --git a/gdb/remote-vxmips.c b/gdb/remote-vxmips.c index 55ba49b98ca..617bce026c7 100644 --- a/gdb/remote-vxmips.c +++ b/gdb/remote-vxmips.c @@ -103,19 +103,23 @@ vx_read_register (int regno) /* Copy the general registers. */ - bcopy (&mips_greg_packet[MIPS_R_GP0], &deprecated_registers[0], - 32 * MIPS_GREG_SIZE); + memcpy (&deprecated_registers[0], &mips_greg_packet[MIPS_R_GP0], + 32 * MIPS_GREG_SIZE); /* Copy SR, LO, HI, and PC. */ - bcopy (&mips_greg_packet[MIPS_R_SR], - &deprecated_registers[DEPRECATED_REGISTER_BYTE (PS_REGNUM)], MIPS_GREG_SIZE); - bcopy (&mips_greg_packet[MIPS_R_LO], - &deprecated_registers[DEPRECATED_REGISTER_BYTE (mips_regnum (current_gdbarch)->lo)], MIPS_GREG_SIZE); - bcopy (&mips_greg_packet[MIPS_R_HI], - &deprecated_registers[DEPRECATED_REGISTER_BYTE (mips_regnum (current_gdbarch)->hi)], MIPS_GREG_SIZE); - bcopy (&mips_greg_packet[MIPS_R_PC], - &deprecated_registers[DEPRECATED_REGISTER_BYTE (mips_regnum (current_gdbarch)->pc)], MIPS_GREG_SIZE); + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (PS_REGNUM)], + &mips_greg_packet[MIPS_R_SR], + MIPS_GREG_SIZE); + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (mips_regnum (current_gdbarch)->lo)], + &mips_greg_packet[MIPS_R_LO], + MIPS_GREG_SIZE); + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (mips_regnum (current_gdbarch)->hi)], + &mips_greg_packet[MIPS_R_HI], + MIPS_GREG_SIZE); + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (mips_regnum (current_gdbarch)->pc)], + &mips_greg_packet[MIPS_R_PC], + MIPS_GREG_SIZE); /* If the target has floating point registers, fetch them. Otherwise, zero the floating point register values in @@ -129,15 +133,15 @@ vx_read_register (int regno) /* Copy the floating point registers. */ - bcopy (&mips_fpreg_packet[MIPS_R_FP0], - &deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], - DEPRECATED_REGISTER_RAW_SIZE (FP0_REGNUM) * 32); + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], + &mips_fpreg_packet[MIPS_R_FP0], + DEPRECATED_REGISTER_RAW_SIZE (FP0_REGNUM) * 32); /* Copy the floating point control/status register (fpcsr). */ - bcopy (&mips_fpreg_packet[MIPS_R_FPCSR], - &deprecated_registers[DEPRECATED_REGISTER_BYTE (mips_regnum (current_gdbarch)->fp_control_status)], - DEPRECATED_REGISTER_RAW_SIZE (mips_regnum (current_gdbarch)->fp_control_status)); + memcpy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (mips_regnum (current_gdbarch)->fp_control_status)], + &mips_fpreg_packet[MIPS_R_FPCSR], + DEPRECATED_REGISTER_RAW_SIZE (mips_regnum (current_gdbarch)->fp_control_status)); } else { @@ -163,19 +167,23 @@ vx_write_register (int regno) /* Store general registers. */ - bcopy (&deprecated_registers[0], &mips_greg_packet[MIPS_R_GP0], - 32 * MIPS_GREG_SIZE); + memcpy (&mips_greg_packet[MIPS_R_GP0], &deprecated_registers[0], + 32 * MIPS_GREG_SIZE); /* Copy SR, LO, HI, and PC. */ - bcopy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (PS_REGNUM)], - &mips_greg_packet[MIPS_R_SR], MIPS_GREG_SIZE); - bcopy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (mips_regnum (current_gdbarch)->lo)], - &mips_greg_packet[MIPS_R_LO], MIPS_GREG_SIZE); - bcopy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (mips_regnum (current_gdbarch)->hi)], - &mips_greg_packet[MIPS_R_HI], MIPS_GREG_SIZE); - bcopy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (mips_regnum (current_gdbarch)->pc)], - &mips_greg_packet[MIPS_R_PC], MIPS_GREG_SIZE); + memcpy (&mips_greg_packet[MIPS_R_SR], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (PS_REGNUM)], + MIPS_GREG_SIZE); + memcpy (&mips_greg_packet[MIPS_R_LO], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (mips_regnum (current_gdbarch)->lo)], + MIPS_GREG_SIZE); + memcpy (&mips_greg_packet[MIPS_R_HI], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (mips_regnum (current_gdbarch)->hi)], + MIPS_GREG_SIZE); + memcpy (&mips_greg_packet[MIPS_R_PC], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (mips_regnum (current_gdbarch)->pc)], + MIPS_GREG_SIZE); net_write_registers (mips_greg_packet, MIPS_GREG_PLEN, PTRACE_SETREGS); @@ -185,15 +193,15 @@ vx_write_register (int regno) { /* Copy the floating point data registers. */ - bcopy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], - &mips_fpreg_packet[MIPS_R_FP0], - DEPRECATED_REGISTER_RAW_SIZE (FP0_REGNUM) * 32); + memcpy (&mips_fpreg_packet[MIPS_R_FP0], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], + DEPRECATED_REGISTER_RAW_SIZE (FP0_REGNUM) * 32); /* Copy the floating point control/status register (fpcsr). */ - bcopy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (mips_regnum (current_gdbarch)->fp_control_status)], - &mips_fpreg_packet[MIPS_R_FPCSR], - DEPRECATED_REGISTER_RAW_SIZE (mips_regnum (current_gdbarch)->fp_control_status)); + memcpy (&mips_fpreg_packet[MIPS_R_FPCSR], + &deprecated_registers[DEPRECATED_REGISTER_BYTE (mips_regnum (current_gdbarch)->fp_control_status)], + DEPRECATED_REGISTER_RAW_SIZE (mips_regnum (current_gdbarch)->fp_control_status)); net_write_registers (mips_fpreg_packet, MIPS_FPREG_PLEN, PTRACE_SETFPREGS); -- 2.30.2