diff options
| -rw-r--r-- | gdb/ChangeLog | 18 | ||||
| -rw-r--r-- | gdb/config/sparc/tm-vxworks.h | 31 | ||||
| -rw-r--r-- | gdb/config/sparc/vxworks.mt | 4 | ||||
| -rw-r--r-- | gdb/configure.tgt | 1 | ||||
| -rw-r--r-- | gdb/remote-vxsparc.c | 202 |
5 files changed, 120 insertions, 136 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 304ec369797..2103c92dcd1 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,21 @@ +2004-01-03 Mark Kettenis <kettenis@gnu.org> + + * configure.tgt: Add back sparc-*-vxworks*. + * remote-vxsparc.c: Remove all includes except for "defs.h", + "regcache.h", "vx-share/ptrace.h" and "vx-share/regPacket.h". + Include "sparc-tdep.h". + (SPARC_R_G1): New define. + (vxsparc_gregset): New variable. + (ext_format_sparc): Remove extern declaration. + (vx_read_register): Rewrite to use sparc32_supply_gregset and + sparc32_supply_fpregset. + (vx_write_register): Rewrite to use sparc32_collect_gregset, + sparc_collect_rwindow and sparc32_collect_fpregset. + * config/sparc/tm-vxworks.h: New file, based on recently removed + tm-vxsparc.h. + * config/sparc/vxworks.mt: New file, based on recently removed + vxworks.mt. + 2004-01-03 J. Brobecker <brobecker@gnat.com> * infrun.c (handle_step_into_function): New function. diff --git a/gdb/config/sparc/tm-vxworks.h b/gdb/config/sparc/tm-vxworks.h new file mode 100644 index 00000000000..7b0474847c6 --- /dev/null +++ b/gdb/config/sparc/tm-vxworks.h @@ -0,0 +1,31 @@ +/* Target-dependent defenitions for VxWorks SPARC. + + Copyright 1993, 1999, 2004 Free Software Foundation, Inc. + Contributed by Cygnus Support. + + 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 + the Free Software Foundation; either version 2 of the License, or + (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 + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifndef TM_VXWORKS_H +#define TM_VXWORKS_H + +#define GDB_MULTI_ARCH GDB_MULTI_ARCH_TM + +/* Get generic VxWorks definitions. */ +#include "config/tm-vxworks.h" + +#endif /* tm-vxworks.h */ diff --git a/gdb/config/sparc/vxworks.mt b/gdb/config/sparc/vxworks.mt new file mode 100644 index 00000000000..175f92ed981 --- /dev/null +++ b/gdb/config/sparc/vxworks.mt @@ -0,0 +1,4 @@ +# Target: VxWorks SPARC +TDEPFILES= sparc-tdep.o \ + remote-vx.o remote-vxsparc.o xdr_ld.o xdr_ptrace.o xdr_rdb.o +TM_FILE= tm-vxworks.h diff --git a/gdb/configure.tgt b/gdb/configure.tgt index d49049fa3af..f974631569c 100644 --- a/gdb/configure.tgt +++ b/gdb/configure.tgt @@ -196,6 +196,7 @@ sparc-*-solaris2.[0-6] | sparc-*-solaris2.[0-6].*) sparc-*-solaris2* | sparcv9-*-solaris2* | sparc64-*-solaris2*) gdb_target=sol2-64 ;; +sparc-*-vxworks*) gdb_target=vxworks ;; sparc-*-*) gdb_target=sparc ;; sparc64-*-*) gdb_target=sparc64 ;; diff --git a/gdb/remote-vxsparc.c b/gdb/remote-vxsparc.c index d313c8f133b..118e5173e13 100644 --- a/gdb/remote-vxsparc.c +++ b/gdb/remote-vxsparc.c @@ -1,5 +1,4 @@ -/* sparc-dependent portions of the RPC protocol - used with a VxWorks target +/* SPARC-specific portions of the RPC protocol for VxWorks. Contributed by Wind River Systems. @@ -20,179 +19,110 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <stdio.h> #include "defs.h" - -#include "vx-share/regPacket.h" -#include "frame.h" -#include "inferior.h" -#include "target.h" -#include "gdbcore.h" -#include "command.h" -#include "symtab.h" -#include "symfile.h" #include "regcache.h" #include "gdb_string.h" -#include <errno.h> -#include <fcntl.h> -#include <sys/types.h> -#include <sys/time.h> -#include <sys/socket.h> - -#ifdef _AIX /* IBM claims "void *malloc()" not char * */ -#define malloc bogon_malloc -#endif - -#include <rpc/rpc.h> -#include <sys/time.h> /* UTek's <rpc/rpc.h> doesn't #incl this */ -#include <netdb.h> -#include "vx-share/ptrace.h" -#include "vx-share/xdr_ptrace.h" -#include "vx-share/xdr_ld.h" -#include "vx-share/xdr_rdb.h" -#include "vx-share/dbgRpcLib.h" -/* get rid of value.h if possible */ -#include <value.h> -#include <symtab.h> +#include "sparc-tdep.h" -/* Flag set if target has fpu */ +#include "vx-share/ptrace.h" +#include "vx-share/regPacket.h" -extern int target_has_fp; +#define SPARC_R_G1 (SPARC_R_G0 + SPARC_GREG_SIZE) -/* sparc floating point format descriptor, from "sparc-tdep.c." */ +const struct sparc_gregset vxsparc_gregset = +{ + SPARC_R_PSR, /* %psr */ + SPARC_R_PC, /* %pc */ + SPARC_R_NPC, /* %npc */ + SPARC_R_Y, /* %y */ + SPARC_R_WIM, /* %wim */ + SPARC_R_TBR, /* %tbr */ + SPARC_R_G1, /* %g1 */ + SPARC_R_I0 /* %l0 */ +}; + +/* Flag set if target has an FPU. */ -extern struct ext_format ext_format_sparc; +extern int target_has_fp; /* Generic register read/write routines in remote-vx.c. */ extern void net_read_registers (); extern void net_write_registers (); -/* Read a register or registers from the VxWorks target. - REGNO is the register to read, or -1 for all; currently, - it is ignored. FIXME look at regno to improve efficiency. */ +/* Read a register or registers from the VxWorks target. REGNUM is + the register to read, or -1 for all; currently, it is ignored. + FIXME: Look at REGNUM to improve efficiency. */ void -vx_read_register (int regno) +vx_read_register (int regnum) { - char sparc_greg_packet[SPARC_GREG_PLEN]; - char sparc_fpreg_packet[SPARC_FPREG_PLEN]; + struct regcache *regcache = current_regcache; + char gregs[SPARC_GREG_PLEN]; + char fpregs[SPARC_FPREG_PLEN]; CORE_ADDR sp; - /* Get general-purpose registers. When copying values into - registers [], don't assume that a location in registers [] - is properly aligned for the target data type. */ - - net_read_registers (sparc_greg_packet, SPARC_GREG_PLEN, PTRACE_GETREGS); - - /* Now copy the register values into registers[]. - Note that this code depends on the ordering of the REGNUMs - as defined in "tm-sparc.h". */ - - bcopy (&sparc_greg_packet[SPARC_R_G0], - &deprecated_registers[DEPRECATED_REGISTER_BYTE (G0_REGNUM)], - 32 * SPARC_GREG_SIZE); - bcopy (&sparc_greg_packet[SPARC_R_Y], - &deprecated_registers[DEPRECATED_REGISTER_BYTE (Y_REGNUM)], 6 * SPARC_GREG_SIZE); - - /* Now write the local and in registers to the register window spill - area in the frame. VxWorks does not do this for the active frame - automatically; it greatly simplifies debugging. */ - - sp = extract_unsigned_integer (&deprecated_registers[DEPRECATED_REGISTER_BYTE (SP_REGNUM)], - DEPRECATED_REGISTER_RAW_SIZE (SP_REGNUM)); - write_memory (sp, &deprecated_registers[DEPRECATED_REGISTER_BYTE (L0_REGNUM)], - 16 * DEPRECATED_REGISTER_RAW_SIZE (L0_REGNUM)); - - /* If the target has floating point registers, fetch them. - Otherwise, zero the floating point register values in - registers[] for good measure, even though we might not - need to. */ + /* Get the general-purpose registers. */ + net_read_registers (gregs, SPARC_GREG_PLEN, PTRACE_GETREGS); + sparc32_supply_gregset (&vxsparc_gregset, regcache, -1, gregs); + /* If the target has floating-point registers, fetch them. + Otherwise, zero the floating-point register values in GDB's + register cache for good measure, even though we might not need + to. */ if (target_has_fp) - { - net_read_registers (sparc_fpreg_packet, SPARC_FPREG_PLEN, - PTRACE_GETFPREGS); - bcopy (&sparc_fpreg_packet[SPARC_R_FP0], - &deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], - 32 * SPARC_FPREG_SIZE); - bcopy (&sparc_fpreg_packet[SPARC_R_FSR], - &deprecated_registers[DEPRECATED_REGISTER_BYTE (FPS_REGNUM)], - 1 * SPARC_FPREG_SIZE); - } + net_read_registers (fpregs, SPARC_FPREG_PLEN, PTRACE_GETFPREGS); else - { - memset (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], - 0, 32 * SPARC_FPREG_SIZE); - memset (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FPS_REGNUM)], - 0, 1 * SPARC_FPREG_SIZE); - } - - /* Mark the register cache valid. */ - - deprecated_registers_fetched (); + memset (fpregs, 0, SPARC_FPREG_PLEN); + sparc32_supply_fpregset (regcache, -1, fpregs); } -/* Store a register or registers into the VxWorks target. - REGNO is the register to store, or -1 for all; currently, - it is ignored. FIXME look at regno to improve efficiency. */ +/* Store a register or registers into the VxWorks target. REGNUM is + the register to store, or -1 for all; currently, it is ignored. + FIXME: Look at REGNUM to improve efficiency. */ void -vx_write_register (int regno) +vx_write_register (int regnum) { - char sparc_greg_packet[SPARC_GREG_PLEN]; - char sparc_fpreg_packet[SPARC_FPREG_PLEN]; - int in_gp_regs; - int in_fp_regs; + struct regcache *regcache = current_regcache; + char gregs[SPARC_GREG_PLEN]; + char fpregs[SPARC_FPREG_PLEN]; + int gregs_p = 1; + int fpregs_p = 1; CORE_ADDR sp; - /* Store general purpose registers. When copying values from - registers [], don't assume that a location in registers [] - is properly aligned for the target data type. */ - - in_gp_regs = 1; - in_fp_regs = 1; - if (regno >= 0) + if (regnum != -1) { - if ((G0_REGNUM <= regno && regno <= I7_REGNUM) - || (Y_REGNUM <= regno && regno <= DEPRECATED_NPC_REGNUM)) - in_fp_regs = 0; + if ((SPARC_G0_REGNUM <= regnum && regnum <= SPARC_I7_REGNUM) + || (SPARC32_Y_REGNUM <= regnum && regnum <= SPARC32_NPC_REGNUM)) + fpregs_p = 0; else - in_gp_regs = 0; + gregs_p = 0; } - if (in_gp_regs) - { - bcopy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (G0_REGNUM)], - &sparc_greg_packet[SPARC_R_G0], 32 * SPARC_GREG_SIZE); - bcopy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (Y_REGNUM)], - &sparc_greg_packet[SPARC_R_Y], 6 * SPARC_GREG_SIZE); - - net_write_registers (sparc_greg_packet, SPARC_GREG_PLEN, PTRACE_SETREGS); - /* If this is a local or in register, or we're storing all - registers, update the register window spill area. */ + /* Store the general-purpose registers. */ + if (gregs_p) + { + sparc32_collect_gregset (&vxsparc_gregset, regcache, -1, gregs); + net_write_registers (gregs, SPARC_GREG_PLEN, PTRACE_SETREGS); - if (regno < 0 || (L0_REGNUM <= regno && regno <= I7_REGNUM)) + /* Deal with the stack regs. */ + if (regnum == -1 || regnum == SPARC_SP_REGNUM + || (regnum >= SPARC_L0_REGNUM && regnum <= SPARC_I7_REGNUM)) { - sp = extract_unsigned_integer (&deprecated_registers[DEPRECATED_REGISTER_BYTE (SP_REGNUM)], - DEPRECATED_REGISTER_RAW_SIZE (SP_REGNUM)); - write_memory (sp, &deprecated_registers[DEPRECATED_REGISTER_BYTE (L0_REGNUM)], - 16 * DEPRECATED_REGISTER_RAW_SIZE (L0_REGNUM)); + ULONGEST sp; + + regcache_cooked_read_unsigned (regcache, SPARC_SP_REGNUM, &sp); + sparc_collect_rwindow (regcache, sp, regnum); } } - /* Store floating point registers if the target has them. */ - - if (in_fp_regs && target_has_fp) + /* Store the floating-point registers if the target has them. */ + if (fpregs_p && target_has_fp) { - bcopy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], - &sparc_fpreg_packet[SPARC_R_FP0], 32 * SPARC_FPREG_SIZE); - bcopy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FPS_REGNUM)], - &sparc_fpreg_packet[SPARC_R_FSR], 1 * SPARC_FPREG_SIZE); - - net_write_registers (sparc_fpreg_packet, SPARC_FPREG_PLEN, - PTRACE_SETFPREGS); + sparc32_collect_fpregset (regcache, -1, fpregs); + net_write_registers (fpregs, SPARC_FPREG_PLEN, PTRACE_SETFPREGS); } } |