Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

* configure.tgt: Add back sparc-*-vxworks*.

Browse Source 
* 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.
This commit is contained in:
Mark Kettenis
2004-01-03 12:09:48 +00:00
parent 5e938f9ff1
commit cb1bf9dc67
5 changed files with 118 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gdb/ChangeLog
View File

@@ -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> 2004-01-03 J. Brobecker <brobecker@gnat.com>
* infrun.c (handle_step_into_function): New function. * infrun.c (handle_step_into_function): New function.

31
gdb/config/sparc/tm-vxworks.h Normal file
View File

@@ -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 */

4
gdb/config/sparc/vxworks.mt Normal file
View File

@@ -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

1
gdb/configure.tgt
View File

@@ -196,6 +196,7 @@ sparc-*-solaris2.[0-6] | sparc-*-solaris2.[0-6].*)
sparc-*-solaris2* | sparcv9-*-solaris2* | sparc64-*-solaris2*) sparc-*-solaris2* | sparcv9-*-solaris2* | sparc64-*-solaris2*)
gdb_target=sol2-64 gdb_target=sol2-64
;; ;;
sparc-*-vxworks*) gdb_target=vxworks ;;
sparc-*-*) gdb_target=sparc ;; sparc-*-*) gdb_target=sparc ;;
sparc64-*-*) gdb_target=sparc64 ;; sparc64-*-*) gdb_target=sparc64 ;;

198
gdb/remote-vxsparc.c
View File

@@ -1,5 +1,4 @@
/* sparc-dependent portions of the RPC protocol /* SPARC-specific portions of the RPC protocol for VxWorks.
used with a VxWorks target
Contributed by Wind River Systems. Contributed by Wind River Systems.
@@ -20,179 +19,110 @@
Foundation, Inc., 59 Temple Place - Suite 330, Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */ Boston, MA 02111-1307, USA. */
#include <stdio.h>
#include "defs.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 "regcache.h"
#include "gdb_string.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 * */ #include "sparc-tdep.h"
#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/ptrace.h"
#include "vx-share/xdr_ptrace.h" #include "vx-share/regPacket.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 */ #define SPARC_R_G1 (SPARC_R_G0 + SPARC_GREG_SIZE)
#include <value.h>
#include <symtab.h>
/* Flag set if target has fpu */ 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 int target_has_fp; extern int target_has_fp;
/* sparc floating point format descriptor, from "sparc-tdep.c." */
extern struct ext_format ext_format_sparc;
/* Generic register read/write routines in remote-vx.c. */ /* Generic register read/write routines in remote-vx.c. */
extern void net_read_registers (); extern void net_read_registers ();
extern void net_write_registers (); extern void net_write_registers ();
/* Read a register or registers from the VxWorks target. /* Read a register or registers from the VxWorks target. REGNUM is
REGNO is the register to read, or -1 for all; currently, the register to read, or -1 for all; currently, it is ignored.
it is ignored. FIXME look at regno to improve efficiency. */ FIXME: Look at REGNUM to improve efficiency. */
void void
vx_read_register (int regno) vx_read_register (int regnum)
{ {
char sparc_greg_packet[SPARC_GREG_PLEN]; struct regcache *regcache = current_regcache;
char sparc_fpreg_packet[SPARC_FPREG_PLEN]; char gregs[SPARC_GREG_PLEN];
char fpregs[SPARC_FPREG_PLEN];
CORE_ADDR sp; CORE_ADDR sp;
/* Get general-purpose registers. When copying values into /* Get the general-purpose registers. */
registers [], don't assume that a location in registers [] net_read_registers (gregs, SPARC_GREG_PLEN, PTRACE_GETREGS);
is properly aligned for the target data type. */ sparc32_supply_gregset (&vxsparc_gregset, regcache, -1, gregs);
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. */
/* 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) if (target_has_fp)
{ net_read_registers (fpregs, SPARC_FPREG_PLEN, PTRACE_GETFPREGS);
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);
}
else else
{ memset (fpregs, 0, SPARC_FPREG_PLEN);
memset (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], sparc32_supply_fpregset (regcache, -1, fpregs);
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 ();
} }
/* Store a register or registers into the VxWorks target. /* Store a register or registers into the VxWorks target. REGNUM is
REGNO is the register to store, or -1 for all; currently, the register to store, or -1 for all; currently, it is ignored.
it is ignored. FIXME look at regno to improve efficiency. */ FIXME: Look at REGNUM to improve efficiency. */
void void
vx_write_register (int regno) vx_write_register (int regnum)
{ {
char sparc_greg_packet[SPARC_GREG_PLEN]; struct regcache *regcache = current_regcache;
char sparc_fpreg_packet[SPARC_FPREG_PLEN]; char gregs[SPARC_GREG_PLEN];
int in_gp_regs; char fpregs[SPARC_FPREG_PLEN];
int in_fp_regs; int gregs_p = 1;
int fpregs_p = 1;
CORE_ADDR sp; CORE_ADDR sp;
/* Store general purpose registers. When copying values from if (regnum != -1)
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 ((G0_REGNUM <= regno && regno <= I7_REGNUM) if ((SPARC_G0_REGNUM <= regnum && regnum <= SPARC_I7_REGNUM)
|| (Y_REGNUM <= regno && regno <= DEPRECATED_NPC_REGNUM)) || (SPARC32_Y_REGNUM <= regnum && regnum <= SPARC32_NPC_REGNUM))
in_fp_regs = 0; fpregs_p = 0;
else else
in_gp_regs = 0; gregs_p = 0;
} }
if (in_gp_regs)
/* Store the general-purpose registers. */
if (gregs_p)
{ {
bcopy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (G0_REGNUM)], sparc32_collect_gregset (&vxsparc_gregset, regcache, -1, gregs);
&sparc_greg_packet[SPARC_R_G0], 32 * SPARC_GREG_SIZE); net_write_registers (gregs, SPARC_GREG_PLEN, PTRACE_SETREGS);
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); /* Deal with the stack regs. */
if (regnum == -1 || regnum == SPARC_SP_REGNUM
/* If this is a local or in register, or we're storing all || (regnum >= SPARC_L0_REGNUM && regnum <= SPARC_I7_REGNUM))
registers, update the register window spill area. */
if (regno < 0 || (L0_REGNUM <= regno && regno <= I7_REGNUM))
{ {
sp = extract_unsigned_integer (&deprecated_registers[DEPRECATED_REGISTER_BYTE (SP_REGNUM)], ULONGEST sp;
DEPRECATED_REGISTER_RAW_SIZE (SP_REGNUM));
write_memory (sp, &deprecated_registers[DEPRECATED_REGISTER_BYTE (L0_REGNUM)], regcache_cooked_read_unsigned (regcache, SPARC_SP_REGNUM, &sp);
16 * DEPRECATED_REGISTER_RAW_SIZE (L0_REGNUM)); sparc_collect_rwindow (regcache, sp, regnum);
} }
} }
/* Store floating point registers if the target has them. */ /* Store the floating-point registers if the target has them. */
if (fpregs_p && target_has_fp)
if (in_fp_regs && target_has_fp)
{ {
bcopy (&deprecated_registers[DEPRECATED_REGISTER_BYTE (FP0_REGNUM)], sparc32_collect_fpregset (regcache, -1, fpregs);
&sparc_fpreg_packet[SPARC_R_FP0], 32 * SPARC_FPREG_SIZE); net_write_registers (fpregs, SPARC_FPREG_PLEN, PTRACE_SETFPREGS);
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);
} }
} }